diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16b634c7..73ff6a5e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: cimg/android:2023.07
+      - image: cimg/android:2025.04
     environment:
       JVM_OPTS: -Xmx3200m
       GRADLE_OPTS: -Dorg.gradle.daemon=true
@@ -12,7 +12,7 @@ jobs:
       - checkout
       - restore_cache:
           # bump the cache version number if you want to wipe the gradle cache
-          key: v6-gradle-dependencies-cache
+          key: v7-gradle-dependencies-cache
 #      - run:
 #         name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
 #         command: sudo chmod +x ./gradlew
@@ -22,116 +22,77 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle
-          key: v6-gradle-dependencies-cache
+          key: v7-gradle-dependencies-cache
 
       - run:
-          name: Run Tests fore-jv-android
-          command: ./gradlew fore-jv:fore-jv-android:lintRelease fore-jv:fore-jv-android:testRelease
+          name: Run Tests fore-compose
+          command: ./gradlew lib:fore-compose:lintRelease lib:fore-compose:testRelease
       - store_artifacts:
-          path: fore-jv/fore-jv-android/build/reports
+          path: lib/fore-compose/build/reports
       - store_test_results:
-          path: fore-jv/fore-jv-android/build/test-results
+          path: lib/fore-compose/build/test-results
 
       - run:
-          name: Run Tests fore-kt-android
-          command: ./gradlew fore-kt:fore-kt-android:lintRelease fore-kt:fore-kt-android:testRelease
+          name: Run Tests fore-core
+          command: ./gradlew lib:fore-core:lintRelease lib:fore-core:testRelease
       - store_artifacts:
-          path: fore-kt/fore-kt-android/build/reports
+          path: lib/fore-core/build/reports
       - store_test_results:
-          path: fore-kt/fore-kt-android/build/test-results
+          path: lib/fore-core/build/test-results
 
       - run:
-          name: Run Tests example-jv-01reactiveui
-          command: ./gradlew app-examples:example-jv-01reactiveui:lintRelease app-examples:example-jv-01reactiveui:testRelease
+          name: Run Tests fore-net
+          command: ./gradlew lib:fore-net:lintRelease lib:fore-net:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-01reactiveui/build/reports
+          path: lib/fore-net/build/reports
       - store_test_results:
-          path: app-examples/example-jv-01reactiveui/build/test-results
+          path: lib/fore-net/build/test-results
 
       - run:
-          name: Run Tests example-jv-02threading
-          command: ./gradlew app-examples:example-jv-02threading:lintRelease app-examples:example-jv-02threading:testRelease
+          name: Run Tests example-01-reactiveui
+          command: ./gradlew app-examples:example-01-reactiveui:lintRelease app-examples:example-01-reactiveui:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-02threading/build/reports
+          path: app-examples/example-01-reactiveui/build/reports
       - store_test_results:
-          path: app-examples/example-jv-02threading/build/test-results
+          path: app-examples/example-01-reactiveui/build/test-results
 
       - run:
-          name: Run Tests example-jv-03adapters
-          command: ./gradlew app-examples:example-jv-03adapters:lintRelease app-examples:example-jv-03adapters:testRelease
+          name: Run Tests example-02-coroutine
+          command: ./gradlew app-examples:example-02-coroutine:lintRelease app-examples:example-02-coroutine:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-03adapters/build/reports
+          path: app-examples/example-02-coroutine/build/reports
       - store_test_results:
-          path: app-examples/example-jv-03adapters/build/test-results
+          path: app-examples/example-02-coroutine/build/test-results
 
       - run:
-          name: Run Tests example-jv-04retrofit
-          command: ./gradlew app-examples:example-jv-04retrofit:lintRelease app-examples:example-jv-04retrofit:testRelease
+          name: Run Tests example-03-ktor
+          command: ./gradlew app-examples:example-03-ktor:lintRelease app-examples:example-03-ktor:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-04retrofit/build/reports
+          path: app-examples/example-03-ktor/build/reports
       - store_test_results:
-          path: app-examples/example-jv-04retrofit/build/test-results
+          path: app-examples/example-03-ktor/build/test-results
 
       - run:
-          name: Run Tests example-jv-06db
-          command: ./gradlew app-examples:example-jv-06db:lintRelease app-examples:example-jv-06db:testRelease
+          name: Run Tests example-04-apollo
+          command: ./gradlew app-examples:example-04-apollo:lintRelease app-examples:example-04-apollo:testRelease
       - store_artifacts:
-          path: app-examples/example-jv-06db/build/reports
+          path: app-examples/example-04-apollo/build/reports
       - store_test_results:
-          path: app-examples/example-jv-06db/build/test-results
+          path: app-examples/example-04-apollo/build/test-results
 
-      - run:
-          name: Run Tests example-kt-01reactiveui
-          command: ./gradlew app-examples:example-kt-01reactiveui:lintRelease app-examples:example-kt-01reactiveui:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-01reactiveui/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-01reactiveui/build/test-results
-
-      - run:
-          name: Run Tests example-kt-02coroutine
-          command: ./gradlew app-examples:example-kt-02coroutine:lintRelease app-examples:example-kt-02coroutine:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-02coroutine/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-02coroutine/build/test-results
-
-      - run:
-          name: Run Tests example-kt-03adapters
-          command: ./gradlew app-examples:example-kt-03adapters:lintRelease app-examples:example-kt-03adapters:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-03adapters/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-03adapters/build/test-results
-
-      - run:
-          name: Run Tests example-kt-04retrofit
-          command: ./gradlew app-examples:example-kt-04retrofit:lintRelease app-examples:example-kt-04retrofit:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-04retrofit/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-04retrofit/build/test-results
-
-      - run:
-          name: Run Tests example-kt-07apollo3
-          command: ./gradlew app-examples:example-kt-07apollo3:lintRelease app-examples:example-kt-07apollo3:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-07apollo3/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-07apollo3/build/test-results
+#      - run:
+#          name: Run Tests example-05-db
+#          command: ./gradlew app-examples:example-05-db:lintRelease app-examples:example-05-db:testRelease
+#      - store_artifacts:
+#          path: app-examples/example-05-db/build/reports
+#      - store_test_results:
+#          path: app-examples/example-05-db/build/test-results
 
       - run:
-          name: Run Tests example-kt-08ktor
-          command: ./gradlew app-examples:example-kt-08ktor:lintRelease app-examples:example-kt-08ktor:testRelease
+          name: Run Tests example-06-compose
+          command: ./gradlew app-examples:example-06-compose:lintRelease app-examples:example-06-compose:testRelease
       - store_artifacts:
-          path: app-examples/example-kt-08ktor/build/reports
+          path: app-examples/example-06-compose/build/reports
       - store_test_results:
-          path: app-examples/example-kt-08ktor/build/test-results
+          path: app-examples/example-06-compose/build/test-results
 
-      - run:
-          name: Run Tests example-kt-09compose
-          command: ./gradlew app-examples:example-kt-09compose:lintRelease app-examples:example-kt-09compose:testRelease
-      - store_artifacts:
-          path: app-examples/example-kt-09compose/build/reports
-      - store_test_results:
-          path: app-examples/example-kt-09compose/build/test-results
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 3bf8bd1a..386bb539 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,8 @@ secret_key_ring.gpg
 
 # passwords
 secrets.properties
+
+# Ignore Kotlin/Native metadata and build artifacts
+.kotlin/
+
+**/iosApp/Frameworks/
diff --git a/app-examples/example-kt-01reactiveui/build.gradle.kts b/app-examples/example-01-reactiveui/build.gradle.kts
similarity index 87%
rename from app-examples/example-kt-01reactiveui/build.gradle.kts
rename to app-examples/example-01-reactiveui/build.gradle.kts
index 3b8db2e2..f92552bb 100644
--- a/app-examples/example-kt-01reactiveui/build.gradle.kts
+++ b/app-examples/example-01-reactiveui/build.gradle.kts
@@ -2,9 +2,9 @@ import co.early.fore.Shared
 import co.early.fore.Shared.BuildTypes
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    kotlin("kapt")
+    alias(libs.plugins.androidAppPlugin)
+    alias(libs.plugins.kotlinAndroidPlugin)
+    alias(libs.plugins.kotlinKaptPlugin)
 }
 
 
@@ -18,7 +18,7 @@ println("[$appId testBuildType:${getTestBuildType()}]")
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
     }
 }
 
@@ -68,9 +68,11 @@ android {
 dependencies {
 
     if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android-core:${Shared.Publish.published_fore_version_for_examples}")
+        implementation(libs.fore.core)
+        testImplementation(libs.fore.test.fixtures)
     } else {
-        implementation(project(":fore-kt:fore-kt-android-core"))
+        implementation(project(":lib:fore-core"))
+        testImplementation(project(":lib:fore-test-fixtures"))
     }
 
     implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
diff --git a/app-examples/example-jv-01reactiveui/screenshot.png b/app-examples/example-01-reactiveui/screenshot.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/screenshot.png
rename to app-examples/example-01-reactiveui/screenshot.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/AndroidManifest.xml b/app-examples/example-01-reactiveui/src/main/AndroidManifest.xml
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/AndroidManifest.xml
rename to app-examples/example-01-reactiveui/src/main/AndroidManifest.xml
diff --git a/app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/App.kt b/app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/App.kt
similarity index 82%
rename from app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/App.kt
rename to app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/App.kt
index 2767c945..005dcf79 100644
--- a/app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/App.kt
+++ b/app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/App.kt
@@ -1,8 +1,8 @@
 package foo.bar.example.forereactiveuikt
 
 import android.app.Application
-import co.early.fore.kt.core.delegate.DebugDelegateDefault
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.DebugDelegateDefault
+import co.early.fore.core.delegate.Fore
 
 /**
  * Copyright © 2015-2020 early.co. All rights reserved.
diff --git a/app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/OG.kt b/app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/OG.kt
similarity index 94%
rename from app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/OG.kt
rename to app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/OG.kt
index 0b214837..e87287a8 100644
--- a/app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/OG.kt
+++ b/app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/OG.kt
@@ -1,7 +1,8 @@
 package foo.bar.example.forereactiveuikt
 
 import android.app.Application
-import co.early.fore.kt.core.logging.AndroidLogger
+import co.early.fore.core.logging.AndroidLogger
+//import co.early.fore.core.logging.AndroidLogger
 import foo.bar.example.forereactiveuikt.feature.wallet.Wallet
 import java.util.HashMap
 
diff --git a/app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/feature/wallet/Wallet.kt b/app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/feature/wallet/Wallet.kt
similarity index 92%
rename from app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/feature/wallet/Wallet.kt
rename to app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/feature/wallet/Wallet.kt
index 82272371..d2055384 100644
--- a/app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/feature/wallet/Wallet.kt
+++ b/app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/feature/wallet/Wallet.kt
@@ -1,8 +1,8 @@
 package foo.bar.example.forereactiveuikt.feature.wallet
 
-import co.early.fore.kt.core.logging.Logger
+import co.early.fore.core.logging.Logger
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.observer.ObservableImp
+import co.early.fore.core.observer.ObservableImp
 
 /**
  * Copyright © 2015-2020 early.co. All rights reserved.
diff --git a/app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivity.kt b/app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivity.kt
similarity index 67%
rename from app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivity.kt
rename to app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivity.kt
index c8c11661..fffe6ff5 100644
--- a/app-examples/example-kt-01reactiveui/src/main/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivity.kt
+++ b/app-examples/example-01-reactiveui/src/main/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivity.kt
@@ -2,8 +2,13 @@ package foo.bar.example.forereactiveuikt.ui.wallet
 
 import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
+import co.early.fore.core.delegate.Fore
+/**
+ * example 1/3 without using the LifecycleObserver
+ */
+//import co.early.fore.core.observer.Observer
 import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.ui.LifecycleObserver
+import co.early.fore.core.ui.ForeLifecycleObserver
 import foo.bar.example.forereactiveuikt.OG
 import foo.bar.example.forereactiveuikt.databinding.ActivityWalletBinding
 import foo.bar.example.forereactiveuikt.feature.wallet.Wallet
@@ -18,13 +23,20 @@ class WalletsActivity : FragmentActivity(), SyncableView {
 
     private lateinit var binding: ActivityWalletBinding
 
+    /**
+     * example 2/3 without using the LifecycleObserver
+     */
+//    var observer: Observer = Observer { syncView() }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        Fore.i("onCreate()")
+
         binding = ActivityWalletBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        lifecycle.addObserver(LifecycleObserver(this, wallet))
+        lifecycle.addObserver(ForeLifecycleObserver(this, wallet))
 
         setupButtonClickListeners()
     }
@@ -39,9 +51,25 @@ class WalletsActivity : FragmentActivity(), SyncableView {
     }
 
     override fun syncView() {
+
+        Fore.i("syncView()")
+
         binding.walletIncreaseBtn.isEnabled = wallet.canIncrease()
         binding.walletDecreaseBtn.isEnabled = wallet.canDecrease()
         binding.walletMobileamountTxt.text = wallet.mobileWalletAmount.toString()
         binding.walletSavingsamountTxt.text = wallet.savingsWalletAmount.toString()
     }
+
+    /**
+     * example 3/3 without using the LifecycleObserver
+     */
+//    override fun onStart() {
+//        super.onStart()
+//        wallet.addObserver(observer)
+//        syncView() //  <- don't forget this
+//    }
+//    override fun onStop() {
+//        super.onStop()
+//        wallet.removeObserver(observer)
+//    }
 }
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/drawable-xxhdpi/moneybag.png b/app-examples/example-01-reactiveui/src/main/res/drawable-xxhdpi/moneybag.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/drawable-xxhdpi/moneybag.png
rename to app-examples/example-01-reactiveui/src/main/res/drawable-xxhdpi/moneybag.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/drawable-xxhdpi/phone.png b/app-examples/example-01-reactiveui/src/main/res/drawable-xxhdpi/phone.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/drawable-xxhdpi/phone.png
rename to app-examples/example-01-reactiveui/src/main/res/drawable-xxhdpi/phone.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/layout/activity_wallet.xml b/app-examples/example-01-reactiveui/src/main/res/layout/activity_wallet.xml
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/layout/activity_wallet.xml
rename to app-examples/example-01-reactiveui/src/main/res/layout/activity_wallet.xml
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-01-reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-01-reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-01-reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app-examples/example-01-reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/values/colors.xml b/app-examples/example-01-reactiveui/src/main/res/values/colors.xml
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/values/colors.xml
rename to app-examples/example-01-reactiveui/src/main/res/values/colors.xml
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/values/strings.xml b/app-examples/example-01-reactiveui/src/main/res/values/strings.xml
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/values/strings.xml
rename to app-examples/example-01-reactiveui/src/main/res/values/strings.xml
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/values/styles.xml b/app-examples/example-01-reactiveui/src/main/res/values/styles.xml
similarity index 100%
rename from app-examples/example-jv-01reactiveui/src/main/res/values/styles.xml
rename to app-examples/example-01-reactiveui/src/main/res/values/styles.xml
diff --git a/app-examples/example-kt-01reactiveui/src/test/java/foo/bar/example/forereactiveuikt/feature/wallet/WalletTest.kt b/app-examples/example-01-reactiveui/src/test/java/foo/bar/example/forereactiveuikt/feature/wallet/WalletTest.kt
similarity index 95%
rename from app-examples/example-kt-01reactiveui/src/test/java/foo/bar/example/forereactiveuikt/feature/wallet/WalletTest.kt
rename to app-examples/example-01-reactiveui/src/test/java/foo/bar/example/forereactiveuikt/feature/wallet/WalletTest.kt
index fd717435..581811d3 100644
--- a/app-examples/example-kt-01reactiveui/src/test/java/foo/bar/example/forereactiveuikt/feature/wallet/WalletTest.kt
+++ b/app-examples/example-01-reactiveui/src/test/java/foo/bar/example/forereactiveuikt/feature/wallet/WalletTest.kt
@@ -1,10 +1,10 @@
 package foo.bar.example.forereactiveuikt.feature.wallet
 
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.logging.SystemLogger
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.logging.SystemLogger
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import co.early.fore.core.delegate.Fore
 import io.mockk.MockKAnnotations
 import io.mockk.impl.annotations.MockK
 import io.mockk.verify
diff --git a/app-examples/example-kt-02coroutine/build.gradle.kts b/app-examples/example-02-coroutine/build.gradle.kts
similarity index 85%
rename from app-examples/example-kt-02coroutine/build.gradle.kts
rename to app-examples/example-02-coroutine/build.gradle.kts
index 89203dff..ed0e50ef 100644
--- a/app-examples/example-kt-02coroutine/build.gradle.kts
+++ b/app-examples/example-02-coroutine/build.gradle.kts
@@ -2,9 +2,9 @@ import co.early.fore.Shared
 import co.early.fore.Shared.BuildTypes
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    kotlin("kapt")
+    alias(libs.plugins.androidAppPlugin)
+    alias(libs.plugins.kotlinAndroidPlugin)
+    alias(libs.plugins.kotlinKaptPlugin)
 }
 
 val appId = "foo.bar.example.forecoroutine"
@@ -17,7 +17,7 @@ println("[$appId testBuildType:${getTestBuildType()}]")
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
     }
 }
 
@@ -67,13 +67,14 @@ android {
 dependencies {
 
     if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android-core:${Shared.Publish.published_fore_version_for_examples}")
+        implementation(libs.fore.core)
+        testImplementation(libs.fore.test.fixtures)
     } else {
-        implementation(project(":fore-kt:fore-kt-android-core"))
+        implementation(project(":lib:fore-core"))
+        testImplementation(project(":lib:fore-test-fixtures"))
     }
 
     implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
-    implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
 
     testImplementation("junit:junit:${Shared.Versions.junit}")
     testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")
diff --git a/app-examples/example-jv-02threading/screenshot.png b/app-examples/example-02-coroutine/screenshot.png
similarity index 100%
rename from app-examples/example-jv-02threading/screenshot.png
rename to app-examples/example-02-coroutine/screenshot.png
diff --git a/app-examples/example-jv-02threading/src/main/AndroidManifest.xml b/app-examples/example-02-coroutine/src/main/AndroidManifest.xml
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/AndroidManifest.xml
rename to app-examples/example-02-coroutine/src/main/AndroidManifest.xml
diff --git a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/App.kt b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/App.kt
similarity index 100%
rename from app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/App.kt
rename to app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/App.kt
diff --git a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/OG.kt b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/OG.kt
similarity index 95%
rename from app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/OG.kt
rename to app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/OG.kt
index bdcb64ae..9c2cb021 100644
--- a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/OG.kt
+++ b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/OG.kt
@@ -1,8 +1,7 @@
 package foo.bar.example.forecoroutine
 
 import android.app.Application
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.AndroidLogger
+import co.early.fore.core.logging.AndroidLogger
 import foo.bar.example.forecoroutine.feature.counter.Counter
 import foo.bar.example.forecoroutine.feature.counter.CounterWithProgress
 import java.util.HashMap
diff --git a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/Counter.kt b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/Counter.kt
similarity index 85%
rename from app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/Counter.kt
rename to app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/Counter.kt
index d9a76a6a..cf9a9da6 100644
--- a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/Counter.kt
+++ b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/Counter.kt
@@ -2,12 +2,12 @@ package foo.bar.example.forecoroutine.feature.counter
 
 
 import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.Logger
+import co.early.fore.core.logging.Logger
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.coroutine.awaitDefault
-import co.early.fore.kt.core.coroutine.launchMain
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.observer.ObservableImp
+import co.early.fore.core.coroutine.awaitDefault
+import co.early.fore.core.coroutine.launchMain
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.observer.ObservableImp
 import kotlinx.coroutines.delay
 
 /**
diff --git a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgress.kt b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgress.kt
similarity index 90%
rename from app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgress.kt
rename to app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgress.kt
index 7b963f32..667f9c41 100644
--- a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgress.kt
+++ b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgress.kt
@@ -2,11 +2,11 @@ package foo.bar.example.forecoroutine.feature.counter
 
 
 import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.Logger
+import co.early.fore.core.logging.Logger
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.coroutine.*
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.observer.ObservableImp
+import co.early.fore.core.coroutine.*
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.observer.ObservableImp
 import kotlinx.coroutines.delay
 
 /**
diff --git a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/ui/CounterActivity.kt b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/ui/CounterActivity.kt
similarity index 97%
rename from app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/ui/CounterActivity.kt
rename to app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/ui/CounterActivity.kt
index be118217..a0247551 100644
--- a/app-examples/example-kt-02coroutine/src/main/java/foo/bar/example/forecoroutine/ui/CounterActivity.kt
+++ b/app-examples/example-02-coroutine/src/main/java/foo/bar/example/forecoroutine/ui/CounterActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.FragmentActivity
 import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.ui.LifecycleObserver
+import co.early.fore.core.ui.LifecycleObserver
 import foo.bar.example.forecoroutine.OG
 import foo.bar.example.forecoroutine.databinding.ActivityCounterBinding
 import foo.bar.example.forecoroutine.feature.counter.Counter
diff --git a/app-examples/example-kt-02coroutine/src/main/res/layout/activity_counter.xml b/app-examples/example-02-coroutine/src/main/res/layout/activity_counter.xml
similarity index 100%
rename from app-examples/example-kt-02coroutine/src/main/res/layout/activity_counter.xml
rename to app-examples/example-02-coroutine/src/main/res/layout/activity_counter.xml
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-02-coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app-examples/example-02-coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-02-coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app-examples/example-02-coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-02-coroutine/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-02-coroutine/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-02-coroutine/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-02-coroutine/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-02-coroutine/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-02-coroutine/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-02threading/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-02-coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app-examples/example-02-coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-02threading/src/main/res/values/colors.xml b/app-examples/example-02-coroutine/src/main/res/values/colors.xml
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/values/colors.xml
rename to app-examples/example-02-coroutine/src/main/res/values/colors.xml
diff --git a/app-examples/example-kt-02coroutine/src/main/res/values/strings.xml b/app-examples/example-02-coroutine/src/main/res/values/strings.xml
similarity index 100%
rename from app-examples/example-kt-02coroutine/src/main/res/values/strings.xml
rename to app-examples/example-02-coroutine/src/main/res/values/strings.xml
diff --git a/app-examples/example-jv-02threading/src/main/res/values/styles.xml b/app-examples/example-02-coroutine/src/main/res/values/styles.xml
similarity index 100%
rename from app-examples/example-jv-02threading/src/main/res/values/styles.xml
rename to app-examples/example-02-coroutine/src/main/res/values/styles.xml
diff --git a/app-examples/example-kt-02coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterTest.kt b/app-examples/example-02-coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterTest.kt
similarity index 93%
rename from app-examples/example-kt-02coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterTest.kt
rename to app-examples/example-02-coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterTest.kt
index e32c54fb..f48c26df 100644
--- a/app-examples/example-kt-02coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterTest.kt
+++ b/app-examples/example-02-coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterTest.kt
@@ -1,9 +1,9 @@
 package foo.bar.example.forecoroutine.feature.counter
 
-import co.early.fore.kt.core.logging.SystemLogger
+import co.early.fore.core.logging.SystemLogger
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
 import io.mockk.MockKAnnotations
 import io.mockk.mockk
 import io.mockk.verify
diff --git a/app-examples/example-kt-02coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgressTest.kt b/app-examples/example-02-coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgressTest.kt
similarity index 96%
rename from app-examples/example-kt-02coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgressTest.kt
rename to app-examples/example-02-coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgressTest.kt
index b4025c7a..9ce40c81 100644
--- a/app-examples/example-kt-02coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgressTest.kt
+++ b/app-examples/example-02-coroutine/src/test/java/foo/bar/example/forecoroutine/feature/counter/CounterWithProgressTest.kt
@@ -1,10 +1,10 @@
 package foo.bar.example.forecoroutine.feature.counter
 
 import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.SystemLogger
+import co.early.fore.core.logging.SystemLogger
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
 import io.mockk.mockk
 import io.mockk.verify
 import org.junit.Assert
diff --git a/app-examples/example-kt-08ktor/build.gradle.kts b/app-examples/example-03-ktor/build.gradle.kts
similarity index 77%
rename from app-examples/example-kt-08ktor/build.gradle.kts
rename to app-examples/example-03-ktor/build.gradle.kts
index 600de1be..941ee6cc 100644
--- a/app-examples/example-kt-08ktor/build.gradle.kts
+++ b/app-examples/example-03-ktor/build.gradle.kts
@@ -2,10 +2,10 @@ import co.early.fore.Shared
 import co.early.fore.Shared.BuildTypes
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    alias(libs.plugins.kotlinSerialization)
-    kotlin("kapt")
+    alias(libs.plugins.androidAppPlugin)
+    alias(libs.plugins.kotlinAndroidPlugin)
+    alias(libs.plugins.kotlinSerializationPlugin)
+    alias(libs.plugins.kotlinKaptPlugin)
 }
 
 
@@ -19,7 +19,7 @@ println("[$appId testBuildType:${getTestBuildType()}]")
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
     }
 }
 
@@ -70,11 +70,18 @@ android {
 dependencies {
 
     if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android:${Shared.Publish.published_fore_version_for_examples}")
+        implementation(libs.fore.core)
+        implementation(libs.fore.net)
+        testImplementation(libs.fore.test.fixtures)
     } else {
-        implementation(project(":fore-kt:fore-kt-android"))
+        implementation(project(":lib:fore-core"))
+        implementation(project(":lib:fore-net"))
+        testImplementation(project(":lib:fore-test-fixtures"))
     }
 
+    implementation("io.ktor:ktor-client-mock:${Shared.Versions.ktor_client}")
+    implementation("io.ktor:ktor-client-cio:${Shared.Versions.ktor_client}")
+    implementation("io.ktor:ktor-client-logging:${Shared.Versions.ktor_client}")
     implementation("io.ktor:ktor-client-okhttp:${Shared.Versions.ktor_client}")
     implementation("io.ktor:ktor-serialization-kotlinx-json:${Shared.Versions.ktor_client}")
     implementation("io.ktor:ktor-client-content-negotiation:${Shared.Versions.ktor_client}")
@@ -82,6 +89,8 @@ dependencies {
     implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
     implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
 
+    implementation("org.slf4j:slf4j-nop:2.0.7") /// to get rid of the slf4 warning that comes from ktor
+
     testImplementation("junit:junit:${Shared.Versions.junit}")
     testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")
 
diff --git a/app-examples/example-kt-08ktor/proguard-example-kt-08ktor.pro b/app-examples/example-03-ktor/proguard-example-kt-08ktor.pro
similarity index 100%
rename from app-examples/example-kt-08ktor/proguard-example-kt-08ktor.pro
rename to app-examples/example-03-ktor/proguard-example-kt-08ktor.pro
diff --git a/app-examples/example-kt-08ktor/screenshot.png b/app-examples/example-03-ktor/screenshot.png
similarity index 100%
rename from app-examples/example-kt-08ktor/screenshot.png
rename to app-examples/example-03-ktor/screenshot.png
diff --git a/app-examples/example-kt-08ktor/src/main/AndroidManifest.xml b/app-examples/example-03-ktor/src/main/AndroidManifest.xml
similarity index 100%
rename from app-examples/example-kt-08ktor/src/main/AndroidManifest.xml
rename to app-examples/example-03-ktor/src/main/AndroidManifest.xml
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/App.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/App.kt
similarity index 100%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/App.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/App.kt
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/OG.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/OG.kt
similarity index 72%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/OG.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/OG.kt
index b3afd249..01f16fc1 100644
--- a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/OG.kt
+++ b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/OG.kt
@@ -1,16 +1,13 @@
 package foo.bar.example.forektorkt
 
 import android.app.Application
-import co.early.fore.kt.core.delegate.DebugDelegateDefault
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.net.InterceptorLogging
-import co.early.fore.kt.net.ktor.CallWrapperKtor
-import foo.bar.example.forektorkt.api.CustomGlobalErrorHandler
-import foo.bar.example.forektorkt.api.CustomGlobalRequestInterceptor
-import foo.bar.example.forektorkt.api.CustomKtorBuilder
+import co.early.fore.core.delegate.DebugDelegateDefault
+import co.early.fore.core.delegate.Fore
+import co.early.fore.net.wrap.CallWrapper
+import foo.bar.example.forektorkt.api.GlobalErrorHandler
+import foo.bar.example.forektorkt.api.KtorClientBuilder
 import foo.bar.example.forektorkt.api.fruits.FruitService
 import foo.bar.example.forektorkt.feature.fruit.FruitFetcher
-import java.util.*
 import kotlin.collections.set
 
 /**
@@ -29,17 +26,15 @@ object OG {
 
         // create dependency graph
 
-        if (BuildConfig.DEBUG) { Fore.setDelegate(DebugDelegateDefault("fore_")) }
+        if (BuildConfig.DEBUG) {
+            Fore.setDelegate(DebugDelegateDefault("fore_"))
+        }
         val logger = Fore.getLogger()
 
         // networking classes common to all models
-        val httpClient = CustomKtorBuilder.create(
-            CustomGlobalRequestInterceptor(logger),
-            InterceptorLogging(logger)
-        )//logging interceptor should be the last one
-
-        val callWrapper = CallWrapperKtor(
-            errorHandler = CustomGlobalErrorHandler(logger),
+        val httpClient = KtorClientBuilder.create(logger)
+        val callWrapper = CallWrapper(
+            errorHandler = GlobalErrorHandler(logger),
             logger = logger
         )
 
diff --git a/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/GlobalErrorHandler.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/GlobalErrorHandler.kt
new file mode 100644
index 00000000..1955867a
--- /dev/null
+++ b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/GlobalErrorHandler.kt
@@ -0,0 +1,173 @@
+package foo.bar.example.forektorkt.api
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.logging.Logger
+import co.early.fore.net.MessageProvider
+import co.early.fore.net.wrap.ErrorHandler
+import foo.bar.example.forektorkt.message.ErrorMessage
+import foo.bar.example.forektorkt.message.ErrorMessage.*
+import io.ktor.client.call.*
+import io.ktor.client.plugins.ClientRequestException
+import io.ktor.client.plugins.RedirectResponseException
+import io.ktor.client.plugins.ResponseException
+import io.ktor.client.plugins.ServerResponseException
+import io.ktor.client.statement.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
+
+/**
+ * KMP-compatible error handler for REST API calls.
+ *
+ * Something like this will be suitable for most HTTP services,
+ * consider customizing for the particularities of your own server side
+ *
+ * Retry logic is handled in KtorBuilder
+ */
+class GlobalErrorHandler(private val logWrapper: Logger? = null) : ErrorHandler<ErrorMessage> {
+
+    override suspend fun <CE : MessageProvider<ErrorMessage>> handleError(
+        t: Throwable,
+        kSerializer: KSerializer<CE>?,
+    ): ErrorMessage {
+
+        Fore.getLogger(logWrapper).e("handling error in global error handler", t)
+
+        val errorMessage = when (t) {
+
+            is ResponseException -> {
+
+                //initial error type
+                var msg = when (t) {
+                    is ClientRequestException -> {
+                        ERROR_SERVER
+                    } // in 400..499
+                    is RedirectResponseException -> {
+                        ERROR_SERVER
+                    } //in 300..399
+                    is ServerResponseException -> {
+                        ERROR_SERVER
+                    } //in 500..599
+                    else -> {
+                        ERROR_NETWORK
+                    } //something else
+                }
+
+                val response = t.response
+
+                Fore.getLogger(logWrapper).e("handleError() HTTP:" + response.status)
+
+                //get more specific with the error type
+                msg = when (response.status.value) {
+                    401 -> ERROR_SESSION_TIMED_OUT
+                    400, 405 -> ERROR_CLIENT
+                    429 -> ERROR_RATE_LIMITED
+                    404 -> ERROR_SERVER //if this happens in prod, it's usually a server config issue
+                    else -> null
+                } ?: msg
+
+                //let's get even more specifics about the error
+                kSerializer?.let { serializer ->
+                    msg = parseCustomError(msg, response, serializer)
+                }
+
+                msg
+            }
+
+            is NoTransformationFoundException -> ERROR_SERVER // content type is probably wrong, check response from server in app logs
+            is SerializationException -> ERROR_SERVER //parsing issue, maybe response is not json, or does not match expected type, or is empty
+            is TimeoutCancellationException -> ERROR_NETWORK // network timeout
+            is CancellationException -> ERROR_CLIENT // user cancellation, lifecycle takedown
+
+            else -> {
+                when {
+                    isProbablyNetworkError(t) -> ERROR_NETWORK
+                    isProbablySecurityError(t) -> ERROR_SECURITY_UNKNOWN
+                    else -> ERROR_NETWORK
+                }
+            }
+        }
+
+        Fore.getLogger(logWrapper).w("replyWithFailure() returning:$errorMessage")
+        return errorMessage
+    }
+
+    // this works a little better in KMP where we don't have unified exceptions
+    // because of platform differences
+    private fun isProbablyNetworkError(throwable: Throwable): Boolean {
+        val message = throwable.message?.lowercase() ?: ""
+        val className = throwable::class.simpleName?.lowercase() ?: ""
+
+        return message.contains("network") ||
+                message.contains("connection") ||
+                message.contains("timeout") ||
+                message.contains("unreachable") ||
+                className.contains("network") ||
+                className.contains("connection") ||
+                className.contains("timeout") ||
+                className.contains("io")
+    }
+
+    // this works a little better in KMP where we don't have unified exceptions
+    // because of platform differences
+    private fun isProbablySecurityError(throwable: Throwable): Boolean {
+        val message = throwable.message?.lowercase() ?: ""
+        val className = throwable::class.simpleName?.lowercase() ?: ""
+
+        return message.contains("ssl") ||
+                message.contains("tls") ||
+                message.contains("certificate") ||
+                message.contains("security") ||
+                className.contains("ssl") ||
+                className.contains("tls") ||
+                className.contains("security")
+    }
+
+
+    @Suppress("UNCHECKED_CAST")
+    private suspend fun <CE : MessageProvider<ErrorMessage>> parseCustomError(
+        provisionalErrorMessage: ErrorMessage,
+        errorResponse: HttpResponse,
+        customErrorSerializer: KSerializer<CE>
+    ): ErrorMessage {
+
+        var customError: ErrorMessage = provisionalErrorMessage
+
+        try {
+
+            val bodyContent = errorResponse.bodyAsText()
+            Fore.getLogger(logWrapper)
+                .w("parseCustomError() attempting to parse this content:\n $bodyContent")
+
+            val errorClass = Json.decodeFromString(customErrorSerializer, bodyContent)
+            customError = errorClass.message
+
+        } catch (t: Throwable) {
+
+            Fore.getLogger(logWrapper).e("parseCustomError() unexpected issue $t")
+
+            when (t) {
+                is IllegalStateException -> {
+                    Fore.getLogger(logWrapper).e("01") // problem reading body text
+                }
+                is SerializationException -> {
+                    Fore.getLogger(logWrapper).e("02") // parsing error, @Serializable missing, wrong error class specified etc
+                }
+                is IllegalArgumentException -> {
+                    Fore.getLogger(logWrapper).e("03") // encoding or argument issues
+                }
+                is NullPointerException -> {
+                    Fore.getLogger(logWrapper).e("04")
+                }
+                else -> {
+                    Fore.getLogger(logWrapper).e("05")
+                }
+            }
+        }
+
+        Fore.getLogger(logWrapper).w("parseCustomError() returning:$customError")
+        return customError
+    }
+}
diff --git a/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/KtorClientBuilder.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/KtorClientBuilder.kt
new file mode 100644
index 00000000..39b2f47d
--- /dev/null
+++ b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/KtorClientBuilder.kt
@@ -0,0 +1,77 @@
+package foo.bar.example.forektorkt.api
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.logging.Logger
+import co.early.fore.net.NetworkingLogSanitizer
+import co.early.fore.net.ForeNetworkLogs
+import io.ktor.client.*
+import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.plugins.logging.Logging
+import io.ktor.serialization.kotlinx.json.*
+
+/**
+ * Most of this will all be specific to your application, when customising for your own case
+ * bare in mind that you should also be able to use this class in your tests to mock the server
+ * by passing offline data interceptor plugins in (see unit tests for an example)
+ */
+object KtorClientBuilder {
+
+    /**
+     *
+     * @param configurePluginsBefore ktor plugin configuration block to be run first
+     * NB the logging plugin is usually the last one assuming you want to log what is actually
+     * sent from the device after all the other plugins have run
+     * @return ktor HttpClient object suitable for instantiating service interfaces
+     */
+    fun create(
+        lgr: Logger = Fore.getLogger(),
+        configurePluginsBefore: HttpClientConfig<*>.() -> Unit = {},
+    ): HttpClient {
+
+        return HttpClient(CIO) { // CIO or Darwin etc
+            expectSuccess = true
+
+            configurePluginsBefore(this)
+
+            install(ContentNegotiation) {
+                json()
+            }
+            install(PluginGlobalInterceptor) {
+                logger = lgr
+            }
+            // install(Logging)
+            // alternatively
+            install(ForeNetworkLogs) {
+                // all these are optional, default will suit most requirements
+                logger = lgr
+                curlStyleRequestLogs = true
+                prettifyResponseLogs = true
+                networkingLogSanitizer = object : NetworkingLogSanitizer {
+                    override fun sanitizeHeaders(headers: Set<Map.Entry<String, List<String>>>): Set<Map.Entry<String, List<String>>> {
+                        return headers
+                            .filterNot { header ->
+                                setOf(
+                                    "Authorization",
+                                    "X-Auth-Token",
+                                    "X-Session-Token"
+                                ).any { it.equals(header.key, ignoreCase = true) }
+                            }
+                            .toSet()
+                    }
+
+                    override fun sanitizeBody(text: String): String {
+                        // highly implementation specific, e.g. you might want
+                        // to recursively search through json keys for "id" or whatever
+                        // and redact all the corresponding values etc
+                        return text.replace("secret", "XXXX")
+                    }
+                }
+                filters = listOf { request ->
+                    // don't log any hosts containing notinteresting.com
+                    !request.url.host.contains("notinteresting.com")
+                }
+            }
+        }
+    }
+}
diff --git a/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/PluginGlobalInterceptor.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/PluginGlobalInterceptor.kt
new file mode 100644
index 00000000..7a51cb4e
--- /dev/null
+++ b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/PluginGlobalInterceptor.kt
@@ -0,0 +1,44 @@
+package foo.bar.example.forektorkt.api
+
+import co.early.fore.core.logging.Logger
+import foo.bar.example.forektorkt.BuildConfig
+import io.ktor.client.plugins.*
+import io.ktor.client.request.*
+import io.ktor.util.*
+import io.ktor.client.HttpClient
+
+/**
+ * Before creating your own custom ktor plugin check what's available first,
+ * for instance: install(DefaultRequest) { headers.append("User-Agent", "my ua") }
+ */
+class PluginGlobalInterceptor private constructor(
+    private val logger: Logger,
+   // private val session: Session,
+) {
+
+    class Config {
+        lateinit var logger: Logger
+      //  var session: Session
+    }
+
+    companion object Plugin : HttpClientPlugin<Config, PluginGlobalInterceptor> {
+
+        override val key = AttributeKey<PluginGlobalInterceptor>("PluginGlobalInterceptor")
+
+        override fun prepare(block: Config.() -> Unit): PluginGlobalInterceptor {
+            val config = Config().apply(block)
+            return PluginGlobalInterceptor(
+                logger = config.logger
+             //   session = config.session
+            )
+        }
+
+        override fun install(plugin: PluginGlobalInterceptor, scope: HttpClient) {
+            scope.requestPipeline.intercept(HttpRequestPipeline.State) {
+                context.headers.append("Content-Type", "application/json")
+                // context.headers.append("X-MyApp-Auth-Token", plugin.session?.getSessionToken() ?: "expired")
+                context.headers.append("User-Agent", "fore-example-user-agent-${BuildConfig.VERSION_NAME}")
+            }
+        }
+    }
+}
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/fruits/FruitService.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/fruits/FruitService.kt
similarity index 79%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/fruits/FruitService.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/fruits/FruitService.kt
index 4a8f349e..e50dc248 100644
--- a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/fruits/FruitService.kt
+++ b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/fruits/FruitService.kt
@@ -8,19 +8,21 @@ import io.ktor.client.request.*
  * These stubs are hosted at https://www.mocky.io/
  *
  * success example response:
- * http://www.mocky.io/v2/59efa0132e0000ef331c5f9b
+ * https://run.mocky.io/v3/57760938-6a45-49de-8f34-2cc061d26bbd
  *
  * fail example response:
  * http://www.mocky.io/v2/59ef2a6c2e00002a1a1c5dea
  */
 class FruitService(private val httpClient: HttpClient) {
 
-    private val baseUrl = "http://www.mocky.io/v2/"
+    private val baseUrl = "https://run.mocky.io/v3/"
     private val mediumDelay = 3
     private val smallDelay = 1
 
     suspend fun getFruitsSimulateOk(): List<FruitPojo> {
-        return httpClient.get("${baseUrl}59efa0132e0000ef331c5f9b/?mocky-delay=${mediumDelay}s").body()
+        return httpClient.get("${baseUrl}978bfa2b-cb05-45fa-b079-1b49a87d1832/?mocky-delay=${mediumDelay}s").body()
+        //return httpClient.get("${baseUrl}95fc2cb1-d8bf-43ef-a5cb-7db61736f40f/?mocky-delay=${mediumDelay}s").body()
+      //  return httpClient.get("${baseUrl}57760938-6a45-49de-8f34-2cc061d26bbd/?mocky-delay=${mediumDelay}s").body()
     }
 
     suspend fun getFruitsSimulateNotAuthorised(): List<FruitPojo> {
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/fruits/FruitsCustomError.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/fruits/FruitsCustomError.kt
similarity index 100%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/fruits/FruitsCustomError.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/fruits/FruitsCustomError.kt
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/fruits/Pojos.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/fruits/Pojos.kt
similarity index 100%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/fruits/Pojos.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/api/fruits/Pojos.kt
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcher.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/feature/fruit/FruitFetcher.kt
similarity index 85%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcher.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/feature/fruit/FruitFetcher.kt
index e13f1c9b..becdaab9 100644
--- a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcher.kt
+++ b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/feature/fruit/FruitFetcher.kt
@@ -1,18 +1,14 @@
 package foo.bar.example.forektorkt.feature.fruit
 
-import co.early.fore.kt.core.logging.Logger
+import co.early.fore.core.logging.Logger
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.carryOn
-import co.early.fore.kt.core.coroutine.launchMain
-import co.early.fore.kt.core.eitherError
-import co.early.fore.kt.core.eitherSuccess
-import co.early.fore.kt.core.observer.ObservableImp
-import co.early.fore.kt.core.type.Either.Companion.fail
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.kt.core.type.Either.Fail
-import co.early.fore.kt.core.type.Either.Success
-import co.early.fore.kt.core.type.carryOn
-import co.early.fore.kt.net.ktor.CallWrapperKtor
+import co.early.fore.core.coroutine.launchMain
+import co.early.fore.core.observer.ObservableImp
+import co.early.fore.core.type.Either.Fail
+import co.early.fore.core.type.Either.Success
+import co.early.fore.core.type.carryOn
+import co.early.fore.net.wrap.CallWrapper
+import co.early.fore.net.wrap.Wrapper
 import foo.bar.example.forektorkt.api.fruits.FruitPojo
 import foo.bar.example.forektorkt.api.fruits.FruitService
 import foo.bar.example.forektorkt.api.fruits.FruitsCustomError
@@ -27,7 +23,7 @@ typealias FailureCallback<T> = (T) -> Unit
  */
 class FruitFetcher(
     private val fruitService: FruitService,
-    private val callWrapperKtor: CallWrapperKtor<ErrorMessage>,
+    private val callWrapper: Wrapper<ErrorMessage>,
     private val logger: Logger
 ) : Observable by ObservableImp(logger = logger) {
 
@@ -56,7 +52,7 @@ class FruitFetcher(
 
             logger.i("about to use CallWrapper t:" + Thread.currentThread())
 
-            val deferredResult = callWrapperKtor.processCallAsync {
+            val deferredResult = callWrapper.processCallAsync {
 
                 logger.i("processing call t:" + Thread.currentThread())
 
@@ -93,7 +89,7 @@ class FruitFetcher(
 
         launchMain {
 
-            val result = callWrapperKtor.processCallAwait {
+            val result = callWrapper.processCallAwait {
                 fruitService.getFruitsSimulateNotAuthorised()
             }
 
@@ -126,7 +122,7 @@ class FruitFetcher(
 
         launchMain {
 
-            val result = callWrapperKtor.processCallAwait(FruitsCustomError::class) {
+            val result = callWrapper.processCallAwait(FruitsCustomError.serializer()) {
                 fruitService.getFruitsSimulateNotAuthorised()
             }
 
@@ -171,35 +167,35 @@ class FruitFetcher(
              * errors at each step - Internet search for "railway oriented programming"
              * or "andThen" functions)
              */
-            val response = callWrapperKtor.processCallAwait {
+            val response = callWrapper.processCallAwait {
                 logger.i("...create user...")
                 fruitService.createUser()
             }.carryOn {
                 logger.i("...create user ticket...")
-                callWrapperKtor.processCallAwait {
+                callWrapper.processCallAwait {
                     fruitService.createUserTicket(it.userId)
                 }
             }.carryOn {
                 ticketRef = it.ticketRef
                 logger.i("...get waiting time...")
-                callWrapperKtor.processCallAwait {
+                callWrapper.processCallAwait {
                     fruitService.getEstimatedWaitingTime(it.ticketRef)
                 }
             }.carryOn {
                 if (it.minutesWait > 10) {
                     logger.i("...cancel ticket...")
-                    callWrapperKtor.processCallAwait {
+                    callWrapper.processCallAwait {
                         fruitService.cancelTicket(ticketRef)
                     }
                 } else {
                     logger.i("...confirm ticket...")
-                    callWrapperKtor.processCallAwait {
+                    callWrapper.processCallAwait {
                         fruitService.confirmTicket(ticketRef)
                     }
                 }
             }.carryOn {
                 logger.i("...claim free fruit!...")
-                callWrapperKtor.processCallAwait {
+                callWrapper.processCallAwait {
                     fruitService.claimFreeFruit(it.ticketRef)
                 }
             }
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/message/ErrorMessage.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/message/ErrorMessage.kt
similarity index 100%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/message/ErrorMessage.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/message/ErrorMessage.kt
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/ui/fruit/FruitActivity.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/ui/fruit/FruitActivity.kt
similarity index 95%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/ui/fruit/FruitActivity.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/ui/fruit/FruitActivity.kt
index fd7cbf18..1b8a1e02 100644
--- a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/ui/fruit/FruitActivity.kt
+++ b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/ui/fruit/FruitActivity.kt
@@ -5,10 +5,10 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.fragment.app.FragmentActivity
+import co.early.fore.core.ui.LifecycleObserver
 import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.ui.LifecycleObserver
-import co.early.fore.kt.core.ui.showOrGone
-import co.early.fore.kt.core.ui.showOrInvisible
+import co.early.fore.core.ui.showOrGone
+import co.early.fore.core.ui.showOrInvisible
 import foo.bar.example.forektorkt.OG
 import foo.bar.example.forektorkt.R
 import foo.bar.example.forektorkt.databinding.ActivityFruitBinding
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/ui/widgets/AnimatedTastyRatingBar.kt b/app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/ui/widgets/AnimatedTastyRatingBar.kt
similarity index 100%
rename from app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/ui/widgets/AnimatedTastyRatingBar.kt
rename to app-examples/example-03-ktor/src/main/kotlin/foo/bar/example/forektorkt/ui/widgets/AnimatedTastyRatingBar.kt
diff --git a/app-examples/example-jv-04retrofit/src/main/res/drawable-xxhdpi/lemon_negative.png b/app-examples/example-03-ktor/src/main/res/drawable-xxhdpi/lemon_negative.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/drawable-xxhdpi/lemon_negative.png
rename to app-examples/example-03-ktor/src/main/res/drawable-xxhdpi/lemon_negative.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/drawable-xxhdpi/lemon_positive.png b/app-examples/example-03-ktor/src/main/res/drawable-xxhdpi/lemon_positive.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/drawable-xxhdpi/lemon_positive.png
rename to app-examples/example-03-ktor/src/main/res/drawable-xxhdpi/lemon_positive.png
diff --git a/app-examples/example-kt-08ktor/src/main/res/layout/activity_fruit.xml b/app-examples/example-03-ktor/src/main/res/layout/activity_fruit.xml
similarity index 100%
rename from app-examples/example-kt-08ktor/src/main/res/layout/activity_fruit.xml
rename to app-examples/example-03-ktor/src/main/res/layout/activity_fruit.xml
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-03-ktor/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app-examples/example-03-ktor/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-03-ktor/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app-examples/example-03-ktor/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-03-ktor/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-03-ktor/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-03-ktor/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-03-ktor/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-03-ktor/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-03-ktor/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-03-ktor/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-03-ktor/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-03-ktor/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-03-ktor/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-03-ktor/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-03-ktor/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-03-ktor/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-03-ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-03-ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app-examples/example-03-ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/values/colors.xml b/app-examples/example-03-ktor/src/main/res/values/colors.xml
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/values/colors.xml
rename to app-examples/example-03-ktor/src/main/res/values/colors.xml
diff --git a/app-examples/example-kt-08ktor/src/main/res/values/strings.xml b/app-examples/example-03-ktor/src/main/res/values/strings.xml
similarity index 100%
rename from app-examples/example-kt-08ktor/src/main/res/values/strings.xml
rename to app-examples/example-03-ktor/src/main/res/values/strings.xml
diff --git a/app-examples/example-jv-04retrofit/src/main/res/values/styles.xml b/app-examples/example-03-ktor/src/main/res/values/styles.xml
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/values/styles.xml
rename to app-examples/example-03-ktor/src/main/res/values/styles.xml
diff --git a/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcherUnitTest.kt b/app-examples/example-03-ktor/src/test/kotlin/foo/bar/example/forektorkt/feature/fruit/FruitFetcherUnitTest.kt
similarity index 86%
rename from app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcherUnitTest.kt
rename to app-examples/example-03-ktor/src/test/kotlin/foo/bar/example/forektorkt/feature/fruit/FruitFetcherUnitTest.kt
index fc79125c..0ea27da9 100644
--- a/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcherUnitTest.kt
+++ b/app-examples/example-03-ktor/src/test/kotlin/foo/bar/example/forektorkt/feature/fruit/FruitFetcherUnitTest.kt
@@ -1,10 +1,10 @@
 package foo.bar.example.forektorkt.feature.fruit
 
-import co.early.fore.kt.core.logging.SystemLogger
+import co.early.fore.core.logging.SystemLogger
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.net.ktor.CallWrapperKtor
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import co.early.fore.net.wrap.CallWrapper
 import foo.bar.example.forektorkt.api.fruits.FruitPojo
 import foo.bar.example.forektorkt.api.fruits.FruitService
 import foo.bar.example.forektorkt.message.ErrorMessage
@@ -34,7 +34,7 @@ class FruitFetcherUnitTest {
     private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
 
     @MockK
-    private lateinit var mockCallWrapperKtor: CallWrapperKtor<ErrorMessage>
+    private lateinit var mockCallWrapper: CallWrapper<ErrorMessage>
 
     @MockK
     private lateinit var mockFruitService: FruitService
@@ -61,7 +61,7 @@ class FruitFetcherUnitTest {
         //arrange
         val fruitFetcher = FruitFetcher(
                 mockFruitService,
-                mockCallWrapperKtor,
+                mockCallWrapper,
                 logger
         )
 
@@ -79,10 +79,10 @@ class FruitFetcherUnitTest {
     fun fetchFruit_MockSuccess() {
 
         //arrange
-        StateBuilder(mockCallWrapperKtor).getFruitSuccess(fruitPojo)
+        val fakeCallWrapper = StateBuilder().getFruitSuccess(fruitPojo).fakeCallWrapper
         val fruitFetcher = FruitFetcher(
                 mockFruitService,
-                mockCallWrapperKtor,
+                fakeCallWrapper,
                 logger
         )
 
@@ -110,10 +110,10 @@ class FruitFetcherUnitTest {
     fun fetchFruit_MockFailure() {
 
         //arrange
-        StateBuilder(mockCallWrapperKtor).getFruitFail(ErrorMessage.ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT)
+        val fakeCallWrapper = StateBuilder().getFruitFail(ErrorMessage.ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT).fakeCallWrapper
         val fruitFetcher = FruitFetcher(
                 mockFruitService,
-                mockCallWrapperKtor,
+                fakeCallWrapper,
                 logger
         )
 
@@ -136,7 +136,6 @@ class FruitFetcherUnitTest {
 
 
     /**
-     *
      * NB all we are checking here is that observers are called AT LEAST once
      *
      * We don't really want tie our tests (OR any observers in production code)
@@ -147,7 +146,7 @@ class FruitFetcherUnitTest {
      * only that they will be called if something changes ("something" is not defined
      * and can change between implementations).
      *
-     * See the databinding docs for more information about this
+     * See the fore docs for more information about this
      *
      * @throws Exception
      */
@@ -156,10 +155,10 @@ class FruitFetcherUnitTest {
     fun observersNotifiedAtLeastOnce() {
 
         //arrange
-        StateBuilder(mockCallWrapperKtor).getFruitSuccess(fruitPojo)
+        val fakeCallWrapper = StateBuilder().getFruitSuccess(fruitPojo).fakeCallWrapper
         val fruitFetcher = FruitFetcher(
                 mockFruitService,
-                mockCallWrapperKtor,
+            fakeCallWrapper,
                 logger
         )
         fruitFetcher.addObserver(mockObserver)
diff --git a/app-examples/example-03-ktor/src/test/kotlin/foo/bar/example/forektorkt/feature/fruit/StateBuilder.kt b/app-examples/example-03-ktor/src/test/kotlin/foo/bar/example/forektorkt/feature/fruit/StateBuilder.kt
new file mode 100644
index 00000000..3216843c
--- /dev/null
+++ b/app-examples/example-03-ktor/src/test/kotlin/foo/bar/example/forektorkt/feature/fruit/StateBuilder.kt
@@ -0,0 +1,30 @@
+package foo.bar.example.forektorkt.feature.fruit
+
+import co.early.fore.net.wrap.FakeCallWrapper
+import co.early.fore.net.wrap.toFakeFail
+import co.early.fore.net.wrap.toFakeSuccess
+import foo.bar.example.forektorkt.api.fruits.FruitPojo
+import foo.bar.example.forektorkt.message.ErrorMessage
+
+class StateBuilder {
+
+    lateinit var fakeCallWrapper: FakeCallWrapper<ErrorMessage>
+
+    internal fun getFruitSuccess(fruitPojo: FruitPojo): StateBuilder {
+
+        fakeCallWrapper = FakeCallWrapper(
+            listOf(fruitPojo).toFakeSuccess()
+        )
+
+        return this
+    }
+
+    internal fun getFruitFail(errorMessage: ErrorMessage): StateBuilder {
+
+        fakeCallWrapper = FakeCallWrapper(
+            errorMessage.toFakeFail(),
+        )
+
+        return this
+    }
+}
diff --git a/app-examples/example-kt-07apollo3/build.gradle.kts b/app-examples/example-04-apollo/build.gradle.kts
similarity index 70%
rename from app-examples/example-kt-07apollo3/build.gradle.kts
rename to app-examples/example-04-apollo/build.gradle.kts
index 4ac9598a..33b89a82 100644
--- a/app-examples/example-kt-07apollo3/build.gradle.kts
+++ b/app-examples/example-04-apollo/build.gradle.kts
@@ -2,14 +2,14 @@ import co.early.fore.Shared
 import co.early.fore.Shared.BuildTypes
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    id("com.apollographql.apollo3").version("3.8.3")
-    kotlin("kapt")
+    alias(libs.plugins.androidAppPlugin)
+    alias(libs.plugins.kotlinAndroidPlugin)
+    alias(libs.plugins.kotlinSerializationPlugin)
+    alias(libs.plugins.kotlinKaptPlugin)
+    alias(libs.plugins.apolloPlugin)
 }
 
-
-val appId = "foo.bar.example.foreapollo3"
+val appId = "foo.bar.example.foreapollo"
 
 fun getTestBuildType(): String {
     return project.properties["testBuildType"] as String? ?: BuildTypes.DEFAULT
@@ -19,7 +19,7 @@ println("[$appId testBuildType:${getTestBuildType()}]")
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
     }
 }
 
@@ -57,7 +57,10 @@ android {
         }
         getByName(BuildTypes.RELEASE) {
             isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "../proguard-example-app.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android.txt"),
+                "proguard-example-kt-08ktor.pro"
+            )
             signingConfig = signingConfigs.getByName(BuildTypes.RELEASE)
         }
     }
@@ -85,19 +88,32 @@ apollo {
 dependencies {
 
     if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android-core:${Shared.Publish.published_fore_version_for_examples}")
-        implementation("co.early.fore:fore-kt-network:${Shared.Publish.published_fore_version_for_examples}")
+        implementation(libs.fore.core)
+        implementation(libs.fore.net)
+        implementation(libs.fore.net.apollo)
+        testImplementation(libs.fore.test.fixtures)
+        testImplementation(libs.fore.net.apollo.test.fixtures)
     } else {
-        implementation(project(":fore-kt:fore-kt-android-core"))
-        implementation(project(":fore-kt:fore-kt-network"))
+        implementation(project(":lib:fore-core"))
+        implementation(project(":lib:fore-net"))
+        implementation(project(":lib:fore-net-apollo"))
+        testImplementation(project(":lib:fore-test-fixtures"))
+        testImplementation(project(":lib:fore-net-apollo-test-fixtures"))
     }
 
-    implementation("com.apollographql.apollo3:apollo-runtime:${Shared.Versions.apollo3}")
+    implementation(libs.apollo.runtime)
+    implementation(libs.apollo.engine.ktor)
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.cio)
+    implementation(libs.ktor.serialization.json)
+    implementation(libs.ktor.content.negotiation)
 
     implementation("io.coil-kt:coil:${Shared.Versions.coil}")
     implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
     implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
 
+    implementation("org.slf4j:slf4j-nop:2.0.7") // to get rid of the slf4 warning that comes from ktor
+
     testImplementation("junit:junit:${Shared.Versions.junit}")
     testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")
 
diff --git a/app-examples/example-kt-07apollo3/screenshot.png b/app-examples/example-04-apollo/screenshot.png
similarity index 100%
rename from app-examples/example-kt-07apollo3/screenshot.png
rename to app-examples/example-04-apollo/screenshot.png
diff --git a/app-examples/example-kt-04retrofit/src/main/AndroidManifest.xml b/app-examples/example-04-apollo/src/main/AndroidManifest.xml
similarity index 82%
rename from app-examples/example-kt-04retrofit/src/main/AndroidManifest.xml
rename to app-examples/example-04-apollo/src/main/AndroidManifest.xml
index 14caf367..d224fb77 100644
--- a/app-examples/example-kt-04retrofit/src/main/AndroidManifest.xml
+++ b/app-examples/example-04-apollo/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".App"
+        android:name="foo.bar.example.foreapollo.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -13,7 +13,7 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name=".ui.fruit.FruitActivity" android:exported="true">
+        <activity android:name="foo.bar.example.foreapollo.ui.launch.LaunchActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app-examples/example-kt-07apollo3/src/main/graphql/BookTrip.graphql b/app-examples/example-04-apollo/src/main/graphql/BookTrip.graphql
similarity index 100%
rename from app-examples/example-kt-07apollo3/src/main/graphql/BookTrip.graphql
rename to app-examples/example-04-apollo/src/main/graphql/BookTrip.graphql
diff --git a/app-examples/example-kt-07apollo3/src/main/graphql/CancelTrip.graphql b/app-examples/example-04-apollo/src/main/graphql/CancelTrip.graphql
similarity index 100%
rename from app-examples/example-kt-07apollo3/src/main/graphql/CancelTrip.graphql
rename to app-examples/example-04-apollo/src/main/graphql/CancelTrip.graphql
diff --git a/app-examples/example-kt-07apollo3/src/main/graphql/LaunchDetails.graphql b/app-examples/example-04-apollo/src/main/graphql/LaunchDetails.graphql
similarity index 100%
rename from app-examples/example-kt-07apollo3/src/main/graphql/LaunchDetails.graphql
rename to app-examples/example-04-apollo/src/main/graphql/LaunchDetails.graphql
diff --git a/app-examples/example-kt-07apollo3/src/main/graphql/LaunchList.graphql b/app-examples/example-04-apollo/src/main/graphql/LaunchList.graphql
similarity index 100%
rename from app-examples/example-kt-07apollo3/src/main/graphql/LaunchList.graphql
rename to app-examples/example-04-apollo/src/main/graphql/LaunchList.graphql
diff --git a/app-examples/example-kt-07apollo3/src/main/graphql/Login.graphql b/app-examples/example-04-apollo/src/main/graphql/Login.graphql
similarity index 100%
rename from app-examples/example-kt-07apollo3/src/main/graphql/Login.graphql
rename to app-examples/example-04-apollo/src/main/graphql/Login.graphql
diff --git a/app-examples/example-kt-07apollo3/src/main/graphql/schema.json b/app-examples/example-04-apollo/src/main/graphql/schema.json
similarity index 100%
rename from app-examples/example-kt-07apollo3/src/main/graphql/schema.json
rename to app-examples/example-04-apollo/src/main/graphql/schema.json
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/App.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/App.kt
similarity index 90%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/App.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/App.kt
index 9793e7f3..a50182dd 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/App.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/App.kt
@@ -1,4 +1,4 @@
-package foo.bar.example.foreapollo3
+package foo.bar.example.foreapollo
 
 
 import android.app.Application
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/OG.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/OG.kt
similarity index 71%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/OG.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/OG.kt
index 4f108809..79ff4c5a 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/OG.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/OG.kt
@@ -1,20 +1,20 @@
-package foo.bar.example.foreapollo3
+package foo.bar.example.foreapollo
+
+import co.early.fore.net.wrap.apollo.CallWrapperApollo
 
-import android.app.Application
-import co.early.fore.kt.core.logging.AndroidLogger
-import co.early.fore.kt.core.logging.SilentLogger
-import co.early.fore.kt.net.InterceptorLogging
-import co.early.fore.kt.net.apollo3.CallWrapperApollo3
-import com.apollographql.apollo3.api.Optional
-import foo.bar.example.foreapollo3.api.CustomApolloBuilder
-import foo.bar.example.foreapollo3.api.CustomGlobalErrorHandler
-import foo.bar.example.foreapollo3.api.CustomGlobalRequestInterceptor
-import foo.bar.example.foreapollo3.feature.authentication.AuthService
-import foo.bar.example.foreapollo3.feature.authentication.Authenticator
-import foo.bar.example.foreapollo3.feature.launch.LaunchService
-import foo.bar.example.foreapollo3.feature.launch.LaunchesModel
-import java.util.*
 
+import android.app.Application
+import co.early.fore.core.delegate.DebugDelegateDefault
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.logging.AndroidLogger
+import co.early.fore.core.logging.SilentLogger
+import foo.bar.example.foreapollo.api.ApolloClientBuilder
+import foo.bar.example.foreapollo.api.CustomGlobalErrorHandler
+import foo.bar.example.foreapollo.feature.authentication.AuthService
+import foo.bar.example.foreapollo.feature.authentication.Authenticator
+import foo.bar.example.foreapollo.feature.launch.LaunchService
+import foo.bar.example.foreapollo.feature.launch.LaunchesModel
+import com.apollographql.apollo.api.Optional
 
 /**
  *
@@ -33,15 +33,13 @@ object OG {
         // create dependency graph
 
         val logger = if (BuildConfig.DEBUG) AndroidLogger("fore_") else SilentLogger()
+        Fore.setDelegate(DebugDelegateDefault(logger = logger))
 
         // networking classes common to all models
-        val globalRequestInterceptor = CustomGlobalRequestInterceptor(logger)
-        val apolloClient = CustomApolloBuilder.create(
-            globalRequestInterceptor,
-            InterceptorLogging(logger)
-        )//logging interceptor should be the last one
 
-        val callWrapper = CallWrapperApollo3(
+        val apolloClient by lazy { ApolloClientBuilder.create(OG[Authenticator::class.java]) }
+
+        val callWrapper = CallWrapperApollo(
             CustomGlobalErrorHandler(logger),
             logger
         )
@@ -54,7 +52,7 @@ object OG {
             callWrapper,
             logger
         )
-        globalRequestInterceptor.setAuthenticator(authenticator)
+
         val launchesModel = LaunchesModel(
             launchService = LaunchService(
                 getLaunchList = { apolloClient.query(LaunchListQuery()).execute() },
diff --git a/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/ApolloClientBuilder.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/ApolloClientBuilder.kt
new file mode 100644
index 00000000..7bb50b3e
--- /dev/null
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/ApolloClientBuilder.kt
@@ -0,0 +1,24 @@
+package foo.bar.example.foreapollo.api
+
+import com.apollographql.apollo.ApolloClient
+import com.apollographql.ktor.ktorClient
+import foo.bar.example.foreapollo.feature.authentication.Authenticator
+
+/**
+ * Most of this will all be specific to your application, when customising for your own case
+ * bare in mind that you should be able to use this class in your tests to mock the server
+ * by passing different interceptors in:
+ *
+ * see @[co.early.fore.net.testhelpers.InterceptorStubbedService]
+ *
+ */
+object ApolloClientBuilder {
+    fun create(authenticator: Authenticator): ApolloClient {
+        return ApolloClient.Builder()
+            .serverUrl("https://apollo-fullstack-tutorial.herokuapp.com/graphql")
+            .ktorClient(KtorClientBuilder.create {
+                addSessionToken(authenticator = authenticator)
+            })
+            .build()
+    }
+}
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomGlobalErrorHandler.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/CustomGlobalErrorHandler.kt
similarity index 67%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomGlobalErrorHandler.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/CustomGlobalErrorHandler.kt
index 1df776ee..4caa58e4 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomGlobalErrorHandler.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/CustomGlobalErrorHandler.kt
@@ -1,16 +1,14 @@
-package foo.bar.example.foreapollo3.api
+package foo.bar.example.foreapollo.api
 
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.net.apollo3.ErrorHandler
-import com.apollographql.apollo3.api.ApolloResponse
-import com.apollographql.apollo3.api.Error
-import com.apollographql.apollo3.exception.ApolloHttpException
-import com.apollographql.apollo3.exception.ApolloNetworkException
-import com.apollographql.apollo3.exception.ApolloParseException
-import com.apollographql.apollo3.exception.JsonEncodingException
-import foo.bar.example.foreapollo3.message.ErrorMessage
-import foo.bar.example.foreapollo3.message.ErrorMessage.*
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.delegate.Fore
+import co.early.fore.net.wrap.apollo.ErrorHandler
+import com.apollographql.apollo.api.ApolloResponse
+import com.apollographql.apollo.exception.ApolloHttpException
+import com.apollographql.apollo.exception.ApolloNetworkException
+import com.apollographql.apollo.exception.JsonEncodingException
+import foo.bar.example.foreapollo.message.ErrorMessage
+import foo.bar.example.foreapollo.message.ErrorMessage.*
 
 /**
  * You can probably use this class almost as it is for your own app, but you might want to
@@ -27,24 +25,25 @@ class CustomGlobalErrorHandler(private val logger: Logger?) :
 
         Fore.getLogger(logger).e("handleError() t:$t errorResponse:$errorResponse")
 
-        val message = parseSpecificError(errorResponse?.errors?.first()) ?: parseGeneralErrors(t)
+        val message = errorResponse?.errors?.firstNotNullOf { it }?.let{
+            parseSpecificError(it)
+        } ?: parseGeneralErrors(t)
 
         Fore.getLogger(logger).e("handleError() returning:$message")
 
         return message
     }
 
-    override fun handlePartialErrors(errors: List<Error?>?): List<ErrorMessage> {
-        return errors?.mapNotNull {
+    override fun handlePartialErrors(errors: List<com.apollographql.apollo.api.Error>): List<ErrorMessage> {
+        return errors.mapNotNull {
             parseSpecificError(it)
-        } ?: emptyList()
+        }
     }
 
     private fun parseGeneralErrors(t: Throwable?): ErrorMessage {
         return t?.let {
             when (it) {
                 is java.lang.IllegalStateException -> ERROR_ALREADY_EXECUTED
-                is ApolloParseException -> ERROR_SERVER
                 is JsonEncodingException -> ERROR_SERVER
                 is ApolloNetworkException -> ERROR_NETWORK
                 is java.net.UnknownServiceException -> ERROR_SECURITY_UNKNOWN
@@ -66,14 +65,14 @@ class CustomGlobalErrorHandler(private val logger: Logger?) :
         } ?: ERROR_MISC
     }
 
-    private fun parseSpecificError(error: Error?): ErrorMessage? {
+    private fun parseSpecificError(error: com.apollographql.apollo.api.Error): ErrorMessage {
         // amazingly GraphQL never had an error code in its standard error
         // block so it usually gets put under the extensions block like this:
         // https://spec.graphql.org/draft/#example-8b658
-        return error?.extensions?.let { extensions ->
+        return error.extensions?.let { extensions ->
             (extensions as? Map<*, *>)?.get("code")?.let { code ->
                 ErrorMessage.createFromName(code as? String)
             }
-        }
+        } ?: ERROR_MISC
     }
 }
diff --git a/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/KtorClientBuilder.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/KtorClientBuilder.kt
new file mode 100644
index 00000000..d507b59d
--- /dev/null
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/KtorClientBuilder.kt
@@ -0,0 +1,78 @@
+package foo.bar.example.foreapollo.api
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.logging.Logger
+import co.early.fore.net.NetworkingLogSanitizer
+import co.early.fore.net.ForeNetworkLogs
+import foo.bar.example.foreapollo.BuildConfig
+import io.ktor.client.*
+import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.DefaultRequest
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import kotlinx.serialization.json.Json
+
+/**
+ * Most of this will all be specific to your application, when customising for your own case
+ * bare in mind that you should also be able to use this class in your tests to mock the server
+ * by passing offline data interceptor plugins in (see unit tests for an example)
+ */
+object KtorClientBuilder {
+
+    /**
+     *
+     * @param configurePluginsBefore ktor plugin configuration block to be run first
+     * NB the logging plugin is usually the last one assuming you want to log what is actually
+     * sent from the device after all the other plugins have run
+     * @return ktor HttpClient object suitable for instantiating service interfaces
+     */
+    fun create(
+        lgr: Logger = Fore.getLogger(),
+        configurePluginsBefore: HttpClientConfig<*>.() -> Unit = {},
+    ): HttpClient {
+
+        return HttpClient(CIO) { // CIO or Darwin etc
+            expectSuccess = true
+
+            configurePluginsBefore(this)
+
+            install(DefaultRequest) {
+                headers.append("User-Agent", "fore-example-user-agent-${BuildConfig.VERSION_NAME}")
+            }
+            install(ContentNegotiation) {
+                Json {
+                    ignoreUnknownKeys = true
+                }
+            }
+            install(ForeNetworkLogs) {
+                // all these are optional, default will suit most requirements
+                logger = lgr
+                curlStyleRequestLogs = true
+                prettifyResponseLogs = true
+                networkingLogSanitizer = object : NetworkingLogSanitizer {
+                    override fun sanitizeHeaders(headers: Set<Map.Entry<String, List<String>>>): Set<Map.Entry<String, List<String>>> {
+                        return headers
+                            .filterNot { header ->
+                                setOf(
+                                    "Authorization",
+                                    "X-Auth-Token",
+                                    "X-Session-Token"
+                                ).any { it.equals(header.key, ignoreCase = true) }
+                            }
+                            .toSet()
+                    }
+
+                    override fun sanitizeBody(text: String): String {
+                        // highly implementation specific, e.g. you might want
+                        // to recursively search through json keys for "id" or whatever
+                        // and redact all the corresponding values etc
+                        return text.replace("secret", "XXXX")
+                    }
+                }
+                filters = listOf { request ->
+                    // don't log any hosts containing notinteresting.com
+                    !request.url.host.contains("notinteresting.com")
+                }
+            }
+        }
+    }
+}
diff --git a/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/PluginSession.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/PluginSession.kt
new file mode 100644
index 00000000..41711b78
--- /dev/null
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/api/PluginSession.kt
@@ -0,0 +1,17 @@
+package foo.bar.example.foreapollo.api
+
+import foo.bar.example.foreapollo.feature.authentication.Authenticator
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.plugins.api.createClientPlugin
+
+fun HttpClientConfig<*>.addSessionToken(authenticator: Authenticator? = null) {
+    install(createClientPlugin("PluginSessionToken") {
+        onRequest { request, _ ->
+            if (authenticator?.hasSessionToken() == true) {
+                request.headers.append("Authorization", authenticator.sessionToken)
+            } else {
+                request.headers.append("Authorization", "expired")
+            }
+        }
+    })
+}
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/Callbacks.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/Callbacks.kt
similarity index 65%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/Callbacks.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/Callbacks.kt
index 89ef7f36..e3491c69 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/Callbacks.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/Callbacks.kt
@@ -1,4 +1,4 @@
-package foo.bar.example.foreapollo3.feature
+package foo.bar.example.foreapollo.feature
 
 typealias SuccessCallback = () -> Unit
 typealias FailureCallback<T> = (T) -> Unit
\ No newline at end of file
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/authentication/Authenticator.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/authentication/Authenticator.kt
similarity index 77%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/authentication/Authenticator.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/authentication/Authenticator.kt
index 844cd284..a7db22f5 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/authentication/Authenticator.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/authentication/Authenticator.kt
@@ -1,18 +1,18 @@
-package foo.bar.example.foreapollo3.feature.authentication
+package foo.bar.example.foreapollo.feature.authentication
 
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.coroutine.awaitMain
-import co.early.fore.kt.core.coroutine.launchIO
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.observer.ObservableImp
-import co.early.fore.kt.core.type.Either.Fail
-import co.early.fore.kt.core.type.Either.Success
-import co.early.fore.kt.net.apollo3.CallWrapperApollo3
-import com.apollographql.apollo3.api.ApolloResponse
-import foo.bar.example.foreapollo3.LoginMutation
-import foo.bar.example.foreapollo3.feature.FailureCallback
-import foo.bar.example.foreapollo3.feature.SuccessCallback
-import foo.bar.example.foreapollo3.message.ErrorMessage
+import co.early.fore.core.coroutine.awaitMain
+import co.early.fore.core.coroutine.launchIO
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.observer.ObservableImp
+import co.early.fore.core.type.Either.Fail
+import co.early.fore.core.type.Either.Success
+import co.early.fore.net.wrap.apollo.CallWrapperApollo
+import com.apollographql.apollo.api.ApolloResponse
+import foo.bar.example.foreapollo.LoginMutation
+import foo.bar.example.foreapollo.feature.FailureCallback
+import foo.bar.example.foreapollo.feature.SuccessCallback
+import foo.bar.example.foreapollo.message.ErrorMessage
 
 data class AuthService(
     val login: suspend (email: String) -> ApolloResponse<LoginMutation.Data>
@@ -23,7 +23,7 @@ data class AuthService(
  */
 class Authenticator(
     private val authService: AuthService,
-    private val callWrapperApollo3: CallWrapperApollo3<ErrorMessage>,
+    private val callWrapperApollo: CallWrapperApollo<ErrorMessage>,
     private val logger: Logger
 ) : Observable by ObservableImp(logger = logger) {
 
@@ -58,7 +58,7 @@ class Authenticator(
 
         launchIO {
 
-            val deferredResult = callWrapperApollo3.processCallAsync {
+            val deferredResult = callWrapperApollo.processCallAsync {
                 authService.login(email)
             }
 
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/launch/DataMapping.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/launch/DataMapping.kt
similarity index 82%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/launch/DataMapping.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/launch/DataMapping.kt
index fe2f9ece..658f2c45 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/launch/DataMapping.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/launch/DataMapping.kt
@@ -1,7 +1,7 @@
-package foo.bar.example.foreapollo3.feature.launch
+package foo.bar.example.foreapollo.feature.launch
 
-import foo.bar.example.foreapollo3.LaunchDetailsQuery
-import foo.bar.example.foreapollo3.LaunchListQuery
+import foo.bar.example.foreapollo.LaunchDetailsQuery
+import foo.bar.example.foreapollo.LaunchListQuery
 
 
 //we don't want the API / graphQL pojo abstractions leaking in to the rest of the app
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/launch/LaunchesModel.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/launch/LaunchesModel.kt
similarity index 86%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/launch/LaunchesModel.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/launch/LaunchesModel.kt
index 88877663..9d9042a8 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/feature/launch/LaunchesModel.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/feature/launch/LaunchesModel.kt
@@ -1,20 +1,20 @@
-package foo.bar.example.foreapollo3.feature.launch
+package foo.bar.example.foreapollo.feature.launch
 
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.coroutine.awaitMain
-import co.early.fore.kt.core.coroutine.launchIO
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.observer.ObservableImp
-import co.early.fore.kt.core.type.Either.Fail
-import co.early.fore.kt.core.type.Either.Success
-import co.early.fore.kt.core.type.carryOn
-import co.early.fore.kt.net.apollo3.CallWrapperApollo3
-import com.apollographql.apollo3.api.ApolloResponse
-import foo.bar.example.foreapollo3.*
-import foo.bar.example.foreapollo3.feature.FailureCallback
-import foo.bar.example.foreapollo3.feature.SuccessCallback
-import foo.bar.example.foreapollo3.feature.authentication.Authenticator
-import foo.bar.example.foreapollo3.message.ErrorMessage
+import co.early.fore.core.coroutine.awaitMain
+import co.early.fore.core.coroutine.launchIO
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.observer.ObservableImp
+import co.early.fore.core.type.Either.Fail
+import co.early.fore.core.type.Either.Success
+import co.early.fore.core.type.carryOn
+import co.early.fore.net.wrap.apollo.WrapperApollo
+import com.apollographql.apollo.api.ApolloResponse
+import foo.bar.example.foreapollo.*
+import foo.bar.example.foreapollo.feature.FailureCallback
+import foo.bar.example.foreapollo.feature.SuccessCallback
+import foo.bar.example.foreapollo.feature.authentication.Authenticator
+import foo.bar.example.foreapollo.message.ErrorMessage
 import java.util.*
 
 data class LaunchService(
@@ -28,7 +28,7 @@ data class LaunchService(
 
 class LaunchesModel(
     private val launchService: LaunchService,
-    private val callWrapper: CallWrapperApollo3<ErrorMessage>,
+    private val callWrapper: WrapperApollo<ErrorMessage>,
     private val authenticator: Authenticator,
     private val logger: Logger
 ) : Observable by ObservableImp(logger = logger) {
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/message/ErrorMessage.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/message/ErrorMessage.kt
similarity index 94%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/message/ErrorMessage.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/message/ErrorMessage.kt
index 3d72a3b4..73cf1121 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/message/ErrorMessage.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/message/ErrorMessage.kt
@@ -1,9 +1,9 @@
-package foo.bar.example.foreapollo3.message
+package foo.bar.example.foreapollo.message
 
 import android.os.Parcel
 import android.os.Parcelable
-import foo.bar.example.foreapollo3.App
-import foo.bar.example.foreapollo3.R
+import foo.bar.example.foreapollo.App
+import foo.bar.example.foreapollo.R
 
 /**
  * As an enum, this value can be passed around the app to indicate various error states.
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/ui/launch/LaunchActivity.kt b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/ui/launch/LaunchActivity.kt
similarity index 81%
rename from app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/ui/launch/LaunchActivity.kt
rename to app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/ui/launch/LaunchActivity.kt
index 268d2b95..d557f34e 100644
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/ui/launch/LaunchActivity.kt
+++ b/app-examples/example-04-apollo/src/main/java/foo/bar/example/foreapollo/ui/launch/LaunchActivity.kt
@@ -1,22 +1,24 @@
-package foo.bar.example.foreapollo3.ui.launch
+package foo.bar.example.foreapollo.ui.launch
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
 import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.ui.LifecycleObserver
-import co.early.fore.kt.core.ui.showOrGone
-import co.early.fore.kt.core.ui.showOrInvisible
+import co.early.fore.core.ui.LifecycleObserver
+import co.early.fore.core.ui.showOrGone
+import co.early.fore.core.ui.showOrInvisible
 import coil.load
-import foo.bar.example.foreapollo3.OG
-import foo.bar.example.foreapollo3.databinding.ActivityLaunchesBinding
-import foo.bar.example.foreapollo3.feature.FailureCallback
-import foo.bar.example.foreapollo3.feature.SuccessCallback
-import foo.bar.example.foreapollo3.feature.authentication.Authenticator
-import foo.bar.example.foreapollo3.feature.launch.LaunchesModel
-import foo.bar.example.foreapollo3.message.ErrorMessage
+import foo.bar.example.foreapollo.OG
+import foo.bar.example.foreapollo.databinding.ActivityLaunchesBinding
+import foo.bar.example.foreapollo.feature.FailureCallback
+import foo.bar.example.foreapollo.feature.SuccessCallback
+import foo.bar.example.foreapollo.feature.authentication.Authenticator
+import foo.bar.example.foreapollo.feature.launch.LaunchesModel
+import foo.bar.example.foreapollo.message.ErrorMessage
 
+@SuppressLint("CustomSplashScreen")
 class LaunchActivity : FragmentActivity(), SyncableView {
 
     //models that we need to sync with
diff --git a/app-examples/example-kt-07apollo3/src/main/res/layout/activity_launches.xml b/app-examples/example-04-apollo/src/main/res/layout/activity_launches.xml
similarity index 100%
rename from app-examples/example-kt-07apollo3/src/main/res/layout/activity_launches.xml
rename to app-examples/example-04-apollo/src/main/res/layout/activity_launches.xml
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-04-apollo/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app-examples/example-04-apollo/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-04-apollo/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app-examples/example-04-apollo/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-04-apollo/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-04-apollo/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-04-apollo/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-04-apollo/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-04-apollo/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-04-apollo/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-04-apollo/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-04-apollo/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-04-apollo/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-04-apollo/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-04-apollo/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-04-apollo/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-04-apollo/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-04-apollo/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-04-apollo/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app-examples/example-04-apollo/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/values/colors.xml b/app-examples/example-04-apollo/src/main/res/values/colors.xml
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/values/colors.xml
rename to app-examples/example-04-apollo/src/main/res/values/colors.xml
diff --git a/app-examples/example-kt-07apollo3/src/main/res/values/strings.xml b/app-examples/example-04-apollo/src/main/res/values/strings.xml
similarity index 100%
rename from app-examples/example-kt-07apollo3/src/main/res/values/strings.xml
rename to app-examples/example-04-apollo/src/main/res/values/strings.xml
diff --git a/app-examples/example-kt-04retrofit/src/main/res/values/styles.xml b/app-examples/example-04-apollo/src/main/res/values/styles.xml
similarity index 100%
rename from app-examples/example-kt-04retrofit/src/main/res/values/styles.xml
rename to app-examples/example-04-apollo/src/main/res/values/styles.xml
diff --git a/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/LaunchFetcherUnitTest.kt b/app-examples/example-04-apollo/src/test/java/foo/bar/example/foreapollo/feature/launch/LaunchFetcherUnitTest.kt
similarity index 88%
rename from app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/LaunchFetcherUnitTest.kt
rename to app-examples/example-04-apollo/src/test/java/foo/bar/example/foreapollo/feature/launch/LaunchFetcherUnitTest.kt
index c4480ca5..d04f8907 100644
--- a/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/LaunchFetcherUnitTest.kt
+++ b/app-examples/example-04-apollo/src/test/java/foo/bar/example/foreapollo/feature/launch/LaunchFetcherUnitTest.kt
@@ -1,15 +1,15 @@
-package foo.bar.example.foreapollo3.feature.launch
+package foo.bar.example.foreapollo.feature.launch
 
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.net.apollo3.CallWrapperApollo3
-import foo.bar.example.foreapollo3.LaunchListQuery
-import foo.bar.example.foreapollo3.feature.FailureCallback
-import foo.bar.example.foreapollo3.feature.SuccessCallback
-import foo.bar.example.foreapollo3.feature.authentication.Authenticator
-import foo.bar.example.foreapollo3.message.ErrorMessage
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import co.early.fore.core.logging.SystemLogger
+import co.early.fore.net.wrap.apollo.CallWrapperApollo
+import foo.bar.example.foreapollo.LaunchListQuery
+import foo.bar.example.foreapollo.feature.FailureCallback
+import foo.bar.example.foreapollo.feature.SuccessCallback
+import foo.bar.example.foreapollo.feature.authentication.Authenticator
+import foo.bar.example.foreapollo.message.ErrorMessage
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
@@ -38,7 +38,7 @@ class LaunchesModelUnitTest {
     private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
 
     @MockK
-    private lateinit var mockCallWrapperApollo: CallWrapperApollo3<ErrorMessage>
+    private lateinit var mockCallWrapperApollo: CallWrapperApollo<ErrorMessage>
 
     @MockK
     private lateinit var mockLaunchService: LaunchService
@@ -89,7 +89,7 @@ class LaunchesModelUnitTest {
 
         //arrange
         val callWrapper =
-            StateBuilder().getLaunchSuccess(mockLaunchesData).mockCallWrapperApollo
+            StateBuilder().getLaunchSuccess(mockLaunchesData).fakeCallWrapperApollo
         val launchesModel = LaunchesModel(
             mockLaunchService,
             callWrapper,
@@ -121,7 +121,7 @@ class LaunchesModelUnitTest {
         //arrange
 
         val callWrapper =
-            StateBuilder().getLaunchFail(ErrorMessage.INTERNAL_SERVER_ERROR).mockCallWrapperApollo
+            StateBuilder().getLaunchFail(ErrorMessage.INTERNAL_SERVER_ERROR).fakeCallWrapperApollo
         val launchesModel = LaunchesModel(
             mockLaunchService,
             callWrapper,
@@ -169,7 +169,7 @@ class LaunchesModelUnitTest {
 
         //arrange
         val callWrapper =
-            StateBuilder().getLaunchSuccess(mockLaunchesData).mockCallWrapperApollo
+            StateBuilder().getLaunchSuccess(mockLaunchesData).fakeCallWrapperApollo
         val launchesModel = LaunchesModel(
             mockLaunchService,
             callWrapper,
diff --git a/app-examples/example-04-apollo/src/test/java/foo/bar/example/foreapollo/feature/launch/StateBuilder.kt b/app-examples/example-04-apollo/src/test/java/foo/bar/example/foreapollo/feature/launch/StateBuilder.kt
new file mode 100644
index 00000000..8684d239
--- /dev/null
+++ b/app-examples/example-04-apollo/src/test/java/foo/bar/example/foreapollo/feature/launch/StateBuilder.kt
@@ -0,0 +1,31 @@
+package foo.bar.example.foreapollo.feature.launch
+
+import co.early.fore.net.wrap.apollo.CallWrapperApollo.SuccessResult
+import co.early.fore.net.wrap.apollo.FakeCallWrapperApollo
+import co.early.fore.net.wrap.toFakeFail
+import co.early.fore.net.wrap.toFakeSuccess
+import foo.bar.example.foreapollo.LaunchListQuery
+import foo.bar.example.foreapollo.message.ErrorMessage
+
+class StateBuilder {
+
+    lateinit var fakeCallWrapperApollo: FakeCallWrapperApollo<ErrorMessage>
+
+    internal fun getLaunchSuccess(launches: LaunchListQuery.Data): StateBuilder {
+
+        fakeCallWrapperApollo = FakeCallWrapperApollo(
+            SuccessResult<LaunchListQuery.Data, ErrorMessage>(launches).toFakeSuccess()
+        )
+
+        return this
+    }
+
+    internal fun getLaunchFail(errorMessage: ErrorMessage): StateBuilder {
+
+        fakeCallWrapperApollo = FakeCallWrapperApollo(
+            errorMessage.toFakeFail()
+        )
+
+        return this
+    }
+}
diff --git a/app-examples/example-jv-06db/build.gradle.kts b/app-examples/example-05-db/build.gradle.kts
similarity index 100%
rename from app-examples/example-jv-06db/build.gradle.kts
rename to app-examples/example-05-db/build.gradle.kts
diff --git a/app-examples/example-jv-06db/screenshot.png b/app-examples/example-05-db/screenshot.png
similarity index 100%
rename from app-examples/example-jv-06db/screenshot.png
rename to app-examples/example-05-db/screenshot.png
diff --git a/app-examples/example-jv-06db/src/main/AndroidManifest.xml b/app-examples/example-05-db/src/main/AndroidManifest.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/AndroidManifest.xml
rename to app-examples/example-05-db/src/main/AndroidManifest.xml
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/App.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/App.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/App.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/App.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/OG.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/OG.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/OG.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/OG.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/CustomGlobalErrorHandler.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/CustomGlobalErrorHandler.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/CustomGlobalErrorHandler.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/CustomGlobalErrorHandler.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/CustomGlobalRequestInterceptor.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/CustomGlobalRequestInterceptor.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/CustomGlobalRequestInterceptor.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/CustomGlobalRequestInterceptor.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/CustomRetrofitBuilder.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/CustomRetrofitBuilder.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/CustomRetrofitBuilder.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/CustomRetrofitBuilder.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/todoitems/TodoItemPojo.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/todoitems/TodoItemPojo.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/todoitems/TodoItemPojo.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/todoitems/TodoItemPojo.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/todoitems/TodoItemService.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/todoitems/TodoItemService.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/api/todoitems/TodoItemService.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/api/todoitems/TodoItemService.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/db/todoitems/RandomTodoCreator.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/db/todoitems/RandomTodoCreator.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/db/todoitems/RandomTodoCreator.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/db/todoitems/RandomTodoCreator.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemDao.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemDao.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemDao.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemDao.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemDatabase.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemDatabase.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemDatabase.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemDatabase.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemEntity.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemEntity.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemEntity.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/db/todoitems/TodoItemEntity.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/feature/bossmode/BossMode.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/feature/bossmode/BossMode.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/feature/bossmode/BossMode.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/feature/bossmode/BossMode.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/feature/remote/RemoteWorker.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/feature/remote/RemoteWorker.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/feature/remote/RemoteWorker.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/feature/remote/RemoteWorker.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/feature/todoitems/TodoItem.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/feature/todoitems/TodoItem.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/feature/todoitems/TodoItem.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/feature/todoitems/TodoItem.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/feature/todoitems/TodoListModel.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/feature/todoitems/TodoListModel.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/feature/todoitems/TodoListModel.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/feature/todoitems/TodoListModel.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/message/UserMessage.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/message/UserMessage.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/message/UserMessage.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/message/UserMessage.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/BaseActivity.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/BaseActivity.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/BaseActivity.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/BaseActivity.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/BaseActivityNavDrawer.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/BaseActivityNavDrawer.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/BaseActivityNavDrawer.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/BaseActivityNavDrawer.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/NavContainer.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/NavContainer.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/NavContainer.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/NavContainer.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/NavHeader.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/NavHeader.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/NavHeader.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/NavHeader.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/common/uiutils/SyncerTextWatcher.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/common/uiutils/SyncerTextWatcher.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/common/uiutils/SyncerTextWatcher.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/common/uiutils/SyncerTextWatcher.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/common/widgets/PercentBar.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/common/widgets/PercentBar.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/common/widgets/PercentBar.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/common/widgets/PercentBar.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListActivity.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListActivity.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListActivity.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListActivity.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListAdapter.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListAdapter.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListAdapter.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListAdapter.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListFragment.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListFragment.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListFragment.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListFragment.java
diff --git a/app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListView.java b/app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListView.java
similarity index 100%
rename from app-examples/example-jv-06db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListView.java
rename to app-examples/example-05-db/src/main/java/foo/bar/example/foredb/ui/todolist/TodoListView.java
diff --git a/app-examples/example-jv-06db/src/main/res/drawable-hdpi/basket.png b/app-examples/example-05-db/src/main/res/drawable-hdpi/basket.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable-hdpi/basket.png
rename to app-examples/example-05-db/src/main/res/drawable-hdpi/basket.png
diff --git a/app-examples/example-jv-06db/src/main/res/drawable-hdpi/basket_menu_icon.png b/app-examples/example-05-db/src/main/res/drawable-hdpi/basket_menu_icon.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable-hdpi/basket_menu_icon.png
rename to app-examples/example-05-db/src/main/res/drawable-hdpi/basket_menu_icon.png
diff --git a/app-examples/example-jv-06db/src/main/res/drawable-hdpi/fruit_menu_icon.png b/app-examples/example-05-db/src/main/res/drawable-hdpi/fruit_menu_icon.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable-hdpi/fruit_menu_icon.png
rename to app-examples/example-05-db/src/main/res/drawable-hdpi/fruit_menu_icon.png
diff --git a/app-examples/example-jv-06db/src/main/res/drawable-hdpi/navigation_badge.xml b/app-examples/example-05-db/src/main/res/drawable-hdpi/navigation_badge.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable-hdpi/navigation_badge.xml
rename to app-examples/example-05-db/src/main/res/drawable-hdpi/navigation_badge.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable-hdpi/navigation_selector.xml b/app-examples/example-05-db/src/main/res/drawable-hdpi/navigation_selector.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable-hdpi/navigation_selector.xml
rename to app-examples/example-05-db/src/main/res/drawable-hdpi/navigation_selector.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable-hdpi/todo_menu_icon.png b/app-examples/example-05-db/src/main/res/drawable-hdpi/todo_menu_icon.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable-hdpi/todo_menu_icon.png
rename to app-examples/example-05-db/src/main/res/drawable-hdpi/todo_menu_icon.png
diff --git a/app-examples/example-jv-06db/src/main/res/drawable-xxhdpi/logo.png b/app-examples/example-05-db/src/main/res/drawable-xxhdpi/logo.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable-xxhdpi/logo.png
rename to app-examples/example-05-db/src/main/res/drawable-xxhdpi/logo.png
diff --git a/app-examples/example-jv-06db/src/main/res/drawable/button_negative_disabled.xml b/app-examples/example-05-db/src/main/res/drawable/button_negative_disabled.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable/button_negative_disabled.xml
rename to app-examples/example-05-db/src/main/res/drawable/button_negative_disabled.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable/button_negative_enabled.xml b/app-examples/example-05-db/src/main/res/drawable/button_negative_enabled.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable/button_negative_enabled.xml
rename to app-examples/example-05-db/src/main/res/drawable/button_negative_enabled.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable/button_negative_selector.xml b/app-examples/example-05-db/src/main/res/drawable/button_negative_selector.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable/button_negative_selector.xml
rename to app-examples/example-05-db/src/main/res/drawable/button_negative_selector.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable/button_positive_disabled.xml b/app-examples/example-05-db/src/main/res/drawable/button_positive_disabled.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable/button_positive_disabled.xml
rename to app-examples/example-05-db/src/main/res/drawable/button_positive_disabled.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable/button_positive_enabled.xml b/app-examples/example-05-db/src/main/res/drawable/button_positive_enabled.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable/button_positive_enabled.xml
rename to app-examples/example-05-db/src/main/res/drawable/button_positive_enabled.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable/button_positive_selector.xml b/app-examples/example-05-db/src/main/res/drawable/button_positive_selector.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable/button_positive_selector.xml
rename to app-examples/example-05-db/src/main/res/drawable/button_positive_selector.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable/nav_bg_bossmode_off.xml b/app-examples/example-05-db/src/main/res/drawable/nav_bg_bossmode_off.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable/nav_bg_bossmode_off.xml
rename to app-examples/example-05-db/src/main/res/drawable/nav_bg_bossmode_off.xml
diff --git a/app-examples/example-jv-06db/src/main/res/drawable/nav_bg_bossmode_on.xml b/app-examples/example-05-db/src/main/res/drawable/nav_bg_bossmode_on.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/drawable/nav_bg_bossmode_on.xml
rename to app-examples/example-05-db/src/main/res/drawable/nav_bg_bossmode_on.xml
diff --git a/app-examples/example-jv-06db/src/main/res/layout/common_activity_base.xml b/app-examples/example-05-db/src/main/res/layout/common_activity_base.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/layout/common_activity_base.xml
rename to app-examples/example-05-db/src/main/res/layout/common_activity_base.xml
diff --git a/app-examples/example-jv-06db/src/main/res/layout/common_content_singlepane.xml b/app-examples/example-05-db/src/main/res/layout/common_content_singlepane.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/layout/common_content_singlepane.xml
rename to app-examples/example-05-db/src/main/res/layout/common_content_singlepane.xml
diff --git a/app-examples/example-jv-06db/src/main/res/layout/common_nav_header.xml b/app-examples/example-05-db/src/main/res/layout/common_nav_header.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/layout/common_nav_header.xml
rename to app-examples/example-05-db/src/main/res/layout/common_nav_header.xml
diff --git a/app-examples/example-jv-06db/src/main/res/layout/design_navigation_menu_item.xml b/app-examples/example-05-db/src/main/res/layout/design_navigation_menu_item.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/layout/design_navigation_menu_item.xml
rename to app-examples/example-05-db/src/main/res/layout/design_navigation_menu_item.xml
diff --git a/app-examples/example-jv-06db/src/main/res/layout/fragment_todolist.xml b/app-examples/example-05-db/src/main/res/layout/fragment_todolist.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/layout/fragment_todolist.xml
rename to app-examples/example-05-db/src/main/res/layout/fragment_todolist.xml
diff --git a/app-examples/example-jv-06db/src/main/res/layout/fragment_todolist_listitem.xml b/app-examples/example-05-db/src/main/res/layout/fragment_todolist_listitem.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/layout/fragment_todolist_listitem.xml
rename to app-examples/example-05-db/src/main/res/layout/fragment_todolist_listitem.xml
diff --git a/app-examples/example-jv-06db/src/main/res/menu/menu_bossmode_off.xml b/app-examples/example-05-db/src/main/res/menu/menu_bossmode_off.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/menu/menu_bossmode_off.xml
rename to app-examples/example-05-db/src/main/res/menu/menu_bossmode_off.xml
diff --git a/app-examples/example-jv-06db/src/main/res/menu/menu_bossmode_on.xml b/app-examples/example-05-db/src/main/res/menu/menu_bossmode_on.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/menu/menu_bossmode_on.xml
rename to app-examples/example-05-db/src/main/res/menu/menu_bossmode_on.xml
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-05-db/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app-examples/example-05-db/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-05-db/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app-examples/example-05-db/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-05-db/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app-examples/example-05-db/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-05-db/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app-examples/example-05-db/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-05-db/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app-examples/example-05-db/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-05-db/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app-examples/example-05-db/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-05-db/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app-examples/example-05-db/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-05-db/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app-examples/example-05-db/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-05-db/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app-examples/example-05-db/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-05-db/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app-examples/example-05-db/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-05-db/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app-examples/example-05-db/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-05-db/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app-examples/example-05-db/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-05-db/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app-examples/example-05-db/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-05-db/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app-examples/example-05-db/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-05-db/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app-examples/example-05-db/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-05-db/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app-examples/example-05-db/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-jv-06db/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-05-db/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app-examples/example-05-db/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-jv-06db/src/main/res/values/colors.xml b/app-examples/example-05-db/src/main/res/values/colors.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/values/colors.xml
rename to app-examples/example-05-db/src/main/res/values/colors.xml
diff --git a/app-examples/example-jv-06db/src/main/res/values/dimens.xml b/app-examples/example-05-db/src/main/res/values/dimens.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/values/dimens.xml
rename to app-examples/example-05-db/src/main/res/values/dimens.xml
diff --git a/app-examples/example-jv-06db/src/main/res/values/strings.xml b/app-examples/example-05-db/src/main/res/values/strings.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/values/strings.xml
rename to app-examples/example-05-db/src/main/res/values/strings.xml
diff --git a/app-examples/example-jv-06db/src/main/res/values/styles.xml b/app-examples/example-05-db/src/main/res/values/styles.xml
similarity index 100%
rename from app-examples/example-jv-06db/src/main/res/values/styles.xml
rename to app-examples/example-05-db/src/main/res/values/styles.xml
diff --git a/app-examples/example-jv-06db/src/test/java/foo/bar/example/foredb/feature/todoitems/TodoItemsModelTest.java b/app-examples/example-05-db/src/test/java/foo/bar/example/foredb/feature/todoitems/TodoItemsModelTest.java
similarity index 100%
rename from app-examples/example-jv-06db/src/test/java/foo/bar/example/foredb/feature/todoitems/TodoItemsModelTest.java
rename to app-examples/example-05-db/src/test/java/foo/bar/example/foredb/feature/todoitems/TodoItemsModelTest.java
diff --git a/app-examples/example-kt-09compose/build.gradle.kts b/app-examples/example-06-compose/build.gradle.kts
similarity index 52%
rename from app-examples/example-kt-09compose/build.gradle.kts
rename to app-examples/example-06-compose/build.gradle.kts
index ddbd190b..fd99649b 100644
--- a/app-examples/example-kt-09compose/build.gradle.kts
+++ b/app-examples/example-06-compose/build.gradle.kts
@@ -2,13 +2,13 @@ import co.early.fore.Shared
 import co.early.fore.Shared.BuildTypes
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    alias(libs.plugins.kotlinSerialization)
-    kotlin("kapt")
+    alias(libs.plugins.androidAppPlugin)
+    alias(libs.plugins.kotlinAndroidPlugin)
+    alias(libs.plugins.composeCompilerPlugin)
+    alias(libs.plugins.kotlinSerializationPlugin)
+    alias(libs.plugins.kotlinKaptPlugin)
 }
 
-
 val appId = "foo.bar.example.forecompose"
 
 fun getTestBuildType(): String {
@@ -19,7 +19,7 @@ println("[$appId testBuildType:${getTestBuildType()}]")
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
     }
 }
 
@@ -32,9 +32,6 @@ android {
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = Shared.Versions.composeCompiler
-    }
 
     defaultConfig {
         applicationId = appId
@@ -74,29 +71,44 @@ android {
 dependencies {
 
     if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android:${Shared.Publish.published_fore_version_for_examples}")
-        implementation("co.early.fore:fore-kt-android-compose:${Shared.Versions.composeCompiler}")
+        implementation(libs.fore.core)
+        implementation(libs.fore.net)
+        implementation(libs.fore.compose)
+        testImplementation(libs.fore.test.fixtures)
     } else {
-        implementation(project(":fore-kt:fore-kt-android"))
-        implementation(project(":fore-kt:fore-kt-android-compose"))
+        implementation(project(":lib:fore-core"))
+        implementation(project(":lib:fore-net"))
+        implementation(project(":lib:fore-compose"))
+        testImplementation(project(":lib:fore-test-fixtures"))
     }
 
     // persistence
-    implementation("co.early.persista:persista:${Shared.Versions.perSista}")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Shared.Versions.kotlinxSerializationJson}")
+    implementation(libs.persista)
+    implementation(libs.kotlinx.serialization)
 
     // compose
-    implementation("androidx.activity:activity-compose:${Shared.Versions.activityCompose}")
-    implementation(platform("androidx.compose:compose-bom:${Shared.Versions.composeBom}"))
-    implementation("androidx.compose.material3:material3")
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.ui:ui-tooling")
-    debugImplementation("androidx.compose.ui:ui-tooling-preview")
-    debugImplementation("androidx.compose.ui:ui-tooling")
-    debugImplementation("androidx.compose.ui:ui-test-manifest")
+
+//    implementation("androidx.compose.ui:ui:1.6.0") // Update to latest
+//    implementation("androidx.compose.runtime:runtime:1.6.0")
+
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.ui.tooling)
+    implementation(libs.androidx.wear.compose.tooling)
+    implementation(libs.androidx.wear.tooling.preview)
+
+    implementation(libs.slf4j.nop) // to get rid of the slf4 warning that comes from ktor
+
+    debugImplementation(libs.androidx.ui.tooling.preview)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+    debugImplementation(libs.androidx.wear.compose.tooling)
+    debugImplementation(libs.androidx.wear.tooling.preview)
 
     //testing
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")
+    testImplementation(libs.junit)
+    testImplementation(libs.mockk)
 }
diff --git a/app-examples/example-kt-09compose/src/main/AndroidManifest.xml b/app-examples/example-06-compose/src/main/AndroidManifest.xml
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/AndroidManifest.xml
rename to app-examples/example-06-compose/src/main/AndroidManifest.xml
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/App.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/App.kt
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/App.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/App.kt
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/OG.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/OG.kt
similarity index 91%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/OG.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/OG.kt
index 6c32b5cf..e8f4b2d8 100644
--- a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/OG.kt
+++ b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/OG.kt
@@ -1,12 +1,11 @@
 package foo.bar.example.forecompose
 
 import android.app.Application
-import co.early.fore.kt.core.delegate.DebugDelegateDefault
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.ui.size.*
+import co.early.fore.core.delegate.DebugDelegateDefault
+import co.early.fore.core.delegate.Fore
 import co.early.persista.PerSista
 import foo.bar.example.forecompose.feature.counter.CounterModel
-import java.util.*
+import okio.Path.Companion.toOkioPath
 
 /**
  * Copyright © 2015-2023 early.co. All rights reserved.
@@ -26,7 +25,7 @@ object OG {
         val logger = Fore.getLogger()
 
         val perSista = PerSista(
-            dataDirectory = application.filesDir,
+            dataPath = application.filesDir.toOkioPath(),
             logger = logger,
         )
 
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/feature/counter/CounterModel.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/feature/counter/CounterModel.kt
similarity index 91%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/feature/counter/CounterModel.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/feature/counter/CounterModel.kt
index 5cacd56f..4e521a5f 100644
--- a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/feature/counter/CounterModel.kt
+++ b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/feature/counter/CounterModel.kt
@@ -1,9 +1,9 @@
 package foo.bar.example.forecompose.feature.counter
 
-import co.early.fore.kt.core.logging.Logger
+import co.early.fore.core.logging.Logger
 import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.coroutine.launchIO
-import co.early.fore.kt.core.observer.ObservableImp
+import co.early.fore.core.coroutine.launchIO
+import co.early.fore.core.observer.ObservableImp
 import co.early.persista.PerSista
 import kotlinx.coroutines.delay
 
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/feature/counter/CounterState.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/feature/counter/CounterState.kt
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/feature/counter/CounterState.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/feature/counter/CounterState.kt
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/MainActivity.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/MainActivity.kt
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/MainActivity.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/MainActivity.kt
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/screens/common/LabelFormatting.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/common/LabelFormatting.kt
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/screens/common/LabelFormatting.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/common/LabelFormatting.kt
diff --git a/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/common/StateView.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/common/StateView.kt
new file mode 100644
index 00000000..b14e2166
--- /dev/null
+++ b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/common/StateView.kt
@@ -0,0 +1,134 @@
+package foo.bar.example.forecompose.ui.screens.common
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.sp
+import co.early.fore.ui.size.WidthBasedTextUnit
+import co.early.fore.ui.size.WindowSize
+import foo.bar.example.forecompose.ui.screens.home.DisplayToggleView
+
+
+/**
+ * This is mainly to demonstrate that [ObservableGroup.observeAsState()] works as intended,
+ * as the app is backgrounded or the composable is hidden, the logs show the fore
+ * observer being added / removed as appropriate. See the observeAsState code comments for a
+ * full explanation
+ */
+@Composable
+fun ShowHideWrapper(state: Any, size: WindowSize, content: @Composable () -> Unit) {
+
+    val show = remember { mutableStateOf(true) }
+    val btnColor by animateColorAsState(
+        targetValue = if (show.value) Color.Red else Color.Green,
+        animationSpec = tween(durationMillis = 500),
+    )
+
+    AnimatedVisibility(
+        visible = show.value,
+        enter = slideInVertically(initialOffsetY = { it / 2 }) + fadeIn(),
+        exit = slideOutVertically(targetOffsetY = { it / 2 }) + fadeOut(),
+    ) {
+        content()
+    }
+
+    val stateFontSize = WidthBasedTextUnit(
+        xs = 12.sp,
+        m = 20.sp,
+        l = 35.sp
+    )
+
+    val stateAsString = state.prettyPrint()
+
+    AnimatedVisibility(
+        visible = !show.value,
+        enter = fadeIn(),
+        exit = fadeOut(),
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState()),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Text(
+                text = stateAsString,
+                style = TextStyle(fontSize = stateFontSize(size))
+            )
+        }
+    }
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+    ) {
+        DisplayToggleView(
+            size = size,
+            displayed = show.value,
+            btnColor = btnColor,
+            toggleDisplayCallback = { show.value = !show.value },
+        )
+    }
+}
+
+// https://gist.github.com/Mayankmkh/92084bdf2b59288d3e74c3735cccbf9f
+fun Any.prettyPrint(): String {
+
+    var indentLevel = 0
+    val indentWidth = 4
+
+    fun padding() = "".padStart(indentLevel * indentWidth)
+
+    val toString = toString()//.replace("foo.bar.clean.domain.features.", "")
+
+    val stringBuilder = StringBuilder(toString.length)
+
+    var i = 0
+    while (i < toString.length) {
+        when (val char = toString[i]) {
+            '(', '[', '{' -> {
+                indentLevel++
+                stringBuilder.appendLine(char).append(padding())
+            }
+
+            ')', ']', '}' -> {
+                indentLevel--
+                stringBuilder.appendLine().append(padding()).append(char)
+            }
+
+            ',' -> {
+                stringBuilder.appendLine(char).append(padding())
+                // ignore space after comma as we have added a newline
+                val nextChar = toString.getOrElse(i + 1) { char }
+                if (nextChar == ' ') i++
+            }
+
+            else -> {
+                stringBuilder.append(char)
+            }
+        }
+        i++
+    }
+
+    return stringBuilder.toString().replace("=", " = ")
+}
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/screens/home/HomeScreen.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/home/HomeScreen.kt
similarity index 86%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/screens/home/HomeScreen.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/home/HomeScreen.kt
index a325873e..d1dc0152 100644
--- a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/screens/home/HomeScreen.kt
+++ b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/home/HomeScreen.kt
@@ -22,12 +22,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.*
 import co.early.fore.compose.observeAsState
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.Fore
 import co.early.fore.ui.size.*
 import foo.bar.example.forecompose.OG
 import foo.bar.example.forecompose.R
 import foo.bar.example.forecompose.feature.counter.CounterModel
 import foo.bar.example.forecompose.feature.counter.CounterState
+import foo.bar.example.forecompose.ui.screens.common.ShowHideWrapper
 import foo.bar.example.forecompose.ui.screens.common.toLabel
 
 @Composable
@@ -38,10 +39,9 @@ fun HomeScreen(
 
     Fore.getLogger().i("HomeScreen $size")
 
-    showHideWrapper(size) {
-
-        val counterState by counterModel.observeAsState("FOO") { counterModel.state }
+    val counterState by counterModel.observeAsState("FOO") { counterModel.state }
 
+    ShowHideWrapper(counterState, size) {
         HomeView(
             size = size,
             counterState = counterState,
@@ -268,39 +268,3 @@ fun BoxScope.MiniDiagnostics(size: WindowSize) {
         style = TextStyle(color = Color.Blue, fontSize = diagnosticsFontSize)
     )
 }
-
-/**
- * This is mainly to demonstrate that [ObservableGroup.observeAsState()] works as intended,
- * as the app is backgrounded or the composable is hidden, the logs show the fore
- * observer being added / removed as appropriate. See the observeAsState code comments for a
- * full explanation
- */
-@Composable
-fun showHideWrapper(size: WindowSize, content: @Composable () -> Unit) {
-
-    val show = remember { mutableStateOf(true) }
-    val btnColor by animateColorAsState(
-        targetValue = if (show.value) Color.Red else Color.Green,
-        animationSpec = tween(durationMillis = 500),
-    )
-
-    AnimatedVisibility(
-        visible = show.value,
-        enter = slideInVertically(initialOffsetY = { it / 2 }) + fadeIn(),
-        exit = slideOutVertically(targetOffsetY = { it / 2 }) + fadeOut(),
-    ) {
-        content()
-    }
-
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-    ) {
-        DisplayToggleView(
-            size = size,
-            displayed = show.value,
-            btnColor = btnColor,
-            toggleDisplayCallback = { show.value = !show.value },
-        )
-    }
-}
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/screens/home/Previews.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/home/Previews.kt
similarity index 66%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/screens/home/Previews.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/home/Previews.kt
index 4c3d1f00..8ce634b6 100644
--- a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/screens/home/Previews.kt
+++ b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/screens/home/Previews.kt
@@ -1,17 +1,40 @@
 package foo.bar.example.forecompose.ui.screens.home
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpSize
-import co.early.fore.ui.size.*
+import androidx.wear.tooling.preview.devices.WearDevices
+import co.early.fore.ui.size.WindowSize
+import co.early.fore.ui.size.hL_high
+import co.early.fore.ui.size.hL_low
+import co.early.fore.ui.size.hM_high
+import co.early.fore.ui.size.hM_low
+import co.early.fore.ui.size.hS_high
+import co.early.fore.ui.size.hS_low
+import co.early.fore.ui.size.hXL_high
+import co.early.fore.ui.size.hXL_low
+import co.early.fore.ui.size.hXS_high
+import co.early.fore.ui.size.hXS_low
+import co.early.fore.ui.size.toWindowSize
+import co.early.fore.ui.size.wL_high
+import co.early.fore.ui.size.wL_low
+import co.early.fore.ui.size.wM_high
+import co.early.fore.ui.size.wM_low
+import co.early.fore.ui.size.wS_high
+import co.early.fore.ui.size.wS_low
+import co.early.fore.ui.size.wXL_high
+import co.early.fore.ui.size.wXL_low
+import co.early.fore.ui.size.wXS_high
+import co.early.fore.ui.size.wXS_low
 import foo.bar.example.forecompose.feature.counter.CounterState
 import foo.bar.example.forecompose.ui.theme.ComposeTheme
 
+@SuppressLint("UnusedBoxWithConstraintsScope")
 @Composable
 fun PreviewWithWindowSize(isRound: Boolean = false, content: @Composable (size: WindowSize) -> Unit) {
     ComposeTheme {
@@ -44,7 +67,7 @@ fun MyPreviews() {
     }
 }
 
-@Preview(showBackground = true, device = Devices.WEAR_OS_LARGE_ROUND)
+@Preview(showBackground = true, device = WearDevices.LARGE_ROUND)
 @Composable
 fun MyRoundPreview() {
     PreviewWithWindowSize(isRound = true) {
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/theme/Color.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/theme/Color.kt
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/theme/Color.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/theme/Color.kt
diff --git a/app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/theme/Theme.kt b/app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/theme/Theme.kt
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/java/foo/bar/example/forecompose/ui/theme/Theme.kt
rename to app-examples/example-06-compose/src/main/kotlin/foo/bar/example/forecompose/ui/theme/Theme.kt
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-06-compose/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app-examples/example-06-compose/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-06-compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app-examples/example-06-compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-06-compose/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app-examples/example-06-compose/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-06-compose/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app-examples/example-06-compose/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-06-compose/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app-examples/example-06-compose/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-06-compose/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app-examples/example-06-compose/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-06-compose/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app-examples/example-06-compose/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-06-compose/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app-examples/example-06-compose/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-06-compose/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-06-compose/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-06-compose/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-06-compose/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-06-compose/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-06-compose/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-06-compose/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-06-compose/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-06-compose/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from app-examples/example-kt-01reactiveui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app-examples/example-06-compose/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app-examples/example-kt-09compose/src/main/res/values/strings.xml b/app-examples/example-06-compose/src/main/res/values/strings.xml
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/res/values/strings.xml
rename to app-examples/example-06-compose/src/main/res/values/strings.xml
diff --git a/app-examples/example-kt-09compose/src/main/res/values/themes.xml b/app-examples/example-06-compose/src/main/res/values/themes.xml
similarity index 100%
rename from app-examples/example-kt-09compose/src/main/res/values/themes.xml
rename to app-examples/example-06-compose/src/main/res/values/themes.xml
diff --git a/app-examples/example-kt-09compose/src/test/java/foo/bar/example/forecompose/feature/counter/CounterModelTest.kt b/app-examples/example-06-compose/src/test/kotlin/foo/bar/example/forecompose/feature/counter/CounterModelTest.kt
similarity index 93%
rename from app-examples/example-kt-09compose/src/test/java/foo/bar/example/forecompose/feature/counter/CounterModelTest.kt
rename to app-examples/example-06-compose/src/test/kotlin/foo/bar/example/forecompose/feature/counter/CounterModelTest.kt
index e292abd5..289955b7 100644
--- a/app-examples/example-kt-09compose/src/test/java/foo/bar/example/forecompose/feature/counter/CounterModelTest.kt
+++ b/app-examples/example-06-compose/src/test/kotlin/foo/bar/example/forecompose/feature/counter/CounterModelTest.kt
@@ -1,16 +1,17 @@
 package foo.bar.example.forecompose.feature.counter
 
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.logging.SystemLogger
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.logging.SystemLogger
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import co.early.fore.core.delegate.Fore
 import co.early.persista.PerSista
 import io.mockk.MockKAnnotations
 import io.mockk.impl.annotations.MockK
 import io.mockk.verify
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.asCoroutineDispatcher
+import okio.Path.Companion.toOkioPath
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -159,10 +160,10 @@ class CounterModelTest {
         dataFolder.create()
         return CounterModel(
             PerSista(
-                dataDirectory = dataFolder.newFolder(),
+                dataPath = dataFolder.newFolder().toOkioPath(),
                 mainDispatcher = testDispatcher,
                 writeReadDispatcher = testDispatcher,
-                logger = Fore.getLogger()
+                logger = Fore.getLogger(),
             ),
             Fore.getLogger(),
         )
diff --git a/app-examples/example-07-kmp/.gitignore b/app-examples/example-07-kmp/.gitignore
new file mode 100644
index 00000000..e510fa99
--- /dev/null
+++ b/app-examples/example-07-kmp/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+.idea
+.DS_Store
+build
+captures
+.externalNativeBuild
+.cxx
+local.properties
+xcuserdata
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/androidApp/build.gradle.kts b/app-examples/example-07-kmp/androidApp/build.gradle.kts
new file mode 100644
index 00000000..49805197
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/build.gradle.kts
@@ -0,0 +1,50 @@
+plugins {
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.kotlinKaptPlugin)
+    alias(libs.plugins.kotlinSerializationPlugin)
+}
+
+android {
+    namespace = "com.kmpfoo.android"
+    compileSdk = 35
+    defaultConfig {
+        applicationId = "com.kmpfoo.android"
+        minSdk = 21
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
+    }
+    buildFeatures {
+        compose = true
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(projects.shared)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.tooling.preview)
+    implementation(libs.compose.material3)
+    implementation(libs.androidx.activity.compose)
+    debugImplementation(libs.compose.ui.tooling)
+    debugImplementation(libs.androidx.wear.compose.tooling)
+    debugImplementation(libs.androidx.wear.tooling.preview)
+}
\ No newline at end of file
diff --git a/app-examples/example-kt-02coroutine/src/main/AndroidManifest.xml b/app-examples/example-07-kmp/androidApp/src/main/AndroidManifest.xml
similarity index 63%
rename from app-examples/example-kt-02coroutine/src/main/AndroidManifest.xml
rename to app-examples/example-07-kmp/androidApp/src/main/AndroidManifest.xml
index d3214061..e9e186f9 100644
--- a/app-examples/example-kt-02coroutine/src/main/AndroidManifest.xml
+++ b/app-examples/example-07-kmp/androidApp/src/main/AndroidManifest.xml
@@ -2,19 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:name=".App"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:allowBackup="false"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.CounterActivity" android:exported="true">
+        android:name=".App"
+        android:theme="@style/Theme.AppTheme">
+        <activity
+            android:name=".ui.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-
-</manifest>
+</manifest> 
\ No newline at end of file
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/App.kt b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/App.kt
similarity index 75%
rename from app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/App.kt
rename to app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/App.kt
index c4bd32c3..bdb940e0 100644
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/App.kt
+++ b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/App.kt
@@ -1,10 +1,9 @@
-package foo.bar.example.foreretrofitkt
-
+package com.kmpfoo.android
 
 import android.app.Application
 
 /**
- * Copyright © 2019 early.co. All rights reserved.
+ * Copyright © 2015-2021 early.co. All rights reserved.
  */
 class App : Application() {
 
diff --git a/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/OG.kt b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/OG.kt
new file mode 100644
index 00000000..1caaa9f8
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/OG.kt
@@ -0,0 +1,88 @@
+package com.kmpfoo.android
+
+import android.app.Application
+import android.content.pm.ApplicationInfo
+import co.early.fore.core.delegate.DebugDelegateDefault
+import co.early.fore.core.delegate.Fore
+import co.early.persista.PerSista
+import com.kmpfoo.feature.counter.CounterModel
+import okio.Path.Companion.toOkioPath
+import kotlin.reflect.KClass
+
+/**
+ * Copyright © 2015-2023 early.co. All rights reserved.
+ */
+@Suppress("UNUSED_PARAMETER")
+object OG {
+
+    private var initialized = false
+    private val dependencies = HashMap<KClass<*>, Any>()
+
+    fun setApplication(application: Application) {
+
+        val isDebug = application.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
+
+        // create dependency graph
+        if (isDebug) {
+            Fore.setDelegate(DebugDelegateDefault("foo_"))
+        }
+        val logger = Fore.getLogger()
+
+        val perSista = PerSista(
+            dataPath = application.filesDir.toOkioPath(),
+            logger = logger,
+        )
+
+        val counterModel = CounterModel(
+            perSista = perSista,
+            logger = logger,
+        )
+
+        // add models to the dependencies map if you will need them later
+        dependencies[CounterModel::class] = counterModel
+    }
+
+    fun init() {
+        if (!initialized) {
+            initialized = true
+
+            // run any necessary initialization code once object graph has been created here
+
+//            // just in case you need to, but defaults are recommended
+//            ForeSize.overrideBreakPoints(
+//                ViewPortBreakPoints(
+//                    widthSDpBelow = 400.dp,
+//                    widthMDpBelow = 500.dp,
+//                )
+//            )
+
+        }
+    }
+
+    /**
+     * This is how dependencies get injected, typically an Activity/Fragment/View will call this
+     * during the onCreate()/onCreateView()/onFinishInflate() method respectively for each of the
+     * dependencies it needs.
+     *
+     * Can use a DI library for similar behaviour using annotations
+     *
+     * Will return mocks if they have been set previously in putMock()
+     *
+     *
+     * Call it like this:
+     *
+     * <code>
+     *     yourModel = OG[YourModel::class.java]
+     * </code>
+     *
+     * If you want to more tightly scoped object, one way is to pass a factory class here and create
+     * an instance where you need it
+     *
+     */
+    @Suppress("UNCHECKED_CAST")
+    operator fun <T : Any> get(model: KClass<T>): T = dependencies[model] as T
+
+    fun <T : Any> putMock(clazz: KClass<T>, instance: T) {
+        dependencies[clazz] = instance as Any
+    }
+}
diff --git a/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/MainActivity.kt b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/MainActivity.kt
new file mode 100644
index 00000000..82e2f183
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/MainActivity.kt
@@ -0,0 +1,25 @@
+package com.kmpfoo.android.ui
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Surface
+import androidx.compose.ui.Modifier
+import co.early.fore.ui.size.rememberWindowSize
+import com.kmpfoo.android.ui.screens.home.HomeScreen
+import com.kmpfoo.android.ui.theme.ComposeTheme
+
+class MainActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            ComposeTheme {
+                Surface( modifier = Modifier.fillMaxSize()) {
+                    HomeScreen(rememberWindowSize())
+                }
+            }
+        }
+    }
+}
diff --git a/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/common/LabelFormatting.kt b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/common/LabelFormatting.kt
new file mode 100644
index 00000000..75a290fd
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/common/LabelFormatting.kt
@@ -0,0 +1,51 @@
+package com.kmpfoo.android.ui.screens.common
+
+import co.early.fore.ui.size.*
+
+fun Width.toLabel(extended: Boolean = false): String {
+    return when(this){
+        Width.XSmall -> if (extended) { "Width:XSmall" } else "W:XS"
+        Width.Small -> if (extended) { "Width:Small" } else "W:S"
+        Width.Medium -> if (extended) { "Width:Medium" } else "W:M"
+        Width.Large -> if (extended) { "Width:Large" } else "W:L"
+        Width.XLarge -> if (extended) { "Width:XLarge" } else "W:XL"
+    }
+}
+
+fun Height.toLabel(extended: Boolean = false): String {
+    return when(this){
+        Height.XSmall -> if (extended) { "Height:XSmall" } else "H:XS"
+        Height.Small -> if (extended) { "Height:Small" } else "H:S"
+        Height.Medium -> if (extended) { "Height:Medium" } else "H:M"
+        Height.Large -> if (extended) { "Height:Large" } else "H:L"
+        Height.XLarge -> if (extended) { "Height:XLarge" } else "H:XL"
+    }
+}
+
+fun MinDim.toLabel(extended: Boolean = false): String {
+    return when(this){
+        MinDim.XSmall -> if (extended) { "MinDim:XSmall" } else "M:XS"
+        MinDim.Small -> if (extended) { "MinDim:Small" } else "M:S"
+        MinDim.Medium -> if (extended) { "MinDim:Medium" } else "M:M"
+        MinDim.Large -> if (extended) { "MinDim:Large" } else "M:L"
+        MinDim.XLarge -> if (extended) { "MinDim:XLarge" } else "M:XL"
+    }
+}
+
+fun Aspect.toLabel(extended: Boolean = false): String {
+    return when(this){
+        Aspect.Port -> if (extended) { "Aspect:Port" } else "A:P"
+        Aspect.Land -> if (extended) { "Aspect:Land" } else "A:L"
+        Aspect.Squarish -> if (extended) { "Aspect:Squarish" } else "A:S"
+    }
+}
+
+fun WindowSize.toLabel(extended: Boolean = false, multipleLines: Boolean = false): String {
+    return  "${dpSize.width}:${dpSize.height}|" +
+            (if (multipleLines) "\n" else "") +
+            "${width.toLabel(extended)}|" +
+            "${height.toLabel(extended)}|" +
+            (if (multipleLines) "\n" else "") +
+            "${minDim.toLabel(extended)}|" +
+            aspect.toLabel(extended)
+}
diff --git a/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/home/HomeScreen.kt b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/home/HomeScreen.kt
new file mode 100644
index 00000000..e74b3587
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/home/HomeScreen.kt
@@ -0,0 +1,375 @@
+package com.kmpfoo.android.ui.screens.home
+
+import androidx.annotation.StringRes
+import androidx.compose.animation.*
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.*
+import co.early.fore.compose.observeAsState
+import co.early.fore.core.delegate.Fore
+import co.early.fore.ui.size.*
+import com.kmpfoo.android.OG
+import com.kmpfoo.android.R
+import com.kmpfoo.feature.counter.CounterModel
+import com.kmpfoo.feature.counter.CounterState
+import com.kmpfoo.android.ui.screens.common.toLabel
+
+@Composable
+fun HomeScreen(
+    size: WindowSize = WindowSize(),
+    counterModel: CounterModel = OG[CounterModel::class],
+) {
+
+    Fore.getLogger().i("HomeScreen $size")
+
+    val counterState by counterModel.observeAsState("FOO") { counterModel.state }
+
+    ShowHideWrapper(counterState, size) {
+
+        HomeView(
+            size = size,
+            counterState = counterState,
+            increaseCallback = { counterModel.increase() },
+            decreaseCallback = { counterModel.decrease() },
+        )
+    }
+}
+
+@Composable
+fun HomeView(
+    size: WindowSize,
+    counterState: CounterState,
+    increaseCallback: () -> Unit = {},
+    decreaseCallback: () -> Unit = {},
+) {
+
+    Fore.getLogger().i("HomeView")
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        CounterView(
+            size = size,
+            counterState = counterState,
+            increaseCallback = { increaseCallback() },
+            decreaseCallback = { decreaseCallback() },
+        )
+    }
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+    ) {
+        DiagnosticInfo(size)
+    }
+}
+
+@OptIn(ExperimentalAnimationApi::class)
+@Composable
+fun CounterView(
+    size: WindowSize,
+    counterState: CounterState,
+    increaseCallback: () -> Unit,
+    decreaseCallback: () -> Unit,
+) {
+
+    Fore.getLogger().i("CounterView")
+
+    val minimumDimension = size.dpSize.minimumDimension()
+    val borderThickness = minimumDimension * 0.1f
+    val boxHeight = minimumDimension * 0.5f
+    val numberFontSize = (minimumDimension / 5f).value.sp
+    val buttonFontSize = (minimumDimension / 8f).value.sp
+    val buttonSize = max(borderThickness * 3, 50.dp)
+    val color = WidthBasedValue(
+        xs = Color.Red,
+        s = Color.Green,
+        m = Color.Blue,
+        l = Color.Magenta,
+        xl = Color.Gray
+    )
+    val shape = AspectBasedValue(
+        port = CircleShape,
+        land = CircleShape,
+        squarish = RectangleShape
+    )
+
+    Box(
+        modifier = Modifier
+            .fillMaxWidth(0.9f)
+            .height(boxHeight)
+    ) {
+
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(start = borderThickness, end = borderThickness)
+                .border(width = borderThickness, color = color(size), shape = shape(size)),
+        )
+
+        Box(modifier = Modifier.fillMaxSize()) {
+
+            CustomButton(
+                Modifier.align(Alignment.CenterStart),
+                R.string.decrease,
+                counterState.canDecrease(),
+                buttonSize,
+                buttonFontSize,
+                decreaseCallback,
+            )
+
+            if (counterState.loading) {
+                CircularProgressIndicator(
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .size(borderThickness),
+                )
+            } else {
+                Text(
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .padding(borderThickness / 2),
+                    text = counterState.amount.toString(),
+                    style = TextStyle(fontSize = numberFontSize)
+                )
+            }
+
+            CustomButton(
+                Modifier.align(Alignment.CenterEnd),
+                R.string.increase,
+                counterState.canIncrease(),
+                buttonSize,
+                buttonFontSize,
+                increaseCallback,
+            )
+        }
+    }
+}
+
+@Composable
+fun CustomButton(
+    modifier: Modifier = Modifier,
+    @StringRes labelResId: Int,
+    enabled: Boolean,
+    buttonSize: Dp,
+    buttonFontSize: TextUnit,
+    callback: () -> Unit,
+) {
+
+    Fore.getLogger().i("CustomButton")
+
+    Button(
+        modifier = modifier.size(buttonSize),
+        onClick = { callback() },
+        enabled = enabled
+    ) {
+        Text(
+            text = stringResource(id = labelResId),
+            style = TextStyle(fontSize = buttonFontSize)
+        )
+    }
+}
+
+@Composable
+fun BoxScope.DisplayToggleView(
+    size: WindowSize,
+    btnColor: Color,
+    displayed: Boolean,
+    toggleDisplayCallback: () -> Unit,
+) {
+
+    Fore.getLogger().i("DisplayToggleView")
+
+    val minimumDimension = size.dpSize.minimumDimension()
+    val toggleBtnFontSize = (minimumDimension / 30f).value.sp
+    val label = stringResource(id = if (displayed) R.string.hide else R.string.show)
+    val alignment = if (size.isRound) Alignment.TopCenter else Alignment.TopEnd
+
+    Button(
+        modifier = Modifier.align(alignment),
+        colors = ButtonDefaults.textButtonColors(contentColor = btnColor),
+        onClick = { toggleDisplayCallback() },
+        shape = ButtonDefaults.textShape,
+    ) {
+        Text(
+            text = label,
+            style = TextStyle(fontSize = toggleBtnFontSize),
+        )
+    }
+}
+
+@Composable
+fun BoxScope.DiagnosticInfo(size: WindowSize) {
+    // Note: you don't really need two different composables here
+    // as they are so similar, this code serves as the "adaptive"
+    // vs "responsive" example. In this case "adaptive" meaning to
+    // display a completely different UI based on the size class
+    // see: https://dev.to/erdo/jetpack-compose-and-windowsize-classes-gb4
+    WidthBasedComposable(
+        xs = { sz -> MiniDiagnostics(sz) },
+        m = { sz -> MiniDiagnostics(sz) },
+        l = { sz -> RegularDiagnostics(sz) },
+    )(size)
+}
+
+@Composable
+fun BoxScope.RegularDiagnostics(size: WindowSize) {
+
+    Fore.getLogger().i("RegularDiagnostics ${size.toLabel()}")
+
+    val diagnosticsFontSize = (size.dpSize.width / 60f).value.sp
+    val alignment = if (size.isRound) Alignment.BottomCenter else Alignment.BottomStart
+    val diagnosticText = size.toLabel(extended = true, multipleLines = size.isRound)
+
+    Text(
+        modifier = Modifier
+            .align(alignment)
+            .padding(start = 10.dp, end = 10.dp)
+            .background(color = Color.Yellow),
+        text = diagnosticText,
+        style = TextStyle(color = Color.Red, fontSize = diagnosticsFontSize)
+    )
+}
+
+@Composable
+fun BoxScope.MiniDiagnostics(size: WindowSize) {
+
+    Fore.getLogger().i("MiniDiagnostics ${size.toLabel()}")
+
+    val diagnosticsFontSize = (size.dpSize.width / 30f).value.sp
+    val alignment = if (size.isRound) Alignment.BottomCenter else Alignment.BottomStart
+    val diagnosticText = size.toLabel(multipleLines = size.isRound)
+
+    Text(
+        modifier = Modifier
+            .align(alignment)
+            .padding(start = 10.dp, end = 10.dp)
+            .background(color = Color.Yellow),
+        text = diagnosticText,
+        style = TextStyle(color = Color.Blue, fontSize = diagnosticsFontSize)
+    )
+}
+
+/**
+ * This is mainly to demonstrate that [ObservableGroup.observeAsState()] works as intended,
+ * as the app is backgrounded or the composable is hidden, the logs show the fore
+ * observer being added / removed as appropriate. See the observeAsState code comments for a
+ * full explanation
+ */
+@Composable
+fun ShowHideWrapper(state: Any, size: WindowSize, content: @Composable () -> Unit) {
+
+    val show = remember { mutableStateOf(true) }
+    val btnColor by animateColorAsState(
+        targetValue = if (show.value) Color.Red else Color.Green,
+        animationSpec = tween(durationMillis = 500),
+    )
+
+    AnimatedVisibility(
+        visible = show.value,
+        enter = slideInVertically(initialOffsetY = { it / 2 }) + fadeIn(),
+        exit = slideOutVertically(targetOffsetY = { it / 2 }) + fadeOut(),
+    ) {
+        content()
+    }
+
+    val stateFontSize = WidthBasedTextUnit(
+        xs = 12.sp,
+        m = 20.sp,
+        l = 35.sp
+    )
+
+    val stateAsString = state.prettyPrint()
+
+    AnimatedVisibility(
+        visible = !show.value,
+        enter = fadeIn(),
+        exit = fadeOut(),
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState()),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Text(
+                text = stateAsString,
+                style = TextStyle(fontSize = stateFontSize(size))
+            )
+        }
+    }
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+    ) {
+        DisplayToggleView(
+            size = size,
+            displayed = show.value,
+            btnColor = btnColor,
+            toggleDisplayCallback = { show.value = !show.value },
+        )
+    }
+}
+
+// https://gist.github.com/Mayankmkh/92084bdf2b59288d3e74c3735cccbf9f
+fun Any.prettyPrint(): String {
+
+    var indentLevel = 0
+    val indentWidth = 4
+
+    fun padding() = "".padStart(indentLevel * indentWidth)
+
+    val toString = toString()//.replace("foo.bar.clean.domain.features.", "")
+
+    val stringBuilder = StringBuilder(toString.length)
+
+    var i = 0
+    while (i < toString.length) {
+        when (val char = toString[i]) {
+            '(', '[', '{' -> {
+                indentLevel++
+                stringBuilder.appendLine(char).append(padding())
+            }
+
+            ')', ']', '}' -> {
+                indentLevel--
+                stringBuilder.appendLine().append(padding()).append(char)
+            }
+
+            ',' -> {
+                stringBuilder.appendLine(char).append(padding())
+                // ignore space after comma as we have added a newline
+                val nextChar = toString.getOrElse(i + 1) { char }
+                if (nextChar == ' ') i++
+            }
+
+            else -> {
+                stringBuilder.append(char)
+            }
+        }
+        i++
+    }
+
+    return stringBuilder.toString().replace("=", " = ")
+}
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/home/Previews.kt b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/home/Previews.kt
new file mode 100644
index 00000000..63e3ed02
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/screens/home/Previews.kt
@@ -0,0 +1,76 @@
+package com.kmpfoo.android.ui.screens.home
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.DpSize
+import androidx.wear.tooling.preview.devices.WearDevices
+import co.early.fore.ui.size.WindowSize
+import co.early.fore.ui.size.hL_high
+import co.early.fore.ui.size.hL_low
+import co.early.fore.ui.size.hM_high
+import co.early.fore.ui.size.hM_low
+import co.early.fore.ui.size.hS_high
+import co.early.fore.ui.size.hS_low
+import co.early.fore.ui.size.hXL_high
+import co.early.fore.ui.size.hXL_low
+import co.early.fore.ui.size.hXS_high
+import co.early.fore.ui.size.hXS_low
+import co.early.fore.ui.size.toWindowSize
+import co.early.fore.ui.size.wL_high
+import co.early.fore.ui.size.wL_low
+import co.early.fore.ui.size.wM_high
+import co.early.fore.ui.size.wM_low
+import co.early.fore.ui.size.wS_high
+import co.early.fore.ui.size.wS_low
+import co.early.fore.ui.size.wXL_high
+import co.early.fore.ui.size.wXL_low
+import co.early.fore.ui.size.wXS_high
+import co.early.fore.ui.size.wXS_low
+import com.kmpfoo.feature.counter.CounterState
+import com.kmpfoo.android.ui.theme.ComposeTheme
+
+@SuppressLint("UnusedBoxWithConstraintsScope")
+@Composable
+fun PreviewWithWindowSize(isRound: Boolean = false, content: @Composable (size: WindowSize) -> Unit) {
+    ComposeTheme {
+        BoxWithConstraints(
+            modifier = Modifier
+                .fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            content(DpSize(maxWidth, maxHeight).toWindowSize(isRound = isRound))
+        }
+    }
+}
+
+@Preview(showBackground = true, widthDp = wXS_low, heightDp = hXS_low)
+@Preview(showBackground = true, widthDp = wXS_high, heightDp = hXS_high)
+@Preview(showBackground = true, widthDp = wS_low, heightDp = hS_low)
+@Preview(showBackground = true, widthDp = wS_high, heightDp = hS_high)
+@Preview(showBackground = true, widthDp = wM_low, heightDp = hM_low)
+@Preview(showBackground = true, widthDp = wM_high, heightDp = hM_high)
+@Preview(showBackground = true, widthDp = wL_low, heightDp = hL_low)
+@Preview(showBackground = true, widthDp = wL_high, heightDp = hL_high)
+@Preview(showBackground = true, widthDp = wXL_low, heightDp = hXL_low)
+@Preview(showBackground = true, widthDp = wXL_high, heightDp = hXL_high)
+@Preview(showBackground = true, widthDp = wL_high, heightDp = hXS_low)
+@Preview(showBackground = true, widthDp = wXS_low, heightDp = hM_high)
+@Composable
+fun MyPreviews() {
+    PreviewWithWindowSize {
+        HomeView(size = it, counterState = CounterState(3))
+    }
+}
+
+@Preview(showBackground = true, device = WearDevices.LARGE_ROUND)
+@Composable
+fun MyRoundPreview() {
+    PreviewWithWindowSize(isRound = true) {
+        HomeView(size = it, counterState = CounterState(3))
+    }
+}
diff --git a/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/theme/Color.kt b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/theme/Color.kt
new file mode 100644
index 00000000..d92e7d01
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/theme/Color.kt
@@ -0,0 +1,71 @@
+package com.kmpfoo.android.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+/**
+ * https://m3.material.io/theme-builder
+ */
+
+val md_theme_light_primary = Color(0xFF5754A8)
+val md_theme_light_onPrimary = Color(0xFFFFFFFF)
+val md_theme_light_primaryContainer = Color(0xFFE2DFFF)
+val md_theme_light_onPrimaryContainer = Color(0xFF110563)
+val md_theme_light_secondary = Color(0xFF4F56A9)
+val md_theme_light_onSecondary = Color(0xFFFFFFFF)
+val md_theme_light_secondaryContainer = Color(0xFFE0E0FF)
+val md_theme_light_onSecondaryContainer = Color(0xFF030865)
+val md_theme_light_tertiary = Color(0xFF006590)
+val md_theme_light_onTertiary = Color(0xFFFFFFFF)
+val md_theme_light_tertiaryContainer = Color(0xFFC8E6FF)
+val md_theme_light_onTertiaryContainer = Color(0xFF001E2F)
+val md_theme_light_error = Color(0xFFBA1A1A)
+val md_theme_light_errorContainer = Color(0xFFFFDAD6)
+val md_theme_light_onError = Color(0xFFFFFFFF)
+val md_theme_light_onErrorContainer = Color(0xFF410002)
+val md_theme_light_background = Color(0xFFFFFBFF)
+val md_theme_light_onBackground = Color(0xFF1C1B1F)
+val md_theme_light_surface = Color(0xFFFFFBFF)
+val md_theme_light_onSurface = Color(0xFF1C1B1F)
+val md_theme_light_surfaceVariant = Color(0xFFE4E1EC)
+val md_theme_light_onSurfaceVariant = Color(0xFF47464F)
+val md_theme_light_outline = Color(0xFF787680)
+val md_theme_light_inverseOnSurface = Color(0xFFF3EFF4)
+val md_theme_light_inverseSurface = Color(0xFF313034)
+val md_theme_light_inversePrimary = Color(0xFFC3C0FF)
+val md_theme_light_shadow = Color(0xFF000000)
+val md_theme_light_surfaceTint = Color(0xFF5754A8)
+val md_theme_light_outlineVariant = Color(0xFFC8C5D0)
+val md_theme_light_scrim = Color(0xFF000000)
+
+val md_theme_dark_primary = Color(0xFFC3C0FF)
+val md_theme_dark_onPrimary = Color(0xFF282377)
+val md_theme_dark_primaryContainer = Color(0xFF3F3C8F)
+val md_theme_dark_onPrimaryContainer = Color(0xFFE2DFFF)
+val md_theme_dark_secondary = Color(0xFFBEC2FF)
+val md_theme_dark_onSecondary = Color(0xFF1E2578)
+val md_theme_dark_secondaryContainer = Color(0xFF373E90)
+val md_theme_dark_onSecondaryContainer = Color(0xFFE0E0FF)
+val md_theme_dark_tertiary = Color(0xFF88CEFF)
+val md_theme_dark_onTertiary = Color(0xFF00344D)
+val md_theme_dark_tertiaryContainer = Color(0xFF004C6E)
+val md_theme_dark_onTertiaryContainer = Color(0xFFC8E6FF)
+val md_theme_dark_error = Color(0xFFFFB4AB)
+val md_theme_dark_errorContainer = Color(0xFF93000A)
+val md_theme_dark_onError = Color(0xFF690005)
+val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
+val md_theme_dark_background = Color(0xFF1C1B1F)
+val md_theme_dark_onBackground = Color(0xFFE5E1E6)
+val md_theme_dark_surface = Color(0xFF1C1B1F)
+val md_theme_dark_onSurface = Color(0xFFE5E1E6)
+val md_theme_dark_surfaceVariant = Color(0xFF47464F)
+val md_theme_dark_onSurfaceVariant = Color(0xFFC8C5D0)
+val md_theme_dark_outline = Color(0xFF928F9A)
+val md_theme_dark_inverseOnSurface = Color(0xFF1C1B1F)
+val md_theme_dark_inverseSurface = Color(0xFFE5E1E6)
+val md_theme_dark_inversePrimary = Color(0xFF5754A8)
+val md_theme_dark_shadow = Color(0xFF000000)
+val md_theme_dark_surfaceTint = Color(0xFFC3C0FF)
+val md_theme_dark_outlineVariant = Color(0xFF47464F)
+val md_theme_dark_scrim = Color(0xFF000000)
+
+val seed = Color(0xFF7C7ABA)
diff --git a/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/theme/Theme.kt b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/theme/Theme.kt
new file mode 100644
index 00000000..1d6535c3
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/kotlin/com/kmpfoo/android/ui/theme/Theme.kt
@@ -0,0 +1,93 @@
+package com.kmpfoo.android.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.runtime.Composable
+
+/**
+ * https://m3.material.io/theme-builder
+ */
+
+private val LightColors = lightColorScheme(
+    primary = md_theme_light_primary,
+    onPrimary = md_theme_light_onPrimary,
+    primaryContainer = md_theme_light_primaryContainer,
+    onPrimaryContainer = md_theme_light_onPrimaryContainer,
+    secondary = md_theme_light_secondary,
+    onSecondary = md_theme_light_onSecondary,
+    secondaryContainer = md_theme_light_secondaryContainer,
+    onSecondaryContainer = md_theme_light_onSecondaryContainer,
+    tertiary = md_theme_light_tertiary,
+    onTertiary = md_theme_light_onTertiary,
+    tertiaryContainer = md_theme_light_tertiaryContainer,
+    onTertiaryContainer = md_theme_light_onTertiaryContainer,
+    error = md_theme_light_error,
+    errorContainer = md_theme_light_errorContainer,
+    onError = md_theme_light_onError,
+    onErrorContainer = md_theme_light_onErrorContainer,
+    background = md_theme_light_background,
+    onBackground = md_theme_light_onBackground,
+    surface = md_theme_light_surface,
+    onSurface = md_theme_light_onSurface,
+    surfaceVariant = md_theme_light_surfaceVariant,
+    onSurfaceVariant = md_theme_light_onSurfaceVariant,
+    outline = md_theme_light_outline,
+    inverseOnSurface = md_theme_light_inverseOnSurface,
+    inverseSurface = md_theme_light_inverseSurface,
+    inversePrimary = md_theme_light_inversePrimary,
+    surfaceTint = md_theme_light_surfaceTint,
+    outlineVariant = md_theme_light_outlineVariant,
+    scrim = md_theme_light_scrim,
+)
+
+
+private val DarkColors = darkColorScheme(
+    primary = md_theme_dark_primary,
+    onPrimary = md_theme_dark_onPrimary,
+    primaryContainer = md_theme_dark_primaryContainer,
+    onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+    secondary = md_theme_dark_secondary,
+    onSecondary = md_theme_dark_onSecondary,
+    secondaryContainer = md_theme_dark_secondaryContainer,
+    onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+    tertiary = md_theme_dark_tertiary,
+    onTertiary = md_theme_dark_onTertiary,
+    tertiaryContainer = md_theme_dark_tertiaryContainer,
+    onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+    error = md_theme_dark_error,
+    errorContainer = md_theme_dark_errorContainer,
+    onError = md_theme_dark_onError,
+    onErrorContainer = md_theme_dark_onErrorContainer,
+    background = md_theme_dark_background,
+    onBackground = md_theme_dark_onBackground,
+    surface = md_theme_dark_surface,
+    onSurface = md_theme_dark_onSurface,
+    surfaceVariant = md_theme_dark_surfaceVariant,
+    onSurfaceVariant = md_theme_dark_onSurfaceVariant,
+    outline = md_theme_dark_outline,
+    inverseOnSurface = md_theme_dark_inverseOnSurface,
+    inverseSurface = md_theme_dark_inverseSurface,
+    inversePrimary = md_theme_dark_inversePrimary,
+    surfaceTint = md_theme_dark_surfaceTint,
+    outlineVariant = md_theme_dark_outlineVariant,
+    scrim = md_theme_dark_scrim,
+)
+
+@Composable
+fun ComposeTheme(
+  useDarkTheme: Boolean = isSystemInDarkTheme(),
+  content: @Composable () -> Unit
+) {
+  val colors = if (!useDarkTheme) {
+    LightColors
+  } else {
+    DarkColors
+  }
+
+  MaterialTheme(
+    colorScheme = colors,
+    content = content
+  )
+}
diff --git a/app-examples/example-07-kmp/androidApp/src/main/res/values/strings.xml b/app-examples/example-07-kmp/androidApp/src/main/res/values/strings.xml
new file mode 100644
index 00000000..8ed3192d
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/res/values/strings.xml
@@ -0,0 +1,17 @@
+<resources>
+
+    <string name="app_name">kt 9 compose ex</string>
+
+    <string name="increase">+</string>
+    <string name="decrease">-</string>
+    <string name="show">SHOW</string>
+    <string name="hide">HIDE</string>
+
+    <!-- common error messages -->
+    <string name="msg_empty_message"></string>
+    <string name="err_retry_later">Please retry later</string>
+    <string name="err_network">Please check your network and try again</string>
+    <string name="err_session">Please login and try again</string>
+    <string name="err_account">Please check your account for funds</string>
+
+</resources>
diff --git a/app-examples/example-07-kmp/androidApp/src/main/res/values/themes.xml b/app-examples/example-07-kmp/androidApp/src/main/res/values/themes.xml
new file mode 100644
index 00000000..37f8e608
--- /dev/null
+++ b/app-examples/example-07-kmp/androidApp/src/main/res/values/themes.xml
@@ -0,0 +1,3 @@
+<resources>
+    <style name="Theme.AppTheme" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
diff --git a/app-examples/example-07-kmp/build.gradle.kts b/app-examples/example-07-kmp/build.gradle.kts
new file mode 100644
index 00000000..df4f877f
--- /dev/null
+++ b/app-examples/example-07-kmp/build.gradle.kts
@@ -0,0 +1,10 @@
+plugins {
+    alias(libs.plugins.androidApplication).apply(false)
+    alias(libs.plugins.androidLibrary).apply(false)
+    alias(libs.plugins.kotlinAndroid).apply(false)
+    alias(libs.plugins.kotlinMultiplatform).apply(false)
+    alias(libs.plugins.kotlinCocoapods).apply(false)
+    alias(libs.plugins.compose.compiler).apply(false)
+    alias(libs.plugins.kotlinSerializationPlugin).apply(false)
+    alias(libs.plugins.kotlinKaptPlugin).apply(false)
+}
diff --git a/app-examples/example-07-kmp/gradle.properties b/app-examples/example-07-kmp/gradle.properties
new file mode 100644
index 00000000..aab55e90
--- /dev/null
+++ b/app-examples/example-07-kmp/gradle.properties
@@ -0,0 +1,13 @@
+#Gradle
+org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+
+#Kotlin
+kotlin.code.style=official
+
+#Android
+android.useAndroidX=true
+android.nonTransitiveRClass=true
+
+org.gradle.java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/gradle/libs.versions.toml b/app-examples/example-07-kmp/gradle/libs.versions.toml
new file mode 100644
index 00000000..8ee6ccf4
--- /dev/null
+++ b/app-examples/example-07-kmp/gradle/libs.versions.toml
@@ -0,0 +1,44 @@
+[versions]
+agp = "8.9.0"
+kotlin = "2.1.10"
+compose = "1.7.8"
+compose-material3 = "1.3.1"
+androidx-activityCompose = "1.10.1"
+foreVersion = "2.0.0"
+persistaVersion = "2.0.0"
+n8Version = "2.0.0-rc.1"
+wearComposeVersion = "1.4.1"
+wearToolingPreviewVersion = "1.0.0"
+jvm-toolchain = "21"
+jvm-target = "1.8"
+
+[libraries]
+okio = "com.squareup.okio:okio:3.10.2"
+fore-core = { module = "co.early.fore:fore-core", version.ref = "foreVersion" }
+fore-net = { module = "co.early.fore:fore-net", version.ref = "foreVersion" }
+fore-compose = { module = "co.early.fore:fore-compose", version.ref = "foreVersion" }
+fore-test-fixtures = { module = "co.early.fore:fore-test-fixtures", version.ref = "foreVersion" }
+persista = { module = "co.early.persista:persista", version.ref = "persistaVersion" }
+n8-core = { module = "co.early.n8:n8-core", version.ref = "n8Version" }
+n8-compose = { module = "co.early.n8:n8-compose", version.ref = "n8Version" }
+kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
+compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
+compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
+compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
+androidx-wear-compose-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "wearComposeVersion" }
+androidx-wear-tooling-preview = { module = "androidx.wear:wear-tooling-preview", version.ref = "wearToolingPreviewVersion" }
+
+
+[plugins]
+androidApplication = { id = "com.android.application", version.ref = "agp" }
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
+kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlinKaptPlugin = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
+kotlinSerializationPlugin = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
diff --git a/app-examples/example-07-kmp/gradle/wrapper/gradle-wrapper.jar b/app-examples/example-07-kmp/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..e708b1c0
Binary files /dev/null and b/app-examples/example-07-kmp/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/app-examples/example-07-kmp/gradle/wrapper/gradle-wrapper.properties b/app-examples/example-07-kmp/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..162aedc6
--- /dev/null
+++ b/app-examples/example-07-kmp/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun Mar 30 10:55:53 CEST 2025
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/app-examples/example-07-kmp/gradlew b/app-examples/example-07-kmp/gradlew
new file mode 100755
index 00000000..4f906e0c
--- /dev/null
+++ b/app-examples/example-07-kmp/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/app-examples/example-07-kmp/gradlew.bat b/app-examples/example-07-kmp/gradlew.bat
new file mode 100644
index 00000000..ac1b06f9
--- /dev/null
+++ b/app-examples/example-07-kmp/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/app-examples/example-07-kmp/iosApp/iosApp.xcodeproj/project.pbxproj b/app-examples/example-07-kmp/iosApp/iosApp.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..5a426ab7
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -0,0 +1,408 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 70;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
+		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
+		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
+		2D8BFCBD2DA701AE0048DBCD /* shared.debug.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D8BFCB92DA7003C0048DBCD /* shared.debug.xcframework */; };
+		2D8BFCBE2DA701AE0048DBCD /* shared.debug.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2D8BFCB92DA7003C0048DBCD /* shared.debug.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		2D8BFCC72DA9B4550048DBCD /* OG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D8BFCC62DA9B4500048DBCD /* OG.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		2D8BFCBF2DA701AE0048DBCD /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				2D8BFCBE2DA701AE0048DBCD /* shared.debug.xcframework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
+		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
+		2D8BFCB92DA7003C0048DBCD /* shared.debug.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = shared.debug.xcframework; path = Frameworks/shared.debug.xcframework; sourceTree = "<group>"; };
+		2D8BFCC62DA9B4500048DBCD /* OG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OG.swift; sourceTree = "<group>"; };
+		7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFileSystemSynchronizedRootGroup section */
+		2D8BFCC82DA9B6580048DBCD /* lib */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = lib; sourceTree = "<group>"; };
+		2D8BFCC92DA9B66F0048DBCD /* ui */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = ui; sourceTree = "<group>"; };
+/* End PBXFileSystemSynchronizedRootGroup section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		7555FF78242A565900829871 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2D8BFCBD2DA701AE0048DBCD /* shared.debug.xcframework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		058557D7273AAEEB004C7B11 /* Preview Content */ = {
+			isa = PBXGroup;
+			children = (
+				058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */,
+			);
+			path = "Preview Content";
+			sourceTree = "<group>";
+		};
+		7555FF72242A565900829871 = {
+			isa = PBXGroup;
+			children = (
+				7555FF7D242A565900829871 /* iosApp */,
+				7555FF7C242A565900829871 /* Products */,
+				7555FFB0242A642200829871 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		7555FF7C242A565900829871 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				7555FF7B242A565900829871 /* iosApp.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		7555FF7D242A565900829871 /* iosApp */ = {
+			isa = PBXGroup;
+			children = (
+				2D8BFCC92DA9B66F0048DBCD /* ui */,
+				2D8BFCC82DA9B6580048DBCD /* lib */,
+				2D8BFCC62DA9B4500048DBCD /* OG.swift */,
+				2152FB032600AC8F00CF470E /* iOSApp.swift */,
+				058557BA273AAA24004C7B11 /* Assets.xcassets */,
+				7555FF8C242A565B00829871 /* Info.plist */,
+				058557D7273AAEEB004C7B11 /* Preview Content */,
+			);
+			path = iosApp;
+			sourceTree = "<group>";
+		};
+		7555FFB0242A642200829871 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				2D8BFCB92DA7003C0048DBCD /* shared.debug.xcframework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		7555FF7A242A565900829871 /* iosApp */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */;
+			buildPhases = (
+				7555FFB5242A651A00829871 /* ShellScript */,
+				7555FF77242A565900829871 /* Sources */,
+				7555FF78242A565900829871 /* Frameworks */,
+				7555FF79242A565900829871 /* Resources */,
+				2D8BFCBF2DA701AE0048DBCD /* Embed Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			fileSystemSynchronizedGroups = (
+				2D8BFCC82DA9B6580048DBCD /* lib */,
+				2D8BFCC92DA9B66F0048DBCD /* ui */,
+			);
+			name = iosApp;
+			productName = iosApp;
+			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		7555FF73242A565900829871 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 1130;
+				LastUpgradeCheck = 1130;
+				ORGANIZATIONNAME = orgName;
+				TargetAttributes = {
+					7555FF7A242A565900829871 = {
+						CreatedOnToolsVersion = 11.3.1;
+					};
+				};
+			};
+			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 7555FF72242A565900829871;
+			productRefGroup = 7555FF7C242A565900829871 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				7555FF7A242A565900829871 /* iosApp */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		7555FF79242A565900829871 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
+				058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		7555FFB5242A651A00829871 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		7555FF77242A565900829871 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2D8BFCC72DA9B4550048DBCD /* OG.swift in Sources */,
+				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		7555FFA3242A565B00829871 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		7555FFA4242A565B00829871 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		7555FFA6242A565B00829871 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				ENABLE_PREVIEWS = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+				);
+				INFOPLIST_FILE = iosApp/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					shared,
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		7555FFA7242A565B00829871 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				ENABLE_PREVIEWS = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+				);
+				INFOPLIST_FILE = iosApp/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					shared,
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7555FFA3242A565B00829871 /* Debug */,
+				7555FFA4242A565B00829871 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7555FFA6242A565B00829871 /* Debug */,
+				7555FFA7242A565B00829871 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 7555FF73242A565900829871 /* Project object */;
+}
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json
new file mode 100644
index 00000000..ee7e3ca0
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 00000000..fb88a396
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/Contents.json b/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/Contents.json
new file mode 100644
index 00000000..4aa7c535
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/Info.plist b/app-examples/example-07-kmp/iosApp/iosApp/Info.plist
new file mode 100644
index 00000000..8044709c
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/Info.plist
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+	</dict>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UILaunchScreen</key>
+	<dict/>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/OG.swift b/app-examples/example-07-kmp/iosApp/iosApp/OG.swift
new file mode 100644
index 00000000..033f37ff
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/OG.swift
@@ -0,0 +1,57 @@
+import Foundation
+import shared
+
+/*
+ get dependencies from anywhere like this counterModel = OG[CounterModel.self]
+ */
+final class OG {
+
+    private static let instance = OG()
+    private var dependencies: [String: Any] = [:]
+    
+    private var initialized = false
+
+    private init() {}
+
+    static func create() {
+        
+        let logger = MultiplatformLogger()
+        let fileManager = FileManager.default
+        let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
+        let path = Path.Companion.shared.toPath(documentsDirectory.path, normalize: true)
+        let perSista = PerSista(
+            dataPath: path,
+            logger: logger
+        )
+        
+        // observable models
+        let counterModel = CounterModel(perSista: perSista, logger: logger)
+        
+        // register dependencies for later
+        instance.register(counterModel, as: CounterModel.self)
+    }
+    
+    static func initialize() {
+        if (!instance.initialized) {
+            instance.initialized = true
+
+            // run any necessary initialization code once object graph has been created here
+
+        }
+    }
+
+    private func register<T>(_ dependency: T, as type: T.Type) {
+        dependencies[String(describing: type)] = dependency
+    }
+    
+    static subscript<T>(type: T.Type) -> T {
+        guard let dependency = instance.dependencies[String(describing: type)] as? T else {
+            fatalError("No dependency registered for type \(type)")
+        }
+        return dependency
+    }
+
+    func putMock<T>(_ instance: T, as type: T.Type) {
+        OG.instance.register(instance, as: type)
+    }
+}
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/app-examples/example-07-kmp/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json
new file mode 100644
index 00000000..4aa7c535
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/iOSApp.swift b/app-examples/example-07-kmp/iosApp/iosApp/iOSApp.swift
new file mode 100644
index 00000000..6646fd33
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/iOSApp.swift
@@ -0,0 +1,17 @@
+import SwiftUI
+import shared
+
+@main
+struct iOSApp: App {
+    
+    init() {
+        OG.create()
+        OG.initialize()
+    }
+    
+	var body: some Scene {
+		WindowGroup {
+            CounterView(counterModel:OG[CounterModel.self])
+		}
+	}
+}
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/lib/ObservableWrapper.swift b/app-examples/example-07-kmp/iosApp/iosApp/lib/ObservableWrapper.swift
new file mode 100644
index 00000000..ff504412
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/lib/ObservableWrapper.swift
@@ -0,0 +1,51 @@
+import SwiftUI
+import Combine
+import shared
+
+class ObservableState<S>: ObservableObject {
+    
+    @Published var state: S
+
+    private let model: Observable
+    private var observer: Observer?
+
+    init(model: Observable, _ state: @escaping () -> S) {
+        
+        self.model = model
+        self.state = state()
+        
+        observer = ObserverWrapper(){
+            self.state = state()
+        }
+        
+        model.addObserver(observer: observer.unsafelyUnwrapped)
+    }
+
+    deinit {
+        model.removeObserver(observer: observer.unsafelyUnwrapped)
+    }
+}
+
+class ObserverWrapper: Observer {
+    private let onChange: () -> Void
+
+    init(_ onChange: @escaping () -> Void) {
+        self.onChange = onChange
+    }
+
+    func somethingChanged() {
+        onChange()
+    }
+}
+
+extension Observable {
+    func toObservableState<S>(state: @escaping () -> S) -> ObservableState<S> {
+        return ObservableState<S>(model: self, state)
+    }
+}
+
+extension Observable {
+    func toStateObject<S>(_ state: @escaping () -> S) -> StateObject<ObservableState<S>> {
+        return StateObject(wrappedValue: self.toObservableState(state: state))
+    }
+}
diff --git a/app-examples/example-07-kmp/iosApp/iosApp/ui/CounterView.swift b/app-examples/example-07-kmp/iosApp/iosApp/ui/CounterView.swift
new file mode 100644
index 00000000..a6e36917
--- /dev/null
+++ b/app-examples/example-07-kmp/iosApp/iosApp/ui/CounterView.swift
@@ -0,0 +1,72 @@
+import SwiftUI
+import shared
+
+struct CounterView: View {
+    
+    private let counterModel: CounterModel
+        
+    @StateObject private var counterModelState: ObservableState<CounterState>
+
+    init(counterModel: CounterModel) {
+        self.counterModel = counterModel
+        _counterModelState = counterModel.toStateObject { counterModel.state }
+    }
+    
+    var body: some View {
+        let state = counterModelState.state
+        
+        if state.loading {
+            ProgressView()
+                .scaleEffect(2)
+                .padding()
+        } else {
+            ZStack {
+                Capsule()
+                    .strokeBorder(Color.green, lineWidth: 40)
+                    .frame(width: 260, height: 200)
+                
+                HStack(spacing: 20) {
+                    Button(action: counterModel.decrease) {
+                        ZStack {
+                            Circle()
+                                .fill(Color(red: 0.4, green: 0.4, blue: 0.8))
+                                .frame(width: 130, height: 130)
+                            
+                            Text("-")
+                                .font(.system(size: 30, weight: .bold))
+                                .foregroundColor(.white)
+                        }
+                    }
+                    .disabled(!state.canDecrease())
+                    .opacity(state.canDecrease() ? 1.0 : 0.6)
+                    
+                    Text("\(state.amount)")
+                        .font(.system(size: 80, weight: .medium))
+                        .foregroundColor(.black)
+                        .frame(width: 80)
+                    
+                    Button(action: counterModel.increase) {
+                        ZStack {
+                            Circle()
+                                .fill(Color(red: 0.4, green: 0.4, blue: 0.8))
+                                .frame(width: 130, height: 130)
+                            
+                            Text("+")
+                                .font(.system(size: 30, weight: .bold))
+                                .foregroundColor(.white)
+                        }
+                    }
+                    .disabled(!state.canIncrease())
+                    .opacity(state.canIncrease() ? 1.0 : 0.6)
+                }
+            }
+            .padding()
+        }
+    }
+}
+
+//struct ContentView_Previews: PreviewProvider {
+//    static var previews: some View {
+//        ContentView(counterModel: OG.shared[CounterModel.self])
+//    }
+//}
diff --git a/app-examples/example-07-kmp/settings.gradle.kts b/app-examples/example-07-kmp/settings.gradle.kts
new file mode 100644
index 00000000..1a965e38
--- /dev/null
+++ b/app-examples/example-07-kmp/settings.gradle.kts
@@ -0,0 +1,20 @@
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "KMPFoo"
+include(":androidApp")
+include(":shared")
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/shared/build.gradle.kts b/app-examples/example-07-kmp/shared/build.gradle.kts
new file mode 100644
index 00000000..20dbe204
--- /dev/null
+++ b/app-examples/example-07-kmp/shared/build.gradle.kts
@@ -0,0 +1,109 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.kotlinSerializationPlugin)
+}
+
+kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
+    }
+
+    targets.withType<org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget> {
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+                }
+            }
+        }
+    }
+
+
+    androidTarget {
+        compilations.all {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.JVM_1_8)
+                }
+            }
+        }
+    }
+
+    val xcFramework = XCFramework()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "shared"
+            isStatic = true
+
+            //until we use the XCFramework from fore itself?
+            export(libs.fore.core)
+            export(libs.fore.net)
+            export(libs.fore.compose)
+            export(libs.persista)
+            export(libs.n8.core)
+            export(libs.n8.compose)
+            export(libs.okio)
+            export(libs.kotlinx.serialization)
+
+            xcFramework.add(this)
+        }
+    }
+
+    sourceSets {
+        commonMain.dependencies {
+            api(libs.fore.core)
+            api(libs.fore.net)
+            api(libs.fore.compose)
+            api(libs.persista)
+            api(libs.n8.core)
+            api(libs.n8.compose)
+            api(libs.kotlinx.serialization)
+            api(libs.okio)
+        }
+        commonTest.dependencies {
+            implementation(libs.kotlin.test)
+            api(libs.fore.test.fixtures)
+        }
+    }
+}
+
+android {
+    namespace = "com.deleteme.kmpfoo"
+    compileSdk = 35
+    defaultConfig {
+        minSdk = 21
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+
+//   Build the XCFramework and copy it over to the iosApp
+//
+//   ./gradlew :shared:prepAllXCFrameworkForXcode
+//
+//   then from XCode, add framework
+//   you might need JDK specified explicitly in gradle.properties org.gradle.java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home
+
+fun prepXCFrameworkForXcode(config: String) = tasks.registering(Sync::class) {
+    from(layout.buildDirectory.dir("XCFrameworks/$config/shared.xcframework"))
+    into(rootProject.layout.projectDirectory.dir("iosApp/Frameworks/shared.$config.xcframework"))
+    dependsOn("assembleXCFramework")
+}
+val prepDebugXCFrameworkForXcode by prepXCFrameworkForXcode("debug")
+val prepReleaseXCFrameworkForXcode by prepXCFrameworkForXcode("release")
+
+tasks.register("prepAllXCFrameworkForXcode") {
+    dependsOn(prepDebugXCFrameworkForXcode, prepReleaseXCFrameworkForXcode)
+}
diff --git a/app-examples/example-07-kmp/shared/shared.podspec b/app-examples/example-07-kmp/shared/shared.podspec
new file mode 100644
index 00000000..c695d095
--- /dev/null
+++ b/app-examples/example-07-kmp/shared/shared.podspec
@@ -0,0 +1,54 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'shared'
+    spec.version                  = '1.0'
+    spec.homepage                 = 'Link to the Shared Module homepage'
+    spec.source                   = { :http=> ''}
+    spec.authors                  = ''
+    spec.license                  = ''
+    spec.summary                  = 'Shared Module description'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
+    spec.libraries                = 'c++'
+    spec.ios.deployment_target    = '16.0'
+                
+                
+    if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
+        raise "
+
+        Kotlin framework 'shared' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :shared:generateDummyFramework
+
+        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
+    end
+                
+    spec.xcconfig = {
+        'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
+    }
+                
+    spec.pod_target_xcconfig = {
+        'KOTLIN_PROJECT_PATH' => ':shared',
+        'PRODUCT_MODULE_NAME' => 'shared',
+    }
+                
+    spec.script_phases = [
+        {
+            :name => 'Build shared',
+            :execution_position => :before_compile,
+            :shell_path => '/bin/sh',
+            :script => <<-SCRIPT
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                  exit 0
+                fi
+                set -ev
+                REPO_ROOT="$PODS_TARGET_SRCROOT"
+                "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
+                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
+                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
+                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
+            SCRIPT
+        }
+    ]
+                
+end
\ No newline at end of file
diff --git a/app-examples/example-07-kmp/shared/src/commonMain/kotlin/com/kmpfoo/feature/counter/CounterModel.kt b/app-examples/example-07-kmp/shared/src/commonMain/kotlin/com/kmpfoo/feature/counter/CounterModel.kt
new file mode 100644
index 00000000..7162d9b6
--- /dev/null
+++ b/app-examples/example-07-kmp/shared/src/commonMain/kotlin/com/kmpfoo/feature/counter/CounterModel.kt
@@ -0,0 +1,59 @@
+package com.kmpfoo.feature.counter
+
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.observer.Observable
+import co.early.fore.core.coroutine.launchIO
+import co.early.fore.core.observer.ObservableImp
+import co.early.persista.PerSista
+import kotlinx.coroutines.delay
+
+/**
+ * Copyright © 2015-2023 early.co. All rights reserved.
+ */
+
+class CounterModel(
+    private val perSista: PerSista,
+    private val logger: Logger,
+) : Observable by ObservableImp() {
+
+    var state = CounterState(amount = 0, loading = true)
+        private set
+
+    init {
+        launchIO{
+            delay(1000) // not necessary, it just lets us verify the initial loading spinner
+            perSista.read(state) {
+                state = it.copy(loading = false)
+                notifyObservers()
+            }
+        }
+    }
+
+    fun increase() {
+        if (state.canIncrease()) {
+            perSista.write(state.copy(amount = state.amount + 1)) {
+                logger.i("counter increased to:${it.amount}")
+                state = it
+                notifyObservers()
+            }
+        }
+    }
+
+    fun decrease() {
+        if (state.canDecrease()) {
+            perSista.write(state.copy(amount = state.amount - 1)) {
+                logger.i("counter decreased to:${it.amount}")
+                state = it
+                notifyObservers()
+            }
+        }
+    }
+
+    fun reset() {
+        perSista.clear(state::class){
+            logger.i("counter state cleared")
+            state = CounterState(0)
+            notifyObservers()
+        }
+    }
+}
diff --git a/app-examples/example-07-kmp/shared/src/commonMain/kotlin/com/kmpfoo/feature/counter/CounterState.kt b/app-examples/example-07-kmp/shared/src/commonMain/kotlin/com/kmpfoo/feature/counter/CounterState.kt
new file mode 100644
index 00000000..b935985c
--- /dev/null
+++ b/app-examples/example-07-kmp/shared/src/commonMain/kotlin/com/kmpfoo/feature/counter/CounterState.kt
@@ -0,0 +1,19 @@
+package com.kmpfoo.feature.counter
+
+import kotlinx.serialization.*
+
+/**
+ * Copyright © 2015-2023 early.co. All rights reserved.
+ */
+
+const val COUNTER_MAX_AMOUNT = 9
+
+@Serializable
+data class CounterState(
+    val amount: Int = 5,
+    @Transient
+    val loading: Boolean = false,
+) {
+    fun canIncrease(): Boolean = !loading && amount < COUNTER_MAX_AMOUNT
+    fun canDecrease(): Boolean = !loading && amount > 0
+}
diff --git a/app-examples/example-jv-01reactiveui/build.gradle.kts b/app-examples/example-jv-01reactiveui/build.gradle.kts
deleted file mode 100644
index 8804ac49..00000000
--- a/app-examples/example-jv-01reactiveui/build.gradle.kts
+++ /dev/null
@@ -1,92 +0,0 @@
-import co.early.fore.Shared
-import co.early.fore.Shared.BuildTypes
-
-plugins {
-    alias(libs.plugins.androidApplication)
-}
-
-val appId = "foo.bar.example.forereactiveui"
-
-fun getTestBuildType(): String {
-    return project.properties["testBuildType"] as String? ?: BuildTypes.DEFAULT
-}
-
-println("[$appId testBuildType:${getTestBuildType()}]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = appId
-    compileSdk = Shared.Android.compileSdk
-
-    defaultConfig {
-        applicationId = appId
-        minSdk = Shared.Android.minSdk
-        targetSdk = Shared.Android.targetSdk
-        versionCode = 1
-        versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testBuildType = getTestBuildType()
-    }
-    signingConfigs {
-        create(BuildTypes.RELEASE) {
-            // keytool -genkey -v -keystore debug.fake_keystore -storetype PKCS12 -alias android -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 20000 -dname "cn=Unknown, ou=Unknown, o=Unknown, c=Unknown"
-            storeFile = file("../keystore/debug.fake_keystore")
-            storePassword = "android"
-            keyAlias = "android"
-            keyPassword = "android"
-        }
-    }
-    buildTypes {
-        getByName(BuildTypes.DEBUG) {
-            isMinifyEnabled = false
-        }
-        getByName(BuildTypes.RELEASE) {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "../proguard-example-app.pro")
-            signingConfig = signingConfigs.getByName(BuildTypes.RELEASE)
-        }
-    }
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-example-apps.xml")
-    }
-    buildFeatures {
-        buildConfig = true
-    }
-}
-
-dependencies {
-
-    if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-jv-android-core:${Shared.Publish.published_fore_version_for_examples}")
-    } else {
-        implementation(project(":fore-jv:fore-jv-android-core"))
-    }
-
-    annotationProcessor("com.jakewharton:butterknife-compiler:${Shared.Versions.butterknife}")
-    //noinspection AnnotationProcessorOnCompilePath
-    implementation("com.jakewharton:butterknife:${Shared.Versions.butterknife}")
-
-    implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
-    implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    testImplementation("org.hamcrest:hamcrest-library:${Shared.Versions.hamcrest_library}")
-
-    androidTestImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:${Shared.Versions.dexmaker_mockito}")
-    androidTestImplementation("androidx.test:runner:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:rules:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.annotation:annotation:${Shared.Versions.annotation}")
-    androidTestImplementation("androidx.core:core:${Shared.Versions.android_core}")
-    androidTestImplementation("androidx.test.espresso:espresso-core:${Shared.Versions.espresso_core}") {
-        exclude(group = "com.android.support", module = "support-annotations")
-    }
-}
diff --git a/app-examples/example-jv-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveui/ui/wallet/StateBuilder.java b/app-examples/example-jv-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveui/ui/wallet/StateBuilder.java
deleted file mode 100644
index c4dca8ae..00000000
--- a/app-examples/example-jv-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveui/ui/wallet/StateBuilder.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package foo.bar.example.forereactiveui.ui.wallet;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-
-import co.early.fore.core.WorkMode;
-import foo.bar.example.forereactiveui.App;
-import foo.bar.example.forereactiveui.OG;
-import foo.bar.example.forereactiveui.feature.wallet.Wallet;
-
-import static org.mockito.Mockito.when;
-
-/**
- *
- */
-public class StateBuilder {
-
-    private Wallet mockWallet;
-
-    StateBuilder(Wallet mockWallet) {
-        this.mockWallet = mockWallet;
-    }
-
-    StateBuilder withMobileWalletMaximum(int totalFundsAvailable) {
-        when(mockWallet.getMobileWalletAmount()).thenReturn(totalFundsAvailable);
-        when(mockWallet.getSavingsWalletAmount()).thenReturn(0);
-        when(mockWallet.canDecrease()).thenReturn(true);
-        when(mockWallet.canIncrease()).thenReturn(false);
-        return this;
-    }
-
-    StateBuilder withMobileWalletHalfFull(int savingsWalletAmount, int mobileWalletAmount) {
-        when(mockWallet.getMobileWalletAmount()).thenReturn(mobileWalletAmount);
-        when(mockWallet.getSavingsWalletAmount()).thenReturn(savingsWalletAmount);
-        when(mockWallet.canDecrease()).thenReturn(true);
-        when(mockWallet.canIncrease()).thenReturn(true);
-        return this;
-    }
-
-    StateBuilder withMobileWalletEmpty(int totalFundsAvailable) {
-        when(mockWallet.getMobileWalletAmount()).thenReturn(0);
-        when(mockWallet.getSavingsWalletAmount()).thenReturn(totalFundsAvailable);
-        when(mockWallet.canDecrease()).thenReturn(false);
-        when(mockWallet.canIncrease()).thenReturn(true);
-        return this;
-    }
-
-
-    ActivityTestRule<WalletsActivity>  createRule(){
-
-        return new ActivityTestRule<WalletsActivity>(WalletsActivity.class) {
-            @Override
-            protected void beforeActivityLaunched() {
-
-                //get hold of the application
-                App app = (App) InstrumentationRegistry.getTargetContext().getApplicationContext();
-                OG.setApplication(app, WorkMode.SYNCHRONOUS);
-
-                //inject our mocks so our UI layer will pick them up
-                OG.putMock(Wallet.class, mockWallet);
-            }
-
-        };
-    }
-
-}
diff --git a/app-examples/example-jv-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveui/ui/wallet/WalletsViewTest.java b/app-examples/example-jv-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveui/ui/wallet/WalletsViewTest.java
deleted file mode 100644
index a3f0b594..00000000
--- a/app-examples/example-jv-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveui/ui/wallet/WalletsViewTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package foo.bar.example.forereactiveui.ui.wallet;
-
-import android.app.Activity;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import foo.bar.example.forereactiveui.R;
-import foo.bar.example.forereactiveui.feature.wallet.Wallet;
-
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.not;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-@RunWith(AndroidJUnit4.class)
-public class WalletsViewTest {
-
-
-    private Wallet mockWallet;
-
-
-    @Before
-    public void setup(){
-
-        //MockitoAnnotations.initMocks(WalletView.this);
-        System.setProperty("dexmaker.dexcache", InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
-
-        mockWallet = mock(Wallet.class);
-
-    }
-
-    @Test
-    public void emptyMobileWallet() throws Exception {
-
-        //arrange
-        new StateBuilder(mockWallet)
-                .withMobileWalletEmpty(100)
-                .createRule()
-                .launchActivity(null);
-
-        //act
-
-        //assert
-        onView(withId(R.id.wallet_increase_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.wallet_decrease_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(withText("0")));
-        onView(withId(R.id.wallet_savingsamount_txt)).check(matches(withText("100")));
-    }
-
-    @Test
-    public void fullMobileWallet() throws Exception {
-
-        //arrange
-        new StateBuilder(mockWallet)
-                .withMobileWalletMaximum(100)
-                .createRule()
-                .launchActivity(null);
-
-        //act
-
-        //assert
-        onView(withId(R.id.wallet_increase_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.wallet_decrease_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(withText("100")));
-        onView(withId(R.id.wallet_savingsamount_txt)).check(matches(withText("0")));
-    }
-
-    @Test
-    public void halfFullMobileWallet() throws Exception {
-
-        //arrange
-        new StateBuilder(mockWallet)
-                .withMobileWalletHalfFull(32, 8)
-                .createRule()
-                .launchActivity(null);
-
-        //act
-
-        //assert
-        onView(withId(R.id.wallet_increase_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.wallet_decrease_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(withText("8")));
-        onView(withId(R.id.wallet_savingsamount_txt)).check(matches(withText("32")));
-    }
-
-    @Test
-    public void stateMaintainedAfterRotation() throws Exception {
-
-        //arrange
-        Activity activity = new StateBuilder(mockWallet)
-                        .withMobileWalletHalfFull(200, 10)
-                        .createRule()
-                        .launchActivity(null);
-        activity.setRequestedOrientation(SCREEN_ORIENTATION_LANDSCAPE);
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(withText("10")));
-
-        //act
-        activity.setRequestedOrientation(SCREEN_ORIENTATION_PORTRAIT);
-
-        //assert
-        onView(withId(R.id.wallet_increase_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.wallet_decrease_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(withText("10")));
-        onView(withId(R.id.wallet_savingsamount_txt)).check(matches(withText("200")));
-    }
-
-    @Test
-    public void clickIncreaseCallsModel() throws Exception {
-        //arrange
-        new StateBuilder(mockWallet)
-                .withMobileWalletHalfFull(32, 8)
-                .createRule()
-                .launchActivity(null);
-        //act
-        onView(withId(R.id.wallet_increase_btn)).perform(click());
-
-        //assert
-        verify(mockWallet).increaseMobileWallet();
-    }
-
-    @Test
-    public void clickDecreaseCallsModel() throws Exception {
-        //arrange
-        new StateBuilder(mockWallet)
-                .withMobileWalletHalfFull(32, 8)
-                .createRule()
-                .launchActivity(null);
-        //act
-        onView(withId(R.id.wallet_decrease_btn)).perform(click());
-
-        //assert
-        verify(mockWallet).decreaseMobileWallet();
-    }
-
-}
diff --git a/app-examples/example-jv-01reactiveui/src/main/AndroidManifest.xml b/app-examples/example-jv-01reactiveui/src/main/AndroidManifest.xml
deleted file mode 100644
index 2ff67c60..00000000
--- a/app-examples/example-jv-01reactiveui/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:name=".App"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.wallet.WalletsActivity" android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
diff --git a/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/App.java b/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/App.java
deleted file mode 100644
index 7a450ec5..00000000
--- a/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/App.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package foo.bar.example.forereactiveui;
-
-import android.app.Application;
-
-/**
- * Try not to fill this class with lots of code, if possible move it to a model somewhere
- */
-public class App extends Application {
-
-    private static App inst;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        inst = this;
-
-        OG.setApplication(inst);
-        OG.init();
-    }
-
-    public static App getInst() {
-        return inst;
-    }
-
-}
diff --git a/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/OG.java b/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/OG.java
deleted file mode 100644
index 9ce14ea4..00000000
--- a/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/OG.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package foo.bar.example.forereactiveui;
-
-import android.app.Application;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.AndroidLogger;
-import foo.bar.example.forereactiveui.feature.wallet.Wallet;
-
-import static co.early.fore.core.Affirm.notNull;
-
-/**
- *
- * OG - Object Graph, pure DI implementation
- *
- * Copyright © 2019 early.co. All rights reserved.
- */
-public class OG {
-
-    private static boolean initialized = false;
-    private static final Map<Class<?>, Object> dependencies = new HashMap<>();
-
-
-    public static void setApplication(Application application) {
-        setApplication(application, WorkMode.ASYNCHRONOUS);
-    }
-
-    public static void setApplication(Application application, final WorkMode workMode) {
-
-        notNull(application);
-        notNull(workMode);
-
-
-        // create dependency graph
-        AndroidLogger logger = new AndroidLogger("fore_");
-        Wallet wallet = new Wallet(logger);
-
-
-        // add models to the dependencies map if you will need them later
-        dependencies.put(Wallet.class, wallet);
-
-    }
-
-    public static void init() {
-        if (!initialized) {
-            initialized = true;
-
-            // run any necessary initialization code once object graph has been created here
-
-        }
-    }
-
-    public static <T> T get(Class<T> model) {
-
-        notNull(model);
-        T t = model.cast(dependencies.get(model));
-        notNull(t);
-
-        return t;
-    }
-
-    public static <T> void putMock(Class<T> clazz, T object) {
-
-        notNull(clazz);
-        notNull(object);
-
-        dependencies.put(clazz, object);
-    }
-
-}
diff --git a/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/feature/wallet/Wallet.java b/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/feature/wallet/Wallet.java
deleted file mode 100644
index 59c5d8fd..00000000
--- a/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/feature/wallet/Wallet.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package foo.bar.example.forereactiveui.feature.wallet;
-
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.observer.ObservableImp;
-
-/**
- *
- */
-public class Wallet extends ObservableImp {
-
-    private static final String TAG = Wallet.class.getSimpleName();
-
-    private final Logger logger;
-    public final int totalDollarsAvailable = 10;
-    private int mobileWalletDollars = 0;
-
-
-    public Wallet(Logger logger) {
-        super(WorkMode.SYNCHRONOUS, logger);
-        this.logger = Affirm.notNull(logger);
-    }
-
-
-    public void increaseMobileWallet() {
-        if (canIncrease()) {
-            mobileWalletDollars++;
-            logger.i(TAG, "Increasing mobile wallet to:" + mobileWalletDollars);
-            notifyObservers();
-        }
-    }
-
-    public void decreaseMobileWallet(){
-        if (canDecrease()) {
-            mobileWalletDollars--;
-            logger.i(TAG, "Decreasing mobile wallet to:" + mobileWalletDollars);
-            notifyObservers();
-        }
-    }
-
-    public int getMobileWalletAmount(){
-        return mobileWalletDollars;
-    }
-
-    public int getSavingsWalletAmount(){
-        return totalDollarsAvailable - mobileWalletDollars;
-    }
-
-    public boolean canIncrease(){
-      return mobileWalletDollars<totalDollarsAvailable;
-    }
-
-    public boolean canDecrease(){
-        return mobileWalletDollars>0;
-    }
-
-}
diff --git a/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/ui/wallet/WalletsActivity.java b/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/ui/wallet/WalletsActivity.java
deleted file mode 100644
index 94dc7e68..00000000
--- a/app-examples/example-jv-01reactiveui/src/main/java/foo/bar/example/forereactiveui/ui/wallet/WalletsActivity.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package foo.bar.example.forereactiveui.ui.wallet;
-
-import android.os.Bundle;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.fragment.app.FragmentActivity;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import co.early.fore.core.observer.Observer;
-import foo.bar.example.forereactiveui.OG;
-import foo.bar.example.forereactiveui.R;
-import foo.bar.example.forereactiveui.feature.wallet.Wallet;
-
-
-public class WalletsActivity extends FragmentActivity {
-
-    //models that we need to sync with
-    private Wallet wallet = OG.get(Wallet.class);
-
-
-    //UI elements that we care about
-    @BindView(R.id.wallet_increase_btn)
-    public Button increaseMobileWalletBtn;
-
-    @BindView(R.id.wallet_decrease_btn)
-    public Button decreaseMobileWalletBtn;
-
-    @BindView(R.id.wallet_mobileamount_txt)
-    public TextView mobileWalletAmount;
-
-    @BindView(R.id.wallet_savingsamount_txt)
-    public TextView savingsWalletAmount;
-
-
-    //single observer reference
-    Observer observer = this::syncView;
-
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_wallet);
-
-        ButterKnife.bind(this);
-
-        setupButtonClickListeners();
-    }
-
-    private void setupButtonClickListeners() {
-        increaseMobileWalletBtn.setOnClickListener(v -> {
-            wallet.increaseMobileWallet();//notice how the data binding takes care of updating the view for you
-        });
-        decreaseMobileWalletBtn.setOnClickListener(v -> {
-            wallet.decreaseMobileWallet();//notice how the data binding takes care of updating the view for you
-        });
-    }
-
-
-    //reactive UI stuff below
-
-    public void syncView(){
-        increaseMobileWalletBtn.setEnabled(wallet.canIncrease());
-        decreaseMobileWalletBtn.setEnabled(wallet.canDecrease());
-        mobileWalletAmount.setText("" + wallet.getMobileWalletAmount());
-        savingsWalletAmount.setText("" + wallet.getSavingsWalletAmount());
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        wallet.addObserver(observer);
-        syncView(); //  <- don't forget this
-    }
-
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        wallet.removeObserver(observer);
-    }
-
-}
diff --git a/app-examples/example-jv-01reactiveui/src/main/res/values/strings.xml b/app-examples/example-jv-01reactiveui/src/main/res/values/strings.xml
deleted file mode 100644
index 598f4bcb..00000000
--- a/app-examples/example-jv-01reactiveui/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">jv 1 reactiveui ex</string>
-</resources>
diff --git a/app-examples/example-jv-01reactiveui/src/test/java/foo/bar/example/forereactiveui/feature/wallet/WalletTest.java b/app-examples/example-jv-01reactiveui/src/test/java/foo/bar/example/forereactiveui/feature/wallet/WalletTest.java
deleted file mode 100644
index 0ab997b9..00000000
--- a/app-examples/example-jv-01reactiveui/src/test/java/foo/bar/example/forereactiveui/feature/wallet/WalletTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package foo.bar.example.forereactiveui.feature.wallet;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-import co.early.fore.core.observer.Observer;
-
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- *
- */
-public class WalletTest {
-
-
-    private static Logger logger = new SystemLogger();
-
-    @Test
-    public void initialConditions() throws Exception {
-
-        //arrange
-        Wallet wallet = new Wallet(logger);
-
-        //act
-
-        //assert
-        Assert.assertEquals(true, wallet.canIncrease());
-        Assert.assertEquals(false, wallet.canDecrease());
-        Assert.assertEquals(wallet.totalDollarsAvailable, wallet.getSavingsWalletAmount());
-        Assert.assertEquals(0, wallet.getMobileWalletAmount());
-    }
-
-
-    @Test
-    public void increaseMobileWallet() throws Exception {
-
-        //arrange
-        Wallet wallet = new Wallet(logger);
-
-        //act
-        wallet.increaseMobileWallet();
-
-        //assert
-        Assert.assertEquals(true, wallet.canIncrease());
-        Assert.assertEquals(true, wallet.canDecrease());
-        Assert.assertEquals(wallet.totalDollarsAvailable - 1, wallet.getSavingsWalletAmount());
-        Assert.assertEquals(1, wallet.getMobileWalletAmount());
-    }
-
-
-    @Test
-    public void decreaseMobileWallet() throws Exception {
-
-        //arrange
-        Wallet wallet = new Wallet(logger);
-        wallet.increaseMobileWallet();
-        Assert.assertEquals(1, wallet.getMobileWalletAmount());
-
-        //act
-        wallet.decreaseMobileWallet();
-
-        //assert
-        Assert.assertEquals(true, wallet.canIncrease());
-        Assert.assertEquals(false, wallet.canDecrease());
-        Assert.assertEquals(wallet.totalDollarsAvailable, wallet.getSavingsWalletAmount());
-        Assert.assertEquals(0, wallet.getMobileWalletAmount());
-    }
-
-
-    @Test
-    public void canIncreaseIsFalseAtLimit() throws Exception {
-
-        //arrange
-        Wallet wallet = new Wallet(logger);
-        for (int ii=0; ii<wallet.totalDollarsAvailable; ii++){
-            wallet.increaseMobileWallet();
-        }
-
-        //act
-
-        //assert
-        Assert.assertEquals(false, wallet.canIncrease());
-        Assert.assertEquals(true, wallet.canDecrease());
-    }
-
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the databinding readme for more information about this
-     *
-     * @throws Exception
-     */
-    @Test
-    public void observersNotifiedAtLeastOnceForIncrease() throws Exception {
-
-        //arrange
-        Wallet wallet = new Wallet(logger);
-        Observer mockObserver = mock(Observer.class);
-        wallet.addObserver(mockObserver);
-
-        //act
-        wallet.increaseMobileWallet();
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-
-    @Test
-    public void observersNotifiedAtLeastOnceForDecrease() throws Exception {
-
-        //arrange
-        Wallet wallet = new Wallet(logger);
-        wallet.increaseMobileWallet();
-        Observer mockObserver = mock(Observer.class);
-        wallet.addObserver(mockObserver);
-
-        //act
-        wallet.decreaseMobileWallet();
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-
-
-
-}
diff --git a/app-examples/example-jv-02threading/build.gradle.kts b/app-examples/example-jv-02threading/build.gradle.kts
deleted file mode 100644
index 261660c9..00000000
--- a/app-examples/example-jv-02threading/build.gradle.kts
+++ /dev/null
@@ -1,93 +0,0 @@
-import co.early.fore.Shared
-import co.early.fore.Shared.BuildTypes
-
-plugins {
-    alias(libs.plugins.androidApplication)
-}
-
-
-val appId = "foo.bar.example.forethreading"
-
-fun getTestBuildType(): String {
-    return project.properties["testBuildType"] as String? ?: BuildTypes.DEFAULT
-}
-
-println("[$appId testBuildType:${getTestBuildType()}]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = appId
-    compileSdk = Shared.Android.compileSdk
-
-    defaultConfig {
-        applicationId = appId
-        minSdk = Shared.Android.minSdk
-        targetSdk = Shared.Android.targetSdk
-        versionCode = 1
-        versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testBuildType = getTestBuildType()
-    }
-    signingConfigs {
-        create(BuildTypes.RELEASE) {
-            // keytool -genkey -v -keystore debug.fake_keystore -storetype PKCS12 -alias android -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 20000 -dname "cn=Unknown, ou=Unknown, o=Unknown, c=Unknown"
-            storeFile = file("../keystore/debug.fake_keystore")
-            storePassword = "android"
-            keyAlias = "android"
-            keyPassword = "android"
-        }
-    }
-    buildTypes {
-        getByName(BuildTypes.DEBUG) {
-            isMinifyEnabled = false
-        }
-        getByName(BuildTypes.RELEASE) {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "../proguard-example-app.pro")
-            signingConfig = signingConfigs.getByName(BuildTypes.RELEASE)
-        }
-    }
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-example-apps.xml")
-    }
-    buildFeatures {
-        buildConfig = true
-    }
-}
-
-dependencies {
-
-    if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-jv-android-core:${Shared.Publish.published_fore_version_for_examples}")
-    } else {
-        implementation(project(":fore-jv:fore-jv-android-core"))
-    }
-
-    annotationProcessor("com.jakewharton:butterknife-compiler:${Shared.Versions.butterknife}")
-    //noinspection AnnotationProcessorOnCompilePath
-    implementation("com.jakewharton:butterknife:${Shared.Versions.butterknife}")
-
-    implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
-    implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    testImplementation("org.hamcrest:hamcrest-library:${Shared.Versions.hamcrest_library}")
-
-    androidTestImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:${Shared.Versions.dexmaker_mockito}")
-    androidTestImplementation("androidx.test:runner:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:rules:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.annotation:annotation:${Shared.Versions.annotation}")
-    androidTestImplementation("androidx.core:core:${Shared.Versions.android_core}")
-    androidTestImplementation("androidx.test.espresso:espresso-core:${Shared.Versions.espresso_core}") {
-        exclude(group = "com.android.support", module = "support-annotations")
-    }
-}
diff --git a/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ProgressBarIdler.java b/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ProgressBarIdler.java
deleted file mode 100644
index 72062a82..00000000
--- a/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ProgressBarIdler.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package foo.bar.example.forethreading;
-
-import android.app.Activity;
-import android.app.Application;
-import android.app.Instrumentation;
-import android.os.Bundle;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import androidx.core.content.ContextCompat;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ProgressBar;
-
-import java.util.Collection;
-
-import static androidx.test.runner.lifecycle.Stage.RESUMED;
-
-/**
- * If you have any spinning progress bars in your UI it will mess
- * up espresso tests (espresso will time out waiting for all UI
- * threads to be idle before proceeding).
- * <p>
- * This class will go through all your view elements views checking for
- * indeterminate progress bars and replacing the indeterminate drawable
- * with a static one so that espresso tests can continue
- * <p>
- * http://stackoverflow.com/a/37049916/3680389
- * https://stackoverflow.com/questions/33289152/progressbars-and-espresso#36201647
- */
-public class ProgressBarIdler implements Application.ActivityLifecycleCallbacks {
-
-    private static void makeAllProgressBarsIdle(View view) {
-        if (view instanceof ViewGroup) {
-            ViewGroup viewGroup = (ViewGroup) view;
-            for (int i = 0; i < viewGroup.getChildCount(); i++) {
-                makeAllProgressBarsIdle(viewGroup.getChildAt(i));
-            }
-        } else if (view instanceof ProgressBar) {
-            ProgressBar progressBar = (ProgressBar) view;
-            if (progressBar.isIndeterminate()) {
-                progressBar.setIndeterminateDrawable(ContextCompat.getDrawable(InstrumentationRegistry.getTargetContext(), android.R.drawable.ic_lock_lock));
-            }
-        }
-    }
-
-    public static void makeAllProgressBarsIdle(Instrumentation instrumentation, final Activity activity) {
-        instrumentation.runOnMainSync(new Runnable() {
-            public void run() {
-                makeAllProgressBarsIdle(activity.findViewById(android.R.id.content).getRootView());
-            }
-        });
-    }
-
-    public static void makeAllProgressBarsIdleForAllResumedActivities(Instrumentation instrumentation) {
-        instrumentation.runOnMainSync(new Runnable() {
-            public void run() {
-                Collection<Activity> resumedActivities = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(RESUMED);
-                if (resumedActivities.isEmpty()) {
-                    throw new RuntimeException("Could not change orientation");
-                }
-                for (Activity activity : resumedActivities) {
-                    makeAllProgressBarsIdle(activity.findViewById(android.R.id.content).getRootView());
-                }
-            }
-        });
-    }
-
-
-    @Override
-    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-
-    }
-
-    @Override
-    public void onActivityStarted(Activity activity) {
-
-    }
-
-    @Override
-    public void onActivityResumed(Activity activity) {
-        makeAllProgressBarsIdle(activity.findViewById(android.R.id.content).getRootView());
-    }
-
-    @Override
-    public void onActivityPaused(Activity activity) {
-
-    }
-
-    @Override
-    public void onActivityStopped(Activity activity) {
-
-    }
-
-    @Override
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-
-    }
-
-    @Override
-    public void onActivityDestroyed(Activity activity) {
-
-    }
-
-}
diff --git a/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ui/CounterViewTest.java b/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ui/CounterViewTest.java
deleted file mode 100644
index 9619e1df..00000000
--- a/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ui/CounterViewTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package foo.bar.example.forethreading.ui;
-
-import android.app.Activity;
-import android.app.Application;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import foo.bar.example.forethreading.ProgressBarIdler;
-import foo.bar.example.forethreading.R;
-import foo.bar.example.forethreading.feature.counter.CounterWithLambdas;
-import foo.bar.example.forethreading.feature.counter.CounterWithProgress;
-
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.not;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-@RunWith(AndroidJUnit4.class)
-public class CounterViewTest {
-
-
-    private CounterWithLambdas mockCounterWithLambdas;
-    private CounterWithProgress mockCounterWithProgress;
-
-
-    @Before
-    public void setup(){
-
-        //MockitoAnnotations.initMocks(CounterView.this);
-        System.setProperty("dexmaker.dexcache", InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
-
-        mockCounterWithLambdas = mock(CounterWithLambdas.class);
-        mockCounterWithProgress = mock(CounterWithProgress.class);
-
-        Application application = (Application)getInstrumentation().getTargetContext().getApplicationContext();
-        application.registerActivityLifecycleCallbacks(new ProgressBarIdler());
-    }
-
-    @Test
-    public void initialState() throws Exception {
-
-        //arrange
-        new StateBuilder(mockCounterWithLambdas, mockCounterWithProgress)
-                .counterWithProgressIsBusy(true)
-                .counterWithProgressProgressValue(7)
-                .counterWithProgressCount(40)
-                .counterBasicIsBusy(false)
-                .counterBasicCount(0)
-                .createRule()
-                .launchActivity(null);
-
-        //act
-
-        //assert
-        onView(withId(R.id.counterwprog_increase_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.counterwprog_busy_progress)).check(matches(isDisplayed()));
-        onView(withId(R.id.counterwprog_progress_txt)).check(matches(withText("7")));
-        onView(withId(R.id.counterwprog_current_txt)).check(matches(withText("40")));
-        onView(withId(R.id.counterwlambda_increase_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.counterwlambda_busy_progress)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.counterwlambda_current_txt)).check(matches(withText("0")));
-    }
-
-    @Test
-    public void rotationState() throws Exception {
-
-        //arrange
-        Activity activity = new StateBuilder(mockCounterWithLambdas, mockCounterWithProgress)
-                .counterWithProgressIsBusy(true)
-                .counterWithProgressProgressValue(7)
-                .counterWithProgressCount(40)
-                .counterBasicIsBusy(false)
-                .counterBasicCount(0)
-                .createRule()
-                .launchActivity(null);
-        activity.setRequestedOrientation(SCREEN_ORIENTATION_LANDSCAPE);
-
-        //act
-        activity.setRequestedOrientation(SCREEN_ORIENTATION_PORTRAIT);
-
-        //assert
-        onView(withId(R.id.counterwprog_increase_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.counterwprog_busy_progress)).check(matches(isDisplayed()));
-        onView(withId(R.id.counterwprog_progress_txt)).check(matches(withText("7")));
-        onView(withId(R.id.counterwprog_current_txt)).check(matches(withText("40")));
-        onView(withId(R.id.counterwlambda_increase_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.counterwlambda_busy_progress)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.counterwlambda_current_txt)).check(matches(withText("0")));
-    }
-
-    @Test
-    public void clickCallsBasicModel() throws Exception {
-        //arrange
-        new StateBuilder(mockCounterWithLambdas, mockCounterWithProgress)
-                .counterBasicIsBusy(false)
-                .createRule()
-                .launchActivity(null);
-        //act
-        onView(withId(R.id.counterwlambda_increase_btn)).perform(click());
-
-        //assert
-        verify(mockCounterWithLambdas).increaseBy20();
-    }
-
-    @Test
-    public void clickCallsWithProgressModel() throws Exception {
-        //arrange
-        new StateBuilder(mockCounterWithLambdas, mockCounterWithProgress)
-                .counterWithProgressIsBusy(false)
-                .createRule()
-                .launchActivity(null);
-
-        //act
-        onView(withId(R.id.counterwprog_increase_btn)).perform(click());
-
-        //assert
-        verify(mockCounterWithProgress).increaseBy20();
-    }
-}
diff --git a/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ui/StateBuilder.java b/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ui/StateBuilder.java
deleted file mode 100644
index 4009653b..00000000
--- a/app-examples/example-jv-02threading/src/androidTest/java/foo/bar/example/forethreading/ui/StateBuilder.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package foo.bar.example.forethreading.ui;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import co.early.fore.core.WorkMode;
-import foo.bar.example.forethreading.App;
-import foo.bar.example.forethreading.OG;
-import foo.bar.example.forethreading.feature.counter.CounterWithLambdas;
-import foo.bar.example.forethreading.feature.counter.CounterWithProgress;
-
-import static org.mockito.Mockito.when;
-
-/**
- *
- */
-public class StateBuilder {
-
-    private CounterWithLambdas mockCounterWithLambdas;
-    private CounterWithProgress mockCounterWithProgress;
-
-    StateBuilder(CounterWithLambdas mockCounterWithLambdas, CounterWithProgress mockCounterWithProgress) {
-        this.mockCounterWithLambdas = mockCounterWithLambdas;
-        this.mockCounterWithProgress = mockCounterWithProgress;
-    }
-
-    StateBuilder counterBasicIsBusy(boolean busy) {
-        when(mockCounterWithLambdas.isBusy()).thenReturn(busy);
-        return this;
-    }
-
-    StateBuilder counterWithProgressIsBusy(boolean busy) {
-        when(mockCounterWithProgress.isBusy()).thenReturn(busy);
-        return this;
-    }
-
-    StateBuilder counterBasicCount(int count) {
-        when(mockCounterWithLambdas.getCount()).thenReturn(count);
-        return this;
-    }
-
-    StateBuilder counterWithProgressCount(int count) {
-        when(mockCounterWithProgress.getCount()).thenReturn(count);
-        return this;
-    }
-
-    StateBuilder counterWithProgressProgressValue(int value) {
-        when(mockCounterWithProgress.getProgress()).thenReturn(value);
-        return this;
-    }
-
-    ActivityTestRule<CounterActivity>  createRule(){
-
-        return new ActivityTestRule<CounterActivity>(CounterActivity.class) {
-            @Override
-            protected void beforeActivityLaunched() {
-
-                //get hold of the application
-                App app = (App) InstrumentationRegistry.getTargetContext().getApplicationContext();
-                OG.setApplication(app, WorkMode.SYNCHRONOUS);
-
-                //inject our mocks so our UI layer will pick them up
-                OG.putMock(CounterWithLambdas.class, mockCounterWithLambdas);
-                OG.putMock(CounterWithProgress.class, mockCounterWithProgress);
-            }
-
-        };
-    }
-
-}
diff --git a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/App.java b/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/App.java
deleted file mode 100644
index ec214be4..00000000
--- a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/App.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package foo.bar.example.forethreading;
-
-import android.app.Application;
-
-/**
- * Try not to fill this class with lots of code, if possible move it to a model somewhere
- */
-public class App extends Application {
-
-    private static App inst;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        inst = this;
-
-        OG.setApplication(inst);
-        OG.init();
-    }
-
-    public static App getInst() {
-        return inst;
-    }
-
-}
diff --git a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/OG.java b/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/OG.java
deleted file mode 100644
index 4c655519..00000000
--- a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/OG.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package foo.bar.example.forethreading;
-
-import android.app.Application;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.AndroidLogger;
-import foo.bar.example.forethreading.feature.counter.CounterWithLambdas;
-import foo.bar.example.forethreading.feature.counter.CounterWithProgress;
-
-import static co.early.fore.core.Affirm.notNull;
-
-/**
- *
- * OG - Object Graph, pure DI implementation
- *
- * Copyright © 2019 early.co. All rights reserved.
- */
-public class OG {
-
-    private static boolean initialized = false;
-    private static final Map<Class<?>, Object> dependencies = new HashMap<>();
-
-
-    public static void setApplication(Application application) {
-        setApplication(application, WorkMode.ASYNCHRONOUS);
-    }
-
-    public static void setApplication(Application application, final WorkMode workMode) {
-
-        notNull(application);
-        notNull(workMode);
-
-
-        // create dependency graph
-        AndroidLogger logger = new AndroidLogger("fore_");
-        CounterWithLambdas counterWithLambdas = new CounterWithLambdas(
-                workMode,
-                logger);
-        CounterWithProgress counterWithProgress = new CounterWithProgress(
-                workMode,
-                logger);
-
-
-        // add models to the dependencies map if you will need them later
-        dependencies.put(CounterWithLambdas.class, counterWithLambdas);
-        dependencies.put(CounterWithProgress.class, counterWithProgress);
-
-    }
-
-    public static void init() {
-        if (!initialized) {
-            initialized = true;
-
-            // run any necessary initialization code once object graph has been created here
-
-        }
-    }
-
-    public static <T> T get(Class<T> model) {
-
-        notNull(model);
-        T t = model.cast(dependencies.get(model));
-        notNull(t);
-
-        return t;
-    }
-
-    public static <T> void putMock(Class<T> clazz, T object) {
-
-        notNull(clazz);
-        notNull(object);
-
-        dependencies.put(clazz, object);
-    }
-
-}
diff --git a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/feature/counter/CounterWithLambdas.java b/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/feature/counter/CounterWithLambdas.java
deleted file mode 100644
index cec8923c..00000000
--- a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/feature/counter/CounterWithLambdas.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package foo.bar.example.forethreading.feature.counter;
-
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.observer.ObservableImp;
-import co.early.fore.core.threading.AsyncBuilder;
-
-/**
- *
- */
-public class CounterWithLambdas extends ObservableImp{
-
-    public static final String TAG = CounterWithLambdas.class.getSimpleName();
-
-    private final WorkMode workMode;
-    private final Logger logger;
-
-    private boolean isBusy = false;
-    private int count;
-
-
-    public CounterWithLambdas(WorkMode workMode, Logger logger) {
-        super(workMode, logger);
-        this.workMode = Affirm.notNull(workMode);
-        this.logger = Affirm.notNull(logger);
-    }
-
-
-    public void increaseBy20(){
-
-        logger.i(TAG, "increaseBy20()");
-
-        isBusy = true;
-        notifyObservers();
-
-        new AsyncBuilder<Void, Integer>(workMode)
-                .doInBackground(input -> CounterWithLambdas.this.doStuffInBackground(input))
-                .onPostExecute(result -> CounterWithLambdas.this.doThingsWithTheResult(result))
-                .execute((Void) null);
-
-    }
-
-
-    private Integer doStuffInBackground(Void... inputs){
-        int totalIncrease = 0;
-
-        for (int ii=0; ii<20; ii++) {
-            synchronized (this) {
-                try {
-                    wait(workMode == WorkMode.SYNCHRONOUS ? 1 : 100);
-                } catch (InterruptedException e) {
-                }
-            }
-            ++totalIncrease;
-
-            logger.i(TAG, "-tick-");
-        }
-
-        return totalIncrease;
-    }
-
-
-    private void doThingsWithTheResult(Integer result){
-
-        logger.i(TAG, "done");
-
-        count = count + result;
-        isBusy = false;
-        notifyObservers();
-    }
-
-
-    public boolean isBusy() {
-        return isBusy;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-}
diff --git a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/feature/counter/CounterWithProgress.java b/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/feature/counter/CounterWithProgress.java
deleted file mode 100644
index 8d3f9c46..00000000
--- a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/feature/counter/CounterWithProgress.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package foo.bar.example.forethreading.feature.counter;
-
-
-import android.annotation.SuppressLint;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.observer.ObservableImp;
-import co.early.fore.core.threading.Async;
-
-/**
- *
- */
-public class CounterWithProgress extends ObservableImp{
-
-    public static final String TAG = CounterWithProgress.class.getSimpleName();
-
-    private final WorkMode workMode;
-    private final Logger logger;
-
-    private boolean isBusy = false;
-    private int count;
-    private int progress;
-
-
-    public CounterWithProgress(WorkMode workMode, Logger logger) {
-        super(workMode, logger);
-        this.workMode = Affirm.notNull(workMode);
-        this.logger = Affirm.notNull(logger);
-    }
-
-
-    @SuppressLint("StaticFieldLeak")
-    public void increaseBy20(){
-
-        logger.i(TAG, "increaseBy20()");
-
-        isBusy = true;
-        notifyObservers();
-
-        new Async<Void, Integer, Integer>(workMode) {
-            @Override
-            protected Integer doInBackground(Void... voids) {
-
-                int totalIncrease = 0;
-
-                for (int ii=0; ii<20; ii++) {
-                    synchronized (this) {
-                        try {
-                            wait(workMode == WorkMode.SYNCHRONOUS ? 1 : 100);
-                        } catch (InterruptedException e) {
-                        }
-                    }
-
-                    publishProgressTask(++totalIncrease);
-                }
-
-                return totalIncrease;
-            }
-
-            @Override
-            protected void onProgressUpdate(Integer... values) {
-
-                logger.i(TAG, "-tick-");
-
-                progress = values[0];
-                notifyObservers();
-            }
-
-            @Override
-            protected void onPostExecute(Integer result) {
-
-                logger.i(TAG, "done");
-
-                count = count + result;
-                isBusy = false;
-                progress = 0;
-                notifyObservers();
-            }
-
-        }.executeTask((Void)null);
-
-    }
-
-
-    public boolean isBusy() {
-        return isBusy;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public int getProgress() {
-        return progress;
-    }
-}
diff --git a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/ui/CounterActivity.java b/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/ui/CounterActivity.java
deleted file mode 100644
index c48c1d77..00000000
--- a/app-examples/example-jv-02threading/src/main/java/foo/bar/example/forethreading/ui/CounterActivity.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package foo.bar.example.forethreading.ui;
-
-import android.os.Bundle;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.fragment.app.FragmentActivity;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import co.early.fore.core.observer.Observer;
-import foo.bar.example.forethreading.OG;
-import foo.bar.example.forethreading.R;
-import foo.bar.example.forethreading.feature.counter.CounterWithLambdas;
-import foo.bar.example.forethreading.feature.counter.CounterWithProgress;
-
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
-
-
-public class CounterActivity extends FragmentActivity {
-
-    //models that we need to sync with
-    private CounterWithProgress counterWithProgress = OG.get(CounterWithProgress.class);
-    private CounterWithLambdas counterWithLambdas = OG.get(CounterWithLambdas.class);
-
-
-    //UI elements that we care about
-    @BindView(R.id.counterwprog_increase_btn)
-    public Button increaseBy20Prog;
-
-    @BindView(R.id.counterwprog_busy_progress)
-    public ProgressBar busyProg;
-
-    @BindView(R.id.counterwprog_progress_txt)
-    public TextView progressNumberProg;
-
-    @BindView(R.id.counterwprog_current_txt)
-    public TextView currentNumberProg;
-
-    @BindView(R.id.counterwlambda_increase_btn)
-    public Button increaseBy20Basic;
-
-    @BindView(R.id.counterwlambda_busy_progress)
-    public ProgressBar busyBasic;
-
-    @BindView(R.id.counterwlambda_current_txt)
-    public TextView currentNumberBasic;
-
-
-    //single observer reference
-    Observer observer = this::syncView;
-
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_counter);
-
-        ButterKnife.bind(this);
-
-        setupButtonClickListeners();
-    }
-
-    private void setupButtonClickListeners() {
-        increaseBy20Prog.setOnClickListener(v -> counterWithProgress.increaseBy20());
-        increaseBy20Basic.setOnClickListener(v -> counterWithLambdas.increaseBy20());
-    }
-
-
-    //data binding stuff below
-
-    public void syncView(){
-        increaseBy20Prog.setEnabled(!counterWithProgress.isBusy());
-        busyProg.setVisibility(counterWithProgress.isBusy() ? VISIBLE : INVISIBLE);
-        progressNumberProg.setText("" + counterWithProgress.getProgress());
-        currentNumberProg.setText("" + counterWithProgress.getCount());
-
-        increaseBy20Basic.setEnabled(!counterWithLambdas.isBusy());
-        busyBasic.setVisibility(counterWithLambdas.isBusy() ? VISIBLE : INVISIBLE);
-        currentNumberBasic.setText("" + counterWithLambdas.getCount());
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        counterWithLambdas.addObserver(observer);
-        counterWithProgress.addObserver(observer);
-        syncView(); //<-- don't forget this
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        counterWithLambdas.removeObserver(observer);
-        counterWithProgress.removeObserver(observer);
-    }
-
-}
diff --git a/app-examples/example-jv-02threading/src/main/res/layout/activity_counter.xml b/app-examples/example-jv-02threading/src/main/res/layout/activity_counter.xml
deleted file mode 100644
index d67503cf..00000000
--- a/app-examples/example-jv-02threading/src/main/res/layout/activity_counter.xml
+++ /dev/null
@@ -1,102 +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:background="@color/colorPrimaryDark"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:layout_margin="20dp"
-            android:padding="10dp">
-
-            <Button
-                android:id="@+id/counterwprog_increase_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text="increase with Async" />
-
-            <ProgressBar
-                android:id="@+id/counterwprog_busy_progress"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:indeterminate="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="progress value:" />
-
-            <TextView
-                android:id="@+id/counterwprog_progress_txt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="20sp"
-                android:textColor="@color/colorLightGrey"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="latest count:" />
-
-            <TextView
-                android:id="@+id/counterwprog_current_txt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="20sp"
-                android:textColor="@color/colorLightGrey"/>
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:layout_margin="20dp"
-            android:padding="10dp">
-
-            <Button
-                android:id="@+id/counterwlambda_increase_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text="increase with AsyncBuilder" />
-
-            <ProgressBar
-                android:id="@+id/counterwlambda_busy_progress"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:indeterminate="true" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="latest count:" />
-
-            <TextView
-                android:id="@+id/counterwlambda_current_txt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="20sp"
-                android:textColor="@color/colorLightGrey"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/app-examples/example-jv-02threading/src/main/res/values/strings.xml b/app-examples/example-jv-02threading/src/main/res/values/strings.xml
deleted file mode 100644
index bccff288..00000000
--- a/app-examples/example-jv-02threading/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">jv 2 threading ex</string>
-</resources>
diff --git a/app-examples/example-jv-02threading/src/test/java/foo/bar/example/forethreading/feature/counter/CounterWithLambdasTest.java b/app-examples/example-jv-02threading/src/test/java/foo/bar/example/forethreading/feature/counter/CounterWithLambdasTest.java
deleted file mode 100644
index eb6e1046..00000000
--- a/app-examples/example-jv-02threading/src/test/java/foo/bar/example/forethreading/feature/counter/CounterWithLambdasTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package foo.bar.example.forethreading.feature.counter;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-import co.early.fore.core.observer.Observer;
-
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- *
- */
-public class CounterWithLambdasTest {
-
-
-    private static Logger logger = new SystemLogger();
-
-    @Test
-    public void initialConditions() throws Exception {
-
-        //arrange
-        CounterWithLambdas counterWithLambdas = new CounterWithLambdas(WorkMode.SYNCHRONOUS, logger);
-
-        //act
-
-        //assert
-        Assert.assertEquals(false, counterWithLambdas.isBusy());
-        Assert.assertEquals(0, counterWithLambdas.getCount());
-    }
-
-
-    @Test
-    public void increasesBy20() throws Exception {
-
-        //arrange
-        CounterWithLambdas counterWithLambdas = new CounterWithLambdas(WorkMode.SYNCHRONOUS, logger);
-
-        //act
-        counterWithLambdas.increaseBy20();
-
-        //assert
-        Assert.assertEquals(false, counterWithLambdas.isBusy());
-        Assert.assertEquals(20, counterWithLambdas.getCount());
-    }
-
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times the observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the databinding readme for more information about this
-     *
-     * @throws Exception
-     */
-    @Test
-    public void observersNotifiedAtLeastOnce() throws Exception {
-
-        //arrange
-        CounterWithLambdas counterWithLambdas = new CounterWithLambdas(WorkMode.SYNCHRONOUS, logger);
-        Observer mockObserver = mock(Observer.class);
-        counterWithLambdas.addObserver(mockObserver);
-
-        //act
-        counterWithLambdas.increaseBy20();
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-
-}
diff --git a/app-examples/example-jv-02threading/src/test/java/foo/bar/example/forethreading/feature/counter/CounterWithProgressTest.java b/app-examples/example-jv-02threading/src/test/java/foo/bar/example/forethreading/feature/counter/CounterWithProgressTest.java
deleted file mode 100644
index e056b253..00000000
--- a/app-examples/example-jv-02threading/src/test/java/foo/bar/example/forethreading/feature/counter/CounterWithProgressTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package foo.bar.example.forethreading.feature.counter;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-import co.early.fore.core.observer.Observer;
-
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- *
- */
-public class CounterWithProgressTest {
-
-
-    private static Logger logger = new SystemLogger();
-
-    @Test
-    public void initialConditions() throws Exception {
-
-        //arrange
-        CounterWithProgress counterWithProgress = new CounterWithProgress(WorkMode.SYNCHRONOUS, logger);
-
-        //act
-
-        //assert
-        Assert.assertEquals(false, counterWithProgress.isBusy());
-        Assert.assertEquals(0, counterWithProgress.getProgress());
-        Assert.assertEquals(0, counterWithProgress.getCount());
-    }
-
-
-    @Test
-    public void increasesBy20() throws Exception {
-
-        //arrange
-        CounterWithProgress counterWithProgress = new CounterWithProgress(WorkMode.SYNCHRONOUS, logger);
-
-        //act
-        counterWithProgress.increaseBy20();
-
-        //assert
-        Assert.assertEquals(false, counterWithProgress.isBusy());
-        Assert.assertEquals(0, counterWithProgress.getProgress());
-        Assert.assertEquals(20, counterWithProgress.getCount());
-    }
-
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the databinding readme for more information about this
-     *
-     * @throws Exception
-     */
-    @Test
-    public void observersNotifiedAtLeastOnce() throws Exception {
-
-        //arrange
-        CounterWithProgress counterWithProgress = new CounterWithProgress(WorkMode.SYNCHRONOUS, logger);
-        Observer mockObserver = mock(Observer.class);
-        counterWithProgress.addObserver(mockObserver);
-
-        //act
-        counterWithProgress.increaseBy20();
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-
-    /**
-     * Not so easy to test. We'll skip mockito for this test and do it manually.
-     * We will test that the progress is:
-     *
-     * - published 20 times during one call to increaseBy20()
-     * - never decreases from the last progress value (except when it gets set back to 0)
-     *
-     * @throws Exception
-     */
-    @Test
-    public void progressIsPublished() throws Exception {
-
-        //arrange
-        final CounterWithProgress counterWithProgress = new CounterWithProgress(WorkMode.SYNCHRONOUS, logger);
-        final ProgressTracker pt = new ProgressTracker();
-        counterWithProgress.addObserver(() -> {
-            int latestProgess = counterWithProgress.getProgress();
-            if (latestProgess!=0){//or we just ignore it
-                Assert.assertEquals(true, latestProgess >= pt.latestProgress);//never want progress to go down
-                if (latestProgess > pt.latestProgress) {//if progress ticks up, then we count it as a progress publication
-                    pt.latestProgress = latestProgess;
-                    pt.numberOfProgressPublications++;
-                }
-            }
-        });
-
-        //act
-        counterWithProgress.increaseBy20();
-
-        //assert
-        Assert.assertEquals(20, pt.numberOfProgressPublications);
-    }
-
-
-    private class ProgressTracker{
-        public int numberOfProgressPublications = 0;
-        public int latestProgress = 0;
-    }
-
-
-}
diff --git a/app-examples/example-jv-03adapters/build.gradle.kts b/app-examples/example-jv-03adapters/build.gradle.kts
deleted file mode 100644
index d8e0798c..00000000
--- a/app-examples/example-jv-03adapters/build.gradle.kts
+++ /dev/null
@@ -1,96 +0,0 @@
-import co.early.fore.Shared
-import co.early.fore.Shared.BuildTypes
-
-plugins {
-    alias(libs.plugins.androidApplication)
-}
-
-
-val appId = "foo.bar.example.foreadapters"
-
-fun getTestBuildType(): String {
-    return project.properties["testBuildType"] as String? ?: BuildTypes.DEFAULT
-}
-
-println("[$appId testBuildType:${getTestBuildType()}]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = appId
-    compileSdk = Shared.Android.compileSdk
-
-    defaultConfig {
-        applicationId = appId
-        minSdk = Shared.Android.minSdk
-        targetSdk = Shared.Android.targetSdk
-        versionCode = 1
-        versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testBuildType = getTestBuildType()
-    }
-    signingConfigs {
-        create(BuildTypes.RELEASE) {
-            // keytool -genkey -v -keystore debug.fake_keystore -storetype PKCS12 -alias android -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 20000 -dname "cn=Unknown, ou=Unknown, o=Unknown, c=Unknown"
-            storeFile = file("../keystore/debug.fake_keystore")
-            storePassword = "android"
-            keyAlias = "android"
-            keyPassword = "android"
-        }
-    }
-    buildTypes {
-        getByName(BuildTypes.DEBUG) {
-            isMinifyEnabled = false
-        }
-        getByName(BuildTypes.RELEASE) {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "../proguard-example-app.pro")
-            signingConfig = signingConfigs.getByName(BuildTypes.RELEASE)
-        }
-    }
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-example-apps.xml")
-    }
-    buildFeatures {
-        buildConfig = true
-    }
-}
-
-dependencies {
-
-    if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-jv-android-adapters:${Shared.Publish.published_fore_version_for_examples}")
-    } else {
-        implementation(project(":fore-jv:fore-jv-android-adapters"))
-    }
-
-    annotationProcessor("com.jakewharton:butterknife-compiler:${Shared.Versions.butterknife}")
-    //noinspection AnnotationProcessorOnCompilePath
-    implementation("com.jakewharton:butterknife:${Shared.Versions.butterknife}")
-
-    implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
-    implementation("androidx.recyclerview:recyclerview:${Shared.Versions.recyclerview}")
-    implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    testImplementation("org.hamcrest:hamcrest-library:${Shared.Versions.hamcrest_library}")
-
-    androidTestImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:${Shared.Versions.dexmaker_mockito}")
-    androidTestImplementation("androidx.recyclerview:recyclerview:${Shared.Versions.recyclerview}")
-    androidTestImplementation("androidx.test.ext:junit:${Shared.Versions.androidxjunit}")
-    androidTestImplementation("androidx.test:runner:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:rules:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.annotation:annotation:${Shared.Versions.annotation}")
-    androidTestImplementation("androidx.core:core:${Shared.Versions.android_core}")
-    androidTestImplementation("androidx.test.espresso:espresso-core:${Shared.Versions.espresso_core}") {
-        exclude(group = "com.android.support", module = "support-annotations")
-    }
-}
diff --git a/app-examples/example-jv-03adapters/screenshot.png b/app-examples/example-jv-03adapters/screenshot.png
deleted file mode 100644
index e99fb672..00000000
Binary files a/app-examples/example-jv-03adapters/screenshot.png and /dev/null differ
diff --git a/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/EspressoTestMatchers.java b/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/EspressoTestMatchers.java
deleted file mode 100644
index c2fbd0c0..00000000
--- a/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/EspressoTestMatchers.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package foo.bar.example.foreadapters.ui;
-
-import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-/**
- *
- * https://stackoverflow.com/questions/30361068/assert-proper-number-of-items-in-list-with-espresso
- *
- */
-public class EspressoTestMatchers {
-
-    public static Matcher<View> withRecyclerViewItems (final int size) {
-        return new TypeSafeMatcher<View>() {
-            @Override public boolean matchesSafely (final View view) {
-                return ((RecyclerView) view).getAdapter().getItemCount () == size;
-            }
-
-            @Override public void describeTo (final Description description) {
-                description.appendText ("RecycleView should have " + size + " items");
-            }
-        };
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/playlist/PlaylistsViewTest.java b/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/playlist/PlaylistsViewTest.java
deleted file mode 100644
index 9c884ac7..00000000
--- a/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/playlist/PlaylistsViewTest.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package foo.bar.example.foreadapters.ui.playlist;
-
-import android.app.Activity;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import foo.bar.example.foreadapters.R;
-import foo.bar.example.foreadapters.feature.playlist.ImmutablePlaylistModel;
-import foo.bar.example.foreadapters.feature.playlist.MutablePlaylistModel;
-import foo.bar.example.foreadapters.feature.playlist.Track;
-import foo.bar.example.foreadapters.ui.EspressoTestMatchers;
-
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.not;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-@RunWith(AndroidJUnit4.class)
-public class PlaylistsViewTest {
-
-
-    private ImmutablePlaylistModel mockImmutablePlaylistModel;
-    private MutablePlaylistModel mockMutablePlaylistModel;
-
-
-    @Before
-    public void setup(){
-
-        //MockitoAnnotations.initMocks(WalletView.this);
-        System.setProperty("dexmaker.dexcache", InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
-
-        mockMutablePlaylistModel = mock(MutablePlaylistModel.class);
-        mockImmutablePlaylistModel = mock(ImmutablePlaylistModel.class);
-    }
-
-
-    @Test
-    public void emptyPlaylists() throws Exception {
-
-        //arrange
-        new StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-                .withMutablePlaylistHavingTracks(0)
-                .withImmutablePlaylistHavingTracks(0)
-                .withPlaylistsContainingTracks(new Track(R.color.pastel1))
-                .createRule()
-                .launchActivity(null);
-
-        //act
-
-        //assert
-        onView(withId(R.id.playlist_add1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_add2_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_clear1_button)).check(matches(not(isEnabled())));
-        onView(withId(R.id.playlist_clear2_button)).check(matches(not(isEnabled())));
-
-        onView(withId(R.id.playlist_addMany1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_addMany2_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_removeMany1_button)).check(matches(not(isEnabled())));
-        onView(withId(R.id.playlist_removeMany2_button)).check(matches(not(isEnabled())));
-
-        onView(withId(R.id.playlist_totaltracks1_textview)).check(matches(withText("[0]")));
-        onView(withId(R.id.playlist_totaltracks2_textview)).check(matches(withText("[0]")));
-
-        onView(withId(R.id.playlist_list1_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(0)));
-        onView(withId(R.id.playlist_list2_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(0)));
-
-    }
-
-
-    @Test
-    public void with3ItemsInEachPlaylist() throws Exception {
-
-        //arrange
-        new StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-                .withMutablePlaylistHavingTracks(3)
-                .withImmutablePlaylistHavingTracks(3)
-                .withPlaylistsContainingTracks(new Track(R.color.pastel1))
-                .createRule()
-                .launchActivity(null);
-
-        //act
-
-        //assert
-        onView(withId(R.id.playlist_add1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_add2_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_clear1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_clear2_button)).check(matches(isEnabled()));
-
-        onView(withId(R.id.playlist_addMany1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_addMany2_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_removeMany1_button)).check(matches(not(isEnabled())));
-        onView(withId(R.id.playlist_removeMany2_button)).check(matches(not(isEnabled())));
-
-        onView(withId(R.id.playlist_totaltracks1_textview)).check(matches(withText("[3]")));
-        onView(withId(R.id.playlist_totaltracks2_textview)).check(matches(withText("[3]")));
-
-        onView(withId(R.id.playlist_list1_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(3)));
-        onView(withId(R.id.playlist_list2_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(3)));
-
-    }
-
-
-    @Test
-    public void with5ItemsInEachPlaylist() throws Exception {
-
-        //arrange
-        new StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-                .withMutablePlaylistHavingTracks(5)
-                .withImmutablePlaylistHavingTracks(5)
-                .withPlaylistsContainingTracks(new Track(R.color.pastel1))
-                .createRule()
-                .launchActivity(null);
-
-        //act
-
-        //assert
-        onView(withId(R.id.playlist_add1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_add2_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_clear1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_clear2_button)).check(matches(isEnabled()));
-
-        onView(withId(R.id.playlist_addMany1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_addMany2_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_removeMany1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_removeMany2_button)).check(matches(isEnabled()));
-
-        onView(withId(R.id.playlist_totaltracks1_textview)).check(matches(withText("[5]")));
-        onView(withId(R.id.playlist_totaltracks2_textview)).check(matches(withText("[5]")));
-
-        onView(withId(R.id.playlist_list1_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(5)));
-        onView(withId(R.id.playlist_list2_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(5)));
-
-    }
-
-
-    @Test
-    public void withDifferentItemsInEachPlaylist() throws Exception {
-
-        //arrange
-        new StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-                .withImmutablePlaylistHavingTracks(0)
-                .withMutablePlaylistHavingTracks(5)
-                .withPlaylistsContainingTracks(new Track(R.color.pastel1))
-                .createRule()
-                .launchActivity(null);
-
-        //act
-
-        //assert
-        onView(withId(R.id.playlist_clear1_button)).check(matches(not(isEnabled())));
-        onView(withId(R.id.playlist_clear2_button)).check(matches(isEnabled()));
-
-        onView(withId(R.id.playlist_removeMany1_button)).check(matches(not(isEnabled())));
-        onView(withId(R.id.playlist_removeMany2_button)).check(matches(isEnabled()));
-
-        onView(withId(R.id.playlist_totaltracks1_textview)).check(matches(withText("[0]")));
-        onView(withId(R.id.playlist_totaltracks2_textview)).check(matches(withText("[5]")));
-
-        onView(withId(R.id.playlist_list1_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(0)));
-        onView(withId(R.id.playlist_list2_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(5)));
-
-    }
-
-
-    @Test
-    public void stateMaintainedAfterRotation() throws Exception {
-
-        //arrange
-        Activity activity = new StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-                .withMutablePlaylistHavingTracks(3)
-                .withImmutablePlaylistHavingTracks(3)
-                .withPlaylistsContainingTracks(new Track(R.color.pastel1))
-                .createRule()
-                .launchActivity(null);
-        activity.setRequestedOrientation(SCREEN_ORIENTATION_LANDSCAPE);
-
-        onView(withId(R.id.playlist_addMany1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_removeMany1_button)).check(matches(not(isEnabled())));
-        onView(withId(R.id.playlist_totaltracks1_textview)).check(matches(withText("[3]")));
-
-        //act
-        activity.setRequestedOrientation(SCREEN_ORIENTATION_PORTRAIT);
-
-        //assert
-        onView(withId(R.id.playlist_addMany1_button)).check(matches(isEnabled()));
-        onView(withId(R.id.playlist_removeMany1_button)).check(matches(not(isEnabled())));
-        onView(withId(R.id.playlist_totaltracks1_textview)).check(matches(withText("[3]")));
-    }
-
-
-    @Test
-    public void clickAddTrackMutableCallsModel() throws Exception {
-        //arrange
-        new StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-                .withMutablePlaylistHavingTracks(0)
-                .withImmutablePlaylistHavingTracks(0)
-                .withPlaylistsContainingTracks(new Track(R.color.pastel1))
-                .createRule()
-                .launchActivity(null);
-
-        //act
-        onView(withId(R.id.playlist_add2_button)).perform(click());
-
-        //assert
-        verify(mockMutablePlaylistModel).addNewTrack();
-    }
-
-
-    @Test
-    public void clickAddTrackImmutableCallsModel() throws Exception {
-        //arrange
-        new StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-                .withMutablePlaylistHavingTracks(0)
-                .withImmutablePlaylistHavingTracks(0)
-                .withPlaylistsContainingTracks(new Track(R.color.pastel1))
-                .createRule()
-                .launchActivity(null);
-
-        //act
-        onView(withId(R.id.playlist_add1_button)).perform(click());
-
-        //assert
-        verify(mockImmutablePlaylistModel).addNewTrack();
-    }
-
-}
diff --git a/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/playlist/StateBuilder.java b/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/playlist/StateBuilder.java
deleted file mode 100644
index 2715ba5d..00000000
--- a/app-examples/example-jv-03adapters/src/androidTest/java/foo/bar/example/foreadapters/ui/playlist/StateBuilder.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package foo.bar.example.foreadapters.ui.playlist;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-
-import co.early.fore.adapters.immutable.DiffSpec;
-import co.early.fore.adapters.mutable.UpdateSpec;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.time.SystemTimeWrapper;
-import foo.bar.example.foreadapters.App;
-import foo.bar.example.foreadapters.OG;
-import foo.bar.example.foreadapters.feature.playlist.ImmutablePlaylistModel;
-import foo.bar.example.foreadapters.feature.playlist.MutablePlaylistModel;
-import foo.bar.example.foreadapters.feature.playlist.Track;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class StateBuilder {
-
-    private MutablePlaylistModel mockMutablePlaylistModel;
-    private ImmutablePlaylistModel mockImmutablePlaylistModel;
-
-    StateBuilder(MutablePlaylistModel mockMutablePlaylistModel, ImmutablePlaylistModel mockImmutablePlaylistModel) {
-        this.mockMutablePlaylistModel = mockMutablePlaylistModel;
-        this.mockImmutablePlaylistModel = mockImmutablePlaylistModel;
-
-        UpdateSpec updateSpec = new UpdateSpec(UpdateSpec.UpdateType.FULL_UPDATE, 0, 0, mock(SystemTimeWrapper.class));
-        when(mockMutablePlaylistModel.getAndClearLatestUpdateSpec(anyLong())).thenReturn(updateSpec);
-
-        DiffSpec diffSpec = new DiffSpec(null, mock(SystemTimeWrapper.class));
-        when(mockImmutablePlaylistModel.getAndClearLatestDiffSpec(anyLong())).thenReturn(diffSpec);
-    }
-
-    StateBuilder withMutablePlaylistHavingTracks(int numberOfTracks) {
-        when(mockMutablePlaylistModel.getItemCount()).thenReturn(numberOfTracks);
-        return this;
-    }
-
-    StateBuilder withImmutablePlaylistHavingTracks(int numberOfTracks) {
-        when(mockImmutablePlaylistModel.getItemCount()).thenReturn(numberOfTracks);
-        return this;
-    }
-
-    StateBuilder withPlaylistsContainingTracks(Track track) {
-        when(mockMutablePlaylistModel.getItem(anyInt())).thenReturn(track);
-        when(mockImmutablePlaylistModel.getItem(anyInt())).thenReturn(track);
-        return this;
-    }
-
-    ActivityTestRule<PlaylistsActivity>  createRule(){
-
-        return new ActivityTestRule<PlaylistsActivity>(PlaylistsActivity.class) {
-            @Override
-            protected void beforeActivityLaunched() {
-
-                //get hold of the application
-                App app = (App) InstrumentationRegistry.getTargetContext().getApplicationContext();
-                OG.setApplication(app, WorkMode.SYNCHRONOUS);
-
-                //inject our mocks so our UI layer will pick them up
-                OG.putMock(MutablePlaylistModel.class, mockMutablePlaylistModel);
-                OG.putMock(ImmutablePlaylistModel.class, mockImmutablePlaylistModel);
-            }
-        };
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/AndroidManifest.xml b/app-examples/example-jv-03adapters/src/main/AndroidManifest.xml
deleted file mode 100644
index 239138f8..00000000
--- a/app-examples/example-jv-03adapters/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:name=".App"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.playlist.PlaylistsActivity" android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/App.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/App.java
deleted file mode 100644
index 43b544f6..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/App.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package foo.bar.example.foreadapters;
-
-import android.app.Application;
-
-/**
- * Try not to fill this class with lots of code, if possible move it to a model somewhere
- */
-public class App extends Application {
-
-    private static App inst;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        inst = this;
-
-        OG.setApplication(inst);
-        OG.init();
-    }
-
-    public static App getInst() {
-        return inst;
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/OG.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/OG.java
deleted file mode 100644
index 693f2443..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/OG.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package foo.bar.example.foreadapters;
-
-import android.app.Application;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.AndroidLogger;
-import co.early.fore.core.time.SystemTimeWrapper;
-import foo.bar.example.foreadapters.feature.playlist.ImmutablePlaylistModel;
-import foo.bar.example.foreadapters.feature.playlist.MutablePlaylistModel;
-
-import static co.early.fore.core.Affirm.notNull;
-
-/**
- * OG - Object Graph, pure DI implementation
- * <p>
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-public class OG {
-
-    private static boolean initialized = false;
-    private static final Map<Class<?>, Object> dependencies = new HashMap<>();
-
-
-    public static void setApplication(Application application) {
-        setApplication(application, WorkMode.ASYNCHRONOUS);
-    }
-
-    public static void setApplication(Application application, final WorkMode workMode) {
-
-        notNull(application);
-        notNull(workMode);
-
-        // create dependency graph
-        AndroidLogger logger = new AndroidLogger("fore_");
-        SystemTimeWrapper systemTimeWrapper = new SystemTimeWrapper();
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(
-                systemTimeWrapper,
-                workMode,
-                logger);
-        ImmutablePlaylistModel immutablePlaylistModel = new ImmutablePlaylistModel(
-                systemTimeWrapper,
-                workMode,
-                logger);
-
-        // add models to the dependencies map if you will need them later
-        dependencies.put(SystemTimeWrapper.class, systemTimeWrapper);
-        dependencies.put(MutablePlaylistModel.class, mutablePlaylistModel);
-        dependencies.put(ImmutablePlaylistModel.class, immutablePlaylistModel);
-    }
-
-    public static void init() {
-        if (!initialized) {
-            initialized = true;
-
-            // run any necessary initialization code once object graph has been created here
-
-        }
-    }
-
-    public static <T> T get(Class<T> model) {
-
-        notNull(model);
-        T t = model.cast(dependencies.get(model));
-        notNull(t);
-
-        return t;
-    }
-
-    public static <T> void putMock(Class<T> clazz, T object) {
-
-        notNull(clazz);
-        notNull(object);
-
-        dependencies.put(clazz, object);
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/ImmutablePlaylistModel.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/ImmutablePlaylistModel.java
deleted file mode 100644
index 69c2b48a..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/ImmutablePlaylistModel.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package foo.bar.example.foreadapters.feature.playlist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import co.early.fore.adapters.immutable.ImmutableListMgr;
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.time.SystemTimeWrapper;
-
-import static foo.bar.example.foreadapters.feature.playlist.RandomTrackGeneratorUtil.generateRandomColourResource;
-
-/**
- * Example model based on **immutable** list data
- *
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-public class ImmutablePlaylistModel extends ImmutableListMgr<Track> {
-
-    private static final String LOG_TAG = ImmutablePlaylistModel.class.getSimpleName();
-
-    private final Logger logger;
-
-    public ImmutablePlaylistModel(SystemTimeWrapper systemTimeWrapper, WorkMode workMode, Logger logger) {
-        super(systemTimeWrapper, workMode, logger);
-        this.logger = Affirm.notNull(logger);
-    }
-
-    public void addNewTrack() {
-        logger.i(LOG_TAG, "addNewTrack()");
-        changeList(listCopy -> listCopy.add(new Track(generateRandomColourResource())));
-    }
-
-    public void removeTrack(int index) {
-        logger.i(LOG_TAG, "removeTrack() " + index);
-        checkIndex(index);
-        changeList(listCopy -> listCopy.remove(index));
-    }
-
-    public void removeAllTracks() {
-        logger.i(LOG_TAG, "removeAllTracks()");
-        changeList(listCopy -> listCopy.clear());
-    }
-
-    public void increasePlaysForTrack(int index) {
-        logger.i(LOG_TAG, "increasePlaysForTrack() " + index);
-        checkIndex(index);
-        changeList(listCopy -> listCopy.get(index).increasePlaysRequested());
-    }
-
-    public void decreasePlaysForTrack(int index) {
-        logger.i(LOG_TAG, "decreasePlaysForTrack() " + index);
-        checkIndex(index);
-        changeList(listCopy -> listCopy.get(index).decreasePlaysRequested());
-    }
-
-    public void add5NewTracks() {
-        logger.i(LOG_TAG, "add5NewTracks()");
-        List<Track> newTracks = new ArrayList<>();
-        for (int ii = 0; ii < 5; ii++) {
-            newTracks.add(new Track(generateRandomColourResource()));
-        }
-        changeList(listCopy -> listCopy.addAll(0, newTracks));
-    }
-
-    public void remove5Tracks() {
-        logger.i(LOG_TAG, "remove5Tracks()");
-        if (getItemCount() > 4) {
-            changeList(listCopy -> listCopy.subList(0, 5).clear());
-        }
-    }
-
-    public void replaceTracks(List<Track> newTrackList) {
-        logger.i(LOG_TAG, "replaceTracks()");
-        if (getItemCount() > 4) {
-            replaceList(() -> newTrackList);
-        }
-    }
-
-    private void checkIndex(int index) {
-        if (getItemCount() == 0) {
-            throw new IndexOutOfBoundsException("tracklist has no items in it, can not get index:" + index);
-        } else if (index < 0 || index > getItemCount() - 1) {
-            throw new IndexOutOfBoundsException("tracklist index needs to be between 0 and " + (getItemCount() - 1) + " not:" + index);
-        }
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/MutablePlaylistModel.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/MutablePlaylistModel.java
deleted file mode 100644
index e09cd6d0..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/MutablePlaylistModel.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package foo.bar.example.foreadapters.feature.playlist;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import co.early.fore.adapters.Adaptable;
-import co.early.fore.adapters.mutable.ChangeAwareArrayList;
-import co.early.fore.adapters.mutable.ChangeAwareList;
-import co.early.fore.adapters.mutable.UpdateSpec;
-import co.early.fore.adapters.mutable.Updateable;
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.observer.ObservableImp;
-import co.early.fore.core.time.SystemTimeWrapper;
-
-import static foo.bar.example.foreadapters.feature.playlist.RandomTrackGeneratorUtil.generateRandomColourResource;
-
-/**
- * Example model based on **mutable** list data
- *
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-public class MutablePlaylistModel extends ObservableImp implements  Adaptable<Track>, Updateable {
-
-    private static final String LOG_TAG = MutablePlaylistModel.class.getSimpleName();
-
-    private final Logger logger;
-    private final ChangeAwareList<Track> trackList;
-
-
-    public MutablePlaylistModel(SystemTimeWrapper systemTimeWrapper, WorkMode workMode, Logger logger) {
-        super(workMode, logger);
-        this.logger = Affirm.notNull(logger);
-        trackList = new ChangeAwareArrayList<>(Affirm.notNull(systemTimeWrapper));
-    }
-
-    public void addNewTrack() {
-        logger.i(LOG_TAG, "addNewTrack()");
-        trackList.add(new Track(generateRandomColourResource()));
-        notifyObservers();
-    }
-
-    public void removeTrack(int index) {
-        logger.i(LOG_TAG, "removeTrack() " + index);
-        checkIndex(index);
-        trackList.remove(index);
-        notifyObservers();
-    }
-
-    public void removeAllTracks() {
-        logger.i(LOG_TAG, "removeAllTracks()");
-        trackList.clear();
-        notifyObservers();
-    }
-
-    public void increasePlaysForTrack(int index) {
-        logger.i(LOG_TAG, "increasePlaysForTrack() " + index);
-        getItem(index).increasePlaysRequested();
-        trackList.makeAwareOfDataChange(index);
-        notifyObservers();
-    }
-
-    public void decreasePlaysForTrack(int index) {
-        logger.i(LOG_TAG, "decreasePlaysForTrack() " + index);
-        getItem(index).decreasePlaysRequested();
-        trackList.makeAwareOfDataChange(index);
-        notifyObservers();
-    }
-
-    public void add5NewTracks() {
-        logger.i(LOG_TAG, "add5NewTracks()");
-        List<Track> newTracks = new ArrayList<>();
-        for (int ii = 0; ii < 5; ii++) {
-            newTracks.add(new Track(generateRandomColourResource()));
-        }
-        trackList.addAll(0, newTracks);
-        notifyObservers();
-    }
-
-    public void remove5Tracks() {
-        logger.i(LOG_TAG, "remove5Tracks()");
-        if (getItemCount() > 4) {
-            trackList.removeRange(0, 5);
-            notifyObservers();
-        }
-    }
-
-    private void checkIndex(int index) {
-        if (trackList.size() == 0) {
-            throw new IndexOutOfBoundsException("tracklist has no items in it, can not get index:" + index);
-        } else if (index < 0 || index > trackList.size() - 1) {
-            throw new IndexOutOfBoundsException("tracklist index needs to be between 0 and " + (trackList.size() - 1) + " not:" + index);
-        }
-    }
-
-    @Override
-    public Track getItem(int index) {
-        checkIndex(index);
-        return trackList.get(index);
-    }
-
-    @Override
-    public int getItemCount() {
-        return trackList.size();
-    }
-
-    @Override
-    public UpdateSpec getAndClearLatestUpdateSpec(long maxAgeMs) {
-        return trackList.getAndClearLatestUpdateSpec(maxAgeMs);
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/RandomTrackGeneratorUtil.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/RandomTrackGeneratorUtil.java
deleted file mode 100644
index bb4df750..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/RandomTrackGeneratorUtil.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package foo.bar.example.foreadapters.feature.playlist;
-
-import java.util.Random;
-
-import foo.bar.example.foreadapters.R;
-
-public class RandomTrackGeneratorUtil {
-
-    private static Random random = new Random();
-
-    private static int[] colours = {
-            R.color.pastel1,
-            R.color.pastel2,
-            R.color.pastel3,
-            R.color.pastel4,
-            R.color.pastel5
-    };
-
-    public static int generateRandomColourResource() {
-        return randomInt(colours);
-    }
-
-    public static int randomInt(int[] intArray) {
-        return intArray[random.nextInt(intArray.length - 1)];
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/Track.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/Track.java
deleted file mode 100644
index 986cd760..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/feature/playlist/Track.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package foo.bar.example.foreadapters.feature.playlist;
-
-import androidx.annotation.ColorRes;
-
-import java.util.Random;
-
-import co.early.fore.adapters.immutable.DeepCopyable;
-import co.early.fore.adapters.immutable.DiffComparator;
-
-public class Track implements DeepCopyable<Track>, DiffComparator<Track> {
-
-    private static Random random = new Random();
-
-    @ColorRes
-    private final int colourResource;
-    private static final int MIN_PLAYS_REQUESTED = 1;
-    public static final int MAX_PLAYS_REQUESTED = 4;
-    private int numberOfPlaysRequested = MIN_PLAYS_REQUESTED;
-    private long uniqueId = random.nextLong();
-
-    public Track(@ColorRes int colourResource) {
-        this.colourResource = colourResource;
-    }
-
-    public int getColourResource() {
-        return colourResource;
-    }
-
-    public int getNumberOfPlaysRequested() {
-        return numberOfPlaysRequested;
-    }
-
-    public long getUniqueId() {
-        return uniqueId;
-    }
-
-    // these aren't full observable models,
-    // we want the playlist to manage any changes
-    // so we don't make this method public
-    protected void increasePlaysRequested() {
-        if (canIncreasePlays()) {
-            numberOfPlaysRequested++;
-        }
-    }
-
-    // these aren't full observable models,
-    // we want the playlist to manage any changes
-    // so we don't make this method public
-    protected void decreasePlaysRequested() {
-        if (canDecreasePlays()) {
-            numberOfPlaysRequested--;
-        }
-    }
-
-    public boolean canIncreasePlays() {
-        return numberOfPlaysRequested < MAX_PLAYS_REQUESTED;
-    }
-
-    public boolean canDecreasePlays() {
-        return numberOfPlaysRequested > MIN_PLAYS_REQUESTED;
-    }
-
-    @Override
-    public Track deepCopy() {
-        Track copyTrack = new Track(getColourResource());
-        copyTrack.numberOfPlaysRequested = numberOfPlaysRequested;
-        copyTrack.uniqueId = uniqueId;
-        return copyTrack;
-    }
-
-    @Override
-    public boolean itemsTheSame(Track other) {
-        return other != null && other.uniqueId == uniqueId;
-    }
-
-    @Override
-    public boolean itemsLookTheSame(Track other) {
-        return other != null &&
-                other.numberOfPlaysRequested == numberOfPlaysRequested &&
-                other.colourResource == colourResource;
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/PlaylistsActivity.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/PlaylistsActivity.java
deleted file mode 100644
index 4503a25c..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/PlaylistsActivity.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo.bar.example.foreadapters.ui.playlist;
-
-import androidx.fragment.app.FragmentActivity;
-
-import foo.bar.example.foreadapters.R;
-
-public class PlaylistsActivity extends FragmentActivity {
-    public PlaylistsActivity() {
-        super(R.layout.activity_playlists);
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/immutable/ImmutableListView.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/immutable/ImmutableListView.java
deleted file mode 100644
index fc0ca5ed..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/immutable/ImmutableListView.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package foo.bar.example.foreadapters.ui.playlist.immutable;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.Button;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import co.early.fore.adapters.CrossFadeRemover;
-import co.early.fore.core.observer.Observer;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.ui.SyncableView;
-import foo.bar.example.foreadapters.OG;
-import foo.bar.example.foreadapters.R;
-import foo.bar.example.foreadapters.feature.playlist.ImmutablePlaylistModel;
-import foo.bar.example.foreadapters.ui.playlist.mutable.MutablePlaylistAdapter;
-
-/**
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-public class ImmutableListView extends RelativeLayout implements SyncableView {
-
-    //models that we need
-    private ImmutablePlaylistModel immutablePlaylistModel = OG.get(ImmutablePlaylistModel.class);
-
-    //UI elements that we care about
-    @BindView(R.id.playlist_totaltracks1_textview)
-    public TextView totalTracksImmutable;
-
-    @BindView(R.id.playlist_list1_recycleview)
-    public RecyclerView playListImmutableRecyclerView;
-
-    @BindView(R.id.playlist_addMany1_button)
-    public Button add5ImmutableButton;
-
-    @BindView(R.id.playlist_removeMany1_button)
-    public Button clear5ImmutableButton;
-
-    @BindView(R.id.playlist_add1_button)
-    public Button addImmutableButton;
-
-    @BindView(R.id.playlist_clear1_button)
-    public Button clearImmutableButton;
-
-
-    //single observer reference
-    Observer observer = this::syncView;
-
-
-    private ImmutablePlaylistAdapter immutablePlaylistAdapter;
-
-
-    public ImmutableListView(Context context) {
-        super(context);
-    }
-
-    public ImmutableListView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ImmutableListView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-
-        ButterKnife.bind(this, this);
-
-        setupClickListeners();
-
-        setupAdapters();
-    }
-
-    private void setupClickListeners() {
-        add5ImmutableButton.setOnClickListener(v -> immutablePlaylistModel.add5NewTracks());
-        clear5ImmutableButton.setOnClickListener(v -> immutablePlaylistModel.remove5Tracks());
-        addImmutableButton.setOnClickListener(v -> immutablePlaylistModel.addNewTrack());
-        clearImmutableButton.setOnClickListener(v -> immutablePlaylistModel.removeAllTracks());
-    }
-
-    private void setupAdapters() {
-
-        immutablePlaylistAdapter = new ImmutablePlaylistAdapter(immutablePlaylistModel);
-
-        LinearLayoutManager linearLayoutManager1 = new LinearLayoutManager(getContext());
-        linearLayoutManager1.setOrientation(RecyclerView.VERTICAL);
-
-        playListImmutableRecyclerView.setLayoutManager(linearLayoutManager1);
-        playListImmutableRecyclerView.setAdapter(immutablePlaylistAdapter);
-        playListImmutableRecyclerView.setItemAnimator(new CrossFadeRemover());
-        playListImmutableRecyclerView.setHasFixedSize(true);
-    }
-
-    //data binding stuff below
-
-    public void syncView() {
-
-        clear5ImmutableButton.setEnabled(immutablePlaylistModel.getItemCount() > 4);
-        clearImmutableButton.setEnabled(immutablePlaylistModel.getItemCount() > 0);
-        totalTracksImmutable.setText("[" + immutablePlaylistModel.getItemCount() + "]");
-        immutablePlaylistAdapter.notifyDataSetChangedAuto();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        immutablePlaylistModel.addObserver(observer);
-        syncView();  // <- don't forget this
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        immutablePlaylistModel.removeObserver(observer);
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/immutable/ImmutablePlaylistAdapter.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/immutable/ImmutablePlaylistAdapter.java
deleted file mode 100644
index 23c4bc74..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/immutable/ImmutablePlaylistAdapter.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package foo.bar.example.foreadapters.ui.playlist.immutable;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import co.early.fore.adapters.Notifyable;
-import co.early.fore.adapters.NotifyableImp;
-import co.early.fore.core.Affirm;
-import foo.bar.example.foreadapters.R;
-import foo.bar.example.foreadapters.feature.playlist.ImmutablePlaylistModel;
-import foo.bar.example.foreadapters.feature.playlist.Track;
-import foo.bar.example.foreadapters.ui.widget.PercentPie;
-
-import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static foo.bar.example.foreadapters.ui.playlist.immutable.ImmutablePlaylistAdapter.*;
-
-/**
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-public class ImmutablePlaylistAdapter extends RecyclerView.Adapter<ViewHolder> implements Notifyable<ViewHolder> {
-
-    private final ImmutablePlaylistModel immutablePlaylistModel;
-    private final NotifyableImp<ViewHolder> notifyableImp;
-
-    public ImmutablePlaylistAdapter(ImmutablePlaylistModel immutablePlaylistModel) {
-        this.immutablePlaylistModel = Affirm.notNull(immutablePlaylistModel);
-        this.notifyableImp = new NotifyableImp<>(this, immutablePlaylistModel);
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.activity_playlists_listitem, parent, false);
-        ViewHolder holder = new ViewHolder(view);
-        holder.itemView.setTag(holder);
-        return holder;
-    }
-
-    @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
-
-        final Track item = immutablePlaylistModel.getItem(position);
-
-        holder.increase.setOnClickListener(v -> {
-            //if you tap very fast on different rows removing them
-            //while you are using adapter animations you will crash unless
-            //you check for this
-            int betterPosition = holder.getAdapterPosition();
-            if (betterPosition != NO_POSITION) {
-                immutablePlaylistModel.increasePlaysForTrack(betterPosition);
-            }
-        });
-
-        holder.decrease.setOnClickListener(v -> {
-            int betterPosition = holder.getAdapterPosition();
-            if (betterPosition != NO_POSITION) {
-                immutablePlaylistModel.decreasePlaysForTrack(betterPosition);
-            }
-        });
-
-        holder.remove.setOnClickListener(v -> {
-            int betterPosition = holder.getAdapterPosition();
-            if (betterPosition != NO_POSITION) {
-                immutablePlaylistModel.removeTrack(betterPosition);
-            }
-        });
-
-        holder.itemView.setBackgroundResource(item.getColourResource());
-        holder.playsRequested.setText("" + item.getNumberOfPlaysRequested());
-        holder.increase.setEnabled(item.canIncreasePlays());
-        holder.decrease.setEnabled(item.canDecreasePlays());
-        holder.pie.setPercentDone(item.getUniqueId(), item.getNumberOfPlaysRequested()*100/Track.MAX_PLAYS_REQUESTED);
-    }
-
-    @Override
-    public int getItemCount() {
-        return immutablePlaylistModel.getItemCount();
-    }
-
-    @Override
-    public void notifyDataSetChangedAuto() {
-        notifyableImp.notifyDataSetChangedAuto();
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.track_playsrequested_text)
-        protected TextView playsRequested;
-
-        @BindView(R.id.track_increaseplays_button)
-        protected Button increase;
-
-        @BindView(R.id.track_decreaseplays_button)
-        protected Button decrease;
-
-        @BindView(R.id.track_remove_button)
-        protected Button remove;
-
-        @BindView(R.id.track_percent_pie)
-        protected PercentPie pie;
-
-
-        public ViewHolder(View view) {
-            super(view);
-            ButterKnife.bind(this, view);
-        }
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/mutable/MutableListView.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/mutable/MutableListView.java
deleted file mode 100644
index f231eb53..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/mutable/MutableListView.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package foo.bar.example.foreadapters.ui.playlist.mutable;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.Button;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import co.early.fore.adapters.CrossFadeRemover;
-import co.early.fore.core.observer.Observer;
-import co.early.fore.core.ui.SyncableView;
-import foo.bar.example.foreadapters.OG;
-import foo.bar.example.foreadapters.R;
-import foo.bar.example.foreadapters.feature.playlist.MutablePlaylistModel;
-
-/**
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-public class MutableListView extends RelativeLayout implements SyncableView {
-
-    //models that we need
-    private MutablePlaylistModel mutablePlaylistModel = OG.get(MutablePlaylistModel.class);
-
-    //UI elements that we care about
-    @BindView(R.id.playlist_totaltracks2_textview)
-    public TextView totalTracksMutable;
-
-    @BindView(R.id.playlist_list2_recycleview)
-    public RecyclerView playListMutableRecyclerView;
-
-    @BindView(R.id.playlist_addMany2_button)
-    public Button add5MutableButton;
-
-    @BindView(R.id.playlist_removeMany2_button)
-    public Button clear5MutableButton;
-
-    @BindView(R.id.playlist_add2_button)
-    public Button addMutableButton;
-
-    @BindView(R.id.playlist_clear2_button)
-    public Button clearMutableButton;
-
-
-    //single observer reference
-    Observer observer = this::syncView;
-
-
-    private MutablePlaylistAdapter mutablePlaylistAdapter;
-
-
-    public MutableListView(Context context) {
-        super(context);
-    }
-
-    public MutableListView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MutableListView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-
-        ButterKnife.bind(this, this);
-
-        setupClickListeners();
-
-        setupAdapters();
-    }
-
-    private void setupClickListeners() {
-        add5MutableButton.setOnClickListener(v -> mutablePlaylistModel.add5NewTracks());
-        clear5MutableButton.setOnClickListener(v -> mutablePlaylistModel.remove5Tracks());
-        addMutableButton.setOnClickListener(v -> mutablePlaylistModel.addNewTrack());
-        clearMutableButton.setOnClickListener(v -> mutablePlaylistModel.removeAllTracks());
-    }
-
-    private void setupAdapters() {
-
-        mutablePlaylistAdapter = new MutablePlaylistAdapter(mutablePlaylistModel);
-
-        LinearLayoutManager linearLayoutManager1 = new LinearLayoutManager(getContext());
-        linearLayoutManager1.setOrientation(RecyclerView.VERTICAL);
-
-        playListMutableRecyclerView.setLayoutManager(linearLayoutManager1);
-        playListMutableRecyclerView.setAdapter(mutablePlaylistAdapter);
-        playListMutableRecyclerView.setItemAnimator(new CrossFadeRemover());
-        playListMutableRecyclerView.setHasFixedSize(true);
-    }
-
-    //data binding stuff below
-
-    public void syncView() {
-
-        clear5MutableButton.setEnabled(mutablePlaylistModel.getItemCount() > 4);
-        clearMutableButton.setEnabled(mutablePlaylistModel.getItemCount() > 0);
-        totalTracksMutable.setText("[" + mutablePlaylistModel.getItemCount() + "]");
-        mutablePlaylistAdapter.notifyDataSetChangedAuto();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mutablePlaylistModel.addObserver(observer);
-        syncView();  // <- don't forget this
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        mutablePlaylistModel.removeObserver(observer);
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/mutable/MutablePlaylistAdapter.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/mutable/MutablePlaylistAdapter.java
deleted file mode 100644
index ac6b838e..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/playlist/mutable/MutablePlaylistAdapter.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package foo.bar.example.foreadapters.ui.playlist.mutable;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import co.early.fore.adapters.Notifyable;
-import co.early.fore.adapters.NotifyableImp;
-import co.early.fore.core.Affirm;
-import foo.bar.example.foreadapters.R;
-import foo.bar.example.foreadapters.feature.playlist.MutablePlaylistModel;
-import foo.bar.example.foreadapters.feature.playlist.Track;
-import foo.bar.example.foreadapters.ui.widget.PercentPie;
-
-import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static foo.bar.example.foreadapters.ui.playlist.mutable.MutablePlaylistAdapter.*;
-
-/**
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-public class MutablePlaylistAdapter extends RecyclerView.Adapter<ViewHolder> implements Notifyable<ViewHolder> {
-
-    private final MutablePlaylistModel mutablePlaylistModel;
-    private final NotifyableImp<ViewHolder> notifyableImp;
-
-    public MutablePlaylistAdapter(final MutablePlaylistModel mutablePlaylistModel) {
-        this.mutablePlaylistModel = Affirm.notNull(mutablePlaylistModel);
-        this.notifyableImp = new NotifyableImp<>(this, mutablePlaylistModel);
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.activity_playlists_listitem, parent, false);
-        ViewHolder holder = new ViewHolder(view);
-        holder.itemView.setTag(holder);
-        return holder;
-    }
-
-    @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
-
-        final Track item = mutablePlaylistModel.getItem(position);
-
-        holder.increase.setOnClickListener(v -> {
-            //if you tap very fast on different rows removing them
-            //while you are using adapter animations you will crash unless
-            //you check for this
-            int betterPosition = holder.getAdapterPosition();
-            if (betterPosition != NO_POSITION) {
-                mutablePlaylistModel.increasePlaysForTrack(betterPosition);
-            }
-        });
-
-        holder.decrease.setOnClickListener(v -> {
-            int betterPosition = holder.getAdapterPosition();
-            if (betterPosition != NO_POSITION) {
-                mutablePlaylistModel.decreasePlaysForTrack(betterPosition);
-            }
-        });
-
-        holder.remove.setOnClickListener(v -> {
-            int betterPosition = holder.getAdapterPosition();
-            if (betterPosition != NO_POSITION) {
-                mutablePlaylistModel.removeTrack(betterPosition);
-            }
-        });
-
-        holder.itemView.setBackgroundResource(item.getColourResource());
-        holder.playsRequested.setText("" + item.getNumberOfPlaysRequested());
-        holder.increase.setEnabled(item.canIncreasePlays());
-        holder.decrease.setEnabled(item.canDecreasePlays());
-        holder.pie.setPercentDone(item.getUniqueId(), item.getNumberOfPlaysRequested()*100/Track.MAX_PLAYS_REQUESTED);
-    }
-
-    @Override
-    public int getItemCount() {
-        return mutablePlaylistModel.getItemCount();
-    }
-
-    @Override
-    public void notifyDataSetChangedAuto() {
-        notifyableImp.notifyDataSetChangedAuto();
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.track_playsrequested_text)
-        protected TextView playsRequested;
-
-        @BindView(R.id.track_increaseplays_button)
-        protected Button increase;
-
-        @BindView(R.id.track_decreaseplays_button)
-        protected Button decrease;
-
-        @BindView(R.id.track_remove_button)
-        protected Button remove;
-
-        @BindView(R.id.track_percent_pie)
-        protected PercentPie pie;
-
-        public ViewHolder(View view) {
-            super(view);
-            ButterKnife.bind(this, view);
-        }
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/widget/PercentPie.java b/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/widget/PercentPie.java
deleted file mode 100644
index c1fb4214..00000000
--- a/app-examples/example-jv-03adapters/src/main/java/foo/bar/example/foreadapters/ui/widget/PercentPie.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package foo.bar.example.foreadapters.ui.widget;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.util.AttributeSet;
-
-import foo.bar.example.foreadapters.App;
-import foo.bar.example.foreadapters.R;
-
-/**
- * Just a quick demo of animation when used in adapters, a lottie file would work well here
- */
-public class PercentPie extends androidx.appcompat.widget.AppCompatImageView {
-
-    private Paint paint;
-    private RectF backgroundRect;
-
-    private float widthPx;
-    private float heightPx;
-
-    private int backgroundColour;
-    private int progressColour;
-
-    private float targetPercent = 0;
-    private float currentPercent = -1;
-    private float step = 3;
-    private boolean increasing = false;
-
-    private long itemId = -1;
-
-    public PercentPie(Context context) {
-        super(context);
-    }
-
-    public PercentPie(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public PercentPie(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-
-    @Override
-    public void onFinishInflate() {
-        super.onFinishInflate();
-
-        backgroundColour = App.getInst().getResources().getColor(R.color.colorPrimary);
-        progressColour = App.getInst().getResources().getColor(R.color.colorAccent);
-
-        paint = new Paint();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL_AND_STROKE);
-
-        backgroundRect = new RectF(0, 0, widthPx, heightPx);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-
-        widthPx = getWidth();
-        heightPx = getHeight();
-
-        backgroundRect.set(0, 0, widthPx, heightPx);
-
-        invalidate();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        //background
-        paint.setColor(backgroundColour);
-        canvas.drawArc(backgroundRect, 0, 360, true, paint);
-
-        //percent progress
-        paint.setColor(progressColour);
-        canvas.drawArc(backgroundRect, 270, (float)((currentPercent * 360)/100), true, paint);
-
-        progressAnimation();
-    }
-
-    /**
-     * @param itemId this helps us know if the view is in an adapter and is being recycled
-     *               we don't want to animate if we are being recycled
-     * @param percentDone
-     */
-    public void setPercentDone(long itemId, float percentDone){
-
-        this.targetPercent = percentDone;
-
-        if (currentPercent == -1 || this.itemId != itemId){//don't bother with the animation
-            currentPercent = targetPercent;
-        }
-
-        this.itemId = itemId;
-        increasing = (targetPercent > currentPercent);
-
-        invalidate();
-    }
-
-    private void progressAnimation() {
-
-        if (increasing && currentPercent < targetPercent) {
-
-            currentPercent = Math.min(targetPercent, currentPercent + step);
-
-            invalidate();
-
-        } else if (!increasing && currentPercent > targetPercent) {
-
-            currentPercent = Math.max(targetPercent, currentPercent - step);
-
-            invalidate();
-        }
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/main/res/layout/activity_playlists.xml b/app-examples/example-jv-03adapters/src/main/res/layout/activity_playlists.xml
deleted file mode 100644
index da982efc..00000000
--- a/app-examples/example-jv-03adapters/src/main/res/layout/activity_playlists.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="horizontal">
-
-    <include layout="@layout/view_immutable_based"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="50"/>
-
-    <include layout="@layout/view_mutable_based"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="50"/>
-
-</LinearLayout>
-
diff --git a/app-examples/example-jv-03adapters/src/main/res/layout/activity_playlists_listitem.xml b/app-examples/example-jv-03adapters/src/main/res/layout/activity_playlists_listitem.xml
deleted file mode 100644
index 2a38e7c1..00000000
--- a/app-examples/example-jv-03adapters/src/main/res/layout/activity_playlists_listitem.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center">
-
-    <Button
-        android:id="@+id/track_increaseplays_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        android:text=" (+) " />
-
-    <TextView
-        android:id="@+id/track_playsrequested_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dp"/>
-
-    <Button
-        android:id="@+id/track_decreaseplays_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        android:text=" (-) " />
-
-    <Button
-        android:id="@+id/track_remove_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        android:text="clear" />
-
-    <foo.bar.example.foreadapters.ui.widget.PercentPie
-        android:id="@+id/track_percent_pie"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:padding="5dp" />
-
-</LinearLayout>
diff --git a/app-examples/example-jv-03adapters/src/main/res/layout/view_immutable_based.xml b/app-examples/example-jv-03adapters/src/main/res/layout/view_immutable_based.xml
deleted file mode 100644
index 3fdfd3d3..00000000
--- a/app-examples/example-jv-03adapters/src/main/res/layout/view_immutable_based.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<foo.bar.example.foreadapters.ui.playlist.immutable.ImmutableListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0px"
-    android:layout_height="match_parent"
-    android:layout_weight="50"
-    android:background="@color/colorPrimary">
-
-    <TextView
-        android:id="@+id/playlist_title1_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="10dp"
-        android:text="Playlist Adapter\nImmutable List" />
-
-    <TextView
-        android:id="@+id/playlist_totaltracks1_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_margin="10dp"
-        android:layout_toEndOf="@+id/playlist_title1_textview"
-        android:layout_toRightOf="@+id/playlist_title1_textview"
-        android:text="0" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/playlist_list1_recycleview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/playlist_buttoncontainer1_linear"
-        android:layout_below="@+id/playlist_title1_textview"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="20dp"
-        android:background="@color/colorAccent" />
-
-    <LinearLayout
-        android:id="@+id/playlist_buttoncontainer1_linear"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/playlist_add1_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="Add Track\nImmutable" />
-
-            <Button
-                android:id="@+id/playlist_clear1_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="Clear\nTracks" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/playlist_addMany1_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="+ 5" />
-
-            <Button
-                android:id="@+id/playlist_removeMany1_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="- 5" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</foo.bar.example.foreadapters.ui.playlist.immutable.ImmutableListView>
diff --git a/app-examples/example-jv-03adapters/src/main/res/layout/view_mutable_based.xml b/app-examples/example-jv-03adapters/src/main/res/layout/view_mutable_based.xml
deleted file mode 100644
index 8f84bf31..00000000
--- a/app-examples/example-jv-03adapters/src/main/res/layout/view_mutable_based.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<foo.bar.example.foreadapters.ui.playlist.mutable.MutableListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0px"
-    android:layout_height="match_parent"
-    android:layout_weight="50"
-    android:background="@color/colorLightGrey">
-
-    <TextView
-        android:id="@+id/playlist_title2_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="10dp"
-        android:text="Playlist Adapter\nMutable List" />
-
-    <TextView
-        android:id="@+id/playlist_totaltracks2_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_margin="10dp"
-        android:layout_toEndOf="@+id/playlist_title2_textview"
-        android:layout_toRightOf="@+id/playlist_title2_textview"
-        android:text="0" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/playlist_list2_recycleview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/playlist_buttoncontainer2_linear"
-        android:layout_below="@+id/playlist_title2_textview"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="20dp"
-        android:background="@color/colorAccent" />
-
-    <LinearLayout
-        android:id="@+id/playlist_buttoncontainer2_linear"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/playlist_add2_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="Add Track\nMutable" />
-
-            <Button
-                android:id="@+id/playlist_clear2_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="Clear\nTracks" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/playlist_addMany2_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="+ 5" />
-
-            <Button
-                android:id="@+id/playlist_removeMany2_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:text="- 5" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</foo.bar.example.foreadapters.ui.playlist.mutable.MutableListView>
diff --git a/app-examples/example-jv-03adapters/src/main/res/values/colors.xml b/app-examples/example-jv-03adapters/src/main/res/values/colors.xml
deleted file mode 100644
index ad96f158..00000000
--- a/app-examples/example-jv-03adapters/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="colorPrimary">#515673</color>
-    <color name="colorPrimaryDark">#ff512f</color>
-    <color name="colorAccent">#ff512f</color>
-    <color name="colorLightGrey">#EAEAEA</color>
-
-    <color name="pastel1">#dbe4fa</color>
-    <color name="pastel2">#fffdce</color>
-    <color name="pastel3">#eefbff</color>
-    <color name="pastel4">#fde1ff</color>
-    <color name="pastel5">#edf6c9</color>
-
-</resources>
diff --git a/app-examples/example-jv-03adapters/src/main/res/values/strings.xml b/app-examples/example-jv-03adapters/src/main/res/values/strings.xml
deleted file mode 100644
index 69d6c6a4..00000000
--- a/app-examples/example-jv-03adapters/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">jv 3 adapter ex</string>
-</resources>
diff --git a/app-examples/example-jv-03adapters/src/main/res/values/styles.xml b/app-examples/example-jv-03adapters/src/main/res/values/styles.xml
deleted file mode 100644
index 3293ec30..00000000
--- a/app-examples/example-jv-03adapters/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:buttonStyle">@style/smallButton</item>
-    </style>
-
-    <style name="smallButton" parent="@android:style/Widget.Button">
-        <item name="android:minWidth">5dp</item>
-    </style>
-
-</resources>
diff --git a/app-examples/example-jv-03adapters/src/test/java/foo/bar/example/foreadapters/feature/playlist/ImmutablePlaylistModelTest.java b/app-examples/example-jv-03adapters/src/test/java/foo/bar/example/foreadapters/feature/playlist/ImmutablePlaylistModelTest.java
deleted file mode 100644
index b0d55784..00000000
--- a/app-examples/example-jv-03adapters/src/test/java/foo/bar/example/foreadapters/feature/playlist/ImmutablePlaylistModelTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package foo.bar.example.foreadapters.feature.playlist;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-import co.early.fore.core.observer.Observer;
-import co.early.fore.core.time.SystemTimeWrapper;
-
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- *
- */
-public class ImmutablePlaylistModelTest {
-
-
-    private static Logger logger = new SystemLogger();
-    private SystemTimeWrapper mockSystemTimeWrapper;
-    private ImmutablePlaylistModel immutablePlaylistModel;
-
-
-    @Before
-    public void setUp() throws Exception {
-        mockSystemTimeWrapper = mock(SystemTimeWrapper.class);
-        immutablePlaylistModel = new ImmutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-    }
-
-
-    @Test
-    public void initialConditions() throws Exception {
-
-        //arrange
-
-        //act
-
-        //assert
-        Assert.assertEquals(0, immutablePlaylistModel.getItemCount());
-        Assert.assertEquals(false, immutablePlaylistModel.hasObservers());
-    }
-
-
-    @Test
-    public void addNewTrack() throws Exception {
-
-        //arrange
-
-        //act
-        immutablePlaylistModel.addNewTrack();
-
-        //assert
-        Assert.assertEquals(1, immutablePlaylistModel.getItemCount());
-        Assert.assertEquals(1, immutablePlaylistModel.getItem(0).getNumberOfPlaysRequested());
-    }
-
-
-    @Test
-    public void removeTrack() throws Exception {
-
-        //arrange
-        immutablePlaylistModel.addNewTrack();
-
-        //act
-        immutablePlaylistModel.removeTrack(0);
-
-        //assert
-        Assert.assertEquals(0, immutablePlaylistModel.getItemCount());
-    }
-
-
-    @Test
-    public void add5NewTracks() throws Exception {
-
-        //arrange
-
-        //act
-        immutablePlaylistModel.add5NewTracks();
-
-        //assert
-        Assert.assertEquals(5, immutablePlaylistModel.getItemCount());
-        Assert.assertEquals(1, immutablePlaylistModel.getItem(4).getNumberOfPlaysRequested());
-    }
-
-
-    @Test
-    public void remove5Tracks() throws Exception {
-
-        //arrange
-        immutablePlaylistModel.add5NewTracks();
-
-        //act
-        immutablePlaylistModel.remove5Tracks();
-
-        //assert
-        Assert.assertEquals(0, immutablePlaylistModel.getItemCount());
-    }
-
-
-    @Test
-    public void increasePlays() throws Exception {
-
-        //arrange
-        immutablePlaylistModel.addNewTrack();
-
-        //act
-        immutablePlaylistModel.increasePlaysForTrack(0);
-
-        //assert
-        Assert.assertEquals(2, immutablePlaylistModel.getItem(0).getNumberOfPlaysRequested());
-    }
-
-
-    @Test
-    public void decreasePlays() throws Exception {
-
-        //arrange
-        immutablePlaylistModel.addNewTrack();
-        immutablePlaylistModel.increasePlaysForTrack(0);
-
-        //act
-        immutablePlaylistModel.decreasePlaysForTrack(0);
-
-        //assert
-        Assert.assertEquals(1, immutablePlaylistModel.getItem(0).getNumberOfPlaysRequested());
-    }
-
-
-    @Test
-    public void removeAllTracks() throws Exception {
-
-        //arrange
-        immutablePlaylistModel.add5NewTracks();
-        immutablePlaylistModel.addNewTrack();
-        immutablePlaylistModel.addNewTrack();
-
-        //act
-        immutablePlaylistModel.removeAllTracks();
-
-        //assert
-        Assert.assertEquals(0, immutablePlaylistModel.getItemCount());
-    }
-
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the databinding readme for more information about this
-     *
-     * @throws Exception
-     */
-    @Test
-    public void observersNotifiedAtLeastOnceForAddTrack() throws Exception {
-
-        //arrange
-        Observer mockObserver = mock(Observer.class);
-        immutablePlaylistModel.addObserver(mockObserver);
-
-        //act
-        immutablePlaylistModel.addNewTrack();
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-
-
-    @Test
-    public void observersNotifiedAtLeastOnceForIncreasePlays() throws Exception {
-
-        //arrange
-        immutablePlaylistModel.addNewTrack();
-        Observer mockObserver = mock(Observer.class);
-        immutablePlaylistModel.addObserver(mockObserver);
-
-        //act
-        immutablePlaylistModel.increasePlaysForTrack(0);
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-}
diff --git a/app-examples/example-jv-03adapters/src/test/java/foo/bar/example/foreadapters/feature/playlist/MutablePlaylistModelTest.java b/app-examples/example-jv-03adapters/src/test/java/foo/bar/example/foreadapters/feature/playlist/MutablePlaylistModelTest.java
deleted file mode 100644
index 8430a379..00000000
--- a/app-examples/example-jv-03adapters/src/test/java/foo/bar/example/foreadapters/feature/playlist/MutablePlaylistModelTest.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package foo.bar.example.foreadapters.feature.playlist;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import co.early.fore.adapters.mutable.UpdateSpec;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-import co.early.fore.core.observer.Observer;
-import co.early.fore.core.time.SystemTimeWrapper;
-
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- *
- */
-public class MutablePlaylistModelTest {
-
-
-    private static Logger logger = new SystemLogger();
-    private SystemTimeWrapper mockSystemTimeWrapper;
-
-
-    @Before
-    public void setUp() throws Exception {
-        mockSystemTimeWrapper = mock(SystemTimeWrapper.class);
-    }
-
-
-    @Test
-    public void initialConditions() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-
-        //act
-
-        //assert
-        Assert.assertEquals(0, mutablePlaylistModel.getItemCount());
-        Assert.assertEquals(false, mutablePlaylistModel.hasObservers());
-        // 50ms won't have any effect here as the mocked systemTimeWrapper will always give the current
-        // time as 0 anyway, so we will never have the chance to be over maxAgeMs
-        Assert.assertEquals(UpdateSpec.UpdateType.FULL_UPDATE, mutablePlaylistModel.getAndClearLatestUpdateSpec(50).type);
-    }
-
-
-    @Test
-    public void addNewTrack() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-
-        //act
-        mutablePlaylistModel.addNewTrack();
-
-        //assert
-        Assert.assertEquals(1, mutablePlaylistModel.getItemCount());
-        Assert.assertEquals(1, mutablePlaylistModel.getItem(0).getNumberOfPlaysRequested());
-    }
-
-
-    @Test
-    public void removeTrack() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.addNewTrack();
-
-        //act
-        mutablePlaylistModel.removeTrack(0);
-
-        //assert
-        Assert.assertEquals(0, mutablePlaylistModel.getItemCount());
-    }
-
-
-    @Test
-    public void add5NewTracks() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-
-        //act
-        mutablePlaylistModel.add5NewTracks();
-
-        //assert
-        Assert.assertEquals(5, mutablePlaylistModel.getItemCount());
-        Assert.assertEquals(1, mutablePlaylistModel.getItem(4).getNumberOfPlaysRequested());
-    }
-
-
-    @Test
-    public void remove5Tracks() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.add5NewTracks();
-
-        //act
-        mutablePlaylistModel.remove5Tracks();
-
-        //assert
-        Assert.assertEquals(0, mutablePlaylistModel.getItemCount());
-    }
-
-
-    @Test
-    public void increasePlays() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.addNewTrack();
-
-        //act
-        mutablePlaylistModel.increasePlaysForTrack(0);
-
-        //assert
-        Assert.assertEquals(2, mutablePlaylistModel.getItem(0).getNumberOfPlaysRequested());
-    }
-
-
-    @Test
-    public void decreasePlays() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.addNewTrack();
-        mutablePlaylistModel.increasePlaysForTrack(0);
-
-        //act
-        mutablePlaylistModel.decreasePlaysForTrack(0);
-
-        //assert
-        Assert.assertEquals(1, mutablePlaylistModel.getItem(0).getNumberOfPlaysRequested());
-    }
-
-
-    @Test
-    public void removeAllTracks() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.add5NewTracks();
-        mutablePlaylistModel.addNewTrack();
-        mutablePlaylistModel.addNewTrack();
-
-        //act
-        mutablePlaylistModel.removeAllTracks();
-
-        //assert
-        Assert.assertEquals(0, mutablePlaylistModel.getItemCount());
-    }
-
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the databinding readme for more information about this
-     *
-     * @throws Exception
-     */
-    @Test
-    public void observersNotifiedAtLeastOnceForAddTrack() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        Observer mockObserver = mock(Observer.class);
-        mutablePlaylistModel.addObserver(mockObserver);
-
-        //act
-        mutablePlaylistModel.addNewTrack();
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-
-
-    @Test
-    public void observersNotifiedAtLeastOnceForIncreasePlays() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.addNewTrack();
-        Observer mockObserver = mock(Observer.class);
-        mutablePlaylistModel.addObserver(mockObserver);
-
-        //act
-        mutablePlaylistModel.increasePlaysForTrack(0);
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-
-
-    /**
-     *
-     * Here we make some tests to verify the UpdateSpec returned is correct so that we
-     * know that we can correctly drive a ChangeAwareAdapter with this model
-     *
-     * @throws Exception
-     */
-    @Test
-    public void updateSpecCorrectForAddTrack() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-
-        //act
-        mutablePlaylistModel.addNewTrack();
-
-        //assert
-        UpdateSpec updateSpec = mutablePlaylistModel.getAndClearLatestUpdateSpec(50);
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_INSERTED, updateSpec.type);
-        Assert.assertEquals(0, updateSpec.rowPosition);
-        Assert.assertEquals(1, updateSpec.rowsEffected);
-    }
-
-
-    @Test
-    public void updateSpecCorrectForIncreasePlays() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.addNewTrack();
-        mutablePlaylistModel.add5NewTracks();
-
-        //act
-        mutablePlaylistModel.increasePlaysForTrack(3);
-
-        //assert
-        UpdateSpec updateSpec = mutablePlaylistModel.getAndClearLatestUpdateSpec(50);
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_CHANGED, updateSpec.type);
-        Assert.assertEquals(3, updateSpec.rowPosition);
-        Assert.assertEquals(1, updateSpec.rowsEffected);
-    }
-
-
-    @Test
-    public void updateSpecCorrectForRemove5Tracks() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.add5NewTracks();
-        mutablePlaylistModel.addNewTrack();
-
-        //act
-        mutablePlaylistModel.remove5Tracks();
-
-        //assert
-        UpdateSpec updateSpec = mutablePlaylistModel.getAndClearLatestUpdateSpec(50);
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_REMOVED, updateSpec.type);
-        Assert.assertEquals(0, updateSpec.rowPosition);
-        Assert.assertEquals(5, updateSpec.rowsEffected);
-    }
-
-    @Test
-    public void updateSpecCorrectForClearAllTracks() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.add5NewTracks();
-        mutablePlaylistModel.addNewTrack();
-
-        //act
-        mutablePlaylistModel.removeAllTracks();
-
-        //assert
-        UpdateSpec updateSpec = mutablePlaylistModel.getAndClearLatestUpdateSpec(50);
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_REMOVED, updateSpec.type);
-        Assert.assertEquals(0, updateSpec.rowPosition);
-        Assert.assertEquals(6, updateSpec.rowsEffected);
-    }
-
-
-    @Test
-    public void updateSpecCorrectPastMaxAge() throws Exception {
-
-        //arrange
-        MutablePlaylistModel mutablePlaylistModel = new MutablePlaylistModel(mockSystemTimeWrapper, WorkMode.SYNCHRONOUS, logger);
-        mutablePlaylistModel.add5NewTracks();
-        mutablePlaylistModel.addNewTrack();
-
-        //act
-        mutablePlaylistModel.increasePlaysForTrack(3);
-        when(mockSystemTimeWrapper.currentTimeMillis()).thenReturn((long)51);
-
-        //assert
-        UpdateSpec updateSpec = mutablePlaylistModel.getAndClearLatestUpdateSpec(50);
-        Assert.assertEquals(UpdateSpec.UpdateType.FULL_UPDATE, updateSpec.type);
-        Assert.assertEquals(0, updateSpec.rowPosition);
-        Assert.assertEquals(0, updateSpec.rowsEffected);
-    }
-
-
-}
diff --git a/app-examples/example-jv-04retrofit/build.gradle.kts b/app-examples/example-jv-04retrofit/build.gradle.kts
deleted file mode 100644
index 7f828bef..00000000
--- a/app-examples/example-jv-04retrofit/build.gradle.kts
+++ /dev/null
@@ -1,95 +0,0 @@
-import co.early.fore.Shared
-import co.early.fore.Shared.BuildTypes
-
-plugins {
-    alias(libs.plugins.androidApplication)
-}
-
-
-val appId = "foo.bar.example.foreretrofit"
-
-fun getTestBuildType(): String {
-    return project.properties["testBuildType"] as String? ?: BuildTypes.DEFAULT
-}
-
-println("[$appId testBuildType:${getTestBuildType()}]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = appId
-    compileSdk = Shared.Android.compileSdk
-
-    defaultConfig {
-        applicationId = appId
-        minSdk = Shared.Android.minSdk
-        targetSdk = Shared.Android.targetSdk
-        versionCode = 1
-        versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testBuildType = getTestBuildType()
-    }
-    signingConfigs {
-        create(BuildTypes.RELEASE) {
-            // keytool -genkey -v -keystore debug.fake_keystore -storetype PKCS12 -alias android -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 20000 -dname "cn=Unknown, ou=Unknown, o=Unknown, c=Unknown"
-            storeFile = file("../keystore/debug.fake_keystore")
-            storePassword = "android"
-            keyAlias = "android"
-            keyPassword = "android"
-        }
-    }
-    buildTypes {
-        getByName(BuildTypes.DEBUG) {
-            isMinifyEnabled = false
-        }
-        getByName(BuildTypes.RELEASE) {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "../proguard-example-app.pro")
-            signingConfig = signingConfigs.getByName(BuildTypes.RELEASE)
-        }
-    }
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-example-apps.xml")
-    }
-    buildFeatures {
-        buildConfig = true
-    }
-}
-
-dependencies {
-
-    if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-jv-android-network:${Shared.Publish.published_fore_version_for_examples}")
-    } else {
-        implementation(project(":fore-jv:fore-jv-android-network"))
-    }
-
-    annotationProcessor("com.jakewharton:butterknife-compiler:${Shared.Versions.butterknife}")
-    //noinspection AnnotationProcessorOnCompilePath
-    implementation("com.jakewharton:butterknife:${Shared.Versions.butterknife}")
-
-    implementation("com.squareup.retrofit2:retrofit:${Shared.Versions.retrofit}")
-    implementation("com.squareup.retrofit2:converter-gson:${Shared.Versions.converter_gson}")
-    implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
-    implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    testImplementation("org.hamcrest:hamcrest-library:${Shared.Versions.hamcrest_library}")
-
-    androidTestImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:${Shared.Versions.dexmaker_mockito}")
-    androidTestImplementation("androidx.test:runner:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:rules:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.annotation:annotation:${Shared.Versions.annotation}")
-    androidTestImplementation("androidx.core:core:${Shared.Versions.android_core}")
-    androidTestImplementation("androidx.test.espresso:espresso-core:${Shared.Versions.espresso_core}") {
-        exclude(group = "com.android.support", module = "support-annotations")
-    }
-}
diff --git a/app-examples/example-jv-04retrofit/screenshot.png b/app-examples/example-jv-04retrofit/screenshot.png
deleted file mode 100644
index 55c10a44..00000000
Binary files a/app-examples/example-jv-04retrofit/screenshot.png and /dev/null differ
diff --git a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/DrawableMatcher.java b/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/DrawableMatcher.java
deleted file mode 100644
index 925a6c04..00000000
--- a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/DrawableMatcher.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package foo.bar.example.foreretrofit;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.view.View;
-import android.widget.ImageView;
-
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-
-/**
- *
- * https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f
- * https://github.com/dbottillo/Blog/blob/espresso_match_imageview/app/src/androidTest/java/com/danielebottillo/blog/config/DrawableMatcher.java
- *
- */
-public class DrawableMatcher extends TypeSafeMatcher<View> {
-
-    private final int expectedId;
-    private String resourceName;
-    static final int EMPTY = -1;
-    static final int ANY = -2;
-
-    DrawableMatcher(int expectedId) {
-        super(View.class);
-        this.expectedId = expectedId;
-    }
-
-    @Override
-    protected boolean matchesSafely(View target) {
-        if (!(target instanceof ImageView)) {
-            return false;
-        }
-        ImageView imageView = (ImageView) target;
-        if (expectedId == EMPTY) {
-            return imageView.getDrawable() == null;
-        }
-        if (expectedId == ANY) {
-            return imageView.getDrawable() != null;
-        }
-        Resources resources = target.getContext().getResources();
-        Drawable expectedDrawable = resources.getDrawable(expectedId);
-        resourceName = resources.getResourceEntryName(expectedId);
-
-        if (expectedDrawable == null) {
-            return false;
-        }
-
-        Bitmap bitmap = getBitmap(imageView.getDrawable());
-        Bitmap otherBitmap = getBitmap(expectedDrawable);
-        return bitmap.sameAs(otherBitmap);
-    }
-
-    private Bitmap getBitmap(Drawable drawable) {
-        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-        return bitmap;
-    }
-
-    @Override
-    public void describeTo(Description description) {
-        description.appendText("with drawable from resource id: ");
-        description.appendValue(expectedId);
-        if (resourceName != null) {
-            description.appendText("[");
-            description.appendText(resourceName);
-            description.appendText("]");
-        }
-    }
-}
diff --git a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/EspressoTestMatchers.java b/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/EspressoTestMatchers.java
deleted file mode 100644
index 83505191..00000000
--- a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/EspressoTestMatchers.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package foo.bar.example.foreretrofit;
-
-import android.view.View;
-
-import org.hamcrest.Matcher;
-
-/**
- *
- * https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f
- * https://github.com/dbottillo/Blog/blob/espresso_match_imageview/app/src/androidTest/java/com/danielebottillo/blog/config/EspressoTestsMatchers.java
- *
- */
-public class EspressoTestMatchers {
-
-    public static Matcher<View> withDrawable(final int resourceId) {
-        return new DrawableMatcher(resourceId);
-    }
-
-    public static Matcher<View> noDrawable() {
-        return new DrawableMatcher(DrawableMatcher.EMPTY);
-    }
-
-    public static Matcher<View> hasDrawable() {
-        return new DrawableMatcher(DrawableMatcher.ANY);
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ProgressBarIdler.java b/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ProgressBarIdler.java
deleted file mode 100644
index a0a636e9..00000000
--- a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ProgressBarIdler.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package foo.bar.example.foreretrofit;
-
-import android.app.Activity;
-import android.app.Application;
-import android.app.Instrumentation;
-import android.os.Bundle;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import androidx.core.content.ContextCompat;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ProgressBar;
-
-import java.util.Collection;
-
-import static androidx.test.runner.lifecycle.Stage.RESUMED;
-
-/**
- * If you have any spinning progress bars in your UI it will mess
- * up espresso tests (espresso will time out waiting for all UI
- * threads to be idle before proceeding).
- * <p>
- * This class will go through all your view elements views checking for
- * indeterminate progress bars and replacing the indeterminate drawable
- * with a static one so that espresso tests can continue
- * <p>
- * http://stackoverflow.com/a/37049916/3680389
- * https://stackoverflow.com/questions/33289152/progressbars-and-espresso#36201647
- */
-public class ProgressBarIdler implements Application.ActivityLifecycleCallbacks {
-
-    private static void makeAllProgressBarsIdle(View view) {
-        if (view instanceof ViewGroup) {
-            ViewGroup viewGroup = (ViewGroup) view;
-            for (int i = 0; i < viewGroup.getChildCount(); i++) {
-                makeAllProgressBarsIdle(viewGroup.getChildAt(i));
-            }
-        } else if (view instanceof ProgressBar) {
-            ProgressBar progressBar = (ProgressBar) view;
-            if (progressBar.isIndeterminate()) {
-                progressBar.setIndeterminateDrawable(ContextCompat.getDrawable(InstrumentationRegistry.getTargetContext(), android.R.drawable.ic_lock_lock));
-            }
-        }
-    }
-
-    public static void makeAllProgressBarsIdle(Instrumentation instrumentation, final Activity activity) {
-        instrumentation.runOnMainSync(new Runnable() {
-            public void run() {
-                makeAllProgressBarsIdle(activity.findViewById(android.R.id.content).getRootView());
-            }
-        });
-    }
-
-    public static void makeAllProgressBarsIdleForAllResumedActivities(Instrumentation instrumentation) {
-        instrumentation.runOnMainSync(new Runnable() {
-            public void run() {
-                Collection<Activity> resumedActivities = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(RESUMED);
-                if (resumedActivities.isEmpty()) {
-                    throw new RuntimeException("Could not change orientation");
-                }
-                for (Activity activity : resumedActivities) {
-                    makeAllProgressBarsIdle(activity.findViewById(android.R.id.content).getRootView());
-                }
-            }
-        });
-    }
-
-
-    @Override
-    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-
-    }
-
-    @Override
-    public void onActivityStarted(Activity activity) {
-
-    }
-
-    @Override
-    public void onActivityResumed(Activity activity) {
-        makeAllProgressBarsIdle(activity.findViewById(android.R.id.content).getRootView());
-    }
-
-    @Override
-    public void onActivityPaused(Activity activity) {
-
-    }
-
-    @Override
-    public void onActivityStopped(Activity activity) {
-
-    }
-
-    @Override
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-
-    }
-
-    @Override
-    public void onActivityDestroyed(Activity activity) {
-
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewRotationTest.java b/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewRotationTest.java
deleted file mode 100644
index b117a56a..00000000
--- a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewRotationTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package foo.bar.example.foreretrofit.ui.fruit;
-
-import android.app.Activity;
-import android.content.pm.ActivityInfo;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallback;
-import co.early.fore.core.callbacks.SuccessCallbackWithPayload;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-import co.early.fore.core.observer.Observer;
-import co.early.fore.net.retrofit2.CallProcessorRetrofit2;
-import foo.bar.example.foreretrofit.R;
-import foo.bar.example.foreretrofit.api.fruits.FruitPojo;
-import foo.bar.example.foreretrofit.api.fruits.FruitService;
-import foo.bar.example.foreretrofit.feature.fruit.FruitFetcher;
-import foo.bar.example.foreretrofit.message.UserMessage;
-
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static foo.bar.example.foreretrofit.EspressoTestMatchers.withDrawable;
-import static org.hamcrest.Matchers.not;
-import static org.mockito.Mockito.mock;
-
-/**
- * Here we make sure that when the view is rotated while a long running action is being
- * performed by the model, all the view elements still accurately represent the model's
- * state after rotation is complete, and those view elements are still updated as appropriate
- * when the model completes the long running action.
- */
-@RunWith(AndroidJUnit4.class)
-public class FruitViewRotationTest {
-
-    public static final String TAG = FruitViewRotationTest.class.getSimpleName();
-
-    /**
-     * Here we're testing with a real model,
-     * and just mocking its dependencies.
-     * This lets us realistically test the
-     * interactions between the view
-     * and the model during and after
-     * a rotation
-     */
-    FruitFetcher fruitFetcher;
-    Logger logger = new SystemLogger();
-    FruitPojo fruitPojo = new FruitPojo("testFruit1", true, 45);
-
-    SuccessCallback mockSuccessCallback;
-    FailureCallbackWithPayload mockFailureCallbackWithPayload;
-    CallProcessorRetrofit2<UserMessage> mockCallProcessor;
-    FruitService mockFruitService;
-    Observer mockObserver;
-
-    SuccessCallbackWithPayload cachedSuccessCallback;
-    private CountDownLatch countDownLatch = new CountDownLatch(1);
-
-    @Before
-    public void setup(){
-
-        logger.i(TAG, "setup()");
-
-        //MockitoAnnotations.initMocks(LoginViewTest.this);
-        System.setProperty("dexmaker.dexcache", InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
-
-        mockSuccessCallback = mock(SuccessCallback.class);
-        mockFailureCallbackWithPayload = mock(FailureCallbackWithPayload.class);
-        mockCallProcessor = mock(CallProcessorRetrofit2.class);
-        mockFruitService = mock(FruitService.class);
-
-        //construct a real model with mock dependencies
-        fruitFetcher = new FruitFetcher(
-                mockFruitService,
-                mockCallProcessor,
-                logger,
-                WorkMode.ASYNCHRONOUS);
-
-    }
-
-    @Test
-    public void stateSurvivesRotation() throws Exception {
-
-        logger.i(TAG, "stateSurvivesRotation()");
-
-        //arrange
-        Activity activity = new FruitViewRotationTestStateBuilder(this)
-                .withDelayedCallProcessor()
-                .createRule()
-                .launchActivity(null);
-
-        checkUIBeforeClick(activity);
-
-        //act
-        fruitFetcher.fetchFruits(mockSuccessCallback, mockFailureCallbackWithPayload);
-
-        checkUIWhenFetching(activity);
-
-        swapOrientation(activity);
-
-        checkUIWhenFetching(activity);
-
-        callCachedSuccessCallback();
-
-        try{
-            countDownLatch.await();
-        }catch(InterruptedException e){
-        }
-
-        checkUIOnceComplete(activity);
-    }
-
-
-
-    public void callCachedSuccessCallback() {
-
-        logger.i(TAG, "callSuccessOnCachedSuccessFailCallback()");
-
-        List<FruitPojo> fruitList = new ArrayList<>();
-        fruitList.add(fruitPojo);
-
-        //we need to be back on the UI thread for this
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-
-                logger.i(TAG, "about to call success, id:" + Thread.currentThread().getId());
-
-                cachedSuccessCallback.success(fruitList);
-                countDownLatch.countDown();
-            }
-        });
-    }
-
-    public void setCachedSuccessCallback(SuccessCallbackWithPayload successCallBack) {
-        logger.i(TAG, "setCachedSuccessFailCallback()");
-        this.cachedSuccessCallback = successCallBack;
-    }
-
-
-    private synchronized void checkUIBeforeClick(Activity activity) {
-        logger.i(TAG, "checkUIBeforeClick()");
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("(fruitless)")));
-        onView(withId(R.id.fruit_tastyrating_textview)).check(matches(withText(
-                activity.getString(R.string.fruit_percent, 0)
-        )));
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)));
-    }
-
-    private synchronized void checkUIWhenFetching(Activity activity) {
-        logger.i(TAG, "checkUIWhenFetching()");
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(isDisplayed()));
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.fruit_name_textview)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.fruit_tastyrating_textview)).check(matches(withText(
-                activity.getString(R.string.fruit_percent, 0)
-        )));
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)));
-    }
-
-    private synchronized void checkUIOnceComplete(Activity activity) {
-        logger.i(TAG, "checkUIOnceComplete()");
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText(fruitPojo.name)));
-        onView(withId(R.id.fruit_tastyrating_textview)).check(matches(withText(
-                activity.getString(R.string.fruit_percent, fruitPojo.tastyPercentScore)
-        )));
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(fruitPojo.isCitrus ?
-                R.drawable.lemon_positive : R.drawable.lemon_negative)));
-    }
-
-    private void swapOrientation(Activity activity){
-        activity.setRequestedOrientation(activity.getResources().getConfiguration().orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT ?
-                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    }
-
-
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewRotationTestStateBuilder.java b/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewRotationTestStateBuilder.java
deleted file mode 100644
index d380ed79..00000000
--- a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewRotationTestStateBuilder.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package foo.bar.example.foreretrofit.ui.fruit;
-
-import android.content.pm.ActivityInfo;
-
-import org.mockito.ArgumentCaptor;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.callbacks.SuccessCallbackWithPayload;
-import co.early.fore.core.logging.SystemLogger;
-import foo.bar.example.foreretrofit.App;
-import foo.bar.example.foreretrofit.OG;
-import foo.bar.example.foreretrofit.ProgressBarIdler;
-import foo.bar.example.foreretrofit.feature.fruit.FruitFetcher;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doAnswer;
-
-/**
- *
- */
-public class FruitViewRotationTestStateBuilder {
-
-    private final FruitViewRotationTest fruitViewRotationTest;
-
-    FruitViewRotationTestStateBuilder(FruitViewRotationTest fruitViewRotationTest) {
-        this.fruitViewRotationTest = fruitViewRotationTest;
-    }
-
-    FruitViewRotationTestStateBuilder withDelayedCallProcessor(){
-
-        final ArgumentCaptor<SuccessCallbackWithPayload> callback = ArgumentCaptor.forClass(SuccessCallbackWithPayload.class);
-        doAnswer(__ -> {
-
-            // We need to store this callback so that we can trigger it later
-            // We can't use any kind of post delayed thing because
-            // espresso needs all threads to be idle before proceeding
-            // from this method
-            fruitViewRotationTest.setCachedSuccessCallback(callback.getValue());
-
-            return null;
-        })
-        .when(fruitViewRotationTest.mockCallProcessor)
-        .processCall(any(), any(), any(), callback.capture(), any());
-
-        return this;
-    }
-
-    ActivityTestRule<FruitActivity>  createRule(){
-
-        return new ActivityTestRule<FruitActivity>(FruitActivity.class) {
-            @Override
-            protected void beforeActivityLaunched() {
-
-                new SystemLogger().i("FruitViewRotationTestStateBuilder", "beforeActivityLaunched()");
-
-                App app = (App) InstrumentationRegistry.getTargetContext().getApplicationContext();
-                OG.setApplication(app, WorkMode.SYNCHRONOUS);
-                //inject our test model
-                OG.putMock(FruitFetcher.class, fruitViewRotationTest.fruitFetcher);
-
-                app.registerActivityLifecycleCallbacks(new ProgressBarIdler());
-
-            }
-
-            @Override
-            protected void afterActivityFinished() {
-                super.afterActivityFinished();
-
-                this.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            }
-        };
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewTest.java b/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewTest.java
deleted file mode 100644
index 9f9924ae..00000000
--- a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package foo.bar.example.foreretrofit.ui.fruit;
-
-import android.app.Activity;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import foo.bar.example.foreretrofit.R;
-import foo.bar.example.foreretrofit.api.fruits.FruitPojo;
-import foo.bar.example.foreretrofit.feature.fruit.FruitFetcher;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static foo.bar.example.foreretrofit.EspressoTestMatchers.withDrawable;
-import static org.hamcrest.Matchers.not;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-@RunWith(AndroidJUnit4.class)
-public class FruitViewTest {
-
-
-    private FruitFetcher mockFruitFetcher;
-
-
-    @Before
-    public void setup(){
-
-        //MockitoAnnotations.initMocks(CounterView.this);
-        System.setProperty("dexmaker.dexcache", InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
-
-        mockFruitFetcher = mock(FruitFetcher.class);
-
-    }
-
-
-    @Test
-    public void hasCitrusFruit() throws Exception {
-
-        //arrange
-        Activity activity = new FruitViewTestStateBuilder(mockFruitFetcher)
-                .isBusy(false)
-                .hasFruit(new FruitPojo("testFruit1", true, 45))
-                .createRule()
-                .launchActivity(null);
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("testFruit1")));
-        onView(withId(R.id.fruit_tastyrating_textview)).check(matches(withText(
-                activity.getString(R.string.fruit_percent, 45)
-        )));
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_positive)));
-    }
-
-
-    @Test
-    public void hasNonCitrusFruit() throws Exception {
-
-        //arrange
-        Activity activity = new FruitViewTestStateBuilder(mockFruitFetcher)
-                .isBusy(false)
-                .hasFruit(new FruitPojo("testFruit2", false, 75))
-                .createRule()
-                .launchActivity(null);
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()));
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("testFruit2")));
-        onView(withId(R.id.fruit_tastyrating_textview)).check(matches(withText(
-                activity.getString(R.string.fruit_percent, 75)
-        )));
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)));
-    }
-
-
-    @Test
-    public void isFetchingFruit() throws Exception {
-
-        //arrange
-        new FruitViewTestStateBuilder(mockFruitFetcher)
-                .isBusy(true)
-                .hasFruit(new FruitPojo("testFruit1", true, 45))
-                .createRule()
-                .launchActivity(null);
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(isDisplayed()));
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(not(isEnabled())));
-        onView(withId(R.id.fruit_name_textview)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.fruit_tastyrating_textview)).check(matches(not(isDisplayed())));
-        onView(withId(R.id.fruit_citrus_img)).check(matches(not(isDisplayed())));
-    }
-
-
-    @Test
-    public void clickCallsFetchSuccess() throws Exception {
-        //arrange
-        new FruitViewTestStateBuilder(mockFruitFetcher)
-                .isBusy(false)
-                .hasFruit(new FruitPojo("testFruit2", false, 75))
-                .createRule()
-                .launchActivity(null);
-
-
-        //act
-        onView(withId(R.id.fruit_fetchsuccess_btn)).perform(click());
-
-
-        //assert
-        verify(mockFruitFetcher).fetchFruits(any(), any());
-    }
-
-
-    @Test
-    public void clickCallsFetchFailBasic() throws Exception {
-        //arrange
-        new FruitViewTestStateBuilder(mockFruitFetcher)
-                .isBusy(false)
-                .hasFruit(new FruitPojo("testFruit2", false, 75))
-                .createRule()
-                .launchActivity(null);
-
-
-        //act
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).perform(click());
-
-
-        //assert
-        verify(mockFruitFetcher).fetchFruitsButFailBasic(any(), any());
-    }
-
-
-    @Test
-    public void clickCallsFetchFailAdvanced() throws Exception {
-        //arrange
-        new FruitViewTestStateBuilder(mockFruitFetcher)
-                .isBusy(false)
-                .hasFruit(new FruitPojo("testFruit2", false, 75))
-                .createRule()
-                .launchActivity(null);
-
-
-        //act
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).perform(click());
-
-
-        //assert
-        verify(mockFruitFetcher).fetchFruitsButFailAdvanced(any(), any());
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewTestStateBuilder.java b/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewTestStateBuilder.java
deleted file mode 100644
index ae7e308c..00000000
--- a/app-examples/example-jv-04retrofit/src/androidTest/java/foo/bar/example/foreretrofit/ui/fruit/FruitViewTestStateBuilder.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package foo.bar.example.foreretrofit.ui.fruit;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import co.early.fore.core.WorkMode;
-import foo.bar.example.foreretrofit.App;
-import foo.bar.example.foreretrofit.OG;
-import foo.bar.example.foreretrofit.ProgressBarIdler;
-import foo.bar.example.foreretrofit.api.fruits.FruitPojo;
-import foo.bar.example.foreretrofit.feature.fruit.FruitFetcher;
-
-import static org.mockito.Mockito.when;
-
-/**
- *
- */
-public class FruitViewTestStateBuilder {
-
-    private FruitFetcher mockFruitFetcher;
-
-    FruitViewTestStateBuilder(FruitFetcher mockFruitFetcher) {
-        this.mockFruitFetcher = mockFruitFetcher;
-    }
-
-    FruitViewTestStateBuilder isBusy(boolean busy) {
-        when(mockFruitFetcher.isBusy()).thenReturn(busy);
-        return this;
-    }
-
-    FruitViewTestStateBuilder hasFruit(FruitPojo fruitPojo) {
-        when(mockFruitFetcher.getCurrentFruit()).thenReturn(fruitPojo);
-        return this;
-    }
-
-    ActivityTestRule<FruitActivity>  createRule(){
-
-        return new ActivityTestRule<FruitActivity>(FruitActivity.class) {
-            @Override
-            protected void beforeActivityLaunched() {
-
-                //get hold of the application
-                App app = (App) InstrumentationRegistry.getTargetContext().getApplicationContext();
-                OG.setApplication(app, WorkMode.SYNCHRONOUS);
-
-                //inject our mocks so our UI layer will pick them up
-                OG.putMock(FruitFetcher.class, mockFruitFetcher);
-
-                app.registerActivityLifecycleCallbacks(new ProgressBarIdler());
-            }
-
-        };
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/AndroidManifest.xml b/app-examples/example-jv-04retrofit/src/main/AndroidManifest.xml
deleted file mode 100644
index f418e0d9..00000000
--- a/app-examples/example-jv-04retrofit/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:name=".App"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:usesCleartextTraffic="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.fruit.FruitActivity" android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/App.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/App.java
deleted file mode 100644
index e6779b0a..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/App.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package foo.bar.example.foreretrofit;
-
-import android.app.Application;
-
-/**
- * Try not to fill this class with lots of code, if possible move it to a model somewhere
- */
-public class App extends Application {
-
-    private static App inst;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        inst = this;
-
-        OG.setApplication(inst);
-        OG.init();
-    }
-
-    public static App getInst() {
-        return inst;
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/OG.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/OG.java
deleted file mode 100644
index 83cc6d2d..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/OG.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package foo.bar.example.foreretrofit;
-
-import android.app.Application;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.AndroidLogger;
-import co.early.fore.net.retrofit2.CallProcessorRetrofit2;
-import co.early.fore.net.InterceptorLogging;
-import foo.bar.example.foreretrofit.api.CustomGlobalErrorHandler;
-import foo.bar.example.foreretrofit.api.CustomGlobalRequestInterceptor;
-import foo.bar.example.foreretrofit.api.CustomRetrofitBuilder;
-import foo.bar.example.foreretrofit.api.fruits.FruitService;
-import foo.bar.example.foreretrofit.feature.fruit.FruitFetcher;
-import foo.bar.example.foreretrofit.message.UserMessage;
-import retrofit2.Retrofit;
-
-import static co.early.fore.core.Affirm.notNull;
-
-/**
- *
- * OG - Object Graph, pure DI implementation
- *
- * Copyright © 2019 early.co. All rights reserved.
- */
-public class OG {
-
-    private static boolean initialized = false;
-    private static final Map<Class<?>, Object> dependencies = new HashMap<>();
-
-
-    public static void setApplication(Application application) {
-        setApplication(application, WorkMode.ASYNCHRONOUS);
-    }
-
-    public static void setApplication(Application application, final WorkMode workMode) {
-
-        notNull(application);
-        notNull(workMode);
-
-
-        // create dependency graph
-        AndroidLogger logger = new AndroidLogger("fore_");
-
-        // networking classes common to all models
-        Retrofit retrofit = CustomRetrofitBuilder.create(
-                new CustomGlobalRequestInterceptor(logger),
-                new InterceptorLogging(logger));//logging interceptor should be the last one
-
-        CallProcessorRetrofit2<UserMessage> callProcessor = new CallProcessorRetrofit2<UserMessage>(
-                new CustomGlobalErrorHandler(logger),
-                logger);
-
-
-        // models
-        FruitFetcher fruitFetcher = new FruitFetcher(
-                retrofit.create(FruitService.class),
-                callProcessor,
-                logger,
-                workMode);
-
-
-        // add models to the dependencies map if you will need them later
-        dependencies.put(FruitFetcher.class, fruitFetcher);
-
-    }
-
-    public static void init() {
-        if (!initialized) {
-            initialized = true;
-
-            // run any necessary initialization code once object graph has been created here
-
-        }
-    }
-
-    public static <T> T get(Class<T> model) {
-
-        notNull(model);
-        T t = model.cast(dependencies.get(model));
-        notNull(t);
-
-        return t;
-    }
-
-    public static <T> void putMock(Class<T> clazz, T object) {
-
-        notNull(clazz);
-        notNull(object);
-
-        dependencies.put(clazz, object);
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomGlobalErrorHandler.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomGlobalErrorHandler.java
deleted file mode 100644
index 1e2361e4..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomGlobalErrorHandler.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package foo.bar.example.foreretrofit.api;
-
-import com.google.gson.Gson;
-
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-import androidx.annotation.Nullable;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.net.retrofit2.ErrorHandler;
-import co.early.fore.net.MessageProvider;
-import foo.bar.example.foreretrofit.message.UserMessage;
-import okhttp3.Request;
-import retrofit2.Response;
-
-import static co.early.fore.core.Affirm.notNull;
-import static foo.bar.example.foreretrofit.message.UserMessage.ERROR_CLIENT;
-import static foo.bar.example.foreretrofit.message.UserMessage.ERROR_MISC;
-import static foo.bar.example.foreretrofit.message.UserMessage.ERROR_NETWORK;
-import static foo.bar.example.foreretrofit.message.UserMessage.ERROR_SECURITY_UNKNOWN;
-import static foo.bar.example.foreretrofit.message.UserMessage.ERROR_SERVER;
-import static foo.bar.example.foreretrofit.message.UserMessage.ERROR_SESSION_TIMED_OUT;
-
-/**
- * You can probably use this class almost as it is for your own app, but you might want to
- * customise the behaviour for specific HTTP codes etc, hence it's not in the fore library
- */
-public class CustomGlobalErrorHandler implements ErrorHandler<UserMessage> {
-
-    private static final String TAG = CustomGlobalErrorHandler.class.getSimpleName();
-
-    private final Logger logWrapper;
-
-    public CustomGlobalErrorHandler(Logger logWrapper) {
-        this.logWrapper = notNull(logWrapper);
-    }
-
-
-    @Override
-    public <CE extends MessageProvider<UserMessage>> UserMessage handleError(Throwable t, Response errorResponse, @Nullable Class<CE> customErrorClazz, Request originalRequest) {
-
-        UserMessage message = ERROR_MISC;
-
-        if (errorResponse != null) {
-
-            logWrapper.e(TAG, "handleError() HTTP:" + errorResponse.code());
-
-            switch (errorResponse.code()) {
-
-                case 401:
-                    message = ERROR_SESSION_TIMED_OUT;
-                    break;
-
-                case 400:
-                case 405:
-                    message = ERROR_CLIENT;
-                    break;
-
-                case 404://realise this is officially a "client" error, but in my experience if it happens in prod it is usually the fault of the server ;)
-                case 500:
-                case 503:
-                    message = ERROR_SERVER;
-                    break;
-            }
-
-            if (customErrorClazz != null) {
-                //let's see if we can get more specifics about the error
-                message = parseCustomError(message, errorResponse, customErrorClazz);
-            }
-
-        } else {//non HTTP error, probably some connection problem, but might be JSON parsing related also
-
-            logWrapper.e(TAG, "handleError() throwable:" + t);
-
-            if (t != null) {
-
-                if (t instanceof com.google.gson.stream.MalformedJsonException) {
-                    message = ERROR_SERVER;
-                } else if (t instanceof java.net.UnknownServiceException) {
-                    message = ERROR_SECURITY_UNKNOWN;
-                } else {
-                    message = ERROR_NETWORK;
-                }
-                t.printStackTrace();
-            }
-        }
-
-
-        logWrapper.e(TAG, "handleError() returning:" + message);
-
-        return message;
-    }
-
-
-    private <CE extends MessageProvider<UserMessage>> UserMessage parseCustomError(UserMessage provisionalErrorMessage, Response errorResponse, Class<CE> customErrorClazz) {
-
-        Gson gson = new Gson();
-
-        CE customError = null;
-
-        try {
-            customError = gson.fromJson(new InputStreamReader(errorResponse.errorBody().byteStream(), "UTF-8"), customErrorClazz);
-        } catch (UnsupportedEncodingException | IllegalStateException | NullPointerException e) {
-            logWrapper.e(TAG, "parseCustomError() No more error details", e);
-        } catch (com.google.gson.JsonSyntaxException e) {//the server probably gave us something that is not JSON
-            logWrapper.e(TAG, "parseCustomError() Problem parsing customServerError", e);
-            return ERROR_SERVER;
-        }
-
-        if (customError == null) {
-            return provisionalErrorMessage;
-        } else {
-            return customError.getMessage();
-        }
-    }
-
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomGlobalRequestInterceptor.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomGlobalRequestInterceptor.java
deleted file mode 100644
index 8846cafc..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomGlobalRequestInterceptor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package foo.bar.example.foreretrofit.api;
-
-import java.io.IOException;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.logging.Logger;
-import foo.bar.example.foreretrofit.BuildConfig;
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import okhttp3.Response;
-
-/**
- * This will be specific to your own app.
- *
- * Typically you would construct this class with some kind of Session object or similar that
- * you would use to customize the headers according to the logged in status of the user, for example
- */
-public class CustomGlobalRequestInterceptor implements Interceptor {
-
-    private final static String TAG = CustomGlobalRequestInterceptor.class.getSimpleName();
-
-    private final Logger logger;
-    //private final Session session;
-
-    public CustomGlobalRequestInterceptor(Logger logger) {
-        this.logger = Affirm.notNull(logger);
-    }
-
-
-    @Override
-    public Response intercept(Chain chain) throws IOException {
-
-        Request original = chain.request();
-
-        Request.Builder requestBuilder = original.newBuilder();
-
-
-        requestBuilder.addHeader("Content-Type", "application/json");
-        //requestBuilder.addHeader("X-MyApp-Auth-Token", !session.hasSession() ? "expired" : session.getSessionToken());
-        requestBuilder.addHeader("User-Agent", "fore-example-user-agent-" + BuildConfig.VERSION_NAME);
-
-
-        requestBuilder.method(original.method(), original.body());
-
-        return chain.proceed(requestBuilder.build());
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomRetrofitBuilder.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomRetrofitBuilder.java
deleted file mode 100644
index e22c5ad8..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/CustomRetrofitBuilder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package foo.bar.example.foreretrofit.api;
-
-import com.google.gson.GsonBuilder;
-
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
-
-/**
- * Most of this will all be specific to your application, when customising for your own case
- * bare in mind that you should be able to use this class in your tests to mock the server
- * by passing different interceptors in:
- *
- * see @{@link co.early.fore.net.testhelpers.InterceptorStubbedService}
- *
- */
-public class CustomRetrofitBuilder {
-
-    /**
-     *
-     * @param interceptors list of interceptors NB if you add a logging interceptor, it has to be
-     *                     the last one in the list
-     * @return Retrofit object suitable for instantiating service interfaces
-     */
-    public static Retrofit create(Interceptor... interceptors){
-
-        Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://www.mocky.io/v2/")
-                .addConverterFactory(GsonConverterFactory.create(new GsonBuilder().create()))
-                .client(createOkHttpClient(interceptors))
-                .build();
-
-        return retrofit;
-    }
-
-    private static OkHttpClient createOkHttpClient(Interceptor... interceptors){
-
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
-
-        for (Interceptor interceptor : interceptors) {
-            builder.addInterceptor(interceptor);
-        }
-
-        return builder.build();
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitPojo.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitPojo.java
deleted file mode 100644
index 206093b1..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitPojo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package foo.bar.example.foreretrofit.api.fruits;
-
-/**
- *
- *
- * <Code>
- *
- *  The server returns us a list of fruit that look like this:
- *
- *  {
- *    "name":"papaya",
- *    "isCitrus":false,
- *    "tastyPercentScore":98
- *  }
- *
- * </Code>
- *
- *
- *
- */
-public class FruitPojo {
-
-    public String name;
-    public boolean isCitrus;
-    public int tastyPercentScore;
-
-    public FruitPojo(String name, boolean isCitrus, int tastyPercentScore) {
-        this.name = name;
-        this.isCitrus = isCitrus;
-        this.tastyPercentScore = tastyPercentScore;
-    }
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitService.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitService.java
deleted file mode 100644
index 4bdbf346..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package foo.bar.example.foreretrofit.api.fruits;
-
-import java.util.List;
-
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-/**
- * These stubs are hosted at https://www.mocky.io/
- *
- * http://www.mocky.io/v2/59efa0132e0000ef331c5f9b
- * http://www.mocky.io/v2/59ef2a6c2e00002a1a1c5dea
- *
- */
-public interface FruitService {
-
-    @GET("59efa0132e0000ef331c5f9b/")
-    Call<List<FruitPojo>> getFruitsSimulateOk(@Query("mocky-delay") String delayScalaDurationFormat);
-
-    @GET("59ef2a6c2e00002a1a1c5dea/")
-    Call<List<FruitPojo>> getFruitsSimulateNotAuthorised(@Query("mocky-delay") String delayScalaDurationFormat);
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitsCustomError.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitsCustomError.java
deleted file mode 100644
index 07b53041..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/api/fruits/FruitsCustomError.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package foo.bar.example.foreretrofit.api.fruits;
-
-import com.google.gson.annotations.SerializedName;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.net.MessageProvider;
-import foo.bar.example.foreretrofit.message.UserMessage;
-
-import static foo.bar.example.foreretrofit.message.UserMessage.ERROR_MISC;
-
-/**
- *
- * <Code>
- *
- *  The server returns custom error codes in this form:
- *
- *  {
- *    "errorCode":"FRUIT_USER_LOCKED"
- *  }
- *
- * </Code>
- *
- *
- */
-public class FruitsCustomError implements MessageProvider<UserMessage> {
-
-    private ErrorCode errorCode;
-
-    public FruitsCustomError(ErrorCode errorCode) {
-        this.errorCode = errorCode;
-    }
-
-    public enum ErrorCode {
-
-        @SerializedName("FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT")
-        LOGIN_CREDENTIALS_INCORRECT(UserMessage.ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT),
-        @SerializedName("FRUIT_USER_LOCKED")
-        USER_LOCKED(UserMessage.ERROR_FRUIT_USER_LOCKED),
-        @SerializedName("FRUIT_USER_NOT_ENABLED")
-        USER_NOT_ENABLED(UserMessage.ERROR_FRUIT_USER_NOT_ENABLED);
-
-        public final UserMessage userMessage;
-
-        ErrorCode(UserMessage userMessage) {
-            this.userMessage = Affirm.notNull(userMessage);
-        }
-    }
-
-    public UserMessage getMessage() {
-        if (errorCode == null) {
-            return ERROR_MISC;
-        } else {
-            return errorCode.userMessage;
-        }
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcher.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcher.java
deleted file mode 100644
index 91e5cc9e..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcher.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package foo.bar.example.foreretrofit.feature.fruit;
-
-import java.util.List;
-import java.util.Random;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallback;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.observer.ObservableImp;
-import co.early.fore.net.retrofit2.CallProcessorRetrofit2;
-import foo.bar.example.foreretrofit.api.fruits.FruitPojo;
-import foo.bar.example.foreretrofit.api.fruits.FruitService;
-import foo.bar.example.foreretrofit.api.fruits.FruitsCustomError;
-import foo.bar.example.foreretrofit.message.UserMessage;
-
-/**
- * gets a list of fruit from the network, selects one at random to be currentFruit
- */
-public class FruitFetcher extends ObservableImp{
-
-    public static final String TAG = FruitFetcher.class.getSimpleName();
-
-    private final FruitService fruitService;
-    private final CallProcessorRetrofit2<UserMessage> callProcessor;
-    private final WorkMode workMode;
-    private final Logger logger;
-    private static Random random = new Random();
-
-    private boolean busy;
-    private FruitPojo currentFruit = new FruitPojo("(fruitless)", false, 0);
-
-    public FruitFetcher(FruitService fruitService, CallProcessorRetrofit2<UserMessage> callProcessor, Logger logger, WorkMode workMode) {
-        super(workMode);
-        this.fruitService = Affirm.notNull(fruitService);
-        this.callProcessor = Affirm.notNull(callProcessor);
-        this.logger = Affirm.notNull(logger);
-        this.workMode = Affirm.notNull(workMode);
-    }
-
-
-    public void fetchFruits(final SuccessCallback successCallback, final FailureCallbackWithPayload<UserMessage> failureCallbackWithPayload){
-
-        logger.i(TAG, "fetchFruits()");
-
-        Affirm.notNull(successCallback);
-        Affirm.notNull(failureCallbackWithPayload);
-
-        if (busy){
-            failureCallbackWithPayload.fail(UserMessage.ERROR_BUSY);
-            return;
-        }
-
-        busy = true;
-        notifyObservers();
-
-        callProcessor.processCall(fruitService.getFruitsSimulateOk("3s"), workMode, FruitsCustomError.class,
-                successResponse -> handleSuccess(successCallback, successResponse),
-                failureMessage -> handleFailure(failureCallbackWithPayload, failureMessage));
-
-    }
-
-
-    //identical to fetchFruits() but for demo purposes the URL we point to will give us an error, we also don't specify a custom error class here
-    public void fetchFruitsButFailBasic(final SuccessCallback successCallback, final FailureCallbackWithPayload<UserMessage> failureCallbackWithPayload){
-
-        logger.i(TAG, "fetchFruitsButFailBasic()");
-
-        Affirm.notNull(successCallback);
-        Affirm.notNull(failureCallbackWithPayload);
-
-        if (busy){
-            failureCallbackWithPayload.fail(UserMessage.ERROR_BUSY);
-            return;
-        }
-
-        busy = true;
-        notifyObservers();
-
-        callProcessor.processCall(fruitService.getFruitsSimulateNotAuthorised("3s"), workMode,
-                successResponse -> handleSuccess(successCallback, successResponse),
-                failureMessage -> handleFailure(failureCallbackWithPayload, failureMessage));
-
-    }
-
-
-    //identical to fetchFruits() but for demo purposes the URL we point to will give us an error
-    public void fetchFruitsButFailAdvanced(final SuccessCallback successCallback, final FailureCallbackWithPayload<UserMessage> failureCallbackWithPayload){
-
-        logger.i(TAG, "fetchFruitsButFailAdvanced()");
-
-        Affirm.notNull(successCallback);
-        Affirm.notNull(failureCallbackWithPayload);
-
-        if (busy){
-            failureCallbackWithPayload.fail(UserMessage.ERROR_BUSY);
-            return;
-        }
-
-        busy = true;
-        notifyObservers();
-
-        callProcessor.processCall(fruitService.getFruitsSimulateNotAuthorised("3s"), workMode, FruitsCustomError.class,
-                successResponse -> handleSuccess(successCallback, successResponse),
-                failureMessage -> handleFailure(failureCallbackWithPayload, failureMessage));
-
-    }
-
-    private void handleSuccess(SuccessCallback successCallBack, List<FruitPojo> successResponse){
-        currentFruit = selectRandomFruit(successResponse);
-        successCallBack.success();
-        complete();
-    }
-
-    private void handleFailure(FailureCallbackWithPayload<UserMessage> failureCallbackWithPayload, UserMessage failureMessage){
-        failureCallbackWithPayload.fail(failureMessage);
-        complete();
-    }
-
-    public boolean isBusy() {
-        return busy;
-    }
-
-    public FruitPojo getCurrentFruit() {
-        return currentFruit;
-    }
-
-    private void complete(){
-
-        logger.i(TAG, "complete()");
-
-        busy = false;
-        notifyObservers();
-    }
-
-    private FruitPojo selectRandomFruit(List<FruitPojo> listOfFruits){
-        return listOfFruits.get(listOfFruits.size() == 1 ? 0 : random.nextInt(listOfFruits.size()-1));
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/message/UserMessage.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/message/UserMessage.java
deleted file mode 100644
index 06786a04..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/message/UserMessage.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package foo.bar.example.foreretrofit.message;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import foo.bar.example.foreretrofit.App;
-import foo.bar.example.foreretrofit.R;
-
-/**
- * As an enum, this value can be passed around the app to indicate various states.
- * If you want to display it to the user you can put it inside a dialog (it implements
- * parcelable). Call getString() for the human readable text.
- */
-public enum UserMessage implements Parcelable {
-
-    ERROR_MISC(R.string.msg_error_misc),
-    ERROR_NETWORK(R.string.msg_error_network),
-    ERROR_SERVER(R.string.msg_error_server),
-    ERROR_SECURITY_UNKNOWN(R.string.msg_error_misc),
-    ERROR_CLIENT(R.string.msg_error_client),
-    ERROR_SESSION_TIMED_OUT(R.string.msg_error_session_timeout),
-    ERROR_BUSY(R.string.msg_error_busy),
-    ERROR_CANCELLED(R.string.msg_error_cancelled),
-
-    ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT(R.string.msg_error_fruit_user_login_creds_incorrect),
-    ERROR_FRUIT_USER_LOCKED(R.string.msg_error_fruit_user_locked),
-    ERROR_FRUIT_USER_NOT_ENABLED(R.string.msg_error_fruit_user_locked);
-
-
-    private String message;
-    private int messageResId;
-
-    UserMessage(int messageResId) {
-        this.messageResId = messageResId;
-    }
-
-    public String getString() {
-
-        if (message == null) {
-            message = getString(messageResId);
-        }
-
-        return message;
-    }
-
-    //this should only be called when a UserMessage is actually displayed to a user, so not during a JUnit test
-    private String getString(int resId) {
-        return App.getInst().getResources().getString(resId);
-    }
-
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(final Parcel dest, final int flags) {
-        dest.writeInt(ordinal());
-    }
-
-    public static final Creator<UserMessage> CREATOR = new Creator<UserMessage>() {
-        @Override
-        public UserMessage createFromParcel(final Parcel source) {
-            return UserMessage.values()[source.readInt()];
-        }
-
-        @Override
-        public UserMessage[] newArray(final int size) {
-            return new UserMessage[size];
-        }
-    };
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/ui/fruit/FruitActivity.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/ui/fruit/FruitActivity.java
deleted file mode 100644
index d1ce0efb..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/ui/fruit/FruitActivity.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package foo.bar.example.foreretrofit.ui.fruit;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.fragment.app.FragmentActivity;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallback;
-import co.early.fore.core.observer.Observer;
-import foo.bar.example.foreretrofit.OG;
-import foo.bar.example.foreretrofit.R;
-import foo.bar.example.foreretrofit.feature.fruit.FruitFetcher;
-import foo.bar.example.foreretrofit.message.UserMessage;
-import foo.bar.example.foreretrofit.ui.widgets.AnimatedTastyRatingBar;
-
-import static android.view.View.GONE;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
-
-
-public class FruitActivity extends FragmentActivity {
-
-
-    //models that we need to sync with
-    private FruitFetcher fruitFetcher = OG.get(FruitFetcher.class);
-
-
-    //UI elements that we care about
-    @BindView(R.id.fruit_fetchsuccess_btn)
-    public Button fruitRefreshSuccess;
-
-    @BindView(R.id.fruit_fetchfailbasic_btn)
-    public Button fruitRefreshFailBasic;
-
-    @BindView(R.id.fruit_fetchfailadvanced_btn)
-    public Button fruitRefreshFailAdvanced;
-
-    @BindView(R.id.fruit_name_textview)
-    public TextView fruitName;
-
-    @BindView(R.id.fruit_citrus_img)
-    public ImageView isCitrus;
-
-    @BindView(R.id.fruit_tastyrating_tastybar)
-    public AnimatedTastyRatingBar tasteValuePercentView;
-
-    @BindView(R.id.fruit_tastyrating_textview)
-    public TextView tasteScore;
-
-    @BindView(R.id.fruit_busy_progbar)
-    public ProgressBar busy;
-
-    @BindView(R.id.fruit_detailcontainer_linearlayout)
-    public View fruitDetailContainer;
-
-
-    //single observer reference
-    Observer observer = this::syncView;
-
-
-
-    //just because we re-use these in 3 different button clicks
-    //in this example we define them here
-    private SuccessCallback successCallback = new SuccessCallback() {
-        @Override
-        public void success() {
-            Toast.makeText(FruitActivity.this, "Success - you can use this trigger to " +
-                    "perform a one off action like starting a new activity or " +
-                    "something", Toast.LENGTH_SHORT).show();
-        }
-    };
-    private FailureCallbackWithPayload<UserMessage> failureCallback = new FailureCallbackWithPayload<UserMessage>() {
-        @Override
-        public void fail(UserMessage userMessage) {
-            Toast.makeText(FruitActivity.this, "Fail - maybe tell the user to try again, message:" + userMessage.getString(),
-                           Toast.LENGTH_SHORT).show();
-        }
-    };
-
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_fruit);
-
-        ButterKnife.bind(this);
-
-        setupButtonClickListeners();
-    }
-
-    private void setupButtonClickListeners() {
-
-        fruitRefreshSuccess.setOnClickListener(v -> fruitFetcher.fetchFruits(successCallback, failureCallback));
-
-        fruitRefreshFailBasic.setOnClickListener(v -> fruitFetcher.fetchFruitsButFailBasic(successCallback, failureCallback));
-
-        fruitRefreshFailAdvanced.setOnClickListener(v -> fruitFetcher.fetchFruitsButFailAdvanced(successCallback, failureCallback));
-
-    }
-
-
-    //data binding stuff below
-
-    public void syncView(){
-        fruitRefreshSuccess.setEnabled(!fruitFetcher.isBusy());
-        fruitRefreshFailBasic.setEnabled(!fruitFetcher.isBusy());
-        fruitRefreshFailAdvanced.setEnabled(!fruitFetcher.isBusy());
-        fruitName.setText(fruitFetcher.getCurrentFruit().name);
-        isCitrus.setImageResource(fruitFetcher.getCurrentFruit().isCitrus ? R.drawable.lemon_positive : R.drawable.lemon_negative);
-        tasteValuePercentView.setTastyPercent(fruitFetcher.getCurrentFruit().tastyPercentScore);
-        tasteScore.setText(String.format(this.getString(R.string.fruit_percent), String.valueOf(fruitFetcher.getCurrentFruit().tastyPercentScore)));
-        busy.setVisibility(fruitFetcher.isBusy() ?  VISIBLE : INVISIBLE);
-        fruitDetailContainer.setVisibility(fruitFetcher.isBusy() ? GONE : VISIBLE);
-    }
-
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        fruitFetcher.addObserver(observer);
-        syncView(); //  <- don't forget this
-    }
-
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        fruitFetcher.removeObserver(observer);
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/ui/widgets/AnimatedTastyRatingBar.java b/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/ui/widgets/AnimatedTastyRatingBar.java
deleted file mode 100644
index 70042566..00000000
--- a/app-examples/example-jv-04retrofit/src/main/java/foo/bar/example/foreretrofit/ui/widgets/AnimatedTastyRatingBar.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package foo.bar.example.foreretrofit.ui.widgets;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-
-import androidx.appcompat.widget.AppCompatImageView;
-import foo.bar.example.foreretrofit.App;
-import foo.bar.example.foreretrofit.R;
-
-/**
- *
- */
-public class AnimatedTastyRatingBar extends AppCompatImageView {
-
-    private Paint paint;
-
-    private float widthPx;
-    private float heightPx;
-
-    private int backgroundColour;
-    private int progressColour;
-
-    private float tastyPercent = 0;
-    private float currentPercent = 0;
-    private float step = 1;
-    private boolean increasing = false;
-
-    public AnimatedTastyRatingBar(Context context) {
-        super(context);
-    }
-
-    public AnimatedTastyRatingBar(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public AnimatedTastyRatingBar(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-
-    @Override
-    public void onFinishInflate() {
-        super.onFinishInflate();
-
-        backgroundColour = App.getInst().getResources().getColor(R.color.colorPrimary);
-        progressColour = App.getInst().getResources().getColor(R.color.colorPrimaryDark);
-
-        paint = new Paint();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL_AND_STROKE);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-
-        widthPx = getWidth();
-        heightPx = getHeight();
-
-        invalidate();
-    }
-
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        //background
-        paint.setColor(backgroundColour);
-        canvas.drawRect(0, 0, widthPx, heightPx, paint);
-
-        //percent bar
-        paint.setColor(progressColour);
-        canvas.drawRect(0, 0, (float)((currentPercent * widthPx)/100), heightPx, paint);
-
-        progressAnimation();
-    }
-
-    public void setTastyPercent(float tastyPercent){
-        this.tastyPercent = tastyPercent;
-
-        if (currentPercent == 0){//don't bother with the animation
-            currentPercent = tastyPercent;
-        }
-
-        increasing = (tastyPercent > currentPercent);
-
-        invalidate();
-    }
-
-
-    private void progressAnimation() {
-
-        if (increasing && currentPercent < tastyPercent) {
-
-            currentPercent = Math.min(tastyPercent, currentPercent + step);
-
-            invalidate();
-
-        } else if (!increasing && currentPercent > tastyPercent) {
-
-            currentPercent = Math.max(tastyPercent, currentPercent - step);
-
-            invalidate();
-        }
-    }
-
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/main/res/layout/activity_fruit.xml b/app-examples/example-jv-04retrofit/src/main/res/layout/activity_fruit.xml
deleted file mode 100644
index 1b4fb486..00000000
--- a/app-examples/example-jv-04retrofit/src/main/res/layout/activity_fruit.xml
+++ /dev/null
@@ -1,124 +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:background="@color/colorAccent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:background="@color/colorPrimary"
-        android:layout_margin="15dp"
-        android:padding="15dp"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="10dp"
-            android:textSize="15sp"
-            android:textColor="@color/colorAccent"
-            android:text="Fruit Fetcher" />
-
-        <RelativeLayout
-            android:layout_width="200dp"
-            android:layout_height="180dp"
-            android:layout_margin="10dp"
-            android:background="@color/colorLightGrey">
-
-            <ProgressBar
-                android:id="@+id/fruit_busy_progbar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true" />
-
-            <LinearLayout
-                android:id="@+id/fruit_detailcontainer_linearlayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/fruit_name_textview"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="fruit name"
-                    android:padding="10dp"
-                    android:textStyle="bold"
-                    android:textSize="25sp"
-                    android:textColor="@color/colorAccent" />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="isCitrus"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"
-                        android:layout_alignParentLeft="true"
-                        android:textColor="@color/colorAccent"/>
-
-                    <ImageView
-                        android:id="@+id/fruit_citrus_img"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"/>
-
-                </RelativeLayout>
-
-                <foo.bar.example.foreretrofit.ui.widgets.AnimatedTastyRatingBar
-                    android:id="@+id/fruit_tastyrating_tastybar"
-                    android:layout_width="match_parent"
-                    android:layout_height="3dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="4dp"
-                    android:background="@color/colorAccent"/>
-
-                <TextView
-                    android:id="@+id/fruit_tastyrating_textview"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="100% tasty"
-                    android:textSize="12sp"
-                    android:textColor="@color/colorAccent"/>
-
-            </LinearLayout>
-
-        </RelativeLayout>
-
-        <Button
-            android:id="@+id/fruit_fetchsuccess_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="fetch - (success result)" />
-
-        <Button
-            android:id="@+id/fruit_fetchfailbasic_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="fetch - (fail result basic)" />
-
-        <Button
-            android:id="@+id/fruit_fetchfailadvanced_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="fetch - (fail result advanced)" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/app-examples/example-jv-04retrofit/src/main/res/values/strings.xml b/app-examples/example-jv-04retrofit/src/main/res/values/strings.xml
deleted file mode 100644
index 45c0b128..00000000
--- a/app-examples/example-jv-04retrofit/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<resources>
-    <string name="app_name">jv 4 retrofit ex</string>
-
-    <!-- common error messages -->
-    <string name="msg_empty_message"></string>
-    <string name="msg_error_misc">Some kind of error, maybe check logs</string>
-    <string name="msg_error_network">Network error, check connection</string>
-    <string name="msg_error_server">Server down, try again soon</string>
-    <string name="msg_error_client">Client error</string>
-    <string name="msg_error_session_timeout">Unauthorized</string>
-    <string name="msg_error_busy">Busy</string>
-    <string name="msg_error_cancelled">Cancelled</string>
-
-    <!-- fruit related custom messages -->
-    <string name="msg_error_fruit_user_login_creds_incorrect">Your login details were incorrect, please check and try again</string>
-    <string name="msg_error_fruit_user_locked">Your fruit user account has been locked, please contact us</string>
-    <string name="msg_error_fruit_user_not_enabled">Your fruit user account has not been enabled yet, please contact us</string>
-
-    <string name="fruit_percent">(%s%% tasty)</string>
-
-</resources>
diff --git a/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/api/CommonServiceFailures.java b/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/api/CommonServiceFailures.java
deleted file mode 100644
index ee9b94c8..00000000
--- a/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/api/CommonServiceFailures.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package foo.bar.example.foreretrofit.api;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import co.early.fore.net.testhelpers.StubbedServiceDefinition;
-import foo.bar.example.foreretrofit.message.UserMessage;
-
-/**
- * This will be specific to your own app, it's closely linked with: @{@link CustomGlobalErrorHandler}
- */
-public class CommonServiceFailures extends ArrayList<StubbedServiceDefinition<UserMessage>>{
-
-
-    public CommonServiceFailures() {
-
-        //network down
-        add(new StubbedServiceDefinition(new IOException("fake io exception for testing purposes"), UserMessage.ERROR_NETWORK));
-
-        //bad request
-        add(new StubbedServiceDefinition(400, "common/empty.json", UserMessage.ERROR_CLIENT));
-
-        //session timeout
-        add(new StubbedServiceDefinition(401, "common/empty.json", UserMessage.ERROR_SESSION_TIMED_OUT));
-
-        //missing resource
-        add(new StubbedServiceDefinition(404, "common/empty.json", UserMessage.ERROR_SERVER));//realise this is officially a "client" error, but in our experience this is usually the fault of the server
-
-        //missing resource (html page)
-        add(new StubbedServiceDefinition(404, "common/html.json", "text/html", UserMessage.ERROR_SERVER));
-
-        //bad request
-        add(new StubbedServiceDefinition(405, "common/empty.json", UserMessage.ERROR_CLIENT));
-
-        //server down
-        add(new StubbedServiceDefinition(500, "common/empty.json", UserMessage.ERROR_SERVER));
-
-        //service unavailable
-        add(new StubbedServiceDefinition(503, "common/empty.json", UserMessage.ERROR_SERVER));
-
-        //non valid json
-        add(new StubbedServiceDefinition(200, "common/html.json", UserMessage.ERROR_SERVER));
-
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcherIntegrationTest.java b/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcherIntegrationTest.java
deleted file mode 100644
index 83099efd..00000000
--- a/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcherIntegrationTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package foo.bar.example.foreretrofit.feature.fruit;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallback;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-import co.early.fore.net.retrofit2.CallProcessorRetrofit2;
-import co.early.fore.net.InterceptorLogging;
-import co.early.fore.net.testhelpers.InterceptorStubbedService;
-import co.early.fore.net.testhelpers.StubbedServiceDefinition;
-import foo.bar.example.foreretrofit.api.CommonServiceFailures;
-import foo.bar.example.foreretrofit.api.CustomGlobalErrorHandler;
-import foo.bar.example.foreretrofit.api.CustomRetrofitBuilder;
-import foo.bar.example.foreretrofit.api.fruits.FruitPojo;
-import foo.bar.example.foreretrofit.api.fruits.FruitService;
-import foo.bar.example.foreretrofit.message.UserMessage;
-import retrofit2.Retrofit;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * This is a slightly more end-to-end style of test, but without actually connecting to a network
- * <p>
- * Using {@link InterceptorStubbedService} we
- * replace the server response with a canned response taken from static text files saved
- * in /resources. This all happens in OkHttp land so the model under test is not aware of any
- * difference.
- * <p>
- * As usual for tests, we setup the {@link CallProcessorRetrofit2} with {@link WorkMode#SYNCHRONOUS} so
- * that everything plays out in a single thread.
- *
- */
-public class FruitFetcherIntegrationTest {
-
-    public static final String TAG = FruitFetcherIntegrationTest.class.getSimpleName();
-
-    private Logger logger = new SystemLogger();
-
-    private SuccessCallback mockSuccessCallback;
-    private FailureCallbackWithPayload mockFailureCallbackWithPayload;
-    private InterceptorLogging interceptorLogging;
-    private CallProcessorRetrofit2<UserMessage> callProcessor;
-
-
-    private static StubbedServiceDefinition<FruitPojo> stubbedSuccess = new StubbedServiceDefinition<>(
-            200, //stubbed HTTP code
-            "fruit/success.json", //stubbed body response
-            new FruitPojo("orange", true, 43)); //expected result
-
-    private static StubbedServiceDefinition<UserMessage> stubbedFailUserLocked = new StubbedServiceDefinition<>(
-            401, //stubbed HTTP code
-            "common/error_user_locked.json", //stubbed body response
-            UserMessage.ERROR_FRUIT_USER_LOCKED); //expected result
-
-    private static StubbedServiceDefinition<UserMessage> stubbedFailureUserNotEnabled = new StubbedServiceDefinition<>(
-            401, //stubbed HTTP code
-            "common/error_user_not_enabled.json", //stubbed body response
-            UserMessage.ERROR_FRUIT_USER_NOT_ENABLED); //expected result
-
-
-    @Before
-    public void setup(){
-        mockSuccessCallback = mock(SuccessCallback.class);
-        mockFailureCallbackWithPayload = mock(FailureCallbackWithPayload.class);
-        interceptorLogging = new InterceptorLogging(logger);
-        callProcessor = new CallProcessorRetrofit2<>(new CustomGlobalErrorHandler(logger), logger);
-    }
-
-
-    /**
-     * Here we are making sure that the model correctly handles a successful server response
-     * containing a list of fruit
-     */
-    @Test
-    public void fetchFruit_Success() {
-
-        //arrange
-        Retrofit retrofit = stubbedRetrofit(stubbedSuccess);
-        FruitFetcher fruitFetcher = new FruitFetcher(
-                retrofit.create(FruitService.class),
-                callProcessor,
-                logger,
-                WorkMode.SYNCHRONOUS);
-
-
-        //act
-        fruitFetcher.fetchFruits(mockSuccessCallback, mockFailureCallbackWithPayload);
-
-
-        //assert
-        verify(mockSuccessCallback, times(1)).success();
-        verify(mockFailureCallbackWithPayload, never()).fail(any());
-        Assert.assertEquals(false, fruitFetcher.isBusy());
-        Assert.assertEquals(stubbedSuccess.expectedResult.name, fruitFetcher.getCurrentFruit().name);
-        Assert.assertEquals(stubbedSuccess.expectedResult.isCitrus, fruitFetcher.getCurrentFruit().isCitrus);
-        Assert.assertEquals(stubbedSuccess.expectedResult.tastyPercentScore, fruitFetcher.getCurrentFruit().tastyPercentScore);
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a server response indicating
-     * that the user account has been locked
-     */
-    @Test
-    public void fetchFruit_Fail_UserLocked() {
-
-        //arrange
-        Retrofit retrofit = stubbedRetrofit(stubbedFailUserLocked);
-        FruitFetcher fruitFetcher = new FruitFetcher(
-                retrofit.create(FruitService.class),
-                callProcessor,
-                logger,
-                WorkMode.SYNCHRONOUS);
-
-
-        //act
-        fruitFetcher.fetchFruits(mockSuccessCallback, mockFailureCallbackWithPayload);
-
-
-        //assert
-        verify(mockSuccessCallback, never()).success();
-        verify(mockFailureCallbackWithPayload, times(1)).fail(eq(stubbedFailUserLocked.expectedResult));
-        Assert.assertEquals(false, fruitFetcher.isBusy());
-        Assert.assertEquals(0, fruitFetcher.getCurrentFruit().tastyPercentScore);
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a server response indicating
-     * that the user account has not been enabled
-     */
-    @Test
-    public void fetchFruit_Fail_UserNotEnabled() {
-
-        //arrange
-        Retrofit retrofit = stubbedRetrofit(stubbedFailureUserNotEnabled);
-        FruitFetcher fruitFetcher = new FruitFetcher(
-                retrofit.create(FruitService.class),
-                callProcessor,
-                logger,
-                WorkMode.SYNCHRONOUS);
-
-
-        //act
-        fruitFetcher.fetchFruits(mockSuccessCallback, mockFailureCallbackWithPayload);
-
-
-        //assert
-        verify(mockSuccessCallback, never()).success();
-        verify(mockFailureCallbackWithPayload, times(1)).fail(eq(stubbedFailureUserNotEnabled.expectedResult));
-        Assert.assertEquals(false, fruitFetcher.isBusy());
-        Assert.assertEquals(0, fruitFetcher.getCurrentFruit().tastyPercentScore);
-    }
-
-
-    /**
-     * Here we are making sure that the model correctly handles common API failed responses
-     */
-    @Test
-    public void fetchFruit_CommonFailures() {
-
-        for (StubbedServiceDefinition<UserMessage> stubbedServiceDefinition : new CommonServiceFailures()) {
-
-            logger.i(TAG, "------- Common Service Failure: HTTP:"
-                    + stubbedServiceDefinition.httpCode
-                    + " res:" + stubbedServiceDefinition.resourceFileName
-                    + " --------");
-
-            //arrange
-            mockSuccessCallback = mock(SuccessCallback.class);
-            mockFailureCallbackWithPayload = mock(FailureCallbackWithPayload.class);
-            Retrofit retrofit = stubbedRetrofit(stubbedServiceDefinition);
-            FruitFetcher fruitFetcher = new FruitFetcher(
-                    retrofit.create(FruitService.class),
-                    callProcessor,
-                    logger,
-                    WorkMode.SYNCHRONOUS);
-
-
-            //act
-            fruitFetcher.fetchFruits(mockSuccessCallback, mockFailureCallbackWithPayload);
-
-
-            //assert
-            verify(mockSuccessCallback, never()).success();
-            verify(mockFailureCallbackWithPayload, times(1)).fail(eq(stubbedServiceDefinition.expectedResult));
-            Assert.assertEquals(false, fruitFetcher.isBusy());
-            Assert.assertEquals(0, fruitFetcher.getCurrentFruit().tastyPercentScore);
-        }
-    }
-
-
-    private Retrofit stubbedRetrofit(StubbedServiceDefinition stubbedServiceDefinition){
-        return CustomRetrofitBuilder.create(
-                new InterceptorStubbedService(stubbedServiceDefinition),
-                interceptorLogging);
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcherUnitTest.java b/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcherUnitTest.java
deleted file mode 100644
index f6f8057e..00000000
--- a/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/FruitFetcherUnitTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package foo.bar.example.foreretrofit.feature.fruit;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallback;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-import co.early.fore.core.observer.Observer;
-import co.early.fore.net.retrofit2.CallProcessorRetrofit2;
-import foo.bar.example.foreretrofit.api.fruits.FruitPojo;
-import foo.bar.example.foreretrofit.api.fruits.FruitService;
-import foo.bar.example.foreretrofit.message.UserMessage;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.internal.verification.VerificationModeFactory.times;
-
-/**
- * Tests for this model cover a few areas:
- * <p>
- * 1) Construction: we check that the model is constructed in the correct state
- * 2) Receiving data: we check that the model behaves appropriately when receiving various success and fail responses from the CallProcessor
- * 3) Observers and State: we check that the model updates its observers correctly and presents it's current state accurately
- *
- */
-public class FruitFetcherUnitTest {
-
-    private static Logger logger = new SystemLogger();
-    private FruitPojo fruitPojo = new FruitPojo("strawberry", false, 71);
-
-    private SuccessCallback mockSuccessCallback;
-    private FailureCallbackWithPayload mockFailureCallbackWithPayload;
-    private CallProcessorRetrofit2<UserMessage> mockCallProcessor;
-    private FruitService mockFruitService;
-    private Observer mockObserver;
-
-
-    @Before
-    public void setUp() {
-        mockSuccessCallback = mock(SuccessCallback.class);
-        mockFailureCallbackWithPayload = mock(FailureCallbackWithPayload.class);
-        mockCallProcessor = mock(CallProcessorRetrofit2.class);
-        mockFruitService = mock(FruitService.class);
-        mockObserver = mock(Observer.class);
-    }
-
-
-    @Test
-    public void initialConditions() {
-
-        //arrange
-        FruitFetcher fruitFetcher = new FruitFetcher(
-                mockFruitService,
-                mockCallProcessor,
-                logger,
-                WorkMode.SYNCHRONOUS);
-
-        //act
-
-        //assert
-        Assert.assertEquals(false, fruitFetcher.isBusy());
-        Assert.assertEquals(0, fruitFetcher.getCurrentFruit().tastyPercentScore);
-        Assert.assertEquals(false, fruitFetcher.getCurrentFruit().isCitrus);
-    }
-
-
-    @Test
-    public void fetchFruit_MockSuccess() {
-
-        //arrange
-        new StateBuilder(mockCallProcessor).getFruitSuccess(fruitPojo);
-
-        FruitFetcher fruitFetcher = new FruitFetcher(
-                mockFruitService,
-                mockCallProcessor,
-                logger,
-                WorkMode.SYNCHRONOUS);
-
-
-        //act
-        fruitFetcher.fetchFruits(mockSuccessCallback, mockFailureCallbackWithPayload);
-
-
-        //assert
-        verify(mockSuccessCallback, times(1)).success();
-        verify(mockFailureCallbackWithPayload, never()).fail(any());
-        Assert.assertEquals(false, fruitFetcher.isBusy());
-        Assert.assertEquals(fruitPojo.name, fruitFetcher.getCurrentFruit().name);
-        Assert.assertEquals(fruitPojo.isCitrus, fruitFetcher.getCurrentFruit().isCitrus);
-        Assert.assertEquals(fruitPojo.tastyPercentScore, fruitFetcher.getCurrentFruit().tastyPercentScore);
-    }
-
-
-    @Test
-    public void fetchFruit_MockFailure() {
-
-        //arrange
-        new StateBuilder(mockCallProcessor).getFruitFail(UserMessage.ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT);
-
-        FruitFetcher fruitFetcher = new FruitFetcher(
-                mockFruitService,
-                mockCallProcessor,
-                logger,
-                WorkMode.SYNCHRONOUS);
-
-
-        //act
-        fruitFetcher.fetchFruits(mockSuccessCallback, mockFailureCallbackWithPayload);
-
-
-        //assert
-        verify(mockSuccessCallback, never()).success();
-        verify(mockFailureCallbackWithPayload, times(1)).fail(eq(UserMessage.ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT));
-        Assert.assertEquals(false, fruitFetcher.isBusy());
-        Assert.assertEquals(false, fruitFetcher.getCurrentFruit().isCitrus);
-        Assert.assertEquals(0, fruitFetcher.getCurrentFruit().tastyPercentScore);
-    }
-
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times the observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the reactive UI docs for more information about this
-     *
-     */
-    @Test
-    public void observersNotifiedAtLeastOnce() {
-
-        //arrange
-        new StateBuilder(mockCallProcessor).getFruitSuccess(fruitPojo);
-
-        FruitFetcher fruitFetcher = new FruitFetcher(
-                mockFruitService,
-                mockCallProcessor,
-                logger,
-                WorkMode.SYNCHRONOUS);
-        fruitFetcher.addObserver(mockObserver);
-
-
-        //act
-        fruitFetcher.fetchFruits(mockSuccessCallback, mockFailureCallbackWithPayload);
-
-
-        //assert
-        verify(mockObserver, atLeastOnce()).somethingChanged();
-    }
-
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/StateBuilder.java b/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/StateBuilder.java
deleted file mode 100644
index ff29dfb7..00000000
--- a/app-examples/example-jv-04retrofit/src/test/java/foo/bar/example/foreretrofit/feature/fruit/StateBuilder.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package foo.bar.example.foreretrofit.feature.fruit;
-
-import org.mockito.ArgumentCaptor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallbackWithPayload;
-import co.early.fore.net.retrofit2.CallProcessorRetrofit2;
-import foo.bar.example.foreretrofit.api.fruits.FruitPojo;
-import foo.bar.example.foreretrofit.message.UserMessage;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doAnswer;
-
-/**
- *
- */
-public class StateBuilder {
-
-    private CallProcessorRetrofit2<UserMessage> mockCallProcessor;
-
-    StateBuilder(CallProcessorRetrofit2<UserMessage> mockCallProcessor) {
-        this.mockCallProcessor = mockCallProcessor;
-    }
-
-    StateBuilder getFruitSuccess(final FruitPojo fruitPojo) {
-
-        List<FruitPojo> fruitList = new ArrayList<>();
-        fruitList.add(fruitPojo);
-
-        final ArgumentCaptor<SuccessCallbackWithPayload> callback = ArgumentCaptor.forClass(SuccessCallbackWithPayload.class);
-
-        doAnswer(__ -> {
-            callback.getValue().success(fruitList);
-            return null;
-        })
-
-                .when(mockCallProcessor)
-                .processCall(any(), any(), any(), callback.capture(), any());
-
-        return this;
-    }
-
-    StateBuilder getFruitFail(final UserMessage userMessage) {
-
-        final ArgumentCaptor<FailureCallbackWithPayload> callback = ArgumentCaptor.forClass(FailureCallbackWithPayload.class);
-
-        doAnswer(__ -> {
-            callback.getValue().fail(userMessage);
-            return null;
-        })
-        .when(mockCallProcessor)
-        .processCall(any(), any(), any(), any(), callback.capture());
-
-        return this;
-    }
-
-}
diff --git a/app-examples/example-jv-04retrofit/src/test/resources/common/empty.json b/app-examples/example-jv-04retrofit/src/test/resources/common/empty.json
deleted file mode 100644
index e69de29b..00000000
diff --git a/app-examples/example-jv-04retrofit/src/test/resources/common/error_user_locked.json b/app-examples/example-jv-04retrofit/src/test/resources/common/error_user_locked.json
deleted file mode 100644
index c09caa60..00000000
--- a/app-examples/example-jv-04retrofit/src/test/resources/common/error_user_locked.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "errorCode":"FRUIT_USER_LOCKED"
-}
\ No newline at end of file
diff --git a/app-examples/example-jv-04retrofit/src/test/resources/common/error_user_not_enabled.json b/app-examples/example-jv-04retrofit/src/test/resources/common/error_user_not_enabled.json
deleted file mode 100644
index 05580569..00000000
--- a/app-examples/example-jv-04retrofit/src/test/resources/common/error_user_not_enabled.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "errorCode":"FRUIT_USER_NOT_ENABLED"
-}
\ No newline at end of file
diff --git a/app-examples/example-jv-04retrofit/src/test/resources/common/html.json b/app-examples/example-jv-04retrofit/src/test/resources/common/html.json
deleted file mode 100644
index 92ab9d38..00000000
--- a/app-examples/example-jv-04retrofit/src/test/resources/common/html.json
+++ /dev/null
@@ -1 +0,0 @@
-<HTML>/<HTML>
\ No newline at end of file
diff --git a/app-examples/example-jv-04retrofit/src/test/resources/fruit/success.json b/app-examples/example-jv-04retrofit/src/test/resources/fruit/success.json
deleted file mode 100644
index 1fc65eb4..00000000
--- a/app-examples/example-jv-04retrofit/src/test/resources/fruit/success.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "name":"orange",
-    "isCitrus":true,
-    "tastyPercentScore":43
-  }
-]
\ No newline at end of file
diff --git a/app-examples/example-kt-01reactiveui/screenshot.png b/app-examples/example-kt-01reactiveui/screenshot.png
deleted file mode 100644
index d8b1f112..00000000
Binary files a/app-examples/example-kt-01reactiveui/screenshot.png and /dev/null differ
diff --git a/app-examples/example-kt-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveuikt/ui/wallet/StateBuilder.kt b/app-examples/example-kt-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveuikt/ui/wallet/StateBuilder.kt
deleted file mode 100644
index 54c2b7a6..00000000
--- a/app-examples/example-kt-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveuikt/ui/wallet/StateBuilder.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package foo.bar.example.forereactiveuikt.ui.wallet
-
-import androidx.test.rule.ActivityTestRule
-import foo.bar.example.forereactiveuikt.OG
-import foo.bar.example.forereactiveuikt.feature.wallet.Wallet
-import io.mockk.every
-
-/**
- *
- */
-class StateBuilder internal constructor(private val mockWallet: Wallet) {
-
-    internal fun withMobileWalletMaximum(totalFundsAvailable: Int): StateBuilder {
-
-        every {
-            mockWallet.mobileWalletAmount
-        } returns totalFundsAvailable
-
-        every {
-            mockWallet.savingsWalletAmount
-        } returns 0
-
-        every {
-            mockWallet.canDecrease()
-        } returns true
-
-        every {
-            mockWallet.canIncrease()
-        } returns false
-
-        return this
-    }
-
-    internal fun withMobileWalletHalfFull(savingsWalletAmount: Int, mobileWalletAmount: Int): StateBuilder {
-
-        every {
-            mockWallet.mobileWalletAmount
-        } returns mobileWalletAmount
-
-        every {
-            mockWallet.savingsWalletAmount
-        } returns savingsWalletAmount
-
-        every {
-            mockWallet.canDecrease()
-        } returns true
-
-        every {
-            mockWallet.canIncrease()
-        } returns true
-
-        return this
-    }
-
-    internal fun withMobileWalletEmpty(totalFundsAvailable: Int): StateBuilder {
-
-        every {
-            mockWallet.mobileWalletAmount
-        } returns 0
-
-        every {
-            mockWallet.savingsWalletAmount
-        } returns totalFundsAvailable
-
-        every {
-            mockWallet.canDecrease()
-        } returns false
-
-        every {
-            mockWallet.canIncrease()
-        } returns true
-
-        return this
-    }
-
-    fun createRule(): ActivityTestRule<WalletsActivity> {
-        return object : ActivityTestRule<WalletsActivity>(WalletsActivity::class.java) {
-            override fun beforeActivityLaunched() {
-
-                //inject our mocks so our UI layer will pick them up
-                OG.putMock(Wallet::class.java, mockWallet)
-            }
-        }
-    }
-}
diff --git a/app-examples/example-kt-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivityTest.kt b/app-examples/example-kt-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivityTest.kt
deleted file mode 100644
index ad331612..00000000
--- a/app-examples/example-kt-01reactiveui/src/androidTest/java/foo/bar/example/forereactiveuikt/ui/wallet/WalletsActivityTest.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-package foo.bar.example.forereactiveuikt.ui.wallet
-
-import android.app.Activity
-import android.content.pm.ActivityInfo
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import foo.bar.example.forereactiveuikt.R
-import foo.bar.example.forereactiveuikt.feature.wallet.Wallet
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.hamcrest.Matchers
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-@RunWith(AndroidJUnit4::class)
-class WalletsActivityTest {
-
-    @MockK
-    private lateinit var mockWallet: Wallet
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun emptyMobileWallet() {
-
-        //arrange
-        StateBuilder(mockWallet)
-                .withMobileWalletEmpty(100)
-                .createRule()
-                .launchActivity(null)
-
-        //act
-
-        //assert
-        onView(withId(R.id.wallet_increase_btn)).check(matches(ViewMatchers.isEnabled()))
-        onView(withId(R.id.wallet_decrease_btn)).check(matches(Matchers.not(ViewMatchers.isEnabled())))
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(ViewMatchers.withText("0")))
-        onView(withId(R.id.wallet_savingsamount_txt)).check(matches(ViewMatchers.withText("100")))
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun fullMobileWallet() {
-
-        //arrange
-        StateBuilder(mockWallet)
-                .withMobileWalletMaximum(100)
-                .createRule()
-                .launchActivity(null)
-
-        //act
-
-        //assert
-        onView(withId(R.id.wallet_increase_btn)).check(matches(Matchers.not(ViewMatchers.isEnabled())))
-        onView(withId(R.id.wallet_decrease_btn)).check(matches(ViewMatchers.isEnabled()))
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(ViewMatchers.withText("100")))
-        onView(withId(R.id.wallet_savingsamount_txt)).check(matches(ViewMatchers.withText("0")))
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun halfFullMobileWallet() {
-
-        //arrange
-        StateBuilder(mockWallet)
-                .withMobileWalletHalfFull(32, 8)
-                .createRule()
-                .launchActivity(null)
-
-        //act
-
-        //assert
-        onView(withId(R.id.wallet_increase_btn)).check(matches(ViewMatchers.isEnabled()))
-        onView(withId(R.id.wallet_decrease_btn)).check(matches(ViewMatchers.isEnabled()))
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(ViewMatchers.withText("8")))
-        onView(withId(R.id.wallet_savingsamount_txt)).check(matches(ViewMatchers.withText("32")))
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun stateMaintainedAfterRotation() {
-
-        //arrange
-        val activity: Activity = StateBuilder(mockWallet)
-                .withMobileWalletHalfFull(200, 10)
-                .createRule()
-                .launchActivity(null)
-        activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(ViewMatchers.withText("10")))
-
-        //act
-        activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-
-        //assert
-        onView(withId(R.id.wallet_increase_btn)).check(matches(ViewMatchers.isEnabled()))
-        onView(withId(R.id.wallet_decrease_btn)).check(matches(ViewMatchers.isEnabled()))
-        onView(withId(R.id.wallet_mobileamount_txt)).check(matches(ViewMatchers.withText("10")))
-        onView(withId(R.id.wallet_savingsamount_txt)).check(matches(ViewMatchers.withText("200")))
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun clickIncreaseCallsModel() {
-        //arrange
-        StateBuilder(mockWallet)
-                .withMobileWalletHalfFull(32, 8)
-                .createRule()
-                .launchActivity(null)
-        //act
-        onView(withId(R.id.wallet_increase_btn)).perform(click())
-
-        //assert
-        verify(exactly = 1) {
-            mockWallet.increaseMobileWallet()
-        }
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun clickDecreaseCallsModel() {
-        //arrange
-        StateBuilder(mockWallet)
-                .withMobileWalletHalfFull(32, 8)
-                .createRule()
-                .launchActivity(null)
-        //act
-        onView(withId(R.id.wallet_decrease_btn)).perform(click())
-
-        //assert
-        verify(exactly = 1) {
-            mockWallet.decreaseMobileWallet()
-        }
-    }
-}
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/drawable-xxhdpi/moneybag.png b/app-examples/example-kt-01reactiveui/src/main/res/drawable-xxhdpi/moneybag.png
deleted file mode 100644
index e0ce7a83..00000000
Binary files a/app-examples/example-kt-01reactiveui/src/main/res/drawable-xxhdpi/moneybag.png and /dev/null differ
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/drawable-xxhdpi/phone.png b/app-examples/example-kt-01reactiveui/src/main/res/drawable-xxhdpi/phone.png
deleted file mode 100644
index 2bf7946c..00000000
Binary files a/app-examples/example-kt-01reactiveui/src/main/res/drawable-xxhdpi/phone.png and /dev/null differ
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/layout/activity_wallet.xml b/app-examples/example-kt-01reactiveui/src/main/res/layout/activity_wallet.xml
deleted file mode 100644
index d86c8bf0..00000000
--- a/app-examples/example-kt-01reactiveui/src/main/res/layout/activity_wallet.xml
+++ /dev/null
@@ -1,100 +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:background="@color/colorLightGrey"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:background="@color/colorAccent"
-            android:layout_margin="20dp">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/phone"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text="Mobile Wallet" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginTop="30dp"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/wallet_increase_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="70dp"
-                    android:text="+" />
-
-                <Button
-                    android:id="@+id/wallet_decrease_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="70dp"
-                    android:text="-" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/wallet_mobileamount_txt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="$0"
-                android:textSize="20sp"
-                android:textColor="@color/colorLightGrey"
-                android:paddingBottom="20dp"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:background="@color/colorPrimary"
-            android:layout_margin="20dp">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/moneybag"/>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:text="Savings Wallet" />
-
-            <TextView
-                android:id="@+id/wallet_savingsamount_txt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:text="$10"
-                android:textSize="20sp"
-                android:textColor="@color/colorLightGrey"
-                android:paddingBottom="20dp"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/app-examples/example-kt-01reactiveui/src/main/res/values/styles.xml b/app-examples/example-kt-01reactiveui/src/main/res/values/styles.xml
deleted file mode 100644
index 95f498bb..00000000
--- a/app-examples/example-kt-01reactiveui/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:buttonStyle">@style/LowerCaseButton</item>
-    </style>
-
-    <style name="LowerCaseButton" parent="@android:style/Widget.Button">
-        <item name="textAllCaps">false</item>
-    </style>
-
-</resources>
diff --git a/app-examples/example-kt-02coroutine/screenshot.png b/app-examples/example-kt-02coroutine/screenshot.png
deleted file mode 100644
index 0ab0316d..00000000
Binary files a/app-examples/example-kt-02coroutine/screenshot.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ProgressBarIdler.kt b/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ProgressBarIdler.kt
deleted file mode 100644
index 0f97605b..00000000
--- a/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ProgressBarIdler.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package foo.bar.example.forecoroutine
-
-import android.app.Activity
-import android.app.Application
-import android.app.Instrumentation
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ProgressBar
-
-import androidx.core.content.ContextCompat
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
-
-import androidx.test.runner.lifecycle.Stage.RESUMED
-
-/**
- * If you have any spinning progress bars in your UI it will mess
- * up espresso tests (espresso will time out waiting for all UI
- * threads to be idle before proceeding).
- *
- *
- * This class will go through all your view elements views checking for
- * indeterminate progress bars and replacing the indeterminate drawable
- * with a static one so that espresso tests can continue
- *
- *
- * http://stackoverflow.com/a/37049916/3680389
- * https://stackoverflow.com/questions/33289152/progressbars-and-espresso#36201647
- */
-class ProgressBarIdler : Application.ActivityLifecycleCallbacks {
-
-
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-
-    }
-
-    override fun onActivityStarted(activity: Activity) {
-
-    }
-
-    override fun onActivityResumed(activity: Activity) {
-        makeAllProgressBarsIdle(activity.findViewById<View>(android.R.id.content).rootView)
-    }
-
-    override fun onActivityPaused(activity: Activity) {
-
-    }
-
-    override fun onActivityStopped(activity: Activity) {
-
-    }
-
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-
-    }
-
-    override fun onActivityDestroyed(activity: Activity) {
-
-    }
-
-    companion object {
-
-        private fun makeAllProgressBarsIdle(view: View) {
-            if (view is ViewGroup) {
-                for (i in 0 until view.childCount) {
-                    makeAllProgressBarsIdle(view.getChildAt(i))
-                }
-            } else if (view is ProgressBar) {
-                if (view.isIndeterminate) {
-                    view.indeterminateDrawable = ContextCompat.getDrawable(InstrumentationRegistry.getInstrumentation().targetContext, android.R.drawable.ic_lock_lock)
-                }
-            }
-        }
-
-        fun makeAllProgressBarsIdle(instrumentation: Instrumentation, activity: Activity) {
-            instrumentation.runOnMainSync { makeAllProgressBarsIdle(activity.findViewById<View>(android.R.id.content).rootView) }
-        }
-
-        fun makeAllProgressBarsIdleForAllResumedActivities(instrumentation: Instrumentation) {
-            instrumentation.runOnMainSync {
-                val resumedActivities = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(RESUMED)
-                if (resumedActivities.isEmpty()) {
-                    throw RuntimeException("Could not change orientation")
-                }
-                for (activity in resumedActivities) {
-                    makeAllProgressBarsIdle(activity.findViewById<View>(android.R.id.content).rootView)
-                }
-            }
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ui/CounterViewTest.kt b/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ui/CounterViewTest.kt
deleted file mode 100644
index 47b651e0..00000000
--- a/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ui/CounterViewTest.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-package foo.bar.example.forecoroutine.ui
-
-import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-import android.view.View
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isEnabled
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import foo.bar.example.forecoroutine.App
-import foo.bar.example.forecoroutine.ProgressBarIdler
-import foo.bar.example.forecoroutine.R
-import foo.bar.example.forecoroutine.feature.counter.Counter
-import foo.bar.example.forecoroutine.feature.counter.CounterWithProgress
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.hamcrest.Matchers.not
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Copyright © 2019 early.co. All rights reserved.
- *
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-@RunWith(AndroidJUnit4::class)
-class CounterViewTest {
-
-
-    @MockK
-    private lateinit var mockCounter: Counter
-    @MockK
-    private lateinit var mockCounterWithProgress: CounterWithProgress
-
-
-    @Before
-    fun setup() {
-
-        MockKAnnotations.init(this, relaxed = true)
-
-        val app: App = ApplicationProvider.getApplicationContext() as App
-        app.registerActivityLifecycleCallbacks(ProgressBarIdler())
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun initialState() {
-
-        //arrange
-        StateBuilder(mockCounter, mockCounterWithProgress)
-            .counterWithProgressIsBusy(true)
-            .counterWithProgressProgressValue(7)
-            .counterWithProgressCount(40)
-            .counterBasicIsBusy(false)
-            .counterBasicCount(0)
-            .createRule()
-            .launchActivity(null)
-
-        //act
-
-        //assert
-        onView(withId(R.id.counterwprog_increase_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.counterwprog_busy_progress)).check(matches(isDisplayed()))
-        onView(withId(R.id.counterwprog_progress_txt)).check(matches(withText("7")))
-        onView(withId(R.id.counterwprog_current_txt)).check(matches(withText("40")))
-        onView(withId(R.id.counter_increase_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.counter_busy_progress)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.counter_current_txt)).check(matches(withText("0")))
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun rotationState() {
-
-        //arrange
-        val activity = StateBuilder(mockCounter, mockCounterWithProgress)
-            .counterWithProgressIsBusy(true)
-            .counterWithProgressProgressValue(7)
-            .counterWithProgressCount(40)
-            .counterBasicIsBusy(false)
-            .counterBasicCount(0)
-            .createRule()
-            .launchActivity(null)
-        activity.requestedOrientation = SCREEN_ORIENTATION_LANDSCAPE
-
-        //act
-        activity.requestedOrientation = SCREEN_ORIENTATION_PORTRAIT
-
-        //assert
-        onView(withId(R.id.counterwprog_increase_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.counterwprog_busy_progress)).check(matches(isDisplayed()))
-        onView(withId(R.id.counterwprog_progress_txt)).check(matches(withText("7")))
-        onView(withId(R.id.counterwprog_current_txt)).check(matches(withText("40")))
-        onView(withId(R.id.counter_increase_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.counter_busy_progress)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.counter_current_txt)).check(matches(withText("0")))
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsBasicModel() {
-        //arrange
-        StateBuilder(mockCounter, mockCounterWithProgress)
-            .counterBasicIsBusy(false)
-            .createRule()
-            .launchActivity(null)
-
-        //act
-        onView(withId(R.id.counter_increase_btn)).perform(click())
-
-        //assert
-        verify(exactly = 1) {
-            mockCounter.increaseBy20()
-        }
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsWithProgressModel() {
-        //arrange
-        StateBuilder(mockCounter, mockCounterWithProgress)
-            .counterWithProgressIsBusy(false)
-            .createRule()
-            .launchActivity(null)
-
-        //act
-        onView(withId(R.id.counterwprog_increase_btn)).perform(click())
-
-        //assert
-        verify(exactly = 1) {
-            mockCounterWithProgress.increaseBy20()
-        }
-    }
-}
diff --git a/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ui/StateBuilder.kt b/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ui/StateBuilder.kt
deleted file mode 100644
index 447666f5..00000000
--- a/app-examples/example-kt-02coroutine/src/androidTest/java/foo/bar/example/forecoroutine/ui/StateBuilder.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package foo.bar.example.forecoroutine.ui
-
-import androidx.test.rule.ActivityTestRule
-import foo.bar.example.forecoroutine.OG
-import foo.bar.example.forecoroutine.feature.counter.Counter
-import foo.bar.example.forecoroutine.feature.counter.CounterWithProgress
-import io.mockk.every
-
-
-/**
- * Copyright © 2019 early.co. All rights reserved.
- */
-class StateBuilder internal constructor(private val mockCounter: Counter, private val mockCounterWithProgress: CounterWithProgress) {
-
-    internal fun counterBasicIsBusy(busy: Boolean): StateBuilder {
-        every {
-            mockCounter.isBusy
-        } returns busy
-        return this
-    }
-
-    internal fun counterWithProgressIsBusy(busy: Boolean): StateBuilder {
-        every {
-            mockCounterWithProgress.isBusy
-        } returns busy
-        return this
-    }
-
-    internal fun counterBasicCount(count: Int): StateBuilder {
-        every {
-            mockCounter.count
-        } returns count
-        return this
-    }
-
-    internal fun counterWithProgressCount(count: Int): StateBuilder {
-        every {
-            mockCounterWithProgress.count
-        } returns count
-        return this
-    }
-
-    internal fun counterWithProgressProgressValue(value: Int): StateBuilder {
-        every {
-            mockCounterWithProgress.progress
-        } returns value
-        return this
-    }
-
-    internal fun createRule(): ActivityTestRule<CounterActivity> {
-
-        return object : ActivityTestRule<CounterActivity>(CounterActivity::class.java) {
-            override fun beforeActivityLaunched() {
-
-                //inject our mocks so our UI layer will pick them up
-                OG.putMock(Counter::class.java, mockCounter)
-                OG.putMock(CounterWithProgress::class.java, mockCounterWithProgress)
-            }
-
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-kt-02coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-02coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-kt-02coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-02coroutine/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 8f5c80ae..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher_background.png
deleted file mode 100644
index 1a96b1a9..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 46bea6b3..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index e335d78a..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher_background.png
deleted file mode 100644
index 901d6859..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index b5c5d0b4..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 6fc622e2..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher_background.png
deleted file mode 100644
index 686dab37..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index c6e383af..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 68b160b4..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
deleted file mode 100644
index 670d3e6a..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 840395d1..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 3777b9e6..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
deleted file mode 100644
index 506c6fdb..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e54dcd0f..00000000
Binary files a/app-examples/example-kt-02coroutine/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-02coroutine/src/main/res/values/colors.xml b/app-examples/example-kt-02coroutine/src/main/res/values/colors.xml
deleted file mode 100644
index af48f044..00000000
--- a/app-examples/example-kt-02coroutine/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#515673</color>
-    <color name="colorPrimaryDark">#ff512f</color>
-    <color name="colorAccent">#ff512f</color>
-    <color name="colorLightGrey">#EAEAEA</color>
-</resources>
diff --git a/app-examples/example-kt-02coroutine/src/main/res/values/styles.xml b/app-examples/example-kt-02coroutine/src/main/res/values/styles.xml
deleted file mode 100644
index 95f498bb..00000000
--- a/app-examples/example-kt-02coroutine/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:buttonStyle">@style/LowerCaseButton</item>
-    </style>
-
-    <style name="LowerCaseButton" parent="@android:style/Widget.Button">
-        <item name="textAllCaps">false</item>
-    </style>
-
-</resources>
diff --git a/app-examples/example-kt-03adapters/build.gradle.kts b/app-examples/example-kt-03adapters/build.gradle.kts
deleted file mode 100644
index cc5d3577..00000000
--- a/app-examples/example-kt-03adapters/build.gradle.kts
+++ /dev/null
@@ -1,92 +0,0 @@
-import co.early.fore.Shared
-import co.early.fore.Shared.BuildTypes
-
-plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    kotlin("kapt")
-}
-
-
-val appId = "foo.bar.example.foreadapterskt"
-
-fun getTestBuildType(): String {
-    return project.properties["testBuildType"] as String? ?: BuildTypes.DEFAULT
-}
-
-println("[$appId testBuildType:${getTestBuildType()}]")
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = appId
-    compileSdk = Shared.Android.compileSdk
-
-    buildFeatures {
-        viewBinding = true
-        buildConfig = true
-    }
-    defaultConfig {
-        applicationId = appId
-        minSdk = Shared.Android.minSdk
-        targetSdk = Shared.Android.targetSdk
-        versionCode = 1
-        versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testBuildType = getTestBuildType()
-    }
-    signingConfigs {
-        create(BuildTypes.RELEASE) {
-            // keytool -genkey -v -keystore debug.fake_keystore -storetype PKCS12 -alias android -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 20000 -dname "cn=Unknown, ou=Unknown, o=Unknown, c=Unknown"
-            storeFile = file("../keystore/debug.fake_keystore")
-            storePassword = "android"
-            keyAlias = "android"
-            keyPassword = "android"
-        }
-    }
-    buildTypes {
-        getByName(BuildTypes.DEBUG) {
-            isMinifyEnabled = false
-        }
-        getByName(BuildTypes.RELEASE) {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "../proguard-example-app.pro")
-            signingConfig = signingConfigs.getByName(BuildTypes.RELEASE)
-        }
-    }
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-example-apps.xml")
-    }
-}
-
-dependencies {
-
-    if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android-adapters:${Shared.Publish.published_fore_version_for_examples}")
-    } else {
-        implementation(project(":fore-kt:fore-kt-android-adapters"))
-    }
-
-    implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
-    implementation("androidx.recyclerview:recyclerview:${Shared.Versions.recyclerview}")
-    implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")
-
-    androidTestImplementation("io.mockk:mockk-android:${Shared.Versions.mockk}")
-    androidTestImplementation("androidx.test:core:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:runner:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:rules:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test.ext:junit-ktx:${Shared.Versions.androidxjunit}")
-    androidTestImplementation("androidx.annotation:annotation:${Shared.Versions.annotation}")
-    androidTestImplementation("androidx.test.espresso:espresso-core:${Shared.Versions.espresso_core}") {
-        exclude(group = "com.android.support", module = "support-annotations")
-    }
-}
diff --git a/app-examples/example-kt-03adapters/screenshot.png b/app-examples/example-kt-03adapters/screenshot.png
deleted file mode 100644
index e99fb672..00000000
Binary files a/app-examples/example-kt-03adapters/screenshot.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/EspressoTestMatchers.kt b/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/EspressoTestMatchers.kt
deleted file mode 100644
index 2e6aff17..00000000
--- a/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/EspressoTestMatchers.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package foo.bar.example.foreadapterskt.ui
-
-import android.view.View
-
-import org.hamcrest.Description
-import org.hamcrest.Matcher
-import org.hamcrest.TypeSafeMatcher
-
-import androidx.recyclerview.widget.RecyclerView
-
-/**
- *
- * https://stackoverflow.com/questions/30361068/assert-proper-number-of-items-in-list-with-espresso
- *
- */
-object EspressoTestMatchers {
-
-    fun withRecyclerViewItems(size: Int): Matcher<View> {
-        return object : TypeSafeMatcher<View>() {
-            public override fun matchesSafely(view: View): Boolean {
-                return (view as RecyclerView).adapter!!.itemCount == size
-            }
-
-            override fun describeTo(description: Description) {
-                description.appendText("RecycleView should have $size items")
-            }
-        }
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/playlist/PlaylistsViewTest.kt b/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/playlist/PlaylistsViewTest.kt
deleted file mode 100644
index 57a59db0..00000000
--- a/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/playlist/PlaylistsViewTest.kt
+++ /dev/null
@@ -1,240 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist
-
-import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-import android.view.View
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isEnabled
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import foo.bar.example.foreadapterskt.R
-import foo.bar.example.foreadapterskt.feature.playlist.mutable.MutablePlaylistModel
-import foo.bar.example.foreadapterskt.feature.playlist.immutable.ImmutablePlaylistModel
-import foo.bar.example.foreadapterskt.feature.playlist.Track
-import foo.bar.example.foreadapterskt.ui.EspressoTestMatchers
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.hamcrest.Matchers.not
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-@RunWith(AndroidJUnit4::class)
-class PlaylistsViewTest {
-
-
-    @MockK
-    private lateinit var mockImmutablePlaylistModel: ImmutablePlaylistModel
-    @MockK
-    private lateinit var mockMutablePlaylistModel: MutablePlaylistModel
-
-
-    @Before
-    fun setUp() = MockKAnnotations.init(this, relaxed = true)
-
-
-    @Test
-    @Throws(Exception::class)
-    fun emptyPlaylists() {
-
-        //arrange
-        StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-            .withUpdatablePlaylistHavingTracks(0)
-            .withDiffablePlaylistHavingTracks(0)
-            .createRule()
-            .launchActivity(null)
-
-        //act
-
-        //assert
-        onView(withId(R.id.updatable_add_button)).check(matches(isEnabled()))
-        onView(withId(R.id.updatable_add5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.updatable_remove5_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.updatable_clear_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.updatable_totaltracks_textview)).check(matches(withText("0")))
-        
-        onView(withId(R.id.diffable_add_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_add5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_remove5_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.diffable_clear_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.diffable_totaltracks_textview)).check(matches(withText("0")))
-
-        onView(withId(R.id.updatable_list_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(0)))
-        onView(withId(R.id.diffable_list_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(0)))
-
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun with3ItemsInEachPlaylist() {
-
-        //arrange
-        StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-            .withUpdatablePlaylistHavingTracks(3)
-            .withDiffablePlaylistHavingTracks(3)
-            .withPlaylistsContainingTrack(Track(R.color.pastel1, 123))
-            .createRule()
-            .launchActivity(null)
-
-        //act
-
-        //assert
-        onView(withId(R.id.updatable_add_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_add_button)).check(matches(isEnabled()))
-        onView(withId(R.id.updatable_clear_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_clear_button)).check(matches(isEnabled()))
-
-        onView(withId(R.id.updatable_add5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_add5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.updatable_remove5_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.diffable_remove5_button)).check(matches(not<View>(isEnabled())))
-
-        onView(withId(R.id.updatable_totaltracks_textview)).check(matches(withText("3")))
-        onView(withId(R.id.diffable_totaltracks_textview)).check(matches(withText("3")))
-
-        onView(withId(R.id.updatable_list_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(3)))
-        onView(withId(R.id.diffable_list_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(3)))
-
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun with5ItemsInEachPlaylist() {
-
-        //arrange
-        StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-            .withUpdatablePlaylistHavingTracks(5)
-            .withDiffablePlaylistHavingTracks(5)
-            .withPlaylistsContainingTrack(Track(R.color.pastel1, 123))
-            .createRule()
-            .launchActivity(null)
-
-        //act
-
-        //assert
-        onView(withId(R.id.updatable_add_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_add_button)).check(matches(isEnabled()))
-        onView(withId(R.id.updatable_clear_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_clear_button)).check(matches(isEnabled()))
-
-        onView(withId(R.id.updatable_add5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_add5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.updatable_remove5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.diffable_remove5_button)).check(matches(isEnabled()))
-
-        onView(withId(R.id.updatable_totaltracks_textview)).check(matches(withText("5")))
-        onView(withId(R.id.diffable_totaltracks_textview)).check(matches(withText("5")))
-
-        onView(withId(R.id.updatable_list_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(5)))
-        onView(withId(R.id.diffable_list_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(5)))
-
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun withDifferentItemsInEachPlaylist() {
-
-        //arrange
-        StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-            .withDiffablePlaylistHavingTracks(0)
-            .withUpdatablePlaylistHavingTracks(5)
-            .withPlaylistsContainingTrack(Track(R.color.pastel1, 123))
-            .createRule()
-            .launchActivity(null)
-
-        //act
-
-        //assert
-        onView(withId(R.id.diffable_clear_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.updatable_clear_button)).check(matches(isEnabled()))
-
-        onView(withId(R.id.diffable_remove5_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.updatable_remove5_button)).check(matches(isEnabled()))
-
-        onView(withId(R.id.diffable_totaltracks_textview)).check(matches(withText("0")))
-        onView(withId(R.id.updatable_totaltracks_textview)).check(matches(withText("5")))
-
-        onView(withId(R.id.diffable_list_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(0)))
-        onView(withId(R.id.updatable_list_recycleview)).check(matches(EspressoTestMatchers.withRecyclerViewItems(5)))
-
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun stateMaintainedAfterRotation() {
-
-        //arrange
-        val activity = StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-            .withUpdatablePlaylistHavingTracks(3)
-            .withDiffablePlaylistHavingTracks(3)
-            .withPlaylistsContainingTrack(Track(R.color.pastel1, 123))
-            .createRule()
-            .launchActivity(null)
-        activity.requestedOrientation = SCREEN_ORIENTATION_LANDSCAPE
-
-        onView(withId(R.id.updatable_add5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.updatable_remove5_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.updatable_totaltracks_textview)).check(matches(withText("3")))
-
-        //act
-        activity.requestedOrientation = SCREEN_ORIENTATION_PORTRAIT
-
-        //assert
-        onView(withId(R.id.updatable_add5_button)).check(matches(isEnabled()))
-        onView(withId(R.id.updatable_remove5_button)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.updatable_totaltracks_textview)).check(matches(withText("3")))
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickAddTrackDiffableCallsModel() {
-        //arrange
-        StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-            .withUpdatablePlaylistHavingTracks(0)
-            .withDiffablePlaylistHavingTracks(0)
-            .createRule()
-            .launchActivity(null)
-
-        //act
-        onView(withId(R.id.diffable_add_button)).perform(click())
-
-        //assert
-        verify(exactly = 1) {
-            mockImmutablePlaylistModel.addNTracks(1)
-        }
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickAddTrackUpdatableCallsModel() {
-        //arrange
-        StateBuilder(mockMutablePlaylistModel, mockImmutablePlaylistModel)
-            .withUpdatablePlaylistHavingTracks(0)
-            .withDiffablePlaylistHavingTracks(0)
-            .createRule()
-            .launchActivity(null)
-
-        //act
-        onView(withId(R.id.updatable_add_button)).perform(click())
-
-        //assert
-        verify(exactly = 1) {
-            mockMutablePlaylistModel.addNTracks(1)
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/playlist/StateBuilder.kt b/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/playlist/StateBuilder.kt
deleted file mode 100644
index 638cf4c3..00000000
--- a/app-examples/example-kt-03adapters/src/androidTest/java/foo/bar/example/foreadapterskt/ui/playlist/StateBuilder.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist
-
-import androidx.test.rule.ActivityTestRule
-import co.early.fore.adapters.mutable.UpdateSpec
-import co.early.fore.core.time.SystemTimeWrapper
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import foo.bar.example.foreadapterskt.OG
-import foo.bar.example.foreadapterskt.feature.playlist.mutable.MutablePlaylistModel
-import foo.bar.example.foreadapterskt.feature.playlist.immutable.ImmutablePlaylistModel
-import foo.bar.example.foreadapterskt.feature.playlist.Track
-import io.mockk.CapturingSlot
-import io.mockk.every
-import io.mockk.mockk
-
-
-/**
- *
- */
-class StateBuilder internal constructor(private val mockMutablePlaylistModel: MutablePlaylistModel, private val mockImmutablePlaylistModel: ImmutablePlaylistModel) {
-
-    init {
-
-        val updateSpec = UpdateSpec(UpdateSpec.UpdateType.FULL_UPDATE, 0, 0, mockk<SystemTimeWrapper>(relaxed = true))
-
-        every {
-            mockMutablePlaylistModel.getAndClearLatestUpdateSpec(any())
-        } returns updateSpec
-
-    }
-
-    internal fun withUpdatablePlaylistHavingTracks(numberOfTracks: Int): StateBuilder {
-
-        every {
-            mockMutablePlaylistModel.getItemCount()
-        } returns numberOfTracks
-
-        every {
-            mockMutablePlaylistModel.isEmpty()
-        } returns (numberOfTracks == 0)
-
-        var slot = CapturingSlot<Int>()
-        every {
-            mockMutablePlaylistModel.hasAtLeastNItems(capture(slot))
-        } answers { numberOfTracks >= slot.captured }
-
-        return this
-    }
-
-    internal fun withDiffablePlaylistHavingTracks(numberOfTracks: Int): StateBuilder {
-
-        every {
-            mockImmutablePlaylistModel.getItemCount()
-        } returns numberOfTracks
-
-        every {
-            mockImmutablePlaylistModel.isEmpty()
-        } returns (numberOfTracks == 0)
-
-        var slot = CapturingSlot<Int>()
-        every {
-            mockImmutablePlaylistModel.hasAtLeastNItems(capture(slot))
-        } answers { numberOfTracks >= slot.captured }
-
-        return this
-    }
-
-    internal fun withPlaylistsContainingTrack(track: Track): StateBuilder {
-
-        every {
-            mockMutablePlaylistModel.getItem(any())
-        } returns track
-
-        every {
-            mockImmutablePlaylistModel.getItem(any())
-        } returns track
-
-        return this
-    }
-
-    internal fun createRule(): ActivityTestRule<PlaylistsActivity> {
-
-        return object : ActivityTestRule<PlaylistsActivity>(PlaylistsActivity::class.java) {
-            override fun beforeActivityLaunched() {
-
-                Fore.setDelegate(TestDelegateDefault())
-
-                //inject our mocks so our UI layer will pick them up
-                OG.putMock(MutablePlaylistModel::class.java, mockMutablePlaylistModel)
-                OG.putMock(ImmutablePlaylistModel::class.java, mockImmutablePlaylistModel)
-            }
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-03adapters/src/main/AndroidManifest.xml b/app-examples/example-kt-03adapters/src/main/AndroidManifest.xml
deleted file mode 100644
index 239138f8..00000000
--- a/app-examples/example-kt-03adapters/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:name=".App"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".ui.playlist.PlaylistsActivity" android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/App.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/App.kt
deleted file mode 100644
index 9fa7fd52..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/App.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package foo.bar.example.foreadapterskt
-
-import android.app.Application
-
-/**
- * Copyright © 2015-2020 early.co. All rights reserved.
- */
-class App : Application() {
-
-    override fun onCreate() {
-        super.onCreate()
-
-        inst = this
-
-        OG.setApplication(this)
-        OG.init()
-    }
-
-    companion object {
-        lateinit var inst: App private set
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/OG.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/OG.kt
deleted file mode 100644
index 7247c901..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/OG.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package foo.bar.example.foreadapterskt
-
-import android.app.Application
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.AndroidLogger
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.foreadapterskt.feature.playlist.mutable.MutablePlaylistModel
-import foo.bar.example.foreadapterskt.feature.playlist.immutable.ImmutablePlaylistModel
-import java.util.HashMap
-
-
-/**
- * OG - Object Graph, pure DI implementation
- *
- * Copyright © 2015-2020 early.co. All rights reserved.
-*/
-@Suppress("UNUSED_PARAMETER")
-object OG {
-
-    private var initialized = false
-    private val dependencies = HashMap<Class<*>, Any>()
-
-    fun setApplication(application: Application) {
-
-        // create dependency graph
-        val logger = AndroidLogger("fore_")
-        val playlistAdvancedModel = MutablePlaylistModel(
-                logger
-        )
-        val playlistSimpleModel = ImmutablePlaylistModel(
-                logger
-        )
-
-
-        // add models to the dependencies map if you will need them later
-        dependencies[MutablePlaylistModel::class.java] = playlistAdvancedModel
-        dependencies[ImmutablePlaylistModel::class.java] = playlistSimpleModel
-        dependencies[Logger::class.java] = logger
-
-    }
-
-
-    fun init() {
-        if (!initialized) {
-            initialized = true
-
-            // run any necessary initialization code once object graph has been created here
-
-        }
-    }
-
-
-    /**
-     * This is how dependencies get injected, typically an Activity/Fragment/View will call this
-     * during the onCreate()/onCreateView()/onFinishInflate() method respectively for each of the
-     * dependencies it needs.
-     *
-     * Can use a DI library for similar behaviour using annotations
-     *
-     * Will return mocks if they have been set previously in putMock()
-     *
-     *
-     * Call it like this:
-     *
-     * <code>
-     *     yourModel = OG[YourModel::class.java]
-     * </code>
-     *
-     * If you want to more tightly scoped object, one way is to pass a factory class here and create
-     * an instance where you need it
-     *
-     */
-    @Suppress("UNCHECKED_CAST")
-    operator fun <T> get(model: Class<T>): T = dependencies[model] as T
-
-    fun <T> putMock(clazz: Class<T>, instance: T) {
-        dependencies[clazz] = instance as Any
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/RandomStuffGeneratorUtil.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/RandomStuffGeneratorUtil.kt
deleted file mode 100644
index f39ff54a..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/RandomStuffGeneratorUtil.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package foo.bar.example.foreadapterskt.feature.playlist
-
-import foo.bar.example.foreadapterskt.R
-import java.util.Random
-
-
-object RandomStuffGeneratorUtil {
-
-    private val random = Random()
-
-    private val colours = intArrayOf(R.color.pastel1, R.color.pastel2, R.color.pastel3, R.color.pastel4, R.color.pastel5)
-
-    fun generateRandomColourResource(): Int {
-        return randomInt(colours)
-    }
-
-    fun randomInt(intArray: IntArray): Int {
-        return intArray[random.nextInt(intArray.size - 1)]
-    }
-
-    fun randomLong(): Long {
-        return random.nextLong()
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/Track.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/Track.kt
deleted file mode 100644
index a3b93e91..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/Track.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package foo.bar.example.foreadapterskt.feature.playlist
-
-import androidx.annotation.ColorRes
-import co.early.fore.adapters.immutable.DiffComparator
-import co.early.fore.adapters.immutable.DeepCopyable
-
-
-class Track(
-        @param:ColorRes @field:ColorRes
-        val colourResource: Int,
-        val id: Long,
-        playsRequested: Int? = null
-) : DiffComparator<Track>, DeepCopyable<Track> {
-
-    var numberOfPlaysRequested: Int
-        private set
-
-    init {
-        numberOfPlaysRequested = playsRequested ?: MIN_PLAYS_REQUESTED
-    }
-
-    fun increasePlaysRequested() {
-        if (canIncreasePlays()) {
-            numberOfPlaysRequested++
-        }
-    }
-
-    fun decreasePlaysRequested() {
-        if (canDecreasePlays()) {
-            numberOfPlaysRequested--
-        }
-    }
-
-    fun canIncreasePlays(): Boolean {
-        return numberOfPlaysRequested < MAX_PLAYS_REQUESTED
-    }
-
-    fun canDecreasePlays(): Boolean {
-        return numberOfPlaysRequested > MIN_PLAYS_REQUESTED
-    }
-
-    companion object {
-        private const val MIN_PLAYS_REQUESTED = 1
-        const val MAX_PLAYS_REQUESTED = 4
-    }
-
-    override fun itemsTheSame(other: Track): Boolean {
-        return this.id == other.id
-    }
-
-    override fun itemsLookTheSame(other: Track): Boolean {
-        return (this.numberOfPlaysRequested == other.numberOfPlaysRequested
-                && this.colourResource == other.colourResource)
-    }
-
-    override fun deepCopy(): Track {
-        return Track(
-                colourResource,
-                id,
-                numberOfPlaysRequested
-        )
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/immutable/ImmutablePlaylistModel.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/immutable/ImmutablePlaylistModel.kt
deleted file mode 100644
index 0037beda..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/immutable/ImmutablePlaylistModel.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package foo.bar.example.foreadapterskt.feature.playlist.immutable
-
-import co.early.fore.adapters.Adaptable
-import co.early.fore.adapters.immutable.Diffable
-import co.early.fore.core.observer.Observable
-import co.early.fore.kt.adapters.immutable.ImmutableListMgr
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.foreadapterskt.feature.playlist.RandomStuffGeneratorUtil.generateRandomColourResource
-import foo.bar.example.foreadapterskt.feature.playlist.RandomStuffGeneratorUtil.randomLong
-import foo.bar.example.foreadapterskt.feature.playlist.Track
-import java.util.ArrayList
-
-/**
- * Example model based on **immutable** list data
- *
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-class ImmutablePlaylistModel (
-        private val logger: Logger,
-        private val listMgr: ImmutableListMgr<Track> = ImmutableListMgr(logger = logger)
-) :
-    Diffable by listMgr,
-    Observable by listMgr,
-    Adaptable<Track> by listMgr {
-
-    fun removeTrack(index: Int) {
-        logger.i("removeTrack() $index")
-        checkIndex(index)
-        listMgr.changeList {
-            it.removeAt(index)
-        }
-    }
-
-    fun removeAllTracks() {
-        logger.i("removeAllTracks()")
-        listMgr.changeList {
-            it.clear()
-        }
-    }
-
-    fun increasePlaysForTrack(index: Int) {
-        logger.i("increasePlaysForTrack() $index")
-        checkIndex(index)
-        listMgr.changeList {
-            it[index].increasePlaysRequested()
-        }
-    }
-
-    fun decreasePlaysForTrack(index: Int) {
-        logger.i("decreasePlaysForTrack() $index")
-        checkIndex(index)
-        listMgr.changeList {
-            it[index].decreasePlaysRequested()
-        }
-    }
-
-    fun addNTracks(n: Int) {
-        logger.i("addNTracks() n:$n")
-
-        val newTracks = ArrayList<Track>()
-        for (ii in 0 until n) {
-            newTracks.add(Track(generateRandomColourResource(), randomLong()))
-        }
-
-        listMgr.changeList {
-            it.addAll(newTracks)
-        }
-    }
-
-    fun removeNTracks(n: Int) {
-        logger.i("removeNTracks() n:$n")
-        if (getItemCount() > n - 1) {
-            listMgr.changeList {
-                it.subList(0, n).clear()
-            }
-        }
-    }
-
-    fun isEmpty(): Boolean {
-        return !hasAtLeastNItems(1)
-    }
-
-    fun hasAtLeastNItems(n: Int): Boolean {
-        return getItemCount() >= n
-    }
-
-    fun replaceTracks(newTrackList: List<Track>) {
-        logger.i("replaceTracks()")
-        listMgr.replaceList {
-            newTrackList
-        }
-    }
-
-    private fun checkIndex(index: Int) {
-        if (isEmpty()) {
-            throw IndexOutOfBoundsException("tracklist has no items in it, can not get index:$index")
-        } else if (index < 0 || index > getItemCount() - 1) {
-            throw IndexOutOfBoundsException("tracklist index needs to be between 0 and " + (getItemCount() - 1) + " not:" + index)
-        }
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/mutable/MutablePlaylistModel.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/mutable/MutablePlaylistModel.kt
deleted file mode 100644
index bf353436..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/feature/playlist/mutable/MutablePlaylistModel.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package foo.bar.example.foreadapterskt.feature.playlist.mutable
-
-import co.early.fore.adapters.Adaptable
-import co.early.fore.adapters.mutable.ChangeAwareList
-import co.early.fore.adapters.mutable.Updateable
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.core.observer.Observable
-import co.early.fore.kt.adapters.mutable.ChangeAwareArrayList
-import co.early.fore.kt.core.observer.ObservableImp
-import foo.bar.example.foreadapterskt.feature.playlist.RandomStuffGeneratorUtil.generateRandomColourResource
-import foo.bar.example.foreadapterskt.feature.playlist.RandomStuffGeneratorUtil.randomLong
-import foo.bar.example.foreadapterskt.feature.playlist.Track
-import java.util.ArrayList
-
-/**
- * Example model based on **mutable** list data
- *
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-class MutablePlaylistModel(
-        private val logger: Logger,
-        private val trackList: ChangeAwareList<Track> = ChangeAwareArrayList()
-) : Observable by ObservableImp(),
-    Updateable by trackList,
-    Adaptable<Track> {
-
-    fun removeTrack(index: Int) {
-        logger.i("removeTrack() $index")
-        checkIndex(index)
-        trackList.removeAt(index)
-        notifyObservers()
-    }
-
-    fun removeAllTracks() {
-        logger.i("removeAllTracks()")
-        trackList.clear()
-        notifyObservers()
-    }
-
-    fun increasePlaysForTrack(index: Int) {
-        logger.i("increasePlaysForTrack() $index")
-        getItem(index).increasePlaysRequested()
-        trackList.makeAwareOfDataChange(index)
-        notifyObservers()
-    }
-
-    fun decreasePlaysForTrack(index: Int) {
-        logger.i("decreasePlaysForTrack() $index")
-        getItem(index).decreasePlaysRequested()
-        trackList.makeAwareOfDataChange(index)
-        notifyObservers()
-    }
-
-    fun addNTracks(n: Int) {
-        logger.i("addNTracks() n:$n")
-        val newTracks = ArrayList<Track>()
-        for (ii in 0 until n) {
-            newTracks.add(Track(generateRandomColourResource(), randomLong()))
-        }
-        trackList.addAll(newTracks)
-        logger.i("addNTracks() updated")
-        notifyObservers()
-    }
-
-    fun removeNTracks(n: Int) {
-        logger.i("removeNTracks() n:$n")
-        if (getItemCount() > n - 1) {
-            trackList.removeRange(0, n)
-            notifyObservers()
-        }
-    }
-
-    fun isEmpty(): Boolean {
-        return trackList.isEmpty()
-    }
-
-    fun hasAtLeastNItems(n: Int): Boolean {
-        return trackList.size >= n
-    }
-
-    override fun getItem(index: Int): Track {
-        checkIndex(index)
-        return trackList[index]
-    }
-
-    override fun getItemCount(): Int {
-        return trackList.size
-    }
-
-    private fun checkIndex(index: Int) {
-        if (trackList.size == 0) {
-            throw IndexOutOfBoundsException("tracklist has no items in it, can not get index:$index")
-        } else if (index < 0 || index > trackList.size - 1) {
-            throw IndexOutOfBoundsException("tracklist index needs to be between 0 and " + (trackList.size - 1) + " not:" + index)
-        }
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/PlaylistsActivity.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/PlaylistsActivity.kt
deleted file mode 100644
index 2bbb443e..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/PlaylistsActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist
-
-import androidx.fragment.app.FragmentActivity
-import foo.bar.example.foreadapterskt.R
-
-class PlaylistsActivity : FragmentActivity(R.layout.activity_playlists)
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/immutable/ImmutableListView.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/immutable/ImmutableListView.kt
deleted file mode 100644
index 507a004e..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/immutable/ImmutableListView.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist.immutable
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.Button
-import android.widget.RelativeLayout
-import android.widget.TextView
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import co.early.fore.adapters.CrossFadeRemover
-import co.early.fore.core.observer.Observer
-import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.foreadapterskt.OG
-import foo.bar.example.foreadapterskt.R
-import foo.bar.example.foreadapterskt.feature.playlist.immutable.ImmutablePlaylistModel
-
-/**
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-class ImmutableListView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr), SyncableView {
-
-    //models that we need to sync with
-    private val immutablePlaylistModel: ImmutablePlaylistModel = OG[ImmutablePlaylistModel::class.java]
-    private val logger: Logger = OG[Logger::class.java]
-
-    private lateinit var diffableAddButton: Button
-    private lateinit var diffableAdd5Button: Button
-    private lateinit var diffableAdd100Button: Button
-    private lateinit var diffableRemove5Button: Button
-    private lateinit var diffableRemove100Button: Button
-    private lateinit var diffableClearButton: Button
-    private lateinit var diffableTotaltracksTextview: TextView
-    private lateinit var diffableListRecycleview: RecyclerView
-
-    private lateinit var immutablePlaylistAdapter : ImmutablePlaylistAdapter
-
-    //single observer reference
-    private var observer = Observer { syncView() }
-
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-
-        setupUiReferences()
-
-        setupClickListeners()
-
-        setupAdapters()
-    }
-
-    private fun setupUiReferences() {
-        diffableAddButton = findViewById(R.id.diffable_add_button)
-        diffableAdd5Button = findViewById(R.id.diffable_add5_button)
-        diffableAdd100Button = findViewById(R.id.diffable_add100_button)
-        diffableRemove5Button = findViewById(R.id.diffable_remove5_button)
-        diffableRemove100Button = findViewById(R.id.diffable_remove100_button)
-        diffableClearButton = findViewById(R.id.diffable_clear_button)
-        diffableTotaltracksTextview = findViewById(R.id.diffable_totaltracks_textview)
-        diffableListRecycleview = findViewById(R.id.diffable_list_recycleview)
-    }
-
-    private fun setupClickListeners() {
-        diffableAddButton.setOnClickListener { immutablePlaylistModel.addNTracks(1) }
-        diffableAdd5Button.setOnClickListener { immutablePlaylistModel.addNTracks(5) }
-        diffableAdd100Button.setOnClickListener { immutablePlaylistModel.addNTracks(100) }
-        diffableRemove5Button.setOnClickListener { immutablePlaylistModel.removeNTracks(5) }
-        diffableRemove100Button.setOnClickListener { immutablePlaylistModel.removeNTracks(100) }
-        diffableClearButton.setOnClickListener { immutablePlaylistModel.removeAllTracks() }
-    }
-
-    private fun setupAdapters() {
-        immutablePlaylistAdapter = ImmutablePlaylistAdapter(immutablePlaylistModel)
-        diffableListRecycleview.apply{
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            adapter = immutablePlaylistAdapter
-            itemAnimator = CrossFadeRemover()
-            setHasFixedSize(true)
-        }
-    }
-
-    override fun syncView() {
-        logger.i("syncView()")
-        diffableRemove5Button.isEnabled = immutablePlaylistModel.hasAtLeastNItems(5)
-        diffableRemove100Button.isEnabled = immutablePlaylistModel.hasAtLeastNItems(100)
-        diffableTotaltracksTextview.text = immutablePlaylistModel.getItemCount().toString()
-        diffableClearButton.isEnabled = !immutablePlaylistModel.isEmpty()
-
-        immutablePlaylistAdapter.notifyDataSetChangedAuto()
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        immutablePlaylistModel.addObserver(observer)
-        syncView()  // <- don't forget this
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        immutablePlaylistModel.removeObserver(observer)
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/immutable/ImmutablePlaylistAdapter.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/immutable/ImmutablePlaylistAdapter.kt
deleted file mode 100644
index cef2418b..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/immutable/ImmutablePlaylistAdapter.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist.immutable
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import co.early.fore.adapters.Adaptable
-import co.early.fore.adapters.Notifyable
-import co.early.fore.kt.adapters.NotifyableImp
-import foo.bar.example.foreadapterskt.R
-import foo.bar.example.foreadapterskt.feature.playlist.Track
-import foo.bar.example.foreadapterskt.feature.playlist.immutable.ImmutablePlaylistModel
-import foo.bar.example.foreadapterskt.ui.playlist.immutable.ImmutablePlaylistAdapter.ViewHolder
-import foo.bar.example.foreadapterskt.ui.widget.PercentVBar
-
-/**
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-class ImmutablePlaylistAdapter(
-        private val immutablePlaylistModel: ImmutablePlaylistModel,
-        private val notifyableImp: NotifyableImp<ViewHolder> = NotifyableImp(diffable = immutablePlaylistModel)
-) :
-        RecyclerView.Adapter<ViewHolder>(),
-        Notifyable<ViewHolder> by notifyableImp,
-        Adaptable<Track> by immutablePlaylistModel {
-
-    init {
-        notifyableImp.initializeAdapter(this)
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.activity_playlists_listitem, parent, false)
-        return ViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-
-        val item = immutablePlaylistModel.getItem(position)
-
-        holder.trackIncreasePlaysButton.setOnClickListener {
-            //if you tap very fast on different rows removing them
-            //while you are using adapter animations you will crash unless
-            //you check for this
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                immutablePlaylistModel.increasePlaysForTrack(betterPosition)
-            }
-        }
-
-        holder.trackDecreasePlaysButton.setOnClickListener {
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                immutablePlaylistModel.decreasePlaysForTrack(betterPosition)
-            }
-        }
-
-        holder.trackRemoveButton.setOnClickListener {
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                immutablePlaylistModel.removeTrack(betterPosition)
-            }
-        }
-
-        holder.itemView.setBackgroundResource(item.colourResource)
-        holder.trackPlaysRequestedText.text = "${item.numberOfPlaysRequested}"
-        holder.trackIncreasePlaysButton.isEnabled = item.canIncreasePlays()
-        holder.trackDecreasePlaysButton.isEnabled = item.canDecreasePlays()
-        holder.trackPercentVbar.setPercentDone(item.id,(item.numberOfPlaysRequested*100/Track.MAX_PLAYS_REQUESTED).toFloat())
-    }
-
-    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val trackPlaysRequestedText: TextView
-        val trackIncreasePlaysButton: Button
-        val trackDecreasePlaysButton: Button
-        val trackRemoveButton: Button
-        val trackPercentVbar: PercentVBar
-        init {
-            trackPlaysRequestedText = view.findViewById(R.id.track_playsrequested_text)
-            trackIncreasePlaysButton = view.findViewById(R.id.track_increaseplays_button)
-            trackDecreasePlaysButton = view.findViewById(R.id.track_decreaseplays_button)
-            trackRemoveButton = view.findViewById(R.id.track_remove_button)
-            trackPercentVbar = view.findViewById(R.id.track_percent_vbar)
-        }
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/listdiffer/ListDifferListView.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/listdiffer/ListDifferListView.kt
deleted file mode 100644
index db838c06..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/listdiffer/ListDifferListView.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist.listdiffer
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.Button
-import android.widget.RelativeLayout
-import android.widget.TextView
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import co.early.fore.adapters.CrossFadeRemover
-import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.foreadapterskt.OG
-import foo.bar.example.foreadapterskt.R
-
-/**
- * Copyright © 2015-2020 early.co. All rights reserved.
- */
-class ListDifferListView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr), SyncableView {
-
-    //models that we need to sync with
-    private val logger: Logger = OG[Logger::class.java]
-
-    private lateinit var listdifferAddButton: Button
-    private lateinit var listdifferAdd5Button: Button
-    private lateinit var listdifferAdd100Button: Button
-    private lateinit var listdifferRemove5Button: Button
-    private lateinit var listdifferRemove100Button: Button
-    private lateinit var listdifferClearButton: Button
-    private lateinit var listdifferTotaltracksTextview: TextView
-    private lateinit var listdifferListRecycleview: RecyclerView
-
-    private lateinit var listDifferAdapter: ListDifferPlaylistAdapter
-
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-
-        setupUiReferences()
-
-        setupClickListeners()
-
-        setupAdapters()
-
-        // Note: we are only doing this because this example is demonstrating google's AsyncListDiffer
-        // usually in MVO we would have a model that we would be observing that would call this for us
-        syncView()
-    }
-
-    private fun setupUiReferences() {
-        listdifferAddButton = findViewById(R.id.listdiffer_add_button)
-        listdifferAdd5Button = findViewById(R.id.listdiffer_add5_button)
-        listdifferAdd100Button = findViewById(R.id.listdiffer_add100_button)
-        listdifferRemove5Button = findViewById(R.id.listdiffer_remove5_button)
-        listdifferRemove100Button = findViewById(R.id.listdiffer_remove100_button)
-        listdifferClearButton = findViewById(R.id.listdiffer_clear_button)
-        listdifferTotaltracksTextview = findViewById(R.id.listdiffer_totaltracks_textview)
-        listdifferListRecycleview = findViewById(R.id.listdiffer_list_recycleview)
-    }
-
-    private fun setupClickListeners() {
-        listdifferAddButton.setOnClickListener { listDifferAdapter.addNTracks(1) }
-        listdifferClearButton.setOnClickListener { listDifferAdapter.removeAllTracks() }
-        listdifferAdd5Button.setOnClickListener { listDifferAdapter.addNTracks(5) }
-        listdifferRemove5Button.setOnClickListener { listDifferAdapter.removeNTracks(5) }
-        listdifferAdd100Button.setOnClickListener { listDifferAdapter.addNTracks(100) }
-        listdifferRemove100Button.setOnClickListener { listDifferAdapter.removeNTracks(100) }
-    }
-
-    private fun setupAdapters() {
-        listDifferAdapter = ListDifferPlaylistAdapter(this, logger)
-        listdifferListRecycleview.apply{
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            adapter = listDifferAdapter
-            itemAnimator = CrossFadeRemover()
-            setHasFixedSize(true)
-        }
-    }
-
-    override fun syncView() {
-        logger.i("syncView()")
-        listdifferTotaltracksTextview.text = listDifferAdapter.itemCount.toString()
-        listdifferClearButton.isEnabled = !listDifferAdapter.isEmpty()
-        listdifferRemove5Button.isEnabled = listDifferAdapter.hasAtLeastNItems(5)
-        listdifferRemove100Button.isEnabled = listDifferAdapter.hasAtLeastNItems(100)
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/listdiffer/ListDifferPlaylistAdapter.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/listdiffer/ListDifferPlaylistAdapter.kt
deleted file mode 100644
index 70a1167f..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/listdiffer/ListDifferPlaylistAdapter.kt
+++ /dev/null
@@ -1,210 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist.listdiffer
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.foreadapterskt.R
-import foo.bar.example.foreadapterskt.feature.playlist.RandomStuffGeneratorUtil
-import foo.bar.example.foreadapterskt.feature.playlist.RandomStuffGeneratorUtil.randomLong
-import foo.bar.example.foreadapterskt.feature.playlist.Track
-import foo.bar.example.foreadapterskt.ui.widget.PercentVBar
-import java.util.ArrayList
-
-
-/**
- * Demonstrating list animations with [AsyncListDiffer]
- *
- * This is google's wrapper for DiffUtil (this discussion of AsyncListDiffer applies similarly for
- * ListAdapter which uses AsyncListDiffer internally). The main thing to be aware of regarding
- * AsyncListDiffer is that the source of truth for the list is maintained inside
- * AsyncListDiffer itself. This has three important ramifications:
- *
- * 1) If you need to refer to it (for example to calculate some property of the current list and
- * display it on the UI) you need to use asyncListDiffer.currentList. It's important to
- * remember that if you copy this list rather than refer directly to asyncListDiffer.currentList
- * then your list copy may not accurately reflect the truth (which is carefully managed
- * inside AsyncListDiffer)
- *
- * 2) If you want to alter this list and then have the changes reflected by the adapter, you need
- * to deep copy the list, change it and then submit it back to asyncListDiffer. If you don't deep
- * copy the list, any changes you make to the items will be made to both the items in the new list
- * and the items in the old list that is maintained by asyncListDiffer, when it then compares the
- * two lists with DiffUtil it will not detect any changes and your list will be incorrectly updated.
- * If your architecture is database driven (or viewState driven along the lines of MVI), this
- * should be less of a problem because each time your list changes, you should be receiving a
- * brand new list
- * (the deep copy should be done by MVI in the interactor - however if your implementation of MVI
- * is not deep copying the list items when they change, then the same problem will present - and
- * unless you happen to know that this is how AsyncListDiffer works, you're not going to have a fun
- * day)
- *
- * 3) Because AsyncListDiffer manages the truth, you loose the ability to keep the true list
- * inside something like a view model where you can add associated logic. In this case the logic
- * resides inside the adapter itself so with this type of code, your test focus moves from testing
- * models, to testing a more complicated adapter (that means with this solution you loose some of
- * the advantages of using MVO style models which are shared across different views).
- *
- */
-class ListDifferPlaylistAdapter(
-        private val syncableView: SyncableView,
-        private val logger: Logger
-) : RecyclerView.Adapter<ListDifferPlaylistAdapter.ViewHolder>() {
-
-    val itemCallback: DiffUtil.ItemCallback<Track> = object : DiffUtil.ItemCallback<Track>() {
-        override fun areItemsTheSame(oldItem: Track, newItem: Track): Boolean {
-            return oldItem.itemsTheSame(newItem)
-        }
-
-        override fun areContentsTheSame(oldItem: Track, newItem: Track): Boolean {
-            return oldItem.itemsLookTheSame(newItem)
-        }
-    }
-    private val differ = AsyncListDiffer(this, itemCallback)
-
-
-    fun removeTrack(index: Int) {
-        logger.i("removeTrack() $index")
-        val mutableList = getListCopy()
-        mutableList.removeAt(index)
-        differ.submitList(mutableList) {
-            logger.i("removeTrack() updated")
-            syncableView.syncView()
-        }
-    }
-
-    fun removeAllTracks() {
-        logger.i("removeAllTracks()")
-        val mutableList = getListCopy()
-        mutableList.clear()
-        differ.submitList(mutableList) {
-            logger.i("removeAllTracks() updated")
-            syncableView.syncView()
-        }
-    }
-
-    fun increasePlaysForTrack(index: Int) {
-        logger.i("increasePlaysForTrack() $index")
-        val mutableList = getListCopy()
-        mutableList[index].increasePlaysRequested()
-        differ.submitList(mutableList) {
-            logger.i("increasePlaysForTrack() updated")
-            syncableView.syncView()
-        }
-    }
-
-    fun decreasePlaysForTrack(index: Int) {
-        logger.i("decreasePlaysForTrack() $index")
-        val mutableList = getListCopy()
-        mutableList[index].decreasePlaysRequested()
-        differ.submitList(mutableList) {
-            logger.i("decreasePlaysForTrack() updated")
-            syncableView.syncView()
-        }
-    }
-
-    fun addNTracks(n: Int) {
-        logger.i("addNTracks() n:$n")
-        val newTracks = ArrayList<Track>()
-        for (ii in 0 until n) {
-            newTracks.add(Track(RandomStuffGeneratorUtil.generateRandomColourResource(), randomLong()))
-        }
-        val mutableList = getListCopy()
-        mutableList.addAll(newTracks)
-        differ.submitList(mutableList) {
-            logger.i("addNTracks() updated")
-            syncableView.syncView()
-        }
-    }
-
-    fun removeNTracks(n: Int) {
-        logger.i("removeNTracks() n:$n")
-        val mutableList = getListCopy()
-        if (mutableList.size > n - 1) {
-            mutableList.subList(0, n).clear()
-            differ.submitList(mutableList) {
-                logger.i("remove5Tracks() updated")
-                syncableView.syncView()
-            }
-        }
-    }
-
-    fun isEmpty(): Boolean {
-        return differ.currentList.isEmpty()
-    }
-
-    fun hasAtLeastNItems(n: Int): Boolean {
-        return differ.currentList.size >= n
-    }
-
-    private fun getListCopy(): MutableList<Track> {
-        val listCopy = differ.currentList.map { it.deepCopy() } //deep copy
-        return listCopy.toMutableList()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.activity_playlists_listitem, parent, false)
-        return ViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-
-        val item = differ.currentList[position]
-
-        holder.trackIncreasePlaysButton.setOnClickListener {
-            //if you tap very fast on different rows removing them
-            //while you are using adapter animations you will crash unless
-            //you check for this
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                increasePlaysForTrack(betterPosition)
-            }
-        }
-
-        holder.trackDecreasePlaysButton.setOnClickListener {
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                decreasePlaysForTrack(betterPosition)
-            }
-        }
-
-        holder.trackRemoveButton.setOnClickListener {
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                removeTrack(betterPosition)
-            }
-        }
-
-        holder.itemView.setBackgroundResource(item.colourResource)
-        holder.trackPlaysRequestedText.text = "${item.numberOfPlaysRequested}"
-        holder.trackIncreasePlaysButton.isEnabled = item.canIncreasePlays()
-        holder.trackDecreasePlaysButton.isEnabled = item.canDecreasePlays()
-        holder.trackPercentVbar.setPercentDone(item.id, (item.numberOfPlaysRequested*100/Track.MAX_PLAYS_REQUESTED).toFloat())
-    }
-
-    override fun getItemCount(): Int {
-        return differ.currentList.size
-    }
-
-    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val trackPlaysRequestedText: TextView
-        val trackIncreasePlaysButton: Button
-        val trackDecreasePlaysButton: Button
-        val trackRemoveButton: Button
-        val trackPercentVbar: PercentVBar
-        init {
-            trackPlaysRequestedText = view.findViewById(R.id.track_playsrequested_text)
-            trackIncreasePlaysButton = view.findViewById(R.id.track_increaseplays_button)
-            trackDecreasePlaysButton = view.findViewById(R.id.track_decreaseplays_button)
-            trackRemoveButton = view.findViewById(R.id.track_remove_button)
-            trackPercentVbar = view.findViewById(R.id.track_percent_vbar)
-        }
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/mutable/MutableListView.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/mutable/MutableListView.kt
deleted file mode 100644
index 7822d61e..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/mutable/MutableListView.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist.mutable
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.Button
-import android.widget.RelativeLayout
-import android.widget.TextView
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import co.early.fore.adapters.CrossFadeRemover
-import co.early.fore.core.observer.Observer
-import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.foreadapterskt.OG
-import foo.bar.example.foreadapterskt.R
-import foo.bar.example.foreadapterskt.feature.playlist.mutable.MutablePlaylistModel
-
-/**
- * Copyright © 2015-2020 early.co. All rights reserved.
- */
-class MutableListView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr), SyncableView {
-
-    //models that we need to sync with
-    private val mutablePlaylistModel: MutablePlaylistModel = OG[MutablePlaylistModel::class.java]
-    private val logger: Logger = OG[Logger::class.java]
-
-    private lateinit var updatableAddButton: Button
-    private lateinit var updatableAdd5Button: Button
-    private lateinit var updatableAdd100Button: Button
-    private lateinit var updatableRemove5Button: Button
-    private lateinit var updatableRemove100Button: Button
-    private lateinit var updatableClearButton: Button
-    private lateinit var updatableTotaltracksTextview: TextView
-    private lateinit var updatableListRecycleview: RecyclerView
-
-    private lateinit var mutablePlaylistAdapter: MutablePlaylistAdapter
-
-    //single observer reference
-    private var observer = Observer { syncView() }
-
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-
-        setupUiReferences()
-
-        setupClickListeners()
-
-        setupAdapters()
-    }
-
-    private fun setupUiReferences() {
-        updatableAddButton = findViewById(R.id.updatable_add_button)
-        updatableAdd5Button = findViewById(R.id.updatable_add5_button)
-        updatableAdd100Button = findViewById(R.id.updatable_add100_button)
-        updatableRemove5Button = findViewById(R.id.updatable_remove5_button)
-        updatableRemove100Button = findViewById(R.id.updatable_remove100_button)
-        updatableClearButton = findViewById(R.id.updatable_clear_button)
-        updatableTotaltracksTextview = findViewById(R.id.updatable_totaltracks_textview)
-        updatableListRecycleview = findViewById(R.id.updatable_list_recycleview)
-    }
-
-    private fun setupClickListeners() {
-        updatableAddButton.setOnClickListener { mutablePlaylistModel.addNTracks(1) }
-        updatableClearButton.setOnClickListener { mutablePlaylistModel.removeAllTracks() }
-        updatableAdd5Button.setOnClickListener { mutablePlaylistModel.addNTracks(5) }
-        updatableRemove5Button.setOnClickListener { mutablePlaylistModel.removeNTracks(5) }
-        updatableAdd100Button.setOnClickListener { mutablePlaylistModel.addNTracks(100) }
-        updatableRemove100Button.setOnClickListener { mutablePlaylistModel.removeNTracks(100) }
-    }
-
-    private fun setupAdapters() {
-        mutablePlaylistAdapter = MutablePlaylistAdapter(mutablePlaylistModel)
-        updatableListRecycleview.apply {
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            adapter = mutablePlaylistAdapter
-            itemAnimator = CrossFadeRemover()
-            setHasFixedSize(true)
-        }
-    }
-
-    override fun syncView() {
-        logger.i("syncView()")
-        updatableTotaltracksTextview.text = mutablePlaylistModel.getItemCount().toString()
-        updatableClearButton.isEnabled = !mutablePlaylistModel.isEmpty()
-        updatableRemove5Button.isEnabled = mutablePlaylistModel.hasAtLeastNItems(5)
-        updatableRemove100Button.isEnabled = mutablePlaylistModel.hasAtLeastNItems(100)
-
-        mutablePlaylistAdapter.notifyDataSetChangedAuto()
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        mutablePlaylistModel.addObserver(observer)
-        syncView()  // <- don't forget this
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        mutablePlaylistModel.removeObserver(observer)
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/mutable/MutablePlaylistAdapter.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/mutable/MutablePlaylistAdapter.kt
deleted file mode 100644
index f8725420..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/playlist/mutable/MutablePlaylistAdapter.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.playlist.mutable
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import co.early.fore.adapters.Adaptable
-import co.early.fore.adapters.Notifyable
-import co.early.fore.kt.adapters.NotifyableImp
-import foo.bar.example.foreadapterskt.R
-import foo.bar.example.foreadapterskt.feature.playlist.Track
-import foo.bar.example.foreadapterskt.feature.playlist.mutable.MutablePlaylistModel
-import foo.bar.example.foreadapterskt.ui.playlist.mutable.MutablePlaylistAdapter.*
-import foo.bar.example.foreadapterskt.ui.widget.PercentVBar
-
-/**
- * Copyright © 2015-2021 early.co. All rights reserved.
- */
-class MutablePlaylistAdapter(
-        private val mutablePlaylistModel: MutablePlaylistModel,
-        private val notifyableImp: NotifyableImp<ViewHolder> = NotifyableImp(updateable = mutablePlaylistModel)
-) :
-        RecyclerView.Adapter<ViewHolder>(),
-        Notifyable<ViewHolder> by notifyableImp,
-        Adaptable<Track> by mutablePlaylistModel {
-
-    init {
-        notifyableImp.initializeAdapter(this)
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.activity_playlists_listitem, parent, false)
-        return ViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-
-        val item = mutablePlaylistModel.getItem(position)
-
-        holder.trackIncreasePlaysButton.setOnClickListener {
-            //if you tap very fast on different rows removing them
-            //while you are using adapter animations you will crash unless
-            //you check for this
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                mutablePlaylistModel.increasePlaysForTrack(betterPosition)
-            }
-        }
-
-        holder.trackDecreasePlaysButton.setOnClickListener {
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                mutablePlaylistModel.decreasePlaysForTrack(betterPosition)
-            }
-        }
-
-        holder.trackRemoveButton.setOnClickListener {
-            val betterPosition = holder.bindingAdapterPosition
-            if (betterPosition != NO_POSITION) {
-                mutablePlaylistModel.removeTrack(betterPosition)
-            }
-        }
-
-        holder.itemView.setBackgroundResource(item.colourResource)
-        holder.trackPlaysRequestedText.text = "${item.numberOfPlaysRequested}"
-        holder.trackIncreasePlaysButton.isEnabled = item.canIncreasePlays()
-        holder.trackDecreasePlaysButton.isEnabled = item.canDecreasePlays()
-        holder.trackPercentVbar.setPercentDone(
-                item.id,
-                (item.numberOfPlaysRequested*100/Track.MAX_PLAYS_REQUESTED).toFloat()
-        )
-    }
-
-    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val trackPlaysRequestedText: TextView
-        val trackIncreasePlaysButton: Button
-        val trackDecreasePlaysButton: Button
-        val trackRemoveButton: Button
-        val trackPercentVbar: PercentVBar
-        init {
-            trackPlaysRequestedText = view.findViewById(R.id.track_playsrequested_text)
-            trackIncreasePlaysButton = view.findViewById(R.id.track_increaseplays_button)
-            trackDecreasePlaysButton = view.findViewById(R.id.track_decreaseplays_button)
-            trackRemoveButton = view.findViewById(R.id.track_remove_button)
-            trackPercentVbar = view.findViewById(R.id.track_percent_vbar)
-        }
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/widget/PercentVBar.kt b/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/widget/PercentVBar.kt
deleted file mode 100644
index 523f5310..00000000
--- a/app-examples/example-kt-03adapters/src/main/java/foo/bar/example/foreadapterskt/ui/widget/PercentVBar.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package foo.bar.example.foreadapterskt.ui.widget
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.RectF
-import android.util.AttributeSet
-import android.widget.RelativeLayout
-import androidx.appcompat.widget.AppCompatImageView
-import foo.bar.example.foreadapterskt.App.Companion.inst
-import foo.bar.example.foreadapterskt.R
-import kotlin.math.max
-import kotlin.math.min
-
-/**
- * Just a quick demo of animation when used in adapters, a lottie file would work well here
- */
-class PercentVBar @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : AppCompatImageView(context, attrs, defStyleAttr) {
-
-    private val paint = Paint()
-    private var widthPx = 0f
-    private var heightPx = 0f
-    private val progressColour = inst.resources.getColor(R.color.colorAccent)
-    private val progressRect = RectF(0f, 0f, widthPx, heightPx)
-    private val step = 3f
-
-    private var targetPercent = 0f
-    private var currentPercent = -1f
-    private var increasing = false
-    private var itemId: Long = -1
-
-    init {
-        paint.flags = Paint.ANTI_ALIAS_FLAG
-        paint.style = Paint.Style.FILL_AND_STROKE
-        paint.color = progressColour
-    }
-
-    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-        super.onSizeChanged(w, h, oldw, oldh)
-        widthPx = width.toFloat()
-        heightPx = height.toFloat()
-        invalidate()
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-
-        progressRect.set(0f, ((100 - currentPercent) * heightPx / 100), widthPx, heightPx)
-
-        //percent progress
-        canvas.drawRect(progressRect, paint)
-        progressAnimation()
-    }
-
-    /**
-     * @param itemId this helps us know if the view is in an adapter and is being recycled
-     * we don't want to animate if we are being recycled
-     * @param percentDone
-     */
-    fun setPercentDone(itemId: Long, percentDone: Float) {
-        targetPercent = percentDone
-
-        if (currentPercent == -1f || this.itemId != itemId) { //don't bother with the animation
-            currentPercent = targetPercent
-        }
-        this.itemId = itemId
-
-        increasing = targetPercent > currentPercent
-        invalidate()
-    }
-
-    private fun progressAnimation() {
-        if (increasing && currentPercent < targetPercent) {
-            currentPercent = min(targetPercent, currentPercent + step)
-            invalidate()
-        } else if (!increasing && currentPercent > targetPercent) {
-            currentPercent = max(targetPercent, currentPercent - step)
-            invalidate()
-        }
-    }
-}
diff --git a/app-examples/example-kt-03adapters/src/main/res/drawable/button_text_selector.xml b/app-examples/example-kt-03adapters/src/main/res/drawable/button_text_selector.xml
deleted file mode 100644
index 24c6aab2..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/drawable/button_text_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorGreyMedium" android:state_enabled="false"></item>
-    <item android:color="@color/colorOil"></item>
-</selector>
\ No newline at end of file
diff --git a/app-examples/example-kt-03adapters/src/main/res/layout/activity_playlists.xml b/app-examples/example-kt-03adapters/src/main/res/layout/activity_playlists.xml
deleted file mode 100644
index bd697994..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/layout/activity_playlists.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="horizontal">
-
-    <include layout="@layout/view_playlists_listdiffer"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="33"/>
-
-    <include layout="@layout/view_playlists_mutable"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="33"/>
-
-    <include layout="@layout/view_playlists_immutable"
-        android:layout_width="0px"
-        android:layout_height="match_parent"
-        android:layout_weight="33"/>
-
-</LinearLayout>
diff --git a/app-examples/example-kt-03adapters/src/main/res/layout/activity_playlists_listitem.xml b/app-examples/example-kt-03adapters/src/main/res/layout/activity_playlists_listitem.xml
deleted file mode 100644
index 4de72a39..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/layout/activity_playlists_listitem.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center">
-
-    <Button
-        android:id="@+id/track_increaseplays_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="+" />
-
-    <TextView
-        android:id="@+id/track_playsrequested_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/common_space_tiny"/>
-
-    <Button
-        android:id="@+id/track_decreaseplays_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="-" />
-
-    <Button
-        android:id="@+id/track_remove_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="x" />
-
-    <foo.bar.example.foreadapterskt.ui.widget.PercentVBar
-        android:id="@+id/track_percent_vbar"
-        android:layout_width="10dp"
-        android:layout_height="30dp"
-        android:padding="5dp" />
-
-</LinearLayout>
diff --git a/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_immutable.xml b/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_immutable.xml
deleted file mode 100644
index c32819ed..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_immutable.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<foo.bar.example.foreadapterskt.ui.playlist.immutable.ImmutableListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0px"
-    android:layout_height="match_parent"
-    android:layout_weight="33"
-    android:background="@color/colorGreyMedium">
-
-    <TextView
-        android:id="@+id/diffable_title_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="@dimen/common_space_small"
-        android:text="Immutable\nList Based" />
-
-    <TextView
-        android:id="@+id/diffable_totaltracks_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_margin="@dimen/common_space_small"
-        android:layout_toEndOf="@+id/diffable_title_textview"
-        android:layout_toRightOf="@+id/diffable_title_textview"
-        android:text="0" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/diffable_list_recycleview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/diffable_buttoncontainer_linear"
-        android:layout_below="@+id/diffable_title_textview"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="@dimen/common_space_medium"
-        android:background="@color/colorAccent" />
-
-    <LinearLayout
-        android:id="@+id/diffable_buttoncontainer_linear"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/diffable_add_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="Add\nTrack" />
-
-            <Button
-                android:id="@+id/diffable_clear_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="Clear\nAll" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/diffable_add5_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="+ 5" />
-
-            <Button
-                android:id="@+id/diffable_remove5_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="- 5" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/diffable_add100_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="+ 100" />
-
-            <Button
-                android:id="@+id/diffable_remove100_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="- 100" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</foo.bar.example.foreadapterskt.ui.playlist.immutable.ImmutableListView>
diff --git a/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_listdiffer.xml b/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_listdiffer.xml
deleted file mode 100644
index aec71790..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_listdiffer.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<foo.bar.example.foreadapterskt.ui.playlist.listdiffer.ListDifferListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0px"
-    android:layout_height="match_parent"
-    android:layout_weight="33"
-    android:background="@color/colorPrimary">
-
-    <TextView
-        android:id="@+id/listdiffer_title_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="@dimen/common_space_small"
-        android:text="ListDiffer\nAdapter Based" />
-
-    <TextView
-        android:id="@+id/listdiffer_totaltracks_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_margin="@dimen/common_space_small"
-        android:layout_toEndOf="@+id/listdiffer_title_textview"
-        android:layout_toRightOf="@+id/listdiffer_title_textview"
-        android:text="0" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/listdiffer_list_recycleview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/listdiffer_buttoncontainer_linear"
-        android:layout_below="@+id/listdiffer_title_textview"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="@dimen/common_space_medium"
-        android:background="@color/colorAccent" />
-
-    <LinearLayout
-        android:id="@+id/listdiffer_buttoncontainer_linear"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/listdiffer_add_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="Add\nTrack" />
-
-            <Button
-                android:id="@+id/listdiffer_clear_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="Clear\nAll" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/listdiffer_add5_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="+ 5" />
-
-            <Button
-                android:id="@+id/listdiffer_remove5_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="- 5" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/listdiffer_add100_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="+ 100" />
-
-            <Button
-                android:id="@+id/listdiffer_remove100_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="- 100" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</foo.bar.example.foreadapterskt.ui.playlist.listdiffer.ListDifferListView>
diff --git a/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_mutable.xml b/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_mutable.xml
deleted file mode 100644
index cba2cabf..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/layout/view_playlists_mutable.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<foo.bar.example.foreadapterskt.ui.playlist.mutable.MutableListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0px"
-    android:layout_height="match_parent"
-    android:layout_weight="33"
-    android:background="@color/colorGreyLight">
-
-    <TextView
-        android:id="@+id/updatable_title_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="@dimen/common_space_small"
-        android:text="Mutable\nList Based" />
-
-    <TextView
-        android:id="@+id/updatable_totaltracks_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_margin="@dimen/common_space_small"
-        android:layout_toEndOf="@+id/updatable_title_textview"
-        android:layout_toRightOf="@+id/updatable_title_textview"
-        android:text="0" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/updatable_list_recycleview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/updatable_buttoncontainer_linear"
-        android:layout_below="@+id/updatable_title_textview"
-        android:layout_centerHorizontal="true"
-        android:layout_margin="@dimen/common_space_medium"
-        android:background="@color/colorAccent" />
-
-    <LinearLayout
-        android:id="@+id/updatable_buttoncontainer_linear"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/updatable_add_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="Add\nTrack" />
-
-            <Button
-                android:id="@+id/updatable_clear_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="Clear\nAll" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/updatable_add5_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="+ 5" />
-
-            <Button
-                android:id="@+id/updatable_remove5_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="- 5" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/updatable_add100_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="+ 100" />
-
-            <Button
-                android:id="@+id/updatable_remove100_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/common_space_tiny"
-                android:text="- 100" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</foo.bar.example.foreadapterskt.ui.playlist.mutable.MutableListView>
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-kt-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-kt-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 8f5c80ae..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher_background.png
deleted file mode 100644
index 1a96b1a9..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 46bea6b3..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index e335d78a..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher_background.png
deleted file mode 100644
index 901d6859..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index b5c5d0b4..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 6fc622e2..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_background.png
deleted file mode 100644
index 686dab37..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index c6e383af..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 68b160b4..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
deleted file mode 100644
index 670d3e6a..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 840395d1..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 3777b9e6..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
deleted file mode 100644
index 506c6fdb..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e54dcd0f..00000000
Binary files a/app-examples/example-kt-03adapters/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-03adapters/src/main/res/values/colors.xml b/app-examples/example-kt-03adapters/src/main/res/values/colors.xml
deleted file mode 100644
index 18784622..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="colorPrimary">@color/colorGreyDark</color>
-    <color name="colorPrimaryDark">#ff512f</color>
-    <color name="colorAccent">#ff512f</color>
-
-    <color name="colorOil">#0C0B0B</color>
-    <color name="colorGreyDark">#515673</color>
-    <color name="colorGreyMedium">#B5B5B5</color>
-    <color name="colorGreyLight">#EAEAEA</color>
-
-    <color name="pastel1">#dbe4fa</color>
-    <color name="pastel2">#fffdce</color>
-    <color name="pastel3">#eefbff</color>
-    <color name="pastel4">#fde1ff</color>
-    <color name="pastel5">#edf6c9</color>
-
-</resources>
diff --git a/app-examples/example-kt-03adapters/src/main/res/values/dimens.xml b/app-examples/example-kt-03adapters/src/main/res/values/dimens.xml
deleted file mode 100644
index ad5fd7aa..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
-    <dimen name="common_textsize_small">10sp</dimen>
-    <dimen name="common_textsize_medium">15sp</dimen>
-
-    <dimen name="common_space_tiny">2dp</dimen>
-    <dimen name="common_space_small">5dp</dimen>
-    <dimen name="common_space_medium">10dp</dimen>
-    <dimen name="common_space_medium_large">40dp</dimen>
-    <dimen name="common_space_large">100dp</dimen>
-
-    <dimen name="button_min_width">30dp</dimen>
-
-</resources>
diff --git a/app-examples/example-kt-03adapters/src/main/res/values/strings.xml b/app-examples/example-kt-03adapters/src/main/res/values/strings.xml
deleted file mode 100644
index 02dc4975..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">kt 3 adapter ex</string>
-</resources>
diff --git a/app-examples/example-kt-03adapters/src/main/res/values/styles.xml b/app-examples/example-kt-03adapters/src/main/res/values/styles.xml
deleted file mode 100644
index b0ba1050..00000000
--- a/app-examples/example-kt-03adapters/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:buttonStyle">@style/smallButton</item>
-    </style>
-
-    <style name="smallButton" parent="@android:style/Widget.Button">
-        <item name="android:minWidth">@dimen/button_min_width</item>
-        <item name="android:layout_margin">@dimen/common_space_small</item>
-        <item name="android:padding">@dimen/common_space_small</item>
-        <item name="android:textColor">@drawable/button_text_selector</item>
-    </style>
-
-</resources>
diff --git a/app-examples/example-kt-03adapters/src/test/java/foo/bar/example/foreadapterskt/feature/playlist/ImmutablePlaylistModelTest.kt b/app-examples/example-kt-03adapters/src/test/java/foo/bar/example/foreadapterskt/feature/playlist/ImmutablePlaylistModelTest.kt
deleted file mode 100644
index cbd431e5..00000000
--- a/app-examples/example-kt-03adapters/src/test/java/foo/bar/example/foreadapterskt/feature/playlist/ImmutablePlaylistModelTest.kt
+++ /dev/null
@@ -1,210 +0,0 @@
-package foo.bar.example.foreadapterskt.feature.playlist
-
-import org.junit.Assert
-import org.junit.Test
-
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import foo.bar.example.foreadapterskt.feature.playlist.immutable.ImmutablePlaylistModel
-import io.mockk.MockKAnnotations
-import io.mockk.mockk
-import io.mockk.verify
-import org.junit.Before
-
-
-/**
- *
- */
-class ImmutablePlaylistModelTest {
-
-    private val logger = SystemLogger()
-    private lateinit var immutablePlaylistModel: ImmutablePlaylistModel
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-
-        // make the code run synchronously, reroute Log.x to
-        // System.out.println() so we see it in the test log
-        Fore.setDelegate(TestDelegateDefault())
-
-        immutablePlaylistModel = ImmutablePlaylistModel(logger)
-    }
-    
-    @Test
-    @Throws(Exception::class)
-    fun initialConditions() {
-        
-        //arrange
-        
-        //act
-
-        //assert
-        Assert.assertEquals(0, immutablePlaylistModel.getItemCount())
-        Assert.assertEquals(false, immutablePlaylistModel.hasObservers())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun addNewTrack() {
-        
-        //arrange
-
-        //act
-        immutablePlaylistModel.addNTracks(1)
-
-        //assert
-        Assert.assertEquals(1, immutablePlaylistModel.getItemCount())
-        Assert.assertEquals(1, immutablePlaylistModel.getItem(0).numberOfPlaysRequested.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun removeTrack() {
-        
-        //arrange
-        immutablePlaylistModel.addNTracks(1)
-
-        //act
-        immutablePlaylistModel.removeTrack(0)
-
-        //assert
-        Assert.assertEquals(0, immutablePlaylistModel.getItemCount())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun add5NewTracks() {
-
-        //arrange
-
-        //act
-        immutablePlaylistModel.addNTracks(5)
-
-        //assert
-        Assert.assertEquals(5, immutablePlaylistModel.getItemCount())
-        Assert.assertEquals(1, immutablePlaylistModel.getItem(4).numberOfPlaysRequested.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun remove5Tracks() {
-
-        //arrange
-        immutablePlaylistModel.addNTracks(5)
-
-        //act
-        immutablePlaylistModel.removeNTracks(5)
-
-        //assert
-        Assert.assertEquals(0, immutablePlaylistModel.getItemCount())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun increasePlays() {
-
-        //arrange
-        immutablePlaylistModel.addNTracks(1)
-
-        //act
-        immutablePlaylistModel.increasePlaysForTrack(0)
-
-        //assert
-        Assert.assertEquals(2, immutablePlaylistModel.getItem(0).numberOfPlaysRequested.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun decreasePlays() {
-
-        //arrange
-        immutablePlaylistModel.addNTracks(1)
-        immutablePlaylistModel.increasePlaysForTrack(0)
-
-        //act
-        immutablePlaylistModel.decreasePlaysForTrack(0)
-
-        //assert
-        Assert.assertEquals(1, immutablePlaylistModel.getItem(0).numberOfPlaysRequested.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun removeAllTracks() {
-
-        //arrange
-        immutablePlaylistModel.addNTracks(5)
-        immutablePlaylistModel.addNTracks(1)
-        immutablePlaylistModel.addNTracks(1)
-
-        //act
-        immutablePlaylistModel.removeAllTracks()
-
-        //assert
-        Assert.assertEquals(0, immutablePlaylistModel.getItemCount())
-    }
-
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the databinding readme for more information about this
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun observersNotifiedAtLeastOnceForAddTrack() {
-
-        //arrange
-        val mockObserver: Observer = mockk(relaxed = true)
-        immutablePlaylistModel.addObserver(mockObserver)
-
-        //act
-        immutablePlaylistModel.addNTracks(1)
-
-        //assert
-        verify(atLeast = 1) {
-            mockObserver.somethingChanged()
-        }
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun observersNotifiedAtLeastOnceForIncreasePlays() {
-
-        //arrange
-        immutablePlaylistModel.addNTracks(1)
-        val mockObserver: Observer = mockk(relaxed = true)
-        immutablePlaylistModel.addObserver(mockObserver)
-
-        //act
-        immutablePlaylistModel.increasePlaysForTrack(0)
-
-        //assert
-        verify(atLeast = 1) {
-            mockObserver.somethingChanged()
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-03adapters/src/test/java/foo/bar/example/foreadapterskt/feature/playlist/MutablePlaylistModelTest.kt b/app-examples/example-kt-03adapters/src/test/java/foo/bar/example/foreadapterskt/feature/playlist/MutablePlaylistModelTest.kt
deleted file mode 100644
index 8d562698..00000000
--- a/app-examples/example-kt-03adapters/src/test/java/foo/bar/example/foreadapterskt/feature/playlist/MutablePlaylistModelTest.kt
+++ /dev/null
@@ -1,347 +0,0 @@
-package foo.bar.example.foreadapterskt.feature.playlist
-
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-
-import co.early.fore.adapters.mutable.UpdateSpec
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.core.observer.Observer
-import co.early.fore.core.time.SystemTimeWrapper
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import foo.bar.example.foreadapterskt.feature.playlist.mutable.MutablePlaylistModel
-import io.mockk.MockKAnnotations
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import io.mockk.mockk
-
-/**
- *
- */
-class MutablePlaylistModelTest {
-
-    private val logger = SystemLogger()
-    private lateinit var playlistAdvancedModel: MutablePlaylistModel
-
-    @MockK
-    private lateinit var mockSystemTimeWrapper: SystemTimeWrapper
-
-    private val RELAXED_AGE_LIMIT_FOR_UPDATE_SPEC: Long = 500
-    private val ACTUAL_AGE_LIMIT_FOR_UPDATE_SPEC: Long = 50
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-
-        // make the code run synchronously, reroute Log.x to
-        // System.out.println() so we see it in the test log
-        Fore.setDelegate(TestDelegateDefault())
-
-        playlistAdvancedModel = MutablePlaylistModel(logger)
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun initialConditions() {
-
-        //arrange
-
-        //act
-
-        //assert
-        Assert.assertEquals(0, playlistAdvancedModel.getItemCount().toLong())
-        Assert.assertEquals(false, playlistAdvancedModel.hasObservers())
-        Assert.assertEquals(UpdateSpec.UpdateType.FULL_UPDATE, playlistAdvancedModel.getAndClearLatestUpdateSpec(50).type)
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun addNewTrack() {
-
-        //arrange
-
-        //act
-        playlistAdvancedModel.addNTracks(1)
-
-        //assert
-        Assert.assertEquals(1, playlistAdvancedModel.getItemCount().toLong())
-        Assert.assertEquals(1, playlistAdvancedModel.getItem(0).numberOfPlaysRequested.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun removeTrack() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(1)
-
-        //act
-        playlistAdvancedModel.removeTrack(0)
-
-        //assert
-        Assert.assertEquals(0, playlistAdvancedModel.getItemCount().toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun add5NewTracks() {
-
-        //arrange
-
-        //act
-        playlistAdvancedModel.addNTracks(5)
-
-        //assert
-        Assert.assertEquals(5, playlistAdvancedModel.getItemCount().toLong())
-        Assert.assertEquals(1, playlistAdvancedModel.getItem(4).numberOfPlaysRequested.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun remove5Tracks() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(5)
-
-        //act
-        playlistAdvancedModel.removeNTracks(5)
-
-        //assert
-        Assert.assertEquals(0, playlistAdvancedModel.getItemCount().toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun increasePlays() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(1)
-
-        //act
-        playlistAdvancedModel.increasePlaysForTrack(0)
-
-        //assert
-        Assert.assertEquals(2, playlistAdvancedModel.getItem(0).numberOfPlaysRequested.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun decreasePlays() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(1)
-        playlistAdvancedModel.increasePlaysForTrack(0)
-
-        //act
-        playlistAdvancedModel.decreasePlaysForTrack(0)
-
-        //assert
-        Assert.assertEquals(1, playlistAdvancedModel.getItem(0).numberOfPlaysRequested.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun removeAllTracks() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(5)
-        playlistAdvancedModel.addNTracks(1)
-        playlistAdvancedModel.addNTracks(1)
-
-        //act
-        playlistAdvancedModel.removeAllTracks()
-
-        //assert
-        Assert.assertEquals(0, playlistAdvancedModel.getItemCount().toLong())
-    }
-
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the databinding readme for more information about this
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun observersNotifiedAtLeastOnceForAddTrack() {
-
-        //arrange
-        val mockObserver: Observer = mockk(relaxed = true)
-        playlistAdvancedModel.addObserver(mockObserver)
-
-        //act
-        playlistAdvancedModel.addNTracks(1)
-
-        //assert
-        verify(atLeast = 1) {
-            mockObserver.somethingChanged()
-        }
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun observersNotifiedAtLeastOnceForIncreasePlays() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(1)
-        val mockObserver: Observer = mockk(relaxed = true)
-        playlistAdvancedModel.addObserver(mockObserver)
-
-        //act
-        playlistAdvancedModel.increasePlaysForTrack(0)
-
-        //assert
-        verify(atLeast = 1) {
-            mockObserver.somethingChanged()
-        }
-    }
-
-
-    /**
-     *
-     * Here we make some tests to verify the UpdateSpec returned is correct so that we
-     * know that we can correctly drive a ChangeAwareAdapter with this model
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun updateSpecCorrectForAddTrack() {
-
-        //arrange
-
-        //act
-        playlistAdvancedModel.addNTracks(1)
-
-        //assert
-        val updateSpec = playlistAdvancedModel.getAndClearLatestUpdateSpec(RELAXED_AGE_LIMIT_FOR_UPDATE_SPEC)
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_INSERTED, updateSpec.type)
-        Assert.assertEquals(0, updateSpec.rowPosition.toLong())
-        Assert.assertEquals(1, updateSpec.rowsEffected.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun updateSpecCorrectForIncreasePlays() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(1)
-        playlistAdvancedModel.addNTracks(5)
-
-        //act
-        playlistAdvancedModel.increasePlaysForTrack(3)
-
-        //assert
-        val updateSpec = playlistAdvancedModel.getAndClearLatestUpdateSpec(RELAXED_AGE_LIMIT_FOR_UPDATE_SPEC)
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_CHANGED, updateSpec.type)
-        Assert.assertEquals(3, updateSpec.rowPosition.toLong())
-        Assert.assertEquals(1, updateSpec.rowsEffected.toLong())
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun updateSpecCorrectForRemove5Tracks() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(5)
-        playlistAdvancedModel.addNTracks(1)
-
-        //act
-        playlistAdvancedModel.removeNTracks(5)
-
-        //assert
-        val updateSpec = playlistAdvancedModel.getAndClearLatestUpdateSpec(RELAXED_AGE_LIMIT_FOR_UPDATE_SPEC)
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_REMOVED, updateSpec.type)
-        Assert.assertEquals(0, updateSpec.rowPosition.toLong())
-        Assert.assertEquals(5, updateSpec.rowsEffected.toLong())
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun updateSpecCorrectForClearAllTracks() {
-
-        //arrange
-        playlistAdvancedModel.addNTracks(5)
-        playlistAdvancedModel.addNTracks(1)
-
-        //act
-        playlistAdvancedModel.removeAllTracks()
-
-        //assert
-        val updateSpec = playlistAdvancedModel.getAndClearLatestUpdateSpec(RELAXED_AGE_LIMIT_FOR_UPDATE_SPEC)
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_REMOVED, updateSpec.type)
-        Assert.assertEquals(0, updateSpec.rowPosition.toLong())
-        Assert.assertEquals(6, updateSpec.rowsEffected.toLong())
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun updateSpecCorrectWithinMaxAge() {
-
-        //arrange
-        Fore.setDelegate(TestDelegateDefault(systemTimeWrapper = mockSystemTimeWrapper))
-        playlistAdvancedModel.addNTracks(5)
-        playlistAdvancedModel.addNTracks(1)
-
-        //act
-        playlistAdvancedModel.increasePlaysForTrack(3)
-
-        every {
-            mockSystemTimeWrapper.currentTimeMillis()
-        } returns (ACTUAL_AGE_LIMIT_FOR_UPDATE_SPEC - 1)
-
-        //assert
-        val updateSpec = playlistAdvancedModel.getAndClearLatestUpdateSpec(ACTUAL_AGE_LIMIT_FOR_UPDATE_SPEC)
-        Assert.assertEquals(UpdateSpec.UpdateType.ITEM_CHANGED, updateSpec.type)
-        Assert.assertEquals(3, updateSpec.rowPosition.toLong())
-        Assert.assertEquals(1, updateSpec.rowsEffected.toLong())
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun updateSpecCorrectPastMaxAge() {
-
-        //arrange
-        Fore.setDelegate(TestDelegateDefault(systemTimeWrapper = mockSystemTimeWrapper))
-        playlistAdvancedModel.addNTracks(5)
-        playlistAdvancedModel.addNTracks(1)
-
-        //act
-        playlistAdvancedModel.increasePlaysForTrack(3)
-
-        every {
-            mockSystemTimeWrapper.currentTimeMillis()
-        } returns (ACTUAL_AGE_LIMIT_FOR_UPDATE_SPEC + 1)
-
-        //assert
-        val updateSpec = playlistAdvancedModel.getAndClearLatestUpdateSpec(ACTUAL_AGE_LIMIT_FOR_UPDATE_SPEC)
-        Assert.assertEquals(UpdateSpec.UpdateType.FULL_UPDATE, updateSpec.type)
-        Assert.assertEquals(0, updateSpec.rowPosition.toLong())
-        Assert.assertEquals(0, updateSpec.rowsEffected.toLong())
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/build.gradle.kts b/app-examples/example-kt-04retrofit/build.gradle.kts
deleted file mode 100644
index c761ba12..00000000
--- a/app-examples/example-kt-04retrofit/build.gradle.kts
+++ /dev/null
@@ -1,92 +0,0 @@
-import co.early.fore.Shared
-import co.early.fore.Shared.BuildTypes
-
-plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
-    kotlin("kapt")
-}
-
-
-val appId = "foo.bar.example.foreretrofitkt"
-
-fun getTestBuildType(): String {
-    return project.properties["testBuildType"] as String? ?: BuildTypes.DEFAULT
-}
-
-println("[$appId testBuildType:${getTestBuildType()}]")
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = appId
-    compileSdk = Shared.Android.compileSdk
-
-    buildFeatures {
-        viewBinding = true
-        buildConfig = true
-    }
-    defaultConfig {
-        applicationId = appId
-        minSdk = Shared.Android.minSdk
-        targetSdk = Shared.Android.targetSdk
-        versionCode = 1
-        versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        testBuildType = getTestBuildType()
-    }
-    signingConfigs {
-        create(BuildTypes.RELEASE) {
-            // keytool -genkey -v -keystore debug.fake_keystore -storetype PKCS12 -alias android -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 20000 -dname "cn=Unknown, ou=Unknown, o=Unknown, c=Unknown"
-            storeFile = file("../keystore/debug.fake_keystore")
-            storePassword = "android"
-            keyAlias = "android"
-            keyPassword = "android"
-        }
-    }
-    buildTypes {
-        getByName(BuildTypes.DEBUG) {
-            isMinifyEnabled = false
-        }
-        getByName(BuildTypes.RELEASE) {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "../proguard-example-app.pro")
-            signingConfig = signingConfigs.getByName(BuildTypes.RELEASE)
-        }
-    }
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-example-apps.xml")
-    }
-}
-
-dependencies {
-
-    if (Shared.Publish.use_published_version) {
-        implementation("co.early.fore:fore-kt-android-network:${Shared.Publish.published_fore_version_for_examples}")
-    } else {
-        implementation(project(":fore-kt:fore-kt-android-network"))
-    }
-    implementation("com.squareup.retrofit2:retrofit:${Shared.Versions.retrofit}")
-    implementation("com.squareup.retrofit2:converter-gson:${Shared.Versions.converter_gson}")
-    implementation("androidx.appcompat:appcompat:${Shared.Versions.appcompat}")
-    implementation("androidx.constraintlayout:constraintlayout:${Shared.Versions.constraintlayout}")
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")
-
-    androidTestImplementation("io.mockk:mockk-android:${Shared.Versions.mockk}")
-    androidTestImplementation("androidx.test:core:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:runner:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:rules:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test.ext:junit-ktx:${Shared.Versions.androidxjunit}")
-    androidTestImplementation("androidx.annotation:annotation:${Shared.Versions.annotation}")
-    androidTestImplementation("androidx.test.espresso:espresso-core:${Shared.Versions.espresso_core}") {
-        exclude(group = "com.android.support", module = "support-annotations")
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/screenshot.png b/app-examples/example-kt-04retrofit/screenshot.png
deleted file mode 100644
index 55c10a44..00000000
Binary files a/app-examples/example-kt-04retrofit/screenshot.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/DrawableMatcher.kt b/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/DrawableMatcher.kt
deleted file mode 100644
index a8439010..00000000
--- a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/DrawableMatcher.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package foo.bar.example.foreretrofitkt
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.drawable.Drawable
-import android.view.View
-import android.widget.ImageView
-import org.hamcrest.Description
-import org.hamcrest.TypeSafeMatcher
-
-/**
- *
- * https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f
- * https://github.com/dbottillo/Blog/blob/espresso_match_imageview/app/src/androidTest/java/com/danielebottillo/blog/config/DrawableMatcher.java
- *
- */
-class DrawableMatcher internal constructor(private val expectedId: Int) : TypeSafeMatcher<View>(View::class.java) {
-    private var resourceName: String? = null
-
-    override fun matchesSafely(target: View): Boolean {
-        if (target !is ImageView) {
-            return false
-        }
-        if (expectedId == EMPTY) {
-            return target.drawable == null
-        }
-        if (expectedId == ANY) {
-            return target.drawable != null
-        }
-        val resources = target.getContext().resources
-        val expectedDrawable = resources.getDrawable(expectedId)
-        resourceName = resources.getResourceEntryName(expectedId)
-
-        if (expectedDrawable == null) {
-            return false
-        }
-
-        val bitmap = getBitmap(target.drawable)
-        val otherBitmap = getBitmap(expectedDrawable)
-        return bitmap.sameAs(otherBitmap)
-    }
-
-    private fun getBitmap(drawable: Drawable): Bitmap {
-        val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(bitmap)
-        drawable.setBounds(0, 0, canvas.width, canvas.height)
-        drawable.draw(canvas)
-        return bitmap
-    }
-
-    override fun describeTo(description: Description) {
-        description.appendText("with drawable from resource id: ")
-        description.appendValue(expectedId)
-        if (resourceName != null) {
-            description.appendText("[")
-            description.appendText(resourceName)
-            description.appendText("]")
-        }
-    }
-
-    companion object {
-        internal val EMPTY = -1
-        internal val ANY = -2
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/EspressoTestMatchers.kt b/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/EspressoTestMatchers.kt
deleted file mode 100644
index 9f0c6767..00000000
--- a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/EspressoTestMatchers.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package foo.bar.example.foreretrofitkt
-
-import android.view.View
-
-import org.hamcrest.Matcher
-
-/**
- *
- * https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f
- * https://github.com/dbottillo/Blog/blob/espresso_match_imageview/app/src/androidTest/java/com/danielebottillo/blog/config/EspressoTestsMatchers.java
- *
- */
-object EspressoTestMatchers {
-
-    fun withDrawable(resourceId: Int): Matcher<View> {
-        return DrawableMatcher(resourceId)
-    }
-
-    fun noDrawable(): Matcher<View> {
-        return DrawableMatcher(DrawableMatcher.EMPTY)
-    }
-
-    fun hasDrawable(): Matcher<View> {
-        return DrawableMatcher(DrawableMatcher.ANY)
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ProgressBarIdler.kt b/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ProgressBarIdler.kt
deleted file mode 100644
index 171b1353..00000000
--- a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ProgressBarIdler.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package foo.bar.example.foreretrofitkt
-
-import android.R
-import android.app.Activity
-import android.app.Application
-import android.app.Instrumentation
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ProgressBar
-import androidx.core.content.ContextCompat
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
-import androidx.test.runner.lifecycle.Stage.RESUMED
-
-/**
- * If you have any spinning progress bars in your UI it will mess
- * up espresso tests (espresso will time out waiting for all UI
- * threads to be idle before proceeding).
- *
- *
- * This class will go through all your view elements views checking for
- * indeterminate progress bars and replacing the indeterminate drawable
- * with a static one so that espresso tests can continue
- *
- *
- * http://stackoverflow.com/a/37049916/3680389
- * https://stackoverflow.com/questions/33289152/progressbars-and-espresso#36201647
- */
-class ProgressBarIdler : Application.ActivityLifecycleCallbacks {
-
-
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-
-    }
-
-    override fun onActivityStarted(activity: Activity) {
-
-    }
-
-    override fun onActivityResumed(activity: Activity) {
-        makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView)
-    }
-
-    override fun onActivityPaused(activity: Activity) {
-
-    }
-
-    override fun onActivityStopped(activity: Activity) {
-
-    }
-
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-
-    }
-
-    override fun onActivityDestroyed(activity: Activity) {
-
-    }
-
-    companion object {
-
-        private fun makeAllProgressBarsIdle(view: View) {
-            if (view is ViewGroup) {
-                for (i in 0 until view.childCount) {
-                    makeAllProgressBarsIdle(view.getChildAt(i))
-                }
-            } else if (view is ProgressBar) {
-                if (view.isIndeterminate) {
-                    view.indeterminateDrawable = ContextCompat.getDrawable(InstrumentationRegistry.getInstrumentation().targetContext, android.R.drawable.ic_lock_lock)
-                }
-            }
-        }
-
-        fun makeAllProgressBarsIdle(instrumentation: Instrumentation, activity: Activity) {
-            instrumentation.runOnMainSync { makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView) }
-        }
-
-        fun makeAllProgressBarsIdleForAllResumedActivities(instrumentation: Instrumentation) {
-            instrumentation.runOnMainSync {
-                val resumedActivities = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(RESUMED)
-                if (resumedActivities.isEmpty()) {
-                    throw RuntimeException("Could not change orientation")
-                }
-                for (activity in resumedActivities) {
-                    makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView)
-                }
-            }
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewRotationTest.kt b/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewRotationTest.kt
deleted file mode 100644
index 12a88886..00000000
--- a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewRotationTest.kt
+++ /dev/null
@@ -1,223 +0,0 @@
-package foo.bar.example.foreretrofitkt.ui.fruit
-
-import android.app.Activity
-import android.content.pm.ActivityInfo
-import android.view.View
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.*
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.core.type.Either
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.kt.net.retrofit2.CallWrapperRetrofit2
-import foo.bar.example.foreretrofitkt.EspressoTestMatchers.withDrawable
-import foo.bar.example.foreretrofitkt.R
-import foo.bar.example.foreretrofitkt.api.fruits.FruitPojo
-import foo.bar.example.foreretrofitkt.api.fruits.FruitService
-import foo.bar.example.foreretrofitkt.feature.fruit.FailureCallback
-import foo.bar.example.foreretrofitkt.feature.fruit.FruitFetcher
-import foo.bar.example.foreretrofitkt.feature.fruit.SuccessCallback
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.CompletableDeferred
-import org.hamcrest.Matchers.not
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.*
-import java.util.concurrent.CountDownLatch
-
-
-/**
- * Here we make sure that when the view is rotated while a long running action is being
- * performed by the model, all the view elements still accurately represent the model's
- * state after rotation is complete, and those view elements are still updated as appropriate
- * when the model completes the long running action.
- */
-
-@RunWith(AndroidJUnit4::class)
-class FruitViewRotationTest {
-
-    /**
-     * Here we're testing with a real model,
-     * and just mocking its dependencies.
-     * This lets us realistically test the
-     * interactions between the view
-     * and the model during and after
-     * a rotation
-     */
-
-    lateinit var fruitFetcher: FruitFetcher
-    private var logger: Logger = SystemLogger()
-    private var fruitPojo = FruitPojo("testFruit1", true, 45)
-
-    @MockK
-    private lateinit var mockSuccess: SuccessCallback
-
-    @MockK
-    private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
-
-    @MockK
-    lateinit var mockCallWrapperRetrofit2: CallWrapperRetrofit2<ErrorMessage>
-
-    @MockK
-    private lateinit var mockFruitService: FruitService
-
-    private lateinit var deferredResult: CompletableDeferred<Either<ErrorMessage, List<FruitPojo>>>
-    private val countDownLatch = CountDownLatch(1)
-
-    @Before
-    fun setUp() {
-
-        logger.i("setup()")
-
-        MockKAnnotations.init(this, relaxed = true)
-
-        //construct a real model with mock dependencies
-        fruitFetcher = FruitFetcher(
-            mockFruitService,
-            mockCallWrapperRetrofit2,
-            logger
-        )
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun stateSurvivesRotation() {
-
-        logger.i("stateSurvivesRotation()")
-
-        //arrange
-        val activity = FruitViewRotationTestStateBuilder(this)
-            .withDelayedCallProcessor()
-            .createRule()
-            .launchActivity(null)
-
-        checkUIBeforeClick(activity)
-
-        //act
-        fruitFetcher.fetchFruitsAsync(mockSuccess, mockFailureWithPayload)
-
-        checkUIWhenFetching(activity)
-
-        swapOrientation(activity)
-
-        checkUIWhenFetching(activity)
-
-        completeDeferredResult()
-
-        try {
-            countDownLatch.await()
-        } catch (e: InterruptedException) {
-        }
-
-        checkUIOnceComplete(activity)
-    }
-
-
-    fun completeDeferredResult() {
-
-        logger.i("callSuccessOnCachedSuccessFailCallback()")
-
-        val fruitList = ArrayList<FruitPojo>()
-        fruitList.add(fruitPojo)
-
-        //we need to be back on the UI thread for this
-        getInstrumentation().runOnMainSync {
-            logger.i("about to call success, id:" + Thread.currentThread().id)
-
-            deferredResult.complete(success(fruitList))
-            countDownLatch.countDown()
-        }
-    }
-
-    fun setDeferredResult(deferredResult: CompletableDeferred<Either<ErrorMessage, List<FruitPojo>>>) {
-        logger.i("setDeferredResult()")
-        this.deferredResult = deferredResult
-    }
-
-
-    @Synchronized
-    private fun checkUIBeforeClick(activity: Activity) {
-        logger.i("checkUIBeforeClick()")
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("(fruitless)")))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, 0)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)))
-    }
-
-    @Synchronized
-    private fun checkUIWhenFetching(activity: Activity) {
-        logger.i("checkUIWhenFetching()")
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(isDisplayed()))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_name_textview)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, 0)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)))
-    }
-
-    @Synchronized
-    private fun checkUIOnceComplete(activity: Activity) {
-        logger.i("checkUIOnceComplete()")
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText(fruitPojo.name)))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, fruitPojo.tastyPercentScore)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(
-            matches(
-                withDrawable(
-                    if (fruitPojo.isCitrus) {
-                        R.drawable.lemon_positive
-                    } else {
-                        R.drawable.lemon_negative
-                    }
-                )
-            )
-        )
-    }
-
-    private fun swapOrientation(activity: Activity) {
-        activity.requestedOrientation =
-            if (activity.resources.configuration.orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
-                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-            } else {
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-            }
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewRotationTestStateBuilder.kt b/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewRotationTestStateBuilder.kt
deleted file mode 100644
index 917369ee..00000000
--- a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewRotationTestStateBuilder.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package foo.bar.example.foreretrofitkt.ui.fruit
-
-import android.content.pm.ActivityInfo
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.rule.ActivityTestRule
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.core.type.Either
-import foo.bar.example.foreretrofitkt.App
-import foo.bar.example.foreretrofitkt.OG
-import foo.bar.example.foreretrofitkt.ProgressBarIdler
-import foo.bar.example.foreretrofitkt.api.fruits.FruitPojo
-import foo.bar.example.foreretrofitkt.feature.fruit.FruitFetcher
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-import io.mockk.coEvery
-import kotlinx.coroutines.CompletableDeferred
-import retrofit2.Response
-
-
-class FruitViewRotationTestStateBuilder internal constructor(private val fruitViewRotationTest: FruitViewRotationTest) {
-
-    internal fun withDelayedCallProcessor(): FruitViewRotationTestStateBuilder {
-
-        val deferred = CompletableDeferred<Either<ErrorMessage, List<FruitPojo>>>()
-
-        coEvery {
-            fruitViewRotationTest.mockCallWrapperRetrofit2.processCallAsync(
-                any() as suspend () -> Response<List<FruitPojo>>
-            )
-        } returns deferred
-
-        fruitViewRotationTest.setDeferredResult(deferred)
-
-        return this
-    }
-
-    internal fun createRule(): ActivityTestRule<FruitActivity> {
-
-        return object : ActivityTestRule<FruitActivity>(FruitActivity::class.java) {
-
-            override fun beforeActivityLaunched() {
-
-                SystemLogger().i("FruitViewRotationTestStateBuilder", "beforeActivityLaunched()")
-
-                //get hold of the application
-                val app = ApplicationProvider.getApplicationContext() as App
-                app.registerActivityLifecycleCallbacks(ProgressBarIdler())
-
-                //inject our mocks so our UI layer will pick them up
-                OG.setApplication(app)
-                OG.putMock(FruitFetcher::class.java, fruitViewRotationTest.fruitFetcher)
-            }
-
-            override fun afterActivityFinished() {
-                super.afterActivityFinished()
-
-                this.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-            }
-        }
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewTest.kt b/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewTest.kt
deleted file mode 100644
index 6c128102..00000000
--- a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewTest.kt
+++ /dev/null
@@ -1,194 +0,0 @@
-
-package foo.bar.example.foreretrofitkt.ui.fruit
-
-import android.view.View
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.*
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import foo.bar.example.foreretrofitkt.EspressoTestMatchers.withDrawable
-import foo.bar.example.foreretrofitkt.R
-import foo.bar.example.foreretrofitkt.api.fruits.FruitPojo
-import foo.bar.example.foreretrofitkt.feature.fruit.FruitFetcher
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.hamcrest.Matchers.not
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-
-@RunWith(AndroidJUnit4::class)
-class FruitViewTest {
-
-    @MockK
-    private lateinit var mockFruitFetcher: FruitFetcher
-
-
-    @Before
-    fun setUp() = MockKAnnotations.init(this, relaxed = true)
-
-
-    @Test
-    @Throws(Exception::class)
-    fun hasCitrusFruit() {
-
-        //arrange
-        val activity = FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit1", true, 45))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("testFruit1")))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, 45)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_positive)))
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun hasNonCitrusFruit() {
-
-        //arrange
-        val activity = FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit2", false, 75))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("testFruit2")))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, 75)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)))
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun isFetchingFruit() {
-
-        //arrange
-        FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(true)
-            .hasFruit(FruitPojo("testFruit1", true, 45))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(isDisplayed()))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_name_textview)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_citrus_img)).check(matches(not<View>(isDisplayed())))
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsFetchSuccess() {
-        //arrange
-        FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit2", false, 75))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-        onView(withId(R.id.fruit_fetchsuccess_btn)).perform(click())
-
-
-        //assert
-        verify(exactly = 1) {
-            mockFruitFetcher.fetchFruitsAsync(any(), any())
-        }
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsFetchFailBasic() {
-        //arrange
-        FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit2", false, 75))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).perform(click())
-
-
-        //assert
-        verify(exactly = 1) {
-            mockFruitFetcher.fetchFruitsButFail(any(), any())
-        }
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsFetchFailAdvanced() {
-        //arrange
-        FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit2", false, 75))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).perform(click())
-
-
-        //assert
-        verify(exactly = 1) {
-            mockFruitFetcher.fetchFruitsButFailAdvanced(any(), any())
-        }
-    }
-
-}
-
diff --git a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewTestStateBuilder.kt b/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewTestStateBuilder.kt
deleted file mode 100644
index 79858f05..00000000
--- a/app-examples/example-kt-04retrofit/src/androidTest/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitViewTestStateBuilder.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-package foo.bar.example.foreretrofitkt.ui.fruit
-
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.rule.ActivityTestRule
-import foo.bar.example.foreretrofitkt.App
-import foo.bar.example.foreretrofitkt.OG
-import foo.bar.example.foreretrofitkt.ProgressBarIdler
-import foo.bar.example.foreretrofitkt.api.fruits.FruitPojo
-import foo.bar.example.foreretrofitkt.feature.fruit.FruitFetcher
-import io.mockk.every
-
-
-class FruitViewTestStateBuilder internal constructor(private val mockFruitFetcher: FruitFetcher) {
-
-    internal fun isBusy(busy: Boolean): FruitViewTestStateBuilder {
-        every { mockFruitFetcher.isBusy } returns (busy)
-        return this
-    }
-
-    internal fun hasFruit(fruitPojo: FruitPojo): FruitViewTestStateBuilder {
-        every { mockFruitFetcher.currentFruit } returns (fruitPojo)
-        return this
-    }
-
-    internal fun createRule(): ActivityTestRule<FruitActivity> {
-
-        return object : ActivityTestRule<FruitActivity>(FruitActivity::class.java) {
-            override fun beforeActivityLaunched() {
-
-                //get hold of the application
-                val app = ApplicationProvider.getApplicationContext() as App
-                app.registerActivityLifecycleCallbacks(ProgressBarIdler())
-
-                //inject our mocks so our UI layer will pick them up
-                OG.setApplication(app)
-                OG.putMock(FruitFetcher::class.java, mockFruitFetcher)
-            }
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/OG.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/OG.kt
deleted file mode 100644
index 0fa23960..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/OG.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package foo.bar.example.foreretrofitkt
-
-import android.app.Application
-import co.early.fore.kt.core.logging.AndroidLogger
-import co.early.fore.kt.core.logging.SilentLogger
-import co.early.fore.kt.net.InterceptorLogging
-import co.early.fore.kt.net.retrofit2.CallWrapperRetrofit2
-import foo.bar.example.foreretrofitkt.api.CustomGlobalErrorHandler
-import foo.bar.example.foreretrofitkt.api.CustomGlobalRequestInterceptor
-import foo.bar.example.foreretrofitkt.api.CustomRetrofitBuilder
-import foo.bar.example.foreretrofitkt.api.fruits.FruitService
-import foo.bar.example.foreretrofitkt.feature.fruit.FruitFetcher
-import java.util.*
-
-
-/**
- *
- * OG - Object Graph, pure DI implementation
- *
- * Copyright © 2019 early.co. All rights reserved.
- */
-@Suppress("UNUSED_PARAMETER")
-object OG {
-
-    private var initialized = false
-    private val dependencies = HashMap<Class<*>, Any>()
-
-    fun setApplication(application: Application) {
-
-        // create dependency graph
-
-        val logger = if (BuildConfig.DEBUG) AndroidLogger("fore_") else SilentLogger()
-
-        // networking classes common to all models
-        val retrofit = CustomRetrofitBuilder.create(
-            CustomGlobalRequestInterceptor(logger),
-            InterceptorLogging(logger)
-        )//logging interceptor should be the last one
-
-        val callWrapper = CallWrapperRetrofit2(
-            errorHandler = CustomGlobalErrorHandler(logger),
-            logger = logger
-        )
-
-        // models
-        val fruitFetcher = FruitFetcher(
-            retrofit.create(FruitService::class.java),
-            callWrapper,
-            logger
-        )
-
-        // add models to the dependencies map if you will need them later
-        dependencies[FruitFetcher::class.java] = fruitFetcher
-    }
-
-
-    fun init() {
-        if (!initialized) {
-            initialized = true
-
-            // run any necessary initialization code once object graph has been created here
-
-        }
-    }
-
-
-    /**
-     * This is how dependencies get injected, typically an Activity/Fragment/View will call this
-     * during the onCreate()/onCreateView()/onFinishInflate() method respectively for each of the
-     * dependencies it needs.
-     *
-     * Can use a DI library for similar behaviour using annotations
-     *
-     * Will return mocks if they have been set previously in putMock()
-     *
-     *
-     * Call it like this:
-     *
-     * <code>
-     *     yourModel = OG[YourModel::class.java]
-     * </code>
-     *
-     * If you want to more tightly scoped object, one way is to pass a factory class here and create
-     * an instance where you need it
-     *
-     */
-    @Suppress("UNCHECKED_CAST")
-    operator fun <T> get(model: Class<T>): T = dependencies[model] as T
-
-    fun <T> putMock(clazz: Class<T>, instance: T) {
-        dependencies[clazz] = instance as Any
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomGlobalErrorHandler.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomGlobalErrorHandler.kt
deleted file mode 100644
index c8ee0d7d..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomGlobalErrorHandler.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-package foo.bar.example.foreretrofitkt.api
-
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.net.MessageProvider
-import com.google.gson.Gson
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-import foo.bar.example.foreretrofitkt.message.ErrorMessage.*
-import okhttp3.Request
-import retrofit2.Response
-import java.io.InputStreamReader
-import java.io.UnsupportedEncodingException
-
-/**
- * You can probably use this class almost as it is for your own app, but you might want to
- * customise the behaviour for specific HTTP codes etc, hence it's not in the fore library
- */
-class CustomGlobalErrorHandler(private val logWrapper: Logger) : co.early.fore.net.retrofit2.ErrorHandler<ErrorMessage> {
-
-    override fun <CE : MessageProvider<ErrorMessage>> handleError(
-            t: Throwable?,
-            errorResponse: Response<*>?,
-            customErrorClazz: Class<CE>?,
-            originalRequest: Request?
-    ): ErrorMessage {
-
-        var message = ERROR_MISC
-
-        if (errorResponse != null) {
-
-            logWrapper.e("handleError() HTTP:" + errorResponse.code())
-
-            when (errorResponse.code()) {
-
-                401 -> message = ERROR_SESSION_TIMED_OUT
-
-                400, 405 -> message = ERROR_CLIENT
-
-                429 -> message = ERROR_RATE_LIMITED
-
-                //realise 404 is officially a "client" error, but in my experience if it happens in prod it is usually the fault of the server ;)
-                404, 500, 503 -> message = ERROR_SERVER
-            }
-
-            if (customErrorClazz != null) {
-                //let's see if we can get more specifics about the error
-                message = parseCustomError(message, errorResponse, customErrorClazz)
-            }
-
-        } else {//non HTTP error, probably some connection problem, but might be JSON parsing related also
-
-            logWrapper.e("handleError() throwable:$t")
-
-            if (t != null) {
-
-                message = when (t) {
-                    is com.google.gson.stream.MalformedJsonException -> ERROR_SERVER
-                    is java.net.UnknownServiceException -> ERROR_SECURITY_UNKNOWN
-                    else -> ERROR_NETWORK
-                }
-                t.printStackTrace()
-            }
-        }
-
-
-        logWrapper.e("handleError() returning:$message")
-
-        return message
-    }
-
-
-    private fun <CE : MessageProvider<ErrorMessage>> parseCustomError(
-            provisionalErrorMessage: ErrorMessage,
-            errorResponse: Response<*>,
-            customErrorClazz: Class<CE>
-    ): ErrorMessage {
-
-        val gson = Gson()
-
-        var customError: CE? = null
-
-        try {
-            customError = gson.fromJson(InputStreamReader(errorResponse.errorBody()!!.byteStream(), "UTF-8"), customErrorClazz)
-        } catch (e: UnsupportedEncodingException) {
-            logWrapper.e("parseCustomError() No more error details", e)
-        } catch (e: IllegalStateException) {
-            logWrapper.e("parseCustomError() No more error details", e)
-        } catch (e: NullPointerException) {
-            logWrapper.e("parseCustomError() No more error details", e)
-        } catch (e: com.google.gson.JsonSyntaxException) {//the server probably gave us something that is not JSON
-            logWrapper.e("parseCustomError() Problem parsing customServerError", e)
-            return ERROR_SERVER
-        }
-
-        return customError?.message ?: provisionalErrorMessage
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomGlobalRequestInterceptor.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomGlobalRequestInterceptor.kt
deleted file mode 100644
index a7245879..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomGlobalRequestInterceptor.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package foo.bar.example.foreretrofitkt.api
-
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.foreretrofitkt.BuildConfig
-import okhttp3.Interceptor
-import okhttp3.Response
-import java.io.IOException
-
-/**
- * This will be specific to your own app.
- *
- * Typically you would construct this class with some kind of Session object or similar that
- * you would use to customize the headers according to the logged in status of the user, for example
- */
-class CustomGlobalRequestInterceptor(
-        private val logger: Logger /*, private final Session session */
-) : Interceptor {
-
-
-    @Throws(IOException::class)
-    override fun intercept(chain: Interceptor.Chain): Response {
-
-        val original = chain.request()
-
-        val requestBuilder = original.newBuilder()
-
-
-        requestBuilder.addHeader("Content-Type", "application/json")
-        //requestBuilder.addHeader("X-MyApp-Auth-Token", !session.hasSession() ? "expired" : session.getSessionToken());
-        requestBuilder.addHeader("User-Agent", "fore-example-user-agent-" + BuildConfig.VERSION_NAME)
-
-
-        requestBuilder.method(original.method(), original.body())
-
-        return chain.proceed(requestBuilder.build())
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomRetrofitBuilder.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomRetrofitBuilder.kt
deleted file mode 100644
index b6f34d46..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/CustomRetrofitBuilder.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package foo.bar.example.foreretrofitkt.api
-
-import com.google.gson.GsonBuilder
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-/**
- * Most of this will all be specific to your application, when customising for your own case
- * bare in mind that you should be able to use this class in your tests to mock the server
- * by passing different interceptors in:
- *
- * see @[co.early.fore.net.testhelpers.InterceptorStubbedService]
- *
- */
-object CustomRetrofitBuilder {
-
-    /**
-     *
-     * @param interceptors list of interceptors NB if you add a logging interceptor, it has to be
-     * the last one in the list
-     * @return Retrofit object suitable for instantiating service interfaces
-     */
-    fun create(vararg interceptors: Interceptor): Retrofit {
-
-        return Retrofit.Builder()
-            .baseUrl("http://www.mocky.io/v2/")
-            .addConverterFactory(GsonConverterFactory.create(GsonBuilder().create()))
-            .client(createOkHttpClient(*interceptors))
-            .build()
-    }
-
-    private fun createOkHttpClient(vararg interceptors: Interceptor): OkHttpClient {
-
-        val builder = OkHttpClient.Builder()
-
-        for (interceptor in interceptors) {
-            builder.addInterceptor(interceptor)
-        }
-
-        return builder.build()
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/FruitService.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/FruitService.kt
deleted file mode 100644
index 771f81e1..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/FruitService.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package foo.bar.example.foreretrofitkt.api.fruits
-
-import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-/**
- * These stubs are hosted at https://www.mocky.io/
- *
- * http://www.mocky.io/v2/59efa0132e0000ef331c5f9b
- * http://www.mocky.io/v2/59ef2a6c2e00002a1a1c5dea
- *
- */
-interface FruitService {
-
-    @GET("59efa0132e0000ef331c5f9b/")
-    suspend fun getFruitsSimulateOk(@Query("mocky-delay") delay: String = "3s"): Response<List<FruitPojo>>
-
-    @GET("59ef2a6c2e00002a1a1c5dea/")
-    suspend fun getFruitsSimulateNotAuthorised(@Query("mocky-delay") delay: String = "3s"): Response<List<FruitPojo>>
-
-    // call chain to demonstrate carryOn
-
-    @GET("5de410e83000002b009f78f8/")
-    suspend fun createUser(): Response<UserPojo>
-
-    @GET("5de4112e3000002b009f78f9/")
-    suspend fun createUserTicket(@Query("userId") userId: Int, @Query("mocky-delay") delay: String = "1s"): Response<TicketPojo>
-
-    @GET("5de4114830000062009f78fa/")
-    suspend fun getEstimatedWaitingTime(@Query("ticketRef") ticketRef: String, @Query("mocky-delay") delay: String = "1s"): Response<TimePojo>
-
-    @GET("5de411c63000002b009f78fc/")
-    suspend fun cancelTicket(@Query("ticketRef") ticketRef: String, @Query("mocky-delay") delay: String = "1s"): Response<TicketResultPojo>
-
-    @GET("5de411af3000000e009f78fb/")
-    suspend fun confirmTicket(@Query("ticketRef") ticketRef: String, @Query("mocky-delay") delay: String = "1s"): Response<TicketResultPojo>
-
-    @GET("59efa0132e0000ef331c5f9b/")
-    suspend fun claimFreeFruit(@Query("ticketRef") ticketRef: String, @Query("mocky-delay") delay: String = "1s"): Response<List<FruitPojo>>
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/FruitsCustomError.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/FruitsCustomError.kt
deleted file mode 100644
index 4f161044..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/FruitsCustomError.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package foo.bar.example.foreretrofitkt.api.fruits
-
-import co.early.fore.net.MessageProvider
-import com.google.gson.annotations.SerializedName
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-
-/**
- *
- * <Code>
- *
- * The server returns custom error codes in this form:
- *
- * {
- * "errorCode":"FRUIT_USER_LOCKED"
- * }
- *
- * </Code>
- *
- *
- */
-class FruitsCustomError(private val errorCode: ErrorCode) : MessageProvider<ErrorMessage> {
-
-    enum class ErrorCode constructor(val errorMessage: ErrorMessage) {
-
-        @SerializedName("FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT")
-        LOGIN_CREDENTIALS_INCORRECT(ErrorMessage.ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT),
-
-        @SerializedName("FRUIT_USER_LOCKED")
-        USER_LOCKED(ErrorMessage.ERROR_FRUIT_USER_LOCKED),
-
-        @SerializedName("FRUIT_USER_NOT_ENABLED")
-        USER_NOT_ENABLED(ErrorMessage.ERROR_FRUIT_USER_NOT_ENABLED);
-
-    }
-
-    override val message: ErrorMessage
-        get() {
-            return errorCode.errorMessage
-        }
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/Pojos.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/Pojos.kt
deleted file mode 100644
index 30abf382..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/api/fruits/Pojos.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package foo.bar.example.foreretrofitkt.api.fruits
-
-/**
- *
- *
- * <Code>
- *
- * The server returns us a list of fruit that look like this:
- *
- * {
- * "name":"papaya",
- * "isCitrus":false,
- * "tastyPercentScore":98
- * }
- *
- * </Code>
- *
- *
- */
-data class FruitPojo(var name: String, var isCitrus: Boolean, var tastyPercentScore: Int)
-
-/**
- * various pojos for call chain to demonstrate carryOn...
- */
-data class UserPojo(val userId: Int)
-data class TicketPojo(val ticketRef: String)
-data class TicketResultPojo(val ticketRef: String, val completed: Boolean)
-data class TimePojo(val minutesWait: Int)
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcher.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcher.kt
deleted file mode 100644
index cea56e82..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcher.kt
+++ /dev/null
@@ -1,253 +0,0 @@
-package foo.bar.example.foreretrofitkt.feature.fruit
-
-import co.early.fore.core.observer.Observable
-import co.early.fore.kt.core.coroutine.awaitMain
-import co.early.fore.kt.core.coroutine.launchMain
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.observer.ObservableImp
-import co.early.fore.kt.core.type.Either.Fail
-import co.early.fore.kt.core.type.Either.Success
-import co.early.fore.kt.net.retrofit2.CallWrapperRetrofit2
-import co.early.fore.kt.net.retrofit2.carryOn
-import foo.bar.example.foreretrofitkt.api.fruits.FruitPojo
-import foo.bar.example.foreretrofitkt.api.fruits.FruitService
-import foo.bar.example.foreretrofitkt.api.fruits.FruitsCustomError
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-import java.util.*
-
-typealias SuccessCallback = () -> Unit
-typealias FailureCallback<T> = (T) -> Unit
-
-/**
- * gets a list of fruit from the network, selects one at random to be currentFruit
- */
-class FruitFetcher(
-    private val fruitService: FruitService,
-    private val callWrapper: CallWrapperRetrofit2<ErrorMessage>,
-    private val logger: Logger
-) : Observable by ObservableImp(logger = logger) {
-
-    var isBusy: Boolean = false
-        private set
-    var currentFruit = FruitPojo("(fruitless)", false, 0)
-        private set
-
-
-    fun fetchFruitsAsync(
-        success: SuccessCallback,
-        failureWithPayload: FailureCallback<ErrorMessage>
-    ) {
-
-        logger.i("fetchFruitsAsync() t:" + Thread.currentThread())
-
-        if (isBusy) {
-            failureWithPayload(ErrorMessage.ERROR_BUSY)
-            return
-        }
-
-        isBusy = true
-        notifyObservers()
-
-        launchMain {
-
-            logger.i("about to use CallProcessor t:" + Thread.currentThread())
-
-            val deferredResult = callWrapper.processCallAsync {
-
-                logger.i("processing call t:" + Thread.currentThread())
-
-                fruitService.getFruitsSimulateOk()
-            }
-
-            awaitMain {
-                when (val result = deferredResult.await()) {
-                    is Fail -> handleFailure(failureWithPayload, result.value)
-                    is Success -> handleSuccess(success, result.value)
-                }
-            }
-        }
-
-    }
-
-
-    /**
-     * identical to fetchFruitsAsync() but for demo purposes the URL we point to will give us an error,
-     * we also don't specify a custom error class here
-     */
-    fun fetchFruitsButFail(
-        success: SuccessCallback,
-        failureWithPayload: FailureCallback<ErrorMessage>
-    ) {
-
-        logger.i("fetchFruitsButFail()")
-
-        if (isBusy) {
-            failureWithPayload(ErrorMessage.ERROR_BUSY)
-            return
-        }
-
-        isBusy = true
-        notifyObservers()
-
-
-        launchMain {
-
-            val result = callWrapper.processCallAwait {
-                fruitService.getFruitsSimulateNotAuthorised()
-            }
-
-            awaitMain {
-                when (result) {
-                    is Fail -> handleFailure(failureWithPayload, result.value)
-                    is Success -> handleSuccess(success, result.value)
-                }
-            }
-        }
-    }
-
-
-    /**
-     * identical to fetchFruitsAsync() but for demo purposes the URL we point to will give us an error,
-     * here we specify a custom error class for more detail about the error than just an HTTP code can give us
-     */
-    fun fetchFruitsButFailAdvanced(
-        success: SuccessCallback,
-        failureWithPayload: FailureCallback<ErrorMessage>
-    ) {
-
-        logger.i("fetchFruitsButFailAdvanced()")
-
-        if (isBusy) {
-            failureWithPayload(ErrorMessage.ERROR_BUSY)
-            return
-        }
-
-        isBusy = true
-        notifyObservers()
-
-        launchMain {
-
-            val result = callWrapper.processCallAwait(FruitsCustomError::class.java) {
-                fruitService.getFruitsSimulateNotAuthorised()
-            }
-
-            awaitMain {
-                when (result) {
-                    is Fail -> handleFailure(failureWithPayload, result.value)
-                    is Success -> handleSuccess(success, result.value)
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Demonstration of how to use carryOn to chain multiple connection requests together in a
-     * simple way
-     */
-    fun chainedCall(
-        success: SuccessCallback,
-        failureWithPayload: FailureCallback<ErrorMessage>
-    ) {
-
-        logger.i("chainedCall()")
-
-        if (isBusy) {
-            failureWithPayload(ErrorMessage.ERROR_BUSY)
-            return
-        }
-
-        isBusy = true
-        notifyObservers()
-
-        launchMain {
-
-            val result = callWrapper.processCallAwait(
-                FruitsCustomError::class.java
-            ) {
-
-                /**
-                 * we're using fore's carryOn() extension function here but you can do whatever
-                 * you like here, including using reactive streams if appropriate. Once your network
-                 * chain is complete though, when you want to expose the resulting state,
-                 * you need to: 1) set it, and 2) call notifyObservers().
-                 *
-                 * (carryOn() lets you transparently handle networking
-                 * errors at each step - Internet search for "railway oriented programming"
-                 * or "andThen" functions)
-                 */
-                var ticketRef = ""
-                logger.i("...create user...")
-                fruitService.createUser()
-                    .carryOn {
-                        logger.i("...create user ticket...")
-                        fruitService.createUserTicket(it.userId)
-                    }
-                    .carryOn {
-                        ticketRef = it.ticketRef
-                        logger.i("...get waiting time...")
-                        fruitService.getEstimatedWaitingTime(it.ticketRef)
-                    }
-                    .carryOn {
-                        if (it.minutesWait > 10) {
-                            logger.i("...cancel ticket...")
-                            fruitService.cancelTicket(ticketRef)
-                        } else {
-                            logger.i("...confirm ticket...")
-                            fruitService.confirmTicket(ticketRef)
-                        }
-                    }
-                    .carryOn {
-                        logger.i("...claim free fruit!...")
-                        fruitService.claimFreeFruit(it.ticketRef)
-                    }
-            }
-
-            awaitMain {
-                when (result) {
-                    is Fail -> handleFailure(failureWithPayload, result.value)
-                    is Success -> handleSuccess(success, result.value)
-                }
-            }
-        }
-    }
-
-    private fun handleSuccess(
-        success: SuccessCallback,
-        successResponse: List<FruitPojo>
-    ) {
-
-        logger.i("handleSuccess() t:" + Thread.currentThread())
-
-        currentFruit = selectRandomFruit(successResponse)
-        success()
-        complete()
-    }
-
-    private fun handleFailure(
-        failureWithPayload: FailureCallback<ErrorMessage>,
-        failureMessage: ErrorMessage
-    ) {
-
-        logger.i("handleFailure() t:" + Thread.currentThread())
-
-        failureWithPayload(failureMessage)
-        complete()
-    }
-
-    private fun complete() {
-
-        logger.i("complete() t:" + Thread.currentThread())
-
-        isBusy = false
-        notifyObservers()
-    }
-
-    private fun selectRandomFruit(listOfFruits: List<FruitPojo>): FruitPojo {
-        return listOfFruits[if (listOfFruits.size == 1) 0 else random.nextInt(listOfFruits.size - 1)]
-    }
-
-    companion object {
-        private val random = Random()
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/message/ErrorMessage.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/message/ErrorMessage.kt
deleted file mode 100644
index e30531c3..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/message/ErrorMessage.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package foo.bar.example.foreretrofitkt.message
-
-import android.os.Parcel
-import android.os.Parcelable
-import foo.bar.example.foreretrofitkt.App
-import foo.bar.example.foreretrofitkt.R
-
-/**
- * As an enum, this value can be passed around the app to indicate various states.
- * If you want to display it to the user you can put it inside a dialog (it implements
- * parcelable). Call getString() for the human readable text.
- */
-enum class ErrorMessage constructor(private val messageResId: Int) : Parcelable {
-
-    ERROR_MISC(R.string.msg_error_misc),
-    ERROR_NETWORK(R.string.msg_error_network),
-    ERROR_SECURITY_UNKNOWN(R.string.msg_error_misc),
-    ERROR_SERVER(R.string.msg_error_server),
-    ERROR_CLIENT(R.string.msg_error_client),
-    ERROR_RATE_LIMITED(R.string.msg_rate_limited),
-    ERROR_SESSION_TIMED_OUT(R.string.msg_error_session_timeout),
-    ERROR_BUSY(R.string.msg_error_busy),
-    ERROR_CANCELLED(R.string.msg_error_cancelled),
-
-    ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT(R.string.msg_error_fruit_user_login_creds_incorrect),
-    ERROR_FRUIT_USER_LOCKED(R.string.msg_error_fruit_user_locked),
-    ERROR_FRUIT_USER_NOT_ENABLED(R.string.msg_error_fruit_user_locked);
-
-    val localisedMessage: String by lazy {
-        getString(messageResId)
-    }
-
-    constructor(parcel: Parcel) : this(parcel.readInt())
-
-    //this should only be called when a UserMessage is actually displayed to a user, so not during a JUnit test
-    private fun getString(resId: Int): String {
-        return App.inst.resources.getString(resId)
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeInt(ordinal)
-    }
-
-    companion object CREATOR : Parcelable.Creator<ErrorMessage> {
-        override fun createFromParcel(parcel: Parcel): ErrorMessage {
-            return values()[parcel.readInt()]
-        }
-
-        override fun newArray(size: Int): Array<ErrorMessage?> {
-            return arrayOfNulls(size)
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitActivity.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitActivity.kt
deleted file mode 100644
index 82058a82..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/ui/fruit/FruitActivity.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package foo.bar.example.foreretrofitkt.ui.fruit
-
-import android.content.Context
-import android.os.Bundle
-import android.widget.Toast
-import androidx.fragment.app.FragmentActivity
-import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.ui.LifecycleObserver
-import co.early.fore.kt.core.ui.showOrGone
-import co.early.fore.kt.core.ui.showOrInvisible
-import foo.bar.example.foreretrofitkt.OG
-import foo.bar.example.foreretrofitkt.R
-import foo.bar.example.foreretrofitkt.databinding.ActivityFruitBinding
-import foo.bar.example.foreretrofitkt.feature.fruit.FailureCallback
-import foo.bar.example.foreretrofitkt.feature.fruit.FruitFetcher
-import foo.bar.example.foreretrofitkt.feature.fruit.SuccessCallback
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-
-class FruitActivity : FragmentActivity(), SyncableView {
-
-    //models that we need to sync with
-    private val fruitFetcher: FruitFetcher = OG[FruitFetcher::class.java]
-
-    private lateinit var binding: ActivityFruitBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = ActivityFruitBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        lifecycle.addObserver(LifecycleObserver(this, fruitFetcher))
-
-        setupButtonClickListeners()
-    }
-
-    private fun setupButtonClickListeners() {
-        binding.fruitFetchsuccessBtn.setOnClickListener { fruitFetcher.fetchFruitsAsync(success, failureWithPayload) }
-        binding.fruitFetchchainsuccessBtn.setOnClickListener { fruitFetcher.chainedCall(success, failureWithPayload) }
-        binding.fruitFetchfailbasicBtn.setOnClickListener { fruitFetcher.fetchFruitsButFail(success, failureWithPayload) }
-        binding.fruitFetchfailadvancedBtn.setOnClickListener { fruitFetcher.fetchFruitsButFailAdvanced(success, failureWithPayload) }
-    }
-
-    override fun syncView() {
-        binding.fruitFetchsuccessBtn.isEnabled = !fruitFetcher.isBusy
-        binding.fruitFetchsuccessBtn.isEnabled = !fruitFetcher.isBusy
-        binding.fruitFetchfailbasicBtn.isEnabled = !fruitFetcher.isBusy
-        binding.fruitFetchfailadvancedBtn.isEnabled = !fruitFetcher.isBusy
-        binding.fruitNameTextview.text = fruitFetcher.currentFruit.name
-        binding.fruitCitrusImg.setImageResource(
-            if (fruitFetcher.currentFruit.isCitrus)
-                R.drawable.lemon_positive else R.drawable.lemon_negative
-        )
-        binding.fruitTastyratingTastybar.setTastyPercent(fruitFetcher.currentFruit.tastyPercentScore.toFloat())
-        binding.fruitTastyratingTextview.text = String.format(
-            this.getString(R.string.fruit_percent), fruitFetcher.currentFruit.tastyPercentScore.toString()
-        )
-        binding.fruitBusyProgbar.showOrInvisible(fruitFetcher.isBusy)
-        binding.fruitDetailcontainerLinearlayout.showOrGone(!fruitFetcher.isBusy)
-    }
-
-    private val success: SuccessCallback = {
-        showToast("Success!")
-    }
-    private val failureWithPayload: FailureCallback<ErrorMessage> = { userMessage ->
-        showToast(userMessage)
-    }
-}
-
-fun Context.showToast(message: String) {
-    Toast.makeText(this, message, Toast.LENGTH_LONG).show()
-}
-
-fun Context.showToast(message: ErrorMessage) {
-    Toast.makeText(this, message.localisedMessage, Toast.LENGTH_LONG).show()
-}
\ No newline at end of file
diff --git a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/ui/widgets/AnimatedTastyRatingBar.kt b/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/ui/widgets/AnimatedTastyRatingBar.kt
deleted file mode 100644
index e8840043..00000000
--- a/app-examples/example-kt-04retrofit/src/main/java/foo/bar/example/foreretrofitkt/ui/widgets/AnimatedTastyRatingBar.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package foo.bar.example.foreretrofitkt.ui.widgets
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatImageView
-import foo.bar.example.foreretrofitkt.App
-import foo.bar.example.foreretrofitkt.R
-
-
-@Suppress("DEPRECATION")
-class AnimatedTastyRatingBar @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : AppCompatImageView(context, attrs, defStyleAttr) {
-
-    private lateinit var paint: Paint
-
-    private var widthPx: Float = 0.toFloat()
-    private var heightPx: Float = 0.toFloat()
-
-    private var backgroundColour: Int = 0
-    private var progressColour: Int = 0
-
-    private var tastyPercent = 0f
-    private var currentPercent = 0f
-    private val step = 1f
-    private var increasing = false
-
-
-    public override fun onFinishInflate() {
-        super.onFinishInflate()
-
-        backgroundColour = App.inst.getResources().getColor(R.color.colorPrimary)
-        progressColour = App.inst.getResources().getColor(R.color.colorPrimaryDark)
-
-        paint = Paint()
-        paint.flags = Paint.ANTI_ALIAS_FLAG
-        paint.style = Paint.Style.FILL_AND_STROKE
-    }
-
-    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-        super.onSizeChanged(w, h, oldw, oldh)
-
-        widthPx = width.toFloat()
-        heightPx = height.toFloat()
-
-        invalidate()
-    }
-
-
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-
-        //background
-        paint.color = backgroundColour
-        canvas.drawRect(0f, 0f, widthPx, heightPx, paint)
-
-        //percent bar
-        paint.color = progressColour
-        canvas.drawRect(0f, 0f, currentPercent * widthPx / 100, heightPx, paint)
-
-        progressAnimation()
-    }
-
-    fun setTastyPercent(tastyPercent: Float) {
-        this.tastyPercent = tastyPercent
-
-        if (currentPercent == 0f) {//don't bother with the animation
-            currentPercent = tastyPercent
-        }
-
-        increasing = tastyPercent > currentPercent
-
-        invalidate()
-    }
-
-
-    private fun progressAnimation() {
-
-        if (increasing && currentPercent < tastyPercent) {
-
-            currentPercent = Math.min(tastyPercent, currentPercent + step)
-
-            invalidate()
-
-        } else if (!increasing && currentPercent > tastyPercent) {
-
-            currentPercent = Math.max(tastyPercent, currentPercent - step)
-
-            invalidate()
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-04retrofit/src/main/res/drawable-xxhdpi/lemon_negative.png b/app-examples/example-kt-04retrofit/src/main/res/drawable-xxhdpi/lemon_negative.png
deleted file mode 100644
index 40a99338..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/drawable-xxhdpi/lemon_negative.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/drawable-xxhdpi/lemon_positive.png b/app-examples/example-kt-04retrofit/src/main/res/drawable-xxhdpi/lemon_positive.png
deleted file mode 100644
index c0fb1238..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/drawable-xxhdpi/lemon_positive.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/layout/activity_fruit.xml b/app-examples/example-kt-04retrofit/src/main/res/layout/activity_fruit.xml
deleted file mode 100644
index e82cdf49..00000000
--- a/app-examples/example-kt-04retrofit/src/main/res/layout/activity_fruit.xml
+++ /dev/null
@@ -1,131 +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:background="@color/colorAccent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:background="@color/colorPrimary"
-        android:layout_margin="15dp"
-        android:padding="15dp"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="10dp"
-            android:textSize="15sp"
-            android:textColor="@color/colorAccent"
-            android:text="Fruit Fetcher (Retrofit)" />
-
-        <RelativeLayout
-            android:layout_width="200dp"
-            android:layout_height="180dp"
-            android:layout_margin="10dp"
-            android:background="@color/colorLightGrey">
-
-            <ProgressBar
-                android:id="@+id/fruit_busy_progbar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true" />
-
-            <LinearLayout
-                android:id="@+id/fruit_detailcontainer_linearlayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/fruit_name_textview"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="fruit name"
-                    android:padding="10dp"
-                    android:textStyle="bold"
-                    android:textSize="25sp"
-                    android:textColor="@color/colorAccent" />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="isCitrus"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"
-                        android:layout_alignParentLeft="true"
-                        android:textColor="@color/colorAccent"/>
-
-                    <ImageView
-                        android:id="@+id/fruit_citrus_img"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"/>
-
-                </RelativeLayout>
-
-                <foo.bar.example.foreretrofitkt.ui.widgets.AnimatedTastyRatingBar
-                    android:id="@+id/fruit_tastyrating_tastybar"
-                    android:layout_width="match_parent"
-                    android:layout_height="3dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="4dp"
-                    android:background="@color/colorAccent"/>
-
-                <TextView
-                    android:id="@+id/fruit_tastyrating_textview"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="100% tasty"
-                    android:textSize="12sp"
-                    android:textColor="@color/colorAccent"/>
-
-            </LinearLayout>
-
-        </RelativeLayout>
-
-        <Button
-            android:id="@+id/fruit_fetchsuccess_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="fetch - (success result)" />
-
-        <Button
-            android:id="@+id/fruit_fetchchainsuccess_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="chained fetch - (success result)" />
-
-        <Button
-            android:id="@+id/fruit_fetchfailbasic_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="fetch - (fail result basic)" />
-
-        <Button
-            android:id="@+id/fruit_fetchfailadvanced_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="fetch - (fail result advanced)" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-kt-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-kt-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-04retrofit/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 8f5c80ae..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_background.png
deleted file mode 100644
index 1a96b1a9..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 46bea6b3..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index e335d78a..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_background.png
deleted file mode 100644
index 901d6859..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index b5c5d0b4..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 6fc622e2..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_background.png
deleted file mode 100644
index 686dab37..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index c6e383af..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 68b160b4..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
deleted file mode 100644
index 670d3e6a..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 840395d1..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 3777b9e6..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
deleted file mode 100644
index 506c6fdb..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e54dcd0f..00000000
Binary files a/app-examples/example-kt-04retrofit/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-04retrofit/src/main/res/values/colors.xml b/app-examples/example-kt-04retrofit/src/main/res/values/colors.xml
deleted file mode 100644
index af48f044..00000000
--- a/app-examples/example-kt-04retrofit/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#515673</color>
-    <color name="colorPrimaryDark">#ff512f</color>
-    <color name="colorAccent">#ff512f</color>
-    <color name="colorLightGrey">#EAEAEA</color>
-</resources>
diff --git a/app-examples/example-kt-04retrofit/src/main/res/values/strings.xml b/app-examples/example-kt-04retrofit/src/main/res/values/strings.xml
deleted file mode 100644
index 9c313e07..00000000
--- a/app-examples/example-kt-04retrofit/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<resources>
-    <string name="app_name">kt 4 retrofit ex</string>
-
-    <!-- common error messages -->
-    <string name="msg_empty_message"></string>
-    <string name="msg_error_misc">Some kind of error, maybe check logs</string>
-    <string name="msg_error_network">Network error, check connection</string>
-    <string name="msg_error_server">Server down, try again soon</string>
-    <string name="msg_error_client">Client error</string>
-    <string name="msg_rate_limited">Too many requests</string>
-    <string name="msg_error_session_timeout">Unauthorized</string>
-    <string name="msg_error_busy">Busy</string>
-    <string name="msg_error_cancelled">Cancelled</string>
-
-    <!-- fruit related custom messages -->
-    <string name="msg_error_fruit_user_login_creds_incorrect">Your login details were incorrect, please check and try again</string>
-    <string name="msg_error_fruit_user_locked">Your fruit user account has been locked, please contact us</string>
-    <string name="msg_error_fruit_user_not_enabled">Your fruit user account has not been enabled yet, please contact us</string>
-
-    <string name="fruit_percent">(%s%% tasty)</string>
-
-</resources>
diff --git a/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/api/CommonServiceFailures.kt b/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/api/CommonServiceFailures.kt
deleted file mode 100644
index 0782d530..00000000
--- a/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/api/CommonServiceFailures.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package foo.bar.example.foreretrofitkt.api
-
-import co.early.fore.kt.net.testhelpers.Stub
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-import foo.bar.example.foreretrofitkt.message.ErrorMessage.*
-import java.io.IOException
-import java.net.SocketTimeoutException
-import java.util.ArrayList
-
-/**
- * This will be specific to your own app, it's closely linked to: [CustomGlobalErrorHandler]
- */
-class CommonServiceFailures : ArrayList<Stub<ErrorMessage>>() {
-    init {
-
-        //bad request
-        add(Stub(400, "common/empty.json", expectedResult = ERROR_CLIENT))
-
-        //session timeout
-        add(Stub(401, "common/empty.json", expectedResult = ERROR_SESSION_TIMED_OUT))
-
-        //missing resource
-        add(Stub(404, "common/empty.json", expectedResult = ERROR_SERVER))
-
-        //missing resource (html page)
-        add(Stub(404, "common/html.json", headers = listOf(Stub.Header("Content-Type", "text/html")), expectedResult = ERROR_SERVER))
-
-        //bad request
-        add(Stub(405, "common/empty.json", expectedResult = ERROR_CLIENT))
-
-        //server down
-        add(Stub(500, "common/empty.json", expectedResult = ERROR_SERVER))
-
-        //service unavailable
-        add(Stub(503, "common/empty.json", expectedResult = ERROR_SERVER))
-
-        //non valid json
-        add(Stub(200, "common/html.json", expectedResult = ERROR_SERVER))
-
-        //network down
-        add(Stub(throwable = IOException("fake io exception for testing purposes"), expectedResult = ERROR_NETWORK))
-
-        //network timeout
-        add(Stub(throwable = SocketTimeoutException("fake timeout exception for testing purposes"), expectedResult = ERROR_NETWORK))
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcherIntegrationTest.kt b/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcherIntegrationTest.kt
deleted file mode 100644
index b87bb218..00000000
--- a/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcherIntegrationTest.kt
+++ /dev/null
@@ -1,233 +0,0 @@
-package foo.bar.example.foreretrofitkt.feature.fruit
-
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.net.InterceptorLogging
-import co.early.fore.kt.net.retrofit2.CallWrapperRetrofit2
-import co.early.fore.kt.net.testhelpers.InterceptorStubOkHttp3
-import co.early.fore.kt.net.testhelpers.Stub
-import foo.bar.example.foreretrofitkt.api.CommonServiceFailures
-import foo.bar.example.foreretrofitkt.api.CustomGlobalErrorHandler
-import foo.bar.example.foreretrofitkt.api.CustomRetrofitBuilder
-import foo.bar.example.foreretrofitkt.api.fruits.FruitPojo
-import foo.bar.example.foreretrofitkt.api.fruits.FruitService
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-import io.mockk.MockKAnnotations
-import io.mockk.clearMocks
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-import retrofit2.Retrofit
-
-/**
- * This is a slightly more end-to-end style of test, but without actually connecting to a network
- *
- * Using [InterceptorStubOkHttp3] we replace the server response with a canned response taken
- * from static text files saved in /resources. This all happens in OkHttp land so the model
- * under test is not aware of any difference.
- *
- * As usual for tests, we setup the CallWrapper with [WorkMode.SYNCHRONOUS] so
- * that everything plays out in a single thread. Other examples use
- * [Fore.setDelegate(TestDelegateDefault())] to do the same thing
- */
-class FruitFetcherIntegrationTest {
-
-    private val logger = SystemLogger()
-    private val interceptorLogging = InterceptorLogging(logger)
-    private val callWrapper =
-        CallWrapperRetrofit2(CustomGlobalErrorHandler(logger), WorkMode.SYNCHRONOUS, logger)
-
-    @MockK
-    private lateinit var mockSuccess: SuccessCallback
-
-    @MockK
-    private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-
-        // make the code run synchronously, reroute Log.x to
-        // System.out.println() so we see it in the test log
-        Fore.setDelegate(TestDelegateDefault())
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a successful server response
-     * containing a list of fruit
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_Success() {
-
-        //arrange
-        val retrofit = stubbedRetrofit(stubbedSuccess)
-        val fruitFetcher = FruitFetcher(
-            retrofit.create(FruitService::class.java),
-            callWrapper,
-            logger
-        )
-
-        //act
-        fruitFetcher.fetchFruitsAsync(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 1) {
-            mockSuccess()
-        }
-        verify(exactly = 0) {
-            mockFailureWithPayload(any())
-        }
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(stubbedSuccess.expectedResult?.name, fruitFetcher.currentFruit.name)
-        Assert.assertEquals(
-            stubbedSuccess.expectedResult?.isCitrus,
-            fruitFetcher.currentFruit.isCitrus
-        )
-        Assert.assertEquals(
-            stubbedSuccess.expectedResult?.tastyPercentScore?.toLong(),
-            fruitFetcher.currentFruit.tastyPercentScore.toLong()
-        )
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a server response indicating
-     * that the user account has been locked
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_Fail_UserLocked() {
-
-        //arrange
-        val retrofit = stubbedRetrofit(stubbedFailUserLocked)
-        val fruitFetcher = FruitFetcher(
-            retrofit.create(FruitService::class.java),
-            callWrapper,
-            logger
-        )
-
-        //act
-        fruitFetcher.fetchFruitsButFailAdvanced(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 0) {
-            mockSuccess()
-        }
-        verify(exactly = 1) {
-            mockFailureWithPayload(eq(stubbedFailUserLocked.expectedResult as ErrorMessage))
-        }
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(0, fruitFetcher.currentFruit.tastyPercentScore.toLong())
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a server response indicating
-     * that the user account has not been enabled
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_Fail_UserNotEnabled() {
-
-        //arrange
-        val retrofit = stubbedRetrofit(stubbedFailureUserNotEnabled)
-        val fruitFetcher = FruitFetcher(
-            retrofit.create(FruitService::class.java),
-            callWrapper,
-            logger
-        )
-
-        //act
-        fruitFetcher.fetchFruitsButFailAdvanced(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 0) {
-            mockSuccess()
-        }
-        verify(exactly = 1) {
-            mockFailureWithPayload(eq(stubbedFailureUserNotEnabled.expectedResult as ErrorMessage))
-        }
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(0, fruitFetcher.currentFruit.tastyPercentScore.toLong())
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles common API failed responses
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_CommonFailures() {
-
-        for (stub in CommonServiceFailures()) {
-
-            logger.i(
-                "------- Common Service Failure: HTTP:"
-                        + stub.httpCode
-                        + " res:" + stub.bodyContentResourceFileName
-                        + " expect:" + stub.expectedResult
-                        + " --------"
-            )
-
-            //arrange
-            clearMocks(mockSuccess, mockFailureWithPayload)
-            val retrofit = stubbedRetrofit(stub)
-            val fruitFetcher = FruitFetcher(
-                retrofit.create(FruitService::class.java),
-                callWrapper,
-                logger
-            )
-
-            //act
-            fruitFetcher.fetchFruitsAsync(mockSuccess, mockFailureWithPayload)
-
-            //assert
-            verify(exactly = 0) {
-                mockSuccess()
-            }
-            verify(exactly = 1) {
-                mockFailureWithPayload(eq(stub.expectedResult as ErrorMessage))
-            }
-            Assert.assertEquals(false, fruitFetcher.isBusy)
-            Assert.assertEquals(0, fruitFetcher.currentFruit.tastyPercentScore.toLong())
-        }
-    }
-
-    private fun stubbedRetrofit(stubbedServiceDefinition: Stub<*>): Retrofit {
-        return CustomRetrofitBuilder.create(
-            interceptorLogging,
-            InterceptorStubOkHttp3(stubbedServiceDefinition),
-        )
-    }
-
-    companion object {
-
-        private val stubbedSuccess = Stub(
-            httpCode = 200, //stubbed HTTP code
-            bodyContentResourceFileName = "fruit/success.json", //stubbed body response
-            expectedResult = FruitPojo("orange", true, 43) //expected result
-        )
-
-        private val stubbedFailUserLocked = Stub(
-            httpCode = 401, //stubbed HTTP code
-            bodyContentResourceFileName = "common/error_user_locked.json", //stubbed body response
-            expectedResult = ErrorMessage.ERROR_FRUIT_USER_LOCKED //expected result
-        )
-
-        private val stubbedFailureUserNotEnabled = Stub(
-            httpCode = 401, //stubbed HTTP code
-            bodyContentResourceFileName = "common/error_user_not_enabled.json", //stubbed body response
-            expectedResult = ErrorMessage.ERROR_FRUIT_USER_NOT_ENABLED //expected result
-        )
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcherUnitTest.kt b/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcherUnitTest.kt
deleted file mode 100644
index ded0b469..00000000
--- a/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/FruitFetcherUnitTest.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-package foo.bar.example.foreretrofitkt.feature.fruit
-
-import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.net.retrofit2.CallWrapperRetrofit2
-import foo.bar.example.foreretrofitkt.api.fruits.FruitPojo
-import foo.bar.example.foreretrofitkt.api.fruits.FruitService
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-
-/**
- * Tests for this model cover a few areas:
- *
- * 1) Construction: we check that the model is constructed in the correct state
- * 2) Receiving data: we check that the model behaves appropriately when receiving various success and fail responses from the CallProcessor
- * 3) Observers and State: we check that the model updates its observers correctly and presents its current state accurately
- */
-class FruitFetcherUnitTest {
-
-    private val fruitPojo = FruitPojo("strawberry", false, 71)
-
-    @MockK
-    private lateinit var mockSuccess: SuccessCallback
-
-    @MockK
-    private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
-
-    @MockK
-    private lateinit var mockCallWrapperRetrofit2: CallWrapperRetrofit2<ErrorMessage>
-
-    @MockK
-    private lateinit var mockFruitService: FruitService
-
-    @MockK
-    private lateinit var mockObserver: Observer
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-
-        // make the code run synchronously, reroute Log.x to
-        // System.out.println() so we see it in the test log
-        Fore.setDelegate(TestDelegateDefault())
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun initialConditions() {
-
-        //arrange
-        val fruitFetcher = FruitFetcher(
-            mockFruitService,
-            mockCallWrapperRetrofit2,
-            logger
-        )
-
-        //act
-
-        //assert
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(0, fruitFetcher.currentFruit.tastyPercentScore.toLong())
-        Assert.assertEquals(false, fruitFetcher.currentFruit.isCitrus)
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_MockSuccess() {
-
-        //arrange
-        StateBuilder(mockCallWrapperRetrofit2).getFruitSuccess(fruitPojo)
-        val fruitFetcher = FruitFetcher(
-            mockFruitService,
-            mockCallWrapperRetrofit2,
-            logger
-        )
-
-        //act
-        fruitFetcher.fetchFruitsAsync(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 1) {
-            mockSuccess()
-        }
-        verify(exactly = 0) {
-            mockFailureWithPayload(any())
-        }
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(fruitPojo.name, fruitFetcher.currentFruit.name)
-        Assert.assertEquals(fruitPojo.isCitrus, fruitFetcher.currentFruit.isCitrus)
-        Assert.assertEquals(
-            fruitPojo.tastyPercentScore.toLong(),
-            fruitFetcher.currentFruit.tastyPercentScore.toLong()
-        )
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_MockFailure() {
-
-        //arrange
-        StateBuilder(mockCallWrapperRetrofit2).getFruitFail(ErrorMessage.ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT)
-        val fruitFetcher = FruitFetcher(
-            mockFruitService,
-            mockCallWrapperRetrofit2,
-            logger
-        )
-
-        //act
-        fruitFetcher.fetchFruitsButFailAdvanced(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 0) {
-            mockSuccess()
-        }
-        verify(exactly = 1) {
-            mockFailureWithPayload(eq(ErrorMessage.ERROR_FRUIT_USER_LOGIN_CREDENTIALS_INCORRECT))
-        }
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(false, fruitFetcher.currentFruit.isCitrus)
-        Assert.assertEquals(0, fruitFetcher.currentFruit.tastyPercentScore.toLong())
-    }
-
-    /**
-     *
-     * NB all we are checking here is that observers are called AT LEAST once
-     *
-     * We don't really want tie our tests (OR any observers in production code)
-     * to an expected number of times this method might be called. (This would be
-     * testing an implementation detail and make the tests unnecessarily brittle)
-     *
-     * The contract says nothing about how many times the observers will get called,
-     * only that they will be called if something changes ("something" is not defined
-     * and can change between implementations).
-     *
-     * See the databinding docs for more information about this
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun observersNotifiedAtLeastOnce() {
-
-        //arrange
-        StateBuilder(mockCallWrapperRetrofit2).getFruitSuccess(fruitPojo)
-        val fruitFetcher = FruitFetcher(
-            mockFruitService,
-            mockCallWrapperRetrofit2,
-            logger
-        )
-        fruitFetcher.addObserver(mockObserver)
-
-        //act
-        fruitFetcher.fetchFruitsAsync(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(atLeast = 1) {
-            mockObserver.somethingChanged()
-        }
-    }
-
-    companion object {
-        private val logger = SystemLogger()
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/StateBuilder.kt b/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/StateBuilder.kt
deleted file mode 100644
index db0278fa..00000000
--- a/app-examples/example-kt-04retrofit/src/test/java/foo/bar/example/foreretrofitkt/feature/fruit/StateBuilder.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package foo.bar.example.foreretrofitkt.feature.fruit
-
-import co.early.fore.kt.core.type.Either.Companion.fail
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.kt.net.retrofit2.CallWrapperRetrofit2
-import co.early.fore.net.MessageProvider
-import foo.bar.example.foreretrofitkt.api.fruits.FruitPojo
-import foo.bar.example.foreretrofitkt.message.ErrorMessage
-import io.mockk.coEvery
-import kotlinx.coroutines.CompletableDeferred
-import retrofit2.Response
-
-class StateBuilder internal constructor(private val mockCallWrapperRetrofit2: CallWrapperRetrofit2<ErrorMessage>) {
-
-    internal fun getFruitSuccess(fruitPojo: FruitPojo): StateBuilder {
-
-        coEvery {
-            mockCallWrapperRetrofit2.processCallAsync(
-                any() as suspend () -> Response<List<FruitPojo>>
-            )
-        } returns CompletableDeferred(success(listOf(fruitPojo)))
-
-        return this
-    }
-
-    internal fun getFruitFail(errorMessage: ErrorMessage): StateBuilder {
-
-        coEvery {
-            mockCallWrapperRetrofit2.processCallAwait(
-                any() as Class<MessageProvider<ErrorMessage>>,
-                any() as suspend () -> Response<List<FruitPojo>>
-            )
-        } returns fail(errorMessage)
-
-        return this
-    }
-}
diff --git a/app-examples/example-kt-04retrofit/src/test/resources/common/empty.json b/app-examples/example-kt-04retrofit/src/test/resources/common/empty.json
deleted file mode 100644
index e69de29b..00000000
diff --git a/app-examples/example-kt-04retrofit/src/test/resources/common/error_user_locked.json b/app-examples/example-kt-04retrofit/src/test/resources/common/error_user_locked.json
deleted file mode 100644
index c09caa60..00000000
--- a/app-examples/example-kt-04retrofit/src/test/resources/common/error_user_locked.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "errorCode":"FRUIT_USER_LOCKED"
-}
\ No newline at end of file
diff --git a/app-examples/example-kt-04retrofit/src/test/resources/common/error_user_not_enabled.json b/app-examples/example-kt-04retrofit/src/test/resources/common/error_user_not_enabled.json
deleted file mode 100644
index 05580569..00000000
--- a/app-examples/example-kt-04retrofit/src/test/resources/common/error_user_not_enabled.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "errorCode":"FRUIT_USER_NOT_ENABLED"
-}
\ No newline at end of file
diff --git a/app-examples/example-kt-04retrofit/src/test/resources/common/html.json b/app-examples/example-kt-04retrofit/src/test/resources/common/html.json
deleted file mode 100644
index 92ab9d38..00000000
--- a/app-examples/example-kt-04retrofit/src/test/resources/common/html.json
+++ /dev/null
@@ -1 +0,0 @@
-<HTML>/<HTML>
\ No newline at end of file
diff --git a/app-examples/example-kt-04retrofit/src/test/resources/fruit/success.json b/app-examples/example-kt-04retrofit/src/test/resources/fruit/success.json
deleted file mode 100644
index 1fc65eb4..00000000
--- a/app-examples/example-kt-04retrofit/src/test/resources/fruit/success.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "name":"orange",
-    "isCitrus":true,
-    "tastyPercentScore":43
-  }
-]
\ No newline at end of file
diff --git a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/DrawableMatcher.kt b/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/DrawableMatcher.kt
deleted file mode 100644
index 9f254d4d..00000000
--- a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/DrawableMatcher.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package foo.bar.example.foreapollo3
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.drawable.Drawable
-import android.view.View
-import android.widget.ImageView
-import org.hamcrest.Description
-import org.hamcrest.TypeSafeMatcher
-
-/**
- *
- * https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f
- * https://github.com/dbottillo/Blog/blob/espresso_match_imageview/app/src/androidTest/java/com/danielebottillo/blog/config/DrawableMatcher.java
- *
- */
-class DrawableMatcher internal constructor(private val expectedId: Int) : TypeSafeMatcher<View>(View::class.java) {
-    private var resourceName: String? = null
-
-    override fun matchesSafely(target: View): Boolean {
-        if (target !is ImageView) {
-            return false
-        }
-        if (expectedId == EMPTY) {
-            return target.drawable == null
-        }
-        if (expectedId == ANY) {
-            return target.drawable != null
-        }
-        val resources = target.getContext().resources
-        val expectedDrawable = resources.getDrawable(expectedId)
-        resourceName = resources.getResourceEntryName(expectedId)
-
-        if (expectedDrawable == null) {
-            return false
-        }
-
-        val bitmap = getBitmap(target.drawable)
-        val otherBitmap = getBitmap(expectedDrawable)
-        return bitmap.sameAs(otherBitmap)
-    }
-
-    private fun getBitmap(drawable: Drawable): Bitmap {
-        val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(bitmap)
-        drawable.setBounds(0, 0, canvas.width, canvas.height)
-        drawable.draw(canvas)
-        return bitmap
-    }
-
-    override fun describeTo(description: Description) {
-        description.appendText("with drawable from resource id: ")
-        description.appendValue(expectedId)
-        if (resourceName != null) {
-            description.appendText("[")
-            description.appendText(resourceName)
-            description.appendText("]")
-        }
-    }
-
-    companion object {
-        internal val EMPTY = -1
-        internal val ANY = -2
-    }
-}
diff --git a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/EspressoTestMatchers.kt b/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/EspressoTestMatchers.kt
deleted file mode 100644
index a71d871a..00000000
--- a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/EspressoTestMatchers.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package foo.bar.example.foreapollo3
-
-import android.view.View
-
-import org.hamcrest.Matcher
-
-/**
- *
- * https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f
- * https://github.com/dbottillo/Blog/blob/espresso_match_imageview/app/src/androidTest/java/com/danielebottillo/blog/config/EspressoTestsMatchers.java
- *
- */
-object EspressoTestMatchers {
-
-    fun withDrawable(resourceId: Int): Matcher<View> {
-        return DrawableMatcher(resourceId)
-    }
-
-    fun noDrawable(): Matcher<View> {
-        return DrawableMatcher(DrawableMatcher.EMPTY)
-    }
-
-    fun hasDrawable(): Matcher<View> {
-        return DrawableMatcher(DrawableMatcher.ANY)
-    }
-
-}
diff --git a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ProgressBarIdler.kt b/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ProgressBarIdler.kt
deleted file mode 100644
index abcb4722..00000000
--- a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ProgressBarIdler.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package foo.bar.example.foreapollo3
-
-import android.R
-import android.app.Activity
-import android.app.Application
-import android.app.Instrumentation
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ProgressBar
-import androidx.core.content.ContextCompat
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
-import androidx.test.runner.lifecycle.Stage.RESUMED
-
-/**
- * If you have any spinning progress bars in your UI it will mess
- * up espresso tests (espresso will time out waiting for all UI
- * threads to be idle before proceeding).
- *
- *
- * This class will go through all your view elements views checking for
- * indeterminate progress bars and replacing the indeterminate drawable
- * with a static one so that espresso tests can continue
- *
- *
- * http://stackoverflow.com/a/37049916/3680389
- * https://stackoverflow.com/questions/33289152/progressbars-and-espresso#36201647
- */
-class ProgressBarIdler : Application.ActivityLifecycleCallbacks {
-
-
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-
-    }
-
-    override fun onActivityStarted(activity: Activity) {
-
-    }
-
-    override fun onActivityResumed(activity: Activity) {
-        makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView)
-    }
-
-    override fun onActivityPaused(activity: Activity) {
-
-    }
-
-    override fun onActivityStopped(activity: Activity) {
-
-    }
-
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-
-    }
-
-    override fun onActivityDestroyed(activity: Activity) {
-
-    }
-
-    companion object {
-
-        private fun makeAllProgressBarsIdle(view: View) {
-            if (view is ViewGroup) {
-                for (i in 0 until view.childCount) {
-                    makeAllProgressBarsIdle(view.getChildAt(i))
-                }
-            } else if (view is ProgressBar) {
-                if (view.isIndeterminate) {
-                    view.indeterminateDrawable = ContextCompat.getDrawable(InstrumentationRegistry.getInstrumentation().targetContext, android.R.drawable.ic_lock_lock)
-                }
-            }
-        }
-
-        fun makeAllProgressBarsIdle(instrumentation: Instrumentation, activity: Activity) {
-            instrumentation.runOnMainSync { makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView) }
-        }
-
-        fun makeAllProgressBarsIdleForAllResumedActivities(instrumentation: Instrumentation) {
-            instrumentation.runOnMainSync {
-                val resumedActivities = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(RESUMED)
-                if (resumedActivities.isEmpty()) {
-                    throw RuntimeException("Could not change orientation")
-                }
-                for (activity in resumedActivities) {
-                    makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView)
-                }
-            }
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewRotationTest.kt b/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewRotationTest.kt
deleted file mode 100644
index f6e4d6eb..00000000
--- a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewRotationTest.kt
+++ /dev/null
@@ -1,222 +0,0 @@
-package foo.bar.example.foreapollo3.ui.launch
-
-import android.app.Activity
-import android.content.pm.ActivityInfo
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.*
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.core.type.Either
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.kt.net.apollo3.CallWrapperApollo3
-import foo.bar.example.foreapollo3.LaunchListQuery
-import foo.bar.example.foreapollo3.R
-import foo.bar.example.foreapollo3.feature.FailureCallback
-import foo.bar.example.foreapollo3.feature.SuccessCallback
-import foo.bar.example.foreapollo3.feature.authentication.Authenticator
-import foo.bar.example.foreapollo3.feature.launch.Launch
-import foo.bar.example.foreapollo3.feature.launch.LaunchService
-import foo.bar.example.foreapollo3.feature.launch.LaunchesModel
-import foo.bar.example.foreapollo3.feature.launch.NO_ID
-import foo.bar.example.foreapollo3.message.ErrorMessage
-import io.mockk.MockKAnnotations
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
-import kotlinx.coroutines.CompletableDeferred
-import org.hamcrest.Matchers.containsString
-import org.hamcrest.Matchers.not
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.*
-import java.util.concurrent.CountDownLatch
-
-
-/**
- * Here we make sure that when the view is rotated while a long running action is being
- * performed by the model, all the view elements still accurately represent the model's
- * state after rotation is complete, and those view elements are still updated as appropriate
- * when the model completes the long running action.
- */
-
-@ExperimentalStdlibApi
-@RunWith(AndroidJUnit4::class)
-class LaunchViewRotationTest {
-
-    /**
-     * Here we're testing with a real model,
-     * and just mocking its dependencies.
-     * This lets us realistically test the
-     * interactions between the view
-     * and the model during and after
-     * a rotation
-     */
-
-    @MockK
-    private lateinit var mockSuccess: SuccessCallback
-
-    @MockK
-    private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
-
-    @MockK
-    lateinit var mockCallWrapperApollo: CallWrapperApollo3<ErrorMessage>
-
-    @MockK
-    private lateinit var mockLaunchService: LaunchService
-
-    @MockK
-    private lateinit var mockAuthenticator: Authenticator
-
-    lateinit var launchesModel: LaunchesModel
-    private var logger: Logger = SystemLogger()
-
-    private val launch = Launch("123", "site", true, "http://www.test.com/someimage.png")
-
-    private lateinit var deferredResult: CompletableDeferred<Either<ErrorMessage, CallWrapperApollo3.SuccessResult<LaunchListQuery.Data, ErrorMessage>>>
-    private val countDownLatch = CountDownLatch(1)
-
-    @Before
-    fun setUp() {
-
-        logger.i("setup()")
-
-        MockKAnnotations.init(this, relaxed = true)
-
-        //construct a real model with mock dependencies
-        launchesModel = LaunchesModel(
-            mockLaunchService,
-            mockCallWrapperApollo,
-            mockAuthenticator,
-            logger
-        )
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun stateSurvivesRotation() {
-
-        logger.i("stateSurvivesRotation()")
-
-        //arrange
-        val activity = LaunchViewRotationTestStateBuilder(this)
-            .withDelayedCallProcessor()
-            .createRule()
-            .launchActivity(null)
-
-        checkUIBeforeClick()
-
-        //act
-        launchesModel.fetchLaunches(mockSuccess, mockFailureWithPayload)
-
-        checkUIWhenFetching()
-
-        swapOrientation(activity)
-
-        checkUIWhenFetching()
-
-        completeDeferredResult()
-
-        try {
-            countDownLatch.await()
-        } catch (e: InterruptedException) {
-        }
-
-        checkUIOnceComplete()
-    }
-
-
-    fun completeDeferredResult() {
-
-        logger.i("callSuccessOnCachedSuccessFailCallback()")
-
-        val launchList = ArrayList<Launch>()
-        launchList.add(launch)
-
-        //we need to be back on the UI thread for this
-        getInstrumentation().runOnMainSync {
-            logger.i("about to call success, id:" + Thread.currentThread().id)
-
-            deferredResult.complete(
-                success(
-                    CallWrapperApollo3.SuccessResult(
-                        createMockLaunchesResponse(launch)
-                    )
-                )
-            )
-            countDownLatch.countDown()
-        }
-    }
-
-    fun setDeferredResult(deferredResult: CompletableDeferred<Either<ErrorMessage, CallWrapperApollo3.SuccessResult<LaunchListQuery.Data, ErrorMessage>>>) {
-        logger.i("setDeferredResult()")
-        this.deferredResult = deferredResult
-    }
-
-
-    @Synchronized
-    private fun checkUIBeforeClick() {
-        logger.i("checkUIBeforeClick()")
-
-        //assert
-        onView(withId(R.id.launch_busy_progbar)).check(matches(not(isDisplayed())))
-        onView(withId(R.id.launch_fetch_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.launch_id_textview)).check(matches(withText(containsString(NO_ID))))
-    }
-
-    @Synchronized
-    private fun checkUIWhenFetching() {
-        logger.i("checkUIWhenFetching()")
-
-        //assert
-        onView(withId(R.id.launch_busy_progbar)).check(matches(isDisplayed()))
-        onView(withId(R.id.launch_fetch_btn)).check(matches(not(isEnabled())))
-        onView(withId(R.id.launch_id_textview)).check(matches(not(isDisplayed())))
-    }
-
-    @Synchronized
-    private fun checkUIOnceComplete() {
-        logger.i("checkUIOnceComplete()")
-
-        //assert
-        onView(withId(R.id.launch_busy_progbar)).check(matches(not(isDisplayed())))
-        onView(withId(R.id.launch_fetch_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.launch_id_textview)).check(matches(withText(containsString(launch.id))))
-    }
-
-    private fun swapOrientation(activity: Activity) {
-        activity.requestedOrientation =
-            if (activity.resources.configuration.orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
-                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-            else
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    }
-
-    private fun createMockLaunchesResponse(launch: Launch): LaunchListQuery.Data {
-
-        val mockLaunchesData = mockk<LaunchListQuery.Data>()
-        val mockLaunches = mockk<LaunchListQuery.Launches>()
-
-        val missionQuery =
-            LaunchListQuery.Mission(name = "mission name", missionPatch = launch.patchImgUrl)
-        val launchQuery = LaunchListQuery.Launch(
-            id = launch.id,
-            site = launch.site,
-            mission = missionQuery,
-            isBooked = launch.isBooked
-        )
-
-        every {
-            mockLaunchesData.launches
-        } returns mockLaunches
-        every {
-            mockLaunches.launches
-        } returns listOf(launchQuery)
-
-        return mockLaunchesData
-    }
-
-}
diff --git a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewRotationTestStateBuilder.kt b/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewRotationTestStateBuilder.kt
deleted file mode 100644
index 661d8929..00000000
--- a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewRotationTestStateBuilder.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package foo.bar.example.foreapollo3.ui.launch
-
-import android.content.pm.ActivityInfo
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.rule.ActivityTestRule
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.core.type.Either
-import co.early.fore.kt.net.apollo3.CallWrapperApollo3
-import com.apollographql.apollo3.api.ApolloResponse
-import foo.bar.example.foreapollo3.App
-import foo.bar.example.foreapollo3.LaunchListQuery
-import foo.bar.example.foreapollo3.OG
-import foo.bar.example.foreapollo3.ProgressBarIdler
-import foo.bar.example.foreapollo3.feature.launch.LaunchesModel
-import foo.bar.example.foreapollo3.message.ErrorMessage
-import io.mockk.coEvery
-import kotlinx.coroutines.CompletableDeferred
-
-
-@ExperimentalStdlibApi
-class LaunchViewRotationTestStateBuilder internal constructor(private val launchViewRotationTest: LaunchViewRotationTest) {
-
-    internal fun withDelayedCallProcessor(): LaunchViewRotationTestStateBuilder {
-
-        val deferred = CompletableDeferred<Either<ErrorMessage, CallWrapperApollo3.SuccessResult<LaunchListQuery.Data, ErrorMessage>>>()
-
-        coEvery {
-            launchViewRotationTest.mockCallWrapperApollo.processCallAsync(
-                any() as suspend () -> ApolloResponse<LaunchListQuery.Data>
-            )
-        } returns deferred
-
-        launchViewRotationTest.setDeferredResult(deferred)
-
-        return this
-    }
-
-    internal fun createRule(): ActivityTestRule<LaunchActivity> {
-
-        return object : ActivityTestRule<LaunchActivity>(LaunchActivity::class.java) {
-
-            override fun beforeActivityLaunched() {
-
-                SystemLogger().i("FruitViewRotationTestStateBuilder", "beforeActivityLaunched()")
-
-                //get hold of the application
-                val app = ApplicationProvider.getApplicationContext() as App
-                app.registerActivityLifecycleCallbacks(ProgressBarIdler())
-
-                //inject our mocks so our UI layer will pick them up
-                OG.setApplication(app)
-                OG.putMock(LaunchesModel::class.java, launchViewRotationTest.launchesModel)
-            }
-
-            override fun afterActivityFinished() {
-                super.afterActivityFinished()
-
-                this.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-            }
-        }
-    }
-}
diff --git a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewTest.kt b/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewTest.kt
deleted file mode 100644
index ae0f75d3..00000000
--- a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewTest.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-
-package foo.bar.example.foreapollo3.ui.launch
-
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.*
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import foo.bar.example.foreapollo3.R
-import foo.bar.example.foreapollo3.feature.launch.Launch
-import foo.bar.example.foreapollo3.feature.launch.LaunchesModel
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.hamcrest.Matchers.containsString
-import org.hamcrest.Matchers.not
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-
-@ExperimentalStdlibApi
-@RunWith(AndroidJUnit4::class)
-class LaunchViewTest {
-
-    @MockK
-    private lateinit var mockLaunchesModel: LaunchesModel
-
-    private val launch = Launch("123", "site")
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this, relaxed = true)
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun hasLaunch() {
-
-        //arrange
-        val activity = LaunchViewTestStateBuilder(mockLaunchesModel)
-            .isBusy(false)
-            .hasLaunch(launch)
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.launch_busy_progbar)).check(matches(not(isDisplayed())))
-        onView(withId(R.id.launch_fetch_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.launch_id_textview)).check(matches(withText(containsString(launch.id))))
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun isFetchingLaunch() {
-
-        //arrange
-        LaunchViewTestStateBuilder(mockLaunchesModel)
-            .isBusy(true)
-            .hasLaunch(launch)
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.launch_busy_progbar)).check(matches(isDisplayed()))
-        onView(withId(R.id.launch_fetch_btn)).check(matches(not(isEnabled())))
-        onView(withId(R.id.launch_id_textview)).check(matches(not(isDisplayed())))
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsFetchSuccess() {
-        //arrange
-        LaunchViewTestStateBuilder(mockLaunchesModel)
-            .isBusy(false)
-            .hasLaunch(launch)
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-        onView(withId(R.id.launch_fetch_btn)).perform(click())
-
-
-        //assert
-        verify(exactly = 1) {
-            mockLaunchesModel.fetchLaunches(any(), any())
-        }
-    }
-}
-
diff --git a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewTestStateBuilder.kt b/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewTestStateBuilder.kt
deleted file mode 100644
index 9cf614b1..00000000
--- a/app-examples/example-kt-07apollo3/src/androidTest/java/foo/bar/example/foreapollo3/ui/launch/LaunchViewTestStateBuilder.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package foo.bar.example.foreapollo3.ui.launch
-
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.rule.ActivityTestRule
-import foo.bar.example.foreapollo3.App
-import foo.bar.example.foreapollo3.OG
-import foo.bar.example.foreapollo3.ProgressBarIdler
-import foo.bar.example.foreapollo3.feature.launch.Launch
-import foo.bar.example.foreapollo3.feature.launch.LaunchesModel
-import io.mockk.every
-
-
-@ExperimentalStdlibApi
-class LaunchViewTestStateBuilder internal constructor(private val mockLaunchesModel: LaunchesModel) {
-
-    internal fun isBusy(busy: Boolean): LaunchViewTestStateBuilder {
-        every { mockLaunchesModel.isBusy } returns (busy)
-        return this
-    }
-
-    internal fun hasLaunch(launch: Launch): LaunchViewTestStateBuilder {
-        every { mockLaunchesModel.currentLaunch } returns (launch)
-        return this
-    }
-
-    internal fun createRule(): ActivityTestRule<LaunchActivity> {
-
-        return object : ActivityTestRule<LaunchActivity>(LaunchActivity::class.java) {
-            override fun beforeActivityLaunched() {
-
-                //get hold of the application
-                val app = ApplicationProvider.getApplicationContext() as App
-                app.registerActivityLifecycleCallbacks(ProgressBarIdler())
-
-                //inject our mocks so our UI layer will pick them up
-                OG.setApplication(app)
-                OG.putMock(LaunchesModel::class.java, mockLaunchesModel)
-            }
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-07apollo3/src/main/AndroidManifest.xml b/app-examples/example-kt-07apollo3/src/main/AndroidManifest.xml
deleted file mode 100644
index bcec745e..00000000
--- a/app-examples/example-kt-07apollo3/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:name="foo.bar.example.foreapollo3.App"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="foo.bar.example.foreapollo3.ui.launch.LaunchActivity" android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomApolloBuilder.kt b/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomApolloBuilder.kt
deleted file mode 100644
index b0745de7..00000000
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomApolloBuilder.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package foo.bar.example.foreapollo3.api
-
-import com.apollographql.apollo3.ApolloClient
-import com.apollographql.apollo3.network.http.HttpNetworkTransport
-import com.apollographql.apollo3.network.okHttpClient
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-
-/**
- * Most of this will all be specific to your application, when customising for your own case
- * bare in mind that you should be able to use this class in your tests to mock the server
- * by passing different interceptors in:
- *
- * see @[co.early.fore.net.testhelpers.InterceptorStubbedService]
- *
- */
-object CustomApolloBuilder {
-
-    /**
-     *
-     * @param interceptors list of interceptors NB if you add a logging interceptor, it has to be
-     * the last one in the list
-     * @return ApolloClient object suitable for instantiating service interfaces
-     */
-    fun create(vararg interceptors: Interceptor): ApolloClient {
-        return ApolloClient.Builder()
-            .networkTransport(
-                HttpNetworkTransport.Builder()
-                    .serverUrl("https://apollo-fullstack-tutorial.herokuapp.com/graphql")
-                    .okHttpClient(createOkHttpClient(*interceptors))
-                    .build()
-            ).build()
-    }
-
-    private fun createOkHttpClient(vararg interceptors: Interceptor): OkHttpClient {
-
-        val builder = OkHttpClient.Builder()
-
-        for (interceptor in interceptors) {
-            builder.addInterceptor(interceptor)
-        }
-
-        return builder.build()
-    }
-}
diff --git a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomGlobalRequestInterceptor.kt b/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomGlobalRequestInterceptor.kt
deleted file mode 100644
index f68132bb..00000000
--- a/app-examples/example-kt-07apollo3/src/main/java/foo/bar/example/foreapollo3/api/CustomGlobalRequestInterceptor.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package foo.bar.example.foreapollo3.api
-
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.foreapollo3.BuildConfig
-import foo.bar.example.foreapollo3.feature.authentication.Authenticator
-import foo.bar.example.foreapollo3.feature.authentication.Authenticator.Companion.NO_SESSION
-import okhttp3.Interceptor
-import okhttp3.Response
-import java.io.IOException
-
-/**
- * This will be specific to your own app.
- */
-class CustomGlobalRequestInterceptor(
-        private val logger: Logger
-) : Interceptor {
-
-    private var authenticator: Authenticator? = null
-
-    @Throws(IOException::class)
-    override fun intercept(chain: Interceptor.Chain): Response {
-
-        val original = chain.request()
-
-        val requestBuilder = original.newBuilder()
-
-
-        requestBuilder.addHeader("Content-Type", "application/json")
-        authenticator?.let {
-            requestBuilder.addHeader("Authorization", if (it.sessionToken == NO_SESSION) "expired" else it.sessionToken)
-        }
-        requestBuilder.addHeader("User-Agent", "fore-example-user-agent-" + BuildConfig.VERSION_NAME)
-
-
-        requestBuilder.method(original.method, original.body)
-
-        return chain.proceed(requestBuilder.build())
-    }
-
-    fun setAuthenticator(authenticator: Authenticator){
-        this.authenticator = authenticator
-    }
-
-}
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-kt-07apollo3/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-07apollo3/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-kt-07apollo3/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-07apollo3/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 8f5c80ae..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher_background.png
deleted file mode 100644
index 1a96b1a9..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 46bea6b3..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index e335d78a..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher_background.png
deleted file mode 100644
index 901d6859..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index b5c5d0b4..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 6fc622e2..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher_background.png
deleted file mode 100644
index 686dab37..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index c6e383af..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 68b160b4..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
deleted file mode 100644
index 670d3e6a..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 840395d1..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 3777b9e6..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
deleted file mode 100644
index 506c6fdb..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e54dcd0f..00000000
Binary files a/app-examples/example-kt-07apollo3/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-07apollo3/src/main/res/values/colors.xml b/app-examples/example-kt-07apollo3/src/main/res/values/colors.xml
deleted file mode 100644
index af48f044..00000000
--- a/app-examples/example-kt-07apollo3/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#515673</color>
-    <color name="colorPrimaryDark">#ff512f</color>
-    <color name="colorAccent">#ff512f</color>
-    <color name="colorLightGrey">#EAEAEA</color>
-</resources>
diff --git a/app-examples/example-kt-07apollo3/src/main/res/values/styles.xml b/app-examples/example-kt-07apollo3/src/main/res/values/styles.xml
deleted file mode 100644
index 5885930d..00000000
--- a/app-examples/example-kt-07apollo3/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
diff --git a/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/api/CommonServiceFailures.kt b/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/api/CommonServiceFailures.kt
deleted file mode 100644
index 31fc342a..00000000
--- a/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/api/CommonServiceFailures.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-package foo.bar.example.foreapollo3.api
-
-import co.early.fore.kt.net.testhelpers.Stub
-import foo.bar.example.foreapollo3.message.ErrorMessage
-import java.io.IOException
-import java.net.SocketTimeoutException
-import java.util.ArrayList
-
-/**
- * This will be specific to your own app, it's closely linked with: [CustomGlobalErrorHandler]
- */
-class CommonServiceFailures : ArrayList<Stub<ErrorMessage>>() {
-    init {
-
-        //bad request
-        add(
-            Stub(
-                httpCode = 400,
-                bodyContentResourceFileName = "common/empty.json",
-                expectedResult = ErrorMessage.ERROR_CLIENT
-            )
-        )
-
-        //session timeout
-        add(
-            Stub(
-                httpCode = 401,
-                bodyContentResourceFileName = "common/empty.json",
-                expectedResult = ErrorMessage.ERROR_SESSION_TIMED_OUT
-            )
-        )
-
-        //missing resource
-        add(
-            Stub(
-                httpCode = 404,
-                bodyContentResourceFileName = "common/empty.json",
-                expectedResult = ErrorMessage.ERROR_SERVER
-            )
-        )//realise this is officially a "client" error, but when this happens in prod, this is usually the fault of the server
-
-        //missing resource (html page)
-        add(
-            Stub(
-                httpCode = 404,
-                bodyContentResourceFileName =  "common/html.json",
-                headers = listOf(Stub.Header("Content-Type", "text/html")),
-                expectedResult = ErrorMessage.ERROR_SERVER
-            )
-        )
-
-        //bad request
-        add(
-            Stub(
-                httpCode = 405,
-                bodyContentResourceFileName = "common/empty.json",
-                expectedResult = ErrorMessage.ERROR_CLIENT
-            )
-        )
-
-        //server down
-        add(
-            Stub(
-                httpCode = 500,
-                bodyContentResourceFileName = "common/empty.json",
-                expectedResult = ErrorMessage.ERROR_SERVER
-            )
-        )
-
-        //service unavailable
-        add(
-            Stub(
-                httpCode = 503,
-                bodyContentResourceFileName = "common/empty.json",
-                expectedResult = ErrorMessage.ERROR_SERVER
-            )
-        )
-
-        //non valid json
-        add(
-            Stub(
-                httpCode = 200,
-                bodyContentResourceFileName = "common/html.json",
-                expectedResult = ErrorMessage.ERROR_SERVER
-            )
-        )
-
-        //network down / airplane mode
-        add(
-            Stub(
-                throwable = IOException("fake io exception for testing purposes"),
-                expectedResult = ErrorMessage.ERROR_NETWORK
-            )
-        )
-
-        //network timeout
-        add(
-            Stub(
-                throwable = SocketTimeoutException("fake timeout exception for testing purposes"),
-                expectedResult = ErrorMessage.ERROR_NETWORK
-            )
-        )
-    }
-}
diff --git a/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/LaunchFetcherIntegrationTest.kt b/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/LaunchFetcherIntegrationTest.kt
deleted file mode 100644
index fdd03839..00000000
--- a/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/LaunchFetcherIntegrationTest.kt
+++ /dev/null
@@ -1,243 +0,0 @@
-package foo.bar.example.foreapollo3.feature.launch
-
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.net.InterceptorLogging
-import co.early.fore.kt.net.apollo3.CallWrapperApollo3
-import co.early.fore.kt.net.testhelpers.InterceptorStubOkHttp3
-import co.early.fore.kt.net.testhelpers.Stub
-import com.apollographql.apollo3.ApolloClient
-import com.apollographql.apollo3.api.Optional
-import foo.bar.example.foreapollo3.*
-import foo.bar.example.foreapollo3.api.CommonServiceFailures
-import foo.bar.example.foreapollo3.api.CustomApolloBuilder
-import foo.bar.example.foreapollo3.api.CustomGlobalErrorHandler
-import foo.bar.example.foreapollo3.feature.FailureCallback
-import foo.bar.example.foreapollo3.feature.SuccessCallback
-import foo.bar.example.foreapollo3.feature.authentication.Authenticator
-import foo.bar.example.foreapollo3.message.ErrorMessage
-import io.mockk.MockKAnnotations
-import io.mockk.clearMocks
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-
-/**
- * This is a slightly more end-to-end style of test, but without actually connecting to a network
- *
- * Using [InterceptorStubOkHttp3] we replace the server response with a canned response taken
- * from static text files saved in /resources. This all happens in OkHttp land so the model
- * under test is not aware of any difference.
- */
-class LaunchFetcherIntegrationTest {
-
-    private val interceptorLogging = InterceptorLogging()
-    private val logger = SystemLogger()
-    private val callWrapper = CallWrapperApollo3(CustomGlobalErrorHandler(logger))
-
-    @MockK
-    private lateinit var mockSuccess: SuccessCallback
-
-    @MockK
-    private lateinit var mockAuthenticator: Authenticator
-
-    @MockK
-    private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-
-        // make the code run synchronously, reroute Log.x to
-        // System.out.println() so we see it in the test log
-        Fore.setDelegate(TestDelegateDefault())
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a successful server response
-     * containing launches
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchLaunch_Success() {
-
-        //arrange
-        val apolloClient = stubbedApolloClient(stubbedSuccess)
-        val launchesModel = LaunchesModel(
-            createLaunchService(apolloClient),
-            callWrapper,
-            mockAuthenticator,
-            logger
-        )
-
-        //act
-        launchesModel.fetchLaunches(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 1) {
-            mockSuccess()
-        }
-        verify(exactly = 0) {
-            mockFailureWithPayload(any())
-        }
-        Assert.assertEquals(false, launchesModel.isBusy)
-        Assert.assertEquals(
-            stubbedSuccess.expectedResult?.isBooked,
-            launchesModel.currentLaunch.isBooked
-        )
-        Assert.assertEquals(stubbedSuccess.expectedResult?.id, launchesModel.currentLaunch.id)
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a custom server response indicating
-     * "server says no"
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchLaunch_Fail_SaysNo() {
-
-        //arrange
-        val apolloClient = stubbedApolloClient(stubbedFailSaysNo)
-        val launchesModel = LaunchesModel(
-            createLaunchService(apolloClient),
-            callWrapper,
-            mockAuthenticator,
-            logger
-        )
-
-        //act
-        launchesModel.fetchLaunches(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 0) {
-            mockSuccess()
-        }
-        verify(exactly = 1) {
-            mockFailureWithPayload(eq(stubbedFailSaysNo.expectedResult as ErrorMessage))
-        }
-        Assert.assertEquals(false, launchesModel.isBusy)
-        Assert.assertEquals(NO_ID, launchesModel.currentLaunch.id)
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a server response indicating
-     * that the server has had an internal server error
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchLaunch_Fail_InternalServer() {
-
-        //arrange
-        val apolloClient = stubbedApolloClient(stubbedFailureInternalServerError)
-        val launchesModel = LaunchesModel(
-            createLaunchService(apolloClient),
-            callWrapper,
-            mockAuthenticator,
-            logger
-        )
-
-        //act
-        launchesModel.fetchLaunches(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 0) {
-            mockSuccess()
-        }
-        verify(exactly = 1) {
-            mockFailureWithPayload(eq(stubbedFailureInternalServerError.expectedResult as ErrorMessage))
-        }
-        Assert.assertEquals(false, launchesModel.isBusy)
-        Assert.assertEquals(NO_ID, launchesModel.currentLaunch.id)
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles common API failed responses
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchLaunch_CommonFailures() {
-
-        for (stub in CommonServiceFailures()) {
-
-            logger.i(
-                "------- Common Service Failure: HTTP:"
-                        + stub.httpCode
-                        + " res:" + stub.bodyContentResourceFileName
-                        + " expect:" + stub.expectedResult
-                        + " --------"
-            )
-
-            //arrange
-            clearMocks(mockSuccess, mockFailureWithPayload)
-            val apolloClient = stubbedApolloClient(stub)
-            val launchesModel = LaunchesModel(
-                createLaunchService(apolloClient),
-                callWrapper,
-                mockAuthenticator,
-                logger
-            )
-
-            //act
-            launchesModel.fetchLaunches(mockSuccess, mockFailureWithPayload)
-
-            //assert
-            verify(exactly = 0) {
-                mockSuccess()
-            }
-            verify(exactly = 1) {
-                mockFailureWithPayload(eq(stub.expectedResult as ErrorMessage))
-            }
-            Assert.assertEquals(false, launchesModel.isBusy)
-            Assert.assertEquals(NO_ID, launchesModel.currentLaunch.id)
-        }
-    }
-
-    private fun stubbedApolloClient(stubbedServiceDefinition: Stub<*>): ApolloClient {
-        return CustomApolloBuilder.create(
-            interceptorLogging,
-            InterceptorStubOkHttp3(stubbedServiceDefinition),
-        )
-    }
-
-    private fun createLaunchService(apolloClient: ApolloClient): LaunchService {
-        return LaunchService(
-            getLaunchList = { apolloClient.query(LaunchListQuery()).execute() },
-            login = { email -> apolloClient.mutation(LoginMutation(Optional.Present(email))).execute() },
-            refreshLaunchDetail = { id -> apolloClient.query(LaunchDetailsQuery(id)).execute() },
-            bookTrip = { id -> apolloClient.mutation(BookTripMutation(id)).execute() },
-            cancelTrip = { id -> apolloClient.mutation(CancelTripMutation(id)).execute() }
-        )
-    }
-
-    companion object {
-
-        private val stubbedSuccess = Stub(
-            httpCode = 200, //stubbed HTTP code
-            bodyContentResourceFileName = "launches/success.json", //stubbed body response
-            expectedResult = Launch("109", "Site 40") //expected result
-        )
-
-        private val stubbedFailSaysNo = Stub(
-            httpCode = 200, //stubbed HTTP code
-            bodyContentResourceFileName = "launches/error_launch_service_says_no.json", //stubbed body response
-            expectedResult = ErrorMessage.LAUNCH_SERVICE_SAYS_NO_ERROR //expected result
-        )
-
-        private val stubbedFailureInternalServerError = Stub(
-            httpCode = 200, //stubbed HTTP code - all 200 because GraphQL
-            bodyContentResourceFileName = "common/error_internal_server.json", //stubbed body response
-            expectedResult = ErrorMessage.INTERNAL_SERVER_ERROR  //expected result
-        )
-    }
-}
diff --git a/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/StateBuilder.kt b/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/StateBuilder.kt
deleted file mode 100644
index 67b00d59..00000000
--- a/app-examples/example-kt-07apollo3/src/test/java/foo/bar/example/foreapollo3/feature/launch/StateBuilder.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package foo.bar.example.foreapollo3.feature.launch
-
-import co.early.fore.kt.core.type.Either.Companion.fail
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.kt.net.apollo3.CallWrapperApollo3
-import foo.bar.example.foreapollo3.LaunchListQuery
-import foo.bar.example.foreapollo3.message.ErrorMessage
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.mockk
-import kotlinx.coroutines.CompletableDeferred
-
-class StateBuilder internal constructor() {
-
-    val mockCallWrapperApollo: CallWrapperApollo3<ErrorMessage> = mockk()
-
-    internal fun getLaunchSuccess(launches: LaunchListQuery.Data): StateBuilder {
-
-        val mockResponseSuccess: CallWrapperApollo3.SuccessResult<LaunchListQuery.Data, ErrorMessage> =
-            mockk()
-
-        every {
-            mockResponseSuccess.data
-        } answers { launches }
-
-        coEvery {
-            mockCallWrapperApollo.processCallAsync<LaunchListQuery.Data>(any())
-        } returns CompletableDeferred(success(mockResponseSuccess))
-
-        coEvery {
-            mockCallWrapperApollo.processCallAwait<LaunchListQuery.Data>(any())
-        } returns success(mockResponseSuccess)
-
-        return this
-    }
-
-    internal fun getLaunchFail(errorMessage: ErrorMessage): StateBuilder {
-
-        coEvery {
-            mockCallWrapperApollo.processCallAsync<LaunchListQuery.Data>(any())
-        } returns CompletableDeferred(fail(errorMessage))
-
-        coEvery {
-            mockCallWrapperApollo.processCallAwait<LaunchListQuery.Data>(any())
-        } returns fail(errorMessage)
-
-        return this
-    }
-}
diff --git a/app-examples/example-kt-07apollo3/src/test/resources/common/empty.json b/app-examples/example-kt-07apollo3/src/test/resources/common/empty.json
deleted file mode 100644
index e69de29b..00000000
diff --git a/app-examples/example-kt-07apollo3/src/test/resources/common/error_internal_server.json b/app-examples/example-kt-07apollo3/src/test/resources/common/error_internal_server.json
deleted file mode 100644
index 7f57fd25..00000000
--- a/app-examples/example-kt-07apollo3/src/test/resources/common/error_internal_server.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "errors": [
-    {
-      "message": "computer says no",
-      "locations": [
-        {
-          "line": 1,
-          "column": 10
-        }
-      ],
-      "path": [
-        "launches"
-      ],
-      "extensions": {
-        "code": "INTERNAL_SERVER_ERROR"
-      }
-    }
-  ]
-}
diff --git a/app-examples/example-kt-07apollo3/src/test/resources/common/html.json b/app-examples/example-kt-07apollo3/src/test/resources/common/html.json
deleted file mode 100644
index 92ab9d38..00000000
--- a/app-examples/example-kt-07apollo3/src/test/resources/common/html.json
+++ /dev/null
@@ -1 +0,0 @@
-<HTML>/<HTML>
\ No newline at end of file
diff --git a/app-examples/example-kt-07apollo3/src/test/resources/launches/error_launch_service_says_no.json b/app-examples/example-kt-07apollo3/src/test/resources/launches/error_launch_service_says_no.json
deleted file mode 100644
index fd84ca65..00000000
--- a/app-examples/example-kt-07apollo3/src/test/resources/launches/error_launch_service_says_no.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "errors": [
-    {
-      "message": "computer says no",
-      "locations": [
-        {
-          "line": 1,
-          "column": 10
-        }
-      ],
-      "path": [
-        "launches"
-      ],
-      "extensions": {
-        "code": "LAUNCH_SERVICE_SAYS_NO_ERROR"
-      }
-    }
-  ]
-}
diff --git a/app-examples/example-kt-07apollo3/src/test/resources/launches/success.json b/app-examples/example-kt-07apollo3/src/test/resources/launches/success.json
deleted file mode 100644
index b8b81153..00000000
--- a/app-examples/example-kt-07apollo3/src/test/resources/launches/success.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "data": {
-    "launches": {
-      "__typename": "LaunchConnection",
-      "cursor": "1581951955",
-      "hasMore": true,
-      "launches": [
-        {
-          "__typename": "Launch",
-          "id": "109",
-          "site": "Site 40",
-          "mission": {
-            "__typename": "Mission",
-            "name": "Starlink 6",
-            "missionPatch": "https://images2.imgbox.com/9a/96/nLppz9HW_o.png"
-          },
-          "isBooked": false
-        }
-      ]
-    }
-  }
-}
diff --git a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/DrawableMatcher.kt b/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/DrawableMatcher.kt
deleted file mode 100644
index 28763782..00000000
--- a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/DrawableMatcher.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package foo.bar.example.forektorkt
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.drawable.Drawable
-import android.view.View
-import android.widget.ImageView
-import org.hamcrest.Description
-import org.hamcrest.TypeSafeMatcher
-
-/**
- *
- * https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f
- * https://github.com/dbottillo/Blog/blob/espresso_match_imageview/app/src/androidTest/java/com/danielebottillo/blog/config/DrawableMatcher.java
- *
- */
-class DrawableMatcher internal constructor(private val expectedId: Int) : TypeSafeMatcher<View>(View::class.java) {
-    private var resourceName: String? = null
-
-    override fun matchesSafely(target: View): Boolean {
-        if (target !is ImageView) {
-            return false
-        }
-        if (expectedId == EMPTY) {
-            return target.drawable == null
-        }
-        if (expectedId == ANY) {
-            return target.drawable != null
-        }
-        val resources = target.getContext().resources
-        val expectedDrawable = resources.getDrawable(expectedId)
-        resourceName = resources.getResourceEntryName(expectedId)
-
-        if (expectedDrawable == null) {
-            return false
-        }
-
-        val bitmap = getBitmap(target.drawable)
-        val otherBitmap = getBitmap(expectedDrawable)
-        return bitmap.sameAs(otherBitmap)
-    }
-
-    private fun getBitmap(drawable: Drawable): Bitmap {
-        val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(bitmap)
-        drawable.setBounds(0, 0, canvas.width, canvas.height)
-        drawable.draw(canvas)
-        return bitmap
-    }
-
-    override fun describeTo(description: Description) {
-        description.appendText("with drawable from resource id: ")
-        description.appendValue(expectedId)
-        if (resourceName != null) {
-            description.appendText("[")
-            description.appendText(resourceName)
-            description.appendText("]")
-        }
-    }
-
-    companion object {
-        internal val EMPTY = -1
-        internal val ANY = -2
-    }
-}
diff --git a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/EspressoTestMatchers.kt b/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/EspressoTestMatchers.kt
deleted file mode 100644
index bbdd9009..00000000
--- a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/EspressoTestMatchers.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package foo.bar.example.forektorkt
-
-import android.view.View
-
-import org.hamcrest.Matcher
-
-/**
- *
- * https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f
- * https://github.com/dbottillo/Blog/blob/espresso_match_imageview/app/src/androidTest/java/com/danielebottillo/blog/config/EspressoTestsMatchers.java
- *
- */
-object EspressoTestMatchers {
-
-    fun withDrawable(resourceId: Int): Matcher<View> {
-        return DrawableMatcher(resourceId)
-    }
-
-    fun noDrawable(): Matcher<View> {
-        return DrawableMatcher(DrawableMatcher.EMPTY)
-    }
-
-    fun hasDrawable(): Matcher<View> {
-        return DrawableMatcher(DrawableMatcher.ANY)
-    }
-
-}
diff --git a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ProgressBarIdler.kt b/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ProgressBarIdler.kt
deleted file mode 100644
index 672568dc..00000000
--- a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ProgressBarIdler.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package foo.bar.example.forektorkt
-
-import android.R
-import android.app.Activity
-import android.app.Application
-import android.app.Instrumentation
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ProgressBar
-import androidx.core.content.ContextCompat
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
-import androidx.test.runner.lifecycle.Stage.RESUMED
-
-/**
- * If you have any spinning progress bars in your UI it will mess
- * up espresso tests (espresso will time out waiting for all UI
- * threads to be idle before proceeding).
- *
- *
- * This class will go through all your view elements views checking for
- * indeterminate progress bars and replacing the indeterminate drawable
- * with a static one so that espresso tests can continue
- *
- *
- * http://stackoverflow.com/a/37049916/3680389
- * https://stackoverflow.com/questions/33289152/progressbars-and-espresso#36201647
- */
-class ProgressBarIdler : Application.ActivityLifecycleCallbacks {
-
-
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-
-    }
-
-    override fun onActivityStarted(activity: Activity) {
-
-    }
-
-    override fun onActivityResumed(activity: Activity) {
-        makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView)
-    }
-
-    override fun onActivityPaused(activity: Activity) {
-
-    }
-
-    override fun onActivityStopped(activity: Activity) {
-
-    }
-
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-
-    }
-
-    override fun onActivityDestroyed(activity: Activity) {
-
-    }
-
-    companion object {
-
-        private fun makeAllProgressBarsIdle(view: View) {
-            if (view is ViewGroup) {
-                for (i in 0 until view.childCount) {
-                    makeAllProgressBarsIdle(view.getChildAt(i))
-                }
-            } else if (view is ProgressBar) {
-                if (view.isIndeterminate) {
-                    view.indeterminateDrawable = ContextCompat.getDrawable(InstrumentationRegistry.getInstrumentation().targetContext, android.R.drawable.ic_lock_lock)
-                }
-            }
-        }
-
-        fun makeAllProgressBarsIdle(instrumentation: Instrumentation, activity: Activity) {
-            instrumentation.runOnMainSync { makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView) }
-        }
-
-        fun makeAllProgressBarsIdleForAllResumedActivities(instrumentation: Instrumentation) {
-            instrumentation.runOnMainSync {
-                val resumedActivities = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(RESUMED)
-                if (resumedActivities.isEmpty()) {
-                    throw RuntimeException("Could not change orientation")
-                }
-                for (activity in resumedActivities) {
-                    makeAllProgressBarsIdle(activity.findViewById<View>(R.id.content).rootView)
-                }
-            }
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewRotationTest.kt b/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewRotationTest.kt
deleted file mode 100644
index 16f3bb5e..00000000
--- a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewRotationTest.kt
+++ /dev/null
@@ -1,221 +0,0 @@
-
-package foo.bar.example.forektorkt.ui.fruit
-
-import android.app.Activity
-import android.content.pm.ActivityInfo
-import android.view.View
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isEnabled
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.core.type.Either
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.kt.net.ktor.CallWrapperKtor
-import foo.bar.example.forektorkt.EspressoTestMatchers.withDrawable
-import foo.bar.example.forektorkt.R
-import foo.bar.example.forektorkt.api.fruits.FruitPojo
-import foo.bar.example.forektorkt.api.fruits.FruitService
-import foo.bar.example.forektorkt.feature.fruit.FailureCallback
-import foo.bar.example.forektorkt.feature.fruit.FruitFetcher
-import foo.bar.example.forektorkt.feature.fruit.SuccessCallback
-import foo.bar.example.forektorkt.message.ErrorMessage
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.CompletableDeferred
-import org.hamcrest.Matchers.not
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.ArrayList
-import java.util.concurrent.CountDownLatch
-
-
-/**
- * Here we make sure that when the view is rotated while a long running action is being
- * performed by the model, all the view elements still accurately represent the model's
- * state after rotation is complete, and those view elements are still updated as appropriate
- * when the model completes the long running action.
- */
-
-@RunWith(AndroidJUnit4::class)
-class FruitViewRotationTest {
-
-    /**
-     * Here we're testing with a real model,
-     * and just mocking its dependencies.
-     * This lets us realistically test the
-     * interactions between the view
-     * and the model during and after
-     * a rotation
-     */
-
-    lateinit var fruitFetcher: FruitFetcher
-    private var logger: Logger = SystemLogger()
-    private var fruitPojo = FruitPojo("testFruit1", true, 45)
-
-    @MockK
-    private lateinit var mockSuccess: SuccessCallback
-    @MockK
-    private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
-    @MockK
-    lateinit var mockCallWrapperKtor: CallWrapperKtor<ErrorMessage>
-    @MockK
-    private lateinit var mockFruitService: FruitService
-
-    private lateinit var deferredResult: CompletableDeferred<Either<ErrorMessage, List<FruitPojo>>>
-    private val countDownLatch = CountDownLatch(1)
-
-    @Before
-    fun setUp() {
-
-        logger.i("setup()")
-
-        MockKAnnotations.init(this, relaxed = true)
-
-        //construct a real model with mock dependencies
-        fruitFetcher = FruitFetcher(
-            mockFruitService,
-            mockCallWrapperKtor,
-            logger
-        )
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun stateSurvivesRotation() {
-
-        logger.i("stateSurvivesRotation()")
-
-        //arrange
-        val activity = FruitViewRotationTestStateBuilder(this)
-            .withDelayedCallProcessor()
-            .createRule()
-            .launchActivity(null)
-
-        checkUIBeforeClick(activity)
-
-        //act
-        fruitFetcher.fetchFruitsAsync(mockSuccess, mockFailureWithPayload)
-
-        checkUIWhenFetching(activity)
-
-        swapOrientation(activity)
-
-        checkUIWhenFetching(activity)
-
-        completeDeferredResult()
-
-        try {
-            countDownLatch.await()
-        } catch (e: InterruptedException) {
-        }
-
-        checkUIOnceComplete(activity)
-    }
-
-
-    private fun completeDeferredResult() {
-
-        logger.i("callSuccessOnCachedSuccessFailCallback()")
-
-        val fruitList = ArrayList<FruitPojo>()
-        fruitList.add(fruitPojo)
-
-        //we need to be back on the UI thread for this
-        getInstrumentation().runOnMainSync {
-            logger.i("about to call success, id:" + Thread.currentThread().id)
-
-            deferredResult.complete(success(fruitList))
-            countDownLatch.countDown()
-        }
-    }
-
-    fun setDeferredResult(deferredResult: CompletableDeferred<co.early.fore.kt.core.type.Either<ErrorMessage, List<FruitPojo>>>) {
-        logger.i("setDeferredResult()")
-        this.deferredResult = deferredResult
-    }
-
-
-    @Synchronized
-    private fun checkUIBeforeClick(activity: Activity) {
-        logger.i("checkUIBeforeClick()")
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("(fruitless)")))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, 0)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)))
-    }
-
-    @Synchronized
-    private fun checkUIWhenFetching(activity: Activity) {
-        logger.i("checkUIWhenFetching()")
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(isDisplayed()))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_name_textview)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, 0)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)))
-    }
-
-    @Synchronized
-    private fun checkUIOnceComplete(activity: Activity) {
-        logger.i("checkUIOnceComplete()")
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText(fruitPojo.name)))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, fruitPojo.tastyPercentScore)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(
-            matches(
-                withDrawable(
-                    if (fruitPojo.isCitrus)
-                        R.drawable.lemon_positive
-                    else
-                        R.drawable.lemon_negative
-                )
-            )
-        )
-    }
-
-    private fun swapOrientation(activity: Activity) {
-        activity.requestedOrientation = if (activity.resources.configuration.orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
-            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-        else
-            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    }
-
-}
diff --git a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewRotationTestStateBuilder.kt b/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewRotationTestStateBuilder.kt
deleted file mode 100644
index 060bd731..00000000
--- a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewRotationTestStateBuilder.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package foo.bar.example.forektorkt.ui.fruit
-
-import android.content.pm.ActivityInfo
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.rule.ActivityTestRule
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.core.type.Either
-import foo.bar.example.forektorkt.App
-import foo.bar.example.forektorkt.OG
-import foo.bar.example.forektorkt.ProgressBarIdler
-import foo.bar.example.forektorkt.api.fruits.FruitPojo
-import foo.bar.example.forektorkt.feature.fruit.FruitFetcher
-import foo.bar.example.forektorkt.message.ErrorMessage
-import io.mockk.coEvery
-import kotlinx.coroutines.CompletableDeferred
-
-
-class FruitViewRotationTestStateBuilder internal constructor(private val fruitViewRotationTest: FruitViewRotationTest) {
-
-    internal fun withDelayedCallProcessor(): FruitViewRotationTestStateBuilder {
-
-        val deferred = CompletableDeferred<Either<ErrorMessage, List<FruitPojo>>>()
-
-        coEvery {
-            fruitViewRotationTest.mockCallWrapperKtor.processCallAsync(
-                any() as suspend () -> List<FruitPojo>
-            )
-        } returns deferred
-
-        fruitViewRotationTest.setDeferredResult(deferred)
-
-        return this
-    }
-
-    internal fun createRule(): ActivityTestRule<FruitActivity> {
-
-        return object : ActivityTestRule<FruitActivity>(FruitActivity::class.java) {
-
-            override fun beforeActivityLaunched() {
-
-                SystemLogger().i("FruitViewRotationTestStateBuilder", "beforeActivityLaunched()")
-
-                //get hold of the application
-                val app = ApplicationProvider.getApplicationContext() as App
-                app.registerActivityLifecycleCallbacks(ProgressBarIdler())
-
-                //inject our mocks so our UI layer will pick them up
-                OG.setApplication(app)
-                OG.putMock(FruitFetcher::class.java, fruitViewRotationTest.fruitFetcher)
-            }
-
-            override fun afterActivityFinished() {
-                super.afterActivityFinished()
-
-                this.activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-            }
-        }
-    }
-}
diff --git a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewTest.kt b/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewTest.kt
deleted file mode 100644
index 6c5e69af..00000000
--- a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewTest.kt
+++ /dev/null
@@ -1,197 +0,0 @@
-
-package foo.bar.example.forektorkt.ui.fruit
-
-import android.view.View
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isEnabled
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import foo.bar.example.forektorkt.EspressoTestMatchers.withDrawable
-import foo.bar.example.forektorkt.R
-import foo.bar.example.forektorkt.api.fruits.FruitPojo
-import foo.bar.example.forektorkt.feature.fruit.FruitFetcher
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.hamcrest.Matchers.not
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Here we make sure that the view elements accurately reflect the state of the models
- * and that clicking the buttons results in the correct action being performed
- */
-
-@RunWith(AndroidJUnit4::class)
-class FruitViewTest {
-
-    @MockK
-    private lateinit var mockFruitFetcher: FruitFetcher
-
-
-    @Before
-    fun setUp() = MockKAnnotations.init(this, relaxed = true)
-
-
-    @Test
-    @Throws(Exception::class)
-    fun hasCitrusFruit() {
-
-        //arrange
-        val activity = FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit1", true, 45))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("testFruit1")))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, 45)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_positive)))
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun hasNonCitrusFruit() {
-
-        //arrange
-        val activity = FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit2", false, 75))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(isEnabled()))
-        onView(withId(R.id.fruit_name_textview)).check(matches(withText("testFruit2")))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(
-            matches(
-                withText(
-                    activity.getString(R.string.fruit_percent, 75)
-                )
-            )
-        )
-        onView(withId(R.id.fruit_citrus_img)).check(matches(withDrawable(R.drawable.lemon_negative)))
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun isFetchingFruit() {
-
-        //arrange
-        FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(true)
-            .hasFruit(FruitPojo("testFruit1", true, 45))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-
-
-        //assert
-        onView(withId(R.id.fruit_busy_progbar)).check(matches(isDisplayed()))
-        onView(withId(R.id.fruit_fetchsuccess_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).check(matches(not<View>(isEnabled())))
-        onView(withId(R.id.fruit_name_textview)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_tastyrating_textview)).check(matches(not<View>(isDisplayed())))
-        onView(withId(R.id.fruit_citrus_img)).check(matches(not<View>(isDisplayed())))
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsFetchSuccess() {
-        //arrange
-        FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit2", false, 75))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-        onView(withId(R.id.fruit_fetchsuccess_btn)).perform(click())
-
-
-        //assert
-        verify(exactly = 1) {
-            mockFruitFetcher.fetchFruitsAsync(any(), any())
-        }
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsFetchFailBasic() {
-        //arrange
-        FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit2", false, 75))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-        onView(withId(R.id.fruit_fetchfailbasic_btn)).perform(click())
-
-
-        //assert
-        verify(exactly = 1) {
-            mockFruitFetcher.fetchFruitsButFail(any(), any())
-        }
-    }
-
-
-    @Test
-    @Throws(Exception::class)
-    fun clickCallsFetchFailAdvanced() {
-        //arrange
-        FruitViewTestStateBuilder(mockFruitFetcher)
-            .isBusy(false)
-            .hasFruit(FruitPojo("testFruit2", false, 75))
-            .createRule()
-            .launchActivity(null)
-
-
-        //act
-        onView(withId(R.id.fruit_fetchfailadvanced_btn)).perform(click())
-
-
-        //assert
-        verify(exactly = 1) {
-            mockFruitFetcher.fetchFruitsButFailAdvanced(any(), any())
-        }
-    }
-
-}
-
diff --git a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewTestStateBuilder.kt b/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewTestStateBuilder.kt
deleted file mode 100644
index 6e0ed3ee..00000000
--- a/app-examples/example-kt-08ktor/src/androidTest/java/foo/bar/example/forektorkt/ui/fruit/FruitViewTestStateBuilder.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-package foo.bar.example.forektorkt.ui.fruit
-
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.rule.ActivityTestRule
-import foo.bar.example.forektorkt.ProgressBarIdler
-import foo.bar.example.forektorkt.App
-import foo.bar.example.forektorkt.OG
-import foo.bar.example.forektorkt.api.fruits.FruitPojo
-import foo.bar.example.forektorkt.feature.fruit.FruitFetcher
-import io.mockk.every
-
-
-class FruitViewTestStateBuilder internal constructor(private val mockFruitFetcher: FruitFetcher) {
-
-    internal fun isBusy(busy: Boolean): FruitViewTestStateBuilder {
-        every { mockFruitFetcher.isBusy } returns (busy)
-        return this
-    }
-
-    internal fun hasFruit(fruitPojo: FruitPojo): FruitViewTestStateBuilder {
-        every { mockFruitFetcher.currentFruit } returns (fruitPojo)
-        return this
-    }
-
-    internal fun createRule(): ActivityTestRule<FruitActivity> {
-
-        return object : ActivityTestRule<FruitActivity>(FruitActivity::class.java) {
-            override fun beforeActivityLaunched() {
-
-                //get hold of the application
-                val app = ApplicationProvider.getApplicationContext() as App
-                app.registerActivityLifecycleCallbacks(ProgressBarIdler())
-
-                //inject our mocks so our UI layer will pick them up
-                OG.setApplication(app)
-                OG.putMock(FruitFetcher::class.java, mockFruitFetcher)
-            }
-        }
-    }
-
-}
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomGlobalErrorHandler.kt b/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomGlobalErrorHandler.kt
deleted file mode 100644
index eae9ac2b..00000000
--- a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomGlobalErrorHandler.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package foo.bar.example.forektorkt.api
-
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.net.ktor.ErrorHandler
-import co.early.fore.net.MessageProvider
-import foo.bar.example.forektorkt.message.ErrorMessage
-import foo.bar.example.forektorkt.message.ErrorMessage.*
-import io.ktor.client.call.*
-import io.ktor.client.plugins.*
-import io.ktor.client.statement.*
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.serializer
-import java.io.IOException
-import java.io.UnsupportedEncodingException
-import java.net.UnknownServiceException
-import java.nio.charset.CoderMalfunctionError
-import kotlin.reflect.KClass
-
-/**
- * You can probably use this class almost as is for your own app, but you might want to
- * customise the behaviour for specific HTTP codes etc, hence it's not in the fore library
- */
-class CustomGlobalErrorHandler(private val logWrapper: Logger) : ErrorHandler<ErrorMessage> {
-
-    override suspend fun <CE : MessageProvider<ErrorMessage>> handleError(
-        t: Throwable,
-        customErrorKlazz: KClass<CE>?
-    ): ErrorMessage {
-
-        logWrapper.d("handling error in global error handler", t)
-
-        val errorMessage = when (t) {
-
-            is ResponseException -> {
-
-                //initial error type (we use ERROR_SERVER as our "try again later" message to the user
-                var msg = when (t) {
-                    is ClientRequestException -> { ERROR_SERVER } // in 400..499
-                    is RedirectResponseException -> { ERROR_SERVER } //in 300..399
-                    is ServerResponseException -> { ERROR_SERVER } //in 500..599
-                    else -> { ERROR_NETWORK } //something else
-                }
-
-                val response = t.response
-
-                logWrapper.e("handleError() HTTP:" + response.status)
-
-                //get more specific with the error type
-                msg = when (response.status.value) {
-                    401 -> ERROR_SESSION_TIMED_OUT
-                    400, 405 -> ERROR_CLIENT
-                    429 -> ERROR_RATE_LIMITED
-                    404 -> ERROR_SERVER //if this happens in prod, it's usually a server config issue
-                    else -> null
-                } ?: msg
-
-                //let's get even more specifics about the error
-                customErrorKlazz?.let { klazz ->
-                    msg = parseCustomError(msg, response, klazz)
-                }
-
-                msg
-            }
-            is NoTransformationFoundException -> ERROR_SERVER // content type is probably wrong, check response from server in app logs
-            is SerializationException -> ERROR_SERVER //parsing issue, maybe response is not json, or does not match expected type, or is empty
-            is UnknownServiceException -> ERROR_SECURITY_UNKNOWN //most likely https related, check for usesCleartextTraffic if required
-            is IOException -> ERROR_NETWORK //airplane mode is on, no network coverage etc
-            else -> ERROR_NETWORK
-        }
-
-        logWrapper.d("replyWithFailure() returning:$errorMessage")
-        return errorMessage
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private suspend fun <CE : MessageProvider<ErrorMessage>> parseCustomError(
-            provisionalErrorMessage: ErrorMessage,
-            errorResponse: HttpResponse,
-            customErrorKlazz: KClass<CE>
-    ): ErrorMessage {
-
-        var customError: ErrorMessage = provisionalErrorMessage
-
-        try {
-
-            val bodyContent = errorResponse.bodyAsText(Charsets.UTF_8)
-            logWrapper.d("parseCustomError() attempting to parse this content:\n $bodyContent")
-            val errorClass = Json.decodeFromString(serializer(customErrorKlazz.java), bodyContent) as CE
-            customError = errorClass.message
-
-        } catch (t: Throwable) {
-
-            logWrapper.e("parseCustomError() unexpected issue" + t)
-
-            when (t) {
-                is IllegalStateException, is CoderMalfunctionError -> {logWrapper.e("01")} //problem reading body text
-                is SerializationException -> {logWrapper.e("02")} //parsing error, @Serializable missing, wrong error class specified etc
-                is UnsupportedEncodingException -> {logWrapper.e("03")}
-                is NullPointerException -> {logWrapper.e("04")}
-                else -> {logWrapper.e("05")}
-            }
-        }
-
-        logWrapper.d("parseCustomError() returning:$customError")
-        return customError
-    }
-}
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomGlobalRequestInterceptor.kt b/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomGlobalRequestInterceptor.kt
deleted file mode 100644
index 492f3f59..00000000
--- a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomGlobalRequestInterceptor.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package foo.bar.example.forektorkt.api
-
-import co.early.fore.kt.core.logging.Logger
-import foo.bar.example.forektorkt.BuildConfig
-import okhttp3.Interceptor
-import okhttp3.Response
-import java.io.IOException
-
-/**
- * This will be specific to your own app.
- *
- * Typically you would construct this class with some kind of Session object or similar that
- * you would use to customize the headers according to the logged in status of the user, for example
- */
-class CustomGlobalRequestInterceptor(
-        private val logger: Logger /*, private final Session session */
-) : Interceptor {
-
-    @Throws(IOException::class)
-    override fun intercept(chain: Interceptor.Chain): Response {
-
-        val original = chain.request()
-
-        val requestBuilder = original.newBuilder()
-
-        requestBuilder.addHeader("Content-Type", "application/json")
-        //requestBuilder.addHeader("X-MyApp-Auth-Token", !session.hasSession() ? "expired" : session.getSessionToken());
-        requestBuilder.addHeader("User-Agent", "fore-example-user-agent-${BuildConfig.VERSION_NAME}")
-
-        requestBuilder.method(original.method, original.body) //TODO check our versions of okhttp
-
-        return chain.proceed(requestBuilder.build())
-    }
-}
diff --git a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomKtorBuilder.kt b/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomKtorBuilder.kt
deleted file mode 100644
index 3b76b3de..00000000
--- a/app-examples/example-kt-08ktor/src/main/java/foo/bar/example/forektorkt/api/CustomKtorBuilder.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package foo.bar.example.forektorkt.api
-
-import io.ktor.client.*
-import io.ktor.client.engine.okhttp.*
-import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.serialization.kotlinx.json.*
-import okhttp3.Interceptor
-
-/**
- * Most of this will all be specific to your application, when customising for your own case
- * bare in mind that you should be able to use this class in your tests to mock the server
- * by passing different interceptors in:
- *
- * see @[co.early.fore.net.testhelpers.InterceptorStubbedService]
- *
- */
-object CustomKtorBuilder {
-
-    /**
-     *
-     * @param interceptors list of interceptors NB if you add a logging interceptor, it has to be
-     * the last one in the list
-     * @return ktor HttpClient object suitable for instantiating service interfaces
-     */
-    fun create(vararg interceptors: Interceptor): HttpClient {
-
-        val okHttpConfig = OkHttp.create {
-            for (interceptor in interceptors) {
-                addInterceptor(interceptor)
-            }
-        }
-
-        return HttpClient(okHttpConfig) {
-            expectSuccess = true
-            install(ContentNegotiation) {
-                this.json()
-            }
-        }
-    }
-}
diff --git a/app-examples/example-kt-08ktor/src/main/res/drawable-xxhdpi/lemon_negative.png b/app-examples/example-kt-08ktor/src/main/res/drawable-xxhdpi/lemon_negative.png
deleted file mode 100644
index 40a99338..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/drawable-xxhdpi/lemon_negative.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/drawable-xxhdpi/lemon_positive.png b/app-examples/example-kt-08ktor/src/main/res/drawable-xxhdpi/lemon_positive.png
deleted file mode 100644
index c0fb1238..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/drawable-xxhdpi/lemon_positive.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-kt-08ktor/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-08ktor/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-kt-08ktor/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-08ktor/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 8f5c80ae..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher_background.png
deleted file mode 100644
index 1a96b1a9..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 46bea6b3..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index e335d78a..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher_background.png
deleted file mode 100644
index 901d6859..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index b5c5d0b4..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 6fc622e2..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher_background.png
deleted file mode 100644
index 686dab37..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index c6e383af..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 68b160b4..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
deleted file mode 100644
index 670d3e6a..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 840395d1..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 3777b9e6..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
deleted file mode 100644
index 506c6fdb..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e54dcd0f..00000000
Binary files a/app-examples/example-kt-08ktor/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-08ktor/src/main/res/values/colors.xml b/app-examples/example-kt-08ktor/src/main/res/values/colors.xml
deleted file mode 100644
index af48f044..00000000
--- a/app-examples/example-kt-08ktor/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#515673</color>
-    <color name="colorPrimaryDark">#ff512f</color>
-    <color name="colorAccent">#ff512f</color>
-    <color name="colorLightGrey">#EAEAEA</color>
-</resources>
diff --git a/app-examples/example-kt-08ktor/src/main/res/values/styles.xml b/app-examples/example-kt-08ktor/src/main/res/values/styles.xml
deleted file mode 100644
index 5885930d..00000000
--- a/app-examples/example-kt-08ktor/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
diff --git a/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/api/CommonServiceFailures.kt b/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/api/CommonServiceFailures.kt
deleted file mode 100644
index 31a3b2a5..00000000
--- a/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/api/CommonServiceFailures.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package foo.bar.example.forektorkt.api
-
-import co.early.fore.kt.net.testhelpers.Stub
-import foo.bar.example.forektorkt.message.ErrorMessage
-import foo.bar.example.forektorkt.message.ErrorMessage.*
-import java.io.IOException
-import java.net.SocketTimeoutException
-import java.util.ArrayList
-
-/**
- * This will be specific to your own app, it's closely linked to: [CustomGlobalErrorHandler]
- */
-class CommonServiceFailures : ArrayList<Stub<ErrorMessage>>() {
-    init {
-
-        //bad request
-        add(Stub(400, "common/empty.json", expectedResult = ERROR_CLIENT))
-
-        //session timeout
-        add(Stub(401, "common/empty.json", expectedResult = ERROR_SESSION_TIMED_OUT))
-
-        //missing resource
-        add(Stub(404, "common/empty.json", expectedResult = ERROR_SERVER))
-
-        //missing resource (html page)
-        add(Stub(404, "common/html.json", headers = listOf(Stub.Header("Content-Type", "text/html")), expectedResult = ERROR_SERVER))
-
-        //bad request
-        add(Stub(405, "common/empty.json", expectedResult = ERROR_CLIENT))
-
-        //server down
-        add(Stub(500, "common/empty.json", expectedResult = ERROR_SERVER))
-
-        //service unavailable
-        add(Stub(503, "common/empty.json", expectedResult = ERROR_SERVER))
-
-        //non valid json
-        add(Stub(200, "common/html.json", expectedResult = ERROR_SERVER))
-
-        //network down
-        add(Stub(throwable = IOException("fake io exception for testing purposes"), expectedResult = ERROR_NETWORK))
-
-        //network timeout
-        add(Stub(throwable = SocketTimeoutException("fake timeout exception for testing purposes"), expectedResult = ERROR_NETWORK))
-    }
-}
diff --git a/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcherIntegrationTest.kt b/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcherIntegrationTest.kt
deleted file mode 100644
index 4b08b6cd..00000000
--- a/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/FruitFetcherIntegrationTest.kt
+++ /dev/null
@@ -1,233 +0,0 @@
-package foo.bar.example.forektorkt.feature.fruit
-
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.logging.SystemLogger
-import co.early.fore.kt.net.InterceptorLogging
-import co.early.fore.kt.net.ktor.CallWrapperKtor
-import co.early.fore.kt.net.testhelpers.InterceptorStubOkHttp3
-import co.early.fore.kt.net.testhelpers.Stub
-import foo.bar.example.forektorkt.api.CommonServiceFailures
-import foo.bar.example.forektorkt.api.CustomGlobalErrorHandler
-import foo.bar.example.forektorkt.api.CustomKtorBuilder
-import foo.bar.example.forektorkt.api.fruits.FruitPojo
-import foo.bar.example.forektorkt.api.fruits.FruitService
-import foo.bar.example.forektorkt.message.ErrorMessage
-import io.ktor.client.*
-import io.mockk.MockKAnnotations
-import io.mockk.clearMocks
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-
-/**
- * This is a slightly more end-to-end style of test, but without actually connecting to a network
- *
- * Using [InterceptorStubOkHttp3] we replace the server response with a canned response taken
- * from static text files saved in /resources. This all happens in OkHttp land so the model
- * under test is not aware of any difference.
- */
-class FruitFetcherIntegrationTest {
-
-    private val logger = SystemLogger()
-    private val interceptorLogging = InterceptorLogging(logger)
-    private val callWrapper = CallWrapperKtor(
-        errorHandler = CustomGlobalErrorHandler(logger),
-        logger = logger
-    )
-
-    @MockK
-    private lateinit var mockSuccess: SuccessCallback
-
-    @MockK
-    private lateinit var mockFailureWithPayload: FailureCallback<ErrorMessage>
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-
-        // make the code run synchronously, reroute Log.x to
-        // System.out.println() so we see it in the test log
-        Fore.setDelegate(TestDelegateDefault())
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a successful server response
-     * containing a list of fruit
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_Success() {
-
-        //arrange
-        val httpClient = stubbedHttpClient(stubbedSuccess)
-        val fruitFetcher = FruitFetcher(
-            FruitService(httpClient),
-            callWrapper,
-            logger
-        )
-
-        //act
-        fruitFetcher.fetchFruitsAsync(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 1) {
-            mockSuccess()
-        }
-        verify(exactly = 0) {
-            mockFailureWithPayload(any())
-        }
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(stubbedSuccess.expectedResult?.name, fruitFetcher.currentFruit.name)
-        Assert.assertEquals(
-            stubbedSuccess.expectedResult?.isCitrus,
-            fruitFetcher.currentFruit.isCitrus
-        )
-        Assert.assertEquals(
-            stubbedSuccess.expectedResult?.tastyPercentScore?.toLong(),
-            fruitFetcher.currentFruit.tastyPercentScore.toLong()
-        )
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a server response indicating
-     * that the user account has been locked
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_Fail_UserLocked() {
-
-        //arrange
-        val httpClient = stubbedHttpClient(stubbedFailUserLocked)
-        val fruitFetcher = FruitFetcher(
-            FruitService(httpClient),
-            callWrapper,
-            logger
-        )
-
-        //act
-        fruitFetcher.fetchFruitsButFailAdvanced(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 0) {
-            mockSuccess()
-        }
-        verify(exactly = 1) {
-            mockFailureWithPayload(eq(stubbedFailUserLocked.expectedResult as ErrorMessage))
-        }
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(0, fruitFetcher.currentFruit.tastyPercentScore.toLong())
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles a server response indicating
-     * that the user account has not been enabled
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_Fail_UserNotEnabled() {
-
-        //arrange
-        val httpClient = stubbedHttpClient(stubbedFailureUserNotEnabled)
-        val fruitFetcher = FruitFetcher(
-            FruitService(httpClient),
-            callWrapper,
-            logger
-        )
-
-        //act
-        fruitFetcher.fetchFruitsButFailAdvanced(mockSuccess, mockFailureWithPayload)
-
-        //assert
-        verify(exactly = 0) {
-            mockSuccess()
-        }
-        verify(exactly = 1) {
-            mockFailureWithPayload(eq(stubbedFailureUserNotEnabled.expectedResult as ErrorMessage))
-        }
-        Assert.assertEquals(false, fruitFetcher.isBusy)
-        Assert.assertEquals(0, fruitFetcher.currentFruit.tastyPercentScore.toLong())
-    }
-
-    /**
-     * Here we are making sure that the model correctly handles common API failed responses
-     *
-     * @throws Exception
-     */
-    @Test
-    @Throws(Exception::class)
-    fun fetchFruit_CommonFailures() {
-
-        for (stub in CommonServiceFailures()) {
-
-            logger.i(
-                "------- Common Service Failure: HTTP:"
-                        + stub.httpCode
-                        + " res:" + stub.bodyContentResourceFileName
-                        + " expect:" + stub.expectedResult
-                        + " --------"
-            )
-
-            //arrange
-            clearMocks(mockSuccess, mockFailureWithPayload)
-            val httpClient = stubbedHttpClient(stub)
-            val fruitFetcher = FruitFetcher(
-                FruitService(httpClient),
-                callWrapper,
-                logger
-            )
-
-            //act
-            fruitFetcher.fetchFruitsAsync(mockSuccess, mockFailureWithPayload)
-
-            //assert
-            verify(exactly = 0) {
-                mockSuccess()
-            }
-            verify(exactly = 1) {
-                mockFailureWithPayload(eq(stub.expectedResult as ErrorMessage))
-            }
-            Assert.assertEquals(false, fruitFetcher.isBusy)
-            Assert.assertEquals(0, fruitFetcher.currentFruit.tastyPercentScore.toLong())
-        }
-    }
-
-    private fun stubbedHttpClient(stub: Stub<*>): HttpClient {
-        return CustomKtorBuilder.create(
-            interceptorLogging,
-            InterceptorStubOkHttp3(stub),
-        )
-    }
-
-    companion object {
-
-        private val stubbedSuccess = Stub(
-            httpCode = 201, //stubbed HTTP code
-            bodyContentResourceFileName = "fruit/success.json", //stubbed body response
-            headers = listOf(Stub.Header("Content-Type", "application/json")), //headers
-            expectedResult = FruitPojo("orange", true, 43) //expected result
-        )
-
-        private val stubbedFailUserLocked = Stub(
-            httpCode = 401, //stubbed HTTP code
-            bodyContentResourceFileName = "common/error_user_locked.json", //stubbed body response
-            headers = listOf(Stub.Header("Content-Type", "application/json")), //headers
-            expectedResult = ErrorMessage.ERROR_FRUIT_USER_LOCKED //expected result
-        )
-
-        private val stubbedFailureUserNotEnabled = Stub(
-            httpCode = 401, //stubbed HTTP code
-            bodyContentResourceFileName = "common/error_user_not_enabled.json", //stubbed body response
-            headers = listOf(Stub.Header("Content-Type", "application/json")), //headers
-            expectedResult = ErrorMessage.ERROR_FRUIT_USER_NOT_ENABLED //expected result
-        )
-    }
-}
diff --git a/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/StateBuilder.kt b/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/StateBuilder.kt
deleted file mode 100644
index a4eec2e1..00000000
--- a/app-examples/example-kt-08ktor/src/test/java/foo/bar/example/forektorkt/feature/fruit/StateBuilder.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package foo.bar.example.forektorkt.feature.fruit
-
-import co.early.fore.kt.core.type.Either.Companion.fail
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.kt.net.ktor.CallWrapperKtor
-import co.early.fore.net.MessageProvider
-import foo.bar.example.forektorkt.api.fruits.FruitPojo
-import foo.bar.example.forektorkt.message.ErrorMessage
-import io.mockk.coEvery
-import kotlinx.coroutines.CompletableDeferred
-
-class StateBuilder internal constructor(private val mockCallWrapperKtor: CallWrapperKtor<ErrorMessage>) {
-
-    internal fun getFruitSuccess(fruitPojo: FruitPojo): StateBuilder {
-
-        coEvery {
-            mockCallWrapperKtor.processCallAsync(
-                any() as suspend () -> List<FruitPojo>
-            )
-        } returns CompletableDeferred(success(listOf(fruitPojo)))
-
-        return this
-    }
-
-    internal fun getFruitFail(errorMessage: ErrorMessage): StateBuilder {
-
-        coEvery {
-            mockCallWrapperKtor.processCallAwait(
-                any() as kotlin.reflect.KClass<MessageProvider<ErrorMessage>>,
-                any() as suspend () -> List<FruitPojo>
-            )
-        } returns fail(errorMessage)
-
-        return this
-    }
-}
diff --git a/app-examples/example-kt-08ktor/src/test/resources/common/empty.json b/app-examples/example-kt-08ktor/src/test/resources/common/empty.json
deleted file mode 100644
index e69de29b..00000000
diff --git a/app-examples/example-kt-08ktor/src/test/resources/common/error_user_locked.json b/app-examples/example-kt-08ktor/src/test/resources/common/error_user_locked.json
deleted file mode 100644
index c09caa60..00000000
--- a/app-examples/example-kt-08ktor/src/test/resources/common/error_user_locked.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "errorCode":"FRUIT_USER_LOCKED"
-}
\ No newline at end of file
diff --git a/app-examples/example-kt-08ktor/src/test/resources/common/error_user_not_enabled.json b/app-examples/example-kt-08ktor/src/test/resources/common/error_user_not_enabled.json
deleted file mode 100644
index 05580569..00000000
--- a/app-examples/example-kt-08ktor/src/test/resources/common/error_user_not_enabled.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "errorCode":"FRUIT_USER_NOT_ENABLED"
-}
\ No newline at end of file
diff --git a/app-examples/example-kt-08ktor/src/test/resources/common/html.json b/app-examples/example-kt-08ktor/src/test/resources/common/html.json
deleted file mode 100644
index 92ab9d38..00000000
--- a/app-examples/example-kt-08ktor/src/test/resources/common/html.json
+++ /dev/null
@@ -1 +0,0 @@
-<HTML>/<HTML>
\ No newline at end of file
diff --git a/app-examples/example-kt-08ktor/src/test/resources/fruit/success.json b/app-examples/example-kt-08ktor/src/test/resources/fruit/success.json
deleted file mode 100644
index 1fc65eb4..00000000
--- a/app-examples/example-kt-08ktor/src/test/resources/fruit/success.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "name":"orange",
-    "isCitrus":true,
-    "tastyPercentScore":43
-  }
-]
\ No newline at end of file
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-examples/example-kt-09compose/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-09compose/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-examples/example-kt-09compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/app-examples/example-kt-09compose/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher.png b/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 8f5c80ae..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher_background.png
deleted file mode 100644
index 1a96b1a9..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 46bea6b3..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher.png b/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index e335d78a..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher_background.png
deleted file mode 100644
index 901d6859..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index b5c5d0b4..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 6fc622e2..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher_background.png
deleted file mode 100644
index 686dab37..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index c6e383af..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 68b160b4..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
deleted file mode 100644
index 670d3e6a..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 840395d1..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 3777b9e6..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
deleted file mode 100644
index 506c6fdb..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e54dcd0f..00000000
Binary files a/app-examples/example-kt-09compose/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app-examples/example-kt-09compose/src/test/resources/common/empty.json b/app-examples/example-kt-09compose/src/test/resources/common/empty.json
deleted file mode 100644
index e69de29b..00000000
diff --git a/app-examples/example-kt-09compose/src/test/resources/common/error_user_locked.json b/app-examples/example-kt-09compose/src/test/resources/common/error_user_locked.json
deleted file mode 100644
index c09caa60..00000000
--- a/app-examples/example-kt-09compose/src/test/resources/common/error_user_locked.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "errorCode":"FRUIT_USER_LOCKED"
-}
\ No newline at end of file
diff --git a/app-examples/example-kt-09compose/src/test/resources/common/error_user_not_enabled.json b/app-examples/example-kt-09compose/src/test/resources/common/error_user_not_enabled.json
deleted file mode 100644
index 05580569..00000000
--- a/app-examples/example-kt-09compose/src/test/resources/common/error_user_not_enabled.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "errorCode":"FRUIT_USER_NOT_ENABLED"
-}
\ No newline at end of file
diff --git a/app-examples/example-kt-09compose/src/test/resources/common/html.json b/app-examples/example-kt-09compose/src/test/resources/common/html.json
deleted file mode 100644
index 92ab9d38..00000000
--- a/app-examples/example-kt-09compose/src/test/resources/common/html.json
+++ /dev/null
@@ -1 +0,0 @@
-<HTML>/<HTML>
\ No newline at end of file
diff --git a/app-examples/example-kt-09compose/src/test/resources/fruit/success.json b/app-examples/example-kt-09compose/src/test/resources/fruit/success.json
deleted file mode 100644
index 1fc65eb4..00000000
--- a/app-examples/example-kt-09compose/src/test/resources/fruit/success.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "name":"orange",
-    "isCitrus":true,
-    "tastyPercentScore":43
-  }
-]
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 53bf57b5..9e6d3920 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,8 +28,18 @@
  * co.early.fore.core.testhelpers.CountDownLatchWrapper() //fore-jv-core
  *
  * ./gradlew clean
+ * ./gradlew lib:fore-core:publishToMavenLocal
  * ./gradlew publishToMavenLocal
- * ./gradlew publishReleasePublicationToMavenCentralRepository --no-daemon --no-parallel
+ * ./gradlew lib:fore-core:publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel
+ * ./gradlew publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel
+ *
+ * // pre KMP ./gradlew publishReleasePublicationToMavenCentralRepository --no-daemon --no-parallel
+ *
+ * to build shared framework for the kmp sample app before running the ios app:
+ * ./gradlew :shared:prepAllXCFrameworkForXcode
+ *
+ *
+ * ./gradlew tasks --all | grep publish
  *
  * ./gradlew :fore-kt:fore-kt-android-compose:publishReleasePublicationToMavenCentralRepository --no-daemon --no-parallel
  *
@@ -38,6 +48,7 @@
  *
  * ./gradlew :app-examples:example-kt-04retrofit:dependencies
  * ./gradlew -q :fore-kt:fore-kt-core:dependencyInsight --configuration compileClasspath --dependency okhttp3
+ * ./gradlew lib:fore-core:dependencies --scan
  *
  * tag:fore_
  *
@@ -49,15 +60,14 @@
  * git tag -a v1.5.9 -m 'v1.5.9'
  * git push origin --tags
  */
-
 plugins {
-    alias(libs.plugins.androidApplication).apply(false)
-    alias(libs.plugins.androidLibrary).apply(false)
-    alias(libs.plugins.kotlin).apply(false)
-    alias(libs.plugins.kotlinAndroid).apply(false)
-    alias(libs.plugins.kotlinSerialization).apply(false)
-}
-
-tasks.register("clean", Delete::class){
-    delete(rootProject.layout.buildDirectory)
+    alias(libs.plugins.androidAppPlugin).apply(false)
+    alias(libs.plugins.androidLibraryPlugin).apply(false)
+    alias(libs.plugins.kotlinJvmPlugin).apply(false)
+    alias(libs.plugins.kotlinAndroidPlugin).apply(false)
+    alias(libs.plugins.kotlinMultiPlatformPlugin).apply(false)
+    alias(libs.plugins.kotlinCocoapodsPlugin).apply(false)
+    alias(libs.plugins.composeCompilerPlugin).apply(false)
+    alias(libs.plugins.kotlinSerializationPlugin).apply(false)
+    alias(libs.plugins.kotlinKaptPlugin).apply(false)
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 9fd6e8c5..df499986 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -10,6 +10,6 @@ repositories {
 
 kotlin {
   jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
+    languageVersion.set(JavaLanguageVersion.of(21))
   }
 }
diff --git a/buildSrc/src/main/kotlin/co/early/fore/PublishKmpConfig.kt b/buildSrc/src/main/kotlin/co/early/fore/PublishKmpConfig.kt
new file mode 100644
index 00000000..62f7e2f6
--- /dev/null
+++ b/buildSrc/src/main/kotlin/co/early/fore/PublishKmpConfig.kt
@@ -0,0 +1,112 @@
+package co.early.fore
+
+import org.gradle.api.Project
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.extra
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.plugins.signing.SigningExtension
+import java.net.URI
+
+fun Project.applyPublishingConfig() {
+
+    apply(plugin = "maven-publish")
+    apply(plugin = "signing")
+
+    val LIB_ARTIFACT_ID: String? by project
+    val LIB_DESCRIPTION: String? by project
+
+    println("[$LIB_ARTIFACT_ID lib publish file]")
+
+    group = Shared.Publish.LIB_GROUP
+    version = Shared.Publish.LIB_VERSION_NAME
+
+    afterEvaluate {// otherwise android won't have finished creating the release publication
+
+        configure<PublishingExtension> {
+
+            publications {
+
+                fun MavenPublication.configurePom() {
+                    pom {
+                        name.set(Shared.Publish.PROJ_NAME)
+                        description.set(LIB_DESCRIPTION)
+                        url.set(Shared.Publish.POM_URL)
+
+                        licenses {
+                            license {
+                                name.set(Shared.Publish.LICENCE_NAME)
+                                url.set(Shared.Publish.LICENCE_URL)
+                            }
+                        }
+                        developers {
+                            developer {
+                                id.set(Shared.Publish.LIB_DEVELOPER_ID)
+                                name.set(Shared.Publish.LIB_DEVELOPER_NAME)
+                                email.set(Shared.Publish.LIB_DEVELOPER_EMAIL)
+                            }
+                        }
+                        scm {
+                            connection.set(Shared.Publish.POM_SCM_CONNECTION)
+                            developerConnection.set(Shared.Publish.POM_SCM_CONNECTION)
+                            url.set(Shared.Publish.POM_SCM_URL)
+                        }
+                    }
+                }
+
+                // mavenCentral insists on javadocs for the jvm artifact
+                findByName("jvm")?.let {
+                    (it as MavenPublication).apply {
+                        artifact(tasks.named("javadocJar"))
+                    }
+                }
+
+                publications.forEach { publication ->
+//                    println("publication: ${publication.name}")
+                    (publication as MavenPublication).configurePom()
+                }
+            }
+
+            repositories {
+                maven {
+                    name = "mavenCentral"
+
+                    val releasesRepoUrl =
+                        "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                    val snapshotsRepoUrl =
+                        "https://oss.sonatype.org/content/repositories/snapshots/"
+                    val repoUrl =
+                        if (Shared.Publish.LIB_VERSION_NAME.endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
+
+                    url = URI(repoUrl)
+
+                    credentials {
+                        username = Shared.Secrets.MAVEN_USER
+                        password = Shared.Secrets.MAVEN_PASSWORD
+                    }
+                }
+            }
+        }
+    }
+
+    afterEvaluate {
+        configure<SigningExtension> {
+//        useInMemoryPgpKeys(
+//            Shared.Secrets.SIGNING_KEY_ID,
+//            Shared.Secrets.SIGNING_PRIVATE_KEY,
+//            Shared.Secrets.SIGNING_PASSWORD
+//        )
+            extra["signing.keyId"] = Shared.Secrets.SIGNING_KEY_ID
+            extra["signing.password"] = Shared.Secrets.SIGNING_PASSWORD
+            extra["signing.secretKeyRingFile"] = Shared.Secrets.SIGNING_KEY_RING_FILE
+
+            extensions.findByType<PublishingExtension>()?.publications?.forEach { publication ->
+//                println("signing: ${publication.name}")
+                sign(publication)
+            }
+        }
+    }
+}
diff --git a/buildSrc/src/main/java/co/early/fore/Shared.kt b/buildSrc/src/main/kotlin/co/early/fore/Shared.kt
similarity index 87%
rename from buildSrc/src/main/java/co/early/fore/Shared.kt
rename to buildSrc/src/main/kotlin/co/early/fore/Shared.kt
index 4ab54503..1c68278d 100644
--- a/buildSrc/src/main/java/co/early/fore/Shared.kt
+++ b/buildSrc/src/main/kotlin/co/early/fore/Shared.kt
@@ -1,30 +1,29 @@
 package co.early.fore
 
-import org.gradle.api.JavaVersion
 import java.io.File
-import java.util.*
+import java.util.Properties
 
 object Shared {
 
     object Android {
         const val minSdk = 16
         const val minComposeSdk = 21
-        const val compileSdk = 34
-        const val targetSdk = 34
+        const val compileSdk = 36
+        const val targetSdk = 36
     }
 
     object Versions {
         // fore core package dependencies
         const val android_gradle_plugin = "8.3.2" // must manually change buildSrc.build version
-        const val kotlin_version = "1.9.22" // must manually change buildSrc.build version
+        const val kotlin_version = "2.0.20" // must manually change buildSrc.build version
         const val kotlinx_coroutines_core = "1.8.0"
-        const val jvm_toolchain = 8
+       // const val jvm_toolchain = 8
         // fore optional package dependencies
         const val kotlinx_coroutines_android = "1.8.0"
         const val androidx_lifecycle_common = "2.6.1"
         const val recyclerview = "1.3.2"
         const val okhttp3v3 = "3.14.9"
-        const val okhttp3v4 = "4.12.0"
+        const val okhttp3v4 = "4.11.0"
         const val okhttp3v5 = "5.0.0-alpha.12"
         const val apollo = "2.5.14"
         const val apollo3 = "3.8.3"
@@ -41,14 +40,14 @@ object Shared {
         const val material = "1.7.0"
         const val appcompat = "1.5.1"
         const val coil = "1.1.0"
-        const val perSista = "1.4.0"
+        const val perSista = "2.0.0-rc.1"
         const val androidxtest = "1.4.0"
         const val androidxjunit = "1.1.2"
         const val room_version = "2.4.3"
         const val espresso_core = "3.5.0-alpha03"
         const val butterknife = "10.2.0"
         const val mockito_core = "2.23.0"
-        const val mockk = "1.11.0"
+        const val mockk = "1.13.11"
         const val junit = "4.12"
         const val espresso = "3.0.2"
         const val hamcrest_library = "1.3"
@@ -56,7 +55,7 @@ object Shared {
         const val robolectric = "4.9"
         const val gson = "2.8.5"
         const val constraintlayout = "2.1.4"
-        const val ktor_client = "2.3.9"
+        const val ktor_client = "3.1.1"
         const val converter_gson = "2.6.0"
         const val kotlinxSerializationJson = "1.5.1"
     }
@@ -68,8 +67,7 @@ object Shared {
     }
 
     object Publish {
-        const val LIB_VERSION_NAME = "1.6.5" //"x.x.x-SNAPSHOT"
-        const val LIB_VERSION_CODE = 99
+        const val LIB_VERSION_NAME = "2.0.0"
         const val LIB_GROUP = "co.early.fore"
         const val PROJ_NAME = "fore"
         const val LIB_DEVELOPER_ID = "erdo"
@@ -78,12 +76,11 @@ object Shared {
         const val POM_URL = "https://erdo.github.io/android-fore/"
         const val POM_SCM_URL = "https://github.com/erdo/android-fore"
         const val POM_SCM_CONNECTION = "scm:git@github.com:erdo/android-fore.git"
-        const val LICENCE_SHORT_NAME = "Apache-2.0"
         const val LICENCE_NAME = "The Apache Software License, Version 2.0"
         const val LICENCE_URL = "http://www.apache.org/licenses/LICENSE-2.0.txt"
 
         const val use_published_version = false
-        const val published_fore_version_for_examples = "1.6.3"
+        const val published_fore_version_for_examples = "2.0.0"
     }
 
     object Secrets {
diff --git a/fore-jv/fore-jv-android-adapters/build.gradle.kts b/fore-jv/fore-jv-android-adapters/build.gradle.kts
deleted file mode 100644
index 6e1881f1..00000000
--- a/fore-jv/fore-jv-android-adapters/build.gradle.kts
+++ /dev/null
@@ -1,61 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-jv-android-adapters")
-    set("LIB_DESCRIPTION", "fore - android adapter and diff util helpers, java")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-    namespace = "co.early.fore.adapters"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = Shared.Android.minSdk
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer.pro")
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-        }
-    }
-}
-
-dependencies {
-    api(project(":fore-jv:fore-jv-android-core"))
-    compileOnly("androidx.recyclerview:recyclerview:${Shared.Versions.recyclerview}")
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-jv/fore-jv-android-adapters/src/main/AndroidManifest.xml b/fore-jv/fore-jv-android-adapters/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/Adaptable.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/Adaptable.java
deleted file mode 100644
index a703dd3d..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/Adaptable.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package co.early.fore.adapters;
-
-public interface Adaptable<T> {
-    T getItem(int index);
-    int getItemCount();
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/CrossFadeRemover.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/CrossFadeRemover.java
deleted file mode 100644
index 6294aca0..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/CrossFadeRemover.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package co.early.fore.adapters;
-
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-
-import java.util.List;
-
-/**
- * By default Android will animate changes to an item in a list by cross-fading a copy of the view
- * before the item changed, to a version of the view after the change.
- *
- * This looks ok for simple changes, but if you want a more advanced animation (such as running a
- * lottie animation for example), the default cross-fade will interfere with that, so you can
- * turn it off by setting this class on the recycle view (see the sample apps)
- *
- */
-public class CrossFadeRemover extends DefaultItemAnimator {
-
-    @Override
-    public boolean canReuseUpdatedViewHolder(ViewHolder viewHolder, List<Object> payloads) {
-        return true;
-    }
-
-    @Override
-    public boolean canReuseUpdatedViewHolder(ViewHolder viewHolder) {
-        return true;
-    }
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/Notifyable.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/Notifyable.java
deleted file mode 100644
index 537461bd..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/Notifyable.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.adapters;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-public interface Notifyable<T extends RecyclerView.ViewHolder> {
-    void notifyDataSetChangedAuto();
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/NotifyableImp.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/NotifyableImp.java
deleted file mode 100644
index ea3a1a61..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/NotifyableImp.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package co.early.fore.adapters;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import co.early.fore.adapters.immutable.DiffSpec;
-import co.early.fore.adapters.immutable.Diffable;
-import co.early.fore.adapters.mutable.UpdateSpec;
-import co.early.fore.adapters.mutable.Updateable;
-import co.early.fore.core.Affirm;
-import co.early.fore.core.logging.AndroidLogger;
-import co.early.fore.core.logging.Logger;
-
-public class NotifyableImp<VH extends RecyclerView.ViewHolder> implements Notifyable<VH> {
-
-    private static final int MAX_AGE_MS_BEFORE_IGNORE = 50;
-
-    private final Updateable updateable;
-    private final Diffable diffable;
-    private final RecyclerView.Adapter<VH> adapter;
-
-    public NotifyableImp(RecyclerView.Adapter<VH> adapter, Updateable updateable) {
-        this.adapter = Affirm.notNull(adapter);
-        this.updateable = Affirm.notNull(updateable);
-        this.diffable = null;
-    }
-
-    public NotifyableImp(RecyclerView.Adapter<VH> adapter, Diffable diffable) {
-        this.adapter = Affirm.notNull(adapter);
-        this.updateable = null;
-        this.diffable = Affirm.notNull(diffable);
-    }
-
-    public void notifyDataSetChangedAuto() {
-        if (updateable != null) {
-            processUpdateable();
-        } else {
-            processDiffable();
-        }
-    }
-
-    private void processUpdateable() {
-
-        UpdateSpec updateSpec = updateable.getAndClearLatestUpdateSpec(MAX_AGE_MS_BEFORE_IGNORE);
-
-        switch (updateSpec.type) {
-            case FULL_UPDATE:
-                adapter.notifyDataSetChanged();
-                break;
-            case ITEM_CHANGED:
-                adapter.notifyItemRangeChanged(updateSpec.rowPosition, updateSpec.rowsEffected);
-                break;
-            case ITEM_REMOVED:
-                adapter.notifyItemRangeRemoved(updateSpec.rowPosition, updateSpec.rowsEffected);
-                break;
-            case ITEM_INSERTED:
-                adapter.notifyItemRangeInserted(updateSpec.rowPosition, updateSpec.rowsEffected);
-                break;
-        }
-    }
-
-    private void processDiffable() {
-
-        DiffSpec diffSpec = diffable.getAndClearLatestDiffSpec(MAX_AGE_MS_BEFORE_IGNORE);
-
-        if (diffSpec.diffResult == null) {
-            adapter.notifyDataSetChanged();
-        } else {
-            diffSpec.diffResult.dispatchUpdatesTo(adapter);
-        }
-    }
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DeepCopyable.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DeepCopyable.java
deleted file mode 100644
index b45e9563..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DeepCopyable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.adapters.immutable;
-
-public interface DeepCopyable<T> {
-    T deepCopy();
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffCalculator.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffCalculator.java
deleted file mode 100644
index 3809e78b..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffCalculator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package co.early.fore.adapters.immutable;
-
-import androidx.recyclerview.widget.DiffUtil;
-
-import java.util.List;
-
-public class DiffCalculator<T extends DiffComparator<T>> {
-
-    /**
-     * A wrapper for Android's DiffUtil. It's recommended that this method is run off the UI thread
-     * because it can take some time to generate the DiffResult, especially for large lists or lists
-     * with many changes.
-     *
-     * <p>
-     * It's very important that the contents of the two lists are not changed from another thread
-     * while the DiffUtil calculations are being made. You could use synchronization blocks to
-     * ensure this, use an implementation of an immutable list, or you can make a deepCopy() of
-     * the lists to sever the connection between the lists you pass to this function and the calling
-     * code.
-     *
-     * <p>
-     * Another common issue is to create the new list based on the old list (with changes) and
-     * accidentally change the old list in the process, so that DiffUtil sees two lists which are
-     * identical (2 identical new lists, instead of an old list and a new list). This will result
-     * in no changes being animated in the adapter. You can fix this by making a deepCopy of the
-     * old list before making changes to it. Architectures using immutable view states have often
-     * already made a deep copy of their list data by the time it reaches the UI, so you might not
-     * encounter this issue in that case.
-     *
-     * <p>
-     * Once these lists start to get larger than about 1000 rows, DiffUtil based methods can get
-     * a bit slow. For faster performance consider using the mutable package classes if it's an
-     * option for your situation (mostly if you are using MVI or some other form of immutable
-     * list data, you will be restricted to using DiffUtil based methods to determine list changes)
-     *
-     * <p>
-     * @param oldList the list about to be replaced
-     * @param newList the new list
-     * @return the DiffResult for the two lists
-     */
-    public DiffUtil.DiffResult createDiffResult(List<T> oldList, List<T> newList) {
-
-        return DiffUtil.calculateDiff(new DiffUtil.Callback() {
-
-            @Override
-            public int getOldListSize() {
-                return oldList.size();
-            }
-
-            @Override
-            public int getNewListSize() {
-                return newList.size();
-            }
-
-            @Override
-            public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
-                return oldList.get(oldItemPosition) != null && oldList.get(oldItemPosition).itemsTheSame(newList.get(newItemPosition));
-            }
-
-            @Override
-            public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
-                return oldList.get(oldItemPosition) != null && oldList.get(oldItemPosition).itemsLookTheSame(newList.get(newItemPosition));
-            }
-        });
-    }
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffComparator.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffComparator.java
deleted file mode 100644
index 7546722d..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffComparator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package co.early.fore.adapters.immutable;
-
-import androidx.recyclerview.widget.DiffUtil;
-
-public interface DiffComparator<T> {
-
-    /**
-     * Used by {@link DiffUtil}
-     *
-     * Do the two instances represent the same real world item? even though they maybe
-     * different instances. For example, one could be its representation in a list view, the other
-     * could be its representation in a database entity, but if they represent the same conceptual
-     * item then this method should return true.
-     *
-     * You might use some unique itemId for this, maybe an ISBN number if we are dealing with books,
-     * maybe a title and year of release for a movie (providing you can guarantee this combination
-     * is unique) - you certainly wouldn't use the item's position in a list for example.
-     *
-     * Note: even if the item's states are different - e.g. the same move, but one item has this movie
-     * with a 4 star rating, the other item is the same movie but with a 3 star rating, they are
-     * still the same conceptual item, just with different states, so this method should return true.
-     *
-     * @param other the instance to compare this with
-     * @return true if the items represent the same real world / conceptual item
-     */
-    boolean itemsTheSame(T other);
-
-    /**
-     * Used by {@link DiffUtil}
-     *
-     * Note this really means do they look the same in a specific list on the display. As such
-     * there can be multiple implementations, each related to a particular list display.
-     *
-     * Let's say we are displaying a list of stocks and each stock item in the list has: a ticker
-     * symbol, a stock price, and a "social score" based on twitter mentions in the past hour.
-     *
-     * For our specific list in the UI, we only display the ticker symbol and the stock price. This
-     * means that the social score does not effect the display in any way. If the social score is
-     * the only thing to change, but the ticker symbol and the stock price remain the same, then
-     * the new state of the item will look the same when viewed in this list - and we would return
-     * true here (even though the item itself is no longer in the same state when considered as a
-     * whole). It's important to get this right, it's how android adapters know whether to run an
-     * update animation or not (by default android briefly by fades in and out the item in the view).
-     *
-     * @param other the instance to compare this with
-     * @return true if the items will look the same when displayed
-     */
-    boolean itemsLookTheSame(T other);
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffSpec.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffSpec.java
deleted file mode 100644
index e52085eb..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffSpec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package co.early.fore.adapters.immutable;
-
-
-import androidx.recyclerview.widget.DiffUtil;
-
-import co.early.fore.core.time.SystemTimeWrapper;
-
-/**
- * Wraps a DiffResult with a timestamp so that we can abandon it when it gets old. This helps
- * the NotifyableImp manage adapter updates appropriately
- */
-public class DiffSpec {
-
-    public final DiffUtil.DiffResult diffResult;
-    public final long timeStamp;
-
-    /**
-     * @param diffResult can be null to indicate no changes
-     * @param systemTimeWrapper wrapper for the system time (can not be null)
-     */
-    public DiffSpec(DiffUtil.DiffResult diffResult, SystemTimeWrapper systemTimeWrapper) {
-        this.diffResult = diffResult;
-        this.timeStamp = notNull(systemTimeWrapper).currentTimeMillis();
-    }
-
-    private <T> T notNull(T param) {
-        if (param == null) {
-            throw new NullPointerException("Parameter must not be null");
-        }
-        return param;
-    }
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/Diffable.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/Diffable.java
deleted file mode 100644
index 67a96aff..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/Diffable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.adapters.immutable;
-
-public interface Diffable {
-    DiffSpec getAndClearLatestDiffSpec(long maxAgeMs);
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/ImmutableListMgr.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/ImmutableListMgr.java
deleted file mode 100644
index 478b4566..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/immutable/ImmutableListMgr.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package co.early.fore.adapters.immutable;
-
-import androidx.recyclerview.widget.DiffUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import co.early.fore.adapters.Adaptable;
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.observer.ObservableImp;
-import co.early.fore.core.threading.AsyncBuilder;
-import co.early.fore.core.time.SystemTimeWrapper;
-
-/**
- * This class holds the definition of the current list for an adapter, so it's getItemCount() and getItem()
- * functions are always correct.
- *
- * The way to change the list is to first call getListCopy(), make the changes to that list, and
- * then call updateList() which will return immediately.
- *
- * The DiffSpec between the old and the new list will be calculated off the UI thread and the
- * results applied atomically on the UI thread. Observers will be notified on the UI thread.
- *
- */
-public class ImmutableListMgr<T extends DeepCopyable<T> & DiffComparator<T>>
-        extends ObservableImp implements Diffable, Adaptable<T> {
-
-    private final SystemTimeWrapper systemTimeWrapper;
-    private final WorkMode workMode;
-    private DiffSpec latestDiffSpec;
-    private List<T> currentList = new ArrayList<T>();
-    private List<T> currentListMutableCopy = new ArrayList<T>();
-    private int currentListVersion = 0;
-
-    private final Object listChangesLock = new Object();
-
-    public ImmutableListMgr(SystemTimeWrapper systemTimeWrapper, WorkMode workMode, Logger logger) {
-        super(workMode, logger);
-        this.systemTimeWrapper = Affirm.notNull(systemTimeWrapper);
-        this.workMode = workMode;
-        latestDiffSpec = createFullDiffSpec();
-    }
-
-    public void changeList(ListUpdater<T> listUpdater){
-        synchronized (listChangesLock) {
-            listUpdater.updateList(currentListMutableCopy);
-        }
-        updateList(currentListMutableCopy);
-    }
-
-    public void replaceList(ListReplacer<T> listReplacer){
-        updateList(listReplacer.replaceList());
-    }
-
-    @SuppressWarnings("unchecked")
-    private void updateList(List<T> newList) {
-        new AsyncBuilder<Input, Result>(workMode)
-                .doInBackground(input -> doWork(input[0]))
-                .onPostExecute(this::updateState)
-                .execute(new Input(currentListVersion, currentList, newList));
-    }
-
-    @Override
-    public T getItem(int index) {
-        return currentList.get(index);
-    }
-
-    @Override
-    public int getItemCount() {
-        return currentList.size();
-    }
-
-    /**
-     * If the DiffResult is old, then we assume that whatever changes
-     * were made to the list last time were never picked up by a
-     * recyclerView (maybe because the list was not visible at the time).
-     * In this case we clear the DiffResult and create a fresh one with a
-     * full diff spec.
-     *
-     * @return the latest DiffResult for the list
-     */
-    @Override
-    public DiffSpec getAndClearLatestDiffSpec(long maxAgeMs) {
-
-        DiffSpec latestDiffSpecAvailable = latestDiffSpec;
-        DiffSpec fullDiffSpec = createFullDiffSpec();
-
-        latestDiffSpec = fullDiffSpec;
-
-        if ((systemTimeWrapper.currentTimeMillis() - latestDiffSpecAvailable.timeStamp) < maxAgeMs) {
-            return latestDiffSpecAvailable;
-        } else {
-            return fullDiffSpec;
-        }
-    }
-
-    private DiffSpec createFullDiffSpec() {
-        return new DiffSpec(null, systemTimeWrapper);
-    }
-
-    private Result doWork(Input input) {
-
-        List<T> newListCopy = new ArrayList<>(input.newList.size());
-        List<T> newListCopy2 = new ArrayList<>(input.newList.size());
-
-        synchronized (listChangesLock) {
-            //create a mutable copy of the new list, ready for when client wants to change it
-            for (T item : input.newList) {
-                newListCopy.add(item.deepCopy());
-                newListCopy2.add(item.deepCopy());
-            }
-        }
-
-        // work out the differences in the lists
-        DiffUtil.DiffResult diffResult = new DiffCalculator<T>().createDiffResult(input.oldList, newListCopy);
-
-        //return to the UI thread
-        return new Result(input.oldListVersion, newListCopy, newListCopy2, new DiffSpec(diffResult, systemTimeWrapper));
-    }
-
-    private void updateState(Result result) {
-
-        if (result.oldListVersion != currentListVersion){
-            return; // this is an old change, we ignore it
-        }
-
-        currentListVersion = currentListVersion + 1;
-        currentList = result.newList;
-        currentListMutableCopy = result.newListCopy;
-        latestDiffSpec = result.diffSpec;
-
-        notifyObservers();
-    }
-
-    private class Input {
-
-        public final int oldListVersion;
-        public final List<T> oldList;
-        public final List<T> newList;
-
-        public Input(int oldListVersion, List<T> oldList, List<T> newList) {
-            this.oldListVersion = oldListVersion;
-            this.oldList = Affirm.notNull(oldList);
-            this.newList = Affirm.notNull(newList);
-        }
-    }
-
-    private class Result {
-
-        public final int oldListVersion;
-        public final List<T> newList;
-        public final List<T> newListCopy;
-        public final DiffSpec diffSpec;
-
-        public Result(int oldListVersion, List<T> newList, List<T> newListCopy, DiffSpec diffSpec) {
-            this.oldListVersion = oldListVersion;
-            this.newList = Affirm.notNull(newList);
-            this.newListCopy = Affirm.notNull(newListCopy);
-            this.diffSpec = Affirm.notNull(diffSpec);
-        }
-    }
-
-    public interface ListUpdater<T>{
-        void updateList(List<T> listCopy);
-    }
-
-    public interface ListReplacer<T>{
-        List<T> replaceList();
-    }
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareArrayList.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareArrayList.java
deleted file mode 100644
index 88f1d2b6..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareArrayList.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package co.early.fore.adapters.mutable;
-
-import android.os.Build;
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.function.UnaryOperator;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.time.SystemTimeWrapper;
-
-/**
- * <p>Basic Android adapters use notifyDataSetChanged() to trigger a redraw of the list UI.
- *
- * <code>
- * adapter.notifyDataSetChanged();
- * </code>
- *
- * <p>In order to take advantage of insert and remove animations, we can provide the adapter with
- * more information about how the list has changed (eg: there was an item inserted at position 5
- * or the item at position 3 has changed etc), for that we call a selection of notifyXXX methods()
- * indicating what sort of change happened and which rows were effected.
- *
- * <p>This list class will automatically generate an update specification for each change you make
- * to it, suitable for deciding how to call the various notifyXXX methods:
- *
- * <code>
- *
- * UpdateSpec updateSpec = list.getMostRecentUpdateSpec();
- *
- * switch (updateSpec.type) {
- *  case FULL_UPDATE:
- *      adapter.notifyDataSetChanged();
- *      break;
- *  case ITEM_CHANGED:
- *      adapter.notifyItemChanged(updateSpec.rowPosition);
- *      break;
- *  case ITEM_REMOVED:
- *      adapter.notifyItemRemoved(updateSpec.rowPosition);
- *      break;
- *  case ITEM_INSERTED:
- *      adapter.notifyItemInserted(updateSpec.rowPosition);
- *      break;
- * }
- *
- * </code>
- *
- * <p>This class only supports one type of change at a time (you can't handle a cell update;
- * two removals; and three inserts, all in the same notify round trip - each has to be handled one at a time)
- *
- */
-public class ChangeAwareArrayList<T> extends ArrayList<T> implements ChangeAwareList<T>, Updateable {
-
-    private final SystemTimeWrapper systemTimeWrapper;
-    private UpdateSpec updateSpec;
-
-    public ChangeAwareArrayList(SystemTimeWrapper systemTimeWrapper) {
-        super();
-        this.systemTimeWrapper = Affirm.notNull(systemTimeWrapper);
-        updateSpec = createFullUpdateSpec(systemTimeWrapper);
-    }
-
-    public ChangeAwareArrayList(int capacity, SystemTimeWrapper systemTimeWrapper) {
-        super(capacity);
-        this.systemTimeWrapper = Affirm.notNull(systemTimeWrapper);
-        updateSpec = createFullUpdateSpec(systemTimeWrapper);
-    }
-
-    public ChangeAwareArrayList(@NonNull Collection<? extends T> c, SystemTimeWrapper systemTimeWrapper) {
-        super(c);
-        this.systemTimeWrapper = Affirm.notNull(systemTimeWrapper);
-        updateSpec = createFullUpdateSpec(systemTimeWrapper);
-    }
-
-    @Override
-    public boolean add(T object) {
-        boolean temp = super.add(object);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_INSERTED, size() - 1, 1, systemTimeWrapper);
-        return temp;
-    }
-
-    @Override
-    public void add(int index, T object) {
-        super.add(index, object);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_INSERTED, index, 1, systemTimeWrapper);
-    }
-
-    @Override
-    public T set(int index, T object) {
-        T temp = super.set(index, object);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_CHANGED, index, 1, systemTimeWrapper);
-        return temp;
-    }
-
-    @Override
-    public T remove(int index) {
-        T temp = super.remove(index);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_REMOVED, index, 1, systemTimeWrapper);
-        return temp;
-    }
-
-    @Override
-    public void clear() {
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_REMOVED, 0, size(), systemTimeWrapper);
-        super.clear();
-    }
-
-    @Override
-    public boolean addAll(Collection collection) {
-        boolean temp = super.addAll(collection);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_INSERTED, size() - 1, collection.size(), systemTimeWrapper);
-        return temp;
-    }
-
-    @Override
-    public boolean addAll(int index, Collection collection) {
-        boolean temp = super.addAll(index, collection);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_INSERTED, index, collection.size(), systemTimeWrapper);
-        return temp;
-    }
-
-    /**
-     * Standard AbstractList and ArrayList have this method protected as you
-     * are supposed to remove a range by doing this:
-     * list.subList(start, end).clear();
-     * (clear() ends up calling removeRange() behind the scenes).
-     * This won't work for these change aware lists (plus it's a ball ache),
-     * so this gets made public
-     */
-    @Override
-    public void removeRange(int fromIndex, int toIndex) {
-        super.removeRange(fromIndex, toIndex);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_REMOVED, fromIndex, toIndex - fromIndex, systemTimeWrapper);
-    }
-
-    @Override
-    public boolean remove(Object object) {
-        int index = super.indexOf(object);
-        if (index != -1){
-            boolean temp = super.remove(object);
-            updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_REMOVED, index, 1, systemTimeWrapper);
-            return temp;
-        }else{
-            return false;
-        }
-    }
-
-    @Override
-    public boolean removeAll(Collection collection) {
-        boolean temp = super.removeAll(collection);
-        if (temp){
-            updateSpec = createFullUpdateSpec(systemTimeWrapper);
-        }
-        return temp;
-    }
-
-    @Override
-    public void replaceAll(UnaryOperator<T> operator) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            super.replaceAll(operator);
-            updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_CHANGED, 0, size(), systemTimeWrapper);
-        } else {
-            throw new UnsupportedOperationException("Not supported by this class");
-        }
-    }
-
-    /**
-     * Inform the list that the content of one of its rows has
-     * changed.
-     *
-     * Without calling this, the list may not be aware of
-     * any changes made to this row and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowIndex index of the row that had its data changed
-     */
-    public void makeAwareOfDataChange(int rowIndex){
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_CHANGED, rowIndex, 1, systemTimeWrapper);
-    }
-
-    /**
-     * Inform the list that the content of a range of its rows has
-     * changed.
-     *
-     * Without calling this, the list will not be aware of
-     * any changes made to these rows and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowStartIndex index of the row that had its data changed
-     * @param rowsAffected how many rows have been affected
-     */
-    public void makeAwareOfDataChange(int rowStartIndex, int rowsAffected){
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_CHANGED, rowStartIndex, rowsAffected, systemTimeWrapper);
-    }
-
-
-    /**
-     * Make sure you understand the limitations of this method!
-     *
-     * It essentially only supports one recycleView at a time,
-     * in the unlikely event that you want two different list
-     * views animating the same changes to this list, you will
-     * need to store the updateSpec returned here so that both
-     * recycleView adapters get a copy, otherwise the second
-     * adapter will always get a FULL_UPDATE (meaning no
-     * fancy animations for the second one)
-     *
-     * If the updateSpec is old, then we assume that whatever changes
-     * were made to the Updateable last time were never picked up by a
-     * recyclerView (maybe because the list was not visible at the time).
-     * In this case we clear the updateSpec and create a fresh one with a
-     * full update spec.
-     *
-     * @return the latest update spec for the list
-     */
-    public UpdateSpec getAndClearLatestUpdateSpec(long maxAgeMs){
-
-        UpdateSpec latestUpdateSpecAvailable = updateSpec;
-        updateSpec = createFullUpdateSpec(systemTimeWrapper);
-
-        if (systemTimeWrapper.currentTimeMillis() - latestUpdateSpecAvailable.timeStamp < maxAgeMs) {
-            return latestUpdateSpecAvailable;
-        }else{
-            return updateSpec;
-        }
-    }
-
-    private UpdateSpec createFullUpdateSpec(SystemTimeWrapper stw){
-        return new UpdateSpec(UpdateSpec.UpdateType.FULL_UPDATE, 0, 0, stw);
-    }
-
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareLinkedList.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareLinkedList.java
deleted file mode 100644
index bc380a59..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareLinkedList.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package co.early.fore.adapters.mutable;
-
-import android.os.Build;
-import androidx.annotation.NonNull;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.function.UnaryOperator;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.time.SystemTimeWrapper;
-
-/**
- * <p>Basic Android adapters use notifyDataSetChanged() to trigger a redraw of the list UI.
- *
- * <code>
- * adapter.notifyDataSetChanged();
- * </code>
- *
- * <p>In order to take advantage of insert and remove animations, we can provide the adapter with
- * more information about how the list has changed (eg: there was an item inserted at position 5
- * or the item at position 3 has changed etc), for that we call a selection of notifyXXX methods()
- * indicating what sort of change happened and which rows were effected.
- *
- * <p>This list class will automatically generate an update specification for each change you make
- * to it, suitable for deciding how to call the various notifyXXX methods:
- *
- * <code>
- *
- * UpdateSpec updateSpec = list.getMostRecentUpdateSpec();
- *
- * switch (updateSpec.type) {
- *  case FULL_UPDATE:
- *      adapter.notifyDataSetChanged();
- *      break;
- *  case ITEM_CHANGED:
- *      adapter.notifyItemChanged(updateSpec.rowPosition);
- *      break;
- *  case ITEM_REMOVED:
- *      adapter.notifyItemRemoved(updateSpec.rowPosition);
- *      break;
- *  case ITEM_INSERTED:
- *      adapter.notifyItemInserted(updateSpec.rowPosition);
- *      break;
- * }
- *
- * </code>
- *
- * <p>This class only supports one type of change at a time (you can't handle a cell update;
- * two removals; and three inserts, all in the same notify round trip - each has to be handled one at a time)
- *
- */
-public class ChangeAwareLinkedList<T> extends LinkedList<T> implements ChangeAwareList<T>, Updateable {
-
-    private final SystemTimeWrapper systemTimeWrapper;
-    private UpdateSpec updateSpec;
-
-    public ChangeAwareLinkedList(SystemTimeWrapper systemTimeWrapper) {
-        super();
-        this.systemTimeWrapper = Affirm.notNull(systemTimeWrapper);
-        updateSpec = createFullUpdateSpec(systemTimeWrapper);
-    }
-
-    public ChangeAwareLinkedList(@NonNull Collection<? extends T> c, SystemTimeWrapper systemTimeWrapper) {
-        super(c);
-        this.systemTimeWrapper = Affirm.notNull(systemTimeWrapper);
-        updateSpec = createFullUpdateSpec(systemTimeWrapper);
-    }
-
-    @Override
-    public boolean add(T object) {
-        boolean temp = super.add(object);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_INSERTED, size() - 1, 1, systemTimeWrapper);
-        return temp;
-    }
-
-    @Override
-    public void add(int index, T object) {
-        super.add(index, object);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_INSERTED, index, 1, systemTimeWrapper);
-    }
-
-    @Override
-    public T set(int index, T object) {
-        T temp = super.set(index, object);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_CHANGED, index, 1, systemTimeWrapper);
-        return temp;
-    }
-
-    @Override
-    public T remove(int index) {
-        T temp = super.remove(index);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_REMOVED, index, 1, systemTimeWrapper);
-        return temp;
-    }
-
-    @Override
-    public void clear() {
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_REMOVED, 0, size(), systemTimeWrapper);
-        super.clear();
-    }
-
-    @Override
-    public boolean addAll(Collection collection) {
-        boolean temp = super.addAll(collection);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_INSERTED, size() - 1, collection.size(), systemTimeWrapper);
-        return temp;
-    }
-
-    @Override
-    public boolean addAll(int index, Collection collection) {
-        boolean temp = super.addAll(index, collection);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_INSERTED, index, collection.size(), systemTimeWrapper);
-        return temp;
-    }
-
-    /**
-     * Standard AbstractList and ArrayList have this method protected as you
-     * are supposed to remove a range by doing this:
-     * list.subList(start, end).clear();
-     * (clear() ends up calling removeRange() behind the scenes).
-     * This won't work for these change aware lists (plus it's a ball ache),
-     * so this gets made public
-     */
-    @Override
-    public void removeRange(int fromIndex, int toIndex) {
-        super.removeRange(fromIndex, toIndex);
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_REMOVED, fromIndex, toIndex - fromIndex, systemTimeWrapper);
-    }
-
-    @Override
-    public boolean remove(Object object) {
-        int index = super.indexOf(object);
-        if (index != -1){
-            boolean temp = super.remove(object);
-            updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_REMOVED, index, 1, systemTimeWrapper);
-            return temp;
-        }else{
-            return false;
-        }
-    }
-
-    @Override
-    public boolean removeAll(Collection collection) {
-        boolean temp = super.removeAll(collection);
-        if (temp){
-            updateSpec = createFullUpdateSpec(systemTimeWrapper);
-        }
-        return temp;
-    }
-
-    @Override
-    public void replaceAll(UnaryOperator<T> operator) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            super.replaceAll(operator);
-            updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_CHANGED, 0, size(), systemTimeWrapper);
-        } else {
-            throw new UnsupportedOperationException("Not supported by this class");
-        }
-    }
-
-    /**
-     * Inform the list that the content of one of its rows has
-     * changed.
-     *
-     * Without calling this, the list may not be aware of
-     * any changes made to this row and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowIndex index of the row that had its data changed
-     */
-    public void makeAwareOfDataChange(int rowIndex){
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_CHANGED, rowIndex, 1, systemTimeWrapper);
-    }
-
-    /**
-     * Inform the list that the content of a range of its rows has
-     * changed.
-     *
-     * Without calling this, the list will not be aware of
-     * any changes made to these rows and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowStartIndex index of the row that had its data changed
-     * @param rowsAffected how many rows have been affected
-     */
-    public void makeAwareOfDataChange(int rowStartIndex, int rowsAffected){
-        updateSpec = new UpdateSpec(UpdateSpec.UpdateType.ITEM_CHANGED, rowStartIndex, rowsAffected, systemTimeWrapper);
-    }
-
-
-    /**
-     * Make sure you understand the limitations of this method!
-     *
-     * It essentially only supports one recycleView at a time,
-     * in the unlikely event that you want two different list
-     * views animating the same changes to this list, you will
-     * need to store the updateSpec returned here so that both
-     * recycleView adapters get a copy, otherwise the second
-     * adapter will always get a FULL_UPDATE (meaning no
-     * fancy animations for the second one)
-     *
-     * If the updateSpec is old, then we assume that whatever changes
-     * were made to the Updateable last time were never picked up by a
-     * recyclerView (maybe because the list was not visible at the time).
-     * In this case we clear the updateSpec and create a fresh one with a
-     * full update spec.
-     *
-     * @return the latest update spec for the list
-     */
-    public UpdateSpec getAndClearLatestUpdateSpec(long maxAgeMs){
-
-        UpdateSpec latestUpdateSpecAvailable = updateSpec;
-        updateSpec = createFullUpdateSpec(systemTimeWrapper);
-
-        if (systemTimeWrapper.currentTimeMillis() - latestUpdateSpecAvailable.timeStamp < maxAgeMs) {
-            return latestUpdateSpecAvailable;
-        }else{
-            return updateSpec;
-        }
-    }
-
-    private UpdateSpec createFullUpdateSpec(SystemTimeWrapper stw){
-        return new UpdateSpec(UpdateSpec.UpdateType.FULL_UPDATE, 0, 0, stw);
-    }
-
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareList.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareList.java
deleted file mode 100644
index 5abb736c..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareList.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package co.early.fore.adapters.mutable;
-
-import java.util.List;
-
-public interface ChangeAwareList<E> extends List<E>, Updateable {
-
-    /**
-     * Inform the list that the content of one of its rows has
-     * changed.
-     *
-     * Without calling this, the list may not be aware of
-     * any changes made to this row and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowIndex index of the row that had its data changed
-     */
-    void makeAwareOfDataChange(int rowIndex);
-
-    /**
-     * Inform the list that the content of a range of its rows has
-     * changed.
-     *
-     * Without calling this, the list will not be aware of
-     * any changes made to these rows and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowStartIndex index of the row that had its data changed
-     * @param rowsAffected how many rows have been affected
-     */
-    void makeAwareOfDataChange(int rowStartIndex, int rowsAffected);
-
-    /**
-     * Removes from this list all of the elements whose index is between
-     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
-     * Shifts any succeeding elements to the left (reduces their index).
-     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
-     * (If {@code toIndex==fromIndex}, this operation has no effect.)
-     *
-     * @param fromIndex index of first element to be removed
-     * @param toIndex index after last element to be removed
-     */
-    void removeRange(int fromIndex, int toIndex);
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/UpdateSpec.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/UpdateSpec.java
deleted file mode 100644
index 1890fc79..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/UpdateSpec.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package co.early.fore.adapters.mutable;
-
-import co.early.fore.core.time.SystemTimeWrapper;
-
-/**
- * Indicates what was the most recent change in a list, helps the ChangeAware* classes
- * call the correct notify* method for android adapters to take advantage of built in
- * list animations
- */
-public class UpdateSpec {
-
-    public enum UpdateType {
-        FULL_UPDATE,
-        ITEM_CHANGED,
-        ITEM_INSERTED,
-        ITEM_REMOVED
-    }
-
-    public final UpdateType type;
-    public final int rowPosition;
-    public final int rowsEffected;
-    public final long timeStamp;
-
-    public UpdateSpec(UpdateType type, int rowPosition, int rowsEffected, SystemTimeWrapper systemTimeWrapper) {
-        this.type = notNull(type);
-        this.rowPosition = rowPosition;
-        this.rowsEffected = rowsEffected;
-        this.timeStamp = notNull(systemTimeWrapper).currentTimeMillis();
-    }
-
-    private <T> T notNull(T param) {
-        if (param == null) {
-            throw new NullPointerException("Parameter must not be null");
-        }
-        return param;
-    }
-}
diff --git a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/Updateable.java b/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/Updateable.java
deleted file mode 100644
index c7f31c03..00000000
--- a/fore-jv/fore-jv-android-adapters/src/main/java/co/early/fore/adapters/mutable/Updateable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.adapters.mutable;
-
-public interface Updateable {
-    UpdateSpec getAndClearLatestUpdateSpec(long maxAgeMs);
-}
diff --git a/fore-jv/fore-jv-android-core/build.gradle.kts b/fore-jv/fore-jv-android-core/build.gradle.kts
deleted file mode 100644
index 2641182b..00000000
--- a/fore-jv/fore-jv-android-core/build.gradle.kts
+++ /dev/null
@@ -1,60 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-jv-android-core")
-    set("LIB_DESCRIPTION", "fore - android java core code")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(co.early.fore.Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-    namespace = "co.early.fore.core"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = Shared.Android.minSdk
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer.pro")
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-        }
-    }
-}
-
-dependencies {
-    api(project(":fore-jv:fore-jv-core"))
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-jv/fore-jv-android-core/src/main/AndroidManifest.xml b/fore-jv/fore-jv-android-core/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-jv/fore-jv-android-core/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/logging/AndroidLogger.java b/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/logging/AndroidLogger.java
deleted file mode 100644
index 666b36f8..00000000
--- a/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/logging/AndroidLogger.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package co.early.fore.core.logging;
-
-import android.util.Log;
-
-
-public class AndroidLogger implements Logger{
-
-    private String tagPrefix = null;
-
-    public AndroidLogger() {
-    }
-
-    public AndroidLogger(String tagPrefix) {
-        this.tagPrefix = tagPrefix;
-    }
-
-    public void e(String tag, String message) {
-        Log.e(addTagPrefixIfPresent(tag), message);
-    }
-
-    public void w(String tag, String message) {
-        Log.w(addTagPrefixIfPresent(tag), message);
-    }
-
-    public void i(String tag, String message) {
-        Log.i(addTagPrefixIfPresent(tag), message);
-    }
-
-    public void d(String tag, String message) {
-        Log.d(addTagPrefixIfPresent(tag), message);
-    }
-
-    public void v(String tag, String message) {
-        Log.v(addTagPrefixIfPresent(tag), message);
-    }
-
-    public void e(String tag, String message, Throwable throwable) {
-        Log.e(addTagPrefixIfPresent(tag), message, throwable);
-    }
-
-    public void w(String tag, String message, Throwable throwable) {
-        Log.w(addTagPrefixIfPresent(tag), message, throwable);
-    }
-
-    public void i(String tag, String message, Throwable throwable) {
-        Log.i(addTagPrefixIfPresent(tag), message, throwable);
-    }
-
-    public void d(String tag, String message, Throwable throwable) {
-        Log.d(addTagPrefixIfPresent(tag), message, throwable);
-    }
-
-    public void v(String tag, String message, Throwable throwable) {
-        Log.v(addTagPrefixIfPresent(tag), message, throwable);
-    }
-
-    private String addTagPrefixIfPresent(String message){
-        return (tagPrefix == null ? message : tagPrefix + message);
-    }
-}
diff --git a/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/observer/ObservableImp.java b/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/observer/ObservableImp.java
deleted file mode 100644
index 120b56de..00000000
--- a/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/observer/ObservableImp.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package co.early.fore.core.observer;
-
-import android.os.Handler;
-import android.os.Looper;
-
-import java.util.ArrayList;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-
-public class ObservableImp implements Observable{
-
-    private static String TAG = ObservableImp.class.getSimpleName();
-
-    private final WorkMode notificationMode;
-    private final Logger logger;
-    private final Handler handler;
-
-
-    /**
-     * @param notificationMode If notifications should be posted to the UI thread (appropriate for most app code) then use ASYNCHRONOUS.<p>
-     *                         If notifications should be executed directly (more appropriate for test code) then use SYNCHRONOUS<p>
-     *
-     *                         NB: If there are any Android Adapters depending on your model for their list data, you will
-     *                         want to make sure that you only update this list based data on the UI thread (i.e. for use
-     *                         with adapters, you should only call notifyObservers() on the UI thread). This remains true
-     *                         regardless of whether this Observable has been created with ASYNCHRONOUS or SYNCHRONOUS
-     *                         WorkMode.
-     *                         Synchronizing any list updates is not enough, Android will call Adapter.count() and
-     *                         Adapter.get() on the UI thread and you cannot change the adapter's size between these calls.
-     */
-    public ObservableImp(WorkMode notificationMode) {
-        this.notificationMode = Affirm.notNull(notificationMode);
-        this.logger = null;
-        this.handler = handler(notificationMode);
-    }
-
-
-    /**
-     * @param notificationMode If notifications should be posted to the UI thread (appropriate for most app code) then use ASYNCHRONOUS.<p>
-     *                         If notifications should be executed directly (more appropriate for test code) then use SYNCHRONOUS<p>
-     *
-     *                         NB: If there are any Android Adapters depending on your model for their list data, you will
-     *                         want to make sure that you only update this list based data on the UI thread (i.e. for use
-     *                         with adapters, you should only call notifyObservers() on the UI thread). This remains true
-     *                         regardless of whether this Observable has been created with ASYNCHRONOUS or SYNCHRONOUS
-     *                         WorkMode.
-     *                         Synchronizing any list updates is not enough, Android will call Adapter.count() and
-     *                         Adapter.get() on the UI thread and you cannot change the adapter's size between these calls.
-     *
-     * @param logger           If you want to be told about warnings, pass an implementation of Logger here (recommended)
-     */
-    public ObservableImp(WorkMode notificationMode, Logger logger) {
-        this.notificationMode = Affirm.notNull(notificationMode);
-        this.logger = Affirm.notNull(logger);
-        this.handler = handler(notificationMode);
-    }
-
-
-    private final ArrayList<Observer> observerList = new ArrayList<Observer>();
-
-    /**
-     * Take the observer and add it to the list of registered observers that
-     * want to be notified when the model data changes.
-     */
-    public synchronized void addObserver(Observer observer) {
-
-        observerList.add(Affirm.notNull(observer));
-
-        if (observerList.size() > 2 && logger != null) {
-            logger.w(TAG, "There are now:" + observerList.size() + " Observers added to this Observable, that's quite a lot.\n" +
-                    "It's sometimes indicative of code which is not removing observers when it should\n" +
-                    "(forgetting to remove observers in an onPause() or onDetachedFromWindow() method for example)\n" +
-                    "Failing to remove observers when you no longer need them will cause memory leaks");
-        }
-
-    }
-
-    /**
-     * Remove the observer from the list of registered observers, you should do this
-     * from android lifecycle methods like onPause() to prevent memory leaks
-     *
-     * @param observer the observer that is no longer interested in receiving updates
-     *                 from the model when its data changes
-     */
-    public synchronized void removeObserver(Observer observer) {
-        observerList.remove(Affirm.notNull(observer));
-    }
-
-
-    /**
-     * Extending classes should call this method, whenever the model data is
-     * updated. somethingChanged() will be called on each registered observer.
-     * <p>
-     * If the Observable has been constructed with the SYNCHRONOUS method parameter
-     * then the notifications will be called on the same thread that this method is
-     * called on.<p>
-     * If the Observable has been constructed with the ASYNCHRONOUS method parameter
-     * then the notifications will be posted to the UI thread if necessary (if notifyObservers
-     * is already on the UI thread then the observers will be called immediately, with no posting done)
-     * <p>
-     * NB: If there are any Android Adapters depending on your model for their list data, you will
-     * want to make sure that you only update this list based data on the UI thread (i.e. for use
-     * with adapters, you should only call notifyObservers() on the UI thread). This remains true
-     * regardless of whether this Observable has been created with ASYNCHRONOUS or SYNCHRONOUS
-     * WorkMode.
-     * Synchronizing any list updates is not enough, Android will call Adapter.count() and
-     * Adapter.get() on the UI thread and you cannot change the adapter's size between these calls.
-     */
-    public synchronized void notifyObservers() {
-
-        for (final Observer observer : observerList) {
-
-            //don't post to UI thread if we are already on it as this can cause problems with android adapters
-            if (notificationMode == WorkMode.SYNCHRONOUS || Looper.myLooper() == Looper.getMainLooper()) {
-                doNotification(observer);
-            } else {
-                // post notifications to UI thread (so that no special work needs to be done by observers to update UI)
-                handler.post(() -> doNotification(observer));
-            }
-        }
-    }
-
-    public boolean hasObservers(){
-        return (observerList.size()>0);
-    }
-
-    private void doNotification(Observer observer) {
-        try {
-            observer.somethingChanged();
-        } catch (Exception e) {
-
-            if (logger != null) {
-
-                String errorMessage = "One of the observers has thrown an exception during its somethingChanged() callback\n";
-
-                logger.e(TAG, errorMessage + e.getMessage());
-
-                if (Looper.myLooper() != Looper.getMainLooper()) {
-                    logger.e(TAG, "NOTE: this code is NOT currently on the UI thread,\n" +
-                            "if you are trying to update any part of the android UI,\n" +
-                            "this needs to happen on the UI thread.\n" +
-                            "You can achieve this by either a) calling notifyObservers() from the UI thread,\n" +
-                            "or by b) constructing this Observable with the ASYNCHRONOUS parameter which will\n" +
-                            "ensure that all notifications are run on the UI thread regardless.\n" +
-                            "\n" +
-                            "If you are updating list based data for an Android Adapter directly with these notifications,\n" +
-                            "then you need to use option a).\n");
-                }
-            }
-
-            throw e;
-        }
-    }
-
-    private Handler handler(WorkMode workMode){
-        return (workMode == WorkMode.ASYNCHRONOUS) ? new Handler(Looper.getMainLooper()) : null;
-    }
-}
diff --git a/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/threading/Async.java b/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/threading/Async.java
deleted file mode 100644
index b4e85594..00000000
--- a/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/threading/Async.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package co.early.fore.core.threading;
-
-import android.os.AsyncTask;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-
-
-public abstract class Async<Input, Progress, Result> extends AsyncTask<Input, Progress, Result> {
-
-    protected final WorkMode workMode;
-
-    /**
-     * In all cases you need to use the executeTask() method rather than
-     * execute(), or you will get regular AsyncTask behaviour which can't then be
-     * mocked for tests.
-     * <p>
-     * In addition, if you want to use publishProgress(), you need to call publishProgressTask()
-     * instead or again you will get regular AsyncTask behaviour which can't then be mocked for tests.
-     * Sorry. I'm not the one who made those AsyncTask methods final :/
-     * <p>
-     *
-     * @param workMode if SYNCHRONOUS, onPreExecute(), doInBackground(), onProgressUpdate(), onPostExecute()
-     * will all be run synchronously on the same thread, so the executeTask() call will block.
-     * This means that if you call cancel() sometime later on in the code, when you are running
-     * tests (i.e. using SYNCHRONOUS), the whole thing will have already completed right the way
-     * through to onPostExecute() by the time you get to the cancel() part of your code.
-     * <p>
-     * If you're planning on doing any network io or anything that will take a long time in
-     * doInBackground() don't forget you also need to mock out that kind of behaviour when you are
-     * doing tests, or at best your tests will take ages, at worst your tests will be dependent on
-     * a network and fail when it's not available.
-     * <p>
-     * if ASYNCHRONOUS, a regular AsyncTask will be used to perform the execute
-     * method as expected (but using a THREAD_POOL_EXECUTOR in all versions of android)
-     *
-     */
-    public Async(WorkMode workMode) {
-        this.workMode = Affirm.notNull(workMode);
-    }
-
-    public void executeTask(Input... params) {
-        if (workMode == WorkMode.SYNCHRONOUS) {
-            onPreExecute();
-            onPostExecute(doInBackground(params));
-        } else {
-            super.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
-        }
-    }
-
-    protected void publishProgressTask(Progress... values) {
-        if (workMode == WorkMode.SYNCHRONOUS) {
-            onProgressUpdate(values);
-        } else {
-            super.publishProgress(values);
-        }
-    }
-
-    void doPublishProgress(Progress... values){
-        publishProgress(values);
-    }
-
-    @Override
-    protected void onPreExecute() {
-        //no opp
-    }
-
-    @Override
-    protected void onPostExecute(Result result) {
-        //no opp
-    }
-
-    @Override
-    protected void onProgressUpdate(Progress... values) {
-        //no opp
-    }
-}
diff --git a/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/threading/AsyncBuilder.java b/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/threading/AsyncBuilder.java
deleted file mode 100644
index 5d085120..00000000
--- a/fore-jv/fore-jv-android-core/src/main/java/co/early/fore/core/threading/AsyncBuilder.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package co.early.fore.core.threading;
-
-import android.annotation.SuppressLint;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.callbacks.DoThisCallback;
-import co.early.fore.core.callbacks.DoThisWithPayloadCallback;
-
-/**
- * Note that this class while a lot less verbose than Async, doesn't support progress updates,
- * for that you need to use Async directly
- */
-public class AsyncBuilder<Input, Result>{
-
-    private final WorkMode workMode;
-
-    private DoInBackgroundCallback<Input, Result> doInBackground;
-    private DoThisCallback onPreExecute;
-    private DoThisWithPayloadCallback<Result> onPostExecute;
-
-    private Async<Input, Void, Result> async = null;
-
-    public AsyncBuilder(WorkMode workMode) {
-        this.workMode = Affirm.notNull(workMode);
-    }
-
-    public AsyncBuilder<Input, Result> doInBackground(DoInBackgroundCallback<Input, Result> doInBackground){
-        this.doInBackground = Affirm.notNull(doInBackground);
-        return this;
-    }
-
-    public AsyncBuilder<Input, Result> onPreExecute(DoThisCallback onPreExecute){
-        this.onPreExecute = Affirm.notNull(onPreExecute);
-        return this;
-    }
-
-    public AsyncBuilder<Input, Result> onPostExecute(DoThisWithPayloadCallback<Result> onPostExecute){
-        this.onPostExecute = Affirm.notNull(onPostExecute);
-        return this;
-    }
-
-    @SuppressLint("StaticFieldLeak")
-    public Async<Input, Void, Result> execute(Input... inputs){
-
-        if (async != null){
-            throw new IllegalStateException("Please construct a new AsyncBuilder, as with Async these instances can only be executed once");
-        }
-
-        if (doInBackground == null) {
-            throw new IllegalStateException("You must call at least doInBackground() before calling execute");
-        }
-
-        async = new Async<Input, Void, Result>(workMode) {
-
-            @Override
-            protected void onPreExecute() {
-                if (onPreExecute != null) {
-                    onPreExecute.doThis();
-                }
-            }
-
-            @Override
-            protected Result doInBackground(Input... inputs) {
-                return doInBackground.doThisAndReturn(inputs);
-            }
-
-            @Override
-            protected void onPostExecute(Result result) {
-                if (onPostExecute != null) {
-                    onPostExecute.doThis(result);
-                }
-            }
-        };
-
-        async.executeTask(inputs);
-
-        return async;
-    }
-
-    public interface DoInBackgroundCallback<Input, Result> {
-        Result doThisAndReturn(Input... inputs);
-    }
-}
diff --git a/fore-jv/fore-jv-android-network/build.gradle.kts b/fore-jv/fore-jv-android-network/build.gradle.kts
deleted file mode 100644
index 295d90eb..00000000
--- a/fore-jv/fore-jv-android-network/build.gradle.kts
+++ /dev/null
@@ -1,64 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-jv-android-network")
-    set("LIB_DESCRIPTION", "fore - android network helpers, java")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = "co.early.fore.net"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = Shared.Android.minSdk
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer-network.pro") // NB different consumer file
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-        }
-    }
-}
-
-dependencies {
-    api(project(":fore-jv:fore-jv-network"))
-    api(project(":fore-jv:fore-jv-android-core"))
-    compileOnly("com.apollographql.apollo:apollo-runtime:${Shared.Versions.apollo}")
-    compileOnly("com.squareup.retrofit2:retrofit:${Shared.Versions.retrofit}")
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-jv/fore-jv-android-network/src/main/AndroidManifest.xml b/fore-jv/fore-jv-android-network/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-jv/fore-jv-android-network/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/ApolloCaller.java b/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/ApolloCaller.java
deleted file mode 100644
index 9f73c5c9..00000000
--- a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/ApolloCaller.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package co.early.fore.net.apollo;
-
-import com.apollographql.apollo.ApolloCall;
-
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallbackWithPayload;
-
-public interface ApolloCaller<F> {
-    <S> void processCall(ApolloCall<S> call,
-                         SuccessCallbackWithPayload<CallProcessorApollo.SuccessResult<S>> successCallbackWithPayload,
-                         FailureCallbackWithPayload<F> failureCallbackWithPayload);
-}
diff --git a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/CallProcessorApollo.java b/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/CallProcessorApollo.java
deleted file mode 100644
index bb2923c1..00000000
--- a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/CallProcessorApollo.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package co.early.fore.net.apollo;
-
-import com.apollographql.apollo.ApolloCall;
-import com.apollographql.apollo.api.Response;
-import com.apollographql.apollo.exception.ApolloException;
-
-import org.jetbrains.annotations.NotNull;
-
-import com.apollographql.apollo.api.Error;
-import java.util.List;
-import java.util.Map;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallbackWithPayload;
-import co.early.fore.core.logging.Logger;
-
-/**
- * F - Globally applicable failure message class, like an enum for example
- * S - Success pojo you expect to be returned from the API
- * CE - Custom error class that you expect from the specific API in the event of an error
- * <p>
- * CE needs to implement MessageProvider&lt;F&gt; (i.e. it needs to be able to give you a failure
- * message that can be passed back to the application)
- *
- * Testing: Apollo is not setup to be able to run calls in a synchronous manner (unlike Retrofit),
- * for this reason when testing the fore ApolloCallProcessor we need to use count down latches
- * and there are no WorkMode options specified here
- *
- * @param <F> The class type passed back in the event of a failure, Globally applicable
- *            failure message class, like an enum for example
- */
-public class CallProcessorApollo<F> implements ApolloCaller<F> {
-
-    public static final String TAG = CallProcessorApollo.class.getSimpleName();
-
-    private final ErrorHandler<F> globalErrorHandler;
-    private final Logger logger;
-    private final boolean allowPartialSuccesses;
-
-    /**
-     * @param globalErrorHandler does what it says
-     * @param logger does what it says
-     */
-    public CallProcessorApollo(ErrorHandler<F> globalErrorHandler, Logger logger) {
-        this(globalErrorHandler, logger, false);
-    }
-
-    /**
-     * @param globalErrorHandler does what it says
-     * @param logger does what it says
-     * @param allowPartialSuccesses (defaults to false) The GraphQL spec allows for success responses
-     * with qualified errors, like this: https://spec.graphql.org/draft/#example-90475 if true, you will
-     * receive these responses as successes, together with the list of partial errors that were attached
-     * in the response. If allowPartialSuccesses=false, these types of responses will be delivered as
-     * errors and the successful parts of the response will be dropped. Setting it to true is going to
-     * make keeping your domain layer and api layers separate a lot harder, and apart from in some highly
-     * optimised situations I'd recommend you keep it set to false.
-     */
-    public CallProcessorApollo(ErrorHandler<F> globalErrorHandler, Logger logger, boolean allowPartialSuccesses) {
-        this.globalErrorHandler = Affirm.notNull(globalErrorHandler);
-        this.logger = Affirm.notNull(logger);
-        this.allowPartialSuccesses = allowPartialSuccesses;
-    }
-
-    /**
-     * @param call                       Apollo call to be processed
-     * @param successCallbackWithPayload call back triggered in the event of a successful call
-     * @param failureCallbackWithPayload call back triggered in the event of a failed call
-     * @param <S>                        Successful response body type
-     */
-    @Override
-    public <S> void processCall(ApolloCall<S> call,
-                                final SuccessCallbackWithPayload<SuccessResult<S>> successCallbackWithPayload,
-                                final FailureCallbackWithPayload<F> failureCallbackWithPayload) {
-        Affirm.notNull(call);
-        Affirm.notNull(successCallbackWithPayload);
-        Affirm.notNull(failureCallbackWithPayload);
-
-        call.enqueue(new ApolloCall.Callback<S>() {
-
-            @Override
-            public void onResponse(@NotNull Response<S> response) {
-                processSuccessResponse(response, successCallbackWithPayload, failureCallbackWithPayload);
-            }
-
-            @Override
-            public void onFailure(@NotNull ApolloException e) {
-                processFailResponse(e, null, failureCallbackWithPayload);
-            }
-        });
-    }
-
-    private <S> void processSuccessResponse(Response<S> response,
-                                            final SuccessCallbackWithPayload<SuccessResult<S>> successCallbackWithPayload,
-                                            final FailureCallbackWithPayload<F> failureCallbackWithPayload) {
-        S data = response.getData();
-
-        if (data != null) {
-            if (!response.hasErrors() || allowPartialSuccesses) {
-                successCallbackWithPayload.success(
-                        new SuccessResult<S>(
-                                data,
-                                response.getErrors(),
-                                response.getExtensions(),
-                                response.isFromCache()
-                        )
-                );
-            } else {
-                processFailResponse(null, response, failureCallbackWithPayload);
-            }
-        } else {
-            processFailResponse(null, response, failureCallbackWithPayload);
-        }
-    }
-
-    private <S> void processFailResponse(Throwable t, Response<S> errorResponse,
-                                         final FailureCallbackWithPayload<F> failureCallbackWithPayload) {
-
-        if (t != null) {
-            logger.w(TAG, "processFailResponse()", t);
-        }
-
-        failureCallbackWithPayload.fail(globalErrorHandler.handleError(t, errorResponse));
-    }
-
-    public static class SuccessResult<S> {
-
-        final S data;
-        final List<Error> partialErrors;
-        final Map<String, Object> extensions;
-        final Boolean isFromCache;
-
-        public SuccessResult(S data, List<Error> partialErrors, Map<String, Object> extensions, Boolean isFromCache) {
-            this.data = data;
-            this.partialErrors = partialErrors;
-            this.extensions = extensions;
-            this.isFromCache = isFromCache;
-        }
-    }
-}
diff --git a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/ErrorHandler.java b/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/ErrorHandler.java
deleted file mode 100644
index 85417c39..00000000
--- a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/apollo/ErrorHandler.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package co.early.fore.net.apollo;
-
-import com.apollographql.apollo.api.Response;
-
-import org.jetbrains.annotations.Nullable;
-
-
-/**
- *
- * @param <F> Failure message class to be used throughout the app, such as an enum
- */
-public interface ErrorHandler<F> {
-    /**
-     *
-     * @param t throwable that caused the error, may be null
-     * @param errorResponse error response from the server, the body of which may represent a custom error, may be null
-     * @return the parsed error from the server
-     */
-    F handleError(@Nullable Throwable t, @Nullable Response errorResponse);
-}
diff --git a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/CallProcessorRetrofit2.java b/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/CallProcessorRetrofit2.java
deleted file mode 100644
index 096a4dc9..00000000
--- a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/CallProcessorRetrofit2.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package co.early.fore.net.retrofit2;
-
-import java.io.IOException;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallbackWithPayload;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.net.MessageProvider;
-import okhttp3.Request;
-import retrofit2.Call;
-import retrofit2.Response;
-
-/**
- * F - Globally applicable failure message class, like an enum for example
- * S - Success pojo you expect to be returned from the API
- * CE - Custom error class that you expect from the specific API in the event of an error
- *
- * CE needs to implement MessageProvider&lt;F&gt; (i.e. it needs to be able to give you a failure
- * message that can be passed back to the application)
- *
- * @param <F>  The class type passed back in the event of a failure, Globally applicable
- *           failure message class, like an enum for example
- */
-public class CallProcessorRetrofit2<F> implements Retrofit2Caller<F> {
-
-    public static final String TAG = CallProcessorRetrofit2.class.getSimpleName();
-
-    private final ErrorHandler<F> globalErrorHandler;
-    private final Logger logger;
-
-
-    public CallProcessorRetrofit2(ErrorHandler<F> globalErrorHandler, Logger logger) {
-        this.globalErrorHandler = Affirm.notNull(globalErrorHandler);
-        this.logger = Affirm.notNull(logger);
-    }
-
-    /**
-     *
-     * @param call Retrofit call to be processed
-     * @param workMode how to process the call (synchronously or asynchronously)
-     * @param successCallbackWithPayload call back triggered in the event of a successful call
-     * @param failureCallbackWithPayload call back triggered in the event of a failed call
-     * @param <S> Successful response body type
-     */
-    @Override
-    public <S> void processCall(Call<S> call, WorkMode workMode,
-                                final SuccessCallbackWithPayload<S> successCallbackWithPayload,
-                                final FailureCallbackWithPayload<F> failureCallbackWithPayload) {
-        doProcessCall(call, workMode, null, successCallbackWithPayload, failureCallbackWithPayload);
-    }
-
-    /**
-     *
-     * @param call Retrofit call to be processed
-     * @param workMode how to process the call (synchronously or asynchronously)
-     * @param customErrorClazz custom error class expected from the server in the event of an error
-     * @param successCallbackWithPayload call back triggered in the event of a successful call
-     * @param failureCallbackWithPayload call back triggered in the event of a failed call
-     * @param <S> Successful response body type
-     * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
-     */
-    @Override
-    public <S, CE extends MessageProvider<F>> void processCall(Call<S> call, WorkMode workMode, final Class<CE> customErrorClazz,
-                                                               final SuccessCallbackWithPayload<S> successCallbackWithPayload,
-                                                               final FailureCallbackWithPayload<F> failureCallbackWithPayload) {
-        doProcessCall(call, workMode, Affirm.notNull(customErrorClazz), successCallbackWithPayload, failureCallbackWithPayload);
-    }
-
-
-    private <S, CE extends MessageProvider<F>> void doProcessCall(Call<S> call, WorkMode workMode, final Class<CE> customErrorClazz,
-                                              final SuccessCallbackWithPayload<S> successCallbackWithPayload,
-                                              final FailureCallbackWithPayload<F> failureCallbackWithPayload){
-        Affirm.notNull(call);
-        Affirm.notNull(workMode);
-        Affirm.notNull(successCallbackWithPayload);
-        Affirm.notNull(failureCallbackWithPayload);
-
-        if (workMode == WorkMode.SYNCHRONOUS) {
-
-            Response<S> response = null;
-
-            try {
-                response = call.execute();
-            } catch (IOException e) {
-                processFailResponse(e, null, customErrorClazz, call.request(), failureCallbackWithPayload);
-                return;
-            }
-
-            processSuccessResponse(response, customErrorClazz, call.request(), successCallbackWithPayload, failureCallbackWithPayload);
-
-        } else {
-
-            call.enqueue(new retrofit2.Callback<S>() {
-
-                @Override
-                public void onResponse(Call<S> call, Response<S> response) {
-                    processSuccessResponse(response, customErrorClazz, call.request(), successCallbackWithPayload, failureCallbackWithPayload);
-                }
-
-                @Override
-                public void onFailure(Call<S> call, Throwable t) {
-                    processFailResponse(t, null, customErrorClazz, call.request(), failureCallbackWithPayload);
-                }
-            });
-        }
-    }
-
-    private <CE extends MessageProvider<F>, S> void processSuccessResponse(Response<S> response, Class<CE> customErrorClass,
-                                            Request originalRequest,
-                                            final SuccessCallbackWithPayload<S> successCallbackWithPayload,
-                                            final FailureCallbackWithPayload<F> failureCallbackWithPayload) {
-        if (response.isSuccessful()) {
-            successCallbackWithPayload.success(response.body());
-        } else {
-            processFailResponse(null, response, customErrorClass, originalRequest, failureCallbackWithPayload);
-        }
-    }
-
-    private <CE extends MessageProvider<F>, S> void processFailResponse(Throwable t, Response errorResponse, Class<CE>  customErrorClass,
-                                                                        Request originalRequest,
-                                                                        final FailureCallbackWithPayload<F> failureCallbackWithPayload) {
-
-        if (t != null) {
-            logger.w(TAG, "processFailResponse()", t);
-        }
-
-        failureCallbackWithPayload.fail(globalErrorHandler.handleError(t, errorResponse, customErrorClass, originalRequest));
-    }
-
-}
diff --git a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/ErrorHandler.java b/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/ErrorHandler.java
deleted file mode 100644
index 0ea6d4f2..00000000
--- a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/ErrorHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package co.early.fore.net.retrofit2;
-
-import org.jetbrains.annotations.Nullable;
-
-import co.early.fore.net.MessageProvider;
-import okhttp3.Request;
-import retrofit2.Response;
-
-/**
- *
- * @param <F> Failure message class to be used throughout the app, such as an enum
- */
-public interface ErrorHandler<F> {
-    /**
-     *
-     * @param t throwable that caused the error, may be null
-     * @param errorResponse error response from the server, the body of which may represent a custom error, may be null
-     * @param customErrorClazz custom error class expected from the errorResponse, may be null
-     * @param originalRequest in case it's needed (if you need access to the headers for example), may be null
-     * @param <CE> class type of the custom error, may be null
-     * @return the parsed error from the server
-     */
-    <CE extends MessageProvider<F>> F handleError(@Nullable Throwable t, @Nullable Response errorResponse, @Nullable Class<CE> customErrorClazz, @Nullable Request originalRequest);
-}
diff --git a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/Retrofit2Caller.java b/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/Retrofit2Caller.java
deleted file mode 100644
index 52ce86a7..00000000
--- a/fore-jv/fore-jv-android-network/src/main/java/co/early/fore/net/retrofit2/Retrofit2Caller.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package co.early.fore.net.retrofit2;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.callbacks.FailureCallbackWithPayload;
-import co.early.fore.core.callbacks.SuccessCallbackWithPayload;
-import co.early.fore.net.MessageProvider;
-import retrofit2.Call;
-
-public interface Retrofit2Caller<F> {
-    <S> void processCall(Call<S> call, WorkMode workMode,
-                         SuccessCallbackWithPayload<S> successCallbackWithPayload,
-                         FailureCallbackWithPayload<F> failureCallbackWithPayload);
-
-    <S, CE extends MessageProvider<F>> void processCall(Call<S> call, WorkMode workMode, Class<CE> customErrorClazz,
-                                                        SuccessCallbackWithPayload<S> successCallbackWithPayload,
-                                                        FailureCallbackWithPayload<F> failureCallbackWithPayload);
-}
diff --git a/fore-jv/fore-jv-android/build.gradle.kts b/fore-jv/fore-jv-android/build.gradle.kts
deleted file mode 100644
index 93978405..00000000
--- a/fore-jv/fore-jv-android/build.gradle.kts
+++ /dev/null
@@ -1,70 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-jv-android")
-    set("LIB_DESCRIPTION", "android fore - everything in one aar for java android development")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = "co.early.fore"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = Shared.Android.minSdk
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer-network.pro") // NB different consumer file
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-        }
-    }
-}
-
-dependencies {
-
-    api(project(":fore-jv:fore-jv-android-adapters"))
-    api(project(":fore-jv:fore-jv-android-network"))
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("org.mockito:mockito-core:${Shared.Versions.mockito_core}")
-    testImplementation("org.hamcrest:hamcrest-library:${Shared.Versions.hamcrest_library}")
-    testImplementation("org.robolectric:robolectric:${Shared.Versions.robolectric}") {
-        exclude(module = "maven-artifact")
-    }
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-jv/fore-jv-android/src/main/AndroidManifest.xml b/fore-jv/fore-jv-android/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-jv/fore-jv-android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/observer/ObserverGroupTest.java b/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/observer/ObserverGroupTest.java
deleted file mode 100644
index 1eb3b2d2..00000000
--- a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/observer/ObserverGroupTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package co.early.fore.core.observer;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * Copyright © 2018 early.co. All rights reserved.
- */
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
-public class ObserverGroupTest {
-
-    @Mock
-    private Observable mockObservable1;
-    @Mock
-    private Observable mockObservable2;
-    @Mock
-    private Observable mockObservable3;
-    @Mock
-    private Observer mockObserver1;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-    @Test
-    public void whenObserverAdded_observablesAreCalled() {
-
-        //arrange
-        ObservableGroup observableGroup = new ObservableGroupImp(
-                mockObservable1, mockObservable2, mockObservable3);
-
-        //act
-        observableGroup.addObserver(mockObserver1);
-
-        //assert
-        verify(mockObservable1, times(1)).addObserver(eq(mockObserver1));
-        verify(mockObservable2, times(1)).addObserver(eq(mockObserver1));
-        verify(mockObservable3, times(1)).addObserver(eq(mockObserver1));
-    }
-
-    @Test
-    public void whenObserverRemoved_observablesAreCalled() {
-
-        //arrange
-        ObservableGroup observableGroup = new ObservableGroupImp(
-                mockObservable1, mockObservable2, mockObservable3);
-
-        //act
-        observableGroup.removeObserver(mockObserver1);
-
-        //assert
-        verify(mockObservable1, times(1)).removeObserver(eq(mockObserver1));
-        verify(mockObservable2, times(1)).removeObserver(eq(mockObserver1));
-        verify(mockObservable3, times(1)).removeObserver(eq(mockObserver1));
-    }
-
-    @Test
-    public void whenInitialisedWithNullObservablesList_throwsException() {
-
-        //arrange
-        boolean exceptionThrown = false;
-
-        //act
-        try {
-            ObservableGroup observableGroup = new ObservableGroupImp((Observable) null);
-        } catch (Throwable npe) {
-            exceptionThrown = true;
-        }
-
-        //assert
-        Assert.assertTrue(exceptionThrown);
-    }
-
-    @Test
-    public void whenInitialisedWithSingleNullObservable_throwsException() {
-
-        //arrange
-        boolean exceptionThrown = false;
-
-        //act
-        try {
-            ObservableGroup observableGroup = new ObservableGroupImp(
-                    mockObservable1, null, mockObservable3);
-        } catch (Throwable re) {
-            exceptionThrown = true;
-        }
-
-        //assert
-        Assert.assertTrue(exceptionThrown);
-    }
-}
diff --git a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/observer/ObserverTest.java b/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/observer/ObserverTest.java
deleted file mode 100644
index 8146ef2c..00000000
--- a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/observer/ObserverTest.java
+++ /dev/null
@@ -1,533 +0,0 @@
-package co.early.fore.core.observer;
-
-import android.os.Looper;
-
-import org.junit.Assert;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import co.early.fore.core.WorkMode;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.logging.SystemLogger;
-
-import static co.early.fore.core.testhelpers.CountDownLatchWrapper.runInBatch;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.robolectric.shadows.ShadowLooper.runUiThreadTasks;
-
-/**
- * Copyright © 2018 early.co. All rights reserved.
- */
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
-public class ObserverTest {
-
-    @Mock
-    private Logger mockLogger;
-    @Mock
-    private Observer mockObserver1;
-    @Mock
-    private Observer mockObserver2;
-    @Mock
-    private Observer mockObserver3;
-
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-    @Test
-    public void whenInitialised_withSynchronousAndLogger_stateIsCorrect() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS, mockLogger);
-
-        //act
-
-        //assert
-        verifyZeroInteractions(mockLogger);
-        Assert.assertFalse(observable.hasObservers());
-    }
-
-    @Test
-    public void whenInitialised_withSynchronousAndNoLogger_stateIsCorrect() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS);
-
-        //act
-
-        //assert
-        verifyZeroInteractions(mockLogger);
-        Assert.assertFalse(observable.hasObservers());
-    }
-
-    @Test
-    public void whenInitialised_withAsynchronousAndLogger_stateIsCorrect() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS, mockLogger);
-
-        //act
-
-        //assert
-        verifyZeroInteractions(mockLogger);
-        Assert.assertFalse(observable.hasObservers());
-    }
-
-    @Test
-    public void whenInitialised_withAsynchronousAndNoLogger_stateIsCorrect() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS);
-
-        //act
-
-        //assert
-        verifyZeroInteractions(mockLogger);
-        Assert.assertFalse(observable.hasObservers());
-    }
-
-    @Test
-    public void whenOneObserverAdded_withSynchronousAndLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS, mockLogger);
-        observable.addObserver(mockObserver1);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verifyZeroInteractions(mockLogger);
-        verify(mockObserver1, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenOneObserverAdded_withSynchronousAndNoLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verify(mockObserver1, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenOneObserverAdded_withAsynchronousAndLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS, mockLogger);
-        observable.addObserver(mockObserver1);
-
-        //act
-        runInBatch(1, observable, observable::notifyObservers);
-
-        //assert
-        verifyZeroInteractions(mockLogger);
-        verify(mockObserver1, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenOneObserverAdded_withAsynchronousAndNoLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-
-        //act
-        runInBatch(1, observable, () -> {
-            observable.notifyObservers();
-        });
-
-        //assert
-        verify(mockObserver1, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenTwoObserversAdded_withSynchronousAndLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS, mockLogger);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verifyZeroInteractions(mockLogger);
-        verify(mockObserver1, times(1)).somethingChanged();
-        verify(mockObserver2, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenTwoObserversAdded_withSynchronousAndNoLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verify(mockObserver1, times(1)).somethingChanged();
-        verify(mockObserver2, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenTwoObserversAdded_withAsynchronousAndLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS, mockLogger);
-
-        int[] results = new int[1];
-        results[0] = 0;
-
-        CountDownLatch countDownLatch = new CountDownLatch(2);
-        Observer realObserver1 = () -> {
-            results[0]++;
-            countDownLatch.countDown();
-        };
-        Observer realObserver2 = () -> {
-            results[0]++;
-            countDownLatch.countDown();
-        };
-
-        observable.addObserver(realObserver1);
-        observable.addObserver(realObserver2);
-
-
-        //act
-        observable.notifyObservers();
-        countDownLatch.await(10, TimeUnit.MILLISECONDS);
-
-
-        //assert
-        verifyZeroInteractions(mockLogger);
-        Assert.assertEquals(2, results[0]);
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenTwoObserversAdded_withAsynchronousAndNoLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-
-        //act
-        runInBatch(1, observable, () -> {
-            observable.notifyObservers();
-        });
-
-        //assert
-        verify(mockObserver1, times(1)).somethingChanged();
-        verify(mockObserver2, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenThreeObserversAdded_withSynchronousAndLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS, mockLogger);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-        observable.addObserver(mockObserver3);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verify(mockLogger, times(1)).w(anyString(), anyString());
-        verifyNoMoreInteractions(mockLogger);
-        verify(mockObserver1, times(1)).somethingChanged();
-        verify(mockObserver2, times(1)).somethingChanged();
-        verify(mockObserver3, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenThreeObserversAdded_withSynchronousAndNoLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-        observable.addObserver(mockObserver3);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verify(mockObserver1, times(1)).somethingChanged();
-        verify(mockObserver2, times(1)).somethingChanged();
-        verify(mockObserver3, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenThreeObserversAdded_withAsynchronousAndLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS, mockLogger);
-
-        int[] results = new int[1];
-        results[0] = 0;
-
-        CountDownLatch countDownLatch = new CountDownLatch(3);
-        Observer realObserver1 = () -> {
-            results[0]++;
-            countDownLatch.countDown();
-        };
-        Observer realObserver2 = () -> {
-            results[0]++;
-            countDownLatch.countDown();
-        };
-        Observer realObserver3 = () -> {
-            results[0]++;
-            countDownLatch.countDown();
-        };
-
-        observable.addObserver(realObserver1);
-        observable.addObserver(realObserver2);
-        observable.addObserver(realObserver3);
-
-
-        //act
-        observable.notifyObservers();
-        countDownLatch.await(10, TimeUnit.MILLISECONDS);
-
-
-        //assert
-        verify(mockLogger, times(1)).w(anyString(), anyString());
-        verifyNoMoreInteractions(mockLogger);
-        Assert.assertEquals(3, results[0]);
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenThreeObserversAdded_withAsynchronousAndNoLogger_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-        observable.addObserver(mockObserver3);
-
-        //act
-        runInBatch(1, observable, () -> {
-            observable.notifyObservers();
-        });
-
-        //assert
-        verify(mockObserver1, times(1)).somethingChanged();
-        verify(mockObserver2, times(1)).somethingChanged();
-        verify(mockObserver3, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenThreeObserversAdded_thenTwoRemoved_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-        observable.addObserver(mockObserver3);
-
-        observable.removeObserver(mockObserver1);
-        observable.removeObserver(mockObserver2);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verifyZeroInteractions(mockObserver1);
-        verifyZeroInteractions(mockObserver2);
-        verify(mockObserver3, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenThreeObserversAdded_thenThreeRemoved_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-        observable.addObserver(mockObserver3);
-
-        observable.removeObserver(mockObserver1);
-        observable.removeObserver(mockObserver2);
-        observable.removeObserver(mockObserver3);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verifyZeroInteractions(mockObserver1);
-        verifyZeroInteractions(mockObserver2);
-        verifyZeroInteractions(mockObserver3);
-        Assert.assertFalse(observable.hasObservers());
-    }
-
-    @Test
-    public void whenTwoObserversAdded_thenNotify5Times_notificationsFiredCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-        observable.addObserver(mockObserver2);
-
-        //act
-        observable.notifyObservers();
-        observable.notifyObservers();
-        observable.notifyObservers();
-        observable.notifyObservers();
-        observable.notifyObservers();
-
-        //assert
-        verify(mockObserver1, times(5)).somethingChanged();
-        verify(mockObserver2, times(5)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    public void whenExceptionThrowingObserverAdded_withNotificationOnNonUIThread_notifyWarnsCorrectly() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.SYNCHRONOUS, mockLogger);
-        Observer exceptionThrowingObserver = () -> {
-            throw new RuntimeException();
-        };
-        observable.addObserver(exceptionThrowingObserver);
-
-
-        //act
-        CountDownLatch countDownLatch = new CountDownLatch(1);
-        Thread thread = new Thread(() -> {
-            try {
-                observable.notifyObservers();
-            } catch (Throwable t) {
-                //ignore
-            } finally {
-                countDownLatch.countDown();
-            }
-        });
-        thread.start();
-        countDownLatch.await();
-
-
-        //assert
-        verify(mockLogger, times(2)).e(any(), any());
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-
-    /**
-     * The handling of threads and loopers in Robolectric is a bit basic unfortunately,
-     * we are going to have a hard time testing the finer points of the notification
-     * handling in fore until these issues get resolved:
-     *
-     * https://github.com/robolectric/robolectric/issues/1306
-     * https://github.com/robolectric/robolectric/pull/2166
-     * https://github.com/robolectric/robolectric/issues/2977
-     *
-     * So the following tests have been ignored for the moment until we can work out a
-     * nice way to test the threading behaviour of fore
-     */
-
-    @Test
-    @Ignore("This test makes sure that if we call notifyObservers() on the UI thread - even when we" +
-            "are setup in ASYNCHRONOUS mode: the somethingChanged() notification will be called inline" +
-            "_without_ being posted to the end of the message queue (this is important for supporting" +
-            "android adapters). Unfortunately when we run this test with Robolectric, the Handler implementation" +
-            "always runs in-line, so the test would always pass, even if the code was failing.")
-    public void whenNotifyOnUIThread_withAsynchronousSetup_notificationsSentOnUIThreadWithNoYield() throws Exception {
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS);
-        observable.addObserver(mockObserver1);
-
-        //act
-        observable.notifyObservers();
-
-        //assert
-        verify(mockObserver1, times(1)).somethingChanged();
-        Assert.assertTrue(observable.hasObservers());
-    }
-
-    @Test
-    @Ignore("This test makes sure that if we call notifyObservers() on a thread which isn't the UI thread," +
-            "the somethingChanged() notification will come through on the UI thread providing we are setup with" +
-            "ASYNCHRONOUS mode. Unfortunately when we run this test with Robolectric, the Handler implementation" +
-            "always fires on the same thread it was created on, so the test always fails, even if the code is correct.")
-    public void whenNotifyOffUIThread_withAsynchronousSetup_notificationsSentOnUIThread() throws Exception {
-
-        Logger logger = new SystemLogger();
-
-        //arrange
-        Observable observable = new ObservableImp(WorkMode.ASYNCHRONOUS, logger);
-        int[] results = new int[1];
-        results[0] = 0;
-        CountDownLatch countDownLatch = new CountDownLatch(1);
-        Observer realObserver = () -> {
-            if (Looper.myLooper() == Looper.getMainLooper()) {
-                results[0]++;
-            }
-            countDownLatch.countDown();
-            Looper.myLooper().quit();
-        };
-        observable.addObserver(realObserver);
-
-
-        //act
-        Thread thread = new Thread(() -> {
-            Looper.prepare();
-            observable.notifyObservers();
-            runUiThreadTasks();
-        });
-        thread.start();
-        countDownLatch.await();
-
-
-        //assert
-        Assert.assertEquals(1, results[0]);
-    }
-
-}
diff --git a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/ui/trigger/TriggerTest.java b/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/ui/trigger/TriggerTest.java
deleted file mode 100644
index f63f6969..00000000
--- a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/ui/trigger/TriggerTest.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package co.early.fore.core.ui.trigger;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import static co.early.fore.core.ui.trigger.Trigger.ResetRule.IMMEDIATELY;
-import static co.early.fore.core.ui.trigger.Trigger.ResetRule.NEVER;
-import static co.early.fore.core.ui.trigger.Trigger.ResetRule.ONLY_AFTER_REVERSION;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.reset;
-
-import co.early.fore.core.ui.trigger.Trigger;
-
-
-public class TriggerTest {
-
-    @Mock
-    private Threshold mockThreshold;
-
-    @Mock
-    private Triggered mockTriggered;
-
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-    }
-
-
-
-    @Test
-    public void testCheckLazyReset_IMMEDIATELY() {
-
-        Trigger trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                IMMEDIATELY);
-
-        //check
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-
-        trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                IMMEDIATELY);
-
-        // checkLazy threshold breached, but trigger
-        // is swallowed for first trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //immediately reset and triggers
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //immediately reset and triggers
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-    }
-
-    @Test
-    public void testCheckLazyReset_ONLY_AFTER_REVERSION() {
-
-        Trigger trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                ONLY_AFTER_REVERSION);
-
-        //check
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-
-        trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                ONLY_AFTER_REVERSION);
-
-        // checkLazy threshold breached, but trigger
-        // is swallowed for first trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //not yet reset, trigger not fired
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //reset, no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //now triggers once more
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-    }
-
-    @Test
-    public void testCheckLazyReset_NEVER() {
-
-        Trigger trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                NEVER);
-
-        //check
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-
-        trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                NEVER);
-
-        // checkLazy threshold breached, but trigger
-        // is swallowed for first trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //not reset, trigger not fired
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //threshold no longer breached, no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //never reset so no trigger still, even with threshold breached
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.checkLazy();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-    }
-
-    @Test
-    public void testCheckReset_IMMEDIATELY() {
-
-        Trigger trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                IMMEDIATELY);
-
-        //no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //no reset, still above threshold
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //reset, no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-    }
-
-    @Test
-    public void testCheckReset_ONLY_AFTER_REVERSION() {
-
-        Trigger trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                ONLY_AFTER_REVERSION);
-
-        //no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //no reset, still above threshold
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //reset, no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-    }
-
-    @Test
-    public void testCheckReset_NEVER() {
-
-        Trigger trigger = new Trigger(
-                () -> mockTriggered.triggered(),
-                () -> mockThreshold.shouldTrigger(),
-                NEVER);
-
-        //no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, times(1)).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //no reset, still above threshold
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //below threshold, but never reset, no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(false);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-
-        //still no trigger
-        when(mockThreshold.shouldTrigger()).thenReturn(true);
-        trigger.check();
-        verify(mockTriggered, never()).triggered();
-        verify(mockThreshold, times(1)).shouldTrigger();
-        reset(mockTriggered);
-        reset(mockThreshold);
-    }
-
-
-    class Threshold{
-        public boolean shouldTrigger(){
-            return true;
-        }
-    }
-
-    class Triggered {
-        public void triggered(){
-            return;
-        }
-    }
-}
diff --git a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/utils/text/BasicTextWrapperTest.java b/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/utils/text/BasicTextWrapperTest.java
deleted file mode 100644
index 05791596..00000000
--- a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/utils/text/BasicTextWrapperTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package co.early.fore.core.utils.text;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.List;
-
-
-public class BasicTextWrapperTest {
-
-    private static final String EMPTY_TEXT = "";
-    private static final String SPACE_TEXT = " ";
-    private static final String LONG_SPACE_TEXT = "     ";
-    private static final String SHORT_TEXT = "hello";
-    private static final String LONG_TEXT = "The quick brown fox jumped over the lazy dogs, the quick brown fox jumped over the lazy dogs.";
-    private static final String LONG_TEXT_LONG_WORD = "The quick brown fox jumped over the lazy 1 abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789 the quick brown fox";
-
-    private static final int ZERO_CHARACTERS_AVAILABLE = 0;
-    private static final int TINY_CHARACTERS_AVAILABLE = 1;
-    private static final int MEDIUM_CHARACTERS_AVAILABLE = 40;
-
-    private static final String FIRST_LINE = "The quick brown fox jumped over the lazy";
-    private static final String SECOND_LINE = "dogs, the quick brown fox jumped over";
-    private static final String THIRD_LINE = "the lazy dogs.";
-
-    private static final String DOUBLE_SPACE_TEXT = "The quick brown fox jumped over the    -multi space text";
-    private static final String LINE_BREAK_TEXT = "The quick brown\nfox jumped over the abc defghi\njklmnopqrstuvwxyz0123\n\n\n45678 9abcde fghijklm nopqrs tuvwxyz0 123456";
-
-
-    private static final String FIRST_LINE_DOUBLE_SPACE = "The quick brown fox jumped over the";
-    private static final String FIRST_LINE_LINE_BREAK = "The quick brown";
-
-    @Test
-    public void testMediumText_mediumWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(LONG_TEXT, MEDIUM_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals(FIRST_LINE, wrappedLines.get(0));
-        Assert.assertEquals(SECOND_LINE, wrappedLines.get(1));
-        Assert.assertEquals(THIRD_LINE, wrappedLines.get(2));
-        Assert.assertEquals(3, wrappedLines.size());
-    }
-
-    @Test
-    public void testSmallText_mediumWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(SHORT_TEXT, MEDIUM_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals(SHORT_TEXT, wrappedLines.get(0));
-        Assert.assertEquals(1, wrappedLines.size());
-    }
-
-    @Test
-    public void testEmptyText_mediumWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(EMPTY_TEXT, MEDIUM_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals("", wrappedLines.get(0));
-
-        Assert.assertEquals(1, wrappedLines.size());
-    }
-
-    @Test
-    public void testSpaceText_mediumWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(SPACE_TEXT, MEDIUM_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals(SPACE_TEXT, wrappedLines.get(0));
-        Assert.assertEquals(1, wrappedLines.size());
-    }
-
-    @Test
-    public void testLongSpaceText_mediumWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(LONG_SPACE_TEXT, MEDIUM_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals(SPACE_TEXT, wrappedLines.get(0));//note we only expect one space back
-        Assert.assertEquals(1, wrappedLines.size());
-    }
-
-    @Test
-    public void testShortText_tinyWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(SHORT_TEXT, TINY_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals("h", wrappedLines.get(0));
-        Assert.assertEquals("e", wrappedLines.get(1));
-        Assert.assertEquals("l", wrappedLines.get(2));
-        Assert.assertEquals("l", wrappedLines.get(3));
-        Assert.assertEquals("o", wrappedLines.get(4));
-
-        Assert.assertEquals(5, wrappedLines.size());
-    }
-
-    @Test
-    public void testLongTextWithLongWord_mediumWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(LONG_TEXT_LONG_WORD, MEDIUM_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals(FIRST_LINE, wrappedLines.get(0));
-        Assert.assertEquals("1", wrappedLines.get(1));
-        Assert.assertEquals("abcdefghijklmnopqrstuvwxyz0123456789abcd", wrappedLines.get(2));
-        Assert.assertEquals("efghijklmnopqrstuvwxyz0123456789 the", wrappedLines.get(3));
-        Assert.assertEquals("quick brown fox", wrappedLines.get(4));
-        Assert.assertEquals(5, wrappedLines.size());
-    }
-
-    @Test
-    public void testMultipleSpaceText_mediumWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(DOUBLE_SPACE_TEXT, MEDIUM_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals(FIRST_LINE_DOUBLE_SPACE, wrappedLines.get(0));
-        Assert.assertEquals("-multi space text", wrappedLines.get(1));
-        Assert.assertEquals(2, wrappedLines.size());
-    }
-
-    @Test
-    public void testLineBreakText_mediumWidthAvailable() {
-
-        List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(LINE_BREAK_TEXT, MEDIUM_CHARACTERS_AVAILABLE);
-
-        Assert.assertEquals(FIRST_LINE_LINE_BREAK, wrappedLines.get(0));
-        Assert.assertEquals("fox jumped over the abc defghi", wrappedLines.get(1));
-        Assert.assertEquals("jklmnopqrstuvwxyz0123", wrappedLines.get(2));
-        Assert.assertEquals("", wrappedLines.get(3));
-        Assert.assertEquals("", wrappedLines.get(4));
-        Assert.assertEquals("45678 9abcde fghijklm nopqrs tuvwxyz0", wrappedLines.get(5));
-        Assert.assertEquals("123456", wrappedLines.get(6));
-
-        Assert.assertEquals(7, wrappedLines.size());
-    }
-
-
-    @Test
-    public void testLongText_zeroWidthAvailable() {
-
-        boolean exceptionThrown = false;
-
-        try {
-            List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(LONG_TEXT, ZERO_CHARACTERS_AVAILABLE);
-        } catch (IllegalArgumentException e) {
-            exceptionThrown = true;
-        }
-
-        Assert.assertTrue(exceptionThrown);
-    }
-
-
-}
diff --git a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/utils/text/TextPadderTest.java b/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/utils/text/TextPadderTest.java
deleted file mode 100644
index 0608af3b..00000000
--- a/fore-jv/fore-jv-android/src/test/java/co/early/fore/core/utils/text/TextPadderTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package co.early.fore.core.utils.text;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-
-public class TextPadderTest {
-
-    private static final String TEXT_ORIG = "foo";
-    private static final char PADDING_CHARACTER = '+';
-
-    @Test
-    public void testPaddingOnTheRight() {
-
-        String paddedText = TextPadder.padText(TEXT_ORIG, 10, TextPadder.Pad.RIGHT, '+');
-
-        Assert.assertEquals(TEXT_ORIG + "+++++++", paddedText);
-    }
-
-
-    @Test
-    public void testPaddingOnTheLeft() {
-
-        String paddedText = TextPadder.padText(TEXT_ORIG, 10, TextPadder.Pad.LEFT, '*');
-
-        Assert.assertEquals("*******" + TEXT_ORIG, paddedText);
-    }
-
-
-    @Test
-    public void testPaddingWhenAlreadyPadded() {
-
-        String paddedText = TextPadder.padText(TEXT_ORIG, 3, TextPadder.Pad.LEFT, PADDING_CHARACTER);
-
-        Assert.assertEquals(TEXT_ORIG, paddedText);
-    }
-
-
-    @Test
-    public void testPaddingIllegalValues() {
-
-        try {
-            TextPadder.padText(null, 3, TextPadder.Pad.LEFT, PADDING_CHARACTER);
-            Assert.fail("should have thrown an exception by now: original text was null");
-        } catch (Exception e) {
-        }
-
-        try {
-            TextPadder.padText(TEXT_ORIG, 3, null, PADDING_CHARACTER);
-            Assert.fail("should have thrown an exception by now: pad direction was null");
-        } catch (Exception e) {
-        }
-
-        try {
-            TextPadder.padText(TEXT_ORIG, 2, TextPadder.Pad.LEFT, PADDING_CHARACTER);
-            Assert.fail("should have thrown an exception by now: original text was already longer than the desiredLength");
-        } catch (Exception e) {
-        }
-    }
-
-}
diff --git a/fore-jv/fore-jv-core/build.gradle.kts b/fore-jv/fore-jv-core/build.gradle.kts
deleted file mode 100644
index c145f679..00000000
--- a/fore-jv/fore-jv-core/build.gradle.kts
+++ /dev/null
@@ -1,20 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    id("java-library")
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-jv-core")
-    set("LIB_DESCRIPTION", "fore - java core code")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-apply(from = "../../publish-lib.gradle.kts")
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/Affirm.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/Affirm.java
deleted file mode 100644
index 12bb5f9c..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/Affirm.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package co.early.fore.core;
-
-public class Affirm {
-
-    public static <T> T notNull(T param) {
-        if (param == null) {
-            throw new NullPointerException("Parameter must not be null");
-        }
-        return param;
-    }
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/WorkMode.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/WorkMode.java
deleted file mode 100644
index 78711067..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/WorkMode.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package co.early.fore.core;
-
-public enum WorkMode {
-    ASYNCHRONOUS,
-    SYNCHRONOUS
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/ContinueCallback.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/ContinueCallback.java
deleted file mode 100644
index beae424f..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/ContinueCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.core.callbacks;
-
-public interface ContinueCallback {
-    void carryOn();
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/DoThisCallback.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/DoThisCallback.java
deleted file mode 100644
index 782a695f..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/DoThisCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.core.callbacks;
-
-public interface DoThisCallback {
-    void doThis();
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/DoThisWithPayloadCallback.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/DoThisWithPayloadCallback.java
deleted file mode 100644
index b39b9ac2..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/DoThisWithPayloadCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.core.callbacks;
-
-public interface DoThisWithPayloadCallback<T> {
-    void doThis(T payload);
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/FailureCallback.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/FailureCallback.java
deleted file mode 100644
index fa9af350..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/FailureCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.core.callbacks;
-
-public interface FailureCallback {
-    void fail();
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/FailureCallbackWithPayload.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/FailureCallbackWithPayload.java
deleted file mode 100644
index 5f6fed66..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/FailureCallbackWithPayload.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.core.callbacks;
-
-public interface FailureCallbackWithPayload<F> {
-    void fail(F failureMessage);
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/SuccessCallback.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/SuccessCallback.java
deleted file mode 100644
index 86f815f0..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/SuccessCallback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.core.callbacks;
-
-public interface SuccessCallback {
-    void success();
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/SuccessCallbackWithPayload.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/SuccessCallbackWithPayload.java
deleted file mode 100644
index 7f773900..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/callbacks/SuccessCallbackWithPayload.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.core.callbacks;
-
-public interface SuccessCallbackWithPayload<S> {
-    void success(S successResponse);
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/logging/Logger.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/logging/Logger.java
deleted file mode 100644
index 55508271..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/logging/Logger.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package co.early.fore.core.logging;
-
-
-public interface Logger {
-
-    void e(String tag, String message);
-    void w(String tag, String message);
-    void i(String tag, String message);
-    void d(String tag, String message);
-    void v(String tag, String message);
-
-    void e(String tag, String message, Throwable throwable);
-    void w(String tag, String message, Throwable throwable);
-    void i(String tag, String message, Throwable throwable);
-    void d(String tag, String message, Throwable throwable);
-    void v(String tag, String message, Throwable throwable);
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/logging/SystemLogger.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/logging/SystemLogger.java
deleted file mode 100644
index 6622afca..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/logging/SystemLogger.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package co.early.fore.core.logging;
-
-
-import co.early.fore.core.utils.text.TextPadder;
-
-public class SystemLogger implements Logger {
-
-    private int longestTagLength = 0;
-
-    @Override
-    public void e(String tag, String message) {
-        System.out.println("(E) " + padTagWithSpace(tag) + "|" + message);
-    }
-
-    @Override
-    public void w(String tag, String message) {
-        System.out.println("(W) " + padTagWithSpace(tag) + "|" + message);
-    }
-
-    @Override
-    public void i(String tag, String message) {
-        System.out.println("(I) " + padTagWithSpace(tag) + "|" + message);
-    }
-
-    @Override
-    public void d(String tag, String message) {
-        System.out.println("(D) " + padTagWithSpace(tag) + "|" + message);
-    }
-
-    @Override
-    public void v(String tag, String message) {
-        System.out.println("(V) " + padTagWithSpace(tag) + "|" + message);
-    }
-
-
-    @Override
-    public void e(String tag, String message, Throwable throwable) {
-        e(tag, message);
-        System.out.println(throwable);
-    }
-
-    @Override
-    public void w(String tag, String message, Throwable throwable) {
-        w(tag, message);
-        System.out.println(throwable);
-    }
-
-    @Override
-    public void i(String tag, String message, Throwable throwable) {
-        i(tag, message);
-        System.out.println(throwable);
-    }
-
-    @Override
-    public void d(String tag, String message, Throwable throwable) {
-        d(tag, message);
-        System.out.println(throwable);
-    }
-
-    @Override
-    public void v(String tag, String message, Throwable throwable) {
-        v(tag, message);
-        System.out.println(throwable);
-    }
-
-
-    private String padTagWithSpace(String tag){
-
-        longestTagLength = Math.max(longestTagLength, tag.length() + 1);
-
-        if (longestTagLength != tag.length()) {
-            return TextPadder.padText(tag, longestTagLength, TextPadder.Pad.RIGHT, ' ');
-        }else{
-            return tag;
-        }
-    }
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/Observable.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/Observable.java
deleted file mode 100644
index 350c5966..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/Observable.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.observer;
-
-
-public interface Observable extends ObservableGroup {
-    void notifyObservers();
-    boolean hasObservers();
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/ObservableGroup.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/ObservableGroup.java
deleted file mode 100644
index c544d2ac..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/ObservableGroup.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.observer;
-
-
-public interface ObservableGroup {
-    void addObserver(Observer observer);
-    void removeObserver(Observer observer);
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/ObservableGroupImp.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/ObservableGroupImp.java
deleted file mode 100644
index c82dd65b..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/ObservableGroupImp.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package co.early.fore.core.observer;
-
-import java.util.Arrays;
-import java.util.List;
-
-import co.early.fore.core.Affirm;
-
-public class ObservableGroupImp implements ObservableGroup {
-
-    private final List<Observable> observablesList;
-
-    public ObservableGroupImp(Observable... observablesList) {
-        this.observablesList = Arrays.asList(Affirm.notNull(observablesList));
-        checkObservables();
-    }
-
-    @Override
-    public void addObserver(Observer observer) {
-        for (Observable observable : observablesList) {
-            observable.addObserver(observer);
-        }
-    }
-
-    @Override
-    public void removeObserver(Observer observer) {
-        for (Observable observable : observablesList) {
-            observable.removeObserver(observer);
-        }
-    }
-
-    private void checkObservables() {
-        for (Observable observable : observablesList) {
-            if (observable == null) {
-                throw new RuntimeException("ObservableGroup has been instantiated with at least one null observable");
-            }
-        }
-    }
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/Observer.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/Observer.java
deleted file mode 100644
index d64d8a02..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/observer/Observer.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package co.early.fore.core.observer;
-
-public interface Observer {
-
-    /**
-     * Called by the model on each observer whenever the model data has changed, implementing
-     * classes should take this as an invitation to query the model again for any new data.
-     */
-    void somethingChanged();
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/testhelpers/CountDownLatchWrapper.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/testhelpers/CountDownLatchWrapper.java
deleted file mode 100644
index 80269cc7..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/testhelpers/CountDownLatchWrapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package co.early.fore.core.testhelpers;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import co.early.fore.core.observer.Observable;
-
-
-/**
- * Removing countdownlatch boiler plate from tests which require latches
- */
-public class CountDownLatchWrapper {
-
-    public static final int DEFAULT_TIMEOUT_SECONDS = 2;
-    private static int timeoutInSeconds = DEFAULT_TIMEOUT_SECONDS;
-
-    /**
-     * @param updatesExpected how many notifications (countdowns) you expect from the observable
-     * @param observableModel observable model to be used for counting down the latch
-     * @param surroundByCountdownLatch code to be surrounded by the countdown latch
-     */
-    public static void runInBatch(int updatesExpected, Observable observableModel, SurroundByCountdownLatch surroundByCountdownLatch){
-
-        CountDownLatch latch = new CountDownLatch(updatesExpected);
-        observableModel.addObserver(() -> latch.countDown());
-
-        surroundByCountdownLatch.run();
-
-        // Try to ensure all the invalidation trackers have been fired before we continue.
-        // In reality, there are some things we can't be deterministic about (Room batches up
-        // its invalidation trackers for example, so we can't tell how many we will receive)
-        // hence the timeout
-        try {
-            latch.await(timeoutInSeconds, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void overrideLatchTimeout(int timeoutInSeconds){
-        CountDownLatchWrapper.timeoutInSeconds = timeoutInSeconds;
-    }
-
-    public interface SurroundByCountdownLatch {
-        void run();
-    }
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/time/SystemTimeWrapper.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/time/SystemTimeWrapper.java
deleted file mode 100644
index 738c1232..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/time/SystemTimeWrapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package co.early.fore.core.time;
-
-/**
- * This enables us to set a mock the system time for testing.
- */
-public class SystemTimeWrapper {
-
-    public long currentTimeMillis() {
-        return System.currentTimeMillis();
-    }
-
-    public long nanoTime() {
-        return System.nanoTime();
-    }
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/ui/SyncableView.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/ui/SyncableView.java
deleted file mode 100644
index a6df163f..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/ui/SyncableView.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.core.ui;
-
-public interface SyncableView {
-    void syncView();
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/ui/trigger/Trigger.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/ui/trigger/Trigger.java
deleted file mode 100644
index da19189d..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/ui/trigger/Trigger.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package co.early.fore.core.ui.trigger;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.ui.SyncableView;
-
-/**
- * <p>
- *      Convenience class used to fire one-off events from within the {@link SyncableView#syncView()}
- *      method of a view.
- * </p><p>
- *      {@link DoThisWhenTriggered#triggered()} is called once the first time that
- *      {@link CheckTriggerThreshold#checkThreshold()} returns true when checked.
- * </p><p>
- *      If {@link CheckTriggerThreshold#checkThreshold()} later
- *      returns false when checked, then the trigger is reset and will fire again if
- *      {@link CheckTriggerThreshold#checkThreshold()} once again returns true.
- * </p><p>
- *      To configure this trigger to immediately reset itself after each time it's fired without
- *      having to wait for {@link CheckTriggerThreshold#checkThreshold()} to return false,
- *      construct this class with the ResetRule.IMMEDIATELY flag
- * </p>
- */
-public class Trigger {
-
-    private final DoThisWhenTriggered doThisWhenTriggered;
-    private final CheckTriggerThreshold checkTriggerThreshold;
-    private final ResetRule resetRule;
-
-    private boolean overThreshold = false;
-    private boolean firstCheck = true;
-
-
-    public enum ResetRule{
-        /*
-            Trigger is reset after each successful check
-         */
-        IMMEDIATELY,
-        /*
-            Trigger is only reset after a successful check, once a subsequent check fails.
-            This is the default.
-         */
-        ONLY_AFTER_REVERSION,
-        /*
-            Trigger is never reset i.e. it fires once only _per instance_. NB: SyncTriggers usually
-            live in Views and are destroyed and recreated on device rotation along with the View,
-            which would give you a new instance - although checkLazy() might be enough to prevent
-            issues here. You might instead prefer to keep the SyncTrigger in a ViewModel to reduce
-            the likely-hood of getting a new instance of the SyncTrigger.
-         */
-        NEVER
-    }
-
-    public Trigger(DoThisWhenTriggered doThisWhenTriggered, CheckTriggerThreshold checkTriggerThreshold) {
-        this(doThisWhenTriggered, checkTriggerThreshold, ResetRule.ONLY_AFTER_REVERSION);
-    }
-
-    public Trigger(DoThisWhenTriggered doThisWhenTriggered, CheckTriggerThreshold checkTriggerThreshold, ResetRule resetRule) {
-        this.doThisWhenTriggered = Affirm.notNull(doThisWhenTriggered);
-        this.checkTriggerThreshold = Affirm.notNull(checkTriggerThreshold);
-        this.resetRule = Affirm.notNull(resetRule);
-    }
-
-
-    /**
-     * <p>
-     * If you are using this in a view that supports rotation, you might want to look at
-     * {@link #checkLazy()}
-     * </p><p>
-     * SyncTriggers usually exist in the the view layer and as such they are completely
-     * reconstructed each time a view is rotated (on Android).
-     * </p><p>
-     * This means that if your trigger threshold is met (causing the trigger to be fired) and then
-     * you rotate the screen - the first check on the newly constructed syncTrigger will also cause
-     * the trigger to be fired, continually rotating the screen will result in continual trigger
-     * firing.
-     * </p><p>
-     * This is probably not what you want, so you can use checkLazy() instead which swallows
-     * the first trigger IF and only if it occurs on the FIRST EVER check of the trigger
-     * threshold for this syncTrigger.
-     * </p>
-     */
-    public void check(){
-        check(false);
-    }
-
-
-    /**
-     * <p>
-     * A trigger check (similar to {@link #check()} but which swallows the first trigger IF and
-     * only if it occurs on the FIRST EVER check of the trigger threshold for this syncTrigger.
-     * </p><p>
-     * SyncTriggers usually exist in the the view layer and as such they are completely
-     * reconstructed each time a view is rotated (on Android).
-     * </p><p>
-     * This means that if your trigger threshold is met (causing the trigger to be fired) and then
-     * you rotate the screen - the first check on the newly constructed syncTrigger will also cause
-     * the trigger to be fired, continually rotating the screen will result in continual trigger
-     * firing.
-     * </p><p>
-     * For this reason, you might want to use this method for your application
-     * </p>
-     */
-    public void checkLazy(){
-        check(true);
-    }
-
-
-    /**
-     *
-     * @param swallowTriggerForFirstCheck true to swallow triggers on the first check - depending
-     *                                    on your application this maybe useful to prevent triggers
-     *                                    firing due to a screen rotation.
-     */
-    private void check(boolean swallowTriggerForFirstCheck) {
-
-        boolean reached = checkTriggerThreshold.checkThreshold();
-
-        if (!overThreshold && reached) {
-
-            overThreshold = true;
-
-            if(!(swallowTriggerForFirstCheck && firstCheck)) {//not ignoring the first check AND threshold has been reached
-                fireTrigger();
-            }
-        }
-
-        firstCheck = false;
-
-        switch (resetRule){
-            case IMMEDIATELY:
-                overThreshold = false;
-                break;
-            case ONLY_AFTER_REVERSION:
-                if (!reached){
-                    overThreshold = false;
-                }
-                break;
-            case NEVER:
-                break;
-        }
-
-    }
-
-    private void fireTrigger(){
-        doThisWhenTriggered.triggered();
-    }
-
-    public interface CheckTriggerThreshold {
-        /**
-         *
-         * @return true if the threshold has been reached or requirement is met. false if not
-         */
-        boolean checkThreshold();
-    }
-
-    public interface DoThisWhenTriggered {
-        void triggered();
-    }
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/utils/text/BasicTextWrapper.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/utils/text/BasicTextWrapper.java
deleted file mode 100644
index de2d38ab..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/utils/text/BasicTextWrapper.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package co.early.fore.core.utils.text;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/**
- * Basic class which only deals with Left to Right text and will work for Monospaced fonts only
- */
-public class BasicTextWrapper {
-
-    private static final String LINE_BREAK = "\n";
-    public static final String SPACE = " ";
-    public static final String EMPTY = "";
-
-
-    /**
-     * Wrap fullText so that it will fit in charactersAvailable,
-     * over however many lines it takes
-     * <p>
-     * Attempts to wrap on spaces between words if possible, if not will break mid-word
-     * <p>
-     * Honours the line break '\n'
-     * <p>
-     * Does not honour large spaces (made up of multiple space characters in a row) - all spaces between
-     * words will return as single spaced
-     *
-     * @param fullText text that needs to be wrapped
-     * @param charactersAvailable has to be larger than 0
-     * @return lines of text, such that each line of text fits inside the charactersAvailable, any line
-     * breaks in the original string will be converted to a empty string item in the list
-     */
-    public static List<String> wrapMonospaceText(String fullText, int charactersAvailable) {
-
-        notNull(fullText);
-
-        if (charactersAvailable <= 0) {
-            throw new IllegalArgumentException("charactersAvailable needs to be larger than 0, charactersAvailable:" + charactersAvailable);
-        }
-
-        //separate any line breaks out
-        List<String> linesWithExtractedLineBreaks = new ArrayList<>();
-        expandLineBreaks(linesWithExtractedLineBreaks, fullText);
-
-        List<String> finalLines = new ArrayList<>();
-
-        for (String line : linesWithExtractedLineBreaks) {
-            if (EMPTY.equals(line)) {
-                finalLines.add(line);
-            } else {
-                String trimmedLine = line.trim();
-                if (EMPTY.equals(trimmedLine)) {
-                    finalLines.add(SPACE);
-                } else {
-                    //take the line with no line breaks in it and then wrap that
-                    StringTokenizer stringTokenizer = new StringTokenizer(line, SPACE, false);
-                    List<String> words = new ArrayList<String>();
-                    while (stringTokenizer.hasMoreTokens()) {
-                        words.add(stringTokenizer.nextToken());
-                    }
-                    extractWrappedLines(finalLines, words, charactersAvailable);
-                }
-            }
-        }
-        return finalLines;
-    }
-
-
-    /**
-     * Takes a string of text, replacing any '\n' line breaks with new lines which are added to the output list
-     *
-     * @param lines list of lines, which will have more lines appended to it by this method
-     * @param lineWhichMayIncludeLineBreaks this is the text which will be appended to the lines list (if it contains
-     *                                      line breaks, then the text will be broken into multiple lines before
-     *                                      being appended)
-     */
-    private static void expandLineBreaks(List<String> lines, String lineWhichMayIncludeLineBreaks) {
-
-        int positionOfLineBreak = lineWhichMayIncludeLineBreaks.indexOf(LINE_BREAK);
-
-        if (positionOfLineBreak < 0) { //no line breaks present
-            lines.add(lines.size(), lineWhichMayIncludeLineBreaks);
-        } else { //has a line break in the word
-            lines.add(lines.size(), lineWhichMayIncludeLineBreaks.substring(0, positionOfLineBreak));
-            expandLineBreaks(lines, lineWhichMayIncludeLineBreaks.substring(positionOfLineBreak + 1, lineWhichMayIncludeLineBreaks.length()));
-        }
-    }
-
-    /**
-     * Recursive method, takes a list of words and concatenates them in order and with spaces in between each word, up to a maximum line width of widthAvailable,
-     * further lines are added to linesSoFar until all the wordsStillToWrap have been processed.
-     *
-     * @param linesSoFar output list of lines of text limited to the characters available and made up of the words taken from wordsStillToWrap
-     * @param wordsStillToWrap words that are to be concatenated into lines and then added to linesSoFar
-     */
-    private static void extractWrappedLines(List<String> linesSoFar, List<String> wordsStillToWrap, int charactersAvailable) {
-
-        if (wordsStillToWrap.size() > 0) {
-
-            //start by assuming all the words still to wrap will wrap into one line
-            String nextLineAttempt = flattenWordsAddingSpaces(wordsStillToWrap);
-
-            int charactersThatFit = nextLineAttempt.length() < charactersAvailable ? nextLineAttempt.length() : charactersAvailable;
-
-            if (charactersThatFit == nextLineAttempt.length()) { //we're done
-
-                linesSoFar.add(nextLineAttempt);
-                wordsStillToWrap.clear();
-
-            } else { //just get the next line, then pass the remaining words to the method again recursively
-
-                List<String> wordsForNextLine = new ArrayList<String>();
-
-                int charactersUsed = -1;//to take into account that there is no space before the first word in a line
-
-                while (wordsStillToWrap.size() > 0 && charactersUsed + 1 + wordsStillToWrap.get(0).length() <= charactersThatFit) {
-
-                    wordsForNextLine.add(wordsStillToWrap.get(0));
-                    charactersUsed += (1 + wordsStillToWrap.get(0).length());
-                    wordsStillToWrap.remove(0);
-                }
-
-                if (charactersUsed < 1) {//the next word must be very large so we need to take what we can off the front of it
-
-                    String massiveWord = wordsStillToWrap.get(0);
-
-                    if (charactersThatFit == 0) {//just in case
-                        charactersThatFit = 1;
-                    }
-
-                    wordsForNextLine.add(massiveWord.substring(0, charactersThatFit));
-                    wordsStillToWrap.remove(0);
-
-                    if (massiveWord.length() > charactersThatFit) {
-                        wordsStillToWrap.add(0, massiveWord.substring(charactersThatFit, massiveWord.length()));
-                    }
-                }
-
-                linesSoFar.add(flattenWordsAddingSpaces(wordsForNextLine));
-
-                extractWrappedLines(linesSoFar, wordsStillToWrap, charactersAvailable);
-
-            }
-        }
-    }
-
-    private static String flattenWordsAddingSpaces(List<String> words) {
-
-        StringBuilder stringBuilder = new StringBuilder();
-
-        for (String word : words) {
-            stringBuilder.append(word);
-            stringBuilder.append(" ");
-        }
-
-        if (words.size() > 0) {
-            stringBuilder.deleteCharAt(stringBuilder.length() - 1);
-        }
-
-        return stringBuilder.toString();
-    }
-
-    private static <T> T notNull(T param) {
-        if (param == null) {
-            throw new NullPointerException("Parameter must not be null");
-        }
-        return param;
-    }
-}
diff --git a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/utils/text/TextPadder.java b/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/utils/text/TextPadder.java
deleted file mode 100644
index 8787c8f9..00000000
--- a/fore-jv/fore-jv-core/src/main/java/co/early/fore/core/utils/text/TextPadder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package co.early.fore.core.utils.text;
-
-import static co.early.fore.core.utils.text.TextPadder.Pad.LEFT;
-
-public class TextPadder {
-
-    public enum Pad {
-        LEFT,
-        RIGHT;
-    }
-
-    public static String padText(String textOriginal, int desiredLength, Pad pad, char paddingCharacter) {
-
-        notNull(textOriginal);
-        notNull(pad);
-
-        int paddingCharactersRequired = desiredLength - textOriginal.length();
-
-        if (paddingCharactersRequired < 0) {
-            throw new IllegalArgumentException("textOriginal is already longer than the desiredLength, textOriginal.length():" + textOriginal.length() + " desiredLength:" + desiredLength);
-        }
-
-        StringBuilder sb = new StringBuilder();
-        for (int ii = 0; ii < paddingCharactersRequired; ii++) {
-            sb.append(paddingCharacter);
-        }
-
-        if (pad == LEFT) {
-            sb.append(textOriginal);
-        } else {
-            sb.insert(0, textOriginal);
-        }
-
-        return sb.toString();
-    }
-
-    private static <T> T notNull(T param) {
-        if (param == null) {
-            throw new NullPointerException("Parameter must not be null");
-        }
-        return param;
-    }
-}
diff --git a/fore-jv/fore-jv-network/build.gradle.kts b/fore-jv/fore-jv-network/build.gradle.kts
deleted file mode 100644
index bdc96984..00000000
--- a/fore-jv/fore-jv-network/build.gradle.kts
+++ /dev/null
@@ -1,25 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    id("java-library")
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-jv-network")
-    set("LIB_DESCRIPTION", "fore - network code for java")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-dependencies {
-    api(project(":fore-jv:fore-jv-core"))
-    compileOnly("com.squareup.okhttp3:okhttp:${Shared.Versions.okhttp3v3}")
-}
-
-apply(from = "../../publish-lib.gradle.kts")
diff --git a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/InterceptorLogging.java b/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/InterceptorLogging.java
deleted file mode 100644
index 64f68d8d..00000000
--- a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/InterceptorLogging.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package co.early.fore.net;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Random;
-
-import co.early.fore.core.Affirm;
-import co.early.fore.core.logging.Logger;
-import co.early.fore.core.utils.text.BasicTextWrapper;
-import okhttp3.Headers;
-import okhttp3.Interceptor;
-import okhttp3.MediaType;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okhttp3.internal.http.HttpHeaders;
-import okio.Buffer;
-import okio.BufferedSource;
-
-
-/**
- * see https://github.com/square/okhttp/blob/master/okhttp-logging-interceptor/src/main/java/okhttp3/logging/HttpLoggingInterceptor.java
- */
-public class InterceptorLogging implements Interceptor {
-
-    private final static String TAG = "Network";
-    private final int MAX_BODY_LOG_LENGTH;
-    private static final int DEAFULT_MAX_BODY_LOG_LENGTH = 4000;
-    Charset UTF8 = Charset.forName("UTF-8");
-    private final Logger logger;
-    private final Random random = new Random();
-    private char[] somecharacters = "ABDEFGH023456789".toCharArray();
-    private NetworkingLogSanitizer networkingLogSanitizer;
-
-    public InterceptorLogging(Logger logger) {
-        this(logger, DEAFULT_MAX_BODY_LOG_LENGTH, null);
-    }
-
-    public InterceptorLogging(Logger logger, int maxBodyLogCharacters) {
-        this(logger, maxBodyLogCharacters, null);
-    }
-
-    public InterceptorLogging(Logger logger, NetworkingLogSanitizer networkingLogSanitizer) {
-        this(logger, DEAFULT_MAX_BODY_LOG_LENGTH, networkingLogSanitizer);
-    }
-
-    public InterceptorLogging(Logger logger, int maxBodyLogCharacters, NetworkingLogSanitizer networkingLogSanitizer) {
-        this.logger = Affirm.notNull(logger);
-        this.MAX_BODY_LOG_LENGTH = maxBodyLogCharacters;
-        this.networkingLogSanitizer = networkingLogSanitizer;
-
-        if (maxBodyLogCharacters<1){
-            throw new IllegalArgumentException("maxBodyLogCharacters must be greater than 0");
-        }
-    }
-
-    @Override
-    public Response intercept(Chain chain) throws IOException {
-
-        Request request = chain.request();
-        String method = request.method();
-        String url = request.url().toString();
-
-        String randomPostTag = " " + somecharacters[random.nextInt(15)]
-                + somecharacters[random.nextInt(15)]
-                + somecharacters[random.nextInt(15)]
-                + somecharacters[random.nextInt(15)]
-                + somecharacters[random.nextInt(15)];
-
-        //request
-
-        logger.i(TAG + randomPostTag, String.format("HTTP %s --> %s", method, url));
-
-        if (networkingLogSanitizer == null){
-            logHeaders(request.headers(), randomPostTag);
-        } else {
-            logHeaders(networkingLogSanitizer.sanitizeHeaders(request.headers()), randomPostTag);
-        }
-
-        RequestBody requestBody = request.body();
-
-        if (requestBody != null) {
-            Buffer buffer = new Buffer();
-            requestBody.writeTo(buffer);
-            Charset charset = getCharset(requestBody.contentType());
-            if (isPlaintext(buffer)) {
-
-                String body;
-                if (networkingLogSanitizer == null){
-                    body = truncate(buffer.clone().readString(charset));
-                } else {
-                    body = truncate(networkingLogSanitizer.sanitizeBody(buffer.clone().readString(charset)));
-                }
-
-                List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(body.replace(",", ", "), 150);
-                synchronized (this) {
-                    for (String line : wrappedLines) {
-                        logger.i(TAG + randomPostTag, line);
-                    }
-                }
-            } else {
-                logger.i(TAG + randomPostTag, method + "- binary data -");
-            }
-        }
-
-
-
-        //response
-
-        long t1 = System.nanoTime();
-
-
-        Response response;
-        try {
-            response = chain.proceed(request);
-        } catch (Exception e) {
-            logger.e(TAG + randomPostTag, "HTTP " + method + " <-- Connection dropped, but GETs will be retried " + url + " : " + e);
-            throw e;
-        }
-
-        long t2 = System.nanoTime();
-        logger.i(TAG + randomPostTag, "HTTP " + method + " <-- Server replied HTTP-" + response.code() + " " + (t2-t1)/(1000*1000) + "ms " + url);
-
-
-        if (networkingLogSanitizer == null){
-            logHeaders(response.headers(), randomPostTag);
-        } else {
-            logHeaders(networkingLogSanitizer.sanitizeHeaders(response.headers()), randomPostTag);
-        }
-
-        ResponseBody responseBody = response.body();
-        long contentLength = responseBody.contentLength();
-
-        if (HttpHeaders.hasBody(response)){
-            BufferedSource source = responseBody.source();
-            source.request(Long.MAX_VALUE); // Buffer the entire body.
-            Buffer buffer = source.getBuffer();
-            Charset charset = getCharset(responseBody.contentType());
-            if (!isPlaintext(buffer)) {
-                logger.i(TAG + randomPostTag, " (binary " + buffer.size() + " byte body omitted)");
-                return response;
-            }else {
-                if (contentLength != 0) {
-                    String bodyJson = truncate(buffer.clone().readString(charset));
-                    List<String> wrappedLines = BasicTextWrapper.wrapMonospaceText(bodyJson.replace(",", ", "), 150);
-                    synchronized (this) {
-                        for (String line : wrappedLines) {
-                            logger.i(TAG + randomPostTag, line);
-                        }
-                    }
-                } else {
-                    logger.i(TAG + randomPostTag, " (no body content)");
-                }
-            }
-        }
-
-        return response;
-    }
-
-    /**
-     * Returns true if the body in question probably contains human readable text. Uses a small sample
-     * of code points to detect unicode control characters commonly used in binary file signatures.
-     */
-    static boolean isPlaintext(Buffer buffer) {
-        try {
-            Buffer prefix = new Buffer();
-            long byteCount = buffer.size() < 64 ? buffer.size() : 64;
-            buffer.copyTo(prefix, 0, byteCount);
-            for (int i = 0; i < 16; i++) {
-                if (prefix.exhausted()) {
-                    break;
-                }
-                int codePoint = prefix.readUtf8CodePoint();
-                if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) {
-                    return false;
-                }
-            }
-            return true;
-        } catch (EOFException e) {
-            return false; // Truncated UTF-8 sequence.
-        }
-    }
-
-    private String truncate(String potentiallyLongString){
-        if (potentiallyLongString.length()>MAX_BODY_LOG_LENGTH){
-            return potentiallyLongString.substring(0, MAX_BODY_LOG_LENGTH) + "...truncated";
-        }else {
-            return potentiallyLongString;
-        }
-    }
-
-    private void logHeaders(Headers headers, String randomPostTag){
-        for(String headerName: headers.names()){
-            logger.i(TAG + randomPostTag, String.format("    %s: %s", headerName, headers.get(headerName)));
-        }
-    }
-
-    private Charset getCharset(MediaType contentType){
-        Charset charset = UTF8;
-        if (contentType != null) {
-            charset = contentType.charset(charset);
-        }
-        return charset;
-    }
-}
diff --git a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/MessageProvider.java b/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/MessageProvider.java
deleted file mode 100644
index 69d700ce..00000000
--- a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/MessageProvider.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package co.early.fore.net;
-
-/**
- * Created by eric on 12/01/2017.
- */
-
-public interface MessageProvider<M> {
-    M getMessage();
-}
diff --git a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/NetworkingLogSanitizer.java b/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/NetworkingLogSanitizer.java
deleted file mode 100644
index e91fc40a..00000000
--- a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/NetworkingLogSanitizer.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package co.early.fore.net;
-
-import okhttp3.Headers;
-
-
-public interface NetworkingLogSanitizer {
-    Headers sanitizeHeaders(Headers allHeaders);
-    String sanitizeBody(String text);
-}
diff --git a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/InterceptorStubbedService.java b/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/InterceptorStubbedService.java
deleted file mode 100644
index 0ddb4a2e..00000000
--- a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/InterceptorStubbedService.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package co.early.fore.net.testhelpers;
-
-import java.io.IOException;
-
-import okhttp3.Interceptor;
-import okhttp3.MediaType;
-import okhttp3.Protocol;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
-/**
- * Using this interceptor will simulate a canned server response at the okhttp level
- * without actually connecting to a real server
- *
- * This interceptor will easily work for models that are only calling one endpoint,
- * for more complex models with multiple end points returning different pojos
- * you would need slightly more sophistication here to intercept each network
- * request in a different way (you may also be able to construct the model under test
- * with a new Interceptor setup for each test).
- *
- */
-public class InterceptorStubbedService implements Interceptor {
-
-    private final StubbedServiceDefinition stubbedServiceDefinition;
-
-    public InterceptorStubbedService(StubbedServiceDefinition stubbedServiceDefinition) {
-        this.stubbedServiceDefinition = notNull(stubbedServiceDefinition);
-    }
-
-    @Override
-    public Response intercept(Chain chain) throws IOException {
-
-        if (!stubbedServiceDefinition.successfullyConnected()) { //stubbing a connection failure
-            throw stubbedServiceDefinition.ioException;
-        }
-
-        String bodyString = JunitFileIO.getRawResourceAsUTF8String(stubbedServiceDefinition.resourceFileName, this.getClass().getClassLoader());
-
-        return new Response.Builder()
-                    .request(chain.request())
-                    .protocol(Protocol.HTTP_1_1)
-                    .code(stubbedServiceDefinition.httpCode)
-                    .addHeader("Content-Type", stubbedServiceDefinition.mimeType)
-                    .body(ResponseBody.create(MediaType.parse(stubbedServiceDefinition.mimeType), bodyString))
-                    .message("")
-                    .build();
-    }
-
-    private <T> T notNull(T param) {
-        if (param == null) {
-            throw new NullPointerException("Parameter must not be null");
-        }
-        return param;
-    }
-}
diff --git a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/JunitFileIO.java b/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/JunitFileIO.java
deleted file mode 100644
index 778e58e1..00000000
--- a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/JunitFileIO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package co.early.fore.net.testhelpers;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-
-/**
- * To use this in a unit test, you need to put your data files in a folder called "resources"
- * see the unit tests for example retrofit app: "fore 4 retrofit ex"
- */
-public class JunitFileIO {
-
-    public static String getRawResourceAsUTF8String(String resourceFileName, ClassLoader classLoader) throws IOException {
-        return new String(getResourceBytes(resourceFileName, classLoader), Charset.forName("UTF-8"));
-    }
-
-    private static byte[] getResourceBytes(String resourceFileName, ClassLoader classLoader) throws IOException {
-        return getBytesFromInputStream(classLoader.getResourceAsStream(resourceFileName));
-    }
-
-    private static byte[] getBytesFromInputStream(InputStream is) throws IOException {
-
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-
-        byte[] readBuffer = new byte[4 * 1024];
-
-        try {
-            int read;
-            do {
-                read = is.read(readBuffer, 0, readBuffer.length);
-                if (read == -1) {
-                    break;
-                }
-                bout.write(readBuffer, 0, read);
-            } while (true);
-
-            return bout.toByteArray();
-
-        } finally {
-            is.close();
-        }
-    }
-}
diff --git a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/StubbedServiceDefinition.java b/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/StubbedServiceDefinition.java
deleted file mode 100644
index e807350f..00000000
--- a/fore-jv/fore-jv-network/src/main/java/co/early/fore/net/testhelpers/StubbedServiceDefinition.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package co.early.fore.net.testhelpers;
-
-import java.io.IOException;
-
-/**
- *
- * @param <R> The class type expected to be passed back as the result
- */
-public class StubbedServiceDefinition<R> {
-
-    public final int httpCode;
-    public final String resourceFileName;
-    public final String mimeType;
-
-    public final IOException ioException;
-
-    public final R expectedResult;
-
-    public StubbedServiceDefinition(IOException ioException, R expectedResult) {
-        this.httpCode = 0;
-        this.resourceFileName = null;
-        this.mimeType = null;
-        this.ioException = notNull(ioException);
-        this.expectedResult = expectedResult;
-    }
-
-    public StubbedServiceDefinition(int httpCode, String resourceFileName) {
-        this(httpCode, resourceFileName, "application/json", null);
-    }
-
-    public StubbedServiceDefinition(int httpCode, String resourceFileName, R expectedResult) {
-        this(httpCode, resourceFileName, "application/json", expectedResult);
-    }
-
-    public StubbedServiceDefinition(int httpCode, String resourceFileName, String mimeType, R expectedResult) {
-        this.httpCode = httpCode;
-        this.resourceFileName = notNull(resourceFileName);
-        this.mimeType = notNull(mimeType);
-        this.ioException = null;
-        this.expectedResult = expectedResult;
-    }
-
-    public boolean successfullyConnected(){
-        return ioException == null;
-    }
-
-    private <T> T notNull(T param) {
-        if (param == null) {
-            throw new NullPointerException("Parameter must not be null");
-        }
-        return param;
-    }
-}
diff --git a/fore-kt/fore-kt-android-adapters/build.gradle.kts b/fore-kt/fore-kt-android-adapters/build.gradle.kts
deleted file mode 100644
index 9adee184..00000000
--- a/fore-kt/fore-kt-android-adapters/build.gradle.kts
+++ /dev/null
@@ -1,56 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.kotlinAndroid)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-android-adapters")
-    set("LIB_DESCRIPTION", "fore - android adapter and diff util helpers, kotlin")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-    namespace = "co.early.fore.kt.adapters"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = Shared.Android.minSdk
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer.pro")
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-}
-
-dependencies {
-    api(project(":fore-kt:fore-kt-android-core"))
-    compileOnly("androidx.recyclerview:recyclerview:${Shared.Versions.recyclerview}")
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-android-adapters/src/main/AndroidManifest.xml b/fore-kt/fore-kt-android-adapters/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/Adaptable.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/Adaptable.kt
deleted file mode 100644
index fae704b3..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/Adaptable.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package co.early.fore.adapters
-
-interface Adaptable<T> {
-    fun getItem(index: Int): T
-    fun getItemCount(): Int
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/CrossFadeRemover.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/CrossFadeRemover.kt
deleted file mode 100644
index cabb88d6..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/CrossFadeRemover.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package co.early.fore.adapters
-
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.RecyclerView
-
-/**
- * By default Android will animate changes to an item in a list by cross-fading a copy of the view
- * before the item changed, to a version of the view after the change.
- *
- * This looks ok for simple changes, but if you want a more advanced animation (such as running a
- * lottie animation for example), the default cross-fade will interfere with that, so you can
- * turn it off by setting this class on the recycle view (see the sample apps)
- *
- */
-class CrossFadeRemover : DefaultItemAnimator() {
-    override fun canReuseUpdatedViewHolder(
-        viewHolder: RecyclerView.ViewHolder,
-        payloads: List<Any>
-    ): Boolean {
-        return true
-    }
-
-    override fun canReuseUpdatedViewHolder(viewHolder: RecyclerView.ViewHolder): Boolean {
-        return true
-    }
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/Notifyable.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/Notifyable.kt
deleted file mode 100644
index 500e0e41..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/Notifyable.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.adapters
-
-import androidx.recyclerview.widget.RecyclerView
-
-interface Notifyable<T : RecyclerView.ViewHolder?> {
-    fun notifyDataSetChangedAuto()
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DeepCopyable.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DeepCopyable.kt
deleted file mode 100644
index 2944190c..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DeepCopyable.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.adapters.immutable
-
-interface DeepCopyable<T> {
-    fun deepCopy(): T
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffCalculator.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffCalculator.kt
deleted file mode 100644
index 691752b8..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffCalculator.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package co.early.fore.adapters.immutable
-
-import androidx.recyclerview.widget.DiffUtil.DiffResult
-import androidx.recyclerview.widget.DiffUtil
-
-class DiffCalculator<T : DiffComparator<T>?> {
-    /**
-     * A wrapper for Android's DiffUtil. It's recommended that this method is run off the UI thread
-     * because it can take some time to generate the DiffResult, especially for large lists or lists
-     * with many changes.
-     *
-     *
-     *
-     * It's very important that the contents of the two lists are not changed from another thread
-     * while the DiffUtil calculations are being made. You could use synchronization blocks to
-     * ensure this, use an implementation of an immutable list, or you can make a deepCopy() of
-     * the lists to sever the connection between the lists you pass to this function and the calling
-     * code.
-     *
-     *
-     *
-     * Another common issue is to create the new list based on the old list (with changes) and
-     * accidentally change the old list in the process, so that DiffUtil sees two lists which are
-     * identical (2 identical new lists, instead of an old list and a new list). This will result
-     * in no changes being animated in the adapter. You can fix this by making a deepCopy of the
-     * old list before making changes to it. Architectures using immutable view states have often
-     * already made a deep copy of their list data by the time it reaches the UI, so you might not
-     * encounter this issue in that case.
-     *
-     *
-     *
-     * Once these lists start to get larger than about 1000 rows, DiffUtil based methods can get
-     * a bit slow. For faster performance consider using the mutable package classes if it's an
-     * option for your situation (mostly if you are using MVI or some other form of immutable
-     * list data, you will be restricted to using DiffUtil based methods to determine list changes)
-     *
-     *
-     *
-     * @param oldList the list about to be replaced
-     * @param newList the new list
-     * @return the DiffResult for the two lists
-     */
-    fun createDiffResult(oldList: List<T>, newList: List<T>): DiffResult {
-        return DiffUtil.calculateDiff(object : DiffUtil.Callback() {
-            override fun getOldListSize(): Int {
-                return oldList.size
-            }
-
-            override fun getNewListSize(): Int {
-                return newList.size
-            }
-
-            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-                return oldList[oldItemPosition] != null && oldList[oldItemPosition]!!.itemsTheSame(
-                    newList[newItemPosition]
-                )
-            }
-
-            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-                return oldList[oldItemPosition] != null && oldList[oldItemPosition]!!.itemsLookTheSame(
-                    newList[newItemPosition]
-                )
-            }
-        })
-    }
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffComparator.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffComparator.kt
deleted file mode 100644
index bd400efa..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffComparator.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package co.early.fore.adapters.immutable
-
-interface DiffComparator<T> {
-    /**
-     * Used by [DiffUtil]
-     *
-     * Do the two instances represent the same real world item? even though they maybe
-     * different instances. For example, one could be its representation in a list view, the other
-     * could be its representation in a database entity, but if they represent the same conceptual
-     * item then this method should return true.
-     *
-     * You might use some unique itemId for this, maybe an ISBN number if we are dealing with books,
-     * maybe a title and year of release for a movie (providing you can guarantee this combination
-     * is unique) - you certainly wouldn't use the item's position in a list for example.
-     *
-     * Note: even if the item's states are different - e.g. the same move, but one item has this movie
-     * with a 4 star rating, the other item is the same movie but with a 3 star rating, they are
-     * still the same conceptual item, just with different states, so this method should return true.
-     *
-     * @param other the instance to compare this with
-     * @return true if the items represent the same real world / conceptual item
-     */
-    fun itemsTheSame(other: T): Boolean
-
-    /**
-     * Used by [DiffUtil]
-     *
-     * Note this really means do they look the same in a specific list on the display. As such
-     * there can be multiple implementations, each related to a particular list display.
-     *
-     * Let's say we are displaying a list of stocks and each stock item in the list has: a ticker
-     * symbol, a stock price, and a "social score" based on twitter mentions in the past hour.
-     *
-     * For our specific list in the UI, we only display the ticker symbol and the stock price. This
-     * means that the social score does not effect the display in any way. If the social score is
-     * the only thing to change, but the ticker symbol and the stock price remain the same, then
-     * the new state of the item will look the same when viewed in this list - and we would return
-     * true here (even though the item itself is no longer in the same state when considered as a
-     * whole). It's important to get this right, it's how android adapters know whether to run an
-     * update animation or not (by default android briefly by fades in and out the item in the view).
-     *
-     * @param other the instance to compare this with
-     * @return true if the items will look the same when displayed
-     */
-    fun itemsLookTheSame(other: T): Boolean
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffSpec.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffSpec.kt
deleted file mode 100644
index 0627aebf..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/DiffSpec.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package co.early.fore.adapters.immutable
-
-import co.early.fore.core.time.SystemTimeWrapper
-import androidx.recyclerview.widget.DiffUtil.DiffResult
-
-/**
- * Wraps a DiffResult with a timestamp so that we can abandon it when it gets old. This helps
- * the NotifyableImp manage adapter updates appropriately
- *
- * @param diffResult can be null to indicate no changes
- * @param systemTimeWrapper wrapper for the system time
- */
-class DiffSpec(val diffResult: DiffResult?, systemTimeWrapper: SystemTimeWrapper) {
-    val timeStamp: Long = systemTimeWrapper.currentTimeMillis()
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/Diffable.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/Diffable.kt
deleted file mode 100644
index 0dab35d0..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/immutable/Diffable.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.adapters.immutable
-
-interface Diffable {
-    fun getAndClearLatestDiffSpec(maxAgeMs: Long): DiffSpec
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareList.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareList.kt
deleted file mode 100644
index cbfabc10..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/ChangeAwareList.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package co.early.fore.adapters.mutable
-
-interface ChangeAwareList<E> : MutableList<E>, Updateable {
-    /**
-     * Inform the list that the content of one of its rows has
-     * changed.
-     *
-     * Without calling this, the list may not be aware of
-     * any changes made to this row and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowIndex index of the row that had its data changed
-     */
-    fun makeAwareOfDataChange(rowIndex: Int)
-
-    /**
-     * Inform the list that the content of a range of its rows has
-     * changed.
-     *
-     * Without calling this, the list will not be aware of
-     * any changes made to these rows and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowStartIndex index of the row that had its data changed
-     * @param rowsAffected how many rows have been affected
-     */
-    fun makeAwareOfDataChange(rowStartIndex: Int, rowsAffected: Int)
-
-    /**
-     * Removes from this list all of the elements whose index is between
-     * `fromIndex`, inclusive, and `toIndex`, exclusive.
-     * Shifts any succeeding elements to the left (reduces their index).
-     * This call shortens the list by `(toIndex - fromIndex)` elements.
-     * (If `toIndex==fromIndex`, this operation has no effect.)
-     *
-     * @param fromIndex index of first element to be removed
-     * @param toIndex index after last element to be removed
-     */
-    fun removeRange(fromIndex: Int, toIndex: Int)
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/UpdateSpec.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/UpdateSpec.kt
deleted file mode 100644
index 39c67ba2..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/UpdateSpec.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package co.early.fore.adapters.mutable
-
-import co.early.fore.core.time.SystemTimeWrapper
-import java.lang.NullPointerException
-
-/**
- * Indicates what was the most recent change in a list, helps the ChangeAware* classes
- * call the correct notify* method for android adapters to take advantage of built in
- * list animations
- */
-class UpdateSpec(
-    type: UpdateType,
-    rowPosition: Int,
-    rowsEffected: Int,
-    systemTimeWrapper: SystemTimeWrapper
-) {
-    enum class UpdateType {
-        FULL_UPDATE, ITEM_CHANGED, ITEM_INSERTED, ITEM_REMOVED
-    }
-
-    val type: UpdateType
-    val rowPosition: Int
-    val rowsEffected: Int
-    val timeStamp: Long
-    private fun <T> notNull(param: T?): T {
-        if (param == null) {
-            throw NullPointerException("Parameter must not be null")
-        }
-        return param
-    }
-
-    init {
-        this.type = notNull(type)
-        this.rowPosition = rowPosition
-        this.rowsEffected = rowsEffected
-        timeStamp = notNull(systemTimeWrapper).currentTimeMillis()
-    }
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/Updateable.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/Updateable.kt
deleted file mode 100644
index 70f138d8..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/adapters/mutable/Updateable.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.early.fore.adapters.mutable
-
-interface Updateable {
-    fun getAndClearLatestUpdateSpec(maxAgeMs: Long): UpdateSpec
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/NotifyableImp.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/NotifyableImp.kt
deleted file mode 100644
index 87449bd5..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/NotifyableImp.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package co.early.fore.kt.adapters
-
-import androidx.recyclerview.widget.RecyclerView
-import co.early.fore.adapters.Notifyable
-import co.early.fore.adapters.immutable.Diffable
-import co.early.fore.adapters.mutable.UpdateSpec.UpdateType
-import co.early.fore.adapters.mutable.Updateable
-
-class NotifyableImp<VH : RecyclerView.ViewHolder>(
-        private val updateable: Updateable? = null,
-        private val diffable: Diffable? = null
-) : Notifyable<VH> {
-
-    private lateinit var adapter: RecyclerView.Adapter<VH>
-
-    init {
-        if (updateable == null && diffable == null) {
-            throw IllegalArgumentException("updateable and diffable cannot both be null")
-        }
-        if (updateable != null && diffable != null) {
-            throw IllegalArgumentException("one of updateable or diffable must be null")
-        }
-    }
-
-    fun initializeAdapter(adapter: RecyclerView.Adapter<VH>) {
-        if (this::adapter.isInitialized) {
-            throw IllegalAccessException("adapter has already been initialized")
-        }
-        this.adapter = adapter
-    }
-
-    override fun notifyDataSetChangedAuto() {
-
-        if (!this::adapter.isInitialized) {
-            throw IllegalAccessException("adapter must be initialized first, please call initializeAdapter() from the init{} of your Adapter class")
-        }
-
-        if (updateable != null) {
-            processUpdateable()
-        } else {
-            processDiffable()
-        }
-    }
-
-    private fun processUpdateable() {
-        val updateSpec = updateable!!.getAndClearLatestUpdateSpec(MAX_AGE_MS_BEFORE_IGNORE.toLong())
-        when (updateSpec.type) {
-            UpdateType.FULL_UPDATE -> adapter.notifyDataSetChanged()
-            UpdateType.ITEM_CHANGED -> adapter.notifyItemRangeChanged(updateSpec.rowPosition, updateSpec.rowsEffected)
-            UpdateType.ITEM_REMOVED -> adapter.notifyItemRangeRemoved(updateSpec.rowPosition, updateSpec.rowsEffected)
-            UpdateType.ITEM_INSERTED -> adapter.notifyItemRangeInserted(updateSpec.rowPosition, updateSpec.rowsEffected)
-        }
-    }
-
-    private fun processDiffable() {
-        val diffSpec = diffable!!.getAndClearLatestDiffSpec(MAX_AGE_MS_BEFORE_IGNORE.toLong())
-        if (diffSpec.diffResult == null) {
-            adapter.notifyDataSetChanged()
-        } else {
-            diffSpec.diffResult.dispatchUpdatesTo(adapter)
-        }
-    }
-
-    companion object {
-        private const val MAX_AGE_MS_BEFORE_IGNORE = 50
-    }
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/immutable/ImmutableListMgr.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/immutable/ImmutableListMgr.kt
deleted file mode 100644
index dd2d2c8c..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/immutable/ImmutableListMgr.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-package co.early.fore.kt.adapters.immutable
-
-import co.early.fore.adapters.Adaptable
-import co.early.fore.adapters.immutable.*
-import co.early.fore.core.WorkMode
-import co.early.fore.core.observer.Observable
-import co.early.fore.core.time.SystemTimeWrapper
-import co.early.fore.kt.core.coroutine.awaitDefault
-import co.early.fore.kt.core.coroutine.launchMain
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.observer.ObservableImp
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-
-/**
- * This class holds the definition of the current list for an adapter, so it's getItemCount() and getItem()
- * functions are always correct.
- *
- * The way to change the list is to pass a function to changeList() you will receive a deepCopy
- * of the current list which you can change however you wish, once you are finished the changes
- * will be applied.
- *
- * You can also replace the list completely by calling replaceList()
- *
- * The DiffSpec between the old and the new list will be calculated off the UI thread and the
- * results applied atomically on the UI thread. Observers will be notified on the UI thread.
- *
- */
-class ImmutableListMgr<T>(
-        private val systemTimeWrapper: SystemTimeWrapper? = null,
-        private val workMode: WorkMode? = null,
-        private val logger: Logger? = null
-) : Observable by ObservableImp(workMode, logger),
-        Adaptable<T>,
-        Diffable
-        where T : DeepCopyable<T>, T : DiffComparator<T> {
-
-    private var latestDiffSpec: DiffSpec? = createFullDiffSpec()
-    private var currentList = listOf<T>()
-    private var currentListMutableCopy = mutableListOf<T>()
-    private var currentListVersion = 0
-
-    private val mutex = Mutex()
-
-    fun changeList(block: (MutableList<T>) -> Unit) {
-        launchMain(Fore.getWorkMode(workMode)) {
-            mutex.withLock {
-                block(currentListMutableCopy)
-            }
-            updateList(currentListMutableCopy)
-        }
-    }
-
-    fun replaceList(block: () -> List<T>) {
-        updateList(block())
-    }
-
-    override fun getItem(index: Int): T {
-        return currentList[index]
-    }
-
-    override fun getItemCount(): Int {
-        return currentList.size
-    }
-
-    /**
-     * If the DiffResult is old, then we assume that whatever changes
-     * were made to the list last time were never picked up by a
-     * recyclerView (maybe because the list was not visible at the time).
-     * In this case we clear the DiffResult and create a fresh one with a
-     * full diff spec.
-     *
-     * @return the latest DiffResult for the list
-     */
-    override fun getAndClearLatestDiffSpec(maxAgeMs: Long): DiffSpec {
-
-        val latestDiffSpecAvailable = latestDiffSpec
-        val fullDiffSpec = createFullDiffSpec()
-
-        latestDiffSpec = fullDiffSpec
-
-        return if (Fore.getSystemTimeWrapper(systemTimeWrapper).currentTimeMillis() - latestDiffSpecAvailable!!.timeStamp < maxAgeMs) {
-            latestDiffSpecAvailable
-        } else {
-            fullDiffSpec
-        }
-    }
-
-    private fun updateList(newList: List<T>) {
-
-        val input = Input(currentListVersion, currentList, newList)
-
-        launchMain(Fore.getWorkMode(workMode)) {
-
-            val result = awaitDefault(Fore.getWorkMode(workMode)) {
-
-                // work out the differences in the lists
-                val diffResult = DiffCalculator<T>().createDiffResult(input.currentList, input.newList)
-
-                val newListCopy: List<T>
-                val newListCopy2: List<T>
-
-                mutex.withLock {
-                    //create a mutable copy of the new list, ready for when client wants to change it
-                    newListCopy = newList.map { it.deepCopy() }
-                    newListCopy2 = newList.map { it.deepCopy() }
-                }
-
-                //return to the UI thread
-                Result(input.currentListVersion, newListCopy, newListCopy2.toMutableList(), DiffSpec(diffResult, Fore.getSystemTimeWrapper(systemTimeWrapper)))
-            }
-
-            // otherwise this is an old change, we ignore it
-            if (result.oldListVersion == currentListVersion) {
-                currentListVersion += 1
-                currentList = result.newList
-                currentListMutableCopy = result.newListCopy
-                latestDiffSpec = result.diffSpec
-                Fore.getLogger(logger).i("list updated, thread:" + Thread.currentThread().id)
-                notifyObservers()
-            }
-        }
-    }
-
-    private fun createFullDiffSpec(): DiffSpec {
-        return DiffSpec(null, Fore.getSystemTimeWrapper(systemTimeWrapper))
-    }
-
-    private data class Input<T>(
-            val currentListVersion: Int,
-            val currentList: List<T>,
-            val newList: List<T>
-    )
-
-    private data class Result<T>(
-            val oldListVersion: Int,
-            val newList: List<T>,
-            val newListCopy: MutableList<T>,
-            val diffSpec: DiffSpec
-    )
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/mutable/ChangeAwareArrayList.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/mutable/ChangeAwareArrayList.kt
deleted file mode 100644
index 799264f3..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/mutable/ChangeAwareArrayList.kt
+++ /dev/null
@@ -1,253 +0,0 @@
-package co.early.fore.kt.adapters.mutable
-
-import co.early.fore.adapters.mutable.ChangeAwareList
-import co.early.fore.adapters.mutable.UpdateSpec
-import co.early.fore.adapters.mutable.Updateable
-import co.early.fore.core.time.SystemTimeWrapper
-import co.early.fore.kt.core.delegate.Fore
-import java.util.*
-import java.util.function.UnaryOperator
-
-/**
- * <p>Basic Android adapters use notifyDataSetChanged() to trigger a redraw of the list UI.
- *
- * <code>
- * adapter.notifyDataSetChanged();
- * </code>
- *
- * <p>In order to take advantage of insert and remove animations, we can provide the adapter with
- * more information about how the list has changed (eg: there was an item inserted at position 5
- * or the item at position 3 has changed etc), for that we call a selection of notifyXXX methods()
- * indicating what sort of change happened and which rows were effected.
- *
- * <p>This list class will automatically generate an update specification for each change you make
- * to it, suitable for deciding how to call the various notifyXXX methods:
- *
- * <code>
- *
- * UpdateSpec updateSpec = list.getMostRecentUpdateSpec();
- *
- * switch (updateSpec.type) {
- *  case FULL_UPDATE:
- *      adapter.notifyDataSetChanged();
- *      break;
- *  case ITEM_CHANGED:
- *      adapter.notifyItemChanged(updateSpec.rowPosition);
- *      break;
- *  case ITEM_REMOVED:
- *      adapter.notifyItemRemoved(updateSpec.rowPosition);
- *      break;
- *  case ITEM_INSERTED:
- *      adapter.notifyItemInserted(updateSpec.rowPosition);
- *      break;
- * }
- *
- * </code>
- *
- * <p>This class only supports one type of change at a time (you can't handle a cell update;
- * two removals; and three inserts, all in the same notify round trip - each has to be handled one at a time)
- *
- */
-class ChangeAwareArrayList<T>(
-        private val systemTimeWrapper: SystemTimeWrapper? = null
-) : ArrayList<T>(), ChangeAwareList<T>, Updateable {
-
-    private var updateSpec: UpdateSpec = createFullUpdateSpec(Fore.getSystemTimeWrapper(systemTimeWrapper))
-
-    override fun add(element: T): Boolean {
-        val temp = super.add(element)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_INSERTED,
-                size - 1,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    override fun add(index: Int, element: T) {
-        super.add(index, element)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_INSERTED,
-                index,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-    }
-
-    override fun set(index: Int, element: T): T {
-        val temp = super.set(index, element)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_CHANGED,
-                index,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    override fun removeAt(index: Int): T {
-        val temp = super.removeAt(index)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_REMOVED,
-                index,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    override fun clear() {
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_REMOVED,
-                0,
-                size,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        super.clear()
-    }
-
-    override fun addAll(elements: Collection<T>): Boolean {
-        val temp = super.addAll(elements)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_INSERTED,
-                size - 1,
-                elements.size,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    override fun addAll(index: Int, elements: Collection<T>): Boolean {
-        val temp = super.addAll(index, elements)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_INSERTED,
-                index,
-                elements.size,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    /**
-     * Standard AbstractList and ArrayList have this method protected as you
-     * are supposed to remove a range by doing this:
-     * list.subList(start, end).clear();
-     * (clear() ends up calling removeRange() behind the scenes).
-     * This won't work for these change aware lists (plus it's a ball ache),
-     * so this gets made public
-     */
-    override fun removeRange(fromIndex: Int, toIndex: Int) {
-        super.removeRange(fromIndex, toIndex)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_REMOVED,
-                fromIndex,
-                toIndex - fromIndex,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-    }
-
-    override fun remove(element: T): Boolean {
-        val index = super.indexOf(element)
-        return if (index != -1) {
-            val temp = super.remove(element)
-            updateSpec = UpdateSpec(
-                    UpdateSpec.UpdateType.ITEM_REMOVED,
-                    index,
-                    1,
-                    Fore.getSystemTimeWrapper(systemTimeWrapper)
-            )
-            temp
-        } else {
-            false
-        }
-    }
-
-    override fun removeAll(elements: Collection<T>): Boolean {
-        val temp = super.removeAll(elements)
-        if (temp) {
-            updateSpec = createFullUpdateSpec(
-                    Fore.getSystemTimeWrapper(systemTimeWrapper)
-            )
-        }
-        return temp
-    }
-
-    override fun replaceAll(operator: UnaryOperator<T>) {
-        throw UnsupportedOperationException("Not supported by this class")
-    }
-
-    /**
-     * Inform the list that the content of one of its rows has
-     * changed.
-     *
-     * Without calling this, the list may not be aware of
-     * any changes made to this row and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowIndex index of the row that had its data changed
-     */
-    override fun makeAwareOfDataChange(rowIndex: Int) {
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_CHANGED,
-                rowIndex,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-    }
-
-    /**
-     * Inform the list that the content of a range of its rows has
-     * changed.
-     *
-     * Without calling this, the list will not be aware of
-     * any changes made to these rows and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowStartIndex index of the row that had its data changed
-     * @param rowsAffected how many rows have been affected
-     */
-    override fun makeAwareOfDataChange(rowStartIndex: Int, rowsAffected: Int) {
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_CHANGED,
-                rowStartIndex,
-                rowsAffected,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-    }
-
-    /**
-     * Make sure you understand the limitations of this method!
-     *
-     * It essentially only supports one recycleView at a time,
-     * in the unlikely event that you want two different list
-     * views animating the same changes to this list, you will
-     * need to store the updateSpec returned here so that both
-     * recycleView adapters get a copy, otherwise the second
-     * adapter will always get a FULL_UPDATE (meaning no
-     * fancy animations for the second one)
-     *
-     * If the updateSpec is old, then we assume that whatever changes
-     * were made to the Updateable last time were never picked up by a
-     * recyclerView (maybe because the list was not visible at the time).
-     * In this case we clear the updateSpec and create a fresh one with a
-     * full update spec.
-     *
-     * @return the latest update spec for the list
-     */
-    override fun getAndClearLatestUpdateSpec(maxAgeMs: Long): UpdateSpec {
-        val latestUpdateSpecAvailable = updateSpec
-        updateSpec = createFullUpdateSpec(Fore.getSystemTimeWrapper(systemTimeWrapper))
-        return if (Fore.getSystemTimeWrapper(systemTimeWrapper).currentTimeMillis() - latestUpdateSpecAvailable.timeStamp < maxAgeMs) {
-            latestUpdateSpecAvailable
-        } else {
-            updateSpec
-        }
-    }
-
-    private fun createFullUpdateSpec(stw: SystemTimeWrapper): UpdateSpec {
-        return UpdateSpec(UpdateSpec.UpdateType.FULL_UPDATE, 0, 0, stw)
-    }
-}
diff --git a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/mutable/ChangeAwareLinkedList.kt b/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/mutable/ChangeAwareLinkedList.kt
deleted file mode 100644
index e95371c4..00000000
--- a/fore-kt/fore-kt-android-adapters/src/main/java/co/early/fore/kt/adapters/mutable/ChangeAwareLinkedList.kt
+++ /dev/null
@@ -1,253 +0,0 @@
-package co.early.fore.kt.adapters.mutable
-
-import co.early.fore.adapters.mutable.ChangeAwareList
-import co.early.fore.adapters.mutable.UpdateSpec
-import co.early.fore.adapters.mutable.Updateable
-import co.early.fore.core.time.SystemTimeWrapper
-import co.early.fore.kt.core.delegate.Fore
-import java.util.*
-import java.util.function.UnaryOperator
-
-/**
- * <p>Basic Android adapters use notifyDataSetChanged() to trigger a redraw of the list UI.
- *
- * <code>
- * adapter.notifyDataSetChanged();
- * </code>
- *
- * <p>In order to take advantage of insert and remove animations, we can provide the adapter with
- * more information about how the list has changed (eg: there was an item inserted at position 5
- * or the item at position 3 has changed etc), for that we call a selection of notifyXXX methods()
- * indicating what sort of change happened and which rows were effected.
- *
- * <p>This list class will automatically generate an update specification for each change you make
- * to it, suitable for deciding how to call the various notifyXXX methods:
- *
- * <code>
- *
- * UpdateSpec updateSpec = list.getMostRecentUpdateSpec();
- *
- * switch (updateSpec.type) {
- *  case FULL_UPDATE:
- *      adapter.notifyDataSetChanged();
- *      break;
- *  case ITEM_CHANGED:
- *      adapter.notifyItemChanged(updateSpec.rowPosition);
- *      break;
- *  case ITEM_REMOVED:
- *      adapter.notifyItemRemoved(updateSpec.rowPosition);
- *      break;
- *  case ITEM_INSERTED:
- *      adapter.notifyItemInserted(updateSpec.rowPosition);
- *      break;
- * }
- *
- * </code>
- *
- * <p>This class only supports one type of change at a time (you can't handle a cell update;
- * two removals; and three inserts, all in the same notify round trip - each has to be handled one at a time)
- *
- */
-class ChangeAwareLinkedList<T>(
-        private val systemTimeWrapper: SystemTimeWrapper? = null
-) : LinkedList<T>(), ChangeAwareList<T>, Updateable {
-
-    private var updateSpec: UpdateSpec = createFullUpdateSpec(Fore.getSystemTimeWrapper(systemTimeWrapper))
-
-    override fun add(element: T): Boolean {
-        val temp = super.add(element)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_INSERTED,
-                size - 1,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    override fun add(index: Int, element: T) {
-        super.add(index, element)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_INSERTED,
-                index,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-    }
-
-    override fun set(index: Int, element: T): T {
-        val temp = super.set(index, element)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_CHANGED,
-                index,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    override fun removeAt(index: Int): T {
-        val temp = super.removeAt(index)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_REMOVED,
-                index,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    override fun clear() {
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_REMOVED,
-                0,
-                size,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        super.clear()
-    }
-
-    override fun addAll(elements: Collection<T>): Boolean {
-        val temp = super.addAll(elements)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_INSERTED,
-                size - 1,
-                elements.size,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    override fun addAll(index: Int, elements: Collection<T>): Boolean {
-        val temp = super.addAll(index, elements)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_INSERTED,
-                index,
-                elements.size,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-        return temp
-    }
-
-    /**
-     * Standard AbstractList and ArrayList have this method protected as you
-     * are supposed to remove a range by doing this:
-     * list.subList(start, end).clear();
-     * (clear() ends up calling removeRange() behind the scenes).
-     * This won't work for these change aware lists (plus it's a ball ache),
-     * so this gets made public
-     */
-    override fun removeRange(fromIndex: Int, toIndex: Int) {
-        super.removeRange(fromIndex, toIndex)
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_REMOVED,
-                fromIndex,
-                toIndex - fromIndex,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-    }
-
-    override fun remove(element: T): Boolean {
-        val index = super.indexOf(element)
-        return if (index != -1) {
-            val temp = super.remove(element)
-            updateSpec = UpdateSpec(
-                    UpdateSpec.UpdateType.ITEM_REMOVED,
-                    index,
-                    1,
-                    Fore.getSystemTimeWrapper(systemTimeWrapper)
-            )
-            temp
-        } else {
-            false
-        }
-    }
-
-    override fun removeAll(elements: Collection<T>): Boolean {
-        val temp = super.removeAll(elements)
-        if (temp) {
-            updateSpec = createFullUpdateSpec(
-                    Fore.getSystemTimeWrapper(systemTimeWrapper)
-            )
-        }
-        return temp
-    }
-
-    override fun replaceAll(operator: UnaryOperator<T>) {
-        throw UnsupportedOperationException("Not supported by this class")
-    }
-
-    /**
-     * Inform the list that the content of one of its rows has
-     * changed.
-     *
-     * Without calling this, the list may not be aware of
-     * any changes made to this row and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowIndex index of the row that had its data changed
-     */
-    override fun makeAwareOfDataChange(rowIndex: Int) {
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_CHANGED,
-                rowIndex,
-                1,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-    }
-
-    /**
-     * Inform the list that the content of a range of its rows has
-     * changed.
-     *
-     * Without calling this, the list will not be aware of
-     * any changes made to these rows and the updateSpec will
-     * be incorrect as a result (you won't get default
-     * animations on your recyclerview)
-     *
-     * @param rowStartIndex index of the row that had its data changed
-     * @param rowsAffected how many rows have been affected
-     */
-    override fun makeAwareOfDataChange(rowStartIndex: Int, rowsAffected: Int) {
-        updateSpec = UpdateSpec(
-                UpdateSpec.UpdateType.ITEM_CHANGED,
-                rowStartIndex,
-                rowsAffected,
-                Fore.getSystemTimeWrapper(systemTimeWrapper)
-        )
-    }
-
-    /**
-     * Make sure you understand the limitations of this method!
-     *
-     * It essentially only supports one recycleView at a time,
-     * in the unlikely event that you want two different list
-     * views animating the same changes to this list, you will
-     * need to store the updateSpec returned here so that both
-     * recycleView adapters get a copy, otherwise the second
-     * adapter will always get a FULL_UPDATE (meaning no
-     * fancy animations for the second one)
-     *
-     * If the updateSpec is old, then we assume that whatever changes
-     * were made to the Updateable last time were never picked up by a
-     * recyclerView (maybe because the list was not visible at the time).
-     * In this case we clear the updateSpec and create a fresh one with a
-     * full update spec.
-     *
-     * @return the latest update spec for the list
-     */
-    override fun getAndClearLatestUpdateSpec(maxAgeMs: Long): UpdateSpec {
-        val latestUpdateSpecAvailable = updateSpec
-        updateSpec = createFullUpdateSpec(Fore.getSystemTimeWrapper(systemTimeWrapper))
-        return if (Fore.getSystemTimeWrapper(systemTimeWrapper).currentTimeMillis() - latestUpdateSpecAvailable.timeStamp < maxAgeMs) {
-            latestUpdateSpecAvailable
-        } else {
-            updateSpec
-        }
-    }
-
-    private fun createFullUpdateSpec(stw: SystemTimeWrapper): UpdateSpec {
-        return UpdateSpec(UpdateSpec.UpdateType.FULL_UPDATE, 0, 0, stw)
-    }
-}
diff --git a/fore-kt/fore-kt-android-compose/build.gradle.kts b/fore-kt/fore-kt-android-compose/build.gradle.kts
deleted file mode 100644
index 54ea62d7..00000000
--- a/fore-kt/fore-kt-android-compose/build.gradle.kts
+++ /dev/null
@@ -1,63 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.kotlinAndroid)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-android-compose")
-    set("LIB_DESCRIPTION", "fore - android kotlin compose")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-    buildFeatures {
-        compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = Shared.Versions.composeCompiler
-    }
-    namespace = "co.early.fore.kt.compose"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = 21 // NB higher minimum due to compose
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer.pro")
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-}
-
-dependencies {
-    api(project(":fore-kt:fore-kt-android"))
-    implementation("androidx.compose.ui:ui:${Shared.Versions.composeUi}")
-    implementation("androidx.window:window:${Shared.Versions.androidWindow}")
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-android-compose/src/main/AndroidManifest.xml b/fore-kt/fore-kt-android-compose/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-kt/fore-kt-android-compose/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android-core/build.gradle.kts b/fore-kt/fore-kt-android-core/build.gradle.kts
deleted file mode 100644
index 1eab7274..00000000
--- a/fore-kt/fore-kt-android-core/build.gradle.kts
+++ /dev/null
@@ -1,65 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.kotlinAndroid)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-android-core")
-    set("LIB_DESCRIPTION", "fore - android kotlin")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-    namespace = "co.early.fore.kt.core"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = Shared.Android.minSdk
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer.pro")
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-        }
-    }
-}
-
-dependencies {
-    api(project(":fore-kt:fore-kt-core"))
-    api("androidx.lifecycle:lifecycle-runtime-ktx:${Shared.Versions.androidx_lifecycle_common}")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Shared.Versions.kotlinx_coroutines_android}")
-    //promote the kotlin-reflect version used in the android lint tools to match kotlin_version used elsewhere
-    implementation(kotlin("reflect"))
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-android-core/src/main/AndroidManifest.xml b/fore-kt/fore-kt-android-core/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-kt/fore-kt-android-core/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/delegate/AndroidDebugDelegate.kt b/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/delegate/AndroidDebugDelegate.kt
deleted file mode 100644
index 33894286..00000000
--- a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/delegate/AndroidDebugDelegate.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package co.early.fore.kt.core.delegate
-
-import co.early.fore.core.WorkMode
-import co.early.fore.core.time.SystemTimeWrapper
-import co.early.fore.kt.core.logging.AndroidLogger
-import co.early.fore.kt.core.logging.Logger
-
-class DebugDelegateDefault (
-        tagPrefix: String? = null,
-        override val workMode: WorkMode = WorkMode.ASYNCHRONOUS,
-        override val logger: Logger = AndroidLogger(tagPrefix),
-        override val systemTimeWrapper: SystemTimeWrapper = SystemTimeWrapper()
-) : Delegate
diff --git a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/logging/AndroidLogger.kt b/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/logging/AndroidLogger.kt
deleted file mode 100644
index ae96cfed..00000000
--- a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/logging/AndroidLogger.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-package co.early.fore.kt.core.logging
-
-import android.util.Log
-
-class AndroidLogger(
-        private val tagPrefix: String? = null,
-        private val stableTagLength: Boolean = false,
-        overrideMaxTagLength: Int? = null
-) :
-        Logger,
-        TagInferer by TagInfererImpl(),
-        TagFormatter by TagFormatterImpl(overrideMaxTagLength) {
-
-    override fun e(message: String) {
-        e(inferTag(), message)
-    }
-
-    override fun w(message: String) {
-        w(inferTag(), message)
-    }
-
-    override fun i(message: String) {
-        i(inferTag(), message)
-    }
-
-    override fun d(message: String) {
-        d(inferTag(), message)
-    }
-
-    override fun v(message: String) {
-        v(inferTag(), message)
-    }
-
-    override fun e(message: String, throwable: Throwable) {
-        e(inferTag(), message, throwable)
-    }
-
-    override fun w(message: String, throwable: Throwable) {
-        w(inferTag(), message, throwable)
-    }
-
-    override fun i(message: String, throwable: Throwable) {
-        i(inferTag(), message, throwable)
-    }
-
-    override fun d(message: String, throwable: Throwable) {
-        d(inferTag(), message, throwable)
-    }
-
-    override fun v(message: String, throwable: Throwable) {
-        v(inferTag(), message, throwable)
-    }
-
-    override fun e(tag: String, message: String) {
-        if (stableTagLength) {
-            Log.e(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message)
-        } else {
-            Log.e(limitTagLength(addTagPrefixIfPresent(tag)), message)
-        }
-    }
-
-    override fun w(tag: String, message: String) {
-        if (stableTagLength) {
-            Log.w(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message)
-        } else {
-            Log.w(limitTagLength(addTagPrefixIfPresent(tag)), message)
-        }
-    }
-
-    override fun i(tag: String, message: String) {
-        if (stableTagLength) {
-            Log.i(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message)
-        } else {
-            Log.i(limitTagLength(addTagPrefixIfPresent(tag)), message)
-        }
-    }
-
-    override fun d(tag: String, message: String) {
-        if (stableTagLength) {
-            Log.d(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message)
-        } else {
-            Log.d(limitTagLength(addTagPrefixIfPresent(tag)), message)
-        }
-    }
-
-    override fun v(tag: String, message: String) {
-        if (stableTagLength) {
-            Log.v(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message)
-        } else {
-            Log.v(limitTagLength(addTagPrefixIfPresent(tag)), message)
-        }
-    }
-
-    override fun e(tag: String, message: String, throwable: Throwable) {
-        if (stableTagLength) {
-            Log.e(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message, throwable)
-        } else {
-            Log.e(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
-        }
-    }
-
-    override fun w(tag: String, message: String, throwable: Throwable) {
-        if (stableTagLength) {
-            Log.w(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message, throwable)
-        } else {
-            Log.w(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
-        }
-    }
-
-    override fun i(tag: String, message: String, throwable: Throwable) {
-        if (stableTagLength) {
-            Log.i(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message, throwable)
-        } else {
-            Log.i(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
-        }
-    }
-
-    override fun d(tag: String, message: String, throwable: Throwable) {
-        if (stableTagLength) {
-            Log.d(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message, throwable)
-        } else {
-            Log.d(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
-        }
-    }
-
-    override fun v(tag: String, message: String, throwable: Throwable) {
-        if (stableTagLength) {
-            Log.v(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + "|", message, throwable)
-        } else {
-            Log.v(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
-        }
-    }
-
-    private fun addTagPrefixIfPresent(message: String): String {
-        return tagPrefix?.let {
-            it + message
-        } ?: message
-    }
-}
diff --git a/fore-kt/fore-kt-android-network/build.gradle.kts b/fore-kt/fore-kt-android-network/build.gradle.kts
deleted file mode 100644
index 716d68c4..00000000
--- a/fore-kt/fore-kt-android-network/build.gradle.kts
+++ /dev/null
@@ -1,59 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.kotlinAndroid)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-android-network")
-    set("LIB_DESCRIPTION", "fore - android network helpers, kotlin")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = "co.early.fore.kt.net"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = Shared.Android.minSdk
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer-network.pro") // NB different consumer file
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-}
-
-dependencies {
-    api(project(":fore-kt:fore-kt-android-core"))
-    api(project(":fore-kt:fore-kt-network"))
-    compileOnly("com.apollographql.apollo:apollo-runtime:${Shared.Versions.apollo}")
-    compileOnly("com.squareup.retrofit2:retrofit:${Shared.Versions.retrofit}")
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-android-network/src/main/AndroidManifest.xml b/fore-kt/fore-kt-android-network/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-kt/fore-kt-android-network/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/apollo/CallProcessorApollo.kt b/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/apollo/CallProcessorApollo.kt
deleted file mode 100644
index 879c9095..00000000
--- a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/apollo/CallProcessorApollo.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package co.early.fore.kt.net.apollo
-
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.Either
-import co.early.fore.kt.core.coroutine.asyncMain
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.net.apollo.ErrorHandler
-import com.apollographql.apollo.ApolloCall
-import com.apollographql.apollo.api.Error
-import com.apollographql.apollo.api.Response
-import com.apollographql.apollo.exception.ApolloException
-import kotlinx.coroutines.Deferred
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-@Deprecated("uses a deprecated version of Either and will be removed in a future fore release, use CallerApollo instead", replaceWith = ReplaceWith(expression = "CallerApollo<F>", "co.early.fore.kt.core.type.carryOn"))
-interface ApolloCaller<F> {
-    suspend fun <S> processCallAwait(
-        call: () -> ApolloCall<S>
-    ): Either<F, CallProcessorApollo.SuccessResult<S>>
-    suspend fun <S> processCallAsync(
-        call: () -> ApolloCall<S>
-    ): Deferred<Either<F, CallProcessorApollo.SuccessResult<S>>>
-}
-
-/**
- * @param errorHandler Error handler for the service (interpreting HTTP codes, GraphQL errors
- * etc). This error handler is often the same across a range of services required by the app.
- * However, sometimes the APIs all have different error behaviours (say when the service APIs have
- * been developed at different times, or by different teams or different third parties). In this
- * case it might be easier to use a separate CallProcessorApollo instance (and ErrorHandler) for
- * each micro service.
- * @param logger (optional: ForeDelegateHolder will choose a sensible default)
- * @param workMode (optional: ForeDelegateHolder will choose a sensible default) Testing: Apollo
- * library is NOT setup to be able to run calls in a synchronous manner (unlike Retrofit), for this
- * reason when testing the fore ApolloCallProcessor we still need to use count down latches even with
- * workMode = SYNCHRONOUS
- * @param allowPartialSuccesses (defaults to false) The GraphQL spec allows for success responses
- * with qualified errors, like this: https://spec.graphql.org/draft/#example-90475 if true, you will
- * receive these responses as successes, together with the list of partial errors that were attached
- * in the response. If allowPartialSuccesses=false, these types of responses will be delivered as
- * errors and the successful parts of the response will be dropped. Setting it to true is going to
- * make keeping your domain layer and api layers separate a lot harder, and apart from in some highly
- * optimised situations I'd recommend you keep it set to false.
- *
- * @param <F>  The class type passed back in the event of a failure, Globally applicable
- * failure message class, like an enum for example
- */
-@Deprecated("uses a deprecated version of Either and will be removed in a future fore release, use CallWrapperApollo instead", replaceWith = ReplaceWith(expression = "CallWrapperApollo<F>"))
-class CallProcessorApollo<F>(
-    private val errorHandler: ErrorHandler<F>,
-    private val logger: Logger? = null,
-    private val workMode: WorkMode? = null,
-    private val allowPartialSuccesses: Boolean = false
-) : ApolloCaller<F> {
-
-    data class SuccessResult<S>(
-            val data: S,
-            val partialErrors: List<Error> = listOf(),
-            val extensions: Map<String, Any?> = hashMapOf(),
-            val isFromCache: Boolean = false
-    )
-
-    /**
-     * @param call functional type that returns a fresh instance of the ApolloCall to be processed
-     * @param <S> Success class you expect to be returned from the call (or Unit for an empty response)
-     *
-     * @returns Either<F, SuccessResult<S>>
-     */
-    override suspend fun <S> processCallAwait(call: () -> ApolloCall<S>): Either<F, SuccessResult<S>> {
-        return processCallAsync(call).await()
-    }
-
-    /**
-     * @param call functional type that returns a fresh instance of the ApolloCall to be processed
-     * @param <S> Success class you expect to be returned from the call (or Unit for an empty response)
-     *
-     * @returns Deferred<Either<F, SuccessResult<S>>>
-     */
-    override suspend fun <S> processCallAsync(call: () -> ApolloCall<S>): Deferred<Either<F, SuccessResult<S>>> {
-
-        return asyncMain(Fore.getWorkMode(workMode)) {
-            try {
-                suspendCoroutine { continuation ->
-                    call().enqueue(object : ApolloCall.Callback<S>() {
-                        override fun onResponse(response: Response<S>) {
-                            continuation.resume(processSuccessResponse(response))
-                        }
-
-                        override fun onFailure(e: ApolloException) {
-                            continuation.resume(processFailResponse(e, null))
-                        }
-                    })
-                }
-            } catch (t: Throwable) {
-                processFailResponse(t, null)
-            }
-        }
-    }
-
-    private fun <S> processSuccessResponse(
-            response: Response<S>
-    ): Either<F, SuccessResult<S>> {
-
-        val data: S? = response.data
-
-        return if (data != null) {
-            if (!response.hasErrors() || allowPartialSuccesses) {
-                Either.right(SuccessResult(data, response.errors
-                        ?: mutableListOf(), response.extensions, response.isFromCache))
-            } else {
-                processFailResponse(null, response)
-            }
-        } else {
-            processFailResponse(null, response)
-        }
-    }
-
-    private fun <S> processFailResponse(
-            t: Throwable?, errorResponse: Response<*>?
-    ): Either<F, SuccessResult<S>> {
-
-        if (t != null) {
-            Fore.getLogger(logger).e("processFailResponse() t:" + Thread.currentThread(), t)
-        }
-
-        return Either.left(errorHandler.handleError(t, errorResponse))
-    }
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/apollo/CallWrapperApollo.kt b/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/apollo/CallWrapperApollo.kt
deleted file mode 100644
index b43dd3bf..00000000
--- a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/apollo/CallWrapperApollo.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package co.early.fore.kt.net.apollo
-
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.coroutine.asyncMain
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.type.Either
-import co.early.fore.kt.core.type.Either.Companion.fail
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.net.apollo.ErrorHandler
-import com.apollographql.apollo.ApolloCall
-import com.apollographql.apollo.api.Error
-import com.apollographql.apollo.api.Response
-import com.apollographql.apollo.exception.ApolloException
-import kotlinx.coroutines.Deferred
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-interface CallerApollo<F> {
-    suspend fun <S> processCallAwait(
-        call: () -> ApolloCall<S>
-    ): Either<F, CallWrapperApollo.SuccessResult<S>>
-    suspend fun <S> processCallAsync(
-        call: () -> ApolloCall<S>
-    ): Deferred<Either<F, CallWrapperApollo.SuccessResult<S>>>
-}
-
-/**
- * @param errorHandler Error handler for the service (interpreting HTTP codes, GraphQL errors
- * etc). This error handler is often the same across a range of services required by the app.
- * However, sometimes the APIs all have different error behaviours (say when the service APIs have
- * been developed at different times, or by different teams or different third parties). In this
- * case it might be easier to use a separate CallProcessorApollo instance (and ErrorHandler) for
- * each micro service.
- * @param logger (optional: ForeDelegateHolder will choose a sensible default)
- * @param workMode (optional: ForeDelegateHolder will choose a sensible default) Testing: Apollo
- * library is NOT setup to be able to run calls in a synchronous manner (unlike Retrofit), for this
- * reason when testing the fore ApolloCallProcessor we still need to use count down latches even with
- * workMode = SYNCHRONOUS
- * @param allowPartialSuccesses (defaults to false) The GraphQL spec allows for success responses
- * with qualified errors, like this: https://spec.graphql.org/draft/#example-90475 if true, you will
- * receive these responses as successes, together with the list of partial errors that were attached
- * in the response. If allowPartialSuccesses=false, these types of responses will be delivered as
- * errors and the successful parts of the response will be dropped. Setting it to true is going to
- * make keeping your domain layer and api layers separate a lot harder, and apart from in some highly
- * optimised situations I'd recommend you keep it set to false.
- *
- * @param <F>  The class type passed back in the event of a failure, Globally applicable
- * failure message class, like an enum for example
- */
-class CallWrapperApollo<F>(
-    private val errorHandler: ErrorHandler<F>,
-    private val logger: Logger? = null,
-    private val workMode: WorkMode? = null,
-    private val allowPartialSuccesses: Boolean = false
-) : CallerApollo<F> {
-
-    data class SuccessResult<S>(
-            val data: S,
-            val partialErrors: List<Error> = listOf(),
-            val extensions: Map<String, Any?> = hashMapOf(),
-            val isFromCache: Boolean = false
-    )
-
-    /**
-     * @param call functional type that returns a fresh instance of the ApolloCall to be processed
-     * @param <S> Success class you expect to be returned from the call (or Unit for an empty response)
-     *
-     * @returns Either<F, SuccessResult<S>>
-     */
-    override suspend fun <S> processCallAwait(call: () -> ApolloCall<S>): Either<F, SuccessResult<S>> {
-        return processCallAsync(call).await()
-    }
-
-    /**
-     * @param call functional type that returns a fresh instance of the ApolloCall to be processed
-     * @param <S> Success class you expect to be returned from the call (or Unit for an empty response)
-     *
-     * @returns Deferred<Either<F, SuccessResult<S>>>
-     */
-    override suspend fun <S> processCallAsync(call: () -> ApolloCall<S>): Deferred<Either<F, SuccessResult<S>>> {
-
-        return asyncMain(Fore.getWorkMode(workMode)) {
-            try {
-                suspendCoroutine { continuation ->
-                    call().enqueue(object : ApolloCall.Callback<S>() {
-                        override fun onResponse(response: Response<S>) {
-                            continuation.resume(processSuccessResponse(response))
-                        }
-
-                        override fun onFailure(e: ApolloException) {
-                            continuation.resume(processFailResponse(e, null))
-                        }
-                    })
-                }
-            } catch (t: Throwable) {
-                processFailResponse(t, null)
-            }
-        }
-    }
-
-    private fun <S> processSuccessResponse(
-            response: Response<S>
-    ): Either<F, SuccessResult<S>> {
-
-        val data: S? = response.data
-
-        return if (data != null) {
-            if (!response.hasErrors() || allowPartialSuccesses) {
-                success(SuccessResult(data, response.errors
-                        ?: mutableListOf(), response.extensions, response.isFromCache))
-            } else {
-                processFailResponse(null, response)
-            }
-        } else {
-            processFailResponse(null, response)
-        }
-    }
-
-    private fun <S> processFailResponse(
-            t: Throwable?, errorResponse: Response<*>?
-    ): Either<F, SuccessResult<S>> {
-
-        if (t != null) {
-            Fore.getLogger(logger).e("processFailResponse() t:" + Thread.currentThread(), t)
-        }
-
-        return fail(errorHandler.handleError(t, errorResponse))
-    }
-}
diff --git a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/CallProcessorRetrofit2.kt b/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/CallProcessorRetrofit2.kt
deleted file mode 100644
index d69c6b1c..00000000
--- a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/CallProcessorRetrofit2.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-package co.early.fore.kt.net.retrofit2
-
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.Either
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.coroutine.asyncMain
-import co.early.fore.kt.core.coroutine.awaitIO
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.net.MessageProvider
-import kotlinx.coroutines.Deferred
-import retrofit2.Response
-
-@Deprecated("uses a deprecated version of Either and will be removed in a future fore release, use CallerRetrofit2 instead", replaceWith = ReplaceWith(expression = "CallerRetrofit2<F>"))
-interface Retrofit2Caller<F> {
-    suspend fun <S> processCallAwait(
-        call: suspend () -> Response<S>
-    ): Either<F, S>
-    suspend fun <S, CE : MessageProvider<F>> processCallAwait(
-        customErrorClazz: Class<CE>,
-        call: suspend () -> Response<S>
-    ): Either<F, S>
-    suspend fun <S> processCallAsync(
-        call: suspend () -> Response<S>
-    ): Deferred<Either<F, S>>
-    suspend fun <S, CE : MessageProvider<F>> processCallAsync(
-        customErrorClazz: Class<CE>,
-        call: suspend () -> Response<S>
-    ): Deferred<Either<F, S>>
-}
-
-/**
- * F - Globally applicable failure message class, like an enum for example
- * S - Success pojo you expect to be returned from the API (or Unit for an empty response)
- * CE - Custom error class that you expect from the specific API in the event of an error
- *
- * CE needs to implement MessageProvider&lt;F&gt; (i.e. it needs to be able to give you a failure
- * message that can be passed back to the application)
- *
- * @param errorHandler Error handler for the service (interpreting HTTP codes etc). This
- * error handler is often the same across a range of services required by the app. However, sometimes
- * the APIs all have different error behaviours (say when the service APIs have been developed
- * at different times, or by different companies, or even teams). In this case it might be easier
- * to use a separate CallProcessor instance (and ErrorHandler) for each micro service.
- * @param workMode (optional: ForeDelegateHolder will choose a sensible default)  SYNCHRONOUS means
- * everything is run sequentially in a blocking manner
- * and on whatever thread the caller is on (suitable for running unit tests for example).
- * ASYNCHRONOUS gives you the co-routine behaviour you would expect - for this class that
- * means network requests are run on Dispatchers.IO
- * @param logger (optional: ForeDelegateHolder will choose a sensible default)
- *
- * @param <F>  The class type passed back in the event of a failure, Globally applicable
- * failure message class, like an enum for example
- */
-@Deprecated("uses a deprecated version of Either and will be removed in a future fore release, use CallWrapperRetrofit2 instead", replaceWith = ReplaceWith(expression = "CallWrapperRetrofit2<F>"))
-class CallProcessorRetrofit2<F>(
-    private val errorHandler: co.early.fore.net.retrofit2.ErrorHandler<F>,
-    private val workMode: WorkMode? = null,
-    private val logger: Logger? = null
-) : Retrofit2Caller<F> {
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     */
-    override suspend fun <S> processCallAwait(call: suspend () -> Response<S>): Either<F, S> {
-        return processCallAsync(call).await()
-    }
-
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     */
-    override suspend fun <S, CE : MessageProvider<F>> processCallAwait(
-            customErrorClazz: Class<CE>,
-            call: suspend () -> Response<S>
-    ): Either<F, S> {
-        return processCallAsync(customErrorClazz, call).await()
-    }
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
-     */
-    override suspend fun <S> processCallAsync(call: suspend () -> Response<S>): Deferred<Either<F, S>> {
-        return doCallAsync<S, MessageProvider<F>>(null, call)
-    }
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
-     */
-    override suspend fun <S, CE : MessageProvider<F>> processCallAsync(
-            customErrorClazz: Class<CE>,
-            call: suspend () -> Response<S>
-    ): Deferred<Either<F, S>> {
-        return doCallAsync(customErrorClazz, call)
-    }
-
-    private suspend fun <S, CE : MessageProvider<F>> doCallAsync(
-            customErrorClazz: Class<CE>?,
-            call: suspend () -> Response<S>
-    ): Deferred<Either<F, S>> {
-
-        Fore.getLogger(logger).d("doCallAsync() t:" + Thread.currentThread())
-
-        return asyncMain(Fore.getWorkMode(workMode)) {
-            try {
-
-                val result: Response<S> = awaitIO(Fore.getWorkMode(workMode)) {
-
-                    Fore.getLogger(logger).d("about to make call from io dispatcher, t:" + Thread.currentThread())
-
-                    call()
-                }
-
-                Fore.getLogger(logger).d("continuing back on main dispatcher t:" + Thread.currentThread())
-
-                processSuccessResponse(result, customErrorClazz)
-            } catch (t: Throwable) {
-                processFailResponse<CE, S>(t, null, customErrorClazz)
-            }
-        }
-    }
-
-    private fun <CE : MessageProvider<F>, S> processSuccessResponse(
-            response: Response<S>, customErrorClass: Class<CE>?
-    ): Either<F, S> {
-        val resp: S? = response.body()
-
-        return if (response.isSuccessful && resp != null) {
-            Either.right(resp)
-        } else {
-            processFailResponse(null, response, customErrorClass)
-        }
-    }
-
-    private fun <CE : MessageProvider<F>, S> processFailResponse(
-            t: Throwable?, errorResponse: Response<*>?, customErrorClass: Class<CE>?
-    ): Either<F, S> {
-
-        if (t != null) {
-            Fore.getLogger(logger).w("processFailResponse() t:" + Thread.currentThread(), t)
-        }
-
-        return Either.left(errorHandler.handleError(t, errorResponse, customErrorClass, null))
-    }
-}
diff --git a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/CallWrapperRetrofit2.kt b/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/CallWrapperRetrofit2.kt
deleted file mode 100644
index 4e814fbc..00000000
--- a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/CallWrapperRetrofit2.kt
+++ /dev/null
@@ -1,150 +0,0 @@
-package co.early.fore.kt.net.retrofit2
-
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.coroutine.asyncMain
-import co.early.fore.kt.core.coroutine.awaitIO
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.type.Either
-import co.early.fore.kt.core.type.Either.Companion.fail
-import co.early.fore.kt.core.type.Either.Companion.success
-import co.early.fore.net.MessageProvider
-import kotlinx.coroutines.Deferred
-import retrofit2.Response
-
-interface CallerRetrofit2<F> {
-    suspend fun <S> processCallAwait(
-        call: suspend () -> Response<S>
-    ): Either<F, S>
-    suspend fun <S, CE : MessageProvider<F>> processCallAwait(
-        customErrorClazz: Class<CE>,
-        call: suspend () -> Response<S>
-    ): Either<F, S>
-    suspend fun <S> processCallAsync(
-        call: suspend () -> Response<S>
-    ): Deferred<Either<F, S>>
-    suspend fun <S, CE : MessageProvider<F>> processCallAsync(
-        customErrorClazz: Class<CE>,
-        call: suspend () -> Response<S>
-    ): Deferred<Either<F, S>>
-}
-
-/**
- * F - Globally applicable failure message class, like an enum for example
- * S - Success pojo you expect to be returned from the API (or Unit for an empty response)
- * CE - Custom error class that you expect from the specific API in the event of an error
- *
- * CE needs to implement MessageProvider&lt;F&gt; (i.e. it needs to be able to give you a failure
- * message that can be passed back to the application)
- *
- * @param errorHandler Error handler for the service (interpreting HTTP codes etc). This
- * error handler is often the same across a range of services required by the app. However, sometimes
- * the APIs all have different error behaviours (say when the service APIs have been developed
- * at different times, or by different companies, or even teams). In this case it might be easier
- * to use a separate CallProcessor instance (and ErrorHandler) for each micro service.
- * @param workMode (optional: ForeDelegateHolder will choose a sensible default)  SYNCHRONOUS means
- * everything is run sequentially in a blocking manner
- * and on whatever thread the caller is on (suitable for running unit tests for example).
- * ASYNCHRONOUS gives you the co-routine behaviour you would expect - for this class that
- * means network requests are run on Dispatchers.IO
- * @param logger (optional: ForeDelegateHolder will choose a sensible default)
- *
- * @param <F>  The class type passed back in the event of a failure, Globally applicable
- * failure message class, like an enum for example
- */
-class CallWrapperRetrofit2<F>(
-    private val errorHandler: co.early.fore.net.retrofit2.ErrorHandler<F>,
-    private val workMode: WorkMode? = null,
-    private val logger: Logger? = null
-) : CallerRetrofit2<F> {
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     */
-    override suspend fun <S> processCallAwait(call: suspend () -> Response<S>): Either<F, S> {
-        return processCallAsync(call).await()
-    }
-
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     */
-    override suspend fun <S, CE : MessageProvider<F>> processCallAwait(
-            customErrorClazz: Class<CE>,
-            call: suspend () -> Response<S>
-    ): Either<F, S> {
-        return processCallAsync(customErrorClazz, call).await()
-    }
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
-     */
-    override suspend fun <S> processCallAsync(call: suspend () -> Response<S>): Deferred<Either<F, S>> {
-        return doCallAsync<S, MessageProvider<F>>(null, call)
-    }
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
-     */
-    override suspend fun <S, CE : MessageProvider<F>> processCallAsync(
-            customErrorClazz: Class<CE>,
-            call: suspend () -> Response<S>
-    ): Deferred<Either<F, S>> {
-        return doCallAsync(customErrorClazz, call)
-    }
-
-    private suspend fun <S, CE : MessageProvider<F>> doCallAsync(
-            customErrorClazz: Class<CE>?,
-            call: suspend () -> Response<S>
-    ): Deferred<Either<F, S>> {
-
-        Fore.getLogger(logger).d("doCallAsync() t:" + Thread.currentThread())
-
-        return asyncMain(Fore.getWorkMode(workMode)) {
-            try {
-
-                val result: Response<S> = awaitIO(Fore.getWorkMode(workMode)) {
-
-                    Fore.getLogger(logger).d("about to make call from io dispatcher, t:" + Thread.currentThread())
-
-                    call()
-                }
-
-                Fore.getLogger(logger).d("continuing back on main dispatcher t:" + Thread.currentThread())
-
-                processSuccessResponse(result, customErrorClazz)
-            } catch (t: Throwable) {
-                processFailResponse<CE, S>(t, null, customErrorClazz)
-            }
-        }
-    }
-
-    private fun <CE : MessageProvider<F>, S> processSuccessResponse(
-            response: Response<S>, customErrorClass: Class<CE>?
-    ): Either<F, S> {
-        val resp: S? = response.body()
-
-        return if (response.isSuccessful && resp != null) {
-            success(resp)
-        } else {
-            processFailResponse(null, response, customErrorClass)
-        }
-    }
-
-    private fun <CE : MessageProvider<F>, S> processFailResponse(
-            t: Throwable?, errorResponse: Response<*>?, customErrorClass: Class<CE>?
-    ): Either<F, S> {
-
-        if (t != null) {
-            Fore.getLogger(logger).w("processFailResponse() t:" + Thread.currentThread(), t)
-        }
-
-        return fail(errorHandler.handleError(t, errorResponse, customErrorClass, null))
-    }
-}
diff --git a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/Retrofit2ResponseExt.kt b/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/Retrofit2ResponseExt.kt
deleted file mode 100644
index 96bb3528..00000000
--- a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/kt/net/retrofit2/Retrofit2ResponseExt.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package co.early.fore.kt.net.retrofit2
-
-import retrofit2.Response
-
-/**
- * If this is a successful Response, the extension function calls next() with the result
- *
- * If this is a failed Response, it returns with a new Error Response (of a new type)
- *
- * Copyright © 2019 early.co. All rights reserved.
- */
-suspend fun <T, R> Response<T>.carryOn(
-        next: suspend (T) -> Response<R>
-): Response<R> {
-    return body()?.let {
-        return next(it)
-    } ?: run {
-        return Response.error(errorBody()!!, raw())
-    }
-}
diff --git a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/net/apollo/ErrorHandler.kt b/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/net/apollo/ErrorHandler.kt
deleted file mode 100644
index b2081a09..00000000
--- a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/net/apollo/ErrorHandler.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package co.early.fore.net.apollo
-
-import com.apollographql.apollo.api.Response
-
-/**
- *
- * @param <F> Failure message class to be used throughout the app, such as an enum
-</F> */
-interface ErrorHandler<F> {
-    /**
-     *
-     * @param t throwable that caused the error, may be null
-     * @param errorResponse error response from the server, the body of which may represent a custom error, may be null
-     * @return the parsed error from the server
-     */
-    fun handleError(t: Throwable?, errorResponse: Response<*>?): F
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/net/retrofit2/ErrorHandler.kt b/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/net/retrofit2/ErrorHandler.kt
deleted file mode 100644
index 7f351b86..00000000
--- a/fore-kt/fore-kt-android-network/src/main/java/co/early/fore/net/retrofit2/ErrorHandler.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package co.early.fore.net.retrofit2
-
-import co.early.fore.net.MessageProvider
-import okhttp3.Request
-import retrofit2.Response
-
-/**
- *
- * @param <F> Failure message class to be used throughout the app, such as an enum
-</F> */
-interface ErrorHandler<F> {
-    /**
-     *
-     * @param t throwable that caused the error, may be null
-     * @param errorResponse error response from the server, the body of which may represent a custom error, may be null
-     * @param customErrorClazz custom error class expected from the errorResponse, may be null
-     * @param originalRequest in case it's needed (if you need access to the headers for example), may be null
-     * @param <CE> class type of the custom error, may be null
-     * @return the parsed error from the server
-    </CE> */
-    fun <CE : MessageProvider<F>> handleError(
-        t: Throwable?,
-        errorResponse: Response<*>?,
-        customErrorClazz: Class<CE>?,
-        originalRequest: Request?
-    ): F
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-android/build.gradle.kts b/fore-kt/fore-kt-android/build.gradle.kts
deleted file mode 100644
index 304b2422..00000000
--- a/fore-kt/fore-kt-android/build.gradle.kts
+++ /dev/null
@@ -1,73 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.kotlinAndroid)
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-android")
-    set("LIB_DESCRIPTION", "android fore - everything in one aar for kotlin development")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-android {
-
-    namespace = "co.early.fore.kt"
-
-    // following was previously in BuildSrc
-
-    compileSdk = Shared.Android.compileSdk
-
-    lint {
-        abortOnError = true
-        lintConfig = File(project.rootDir, "lint-library.xml")
-    }
-
-    defaultConfig {
-        minSdk = Shared.Android.minSdk
-        multiDexEnabled = true
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            consumerProguardFiles("../../proguard-library-consumer-network.pro") //NB different consumer file
-        }
-    }
-
-    buildFeatures {
-        buildConfig = false
-    }
-}
-
-dependencies {
-
-    api(project(":fore-kt:fore-kt-android-core"))
-    api(project(":fore-kt:fore-kt-android-adapters"))
-    api(project(":fore-kt:fore-kt-android-network"))
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")
-
-    //These tests need to be run on at least Android P / 9 / 27 (https://github.com/mockk/mockk/issues/182)
-    androidTestImplementation("io.mockk:mockk-android:${Shared.Versions.mockk}")
-    androidTestImplementation("androidx.test:core:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:runner:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test:rules:${Shared.Versions.androidxtest}")
-    androidTestImplementation("androidx.test.ext:junit-ktx:${Shared.Versions.androidxjunit}")
-    androidTestImplementation("androidx.annotation:annotation:${Shared.Versions.annotation}")
-    androidTestImplementation("androidx.test.espresso:espresso-core:${Shared.Versions.espresso_core}") {
-        exclude(group = "com.android.support", module = "support-annotations")
-    }
-}
-
-apply(from = "../../publish-android-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-android/src/main/AndroidManifest.xml b/fore-kt/fore-kt-android/src/main/AndroidManifest.xml
deleted file mode 100644
index 227314ee..00000000
--- a/fore-kt/fore-kt-android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest />
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/build.gradle.kts b/fore-kt/fore-kt-core/build.gradle.kts
deleted file mode 100644
index aec6a270..00000000
--- a/fore-kt/fore-kt-core/build.gradle.kts
+++ /dev/null
@@ -1,27 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.kotlin)
-}
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-core")
-    set("LIB_DESCRIPTION", "fore - kotlin core code")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-dependencies {
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Shared.Versions.kotlinx_coroutines_core}")
-
-    testImplementation("junit:junit:${Shared.Versions.junit}")
-    testImplementation("io.mockk:mockk:${Shared.Versions.mockk}")
-}
-
-apply(from = "../../publish-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/Affirm.java b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/Affirm.java
deleted file mode 100644
index 4007c8c6..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/Affirm.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package co.early.fore.core;
-
-// this is a remnant of the fore's original java implementation and isn't particularly useful for kotlin, so will be removed in the next major version (the java packages like fore-jv-android will remain as they are)
-@Deprecated
-public class Affirm {
-
-    public static <T> T notNull(T param) {
-        if (param == null) {
-            throw new NullPointerException("Parameter must not be null");
-        }
-        return param;
-    }
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/ContinueCallback.java b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/ContinueCallback.java
deleted file mode 100644
index 9fe7029d..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/ContinueCallback.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.callbacks;
-
-// this is a remnant of the fore's original java implementation and isn't particularly useful for kotlin, so will be removed in the next major version (the java packages like fore-jv-android will remain as they are)
-@Deprecated
-public interface ContinueCallback {
-    void carryOn();
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/DoThisCallback.java b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/DoThisCallback.java
deleted file mode 100644
index 9d061d82..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/DoThisCallback.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.callbacks;
-
-// this is a remnant of the fore's original java implementation and isn't particularly useful for kotlin, so will be removed in the next major version (the java packages like fore-jv-android will remain as they are)
-@Deprecated
-public interface DoThisCallback {
-    void doThis();
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/DoThisWithPayloadCallback.java b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/DoThisWithPayloadCallback.java
deleted file mode 100644
index f4cc4373..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/DoThisWithPayloadCallback.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.callbacks;
-
-// this is a remnant of the fore's original java implementation and isn't particularly useful for kotlin, so will be removed in the next major version (the java packages like fore-jv-android will remain as they are)
-@Deprecated
-public interface DoThisWithPayloadCallback<T> {
-    void doThis(T payload);
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/FailureCallback.java b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/FailureCallback.java
deleted file mode 100644
index aa481ae5..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/FailureCallback.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.callbacks;
-
-// this is a remnant of the fore's original java implementation and isn't particularly useful for kotlin, so will be removed in the next major version (the java packages like fore-jv-android will remain as they are)
-@Deprecated
-public interface FailureCallback {
-    void fail();
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/FailureCallbackWithPayload.java b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/FailureCallbackWithPayload.java
deleted file mode 100644
index 4e73fe1b..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/FailureCallbackWithPayload.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.callbacks;
-
-// this is a remnant of the fore's original java implementation and isn't particularly useful for kotlin, so will be removed in the next major version (the java packages like fore-jv-android will remain as they are)
-@Deprecated
-public interface FailureCallbackWithPayload<F> {
-    void fail(F failureMessage);
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/SuccessCallback.java b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/SuccessCallback.java
deleted file mode 100644
index 701b554f..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/SuccessCallback.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.callbacks;
-
-// this is a remnant of the fore's original java implementation and isn't particularly useful for kotlin, so will be removed in the next major version (the java packages like fore-jv-android will remain as they are)
-@Deprecated
-public interface SuccessCallback {
-    void success();
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/SuccessCallbackWithPayload.java b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/SuccessCallbackWithPayload.java
deleted file mode 100644
index 4cb272cc..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/callbacks/SuccessCallbackWithPayload.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.early.fore.core.callbacks;
-
-// this is a remnant of the fore's original java implementation and isn't particularly useful for kotlin, so will be removed in the next major version (the java packages like fore-jv-android will remain as they are)
-@Deprecated
-public interface SuccessCallbackWithPayload<S> {
-    void success(S successResponse);
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/time/SystemTimeWrapper.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/time/SystemTimeWrapper.kt
deleted file mode 100644
index eb593f66..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/time/SystemTimeWrapper.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package co.early.fore.core.time
-
-/**
- * This enables us to set a mock the system time for testing.
- */
-class SystemTimeWrapper {
-    fun currentTimeMillis(): Long {
-        return System.currentTimeMillis()
-    }
-
-    fun nanoTime(): Long {
-        return System.nanoTime()
-    }
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/utils/text/BasicTextWrapper.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/utils/text/BasicTextWrapper.kt
deleted file mode 100644
index 92629a1e..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/utils/text/BasicTextWrapper.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-package co.early.fore.core.utils.text
-
-import java.lang.NullPointerException
-import java.lang.StringBuilder
-import java.util.*
-
-/**
- * Basic class which only deals with Left to Right text and will work for Monospaced fonts only
- */
-object BasicTextWrapper {
-    private const val LINE_BREAK = "\n"
-    const val SPACE = " "
-    const val EMPTY = ""
-
-    /**
-     * Wrap fullText so that it will fit in charactersAvailable,
-     * over however many lines it takes
-     *
-     *
-     * Attempts to wrap on spaces between words if possible, if not will break mid-word
-     *
-     *
-     * Honours the line break '\n'
-     *
-     *
-     * Does not honour large spaces (made up of multiple space characters in a row) - all spaces between
-     * words will return as single spaced
-     *
-     * @param fullText text that needs to be wrapped
-     * @param charactersAvailable has to be larger than 0
-     * @return lines of text, such that each line of text fits inside the charactersAvailable, any line
-     * breaks in the original string will be converted to a empty string item in the list
-     */
-    fun wrapMonospaceText(fullText: String, charactersAvailable: Int): List<String> {
-        notNull(fullText)
-        require(charactersAvailable > 0) { "charactersAvailable needs to be larger than 0, charactersAvailable:$charactersAvailable" }
-
-        //separate any line breaks out
-        val linesWithExtractedLineBreaks = mutableListOf<String>()
-        expandLineBreaks(linesWithExtractedLineBreaks, fullText)
-        val finalLines: MutableList<String> = ArrayList()
-        for (line in linesWithExtractedLineBreaks) {
-            if (EMPTY == line) {
-                finalLines.add(line)
-            } else {
-                val trimmedLine = line.trim { it <= ' ' }
-                if (EMPTY == trimmedLine) {
-                    finalLines.add(SPACE)
-                } else {
-                    //take the line with no line breaks in it and then wrap that
-                    val stringTokenizer = StringTokenizer(line, SPACE, false)
-                    val words: MutableList<String> = ArrayList()
-                    while (stringTokenizer.hasMoreTokens()) {
-                        words.add(stringTokenizer.nextToken())
-                    }
-                    extractWrappedLines(finalLines, words, charactersAvailable)
-                }
-            }
-        }
-        return finalLines
-    }
-
-    /**
-     * Takes a string of text, replacing any '\n' line breaks with new lines which are added to the output list
-     *
-     * @param lines list of lines, which will have more lines appended to it by this method
-     * @param lineWhichMayIncludeLineBreaks this is the text which will be appended to the lines list (if it contains
-     * line breaks, then the text will be broken into multiple lines before
-     * being appended)
-     */
-    private fun expandLineBreaks(lines: MutableList<String>, lineWhichMayIncludeLineBreaks: String) {
-        val positionOfLineBreak = lineWhichMayIncludeLineBreaks.indexOf(LINE_BREAK)
-        if (positionOfLineBreak < 0) { //no line breaks present
-            lines.add(lines.size, lineWhichMayIncludeLineBreaks)
-        } else { //has a line break in the word
-            lines.add(lines.size, lineWhichMayIncludeLineBreaks.substring(0, positionOfLineBreak))
-            expandLineBreaks(
-                lines,
-                lineWhichMayIncludeLineBreaks.substring(
-                    positionOfLineBreak + 1,
-                    lineWhichMayIncludeLineBreaks.length
-                )
-            )
-        }
-    }
-
-    /**
-     * Recursive method, takes a list of words and concatenates them in order and with spaces in between each word, up to a maximum line width of widthAvailable,
-     * further lines are added to linesSoFar until all the wordsStillToWrap have been processed.
-     *
-     * @param linesSoFar output list of lines of text limited to the characters available and made up of the words taken from wordsStillToWrap
-     * @param wordsStillToWrap words that are to be concatenated into lines and then added to linesSoFar
-     */
-    private fun extractWrappedLines(
-        linesSoFar: MutableList<String>,
-        wordsStillToWrap: MutableList<String>,
-        charactersAvailable: Int
-    ) {
-        if (wordsStillToWrap.size > 0) {
-
-            //start by assuming all the words still to wrap will wrap into one line
-            val nextLineAttempt = flattenWordsAddingSpaces(wordsStillToWrap)
-            var charactersThatFit =
-                if (nextLineAttempt.length < charactersAvailable) nextLineAttempt.length else charactersAvailable
-            if (charactersThatFit == nextLineAttempt.length) { //we're done
-                linesSoFar.add(nextLineAttempt)
-                wordsStillToWrap.clear()
-            } else { //just get the next line, then pass the remaining words to the method again recursively
-                val wordsForNextLine: MutableList<String> = ArrayList()
-                var charactersUsed =
-                    -1 //to take into account that there is no space before the first word in a line
-                while (wordsStillToWrap.size > 0 && charactersUsed + 1 + wordsStillToWrap[0].length <= charactersThatFit) {
-                    wordsForNextLine.add(wordsStillToWrap[0])
-                    charactersUsed += 1 + wordsStillToWrap[0].length
-                    wordsStillToWrap.removeAt(0)
-                }
-                if (charactersUsed < 1) { //the next word must be very large so we need to take what we can off the front of it
-                    val massiveWord = wordsStillToWrap[0]
-                    if (charactersThatFit == 0) { //just in case
-                        charactersThatFit = 1
-                    }
-                    wordsForNextLine.add(massiveWord.substring(0, charactersThatFit))
-                    wordsStillToWrap.removeAt(0)
-                    if (massiveWord.length > charactersThatFit) {
-                        wordsStillToWrap.add(
-                            0,
-                            massiveWord.substring(charactersThatFit, massiveWord.length)
-                        )
-                    }
-                }
-                linesSoFar.add(flattenWordsAddingSpaces(wordsForNextLine))
-                extractWrappedLines(linesSoFar, wordsStillToWrap, charactersAvailable)
-            }
-        }
-    }
-
-    private fun flattenWordsAddingSpaces(words: List<String>): String {
-        val stringBuilder = StringBuilder()
-        for (word in words) {
-            stringBuilder.append(word)
-            stringBuilder.append(" ")
-        }
-        if (words.size > 0) {
-            stringBuilder.deleteCharAt(stringBuilder.length - 1)
-        }
-        return stringBuilder.toString()
-    }
-
-    private fun <T> notNull(param: T?): T {
-        if (param == null) {
-            throw NullPointerException("Parameter must not be null")
-        }
-        return param
-    }
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/utils/text/TextPadder.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/utils/text/TextPadder.kt
deleted file mode 100644
index c831fed9..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/utils/text/TextPadder.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package co.early.fore.core.utils.text
-
-import java.lang.NullPointerException
-import java.lang.StringBuilder
-
-object TextPadder {
-    fun padText(
-        textOriginal: String,
-        desiredLength: Int,
-        pad: Pad,
-        paddingCharacter: Char
-    ): String {
-        notNull(textOriginal)
-        notNull(pad)
-        val paddingCharactersRequired = desiredLength - textOriginal.length
-        require(paddingCharactersRequired >= 0) { "textOriginal is already longer than the desiredLength, textOriginal.length():" + textOriginal.length + " desiredLength:" + desiredLength }
-        val sb = StringBuilder()
-        for (ii in 0 until paddingCharactersRequired) {
-            sb.append(paddingCharacter)
-        }
-        if (pad == Pad.LEFT) {
-            sb.append(textOriginal)
-        } else {
-            sb.insert(0, textOriginal)
-        }
-        return sb.toString()
-    }
-
-    private fun <T> notNull(param: T?): T {
-        if (param == null) {
-            throw NullPointerException("Parameter must not be null")
-        }
-        return param
-    }
-
-    enum class Pad {
-        LEFT, RIGHT
-    }
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/Either.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/Either.kt
deleted file mode 100644
index 5a1cb139..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/Either.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package co.early.fore.kt.core
-
-@Deprecated(message = "use Either.Fail instead from the co.early.fore.kt.core.type package", replaceWith = ReplaceWith(expression = "co.early.fore.kt.core.type.Either.Fail", "co.early.fore.kt.core.type.Either.Fail"))
-typealias Error<E> = Either.Left<E>
-@Deprecated(message = "use Either.Success instead from the co.early.fore.kt.core.type package", replaceWith = ReplaceWith(expression = "co.early.fore.kt.core.type.Either.Success", "co.early.fore.kt.core.type.Either.Success"))
-typealias Success<R> = Either.Right<R>
-
-@Deprecated(message = "old Eithers will be removed in a futureversion of fore, use success() instead", replaceWith = ReplaceWith(expression = "success(value)", "co.early.fore.kt.core.type.Either.Companion.success"))
-fun <R> eitherSuccess(value: R): Either<Nothing, R> = Either.right(value)
-@Deprecated(message = "old Eithers will be removed in a future version of fore, use fail() instead", replaceWith = ReplaceWith(expression = "fail(value)", "co.early.fore.kt.core.type.Either.Companion.fail"))
-fun <L> eitherError(value: L): Either<L, Nothing> = Either.left(value)
-
-@Deprecated(message = "this Either will be removed and replaced with co.early.fore.kt.core.type.Either", replaceWith = ReplaceWith(expression = "Either<F, S>", "co.early.fore.kt.core.type.Either"))
-sealed class Either<out L, out R> {
-    data class Left<out L> internal constructor(val a: L) : Either<L, Nothing>() {
-        companion object {
-            operator fun <L> invoke(l: L): Either<L, Nothing> = Left(l)
-        }
-    }
-
-    data class Right<out R> internal constructor(val b: R) : Either<Nothing, R>() {
-        companion object {
-            operator fun <R> invoke(r: R): Either<Nothing, R> = Right(r)
-        }
-    }
-
-    companion object {
-        @Deprecated(message = "old Eithers will be removed in a futureversion of fore, use success() instead", replaceWith = ReplaceWith(expression = "success(value)", "co.early.fore.kt.core.type.Either.Companion.success"))
-        fun <R> right(value: R): Either<Nothing, R> = Right(value)
-        @Deprecated(message = "old Eithers will be removed in a futureversion of fore, use fail() instead", replaceWith = ReplaceWith(expression = "fail(value)", "co.early.fore.kt.core.type.Either.Companion.fail"))
-        fun <L> left(value: L): Either<L, Nothing> = Left(value)
-    }
-}
-
-/**
- * If this is a successful Either (Right), the extension function calls next() with the success
- *
- * If this is a failed Either (Left), it returns the either
- *
- * Copyright © 2020 early.co. All rights reserved.
- */
-@Deprecated(message = "this Either will be removed in a future version of fore, please use co.early.fore.kt.core.type.Either", replaceWith = ReplaceWith(expression = "carryOn(nextBlock)", "co.early.fore.kt.core.type.carryOn"))
-suspend fun <E, R, R2> Either<E, R>.carryOn(
-        nextBlock: suspend (R) -> Either<E, R2>
-): Either<E, R2> {
-    return when (this) {
-        is Either.Left -> Either.left(this.a)
-        is Either.Right -> nextBlock(this.b)
-    }
-}
-
-@Deprecated(message = "legacy Either will be removed in a future version of fore")
-fun <F, S> co.early.fore.kt.core.type.Either<F,S>.toLegacyEither(): Either<F,S> {
-    return when (this){
-        is co.early.fore.kt.core.type.Either.Fail -> Either.left(value)
-        is co.early.fore.kt.core.type.Either.Success -> Either.right(value)
-    }
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/Ext.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/Ext.kt
deleted file mode 100644
index 4d11828c..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/Ext.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package co.early.fore.kt.core
-
-@Deprecated("this isn't really related to a core fore feature, so will be removed in the next major release - you can always add it directly to your project")
-fun String.nullIfBlank(): String? = if (this.isBlank()) null else this
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/callbacks/TypeAlias.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/callbacks/TypeAlias.kt
deleted file mode 100644
index 14526de7..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/callbacks/TypeAlias.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package co.early.fore.kt.core.callbacks
-
-@Deprecated("this isn't generic enough to be widely useful, so will be removed - you can always add these type aliases directly to your project")
-typealias Success = () -> Unit
-@Deprecated("this isn't generic enough to be widely useful, so will be removed - you can always add these type aliases directly to your project")
-typealias SuccessWithPayload<T> = (T) -> Unit
-@Deprecated("this isn't generic enough to be widely useful, so will be removed - you can always add these type aliases directly to your project")
-typealias Failure = () -> Unit
-@Deprecated("this isn't generic enough to be widely useful, so will be removed - you can always add these type aliases directly to your project")
-typealias FailureWithPayload<T> = (T) -> Unit
-@Deprecated("this isn't generic enough to be widely useful, so will be removed - you can always add these type aliases directly to your project")
-typealias Continue = () -> Unit
-@Deprecated("this isn't generic enough to be widely useful, so will be removed - you can always add these type aliases directly to your project")
-typealias ContinueWithPayload<T> = (T) -> Unit
-@Deprecated("this isn't generic enough to be widely useful, so will be removed - you can always add these type aliases directly to your project")
-typealias DoThis = () -> Unit
-@Deprecated("this isn't generic enough to be widely useful, so will be removed - you can always add these type aliases directly to your project")
-typealias DoThisWithPayload<T> = (T) -> Unit
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/TagInferer.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/TagInferer.kt
deleted file mode 100644
index 0246caed..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/TagInferer.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package co.early.fore.kt.core.logging
-
-import java.util.regex.Pattern
-
-interface TagInferer {
-    fun inferTag(): String
-}
-
-class TagInfererImpl : TagInferer {
-
-    override fun inferTag(): String {
-        val trace = Throwable().stackTrace
-        return if (trace.size > 3) {
-            extractClassName(trace[3]).let {
-                if ((it == "ObservableImp" || it == "Fore\$Companion") && trace.size > 4){
-                    extractClassName(trace[4])
-                } else {
-                    it
-                }
-            }
-        } else "missing"
-    }
-
-    /**
-     * inspired by Timber (also Apache 2) -->
-     */
-    private fun extractClassName(element: StackTraceElement): String {
-        var tag = element.className.substringAfterLast('.')
-        val m = ANONYMOUS_CLASS.matcher(tag)
-        if (m.find()) {
-            tag = m.replaceAll("")
-        }
-        return tag
-    }
-
-    companion object {
-        private val ANONYMOUS_CLASS = Pattern.compile("(\\$\\d+)+$")
-    }
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/observer/ObservableImp.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/observer/ObservableImp.kt
deleted file mode 100644
index 8babc0ac..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/observer/ObservableImp.kt
+++ /dev/null
@@ -1,172 +0,0 @@
-package co.early.fore.kt.core.observer
-
-import co.early.fore.core.WorkMode
-import co.early.fore.core.observer.Observable
-import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.coroutine.launchCustom
-import co.early.fore.kt.core.delegate.Fore
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-import java.lang.IllegalArgumentException
-import java.util.concurrent.locks.ReentrantLock
-import kotlin.concurrent.withLock
-
-
-/**
- * @param notificationMode If notifications should be run on the UI thread (appropriate for most
- * app code) then use ASYNCHRONOUS. For tests, you will want to inject SYNCHRONOUS here which will
- * force all the notifications to come through on the same thread that notifyObservers()
- * is called on.
- *
- * @param logger If you want to be told about warnings, pass an implementation of Logger
- * here (recommended)
- *
- * @param dispatcher You will only need to specify this if you are running in a non-android module,
- * we'd recommend passing in Dispatchers.Main.immediate here in that case, otherwise leave this as
- * null
- *
- * If you don't specify any construction parameters, they will be taken from ForeDelegateHolder
- *
- * NB: If there are any Android Adapters depending on your model for their list data, you will
- * want to make sure that you only update this list based data on the UI thread (i.e. for use
- * with adapters, you should only call notifyObservers() on the UI thread). This remains true
- * regardless of whether this Observable has been created with ASYNCHRONOUS or SYNCHRONOUS
- * WorkMode.
- * Synchronizing any list updates is not enough, Android will call Adapter.count() and
- * Adapter.get() on the UI thread and you cannot change the adapter's size between these calls.
- *
- */
-class ObservableImp(
-    private val notificationMode: WorkMode? = null,
-    private val logger: Logger? = null,
-    private val dispatcher: CoroutineDispatcher? = null
-) : Observable {
-
-    private val observerList = mutableListOf<Observer>()
-    private val addRemoveLock = ReentrantLock(true)
-
-    /**
-     * Take the observer and add it to the list of registered observers that
-     * want to be notified when the model data changes. Usually you will do this
-     * from android lifecycle methods like onStart() (and remove the observer in onStop())
-     */
-    override fun addObserver(observer: Observer) {
-
-        addRemoveLock.withLock {
-
-            observerList.add(observer)
-
-            if (observerList.size > 4) {
-                Fore.getLogger(logger).w(
-                        "There are now:" + observerList.size + " Observers added to this Observable, that's quite a lot.\n" +
-                        "It's sometimes indicative of code which is not removing observers when it should\n" +
-                        "(forgetting to remove observers in an onStop(), onClear() or onDetachedFromWindow() method for example)\n" +
-                        "Failing to remove observers when you no longer need them will cause memory leaks,\n" +
-                        "you might want to look in to the ForeLifecycleObserver which handles this for you.\n" +
-                        "[If the number of observers steadily increases as you use the app, that's probably what you have,\n" +
-                        "if the number remains constant or goes down, then you're probably ok :) ]"
-                )
-            }
-        }
-    }
-
-    /**
-     * Remove the observer from the list of registered observers, you should do this
-     * from android lifecycle methods like onStop() to prevent memory leaks.
-     *
-     * @param observer the observer that is no longer interested in receiving updates
-     * from the model when its data changes
-     */
-    override fun removeObserver(observer: Observer) {
-
-        addRemoveLock.withLock {
-
-            val beforeSize = observerList.size
-            observerList.remove(observer)
-
-            if (observerList.size == beforeSize) {
-                Fore.getLogger(logger).w(
-                    "You have tried to remove an observer that wasn't added in the first place. This is almost certainly an error and " +
-                            "will cause a memory leak. Usually an observer is added and removed in line with _mirrored_ lifecycle methods " +
-                            "(for example onStart()/onStop() or onAttachedToWindow()/onDetachedFromWindow())"
-                )
-            }
-        }
-    }
-
-
-    /**
-     * Extending classes should call this method, whenever the model data is
-     * updated. somethingChanged() will be called on each registered observer.
-     *
-     * If the Observable has been constructed with the SYNCHRONOUS method parameter
-     * then the notifications will be called on the same thread that this method is
-     * called on.
-     *
-     * If the Observable has been constructed with the ASYNCHRONOUS method parameter
-     * then the notifications will be posted to the UI thread if necessary (if notifyObservers
-     * is already on the UI thread then the observers will be called immediately with no posting done)
-     *
-     * NB: If there are any Android Adapters depending on your model for their list data, you will
-     * want to make sure that you only update this list based data on the UI thread (i.e. for use
-     * with adapters, you should only call notifyObservers() on the UI thread). This remains true
-     * regardless of whether this Observable has been created with ASYNCHRONOUS or SYNCHRONOUS
-     * WorkMode.
-     * Synchronizing any list updates is not enough, Android will call Adapter.count() and
-     * Adapter.get() on the UI thread and you cannot change the adapter's size between these calls.
-     */
-    override fun notifyObservers() {
-
-        var dispatch = dispatcher
-
-        if (dispatch == null) {
-            try {
-                dispatch = Dispatchers.Main.immediate
-            } catch (uoe: UnsupportedOperationException){
-                val errorMessage = "\nIt looks like you are running in a non-android module\n" +
-                        "If this is intentional, you will need to specify a dispatcher in the\n" +
-                        "constructor, we'd recommend Dispatchers.Main.immediate\n" +
-                        "If this is NOT intentional, move your code to a module that supports\n" +
-                        "Dispatchers.Main.immediate"
-                Fore.getLogger(logger).e(errorMessage)
-                throw IllegalArgumentException(errorMessage)
-            }
-        }
-
-        launchCustom(dispatch, Fore.getWorkMode(notificationMode)) {
-            addRemoveLock.withLock {
-                for (observer in observerList) {
-                    doNotification(observer)
-                }
-            }
-        }
-    }
-
-    override fun hasObservers(): Boolean {
-        return addRemoveLock.withLock {
-            observerList.size > 0
-        }
-    }
-
-    private fun doNotification(observer: Observer) {
-        try {
-            observer.somethingChanged()
-        } catch (e: Exception) {
-
-            val dispatcherMsg = if (dispatcher!=null) {
-                        " and the dispatcher used was: $dispatcher \n" +
-                        "If you are trying to update any part of the android UI directly from the somethingChanged() callback,\n" +
-                        "then ObservableImp needs to be constructed with Dispatchers.Main.immediate" } else ""
-
-            val errorMessage = "\nOne of the observers has thrown an exception during it's somethingChanged() callback\n" +
-                    "The currentThread id is: ${Thread.currentThread().id} $dispatcherMsg\n" +
-                    "If you are updating an android adapter directly, you will want to make sure that notifyObservers()\n" +
-                    "is being called from the UI thread. Having said that, it's quite possible you just have a crash somewhere\n" +
-                    "in your UI code which has bubbled its way up to here. See stack trace for further info, Error Message: "
-
-            Fore.getLogger(logger).e(errorMessage + e.message)
-            throw e
-        }
-    }
-}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/time/Time.kt b/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/time/Time.kt
deleted file mode 100644
index beb9401c..00000000
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/time/Time.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package co.early.fore.kt.core.time
-
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.logging.Logger
-import java.text.DecimalFormat
-
-@Deprecated("this isn't generic enough to be widely useful, so will be removed in a future version of fore")
-val nanosFormat = DecimalFormat("#,###")
-
-/**
- * invokes the function,
- * returns the result,
- * then logs the time taken in a standard format
- */
-@Deprecated("this isn't generic enough to be widely useful, so will be removed in a future version of fore")
-inline fun <T> measureNanos(logger: Logger? = null, function: () -> T): T {
-    return measureNanos({ nanos ->
-        Fore.getLogger(logger).i("operation took: ${nanosFormat.format(nanos)} ns " +
-                "thread:${Thread.currentThread().id}")
-    }) { function.invoke() }
-}
-
-/**
- * invokes the function,
- * invokes timeTaken with the time taken in ns to run the function,
- * returns the result or the function
- */
-@Deprecated("this isn't generic enough to be widely useful, so will be removed in a future version of fore")
-inline fun <T> measureNanos(timeTaken: (Long) -> Unit, function: () -> T): T {
-    val decoratedResult = measureNanos(function)
-    timeTaken(decoratedResult.second)
-    return decoratedResult.first
-}
-
-/**
- * invokes the function,
- * returns a Pair(first = result of the function, second = time taken in ns)
- */
-@Deprecated("this isn't generic enough to be widely useful, so will be removed in a future version of fore")
-inline fun <T> measureNanos(function: () -> T): Pair<T, Long> {
-    val startTime = System.nanoTime()
-    val result: T = function.invoke()
-    return result to (System.nanoTime() - startTime)
-}
diff --git a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/observer/ObservableGroupImpTest.kt b/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/observer/ObservableGroupImpTest.kt
deleted file mode 100644
index bd75e42c..00000000
--- a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/observer/ObservableGroupImpTest.kt
+++ /dev/null
@@ -1,286 +0,0 @@
-package co.early.fore.kt.core.observer
-
-import co.early.fore.core.observer.Observable
-import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.junit.Before
-import org.junit.Test
-
-
-class ObservableGroupImpTest {
-
-    @MockK
-    private lateinit var mockObservable1: Observable
-
-    @MockK
-    private lateinit var mockObservable2: Observable
-
-    @MockK
-    private lateinit var mockObservable3: Observable
-
-    @MockK
-    private lateinit var mockObserver1: Observer
-
-    @MockK
-    private lateinit var mockObserver2: Observer
-
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-        Fore.setDelegate(TestDelegateDefault())
-    }
-
-
-    @Test
-    fun `when created with no observables, throws error`() {
-
-        // arrange, act, assert
-        try {
-            ObservableGroupImp()
-        } catch (iae: IllegalArgumentException){
-            assert(true)
-            return
-        }
-
-        assert(false) {"trying to create an observable" +
-                "group with no observables, should have thrown an exception"}
-    }
-
-    @Test
-    fun `when created with 1 observable, add calls that observable`() {
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            mockObservable1
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-
-        //assert
-        verify(exactly = 1){
-            mockObservable1.addObserver(eq(mockObserver1))
-        }
-        verify(exactly = 0){
-            mockObservable1.removeObserver(eq(mockObserver1))
-        }
-    }
-
-    @Test
-    fun `when created with 1 observable, remove calls that observable`() {
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            mockObservable1
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-        observableGroupImp.removeObserver(mockObserver1)
-
-        //assert
-        verify(exactly = 1){
-            mockObservable1.removeObserver(eq(mockObserver1))
-        }
-    }
-
-    @Test
-    fun `when created with multiple observables, add calls those observables`() {
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            mockObservable1,
-            mockObservable2,
-            mockObservable3
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-
-        //assert
-        verify(exactly = 1){
-            mockObservable1.addObserver(eq(mockObserver1))
-            mockObservable2.addObserver(eq(mockObserver1))
-            mockObservable3.addObserver(eq(mockObserver1))
-        }
-        verify(exactly = 0){
-            mockObservable1.removeObserver(any())
-            mockObservable2.removeObserver(any())
-            mockObservable3.removeObserver(any())
-        }
-    }
-
-    @Test
-    fun `when created with multiple observables, remove calls those observables`() {
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            mockObservable1,
-            mockObservable2,
-            mockObservable3
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-        observableGroupImp.removeObserver(mockObserver1)
-
-        //assert
-        verify(exactly = 1){
-            mockObservable1.removeObserver(eq(mockObserver1))
-            mockObservable2.removeObserver(eq(mockObserver1))
-            mockObservable3.removeObserver(eq(mockObserver1))
-        }
-    }
-
-    @Test
-    fun `when created with multiple observables, adding two observers calls those observables twice`() {
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            mockObservable1,
-            mockObservable2,
-            mockObservable3
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-        observableGroupImp.addObserver(mockObserver2)
-
-        //assert
-        verify(exactly = 1){
-            mockObservable1.addObserver(eq(mockObserver1))
-            mockObservable2.addObserver(eq(mockObserver1))
-            mockObservable3.addObserver(eq(mockObserver1))
-        }
-        verify(exactly = 1){
-            mockObservable1.addObserver(eq(mockObserver2))
-            mockObservable2.addObserver(eq(mockObserver2))
-            mockObservable3.addObserver(eq(mockObserver2))
-        }
-        verify(exactly = 0){
-            mockObservable1.removeObserver(any())
-            mockObservable2.removeObserver(any())
-            mockObservable3.removeObserver(any())
-        }
-    }
-
-    @Test
-    fun `when created with multiple observables, notifying first observable, calls groups somethingchanged`() {
-
-        val realObservable = ObservableImp()
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            realObservable,
-            ObservableImp(),
-            ObservableImp()
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-        realObservable.notifyObservers()
-
-        //assert
-        verify(exactly = 1){
-            mockObserver1.somethingChanged()
-        }
-    }
-
-    @Test
-    fun `when created with multiple observables, notifying second observable, calls groups somethingchanged`() {
-
-        val realObservable = ObservableImp()
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            ObservableImp(),
-            realObservable,
-            ObservableImp()
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-        realObservable.notifyObservers()
-
-        //assert
-        verify(exactly = 1){
-            mockObserver1.somethingChanged()
-        }
-    }
-
-    @Test
-    fun `when created with multiple observables, notifying third observable, calls groups somethingchanged`() {
-
-        val realObservable = ObservableImp()
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            ObservableImp(),
-            ObservableImp(),
-            realObservable
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-        realObservable.notifyObservers()
-
-        //assert
-        verify(exactly = 1){
-            mockObserver1.somethingChanged()
-        }
-    }
-
-    @Test
-    fun `when adding two observers, both somethingchanged methods are called`() {
-
-        val realObservable = ObservableImp()
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            realObservable,
-            ObservableImp(),
-            ObservableImp()
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-        observableGroupImp.addObserver(mockObserver2)
-        realObservable.notifyObservers()
-
-        //assert
-        verify(exactly = 1){
-            mockObserver1.somethingChanged()
-        }
-        verify(exactly = 1){
-            mockObserver2.somethingChanged()
-        }
-    }
-
-    @Test
-    fun `when observers are removed, somethingchanged is no longer called`() {
-
-        val realObservable = ObservableImp()
-
-        // arrange
-        val observableGroupImp = ObservableGroupImp(
-            realObservable,
-            ObservableImp(),
-            ObservableImp()
-        )
-
-        // act
-        observableGroupImp.addObserver(mockObserver1)
-        observableGroupImp.removeObserver(mockObserver1)
-        realObservable.notifyObservers()
-
-        //assert
-        verify(exactly = 0){
-            mockObserver1.somethingChanged()
-        }
-    }
-}
diff --git a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/observer/ObservableImpTest.kt b/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/observer/ObservableImpTest.kt
deleted file mode 100644
index 79cdb598..00000000
--- a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/observer/ObservableImpTest.kt
+++ /dev/null
@@ -1,212 +0,0 @@
-package co.early.fore.kt.core.observer
-
-import co.early.fore.core.WorkMode
-import co.early.fore.core.observer.Observer
-import co.early.fore.core.testhelpers.CountDownLatchWrapper.runInBatch
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.delegate.TestDelegateDefault
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.logging.SilentLogger
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.launch
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-class ObservableImpTest {
-
-    @MockK
-    private lateinit var mockObserver1: Observer
-
-    @MockK
-    private lateinit var mockObserver2: Observer
-
-    @MockK
-    private lateinit var mockObserver3: Observer
-
-    @MockK
-    private lateinit var mockObserver4: Observer
-
-    @MockK
-    private lateinit var mockObserver5: Observer
-
-    @MockK
-    private lateinit var mockLogger: Logger
-
-    private lateinit var observableImp: ObservableImp
-
-
-    @Before
-    fun setup() {
-        MockKAnnotations.init(this, relaxed = true)
-        Fore.setDelegate(TestDelegateDefault())
-    }
-
-
-    @Test
-    fun `when created, has no observers`() {
-
-        // arrange, act
-        observableImp = ObservableImp()
-
-        // assert
-        assertEquals(false, observableImp.hasObservers())
-    }
-
-    @Test
-    fun `when observers added, has observers`() {
-
-        // arrange
-        observableImp = ObservableImp()
-
-        // act
-        observableImp.addObserver(mockObserver1)
-
-        // assert
-        assertEquals(true, observableImp.hasObservers())
-    }
-
-    @Test
-    fun `when observers added, then removed, has no observers`() {
-
-        // arrange
-        observableImp = ObservableImp()
-
-        // act
-        observableImp.addObserver(mockObserver1)
-        observableImp.removeObserver(mockObserver1)
-
-        // assert
-        assertEquals(false, observableImp.hasObservers())
-    }
-
-    @Test
-    fun `when removing an observer that wasn't added, warning is logged`() {
-
-        // arrange
-        observableImp = ObservableImp(logger = mockLogger)
-
-        // act
-        observableImp.addObserver(mockObserver1)
-        observableImp.removeObserver(mockObserver2)
-
-        // assert
-        verify(exactly = 1) { mockLogger.w(any()) }
-    }
-
-    @Test
-    fun `when adding more than 4 observers, warning is logged`() {
-
-        // arrange
-        observableImp = ObservableImp(logger = mockLogger)
-
-        // act
-        observableImp.addObserver(mockObserver1)
-        observableImp.addObserver(mockObserver2)
-        observableImp.addObserver(mockObserver3)
-        observableImp.addObserver(mockObserver4)
-        verify(exactly = 0) { mockLogger.w(any()) }
-        observableImp.addObserver(mockObserver5)
-
-        // assert
-        verify(exactly = 1) { mockLogger.w(any()) }
-    }
-
-    @Test
-    fun `when notifying, all added observers are called`() {
-
-        // arrange
-        observableImp = ObservableImp()
-        observableImp.addObserver(mockObserver1)
-        observableImp.addObserver(mockObserver2)
-        observableImp.addObserver(mockObserver3)
-        observableImp.removeObserver(mockObserver2)
-
-        // act
-        observableImp.notifyObservers()
-
-        // assert
-        verify(exactly = 1) { mockObserver1.somethingChanged() }
-        verify(exactly = 0) { mockObserver2.somethingChanged() }
-        verify(exactly = 1) { mockObserver3.somethingChanged() }
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun `when notifying asynchronously, all added observers are called`() {
-
-        //arrange
-        observableImp = ObservableImp(
-            notificationMode = WorkMode.ASYNCHRONOUS,
-            dispatcher = Dispatchers.IO
-        )
-        observableImp.addObserver(mockObserver1)
-        observableImp.addObserver(mockObserver2)
-        observableImp.addObserver(mockObserver3)
-        observableImp.removeObserver(mockObserver2)
-
-        //act
-        runInBatch(1, observableImp) {
-            observableImp.notifyObservers()
-        }
-
-        // assert
-        verify(exactly = 1) { mockObserver1.somethingChanged() }
-        verify(exactly = 0) { mockObserver2.somethingChanged() }
-        verify(exactly = 1) { mockObserver3.somethingChanged() }
-    }
-
-    @Test
-    fun `when adding and removing observers on different threads, observer list is protected from concurrent changes`() {
-
-        // arrange
-        observableImp = ObservableImp(
-            notificationMode = WorkMode.ASYNCHRONOUS,
-            logger = SilentLogger(),
-            dispatcher = Dispatchers.Unconfined
-        )
-        val loop = 10000
-        val latch = CountDownLatch(loop + 1)
-        var counter = 0
-
-        // act
-        CoroutineScope(
-            Executors.newFixedThreadPool(10).asCoroutineDispatcher()
-        ).launch {
-            repeat(loop) {
-                launch {
-                    val observer = object : Observer {
-                        override fun somethingChanged() {
-                            counter++
-                        }
-                    }
-                    observableImp.addObserver(observer)
-                    if (it % 2 == 0) {
-                        observableImp.removeObserver(observer)
-                    }
-                    latch.countDown()
-                }
-            }
-            launch {
-                observableImp.notifyObservers()
-                latch.countDown()
-            }
-        }
-        try {
-            latch.await(100, TimeUnit.SECONDS)
-        } catch (e: InterruptedException) {
-            e.printStackTrace()
-        }
-
-        // assert
-        assertEquals(loop / 2, counter)
-    }
-}
diff --git a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/ui/trigger/TriggerOnChangeTest.kt b/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/ui/trigger/TriggerOnChangeTest.kt
deleted file mode 100644
index bbb54608..00000000
--- a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/ui/trigger/TriggerOnChangeTest.kt
+++ /dev/null
@@ -1,255 +0,0 @@
-package co.early.fore.kt.core.ui.trigger
-
-import io.mockk.MockKAnnotations
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.junit.Before
-import org.junit.Test
-
-
-class TriggerOnChangeTest {
-
-    private data class TestData(
-        val message: String,
-        val count: Int,
-    )
-
-    @MockK
-    private lateinit var mockCurrentState: () -> Int
-
-    @MockK
-    private lateinit var mockDoThisWhenTriggered: (StateChange<Int>) -> Unit
-
-    @MockK
-    private lateinit var mockNullDoThisWhenTriggered: (StateChange<String?>) -> Unit
-
-    @MockK
-    private lateinit var mockDataClassCurrentState: () -> TestData
-
-    @MockK
-    private lateinit var mockDataClassDoThisWhenTriggered: (StateChange<TestData>) -> Unit
-
-    private val TEST_1 = TestData("yes", 1)
-    private val TEST_2 = TestData("no", 0)
-
-    @Before
-    fun setup() = MockKAnnotations.init(this, relaxed = true)
-
-    @Test
-    fun `when initial state changes, check() triggers`() {
-
-        // arrange
-        every { mockCurrentState.invoke() } returns 1
-        val trigger = TriggerOnChange(mockCurrentState, mockDoThisWhenTriggered)
-
-        // act
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(any())
-        }
-    }
-
-    @Test
-    fun `when initial state stays null, check() does not trigger`() {
-
-        // arrange
-        val trigger = TriggerOnChange({ null }, mockNullDoThisWhenTriggered)
-
-        // act
-        trigger.check()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThisWhenTriggered(any())
-        }
-    }
-
-    @Test
-    fun `when initial state changes, check() triggers with new state value`() {
-
-        // arrange
-        every { mockCurrentState.invoke() } returns 3
-        val trigger = TriggerOnChange(mockCurrentState, mockDoThisWhenTriggered)
-
-        // act
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(eq(StateChange(null, 3)))
-        }
-    }
-
-    @Test
-    fun `when state changes multiple times, check() triggers only on change`() {
-
-        // arrange
-        every { mockCurrentState.invoke() } returns 3 andThen 5 andThen 6 andThen 6 andThen 3
-
-        val trigger = TriggerOnChange(mockCurrentState, mockDoThisWhenTriggered)
-
-        // act
-        trigger.check()
-        trigger.check()
-        trigger.check()
-        trigger.check()
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(eq(StateChange(null,3)))
-        }
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(eq(StateChange(3, 5)))
-        }
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(eq(StateChange(5, 6)))
-        }
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(eq(StateChange(6,3)))
-        }
-    }
-
-    @Test
-    fun `when initial state changes, first checkLazy() does not trigger`() {
-
-        // arrange
-        every { mockCurrentState.invoke() } returns 1
-        val trigger = TriggerOnChange(mockCurrentState, mockDoThisWhenTriggered)
-
-        // act
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThisWhenTriggered(any())
-        }
-    }
-
-    @Test
-    fun `when initial state stays null, checkLazy() does not trigger`() {
-
-        // arrange
-        val trigger = TriggerOnChange<String?>({ null }, mockNullDoThisWhenTriggered)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThisWhenTriggered(any())
-        }
-    }
-
-    @Test
-    fun `when initial state changes, second checkLazy() does not trigger`() {
-
-        // arrange
-        every { mockCurrentState.invoke() } returns 3
-        val trigger = TriggerOnChange(mockCurrentState, mockDoThisWhenTriggered)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThisWhenTriggered(any())
-        }
-    }
-
-    @Test
-    fun `when state changes multiple times, checkLazy() triggers only on change`() {
-
-        // arrange
-        every { mockCurrentState.invoke() } returns 3 andThen 5 andThen 6 andThen 6 andThen 3
-
-        val trigger = TriggerOnChange(mockCurrentState, mockDoThisWhenTriggered)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(eq(StateChange(3, 5)))
-        }
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(eq(StateChange(5, 6)))
-        }
-        verify(exactly = 1) {
-            mockDoThisWhenTriggered(eq(StateChange(6, 3)))
-        }
-    }
-
-    @Test
-    fun `when first and second state changes are the same, second checkLazy() does not trigger`() {
-
-        // arrange
-        every { mockCurrentState.invoke() } returns 3 andThen 3
-
-        val trigger = TriggerOnChange(mockCurrentState, mockDoThisWhenTriggered)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThisWhenTriggered(any())
-        }
-    }
-
-
-    @Test
-    fun `when data class state changes, second check() does trigger`() {
-
-        // arrange
-        every { mockDataClassCurrentState.invoke() } returns TEST_1 andThen TEST_2
-
-        val trigger =
-            TriggerOnChange(mockDataClassCurrentState, mockDataClassDoThisWhenTriggered)
-
-        // act
-        trigger.check()
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDataClassDoThisWhenTriggered(eq(StateChange(null, TEST_1)))
-        }
-        verify(exactly = 1) {
-            mockDataClassDoThisWhenTriggered(eq(StateChange(TEST_1, TEST_2)))
-        }
-    }
-
-    @Test
-    fun `when data class state does not change, second check() does not trigger`() {
-
-        // arrange
-        every { mockDataClassCurrentState.invoke() } returns TEST_1 andThen TEST_1
-
-        val trigger =
-            TriggerOnChange(mockDataClassCurrentState, mockDataClassDoThisWhenTriggered)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDataClassDoThisWhenTriggered(any())
-        }
-    }
-}
-
-//fun MockKMatcherScope.eq(other: StateChange<Int>) = match<StateChange<Int>> {
-//    it.pre == other.pre && it.now == other.now
-//}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/ui/trigger/TriggerWhenTest.kt b/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/ui/trigger/TriggerWhenTest.kt
deleted file mode 100644
index 34bd01cc..00000000
--- a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/ui/trigger/TriggerWhenTest.kt
+++ /dev/null
@@ -1,405 +0,0 @@
-package co.early.fore.kt.core.ui.trigger
-
-import io.mockk.MockKAnnotations
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-
-class TriggerWhenTest {
-
-    @MockK
-    private lateinit var mockTriggeredWhen: () -> Boolean
-
-    @MockK
-    private lateinit var mockDoThis: () -> Unit
-
-    @Before
-    fun setup() = MockKAnnotations.init(this, relaxed = true)
-
-    @Test
-    fun `default Trigger uses resetRule ONLY_AFTER_REVERSION`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }
-
-        // act
-
-        // assert
-        assertEquals(ResetRule.ONLY_AFTER_REVERSION, trigger.getResetRule())
-    }
-
-    @Test
-    fun `on first successful trigger, check DOES fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }
-
-        // act
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on first failed trigger, check DOES NOT fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns false
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }
-
-        // act
-        trigger.check()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on first successful trigger, check lazy DOES NOT fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }
-
-        // act
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on second successful trigger, check lazy DOES NOT fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE then FALSE trigger, check lazy DOES NOT fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true andThen false
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on FALSE then TRUE trigger, check lazy DOES fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns false andThen true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, TRUE, TRUE triggers, check and reset ONLY_AFTER_REVERSION fires only once`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.ONLY_AFTER_REVERSION)
-
-        // act
-        trigger.check()
-        trigger.check()
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, TRUE, TRUE triggers, check lazy and reset ONLY_AFTER_REVERSION does NOT fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.ONLY_AFTER_REVERSION)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, FALSE, TRUE triggers, check and reset ONLY_AFTER_REVERSION fires twice`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true andThen false andThen true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.ONLY_AFTER_REVERSION)
-
-        // act
-        trigger.check()
-        trigger.check()
-        trigger.check()
-
-        // assert
-        verify(exactly = 2) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, FALSE, TRUE triggers, check lazy and reset ONLY_AFTER_REVERSION fires once`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true andThen false andThen true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.ONLY_AFTER_REVERSION)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, TRUE, TRUE triggers, check and reset IMMEDIATELY fires each time`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.IMMEDIATELY)
-
-        // act
-        trigger.check()
-        trigger.check()
-        trigger.check()
-
-        // assert
-        verify(exactly = 3) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, TRUE, TRUE triggers, check lazy and reset IMMEDIATELY fires each time except first`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.IMMEDIATELY)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 2) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, FALSE, TRUE triggers, check and reset IMMEDIATELY fires twice`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true andThen false andThen true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.IMMEDIATELY)
-
-        // act
-        trigger.check()
-        trigger.check()
-        trigger.check()
-
-        // assert
-        verify(exactly = 2) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, FALSE, TRUE triggers, check lazy and reset IMMEDIATELY fires once`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true andThen false andThen true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.IMMEDIATELY)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, TRUE, TRUE triggers, check and reset NEVER, fires one time only`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.NEVER)
-
-        // act
-        trigger.check()
-        trigger.check()
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, TRUE, TRUE triggers, check lazy and reset NEVER, does NOT fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.NEVER)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, FALSE, TRUE triggers, check and reset NEVER, fires one time only`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true andThen false andThen true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.NEVER)
-
-        // act
-        trigger.check()
-        trigger.check()
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `on TRUE, FALSE, TRUE triggers, check lazy and reset NEVER, does NOT fire`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true andThen false andThen true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }.resetRule(ResetRule.NEVER)
-
-        // act
-        trigger.checkLazy()
-        trigger.checkLazy()
-        trigger.checkLazy()
-
-        // assert
-        verify(exactly = 0) {
-            mockDoThis()
-        }
-    }
-
-    @Test
-    fun `SyncTrigger typealias works as the same as TriggerWhen`() {
-
-        // arrange
-        every { mockTriggeredWhen.invoke() } returns true
-        val trigger = TriggerWhen({ mockTriggeredWhen() }) {
-            mockDoThis()
-        }
-
-        // act
-        trigger.check()
-
-        // assert
-        verify(exactly = 1) {
-            mockDoThis()
-        }
-    }
-}
diff --git a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/utils/text/BasicTextWrapperTest.kt b/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/utils/text/BasicTextWrapperTest.kt
deleted file mode 100644
index 5a7c3d2b..00000000
--- a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/utils/text/BasicTextWrapperTest.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package co.early.fore.kt.core.utils.text
-
-import co.early.fore.core.utils.text.BasicTextWrapper.wrapMonospaceText
-import org.junit.Assert
-import org.junit.Test
-import java.lang.IllegalArgumentException
-
-class BasicTextWrapperTest {
-    @Test
-    fun testMediumText_mediumWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(LONG_TEXT, MEDIUM_CHARACTERS_AVAILABLE)
-        Assert.assertEquals(FIRST_LINE, wrappedLines[0])
-        Assert.assertEquals(SECOND_LINE, wrappedLines[1])
-        Assert.assertEquals(THIRD_LINE, wrappedLines[2])
-        Assert.assertEquals(3, wrappedLines.size.toLong())
-    }
-
-    @Test
-    fun testSmallText_mediumWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(SHORT_TEXT, MEDIUM_CHARACTERS_AVAILABLE)
-        Assert.assertEquals(SHORT_TEXT, wrappedLines[0])
-        Assert.assertEquals(1, wrappedLines.size.toLong())
-    }
-
-    @Test
-    fun testEmptyText_mediumWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(EMPTY_TEXT, MEDIUM_CHARACTERS_AVAILABLE)
-        Assert.assertEquals("", wrappedLines[0])
-        Assert.assertEquals(1, wrappedLines.size.toLong())
-    }
-
-    @Test
-    fun testSpaceText_mediumWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(SPACE_TEXT, MEDIUM_CHARACTERS_AVAILABLE)
-        Assert.assertEquals(SPACE_TEXT, wrappedLines[0])
-        Assert.assertEquals(1, wrappedLines.size.toLong())
-    }
-
-    @Test
-    fun testLongSpaceText_mediumWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(LONG_SPACE_TEXT, MEDIUM_CHARACTERS_AVAILABLE)
-        Assert.assertEquals(SPACE_TEXT, wrappedLines[0]) //note we only expect one space back
-        Assert.assertEquals(1, wrappedLines.size.toLong())
-    }
-
-    @Test
-    fun testShortText_tinyWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(SHORT_TEXT, TINY_CHARACTERS_AVAILABLE)
-        Assert.assertEquals("h", wrappedLines[0])
-        Assert.assertEquals("e", wrappedLines[1])
-        Assert.assertEquals("l", wrappedLines[2])
-        Assert.assertEquals("l", wrappedLines[3])
-        Assert.assertEquals("o", wrappedLines[4])
-        Assert.assertEquals(5, wrappedLines.size.toLong())
-    }
-
-    @Test
-    fun testLongTextWithLongWord_mediumWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(LONG_TEXT_LONG_WORD, MEDIUM_CHARACTERS_AVAILABLE)
-        Assert.assertEquals(FIRST_LINE, wrappedLines[0])
-        Assert.assertEquals("1", wrappedLines[1])
-        Assert.assertEquals("abcdefghijklmnopqrstuvwxyz0123456789abcd", wrappedLines[2])
-        Assert.assertEquals("efghijklmnopqrstuvwxyz0123456789 the", wrappedLines[3])
-        Assert.assertEquals("quick brown fox", wrappedLines[4])
-        Assert.assertEquals(5, wrappedLines.size.toLong())
-    }
-
-    @Test
-    fun testMultipleSpaceText_mediumWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(DOUBLE_SPACE_TEXT, MEDIUM_CHARACTERS_AVAILABLE)
-        Assert.assertEquals(FIRST_LINE_DOUBLE_SPACE, wrappedLines[0])
-        Assert.assertEquals("-multi space text", wrappedLines[1])
-        Assert.assertEquals(2, wrappedLines.size.toLong())
-    }
-    
-    @Test
-    fun testLineBreakText_mediumWidthAvailable() {
-        val wrappedLines = wrapMonospaceText(LINE_BREAK_TEXT, MEDIUM_CHARACTERS_AVAILABLE)
-        Assert.assertEquals(FIRST_LINE_LINE_BREAK, wrappedLines[0])
-        Assert.assertEquals("fox jumped over the abc defghi", wrappedLines[1])
-        Assert.assertEquals("jklmnopqrstuvwxyz0123", wrappedLines[2])
-        Assert.assertEquals("", wrappedLines[3])
-        Assert.assertEquals("", wrappedLines[4])
-        Assert.assertEquals("45678 9abcde fghijklm nopqrs tuvwxyz0", wrappedLines[5])
-        Assert.assertEquals("123456", wrappedLines[6])
-        Assert.assertEquals(7, wrappedLines.size.toLong())
-    }
-
-    @Test
-    fun testLongText_zeroWidthAvailable() {
-        var exceptionThrown = false
-        try {
-            val wrappedLines = wrapMonospaceText(LONG_TEXT, ZERO_CHARACTERS_AVAILABLE)
-        } catch (e: IllegalArgumentException) {
-            exceptionThrown = true
-        }
-        Assert.assertTrue(exceptionThrown)
-    }
-
-    companion object {
-        private const val EMPTY_TEXT = ""
-        private const val SPACE_TEXT = " "
-        private const val LONG_SPACE_TEXT = "     "
-        private const val SHORT_TEXT = "hello"
-        private const val LONG_TEXT =
-            "The quick brown fox jumped over the lazy dogs, the quick brown fox jumped over the lazy dogs."
-        private const val LONG_TEXT_WITH_QUOTES =
-            "{\"value\":\"we don't want this very long json string value to be wrapped with a line break somewhere in the middle because when we copy paste it, we won't be able to reformat it to json properly if it includes the line break\"}"
-        private const val LONG_TEXT_LONG_WORD =
-            "The quick brown fox jumped over the lazy 1 abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789 the quick brown fox"
-        private const val ZERO_CHARACTERS_AVAILABLE = 0
-        private const val TINY_CHARACTERS_AVAILABLE = 1
-        private const val MEDIUM_CHARACTERS_AVAILABLE = 40
-        private const val FIRST_LINE = "The quick brown fox jumped over the lazy"
-        private const val SECOND_LINE = "dogs, the quick brown fox jumped over"
-        private const val THIRD_LINE = "the lazy dogs."
-        private const val DOUBLE_SPACE_TEXT =
-            "The quick brown fox jumped over the    -multi space text"
-        private const val LINE_BREAK_TEXT =
-            "The quick brown\nfox jumped over the abc defghi\njklmnopqrstuvwxyz0123\n\n\n45678 9abcde fghijklm nopqrs tuvwxyz0 123456"
-        private const val FIRST_LINE_DOUBLE_SPACE = "The quick brown fox jumped over the"
-        private const val FIRST_LINE_LINE_BREAK = "The quick brown"
-    }
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/utils/text/TextPadderTest.kt b/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/utils/text/TextPadderTest.kt
deleted file mode 100644
index ed9cfaea..00000000
--- a/fore-kt/fore-kt-core/src/test/java/co/early/fore/kt/core/utils/text/TextPadderTest.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package co.early.fore.kt.core.utils.text
-
-import co.early.fore.core.utils.text.TextPadder
-import co.early.fore.core.utils.text.TextPadder.padText
-import org.junit.Assert
-import org.junit.Test
-import java.lang.Exception
-
-class TextPadderTest {
-    @Test
-    fun testPaddingOnTheRight() {
-        val paddedText = padText(TEXT_ORIG, 10, TextPadder.Pad.RIGHT, '+')
-        Assert.assertEquals(TEXT_ORIG + "+++++++", paddedText)
-    }
-
-    @Test
-    fun testPaddingOnTheLeft() {
-        val paddedText = padText(TEXT_ORIG, 10, TextPadder.Pad.LEFT, '*')
-        Assert.assertEquals("*******" + TEXT_ORIG, paddedText)
-    }
-
-    @Test
-    fun testPaddingWhenAlreadyPadded() {
-        val paddedText = padText(TEXT_ORIG, 3, TextPadder.Pad.LEFT, PADDING_CHARACTER)
-        Assert.assertEquals(TEXT_ORIG, paddedText)
-    }
-
-    @Test
-    fun testPaddingIllegalValues() {
-        try {
-            padText(TEXT_ORIG, 2, TextPadder.Pad.LEFT, PADDING_CHARACTER)
-            Assert.fail("should have thrown an exception by now: original text was already longer than the desiredLength")
-        } catch (e: Exception) {
-        }
-    }
-
-    companion object {
-        private const val TEXT_ORIG = "foo"
-        private const val PADDING_CHARACTER = '+'
-    }
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-network-okhttp3v3x/build.gradle.kts b/fore-kt/fore-kt-network-okhttp3v3x/build.gradle.kts
deleted file mode 100644
index 16c571d7..00000000
--- a/fore-kt/fore-kt-network-okhttp3v3x/build.gradle.kts
+++ /dev/null
@@ -1,24 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.kotlin)
-}
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-network-okhttp3v3x")
-    set("LIB_DESCRIPTION", "fore - network code for kotlin okhttp3 v3x")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-dependencies {
-    compileOnly("com.squareup.okhttp3:okhttp:${Shared.Versions.okhttp3v3}")
-}
-
-apply(from = "../../publish-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-network-okhttp3v3x/src/main/java/co/early/fore/kt/net/testhelpers/okhttp3v3x/ResponseBuilder.kt b/fore-kt/fore-kt-network-okhttp3v3x/src/main/java/co/early/fore/kt/net/testhelpers/okhttp3v3x/ResponseBuilder.kt
deleted file mode 100644
index c5bdd931..00000000
--- a/fore-kt/fore-kt-network-okhttp3v3x/src/main/java/co/early/fore/kt/net/testhelpers/okhttp3v3x/ResponseBuilder.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package co.early.fore.kt.net.testhelpers.okhttp3v3x
-
-import okhttp3.*
-import okhttp3.Response.Builder
-
-fun v3xResponse(
-    request: Request,
-    protocol: String,
-    httpCode: Int,
-    body: String,
-    message: String,
-    headers: List<Pair<String, String>>,
-): Response {
-
-    val builder = Builder()
-        .request(request)
-        .protocol(Protocol.get(protocol))
-        .code(httpCode)
-        .body(ResponseBody.create(null, body))
-        .message(message)
-
-    for (header in headers){
-        builder.addHeader(header.first, header.second)
-    }
-
-    return builder.build()
-}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-network-okhttp3v4x/build.gradle.kts b/fore-kt/fore-kt-network-okhttp3v4x/build.gradle.kts
deleted file mode 100644
index a1c2de4f..00000000
--- a/fore-kt/fore-kt-network-okhttp3v4x/build.gradle.kts
+++ /dev/null
@@ -1,24 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.kotlin)
-}
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-network-okhttp3v4x")
-    set("LIB_DESCRIPTION", "fore - network code for kotlin okhttp3 v4x")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-dependencies {
-    compileOnly("com.squareup.okhttp3:okhttp:${Shared.Versions.okhttp3v4}")
-}
-
-apply(from = "../../publish-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-network-okhttp3v4x/src/main/java/co/early/fore/kt/net/testhelpers/okhttp3v4x/ResponseBuilder.kt b/fore-kt/fore-kt-network-okhttp3v4x/src/main/java/co/early/fore/kt/net/testhelpers/okhttp3v4x/ResponseBuilder.kt
deleted file mode 100644
index d3c72f42..00000000
--- a/fore-kt/fore-kt-network-okhttp3v4x/src/main/java/co/early/fore/kt/net/testhelpers/okhttp3v4x/ResponseBuilder.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package co.early.fore.kt.net.testhelpers.okhttp3v4x
-
-import okhttp3.*
-import okhttp3.Response.Builder
-import okhttp3.ResponseBody.Companion.toResponseBody
-
-fun v4xResponse(
-    request: Request,
-    protocol: String,
-    httpCode: Int,
-    body: String,
-    message: String,
-    headers: List<Pair<String, String>>,
-): Response {
-
-    val builder = Builder()
-            .request(request)
-            .protocol(Protocol.get(protocol))
-            .code(httpCode)
-            .body(body.toResponseBody())
-            .message(message)
-
-    for (header in headers){
-        builder.addHeader(header.first, header.second)
-    }
-
-    return builder.build()
-}
diff --git a/fore-kt/fore-kt-network/build.gradle.kts b/fore-kt/fore-kt-network/build.gradle.kts
deleted file mode 100644
index f42460c7..00000000
--- a/fore-kt/fore-kt-network/build.gradle.kts
+++ /dev/null
@@ -1,32 +0,0 @@
-import co.early.fore.Shared
-
-plugins {
-    alias(libs.plugins.kotlin)
-}
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(Shared.Versions.jvm_toolchain))
-    }
-}
-
-ext.apply {
-    set("LIB_ARTIFACT_ID", "fore-kt-network")
-    set("LIB_DESCRIPTION", "fore - network code for kotlin")
-}
-
-println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
-
-dependencies {
-    api(project(":fore-kt:fore-kt-core"))
-    api(project(":fore-kt:fore-kt-network-okhttp3v3x"))
-    api(project(":fore-kt:fore-kt-network-okhttp3v4x"))
-    compileOnly("com.squareup.okhttp3:okhttp:${Shared.Versions.okhttp3v3}")
-    compileOnly("com.apollographql.apollo3:apollo-runtime:${Shared.Versions.apollo3}")
-    // OkHttp3 v3.X.X used by Retrofit2 and Apollo2 has method calls: method(), body(), code() etc
-    // OkHttp3 v4.X.X used by Ktor has fields: method, body, code etc instead
-    // we use reflection so that we can handle either case in InterceptorLogging.kt
-    implementation(kotlin("reflect"))
-}
-
-apply(from = "../../publish-lib.gradle.kts")
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/InterceptorLogging.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/InterceptorLogging.kt
deleted file mode 100644
index e4eee69a..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/InterceptorLogging.kt
+++ /dev/null
@@ -1,314 +0,0 @@
-package co.early.fore.kt.net
-
-import co.early.fore.core.utils.text.BasicTextWrapper
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.logging.Logger
-import java.io.EOFException
-import java.io.IOException
-import java.nio.charset.Charset
-import java.util.*
-import java.util.concurrent.locks.ReentrantLock
-
-import co.early.fore.net.NetworkingLogSanitizer
-import okhttp3.*
-import okio.Buffer
-import java.text.DecimalFormat
-import kotlin.concurrent.withLock
-import kotlin.reflect.KVisibility
-
-const val BIG_LOG = 250000
-
-/**
- * In order to log HTTP calls, add this interceptor at the bottom of your interceptor chain
- * when creating an OkHttpConfig. The log tag will include a random string eg "Net B4D32" which
- * will remain constant for a given call (request and response), so that you can use it to
- * correlate logs in the event that you have many calls being logged simultaneously
- */
-class InterceptorLogging @JvmOverloads constructor(
-    private val logger: Logger? = null,
-    private val maxBodyLogCharacters: Int = 4000,
-    private val networkingLogSanitizer: NetworkingLogSanitizer? = null,
-    private val curlStyleRequests: Boolean = true,
-) : Interceptor {
-
-    private val nanosFormat = DecimalFormat("#,###")
-    private val UTF8 = Charset.forName("UTF-8")
-    private val random = Random()
-    private val someCharacters = "ABDEFGH023456789".toCharArray()
-    private val TAG = "Net"
-    private val logLinesLock = ReentrantLock(true)
-    private var printedWarningAlready = false
-
-    init {
-        require(maxBodyLogCharacters >= 1) { "maxBodyLogCharacters must be greater than 0" }
-    }
-
-    @Throws(IOException::class)
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val request = chain.request()
-        var url: HttpUrl? = null
-        var method: String? = null
-        val randomPostTag = (" " + someCharacters[random.nextInt(someCharacters.size - 1)]
-                + someCharacters[random.nextInt(someCharacters.size - 1)]
-                + someCharacters[random.nextInt(someCharacters.size - 1)]
-                + someCharacters[random.nextInt(someCharacters.size - 1)]
-                + someCharacters[random.nextInt(someCharacters.size - 1)])
-
-        logLinesLock.withLock {
-            try {
-                val pair = logRequest(request, randomPostTag)
-                url = pair.first
-                method = pair.second
-            } catch (t: Throwable) {
-                logWarning(t)
-            }
-        }
-
-        val decoratedResponse = measureNanos {
-            try {
-                chain.proceed(request)
-            } catch (e: Throwable) {
-                Fore.getLogger(logger).e(
-                    TAG + randomPostTag,
-                    "HTTP $method <-- Connection dropped, GETs may be retried $url : $e"
-                )
-                throw e
-            }
-        }
-        val response = decoratedResponse.first
-        val timeTaken = decoratedResponse.second
-
-        logLinesLock.withLock {
-            try {
-                logResponse(response, randomPostTag, method, url, timeTaken)
-            } catch (t: Throwable) {
-                logWarning(t)
-            }
-        }
-
-        return response
-    }
-
-    private fun logWarning(t: Throwable) {
-        if (!printedWarningAlready) {
-            Fore.getLogger(logger)
-                .w("No network logging available: fore doesn't recognise this version of OkHttp, or you have excluded kotlin-reflect from your dependencies. ${t.message}")
-            printedWarningAlready = true
-        }
-    }
-
-    private fun logRequest(request: Request, randomPostTag: String): Pair<HttpUrl, String> {
-
-        val method = method(request)
-        val url = url(request)
-
-        Fore.getLogger(logger).i(TAG + randomPostTag, String.format("HTTP %s --> %s", method, url))
-
-        if (curlStyleRequests) {
-            Fore.getLogger(logger)
-                .i(TAG + randomPostTag, String.format("curl --request %s \\", method))
-            Fore.getLogger(logger).i(TAG + randomPostTag, String.format(" --url '%s' \\", url))
-        }
-
-        networkingLogSanitizer?.let {
-            logHeaders(it.sanitizeHeaders(headers(request)), randomPostTag, curlStyle = curlStyleRequests)
-        } ?: logHeaders(headers(request), randomPostTag, curlStyle = curlStyleRequests)
-
-        body(request)?.let {
-
-            val buffer = Buffer()
-            val charset = getCharset(it.contentType())
-
-            it.writeTo(buffer)
-
-            if (isPlaintext(buffer)) {
-
-                val body = networkingLogSanitizer?.let {
-                    truncate(
-                        networkingLogSanitizer.sanitizeBody(
-                            buffer.clone().readString(charset)
-                        )
-                    )
-                } ?: truncate(buffer.clone().readString(charset))
-
-                try {
-                    val wrappedLines = BasicTextWrapper.wrapMonospaceText(
-                        body.replace(",", ", "),
-                        150
-                    )
-                    logLines(wrappedLines, randomPostTag, curlStyle = curlStyleRequests)
-                } catch (oom: OutOfMemoryError) {
-                    Fore.getLogger(logger)
-                        .e("Network request was too large to format nicely, consider reducing maxBodyLogCharacters from:$maxBodyLogCharacters")
-                    Fore.getLogger(logger).e(oom.toString())
-                }
-
-            } else {
-                Fore.getLogger(logger).i(TAG + randomPostTag, "$method- binary data -")
-            }
-        }
-
-        return url to method
-    }
-
-    private fun logResponse(
-        response: Response,
-        randomPostTag: String,
-        method: String?,
-        url: HttpUrl?,
-        timeTaken: Long
-    ) {
-
-        Fore.getLogger(logger).i(
-            TAG + randomPostTag,
-            "HTTP " + method + " <-- Server replied HTTP-${code(response)}  " +
-                    "${nanosFormat.format(timeTaken / (1000 * 1000))} ms $url"
-        )
-
-        networkingLogSanitizer?.let {
-            logHeaders(it.sanitizeHeaders(headers(response)), randomPostTag)
-        } ?: logHeaders(headers(response), randomPostTag)
-
-        body(response)?.let {
-            val contentLength = it.contentLength()
-            val charset = getCharset(it.contentType())
-            val source = it.source()
-            source.request(Long.MAX_VALUE) // Buffer the entire body.
-            val buffer = source.buffer
-            if (!isPlaintext(buffer)) {
-                Fore.getLogger(logger).i(
-                    TAG + randomPostTag,
-                    " (binary body omitted)"
-                )
-            } else {
-                if (contentLength != 0L) {
-                    val bodyJson = truncate(buffer.clone().readString(charset))
-                    try {
-                        val wrappedLines =
-                            BasicTextWrapper.wrapMonospaceText(bodyJson.replace(",", ", "), 150)
-                        logLines(wrappedLines, randomPostTag)
-                    } catch (oom: OutOfMemoryError) {
-                        Fore.getLogger(logger)
-                            .e("Network response was too large to format nicely, consider reducing maxBodyLogCharacters from:$maxBodyLogCharacters")
-                        Fore.getLogger(logger).e(oom.toString())
-                    }
-                } else {
-                    Fore.getLogger(logger).i(TAG + randomPostTag, " (no body content)")
-                }
-            }
-        }
-    }
-
-    private fun logLines(
-        wrappedLines: List<String>,
-        rndmPostTag: String,
-        curlStyle: Boolean = false
-    ) {
-        if (curlStyle) {
-            wrappedLines.withIndex().forEach {
-                if (it.index == 0) {
-                    Fore.getLogger(logger).i(TAG + rndmPostTag, " -d '${it.value}")
-                } else if (it.index == wrappedLines.size - 1) {
-                    Fore.getLogger(logger).i(TAG + rndmPostTag, "${it.value}'")
-                } else {
-                    Fore.getLogger(logger).i(TAG + rndmPostTag, it.value)
-                }
-            }
-        } else {
-            for (line in wrappedLines) {
-                Fore.getLogger(logger).i(TAG + rndmPostTag, line)
-            }
-        }
-    }
-
-    private fun truncate(potentiallyLongString: String): String {
-        return if (potentiallyLongString.length > maxBodyLogCharacters) {
-            potentiallyLongString.substring(0, maxBodyLogCharacters) + "...truncated " +
-                    if (maxBodyLogCharacters < BIG_LOG) {
-                        "(set maxBodyLogCharacters=BIG_LOG)"
-                    } else ""
-        } else {
-            potentiallyLongString
-        }
-    }
-
-    private fun logHeaders(headers: Headers, randomPostTag: String, curlStyle: Boolean = false) {
-        for (headerName in headers.names()) {
-            if (curlStyle) {
-                Fore.getLogger(logger).i(
-                    TAG + randomPostTag,
-                    String.format(" --header '%s: %s' \\", headerName, headers[headerName])
-                )
-            } else {
-                Fore.getLogger(logger).i(
-                    TAG + randomPostTag,
-                    String.format("    %s: %s", headerName, headers[headerName])
-                )
-            }
-        }
-    }
-
-    private fun getCharset(contentType: MediaType?): Charset {
-        var charset = UTF8
-        if (contentType != null) {
-            charset = contentType.charset(charset)
-        }
-        return charset
-    }
-
-    private inline fun <T> measureNanos(function: () -> T): Pair<T, Long> {
-        val startTime = Fore.getSystemTimeWrapper().nanoTime()
-        val result: T = function.invoke()
-        return result to (System.nanoTime() - startTime)
-    }
-
-    /**
-     * Returns true if the body in question probably contains human readable text. Uses a small sample
-     * of code points to detect unicode control characters commonly used in binary file signatures.
-     */
-    private fun isPlaintext(buffer: Buffer): Boolean {
-        return try {
-            val prefix = Buffer()
-            val size = size(buffer)
-            val byteCount = if (size < 64) size else 64
-            buffer.copyTo(prefix, 0, byteCount)
-            for (i in 0..15) {
-                if (prefix.exhausted()) {
-                    break
-                }
-                val codePoint = prefix.readUtf8CodePoint()
-                if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) {
-                    return false
-                }
-            }
-            true
-        } catch (e: EOFException) {
-            false // Truncated UTF-8 sequence.
-        }
-    }
-
-    //OkHttp3 v3.X.X used by Retrofit2 and Apollo has method calls: method(), body(), code() etc
-    //OkHttp3 v4.X.X used by Ktor has fields: method, body, code etc instead
-
-    private fun size(buffer: Buffer): Long = call(buffer, "size") as Long
-
-    private fun method(request: Request): String = call(request, "method") as String
-    private fun url(request: Request): HttpUrl = call(request, "url") as HttpUrl
-    private fun headers(request: Request): Headers = call(request, "headers") as Headers
-    private fun body(request: Request): RequestBody? =
-        call(request, "body")?.let { it as RequestBody }
-
-    private fun code(response: Response): Int = call(response, "code") as Int
-    private fun headers(response: Response): Headers = call(response, "headers") as Headers
-    private fun body(response: Response): ResponseBody? =
-        call(response, "body")?.let { it as ResponseBody }
-
-    private fun call(clazz: Any, name: String): Any? {
-        return clazz::class.members.find {
-            it.name == name && it.parameters.size == 1 && it.visibility == KVisibility.PUBLIC
-        }?.let {
-            it.call(clazz)
-        }
-    }
-}
-
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/CallProcessorApollo3.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/CallProcessorApollo3.kt
deleted file mode 100644
index 9e3728d7..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/CallProcessorApollo3.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package co.early.fore.kt.net.apollo3
-
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.Either
-import co.early.fore.kt.core.coroutine.asyncMain
-import co.early.fore.kt.core.coroutine.awaitIO
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.logging.Logger
-import com.apollographql.apollo3.api.ApolloResponse
-import com.apollographql.apollo3.api.ExecutionContext
-import com.apollographql.apollo3.api.Operation
-import kotlinx.coroutines.Deferred
-
-@Deprecated("uses a deprecated version of Either and will be removed in a future fore release, use CallerApollo3 instead", replaceWith = ReplaceWith(expression = "CallerApollo3<F>"))
-interface Apollo3Caller<F> {
-    suspend fun <S : Operation.Data> processCallAwait(
-        call: suspend () -> ApolloResponse<S>
-    ): Either<F, CallProcessorApollo3.SuccessResult<S, F>>
-    suspend fun <S : Operation.Data> processCallAsync(
-        call: suspend () -> ApolloResponse<S>
-    ): Deferred<Either<F, CallProcessorApollo3.SuccessResult<S, F>>>
-}
-
-/**
- * @property errorHandler Error handler for the service (interpreting HTTP codes, GraphQL errors
- * etc). This error handler is often the same across a range of services required by the app.
- * However, sometimes the APIs all have different error behaviours (say when the service APIs have
- * been developed at different times, or by different teams or different third parties). In this
- * case it might be easier to use a separate CallProcessorApollo3 instance (and ErrorHandler) for
- * each micro service.
- * @property logger (optional: ForeDelegateHolder will choose a sensible default)
- * @property workMode (optional: ForeDelegateHolder will choose a sensible default)
- * @property allowPartialSuccesses (defaults to true) The GraphQL spec allows for success responses
- * with qualified errors, like this: https://spec.graphql.org/draft/#example-90475 if true, you will
- * receive these responses as successes, together with the list of partial errors that were attached
- * in the response. If allowPartialSuccesses=false, these types of responses will be delivered as
- * errors and the successful parts of the response will be dropped.
- *
- * @param F  The class type passed back in the event of a failure, Globally applicable
- * failure message class, like an enum for example
- */
-@Deprecated("uses a deprecated version of Either and will be removed in a future fore release, use CallWrapperApollo3 instead", replaceWith = ReplaceWith(expression = "CallWrapperApollo3<F>", "co.early.fore.kt.core.type.carryOn"))
-class CallProcessorApollo3<F>(
-    private val errorHandler: ErrorHandler<F>,
-    private val logger: Logger? = null,
-    private val workMode: WorkMode? = null,
-    private val allowPartialSuccesses: Boolean = true
-) : Apollo3Caller<F> {
-
-    data class SuccessResult<S, F>(
-        val data: S,
-        val partialErrors: List<F> = listOf(),
-        val extensions: Map<String, Any?> = hashMapOf(),
-        val executionContext: ExecutionContext = ExecutionContext.Empty
-    )
-
-    /**
-     * @param call functional type that returns the result of an ApolloRequest
-     * @param S Success class you expect to be returned from the call (or Unit for an empty response)
-     *
-     * @return Either<F, SuccessResult<S>>
-     */
-    override suspend fun <S : Operation.Data> processCallAwait(call: suspend () -> ApolloResponse<S>): Either<F, SuccessResult<S, F>> {
-        return processCallAsync(call).await()
-    }
-
-    /**
-     * @param call functional type that returns the result of an ApolloRequest
-     * @param S Success class you expect to be returned from the call (or Unit for an empty response)
-     *
-     * @return Deferred<Either<F, SuccessResult<S>>>
-     */
-    override suspend fun <S : Operation.Data> processCallAsync(call: suspend () -> ApolloResponse<S>): Deferred<Either<F, SuccessResult<S, F>>> {
-
-        return asyncMain(Fore.getWorkMode(workMode)) {
-            try {
-
-                val result: ApolloResponse<S> = awaitIO(Fore.getWorkMode(workMode)) {
-
-                    Fore.getLogger(logger).d("about to make call from io dispatcher, thread:" + Thread.currentThread())
-
-                    call()
-                }
-
-                processSuccessResponse(result)
-
-            } catch (t: Throwable) {
-                processFailResponse(t, null)
-            }
-        }
-    }
-
-    private fun <S : Operation.Data> processSuccessResponse(
-            response: ApolloResponse<S>
-    ): Either<F, SuccessResult<S,F>> {
-
-        val data: S? = response.data
-
-        return if (data != null) {
-            if (!response.hasErrors() || allowPartialSuccesses) {
-                Either.right(
-                    SuccessResult(
-                        data,
-                        errorHandler.handlePartialErrors(response.errors),
-                        response.extensions,
-                        response.executionContext
-                    )
-                )
-            } else {
-                processFailResponse(null, response)
-            }
-        } else {
-            processFailResponse(null, response)
-        }
-    }
-
-    private fun <S> processFailResponse(
-            t: Throwable?, errorResponse: ApolloResponse<*>?
-    ): Either<F, SuccessResult<S,F>> {
-
-        if (t != null) {
-            Fore.getLogger(logger).e("processFailResponse() t:" + Thread.currentThread(), t)
-        }
-
-        if (errorResponse != null) {
-            Fore.getLogger(logger).e("processFailResponse() errorResponse:$errorResponse t:" + Thread.currentThread())
-        }
-
-        return Either.left(errorHandler.handleError(t, errorResponse))
-    }
-}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/CallProcessorKtor.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/CallProcessorKtor.kt
deleted file mode 100644
index ed005292..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/CallProcessorKtor.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package co.early.fore.kt.net.ktor
-
-import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.Either
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.coroutine.asyncMain
-import co.early.fore.kt.core.coroutine.awaitIO
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.net.MessageProvider
-import kotlinx.coroutines.Deferred
-
-@Deprecated("uses a deprecated version of Either and will be removed in a future fore release, use CallerKtor instead", replaceWith = ReplaceWith(expression = "CallerKtor<F>"))
-interface KtorCaller<F> {
-    suspend fun <S> processCallAwait(
-        call: suspend () -> S
-    ): Either<F, S>
-    suspend fun <S, CE : MessageProvider<F>> processCallAwait(
-        customErrorClazz: Class<CE>,
-        call: suspend () -> S
-    ): Either<F, S>
-    suspend fun <S> processCallAsync(
-        call: suspend () -> S
-    ): Deferred<Either<F, S>>
-    suspend fun <S, CE : MessageProvider<F>> processCallAsync(
-        customErrorClazz: Class<CE>,
-        call: suspend () -> S
-    ): Deferred<Either<F, S>>
-}
-
-/**
- * F - Globally applicable failure message class, like an enum for example
- * S - Success pojo you expect to be returned from the API (or Unit for an empty response)
- * CE - Custom error class that you expect from the specific API in the event of an error
- *
- * CE needs to implement MessageProvider&lt;F&gt; (i.e. it needs to be able to give you a failure
- * message that can be passed back to the application)
- *
- * @param errorHandler Error handler for the service (interpreting HTTP codes etc). This
- * error handler is often the same across a range of services required by the app. However, sometimes
- * the APIs all have different error behaviours (say when the service APIs have been developed
- * at different times, or by different companies, or even teams). In this case it might be easier
- * to use a separate CallProcessor instance (and ErrorHandler) for each micro service.
- * @param workMode (optional: ForeDelegateHolder will choose a sensible default)  SYNCHRONOUS means
- * everything is run sequentially in a blocking manner
- * and on whatever thread the caller is on (suitable for running unit tests for example).
- * ASYNCHRONOUS gives you the co-routine behaviour you would expect - for this class that
- * means network requests are run on Dispatchers.IO
- * @param logger (optional: ForeDelegateHolder will choose a sensible default)
- *
- * @param <F> The class type passed back in the event of a failure, Globally applicable
- * failure message class, like an enum for example
- */
-@Deprecated("uses a deprecated version of Either and will be removed in a future fore release, use CallWrapperKtor instead", replaceWith = ReplaceWith(expression = "CallWrapperKtor<F>", "co.early.fore.kt.core.type.carryOn"))
-class CallProcessorKtor<F>(
-    private val errorHandler: ErrorHandler<F>,
-    private val workMode: WorkMode? = null,
-    private val logger: Logger? = null
-) : KtorCaller<F> {
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     */
-    override suspend fun <S> processCallAwait(call: suspend () -> S): Either<F, S> {
-        return processCallAsync(call).await()
-    }
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     */
-    override suspend fun <S, CE : MessageProvider<F>> processCallAwait(
-            customErrorClazz: Class<CE>,
-            call: suspend () -> S
-    ): Either<F, S> {
-        return processCallAsync(customErrorClazz, call).await()
-    }
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
-     */
-    override suspend fun <S> processCallAsync(call: suspend () -> S): Deferred<Either<F, S>> {
-        return doCallAsync<S, MessageProvider<F>>(null, call)
-    }
-
-    /**
-     * @param call Retrofit call to be processed
-     * @param <S> Successful response body type
-     * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
-     */
-    override suspend fun <S, CE : MessageProvider<F>> processCallAsync(
-            customErrorClazz: Class<CE>,
-            call: suspend () -> S
-    ): Deferred<Either<F, S>> {
-        return doCallAsync(customErrorClazz, call)
-    }
-
-    private suspend fun <S, CE : MessageProvider<F>> doCallAsync(
-            customErrorClazz: Class<CE>?,
-            call: suspend () -> S
-    ): Deferred<Either<F, S>> {
-
-        Fore.getLogger(logger).d("doCallAsync() thread:" + Thread.currentThread())
-
-        return asyncMain(Fore.getWorkMode(workMode)) {
-            try {
-
-                val result: S = awaitIO(Fore.getWorkMode(workMode)) {
-
-                    Fore.getLogger(logger).d("about to make call from io dispatcher, thread:" + Thread.currentThread())
-
-                    call()
-                }
-
-                Fore.getLogger(logger).d("continuing back on main dispatcher thread:" + Thread.currentThread())
-
-                Either.right(result)
-
-            } catch (t: Throwable) {
-
-                Fore.getLogger(logger).w("processFailResponse() thread:${Thread.currentThread()} ${t.message}")
-
-                Either.left(errorHandler.handleError(t, customErrorClazz?.kotlin))
-            }
-        }
-    }
-}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/InterceptorStubOkHttp3.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/InterceptorStubOkHttp3.kt
deleted file mode 100644
index cb04e684..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/InterceptorStubOkHttp3.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package co.early.fore.kt.net.testhelpers
-
-import co.early.fore.kt.net.testhelpers.okhttp3v3x.v3xResponse
-import co.early.fore.kt.net.testhelpers.okhttp3v4x.v4xResponse
-import okhttp3.Interceptor
-import okhttp3.Interceptor.Chain
-import okhttp3.Request
-import okhttp3.Response
-import java.io.IOException
-
-/**
- * Using this interceptor will simulate a canned server response at the okhttp level
- * without connecting to a real server
- *
- * This interceptor will easily work for models that are only calling one endpoint,
- * for more complex models with multiple end points returning different pojos
- * you would need slightly more sophistication here to intercept each network
- * request in a different way (you may also be able to construct the model under test
- * with a new Interceptor setup for each test).
- */
-class InterceptorStubOkHttp3(
-    private val stub: Stub<*>
-) : Interceptor {
-    @Throws(IOException::class)
-    override fun intercept(chain: Chain): Response {
-
-        stub.throwable?.let { throw it } // simulates a connection failure
-
-        val bodyString = JunitFileIO.getRawResourceAsUTF8String(
-            stub.bodyContentResourceFileName,
-            this.javaClass.classLoader
-        )
-
-        return when (determineOkHttp3Version()){
-            OkHttp3Version.V3x -> {
-                v3xResponse(
-                    request = chain.request(),
-                    protocol = stub.protocol,
-                    httpCode = stub.httpCode,
-                    body = bodyString,
-                    message = stub.httpMessage,
-                    headers = stub.headers.map { it.name to it.value }
-                )
-            }
-            OkHttp3Version.V4x -> {
-                v4xResponse(
-                    request = chain.request(),
-                    protocol = stub.protocol,
-                    httpCode = stub.httpCode,
-                    body = bodyString,
-                    message = stub.httpMessage,
-                    headers = stub.headers.map { it.name to it.value }
-                )
-            }
-        }
-    }
-
-    private fun determineOkHttp3Version(): OkHttp3Version {
-
-        val functionsDetected = (Request::class.members.find {
-                it.name == "method"
-            }?.toString()?.startsWith("fun") ?: false)
-
-        return if (functionsDetected){
-            OkHttp3Version.V3x
-        } else {
-            OkHttp3Version.V4x
-        }
-    }
-
-    private sealed class OkHttp3Version {
-        object V3x: OkHttp3Version()
-        object V4x: OkHttp3Version()
-    }
-}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/JunitFileIO.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/JunitFileIO.kt
deleted file mode 100644
index 8f535e39..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/JunitFileIO.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package co.early.fore.kt.net.testhelpers
-
-import java.io.ByteArrayOutputStream
-import java.io.IOException
-import java.io.InputStream
-import java.nio.charset.Charset
-
-/**
- * To use this in a unit test, you need to put your data files in a folder called "resources"
- * see the unit tests in the example ktor app
- */
-object JunitFileIO {
-    @Throws(IOException::class)
-    @JvmStatic fun getRawResourceAsUTF8String(resourceFileName: String, classLoader: ClassLoader): String {
-        return String(getResourceBytes(resourceFileName, classLoader), Charset.forName("UTF-8"))
-    }
-
-    @Throws(IOException::class)
-    private fun getResourceBytes(resourceFileName: String, classLoader: ClassLoader): ByteArray {
-        return getBytesFromInputStream(classLoader.getResourceAsStream(resourceFileName))
-    }
-
-    @Throws(IOException::class)
-    private fun getBytesFromInputStream(inputStream: InputStream): ByteArray {
-        val bout = ByteArrayOutputStream()
-        val readBuffer = ByteArray(4 * 1024)
-        return inputStream.use { inpS ->
-            var read: Int
-            do {
-                read = inpS.read(readBuffer, 0, readBuffer.size)
-                if (read == -1) {
-                    break
-                }
-                bout.write(readBuffer, 0, read)
-            } while (true)
-            bout.toByteArray()
-        }
-    }
-}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/Stub.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/Stub.kt
deleted file mode 100644
index 2b95af05..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/testhelpers/Stub.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package co.early.fore.kt.net.testhelpers
-
-/**
- * When used in combination with [InterceptorStubOkHttp3] this class helps you junit test networking
- * code without making a real network call to fetch data. This class defines the details of the
- * stubbed http response you want to return to your code during a test.
- *
- * For instance, if you want to test how your code behaves when it receives an Http 404, you
- * can construct a [Stub] as follows:
- *
- * ```
- * Stub<Unit>(httpCode = 404)
- * ```
- *
- * If you want to test how your code behaves when it receives an HTTP 200, with a body content stored
- * locally in a resources file called "success_response.json", you can construct:
- *
- * ```
- * Stub<Unit>(httpCode = 200, bodyContentResourceFileName = "success_response.json")
- * ```
- *
- * To test the behaviour of your code when it encounters an IOException, you can construct:
- *
- * ```
- * Stub<Unit>(throwable = IOException())
- * ```
- *
- * You can specify the [httpCode], [httpMessage], [bodyContentResourceFileName] (the resource
- * file must be a UTF-8 encoded text file), [throwable], [headers], [protocol] (which defaults to
- * "http/1.1")
- *
- * As a convenience, you can also attach an expected value
- * [expectedResult] to the [Stub], which can later be asserted on, as follows:
- *
- * ```
- * val stub = Stub<Fruit>(httpCode = 200, expectedResult = Fruit())
- * // or
- * val stub = Stub<DataError>(httpCode = 404, expectedResult = DataError.NoFruitFound)
- *
- * // run the code that involves a network call, using the stub, and then...
- *
- * assertEquals(stub.expectedResult, actualResult)
- * ```
- */
-class Stub<R>(
-    val httpCode: Int = 0,
-    val bodyContentResourceFileName: String = "",
-    val throwable: Throwable? = null,
-    val headers: List<Header> = emptyList(), // listOf(Header("Content-Type","application/json")),
-    val protocol: String = "http/1.1",
-    val httpMessage: String = "",
-    val expectedResult: R? = null,
-) {
-
-    data class Header(
-        val name: String,
-        val value: String,
-    )
-
-    fun successfullyConnected() = (throwable == null)
-}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/InterceptorLogging.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/InterceptorLogging.kt
deleted file mode 100644
index 5808f975..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/InterceptorLogging.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-package co.early.fore.net
-
-import okhttp3.Interceptor.Chain
-import co.early.fore.core.utils.text.BasicTextWrapper.wrapMonospaceText
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.logging.Logger
-import okhttp3.*
-import okhttp3.internal.http.promisesBody
-import okio.Buffer
-import java.io.EOFException
-import java.io.IOException
-import java.lang.Exception
-import java.nio.charset.Charset
-import java.util.*
-
-/**
- * In order to log HTTP calls, add this interceptor at the bottom of your interceptor chain
- * when creating an OkHttpConfig. The log tag will include a random string eg "B4D32" which
- * will remain constant for a given call (request and response), so that you can use it to
- * correlate logs in the event that you have many calls being logged simultaneously
- */
-@Deprecated(message = "will be removed in the next major version", replaceWith = ReplaceWith(expression = "co.early.fore.kt.net.InterceptorLogging"))
-class InterceptorLogging @JvmOverloads constructor(
-    logger: Logger,
-    maxBodyLogCharacters: Int = DEAFULT_MAX_BODY_LOG_LENGTH,
-    networkingLogSanitizer: NetworkingLogSanitizer? = null
-) : Interceptor {
-    private val MAX_BODY_LOG_LENGTH: Int
-    var UTF8 = Charset.forName("UTF-8")
-    private val logger: Logger
-    private val random = Random()
-    private val someCharacters = "ABDEFGH023456789".toCharArray()
-    private val networkingLogSanitizer: NetworkingLogSanitizer?
-
-    constructor(logger: Logger, networkingLogSanitizer: NetworkingLogSanitizer?) : this(
-        logger,
-        DEAFULT_MAX_BODY_LOG_LENGTH,
-        networkingLogSanitizer
-    )
-
-    init {
-        this.logger = logger
-        MAX_BODY_LOG_LENGTH = maxBodyLogCharacters
-        this.networkingLogSanitizer = networkingLogSanitizer
-        require(maxBodyLogCharacters >= 1) { "maxBodyLogCharacters must be greater than 0" }
-    }
-
-    @Throws(IOException::class)
-    override fun intercept(chain: Chain): Response {
-        val request: Request = chain.request()
-        val method = request.method
-        val url = request.url.toString()
-        val randomPostTag = (" " + someCharacters[random.nextInt(15)]
-                + someCharacters[random.nextInt(15)]
-                + someCharacters[random.nextInt(15)]
-                + someCharacters[random.nextInt(15)]
-                + someCharacters[random.nextInt(15)])
-
-        //request
-        logger.i(TAG + randomPostTag, String.format("HTTP %s --> %s", method, url))
-        if (networkingLogSanitizer == null) {
-            logHeaders(request.headers, randomPostTag)
-        } else {
-            logHeaders(networkingLogSanitizer.sanitizeHeaders(request.headers), randomPostTag)
-        }
-        val requestBody = request.body
-        if (requestBody != null) {
-            val buffer = Buffer()
-            requestBody.writeTo(buffer)
-            val charset = getCharset(requestBody.contentType())
-            if (isPlaintext(buffer)) {
-                val body: String = if (networkingLogSanitizer == null) {
-                    truncate(buffer.clone().readString(charset!!))
-                } else {
-                    truncate(
-                        networkingLogSanitizer.sanitizeBody(
-                            buffer.clone().readString(charset!!)
-                        )
-                    )
-                }
-                val wrappedLines = wrapMonospaceText(body.replace(",", ", "), 150)
-                synchronized(this) {
-                    for (line in wrappedLines) {
-                        logger.i(TAG + randomPostTag, line)
-                    }
-                }
-            } else {
-                logger.i(TAG + randomPostTag, "$method- binary data -")
-            }
-        }
-
-        //response
-        val t1 = Fore.getSystemTimeWrapper().nanoTime()
-        val response: Response = try {
-            chain.proceed(request)
-        } catch (e: Exception) {
-            logger.e(
-                TAG + randomPostTag,
-                "HTTP $method <-- Connection dropped, but GETs will be retried $url : $e"
-            )
-            throw e
-        }
-        val t2 = Fore.getSystemTimeWrapper().nanoTime()
-        logger.i(
-            TAG + randomPostTag,
-            "HTTP " + method + " <-- Server replied HTTP-" + response.code + " " + (t2 - t1) / (1000 * 1000) + "ms " + url
-        )
-        if (networkingLogSanitizer == null) {
-            logHeaders(response.headers, randomPostTag)
-        } else {
-            logHeaders(networkingLogSanitizer.sanitizeHeaders(response.headers), randomPostTag)
-        }
-        val responseBody = response.body
-        val contentLength = responseBody!!.contentLength()
-        if (response.promisesBody()) {
-            val source = responseBody.source()
-            source.request(Long.MAX_VALUE) // Buffer the entire body.
-            val buffer = source.buffer
-            val charset = getCharset(responseBody.contentType())
-            if (!isPlaintext(buffer)) {
-                logger.i(TAG + randomPostTag, " (binary " + buffer.size + " byte body omitted)")
-                return response
-            } else {
-                if (contentLength != 0L) {
-                    val bodyJson = truncate(buffer.clone().readString(charset!!))
-                    val wrappedLines = wrapMonospaceText(bodyJson.replace(",", ", "), 150)
-                    synchronized(this) {
-                        for (line in wrappedLines) {
-                            logger.i(TAG + randomPostTag, line)
-                        }
-                    }
-                } else {
-                    logger.i(TAG + randomPostTag, " (no body content)")
-                }
-            }
-        }
-        return response
-    }
-
-    private fun truncate(potentiallyLongString: String): String {
-        return if (potentiallyLongString.length > MAX_BODY_LOG_LENGTH) {
-            potentiallyLongString.substring(0, MAX_BODY_LOG_LENGTH) + "...truncated"
-        } else {
-            potentiallyLongString
-        }
-    }
-
-    private fun logHeaders(headers: Headers, randomPostTag: String) {
-        for (headerName in headers.names()) {
-            logger.i(
-                TAG + randomPostTag,
-                String.format("    %s: %s", headerName, headers[headerName])
-            )
-        }
-    }
-
-    private fun getCharset(contentType: MediaType?): Charset? {
-        var charset = UTF8
-        if (contentType != null) {
-            charset = contentType.charset(charset)
-        }
-        return charset
-    }
-
-    companion object {
-        private const val TAG = "Network"
-        private const val DEAFULT_MAX_BODY_LOG_LENGTH = 4000
-
-        /**
-         * Returns true if the body in question probably contains human readable text. Uses a small sample
-         * of code points to detect unicode control characters commonly used in binary file signatures.
-         */
-        fun isPlaintext(buffer: Buffer): Boolean {
-            return try {
-                val prefix = Buffer()
-                val byteCount = if (buffer.size < 64) buffer.size else 64
-                buffer.copyTo(prefix, 0, byteCount)
-                for (i in 0..15) {
-                    if (prefix.exhausted()) {
-                        break
-                    }
-                    val codePoint = prefix.readUtf8CodePoint()
-                    if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) {
-                        return false
-                    }
-                }
-                true
-            } catch (e: EOFException) {
-                false // Truncated UTF-8 sequence.
-            }
-        }
-    }
-}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/NetworkingLogSanitizer.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/NetworkingLogSanitizer.kt
deleted file mode 100644
index b8f643de..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/NetworkingLogSanitizer.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package co.early.fore.net
-
-import okhttp3.Headers
-
-interface NetworkingLogSanitizer {
-    fun sanitizeHeaders(allHeaders: Headers): Headers
-    fun sanitizeBody(text: String): String
-}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/testhelpers/InterceptorStubbedService.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/testhelpers/InterceptorStubbedService.kt
deleted file mode 100644
index e6c96c0a..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/testhelpers/InterceptorStubbedService.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package co.early.fore.net.testhelpers
-
-import co.early.fore.kt.net.testhelpers.JunitFileIO
-import okhttp3.Interceptor
-import okhttp3.Interceptor.Chain
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.Protocol
-import okhttp3.Response
-import okhttp3.Response.Builder
-import okhttp3.ResponseBody.Companion.toResponseBody
-import java.io.IOException
-
-/**
- * Using this interceptor will simulate a canned server response at the okhttp level
- * without actually connecting to a real server
- *
- * This interceptor will easily work for models that are only calling one endpoint,
- * for more complex models with multiple end points returning different pojos
- * you would need slightly more sophistication here to intercept each network
- * request in a different way (you may also be able to construct the model under test
- * with a new Interceptor setup for each test).
- */
-@Deprecated(message = "will be removed in the next major version", replaceWith = ReplaceWith(expression = "InterceptorStubOkHttp3", "co.early.fore.kt.net.testhelpers"))
-class InterceptorStubbedService(
-    private val stubbedServiceDefinition: StubbedServiceDefinition<*>
-) : Interceptor {
-    @Throws(IOException::class)
-    override fun intercept(chain: Chain): Response {
-        stubbedServiceDefinition.ioException?.let { //stubbing a connection failure
-            throw stubbedServiceDefinition.ioException
-        }
-        val bodyString = JunitFileIO.getRawResourceAsUTF8String(
-            stubbedServiceDefinition.resourceFileName,
-            this.javaClass.classLoader
-        )
-
-        return Builder()
-            .request(chain.request())
-            .protocol(Protocol.HTTP_1_1)
-            .code(stubbedServiceDefinition.httpCode)
-            .addHeader("Content-Type", stubbedServiceDefinition.mimeType)
-            .body(bodyString.toResponseBody(stubbedServiceDefinition.mimeType.toMediaTypeOrNull()))
-            .message("")
-            .build()
-    }
-}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/testhelpers/StubbedServiceDefinition.kt b/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/testhelpers/StubbedServiceDefinition.kt
deleted file mode 100644
index f8b865f6..00000000
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/testhelpers/StubbedServiceDefinition.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package co.early.fore.net.testhelpers
-
-import java.io.IOException
-
-/**
- *
- * @param <R> The class type expected to be passed back as the result
- */
-@Deprecated(message = "will be removed in the next major version", replaceWith = ReplaceWith(expression = "Stub", "co.early.fore.kt.net.testhelpers"))
-class StubbedServiceDefinition<R> {
-    val httpCode: Int
-    val resourceFileName: String
-    val mimeType: String
-    val ioException: IOException?
-    val expectedResult: R?
-
-    constructor(ioException: IOException, expectedResult: R) {
-        httpCode = 0
-        resourceFileName = "none"
-        mimeType = "application/json"
-        this.ioException = ioException
-        this.expectedResult = expectedResult
-    }
-
-    constructor(httpCode: Int, resourceFileName: String, expectedResult: R) : this (
-        httpCode,
-        resourceFileName,
-        "application/json",
-        expectedResult
-    )
-
-    @JvmOverloads
-    constructor(
-        httpCode: Int,
-        resourceFileName: String,
-        mimeType: String = "application/json",
-        expectedResult: R? = null
-    ) {
-        this.httpCode = httpCode
-        this.resourceFileName = resourceFileName
-        this.mimeType = mimeType
-        ioException = null
-        this.expectedResult = expectedResult
-    }
-
-    fun successfullyConnected(): Boolean {
-        return ioException == null
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index ad9002dc..e64738be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,13 +17,11 @@ android.nonTransitiveRClass=true
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-# the --add-exports flags are only needed to support butterknife in the old java sample
-# apps with Java17 (which we need to use gradle 8)
-org.gradle.jvmargs=-Xmx1920M \
---add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
---add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
---add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 # @BindView requires a constant resource ID
-
 android.nonFinalResIds=false
 
+org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
+#remove this once we are on about v2.1.0 of dokka
+org.jetbrains.dokka.experimental.gradle.pluginMode.nowarn=true
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 36e7776e..f93f822d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,106 @@
 [versions]
-agp = "8.3.2"
-kotlin = "1.9.22"
+androidPluginVersion = "8.9.1"
+composeBomVersion = "2025.04.00"
+slf4jNopVersion = "2.0.7"
+wearComposeVersion = "1.4.1"
+wearToolingPreviewVersion = "1.0.0"
+junitVersion = "4.13.2"
+kotlinVersion = "2.1.10"
+kotlinXIoVersion = "0.1.8"
+jvm-toolchain = "21"
+jvm-target = "1.8"
+apollo = "4.3.0"
+apolloEngineKtor = "0.1.1"
+ktor = "3.2.1"
+coroutines = "1.10.1"
+lifecycle = "2.6.2" # from 2.7.0 onwards lifecycle-livedata-ktx has broken support for minSdk 16
+composeUiVersion = "1.8.3"
+composeMultiplatformUiVersion = "1.7.3"
+composeMultiplatformPluginVersion = "2.1.10"
+androidxWindowVersion = "1.4.0"
+mockkVersion = "1.13.11"
+persistaVersion = "2.0.0"
+foreVersion = "2.0.0"
+
+[libraries]
+
+# kotlin
+kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io", version.ref = "kotlinXIoVersion" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinVersion" }
+
+# android
+androidx-lifecycle = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+
+# compose androidx
+androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" }
+androidx-material3 = { module = "androidx.compose.material3:material3" }
+androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
+androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
+androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
+androidx-wear-compose-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "wearComposeVersion" }
+androidx-wear-tooling-preview = { module = "androidx.wear:wear-tooling-preview", version.ref = "wearToolingPreviewVersion" }
+androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "composeUiVersion" }
+androidx-activity-compose = "androidx.activity:activity-compose:1.10.1"
+
+# compose jetbrains
+jetbrains-compose-ui  = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatformUiVersion" }
+jetbrains-compose-desktop = { module = "org.jetbrains.compose.desktop:desktop", version.ref = "composeMultiplatformUiVersion" }
+jetbrains-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "composeMultiplatformUiVersion" }
+
+# ui
+androidx-window = { module = "androidx.window:window", version.ref = "androidxWindowVersion" }
+# androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidxWindowVersion" }
+
+# ktor
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
+ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
+ktor-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
+
+# okio
+okio = "com.squareup.okio:okio:3.10.2"
+
+# test
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlinVersion" }
+junit = { module = "junit:junit", version.ref = "junitVersion" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockkVersion" }
+
+# apollo
+apollo-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo" }
+apollo-engine-ktor = { module = "com.apollographql.ktor:apollo-engine-ktor", version.ref = "apolloEngineKtor" }
+
+# fore
+fore-core = { module = "co.early.fore:fore-core", version.ref = "foreVersion" }
+fore-net = { module = "co.early.fore:fore-net", version.ref = "foreVersion" }
+fore-compose = { module = "co.early.fore:fore-compose", version.ref = "foreVersion" }
+fore-test-fixtures = { module = "co.early.fore:fore-test-fixtures", version.ref = "foreVersion" }
+
+# fore-apollo
+fore-net-apollo = { module = "co.early.fore:fore-net-apollo", version.ref = "foreVersion" }
+fore-net-apollo-test-fixtures = { module = "co.early.fore:fore-net-apollo-test-fixtures", version.ref = "foreVersion" }
+
+# persistence
+persista = { module = "co.early.persista:persista", version.ref = "persistaVersion" }
+
+# logging
+slf4j-nop = { module = "org.slf4j:slf4j-nop", version.ref = "slf4jNopVersion" }
+
 
 [plugins]
-androidApplication = { id = "com.android.application", version.ref = "agp" }
-androidLibrary = { id = "com.android.library", version.ref = "agp" }
-kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
+androidAppPlugin = { id = "com.android.application", version.ref = "androidPluginVersion" }
+androidLibraryPlugin = { id = "com.android.library", version.ref = "androidPluginVersion" }
+kotlinAndroidPlugin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" }
+kotlinJvmPlugin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinVersion" }
+kotlinMultiPlatformPlugin = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinVersion" }
+kotlinKaptPlugin = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlinVersion" }
+kotlinSerializationPlugin = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinVersion" }
+composeCompilerPlugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVersion" }
+#composeMultiplatformPlugin = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "composeMultiplatformPluginVersion" }
+apolloPlugin = { id = "com.apollographql.apollo", version.ref = "apollo"}
+kotlinCocoapodsPlugin = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlinVersion" }
+dokkaPlugin = "org.jetbrains.dokka:2.0.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d67691c6..7d27c463 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Jan 29 21:25:26 GMT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
\ No newline at end of file
diff --git a/lib/fore-compose/build.gradle.kts b/lib/fore-compose/build.gradle.kts
new file mode 100644
index 00000000..803ef939
--- /dev/null
+++ b/lib/fore-compose/build.gradle.kts
@@ -0,0 +1,139 @@
+import co.early.fore.Shared
+import co.early.fore.applyPublishingConfig
+import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiPlatformPlugin)
+    alias(libs.plugins.androidLibraryPlugin)
+    alias(libs.plugins.composeCompilerPlugin)
+    alias(libs.plugins.dokkaPlugin)
+    id("maven-publish")
+    id("signing")
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get()))
+    }
+}
+
+kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
+    }
+
+    targets.withType<org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget> {
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+                }
+            }
+        }
+    }
+
+    androidTarget{
+        publishLibraryVariants("release")
+    }
+
+    applyDefaultHierarchyTemplate()
+
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
+
+    sourceSets {
+
+        val commonMain by getting {
+            dependencies {
+                api(project(":lib:fore-core"))
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(libs.kotlin.test)
+                api(project(":lib:fore-test-fixtures"))
+            }
+        }
+
+        val androidMain by getting {
+            dependencies {
+                implementation(libs.androidx.compose.ui)
+                implementation(libs.androidx.window)
+                implementation(libs.androidx.lifecycle)
+            }
+        }
+
+        val iosMain by getting {
+            dependencies {
+                implementation(libs.jetbrains.compose.ui)
+            }
+        }
+    }
+}
+
+android {
+
+    namespace = "co.early.fore.compose"
+
+    compileSdk = Shared.Android.compileSdk
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+        targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+    }
+
+    lint {
+        abortOnError = true
+        lintConfig = File(project.rootDir, "lint-library.xml")
+    }
+
+    defaultConfig {
+        minSdk = Shared.Android.minSdk
+        multiDexEnabled = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildFeatures {
+        buildConfig = false
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            consumerProguardFiles("../../proguard-library-consumer.pro")
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    if (name.contains("android", ignoreCase = true)) {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+        }
+    }
+}
+
+ext.apply {
+    set("LIB_ARTIFACT_ID", "fore-compose")
+    set("LIB_DESCRIPTION", "fore - compose code")
+}
+
+println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
+
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    from(tasks.dokkaHtml)
+}
+
+applyPublishingConfig()
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/kt/core/ui/ComposeExt.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/compose/ComposeExt.kt
similarity index 79%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/kt/core/ui/ComposeExt.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/compose/ComposeExt.kt
index 5815c247..8b4ca123 100644
--- a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/kt/core/ui/ComposeExt.kt
+++ b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/compose/ComposeExt.kt
@@ -1,13 +1,14 @@
-package co.early.fore.kt.core.ui
+package co.early.fore.compose
 
 import androidx.compose.runtime.*
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import co.early.fore.core.observer.Observable
 import co.early.fore.core.observer.ObservableGroup
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.observer.threadName
 
 /**
  * Observes this [Observable] or [ObservableGroup] representing its state via [State]
@@ -21,19 +22,19 @@ import co.early.fore.kt.core.delegate.Fore
  * lifecycle is STARTED. If either or both conditions are false, the observer is removed (and
  * will be added again as appropriate when conditions change).
  *
- * If you want to see exactly what is happening in your UI, you can pass a logString in to this function,
- * and then set a debug logger as usual:
+ * If you want to see exactly what is happening in your UI, you can pass a logLabel in to this
+ * function, and then set a debug logger as usual, so put this somewhere in your code before
+ * calling observeAsState:
  * ```
  *   if (BuildConfig.DEBUG) {
  *       Fore.setDelegate(DebugDelegateDefault("foo_"))
  *   }
  * ```
- * Filter your logs on "foo_" and to Debug level
+ * (and in that case you would filter your logs on "foo_" and to Debug level)
  *
  * There is a sample app that you can use to investigate this behaviour (and the behaviour
  * of Flow.collectAsState and LiveData.observeAsState here: https://github.com/erdo/compose-observe-as-state-explorer)
  */
-@Deprecated("observeAsState has moved to co.early.fore.compose, please update the import")
 @Composable
 fun <T> ObservableGroup.observeAsState(
     logLabel: String? = null,
@@ -42,12 +43,13 @@ fun <T> ObservableGroup.observeAsState(
 ): State<T> {
     val lifecycleOwner = LocalLifecycleOwner.current
     val state = remember { mutableStateOf(getState(), policy) }
-    val observer = Observer { state.value = getState() }
-    var refCount = 0
-
-    logLabel?.let {
-        logMessage(logLabel, "", refCount)
+    val observer = Observer {
+        logLabel?.let {
+            logMessage(logLabel, "[somethingChanged() received, setting compose state]")
+        }
+        state.value = getState()
     }
+    var refCount = 0
 
     val lifeCycleObserver = object : DefaultLifecycleObserver {
         override fun onStart(owner: LifecycleOwner) {
@@ -89,7 +91,7 @@ fun <T> ObservableGroup.observeAsState(
 private fun addIfThresholdMet(logLabel: String?, observable: ObservableGroup, observer: Observer, count: Int, threshold: Int = 2){
     if (count == threshold) {
         logLabel?.let {
-            logMessage(logLabel, "[ADD FORE OBSERVER]", count)
+            logMessage(logLabel, "[ADD <<<FORE>>> OBSERVER]", count)
         }
         observable.addObserver(observer)
         observer.somethingChanged()
@@ -99,12 +101,14 @@ private fun addIfThresholdMet(logLabel: String?, observable: ObservableGroup, ob
 private fun removeIfThresholdSkirted(logLabel: String?, observable: ObservableGroup, observer: Observer, count: Int, threshold: Int = 2){
     if (count == (threshold - 1)) {
         logLabel?.let {
-            logMessage(logLabel, "[REMOVE FORE OBSERVER]", count)
+            logMessage(logLabel, "[REMOVE <<<FORE>>> OBSERVER]", count)
         }
         observable.removeObserver(observer)
     }
 }
 
-private fun logMessage(label: String, msg: String, refCount: Int){
-    Fore.getLogger().d("observeAsState $label $msg refCount:${refCount}")
+private fun logMessage(label: String, msg: String, refCount: Int? = null){
+    refCount?.let {
+        Fore.getLogger().d("observeAsState $label $msg refCount:${refCount} t:${threadName()}")
+    } ?: Fore.getLogger().d("observeAsState $label $msg t:${threadName()}")
 }
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/Ext.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/Ext.kt
similarity index 76%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/Ext.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/Ext.kt
index d141cf61..dac0483c 100644
--- a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/Ext.kt
+++ b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/Ext.kt
@@ -15,10 +15,6 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.min
 import androidx.window.layout.WindowMetricsCalculator
 
-@Deprecated(message = "this will be removed in a future version of fore, please use LocalWindowSize", replaceWith = ReplaceWith(expression = "LocalWindowSize", "co.early.fore.ui.size.WindowSize"))
-val LocalForeWindowSize =
-    compositionLocalOf<WindowSize> { error("To access LocalForeWindowSize, your compose code must be wrapped in a ForeWindowSize{} block, we'd suggest somewhere high up in the UI tree/hierarchy, just inside setContent{}") }
-
 val LocalWindowSize =
     compositionLocalOf<WindowSize> { error("To access LocalWindowSize, your compose code must be wrapped in a WindowSize{} block, we'd suggest somewhere high up in the UI tree/hierarchy, just inside setContent{}") }
 
@@ -76,14 +72,6 @@ private fun Activity.rememberWindowMetrics(): Rect {
     }
 }
 
-@Deprecated(message = "this will be removed in a future version of fore, please use WindowSize", replaceWith = ReplaceWith(expression = "WindowSize(content)", "co.early.fore.ui.size.WindowSize"))
-@Composable
-fun Activity.ForeWindowSize(content: @Composable () -> Unit) {
-    CompositionLocalProvider(LocalForeWindowSize provides rememberWindowSize()) {
-        content()
-    }
-}
-
 @Composable
 fun Activity.WindowSize(content: @Composable () -> Unit) {
     CompositionLocalProvider(LocalWindowSize provides rememberWindowSize()) {
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/ForeSize.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/ForeSize.kt
similarity index 100%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/ForeSize.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/ForeSize.kt
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedComposable.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedComposable.kt
similarity index 100%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedComposable.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedComposable.kt
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedDp.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedDp.kt
similarity index 100%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedDp.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedDp.kt
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedFloat.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedFloat.kt
similarity index 100%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedFloat.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedFloat.kt
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedInt.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedInt.kt
similarity index 100%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedInt.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedInt.kt
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedTextUnit.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedTextUnit.kt
similarity index 100%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedTextUnit.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedTextUnit.kt
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedValue.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedValue.kt
similarity index 100%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/SizedValue.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/SizedValue.kt
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/WindowSize.kt b/lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/WindowSize.kt
similarity index 100%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/ui/size/WindowSize.kt
rename to lib/fore-compose/src/androidMain/kotlin/co/early/fore/ui/size/WindowSize.kt
diff --git a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/compose/ComposeExt.kt b/lib/fore-compose/src/iosMain/kotlin/co/early/fore/compose/ComposeExt.kt
similarity index 97%
rename from fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/compose/ComposeExt.kt
rename to lib/fore-compose/src/iosMain/kotlin/co/early/fore/compose/ComposeExt.kt
index d7e65b1f..7de11c6b 100644
--- a/fore-kt/fore-kt-android-compose/src/main/java/co/early/fore/compose/ComposeExt.kt
+++ b/lib/fore-compose/src/iosMain/kotlin/co/early/fore/compose/ComposeExt.kt
@@ -1,13 +1,14 @@
 package co.early.fore.compose
 
 import androidx.compose.runtime.*
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
+
 import co.early.fore.core.observer.Observable
 import co.early.fore.core.observer.ObservableGroup
 import co.early.fore.core.observer.Observer
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.Fore
 
 /**
  * Observes this [Observable] or [ObservableGroup] representing its state via [State]
diff --git a/lib/fore-core/build.gradle.kts b/lib/fore-core/build.gradle.kts
new file mode 100644
index 00000000..b804fbdd
--- /dev/null
+++ b/lib/fore-core/build.gradle.kts
@@ -0,0 +1,140 @@
+import co.early.fore.Shared
+import co.early.fore.applyPublishingConfig
+import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiPlatformPlugin)
+    alias(libs.plugins.androidLibraryPlugin)
+    alias(libs.plugins.dokkaPlugin)
+    id("maven-publish")
+    id("signing")
+}
+
+kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
+    }
+
+    targets.withType<org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget> {
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+                }
+            }
+        }
+    }
+
+    androidTarget{
+        publishLibraryVariants("release")
+    }
+
+    jvm()
+
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
+
+    macosX64()
+    macosArm64()
+
+    watchosArm32()
+    watchosArm64()
+    watchosX64()
+    watchosSimulatorArm64()
+
+    tvosArm64()
+    tvosX64()
+    tvosSimulatorArm64()
+
+    linuxX64()
+    linuxArm64()
+
+    mingwX64()
+
+    sourceSets {
+
+        val commonMain by getting {
+            dependencies {
+                api(libs.kotlinx.coroutines.core)
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(libs.kotlin.test)
+            }
+        }
+
+        val androidMain by getting {
+            dependencies {
+                implementation(libs.androidx.lifecycle)
+            }
+        }
+    }
+}
+
+android {
+
+    namespace = "co.early.fore.core"
+
+    compileSdk = Shared.Android.compileSdk
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+        targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+    }
+
+    lint {
+        abortOnError = true
+        lintConfig = File(project.rootDir, "lint-library.xml")
+    }
+
+    defaultConfig {
+        minSdk = Shared.Android.minSdk
+        multiDexEnabled = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildFeatures {
+        buildConfig = false
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            consumerProguardFiles("../../proguard-library-consumer.pro")
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    if (name.contains("android", ignoreCase = true)) {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+        }
+    }
+}
+
+ext.apply {
+    set("LIB_ARTIFACT_ID", "fore-core")
+    set("LIB_DESCRIPTION", "fore - core code")
+}
+
+println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
+
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    from(tasks.dokkaHtml)
+}
+
+applyPublishingConfig()
diff --git a/lib/fore-core/fore_core.podspec b/lib/fore-core/fore_core.podspec
new file mode 100644
index 00000000..17b3724e
--- /dev/null
+++ b/lib/fore-core/fore_core.podspec
@@ -0,0 +1,50 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'fore_core'
+    spec.version                  = '1.0'
+    spec.homepage                 = 'Link to the Shared Module homepage'
+    spec.source                   = { :http=> ''}
+    spec.authors                  = ''
+    spec.license                  = ''
+    spec.summary                  = 'Some description for the Shared Module'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
+    spec.libraries                = 'c++'
+    spec.ios.deployment_target = '16.0'
+                
+                
+    if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
+        raise "
+
+        Kotlin framework 'shared' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :lib:fore-core:generateDummyFramework
+
+        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
+    end
+                
+    spec.pod_target_xcconfig = {
+        'KOTLIN_PROJECT_PATH' => ':lib:fore-core',
+        'PRODUCT_MODULE_NAME' => 'shared',
+    }
+                
+    spec.script_phases = [
+        {
+            :name => 'Build fore_core',
+            :execution_position => :before_compile,
+            :shell_path => '/bin/sh',
+            :script => <<-SCRIPT
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                  exit 0
+                fi
+                set -ev
+                REPO_ROOT="$PODS_TARGET_SRCROOT"
+                "$REPO_ROOT/../../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
+                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
+                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
+                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
+            SCRIPT
+        }
+    ]
+                
+end
\ No newline at end of file
diff --git a/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/logging/Logger.android.kt b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/logging/Logger.android.kt
new file mode 100644
index 00000000..2d4f1b27
--- /dev/null
+++ b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/logging/Logger.android.kt
@@ -0,0 +1,23 @@
+package co.early.fore.core.logging
+
+import android.util.Log
+
+internal actual fun verbose(tag: String, message: String, throwable: Throwable?) {
+    Log.v(tag, message, throwable)
+}
+
+internal actual fun debug(tag: String, message: String, throwable: Throwable?) {
+    Log.d(tag, message, throwable)
+}
+
+internal actual fun info(tag: String, message: String, throwable: Throwable?) {
+    Log.i(tag, message, throwable)
+}
+
+internal actual fun warning(tag: String, message: String, throwable: Throwable?) {
+    Log.w(tag, message, throwable)
+}
+
+internal actual fun error(tag: String, message: String, throwable: Throwable?) {
+    Log.e(tag, message, throwable)
+}
diff --git a/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/logging/TagInferer.android.kt b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/logging/TagInferer.android.kt
new file mode 100644
index 00000000..b0531255
--- /dev/null
+++ b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/logging/TagInferer.android.kt
@@ -0,0 +1,31 @@
+package co.early.fore.core.logging
+
+actual fun getTagInferer(): TagInferer = TagInfererAndroid()
+
+class TagInfererAndroid : TagInferer {
+
+    override fun inferTag(): String {
+        val trace = Throwable().stackTrace
+        return if (trace.size > 2) {
+            extractClassName(trace[2]).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && trace.size > 3) {
+                    extractClassName(trace[3])
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(element: StackTraceElement): String {
+        val simpleClassName = element.className.substringAfterLast('.')
+        val anonymousClass = ANONYMOUS_CLASS_SUFFIX.find(simpleClassName)
+        return anonymousClass?.let {
+            simpleClassName.replace(it.value, "") // remove anonymous class suffix
+        } ?: simpleClassName
+    }
+
+    companion object {
+        private val ANONYMOUS_CLASS_SUFFIX = Regex("(\\$\\d+)+$")
+    }
+}
diff --git a/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/observer/ThreadId.android.kt b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/observer/ThreadId.android.kt
new file mode 100644
index 00000000..25d27f70
--- /dev/null
+++ b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/observer/ThreadId.android.kt
@@ -0,0 +1,5 @@
+package co.early.fore.core.observer
+
+actual fun threadName(): String {
+    return Thread.currentThread().name
+}
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/testhelpers/CountDownLatchWrapper.kt b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/testhelpers/CountDownLatchWrapper.kt
similarity index 94%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/core/testhelpers/CountDownLatchWrapper.kt
rename to lib/fore-core/src/androidMain/kotlin/co/early/fore/core/testhelpers/CountDownLatchWrapper.kt
index 5ff40120..c63c4700 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/testhelpers/CountDownLatchWrapper.kt
+++ b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/testhelpers/CountDownLatchWrapper.kt
@@ -6,7 +6,8 @@ import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
 /**
- * Removing countdownlatch boiler plate from tests which require latches
+ * Removing countdownlatch boiler plate from tests which require latches (i.e. for testing code
+ * that uses older jvm thread based libraries like room 2.4.3)
  */
 object CountDownLatchWrapper {
     const val DEFAULT_TIMEOUT_SECONDS = 2
diff --git a/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.android.kt b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.android.kt
new file mode 100644
index 00000000..56d48ae6
--- /dev/null
+++ b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.android.kt
@@ -0,0 +1,13 @@
+package co.early.fore.core.time
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperAndroid()
+
+class SystemTimeWrapperAndroid : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return System.currentTimeMillis()
+    }
+
+    override fun nanoTime(): Long {
+        return System.nanoTime()
+    }
+}
diff --git a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/Ext.kt b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/ui/Ext.kt
similarity index 87%
rename from fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/Ext.kt
rename to lib/fore-core/src/androidMain/kotlin/co/early/fore/core/ui/Ext.kt
index 54910fbc..433f94da 100644
--- a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/Ext.kt
+++ b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/ui/Ext.kt
@@ -1,8 +1,7 @@
-package co.early.fore.kt.core.ui
+package co.early.fore.core.ui
 
 import android.view.View
 
-
 fun View.showOrInvisible(show: Boolean) {
     this.visibility = if (show) View.VISIBLE else View.INVISIBLE
 }
diff --git a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ForeLifecycleObserver.kt b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/ui/ForeLifecycleObserver.kt
similarity index 89%
rename from fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ForeLifecycleObserver.kt
rename to lib/fore-core/src/androidMain/kotlin/co/early/fore/core/ui/ForeLifecycleObserver.kt
index fb547975..216329b4 100644
--- a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ForeLifecycleObserver.kt
+++ b/lib/fore-core/src/androidMain/kotlin/co/early/fore/core/ui/ForeLifecycleObserver.kt
@@ -1,12 +1,11 @@
-package co.early.fore.kt.core.ui
+package co.early.fore.core.ui
 
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import co.early.fore.core.observer.Observable
 import co.early.fore.core.observer.ObservableGroup
 import co.early.fore.core.observer.Observer
-import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.observer.ObservableGroupImp
+import co.early.fore.core.observer.ObservableGroupImp
 
 typealias ForeLifecycleObserver = LifecycleObserver
 
diff --git a/lib/fore-core/src/appleMain/kotlin/co/early/fore/core/logging/Logger.apple.kt b/lib/fore-core/src/appleMain/kotlin/co/early/fore/core/logging/Logger.apple.kt
new file mode 100644
index 00000000..76da9961
--- /dev/null
+++ b/lib/fore-core/src/appleMain/kotlin/co/early/fore/core/logging/Logger.apple.kt
@@ -0,0 +1,45 @@
+package co.early.fore.core.logging
+
+import platform.Foundation.NSLog
+
+private const val maxChunkSize = 800
+
+internal actual fun verbose(tag: String, message: String, throwable: Throwable?) {
+    log("(V) $tag|", message, throwable)
+}
+
+internal actual fun debug(tag: String, message: String, throwable: Throwable?) {
+    log("(D) $tag|", message, throwable)
+}
+
+internal actual fun info(tag: String, message: String, throwable: Throwable?) {
+    log("(I) $tag|", message, throwable)
+}
+
+internal actual fun warning(tag: String, message: String, throwable: Throwable?) {
+    log("(W) $tag|", message, throwable)
+}
+
+internal actual fun error(tag: String, message: String, throwable: Throwable?) {
+    log("(E) $tag|", message, throwable)
+}
+
+private fun log(preLog: String, message: String, throwable: Throwable?){
+    if (message.length > maxChunkSize){
+        NSLog(preLog)
+        longLog(message)
+    } else NSLog("$preLog$message")
+    throwable?.let {
+        NSLog(it.toString())
+    }
+}
+
+private fun longLog(message: String, chunkSize: Int = maxChunkSize) {
+    var start = 0
+    while (start < message.length) {
+        val end = (start + chunkSize).coerceAtMost(message.length)
+        val chunk = message.substring(start, end)
+        NSLog(chunk)
+        start = end
+    }
+}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/WorkMode.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/WorkMode.kt
similarity index 97%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/core/WorkMode.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/WorkMode.kt
index 9cb8db6c..3f3a4017 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/WorkMode.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/WorkMode.kt
@@ -2,4 +2,4 @@ package co.early.fore.core
 
 enum class WorkMode {
     ASYNCHRONOUS, SYNCHRONOUS
-}
\ No newline at end of file
+}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/coroutine/Ext.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/coroutine/Ext.kt
similarity index 76%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/coroutine/Ext.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/coroutine/Ext.kt
index 162079a2..e63dce70 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/coroutine/Ext.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/coroutine/Ext.kt
@@ -1,7 +1,7 @@
-package co.early.fore.kt.core.coroutine
+package co.early.fore.core.coroutine
 
 import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.delegate.Fore
+import co.early.fore.core.delegate.Fore
 import kotlinx.coroutines.*
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.coroutineContext
@@ -37,7 +37,8 @@ import kotlin.coroutines.coroutineContext
  *
  * https://www.thedevtavern.com/blog/posts/structured-concurrency-exceptions-and-cancellations/
  */
-fun launchIO(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> Unit): Job {
+
+inline fun launchIO(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> Unit): Job {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -45,7 +46,7 @@ fun launchIO(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> Uni
     }
 }
 
-fun launchDefault(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> Unit): Job {
+inline fun launchDefault(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> Unit): Job {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -53,7 +54,11 @@ fun launchDefault(workMode: WorkMode? = null, block: suspend CoroutineScope.() -
     }
 }
 
-fun launchCustom(dispatcher: CoroutineContext, workMode: WorkMode? = null, block: suspend CoroutineScope.() -> Unit): Job {
+inline fun launchCustom(
+    dispatcher: CoroutineContext,
+    workMode: WorkMode? = null,
+    crossinline block: suspend CoroutineScope.() -> Unit
+): Job {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -65,7 +70,7 @@ fun launchCustom(dispatcher: CoroutineContext, workMode: WorkMode? = null, block
  * Platform may or may not provide instance of `MainDispatcher`, see kotlin documentation to [Dispatchers.Main]
  * if using this code from a pure kotlin module
  */
-fun launchMain(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> Unit): Job {
+inline fun launchMain(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> Unit): Job {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -79,7 +84,7 @@ fun launchMain(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> U
  *
  * Implementation note: [MainCoroutineDispatcher.immediate] is not supported on Native and JS platforms.
  */
-fun launchMainImm(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> Unit): Job {
+inline fun launchMainImm(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> Unit): Job {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -87,7 +92,7 @@ fun launchMainImm(workMode: WorkMode? = null, block: suspend CoroutineScope.() -
     }
 }
 
-fun <T> asyncIO(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): Deferred<T> {
+inline fun <T> asyncIO(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> T): Deferred<T> {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -95,7 +100,10 @@ fun <T> asyncIO(workMode: WorkMode? = null, block: suspend CoroutineScope.() ->
     }
 }
 
-fun <T> asyncDefault(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): Deferred<T> {
+inline fun <T> asyncDefault(
+    workMode: WorkMode? = null,
+    crossinline block: suspend CoroutineScope.() -> T
+): Deferred<T> {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -103,7 +111,11 @@ fun <T> asyncDefault(workMode: WorkMode? = null, block: suspend CoroutineScope.(
     }
 }
 
-fun <T> asyncCustom(dispatcher: CoroutineContext, workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): Deferred<T> {
+inline fun <T> asyncCustom(
+    dispatcher: CoroutineContext,
+    workMode: WorkMode? = null,
+    crossinline block: suspend CoroutineScope.() -> T
+): Deferred<T> {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -115,7 +127,7 @@ fun <T> asyncCustom(dispatcher: CoroutineContext, workMode: WorkMode? = null, bl
  * Platform may or may not provide instance of `MainDispatcher`, see kotlin documentation to [Dispatchers.Main]
  * if using this code from a pure kotlin module
  */
-fun <T> asyncMain(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): Deferred<T> {
+inline fun <T> asyncMain(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> T): Deferred<T> {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -129,7 +141,10 @@ fun <T> asyncMain(workMode: WorkMode? = null, block: suspend CoroutineScope.() -
  *
  * Implementation note: [MainCoroutineDispatcher.immediate] is not supported on Native and JS platforms.
  */
-fun <T> asyncMainImm(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): Deferred<T> {
+inline fun <T> asyncMainImm(
+    workMode: WorkMode? = null,
+    crossinline block: suspend CoroutineScope.() -> T
+): Deferred<T> {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         runBlocking { CompletableDeferred(block()) }
     } else {
@@ -137,7 +152,7 @@ fun <T> asyncMainImm(workMode: WorkMode? = null, block: suspend CoroutineScope.(
     }
 }
 
-suspend fun <T> awaitIO(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): T {
+suspend inline fun <T> awaitIO(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> T): T {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         block(CoroutineScope(coroutineContext))
     } else {
@@ -145,7 +160,7 @@ suspend fun <T> awaitIO(workMode: WorkMode? = null, block: suspend CoroutineScop
     }
 }
 
-suspend fun <T> awaitDefault(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): T {
+suspend inline fun <T> awaitDefault(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> T): T {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         block(CoroutineScope(coroutineContext))
     } else {
@@ -153,7 +168,11 @@ suspend fun <T> awaitDefault(workMode: WorkMode? = null, block: suspend Coroutin
     }
 }
 
-suspend fun <T> awaitCustom(dispatcher: CoroutineContext, workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): T {
+suspend inline fun <T> awaitCustom(
+    dispatcher: CoroutineContext,
+    workMode: WorkMode? = null,
+    crossinline block: suspend CoroutineScope.() -> T
+): T {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         block(CoroutineScope(coroutineContext))
     } else {
@@ -165,7 +184,7 @@ suspend fun <T> awaitCustom(dispatcher: CoroutineContext, workMode: WorkMode? =
  * Platform may or may not provide instance of `MainDispatcher`, see kotlin documentation to [Dispatchers.Main]
  * if using this code from a pure kotlin module
  */
-suspend fun <T> awaitMain(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): T {
+suspend inline fun <T> awaitMain(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> T): T {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         block(CoroutineScope(coroutineContext))
     } else {
@@ -179,7 +198,7 @@ suspend fun <T> awaitMain(workMode: WorkMode? = null, block: suspend CoroutineSc
  *
  * Implementation note: [MainCoroutineDispatcher.immediate] is not supported on Native and JS platforms.
  */
-suspend fun <T> awaitMainImm(workMode: WorkMode? = null, block: suspend CoroutineScope.() -> T): T {
+suspend inline fun <T> awaitMainImm(workMode: WorkMode? = null, crossinline block: suspend CoroutineScope.() -> T): T {
     return if (Fore.getWorkMode(workMode) == WorkMode.SYNCHRONOUS) {
         block(CoroutineScope(coroutineContext))
     } else {
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/delegate/Delegates.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/delegate/Delegates.kt
similarity index 61%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/delegate/Delegates.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/delegate/Delegates.kt
index fe82528c..c9a9e56e 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/delegate/Delegates.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/delegate/Delegates.kt
@@ -1,15 +1,14 @@
-package co.early.fore.kt.core.delegate
+package co.early.fore.core.delegate
 
 import co.early.fore.core.WorkMode
 import co.early.fore.core.WorkMode.ASYNCHRONOUS
 import co.early.fore.core.WorkMode.SYNCHRONOUS
-import co.early.fore.kt.core.logging.Logger
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.logging.MultiplatformLogger
 import co.early.fore.core.time.SystemTimeWrapper
-import co.early.fore.kt.core.logging.SilentLogger
-import co.early.fore.kt.core.logging.SystemLogger
-
-@Deprecated("use Fore instead")
-typealias ForeDelegateHolder = Fore
+import co.early.fore.core.time.getSystemTimeWrapper
+import co.early.fore.core.logging.SilentLogger
+import co.early.fore.core.logging.SystemLogger
 
 /**
  * Many fore classes take: WorkMode, Logger and/or SystemTimeWrapper as construction parameters.
@@ -24,17 +23,42 @@ interface Delegate {
     val systemTimeWrapper: SystemTimeWrapper
 }
 
-class ReleaseDelegateDefault (
+class DebugDelegateDefault(
+    tagPrefix: String? = null,
+    override val workMode: WorkMode = ASYNCHRONOUS,
+    override val logger: Logger = MultiplatformLogger(tagPrefix),
+    override val systemTimeWrapper: SystemTimeWrapper = getSystemTimeWrapper()
+) : Delegate {
+
+    // this is for iOS target benefit which doesn't like default parameters in constructors
+    constructor(tagPrefix: String) : this(
+        tagPrefix,
+        ASYNCHRONOUS,
+        MultiplatformLogger(tagPrefix),
+        getSystemTimeWrapper()
+    )
+    constructor() : this(null, ASYNCHRONOUS, MultiplatformLogger(null), getSystemTimeWrapper())
+}
+
+class ReleaseDelegateDefault(
     override val workMode: WorkMode = ASYNCHRONOUS,
     override val logger: Logger = SilentLogger(),
-    override val systemTimeWrapper: SystemTimeWrapper = SystemTimeWrapper()
-) : Delegate
+    override val systemTimeWrapper: SystemTimeWrapper = getSystemTimeWrapper()
+) : Delegate {
 
-class TestDelegateDefault (
-        override val workMode: WorkMode = SYNCHRONOUS,
-        override val logger: Logger = SystemLogger(),
-        override val systemTimeWrapper: SystemTimeWrapper = SystemTimeWrapper()
-) : Delegate
+    // this is for iOS target benefit which doesn't like default parameters in constructors
+    constructor() : this(ASYNCHRONOUS, SilentLogger(), getSystemTimeWrapper())
+}
+
+class TestDelegateDefault(
+    override val workMode: WorkMode = SYNCHRONOUS,
+    override val logger: Logger = SystemLogger(),
+    override val systemTimeWrapper: SystemTimeWrapper = getSystemTimeWrapper()
+) : Delegate {
+
+    // this is for iOS target benefit which doesn't like default parameters in constructors
+    constructor() : this(SYNCHRONOUS, SystemLogger(), getSystemTimeWrapper())
+}
 
 
 class Fore {
@@ -64,54 +88,54 @@ class Fore {
          * issues. If this is a problem for your set up, you can revert to passing the parameters
          * to the fore component via the constructor
          */
-        fun setDelegate(delegate: Delegate){
-            this.delegate = delegate
+        fun setDelegate(delegate: Delegate) {
+            Companion.delegate = delegate
         }
 
-        fun getWorkMode(specified: WorkMode? = null) : WorkMode {
+        fun getWorkMode(specified: WorkMode? = null): WorkMode {
             return specified ?: delegate.workMode
         }
 
-        fun getLogger(specified: Logger? = null) : Logger {
+        fun getLogger(specified: Logger? = null): Logger {
             return specified ?: delegate.logger
         }
 
-        fun getSystemTimeWrapper(specified: SystemTimeWrapper? = null) : SystemTimeWrapper {
+        fun getSystemTimeWrapper(specified: SystemTimeWrapper? = null): SystemTimeWrapper {
             return specified ?: delegate.systemTimeWrapper
         }
 
         /**
          * convenience function, same as calling: Fore.getLogger(null).e()
          */
-        fun e(message: String){
+        fun e(message: String) {
             delegate.logger.e(message)
         }
 
         /**
          * convenience function, same as calling: Fore.getLogger(null).w()
          */
-        fun w(message: String){
+        fun w(message: String) {
             delegate.logger.w(message)
         }
 
         /**
          * convenience function, same as calling: Fore.getLogger(null).i()
          */
-        fun i(message: String){
+        fun i(message: String) {
             delegate.logger.i(message)
         }
 
         /**
          * convenience function, same as calling: Fore.getLogger(null).d()
          */
-        fun d(message: String){
+        fun d(message: String) {
             delegate.logger.d(message)
         }
 
         /**
          * convenience function, same as calling: Fore.getLogger(null).w()
          */
-        fun v(message: String){
+        fun v(message: String) {
             delegate.logger.w(message)
         }
     }
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/Logger.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/Logger.kt
similarity index 67%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/Logger.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/Logger.kt
index 376786df..d94f77c2 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/Logger.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/Logger.kt
@@ -1,4 +1,4 @@
-package co.early.fore.kt.core.logging
+package co.early.fore.core.logging
 
 interface Logger {
     fun e(message: String)
@@ -25,3 +25,9 @@ interface Logger {
     fun d(tag: String, message: String, throwable: Throwable)
     fun v(tag: String, message: String, throwable: Throwable)
 }
+
+internal expect fun verbose(tag: String, message: String, throwable: Throwable?)
+internal expect fun debug(tag: String, message: String, throwable: Throwable?)
+internal expect fun info(tag: String, message: String, throwable: Throwable?)
+internal expect fun warning(tag: String, message: String, throwable: Throwable?)
+internal expect fun error(tag: String, message: String, throwable: Throwable?)
diff --git a/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/MultiplatformLogger.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/MultiplatformLogger.kt
new file mode 100644
index 00000000..55e65ab6
--- /dev/null
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/MultiplatformLogger.kt
@@ -0,0 +1,162 @@
+package co.early.fore.core.logging
+
+typealias AndroidLogger = MultiplatformLogger
+
+class MultiplatformLogger(
+    private val tagPrefix: String? = null,
+    private val stableTagLength: Boolean = false,
+    overrideMaxTagLength: Int? = null
+) : Logger, TagFormatter by TagFormatterImp(overrideMaxTagLength) {
+
+    // this is for iOS target benefit which doesn't like default parameters in constructors
+    constructor(tagPrefix: String) : this(tagPrefix, false, null)
+    constructor() : this(null, false, null)
+
+    private val tagInferer: TagInferer = getTagInferer()
+
+    override fun e(message: String) {
+        e(tagInferer.inferTag(), message)
+    }
+
+    override fun w(message: String) {
+        w(tagInferer.inferTag(), message)
+    }
+
+    override fun i(message: String) {
+        i(tagInferer.inferTag(), message)
+    }
+
+    override fun d(message: String) {
+        d(tagInferer.inferTag(), message)
+    }
+
+    override fun v(message: String) {
+        v(tagInferer.inferTag(), message)
+    }
+
+    override fun e(message: String, throwable: Throwable) {
+        e(tagInferer.inferTag(), message, throwable)
+    }
+
+    override fun w(message: String, throwable: Throwable) {
+        w(tagInferer.inferTag(), message, throwable)
+    }
+
+    override fun i(message: String, throwable: Throwable) {
+        i(tagInferer.inferTag(), message, throwable)
+    }
+
+    override fun d(message: String, throwable: Throwable) {
+        d(tagInferer.inferTag(), message, throwable)
+    }
+
+    override fun v(message: String, throwable: Throwable) {
+        v(tagInferer.inferTag(), message, throwable)
+    }
+
+    override fun e(tag: String, message: String) {
+        if (stableTagLength) {
+            error(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ", message, null)
+        } else {
+            error(limitTagLength(addTagPrefixIfPresent(tag)), message, null)
+        }
+    }
+
+    override fun w(tag: String, message: String) {
+        if (stableTagLength) {
+            warning(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ", message, null)
+        } else {
+            warning(limitTagLength(addTagPrefixIfPresent(tag)), message, null)
+        }
+    }
+
+    override fun i(tag: String, message: String) {
+        if (stableTagLength) {
+            info(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ", message, null)
+        } else {
+            info(limitTagLength(addTagPrefixIfPresent(tag)), message, null)
+        }
+    }
+
+    override fun d(tag: String, message: String) {
+        if (stableTagLength) {
+            debug(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ", message, null)
+        } else {
+            debug(limitTagLength(addTagPrefixIfPresent(tag)), message, null)
+        }
+    }
+
+    override fun v(tag: String, message: String) {
+        if (stableTagLength) {
+            verbose(padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ", message, null)
+        } else {
+            verbose(limitTagLength(addTagPrefixIfPresent(tag)), message, null)
+        }
+    }
+
+    override fun e(tag: String, message: String, throwable: Throwable) {
+        if (stableTagLength) {
+            error(
+                padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ",
+                message,
+                throwable
+            )
+        } else {
+            error(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
+        }
+    }
+
+    override fun w(tag: String, message: String, throwable: Throwable) {
+        if (stableTagLength) {
+            warning(
+                padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ",
+                message,
+                throwable
+            )
+        } else {
+            warning(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
+        }
+    }
+
+    override fun i(tag: String, message: String, throwable: Throwable) {
+        if (stableTagLength) {
+            info(
+                padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ",
+                message,
+                throwable
+            )
+        } else {
+            info(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
+        }
+    }
+
+    override fun d(tag: String, message: String, throwable: Throwable) {
+        if (stableTagLength) {
+            debug(
+                padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ",
+                message,
+                throwable
+            )
+        } else {
+            debug(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
+        }
+    }
+
+    override fun v(tag: String, message: String, throwable: Throwable) {
+        if (stableTagLength) {
+            verbose(
+                padTagWithSpace(limitTagLength(addTagPrefixIfPresent(tag))) + " ",
+                message,
+                throwable
+            )
+        } else {
+            verbose(limitTagLength(addTagPrefixIfPresent(tag)), message, throwable)
+        }
+    }
+
+    private fun addTagPrefixIfPresent(message: String): String {
+        return tagPrefix?.let {
+            it + message
+        } ?: message
+    }
+}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/SilentLogger.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/SilentLogger.kt
similarity index 96%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/SilentLogger.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/SilentLogger.kt
index 968e4279..3cce2967 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/SilentLogger.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/SilentLogger.kt
@@ -1,4 +1,4 @@
-package co.early.fore.kt.core.logging
+package co.early.fore.core.logging
 
 class SilentLogger : Logger {
 
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/SystemLogger.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/SystemLogger.kt
similarity index 74%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/SystemLogger.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/SystemLogger.kt
index 108926e9..c70cceac 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/SystemLogger.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/SystemLogger.kt
@@ -1,48 +1,47 @@
-package co.early.fore.kt.core.logging
+package co.early.fore.core.logging
 
-class SystemLogger :
-        Logger,
-        TagInferer by TagInfererImpl(),
-        TagFormatter by TagFormatterImpl() {
+class SystemLogger : Logger, TagFormatter by TagFormatterImp() {
+
+    private val tagInferer = getTagInferer()
 
     override fun e(message: String) {
-        e(inferTag(), message)
+        e(tagInferer.inferTag(), message)
     }
 
     override fun w(message: String) {
-        w(inferTag(), message)
+        w(tagInferer.inferTag(), message)
     }
 
     override fun i(message: String) {
-        i(inferTag(), message)
+        i(tagInferer.inferTag(), message)
     }
 
     override fun d(message: String) {
-        d(inferTag(), message)
+        d(tagInferer.inferTag(), message)
     }
 
     override fun v(message: String) {
-        v(inferTag(), message)
+        v(tagInferer.inferTag(), message)
     }
 
     override fun e(message: String, throwable: Throwable) {
-        e(inferTag(), message, throwable)
+        e(tagInferer.inferTag(), message, throwable)
     }
 
     override fun w(message: String, throwable: Throwable) {
-        w(inferTag(), message, throwable)
+        w(tagInferer.inferTag(), message, throwable)
     }
 
     override fun i(message: String, throwable: Throwable) {
-        i(inferTag(), message, throwable)
+        i(tagInferer.inferTag(), message, throwable)
     }
 
     override fun d(message: String, throwable: Throwable) {
-        d(inferTag(), message, throwable)
+        d(tagInferer.inferTag(), message, throwable)
     }
 
     override fun v(message: String, throwable: Throwable) {
-        v(inferTag(), message, throwable)
+        v(tagInferer.inferTag(), message, throwable)
     }
 
     override fun e(tag: String, message: String) {
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/TagFormatter.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/TagFormatter.kt
similarity index 58%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/TagFormatter.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/TagFormatter.kt
index 275316df..5b898828 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/logging/TagFormatter.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/TagFormatter.kt
@@ -1,14 +1,11 @@
-package co.early.fore.kt.core.logging
-
-import co.early.fore.core.utils.text.TextPadder
-
+package co.early.fore.core.logging
 
 interface TagFormatter {
     fun limitTagLength(tag: String): String
     fun padTagWithSpace(tag: String): String
 }
 
-class TagFormatterImpl(private val overrideMaxTagLength: Int? = null) : TagFormatter {
+internal class TagFormatterImp(private val overrideMaxTagLength: Int? = null) : TagFormatter {
 
     init {
         if (overrideMaxTagLength != null && overrideMaxTagLength<4){
@@ -23,20 +20,16 @@ class TagFormatterImpl(private val overrideMaxTagLength: Int? = null) : TagForma
         return if (tag.length <= overrideMaxTagLength ?: MAX_TAG_LENGTH) {
             tag
         } else {
-            tag.substring(0, bookEndLength) + ".." + tag.substring(tag.length - bookEndLength, tag.length)
+            tag.substring(0, bookEndLength) + "" + tag.substring(tag.length - bookEndLength, tag.length)
         }
     }
 
     override fun padTagWithSpace(tag: String): String {
         longestTagLength = longestTagLength.coerceAtLeast(tag.length + 1)
-        return if (longestTagLength != tag.length) {
-            (TextPadder.padText(tag, longestTagLength, TextPadder.Pad.RIGHT, ' ') ?: tag)
-        } else {
-            tag
-        }
+        return tag.padEnd(longestTagLength, ' ')
     }
 
     companion object {
-        private const val MAX_TAG_LENGTH = 30 //below API 24 is limited to 23 characters
+        private const val MAX_TAG_LENGTH = 30 // Android below API 24 is limited to 23 characters
     }
 }
diff --git a/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/TagInferer.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/TagInferer.kt
new file mode 100644
index 00000000..26894a47
--- /dev/null
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/logging/TagInferer.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.logging
+
+interface TagInferer {
+    fun inferTag(): String
+}
+
+expect fun getTagInferer(): TagInferer
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/observer/Observable.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/Observable.kt
similarity index 100%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/core/observer/Observable.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/Observable.kt
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/observer/ObservableGroup.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ObservableGroup.kt
similarity index 100%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/core/observer/ObservableGroup.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ObservableGroup.kt
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/observer/ObservableGroupImp.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ObservableGroupImp.kt
similarity index 79%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/observer/ObservableGroupImp.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ObservableGroupImp.kt
index e9e40047..4cf49324 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/observer/ObservableGroupImp.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ObservableGroupImp.kt
@@ -1,8 +1,4 @@
-package co.early.fore.kt.core.observer
-
-import co.early.fore.core.observer.ObservableGroup
-import co.early.fore.core.observer.Observable
-import co.early.fore.core.observer.Observer
+package co.early.fore.core.observer
 
 class ObservableGroupImp(vararg observablesList: Observable) : ObservableGroup {
 
diff --git a/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ObservableImp.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ObservableImp.kt
new file mode 100644
index 00000000..0c77cf8a
--- /dev/null
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ObservableImp.kt
@@ -0,0 +1,187 @@
+package co.early.fore.core.observer
+
+import co.early.fore.core.WorkMode
+import co.early.fore.core.coroutine.launchCustom
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.logging.getTagInferer
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+
+/**
+ * @param notificationMode If notifications should be run on the UI thread (appropriate for most
+ * app code) then use ASYNCHRONOUS. For tests, you will want to inject SYNCHRONOUS here which will
+ * force all the notifications to come through on the same thread that notifyObservers()
+ * is called on.
+ *
+ * @param logger If you want to be told about warnings, pass an implementation of Logger
+ * here (recommended)
+ *
+ * @param dispatcherImmediate You will only need to specify this if you are running on a platform
+ * that doesn't have Dispatchers.Main.immediate otherwise leave this as null
+ *
+ *
+ * If you don't specify any construction parameters, they will be taken from ForeDelegateHolder
+ *
+ * NB: If there are any Android Adapters depending on your model for their list data, you will
+ * want to make sure that you only update this list based data on the UI thread (i.e. for use
+ * with adapters, you should only call notifyObservers() on the UI thread). This remains true
+ * regardless of whether this Observable has been created with ASYNCHRONOUS or SYNCHRONOUS
+ * WorkMode.
+ * Synchronizing any list updates is not enough, Android will call Adapter.count() and
+ * Adapter.get() on the UI thread and you cannot change the adapter's size between these calls.
+ *
+ */
+class ObservableImp(
+    private val notificationMode: WorkMode? = null,
+    private val logger: Logger? = null,
+    dispatcherImmediate: CoroutineDispatcher? = null,
+) : Observable {
+
+    // this is for iOS target benefit which doesn't like default parameters in constructors
+    constructor() : this(null, null, null)
+
+    private val observerList = mutableListOf<Observer>()
+    private val addRemoveMutex = Mutex()
+    private val inferredTag: String = getTagInferer().inferTag()
+    private val mainDispatcherImmediate: CoroutineDispatcher
+
+    init {
+        if (dispatcherImmediate == null) {
+            try {
+                mainDispatcherImmediate = Dispatchers.Main.immediate
+            } catch (uoe: UnsupportedOperationException){
+                val errorMessage = "\nIt looks like you are running on a KMP platform that doesn't " +
+                        "support \n" +
+                        "Dispatchers.Main.immediate\n" +
+                        "If this is intentional, you will need to specify a dispatcher in the\n" +
+                        "constructor"
+                Fore.getLogger(logger).e(inferredTag, errorMessage)
+                throw IllegalArgumentException(errorMessage)
+            }
+        } else {
+            mainDispatcherImmediate = dispatcherImmediate
+        }
+    }
+
+    /**
+     * Take the observer and add it to the list of registered observers that
+     * want to be notified when the model data changes. Usually you will do this
+     * from lifecycle methods like onStart() (and remove the observer in onStop())
+     */
+    override fun addObserver(observer: Observer) {
+        launchCustom(mainDispatcherImmediate, notificationMode) {
+            addRemoveMutex.withLock {
+
+                if (observerList.contains(observer)) {
+                    Fore.getLogger(logger).w(inferredTag,
+                        "You are about to add the same observer twice to [$inferredTag]. This is almost certainly an error and indicates code that " +
+                                "could cause a memory leak. Usually an observer is added and removed in line with _mirrored_ lifecycle methods " +
+                                "(for example onStart()/onStop() or onAttachedToWindow()/onDetachedFromWindow()) thread:${threadName()}"
+                    )
+                }
+
+                observerList.add(observer)
+
+                Fore.getLogger(logger).i(inferredTag, "Observer added to [${inferredTag}]: $observer t:${threadName()}")
+
+                if (observerList.size > 4) {
+                    Fore.getLogger(logger).w(inferredTag,
+                        "There are now:" + observerList.size + " Observers added to the Observable [$inferredTag], that's quite a lot.\n" +
+                                "It's sometimes indicative of code which is not removing observers when it should\n" +
+                                "(forgetting to remove observers in an onStop(), onClear() or onDetachedFromWindow() method for example)\n" +
+                                "Failing to remove observers when you no longer need them will cause memory leaks,\n" +
+                                "you might want to look in to the ForeLifecycleObserver (legacy Android) or\n" +
+                                "Fore's observeAsState() extension function (Compose UI) which handles this for you.\n" +
+                                "(If the number of observers steadily increases as you use the app, that's probably what you have,\n" +
+                                "if the number remains constant or goes down, then you're probably ok :) ) Thread:${threadName()}"
+                    )
+                }
+            }
+        }
+    }
+
+    /**
+     * Remove the observer from the list of registered observers, you should do this
+     * from android lifecycle methods like onStop() to prevent memory leaks.
+     *
+     * @param observer the observer that is no longer interested in receiving updates
+     * from the model when its data changes
+     */
+    override fun removeObserver(observer: Observer) {
+        launchCustom(mainDispatcherImmediate, notificationMode) {
+            addRemoveMutex.withLock {
+
+                val beforeSize = observerList.size
+                observerList.remove(observer)
+
+                Fore.getLogger(logger).i(inferredTag, "Observer removed from [$inferredTag]: $observer")
+
+                if (observerList.size == beforeSize) {
+                    Fore.getLogger(logger).w(inferredTag,
+                        "You have tried to remove an observer from [$inferredTag] that wasn't added in the first place. This is almost certainly an error and\n" +
+                                "will cause a memory leak. Usually an observer is added and removed in line with _mirrored_ lifecycle methods\n" +
+                                "(for example onStart()/onStop() or onAttachedToWindow()/onDetachedFromWindow()) thread:${threadName()}"
+                    )
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Extending classes should call this method, whenever the model data is
+     * updated. somethingChanged() will be called on each registered observer.
+     *
+     * If the Observable has been constructed with the SYNCHRONOUS method parameter
+     * then the notifications will be called on the same thread that this method is
+     * called on.
+     *
+     * If the Observable has been constructed with the ASYNCHRONOUS method parameter
+     * then the notifications will be posted to the UI thread if necessary (if notifyObservers
+     * is already on the UI thread then the observers will be called immediately with no posting done)
+     *
+     * NB: If there are any Android Adapters depending on your model for their list data, you will
+     * want to make sure that you only update this list based data on the UI thread (i.e. for use
+     * with adapters, you should only call notifyObservers() on the UI thread). This remains true
+     * regardless of whether this Observable has been created with ASYNCHRONOUS or SYNCHRONOUS
+     * WorkMode.
+     * Synchronizing any list updates is not enough, Android will call Adapter.count() and
+     * Adapter.get() on the UI thread and you cannot change the adapter's size between these calls.
+     */
+    override fun notifyObservers() {
+
+        launchCustom(mainDispatcherImmediate, Fore.getWorkMode(notificationMode)) {
+            addRemoveMutex.withLock {
+                for (observer in observerList) {
+                    Fore.getLogger(logger).d(inferredTag, "notifying [$inferredTag] changes to: $observer")
+                    doNotification(observer)
+                }
+            }
+        }
+    }
+
+    override fun hasObservers(): Boolean {
+        return observerList.size > 0
+    }
+
+    private fun doNotification(observer: Observer) {
+        try {
+            observer.somethingChanged()
+        } catch (e: Exception) {
+
+            val errorMessage = "\nOne of the observers of [$inferredTag] has thrown an exception " +
+                    "during it's somethingChanged() callback\n" +
+                    "The currentThread id is: ${threadName()}" +
+                    "It's quite possible you just have a crash somewhere\n" +
+                    "in your UI code which has bubbled its way up to here. See stack trace for " +
+                    "further info, Error Message: "
+
+            Fore.getLogger(logger).e(inferredTag, errorMessage + e.message)
+            throw e
+        }
+    }
+}
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/observer/Observer.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/Observer.kt
similarity index 100%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/core/observer/Observer.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/Observer.kt
diff --git a/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ThreadId.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ThreadId.kt
new file mode 100644
index 00000000..0538f1b3
--- /dev/null
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/observer/ThreadId.kt
@@ -0,0 +1,11 @@
+package co.early.fore.core.observer
+
+/**
+ * So that we can log the thread id for diagnostics
+ *
+ * JVM uses Thread.currentThread().name, iOS uses NSThread.currentThread().name
+ */
+expect fun threadName(): String
+
+
+
diff --git a/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.kt
new file mode 100644
index 00000000..2c5cfa5c
--- /dev/null
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.kt
@@ -0,0 +1,26 @@
+package co.early.fore.core.time
+
+/**
+ * This enables us to set a mock the system time for testing.
+ */
+interface SystemTimeWrapper {
+    /**
+     * Android / JVM uses System.currentTimeMillis(),
+     * Linux uses TimeSource.Monotonic.markNow()
+     * iOS uses NSDate().timeIntervalSince1970,
+     * Windows uses GetSystemTimeAsFileTime() [NB:but referenced to the Unix epoch i.e. NOT 1/1/1601]
+     */
+    fun currentTimeMillis(): Long
+
+    /**
+     * intended for measuring time _differences_
+     *
+     * Android / JVM uses System.nanoTime(),
+     * Linux uses TimeSource.Monotonic.markNow()
+     * iOS uses clock_gettime(CLOCK_UPTIME_RAW)
+     * Windows uses QueryPerformance
+     */
+    fun nanoTime(): Long
+}
+
+expect fun getSystemTimeWrapper(): SystemTimeWrapper
\ No newline at end of file
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/type/Either.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/type/Either.kt
similarity index 80%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/type/Either.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/type/Either.kt
index 8b5879d0..47f7196b 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/type/Either.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/type/Either.kt
@@ -1,14 +1,14 @@
-package co.early.fore.kt.core.type
+package co.early.fore.core.type
 
 sealed class Either<out F, out S> {
 
-    data class Fail<out F> internal constructor(val value: F) : Either<F, Nothing>() {
+    data class Fail<out F>(val value: F) : Either<F, Nothing>() {
         companion object {
             operator fun <F> invoke(f: F): Either<F, Nothing> = Fail(f)
         }
     }
 
-    data class Success<out S> internal constructor(val value: S) : Either<Nothing, S>() {
+    data class Success<out S>(val value: S) : Either<Nothing, S>() {
         companion object {
             operator fun <S> invoke(s: S): Either<Nothing, S> = Success(s)
         }
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/ui/SyncableView.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/SyncableView.kt
similarity index 97%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/core/ui/SyncableView.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/SyncableView.kt
index 4b0350de..0902812f 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/core/ui/SyncableView.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/SyncableView.kt
@@ -2,4 +2,4 @@ package co.early.fore.core.ui
 
 interface SyncableView {
     fun syncView()
-}
\ No newline at end of file
+}
diff --git a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ViewModelObservability.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/ViewModelObservability.kt
similarity index 66%
rename from fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ViewModelObservability.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/ViewModelObservability.kt
index edc43bec..0a36c978 100644
--- a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ViewModelObservability.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/ViewModelObservability.kt
@@ -1,7 +1,6 @@
-package co.early.fore.kt.core.ui
+package co.early.fore.core.ui
 
 import co.early.fore.core.observer.Observable
-import co.early.fore.core.ui.SyncableView
 
 interface ViewModelObservability : Observable {
     fun initSyncableView(viewModel: SyncableView)
diff --git a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ViewModelObservabilityImp.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/ViewModelObservabilityImp.kt
similarity index 76%
rename from fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ViewModelObservabilityImp.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/ViewModelObservabilityImp.kt
index 326e2b83..e106984c 100644
--- a/fore-kt/fore-kt-android-core/src/main/java/co/early/fore/kt/core/ui/ViewModelObservabilityImp.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/ViewModelObservabilityImp.kt
@@ -1,16 +1,15 @@
-package co.early.fore.kt.core.ui
+package co.early.fore.core.ui
 
 import co.early.fore.core.observer.Observable
 import co.early.fore.core.observer.ObservableGroup
 import co.early.fore.core.observer.Observer
-import co.early.fore.core.ui.SyncableView
-import co.early.fore.kt.core.observer.ObservableGroupImp
-import co.early.fore.kt.core.observer.ObservableImp
+import co.early.fore.core.observer.ObservableGroupImp
+import co.early.fore.core.observer.ObservableImp
 
 /**
  * Convenience class to use with ViewModels which will enable a viewModel to be:
  *
- * 1) Observable (by a fragment or activity)
+ * 1) Observable (e.g. by a fragment or activity)
  * 2) Observe other Observable models (usually from the domain layer).
  *
  * When used with #ForeLifecycleObserver, both observers (that's the one that connects the
@@ -37,20 +36,20 @@ class ViewModelObservabilityImp(
     }
 
     /**
-     * @param uiToVmObserver this will typically be a fragment or activity observer which is observing the view model
+     * @param observer (uiToVmObserver) this will typically be a fragment or activity observer which is observing the view model
      */
-    override fun addObserver(uiToVmObserver: Observer) {
+    override fun addObserver(observer: Observer) {
         verifyInitialization()
-        uiToVmObservable.addObserver(uiToVmObserver)
+        uiToVmObservable.addObserver(observer)
         vmToDomainObservable.addObserver(vmToDomainObserver)
     }
 
     /**
-     * @param uiToVmObserver this will typically be a fragment or activity observer which is observing the view model
+     * @param observer (uiToVmObserver) this will typically be a fragment or activity observer which is observing the view model
      */
-    override fun removeObserver(uiToVmObserver: Observer) {
+    override fun removeObserver(observer: Observer) {
         verifyInitialization()
-        uiToVmObservable.removeObserver(uiToVmObserver)
+        uiToVmObservable.removeObserver(observer)
         vmToDomainObservable.removeObserver(vmToDomainObserver)
     }
 
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/ResetRule.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/ResetRule.kt
similarity index 94%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/ResetRule.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/ResetRule.kt
index a247b140..7634d62e 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/ResetRule.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/ResetRule.kt
@@ -1,4 +1,4 @@
-package co.early.fore.kt.core.ui.trigger
+package co.early.fore.core.ui.trigger
 
 enum class ResetRule {
     /*
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/StateChange.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/StateChange.kt
similarity index 83%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/StateChange.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/StateChange.kt
index 019ac66b..8a007301 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/StateChange.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/StateChange.kt
@@ -1,4 +1,4 @@
-package co.early.fore.kt.core.ui.trigger
+package co.early.fore.core.ui.trigger
 
 data class StateChange<out T>(
     val pre: T?,
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/TriggerOnChange.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/TriggerOnChange.kt
similarity index 98%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/TriggerOnChange.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/TriggerOnChange.kt
index 5e345228..6ebb62f4 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/TriggerOnChange.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/TriggerOnChange.kt
@@ -1,4 +1,4 @@
-package co.early.fore.kt.core.ui.trigger
+package co.early.fore.core.ui.trigger
 
 import co.early.fore.core.ui.SyncableView
 
diff --git a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/TriggerWhen.kt b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/TriggerWhen.kt
similarity index 98%
rename from fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/TriggerWhen.kt
rename to lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/TriggerWhen.kt
index 2271e59b..8f744a02 100644
--- a/fore-kt/fore-kt-core/src/main/java/co/early/fore/kt/core/ui/trigger/TriggerWhen.kt
+++ b/lib/fore-core/src/commonMain/kotlin/co/early/fore/core/ui/trigger/TriggerWhen.kt
@@ -1,4 +1,4 @@
-package co.early.fore.kt.core.ui.trigger
+package co.early.fore.core.ui.trigger
 
 /**
  *
diff --git a/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/observer/ObservableGroupImpTest.kt b/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/observer/ObservableGroupImpTest.kt
new file mode 100644
index 00000000..a8008373
--- /dev/null
+++ b/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/observer/ObservableGroupImpTest.kt
@@ -0,0 +1,177 @@
+package co.early.fore.core.observer
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+
+class ObservableGroupImpTest {
+
+    private val observer1 = ObserverNotificationCollector()
+    private val observer2 = ObserverNotificationCollector()
+
+    private val observable1 = ObservableImp()
+    private val observable2 = ObservableImp()
+    private val observable3 = ObservableImp()
+
+    @BeforeTest
+    fun setup() {
+        Fore.setDelegate(TestDelegateDefault())
+    }
+
+    @Test
+    fun `when created with no observables - throws error`() {
+
+        // arrange, act, assert
+        var thrown = false
+        try {
+            ObservableGroupImp()
+        } catch (iae: IllegalArgumentException) {
+            thrown = true
+        }
+
+        assertTrue(
+            thrown, "trying to create an observable" +
+                    "group with no observables, should have thrown an exception"
+        )
+    }
+
+    @Test
+    fun `when created with 1 observable - adding an observer effects that observable`() {
+
+        // arrange
+        val observableGroupImp = ObservableGroupImp(
+            observable1
+        )
+
+        // act
+        observableGroupImp.addObserver(observer1)
+
+        //assert
+        assertTrue(observable1.hasObservers())
+    }
+
+    @Test
+    fun `when created with 1 observable - adding and removing an observer effects that observable`() {
+
+        // arrange
+        val observableGroupImp = ObservableGroupImp(
+            observable1
+        )
+
+        // act
+        observableGroupImp.addObserver(observer1)
+        observableGroupImp.removeObserver(observer1)
+
+        //assert
+        assertFalse(observable1.hasObservers())
+    }
+
+    @Test
+    fun `when created with multiple observables - adding an observer effects those observables`() {
+
+        // arrange
+        val observableGroupImp = ObservableGroupImp(
+            observable1,
+            observable2,
+            observable3,
+        )
+
+        // act
+        observableGroupImp.addObserver(observer1)
+
+        //assert
+        assertTrue(observable1.hasObservers())
+        assertTrue(observable2.hasObservers())
+        assertTrue(observable3.hasObservers())
+    }
+
+    @Test
+    fun `when created with multiple observables - adding and removing an observer effects those observables`() {
+
+        // arrange
+        val observableGroupImp = ObservableGroupImp(
+            observable1,
+            observable2,
+            observable3,
+        )
+
+        // act
+        observableGroupImp.addObserver(observer1)
+        observableGroupImp.removeObserver(observer1)
+
+        //assert
+        assertFalse(observable1.hasObservers())
+        assertFalse(observable2.hasObservers())
+        assertFalse(observable3.hasObservers())
+    }
+
+    @Test
+    fun `when created with multiple observables - adding two observers then notifying - calls both observers`() {
+
+        // arrange
+        val observableGroupImp = ObservableGroupImp(
+            observable1,
+            observable2,
+            observable3,
+        )
+
+        // act
+        observableGroupImp.addObserver(observer1)
+        observableGroupImp.addObserver(observer2)
+        observable1.notifyObservers()
+        observable2.notifyObservers()
+        observable3.notifyObservers()
+
+        //assert
+        assertEquals(3, observer1.notifications())
+        assertEquals(3, observer2.notifications())
+    }
+
+    @Test
+    fun `when created with multiple observables - adding two observers then removing one - only first is notified`() {
+
+        // arrange
+        val observableGroupImp = ObservableGroupImp(
+            observable1,
+            observable2,
+            observable3,
+        )
+
+        // act
+        observableGroupImp.addObserver(observer1)
+        observableGroupImp.addObserver(observer2)
+        observableGroupImp.removeObserver(observer2)
+        observable1.notifyObservers()
+        observable2.notifyObservers()
+        observable3.notifyObservers()
+
+        //assert
+        assertEquals(3, observer1.notifications())
+        assertEquals(0, observer2.notifications())
+    }
+
+    @Test
+    fun `when created with multiple observables - adding two observers then notifying on second observable - calls both observers`() {
+
+        // arrange
+        val observableGroupImp = ObservableGroupImp(
+            observable1,
+            observable2,
+            observable3,
+        )
+
+        // act
+        observableGroupImp.addObserver(observer1)
+        observableGroupImp.addObserver(observer2)
+        observable2.notifyObservers()
+
+        //assert
+        assertEquals(1, observer1.notifications())
+        assertEquals(1, observer2.notifications())
+    }
+}
diff --git a/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/observer/ObservableImpTest.kt b/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/observer/ObservableImpTest.kt
new file mode 100644
index 00000000..14897fe5
--- /dev/null
+++ b/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/observer/ObservableImpTest.kt
@@ -0,0 +1,199 @@
+package co.early.fore.core.observer
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import co.early.fore.core.logging.Logger
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class ObservableImpTest {
+
+    private val observer1 = ObserverNotificationCollector()
+    private val observer2 = ObserverNotificationCollector()
+    private val observer3 = ObserverNotificationCollector()
+    private val observer4 = ObserverNotificationCollector()
+    private val observer5 = ObserverNotificationCollector()
+
+    private val warningCollector = WarningCollector()
+
+    @BeforeTest
+    fun setup() {
+        Fore.setDelegate(TestDelegateDefault())
+    }
+
+    @Test
+    fun `when created - has no observers`() {
+
+        // arrange, act
+        val observableImp = ObservableImp()
+
+        // assert
+        assertEquals(false, observableImp.hasObservers())
+    }
+
+    @Test
+    fun `when observers added - has observers`() {
+
+        // arrange
+        val observableImp = ObservableImp()
+
+        // act
+        observableImp.addObserver(observer1)
+
+        // assert
+        assertTrue(observableImp.hasObservers())
+    }
+
+    @Test
+    fun `when observers added then removed - has no observers`() {
+
+        // arrange
+        val observableImp = ObservableImp()
+
+        // act
+        observableImp.addObserver(observer1)
+        observableImp.removeObserver(observer1)
+
+        // assert
+        assertFalse(observableImp.hasObservers())
+    }
+
+    @Test
+    fun `when adding the same observer twice - warning is logged`() {
+
+        // arrange
+        val observableImp = ObservableImp(logger = warningCollector)
+
+        // act
+        observableImp.addObserver(observer1)
+        observableImp.addObserver(observer1)
+
+        // assert
+        assertEquals(1, warningCollector.getLogs().size)
+    }
+
+    @Test
+    fun `when removing an observer that wasn't added - warning is logged`() {
+
+        // arrange
+        val observableImp = ObservableImp(logger = warningCollector)
+
+        // act
+        observableImp.addObserver(observer1)
+        observableImp.removeObserver(observer2)
+
+        // assert
+        assertEquals(1, warningCollector.getLogs().size)
+    }
+
+
+    @Test
+    fun `when adding more than 4 observers - warning is logged`() {
+
+        // arrange
+        val observableImp = ObservableImp(logger = warningCollector)
+
+        // act
+        observableImp.addObserver(observer1)
+        observableImp.addObserver(observer2)
+        observableImp.addObserver(observer3)
+        observableImp.addObserver(observer4)
+        assertTrue(warningCollector.getLogs().isEmpty())
+        observableImp.addObserver(observer5)
+
+        // assert
+        assertEquals(1, warningCollector.getLogs().size)
+    }
+
+    @Test
+    fun `when notifying - all added observers are called`() {
+
+        // arrange
+        val observableImp = ObservableImp()
+        observableImp.addObserver(observer1)
+        observableImp.addObserver(observer2)
+        observableImp.addObserver(observer3)
+        observableImp.removeObserver(observer2)
+
+        // act
+        observableImp.notifyObservers()
+
+        // assert
+        assertEquals(1, observer1.notifications())
+        assertEquals(0, observer2.notifications())
+        assertEquals(1, observer3.notifications())
+    }
+}
+
+class WarningCollector : Logger {
+
+    private val warnings: MutableList<String> = mutableListOf()
+
+    fun getLogs(): List<String> {
+        return warnings.toList()
+    }
+
+    override fun w(message: String) {
+        warnings.add(message)
+    }
+
+    override fun w(tag: String, message: String) {
+        warnings.add(message)
+    }
+
+    override fun w(message: String, throwable: Throwable) {
+        warnings.add(message)
+    }
+
+    override fun w(tag: String, message: String, throwable: Throwable) {
+        warnings.add(message)
+    }
+
+    override fun e(message: String) {}
+
+    override fun e(tag: String, message: String) {}
+
+    override fun e(message: String, throwable: Throwable) {}
+
+    override fun e(tag: String, message: String, throwable: Throwable) {}
+
+    override fun i(message: String) {}
+
+    override fun i(tag: String, message: String) {}
+
+    override fun i(message: String, throwable: Throwable) {}
+
+    override fun i(tag: String, message: String, throwable: Throwable) {}
+
+    override fun d(message: String) {}
+
+    override fun d(tag: String, message: String) {}
+
+    override fun d(message: String, throwable: Throwable) {}
+
+    override fun d(tag: String, message: String, throwable: Throwable) {}
+
+    override fun v(message: String) {}
+
+    override fun v(tag: String, message: String) {}
+
+    override fun v(message: String, throwable: Throwable) {}
+
+    override fun v(tag: String, message: String, throwable: Throwable) {}
+}
+
+class ObserverNotificationCollector : Observer {
+
+    private var notifications = 0
+
+    fun notifications(): Int {
+        return notifications
+    }
+
+    override fun somethingChanged() {
+        notifications++
+    }
+}
diff --git a/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/ui/trigger/TriggerOnChangeTest.kt b/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/ui/trigger/TriggerOnChangeTest.kt
new file mode 100644
index 00000000..18aa8ab1
--- /dev/null
+++ b/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/ui/trigger/TriggerOnChangeTest.kt
@@ -0,0 +1,193 @@
+package co.early.fore.core.ui.trigger
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class TriggerOnChangeTest {
+
+    private val stateReturns1 = Returns(1)
+    private val stateReturns3 = Returns(3)
+    private val stateReturns3_6 = Returns(3, 6)
+    private val stateReturns3_5_6_6_3 = Returns(3, 5, 6, 6, 3)
+    private val stateReturnsNull = Returns<Int?>(null)
+
+    @Test
+    fun `when initial state is non-null - triggers on first check`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerOnChange(stateReturns1()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.check()
+
+        // assert
+        assertEquals(1, calledTimes)
+    }
+
+    @Test
+    fun `when initial state is null - does not trigger on first check`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerOnChange(stateReturnsNull()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.check()
+
+        // assert
+        assertEquals(0, calledTimes)
+    }
+
+    @Test
+    fun `when initial state changes - triggers with new state value on check`() {
+
+        // arrange
+        val answers: MutableList<StateChange<Int>> = mutableListOf()
+        val trigger = TriggerOnChange(stateReturns3()) {
+            answers.add(it)
+        }
+
+        // act
+        trigger.check()
+
+        // assert
+        assertEquals(StateChange(null, 3), answers[0])
+    }
+
+    @Test
+    fun `when state changes multiple times - check triggers only on change`() {
+
+        // arrange
+        val answers: MutableList<StateChange<Int>> = mutableListOf()
+        val trigger = TriggerOnChange(stateReturns3_5_6_6_3()) {
+            answers.add(it)
+        }
+
+        // act
+        trigger.check()
+        trigger.check()
+        trigger.check()
+        trigger.check()
+        trigger.check()
+
+        // assert
+        assertEquals(StateChange(null, 3), answers[0])
+        assertEquals(StateChange(3, 5), answers[1])
+        assertEquals(StateChange(5, 6), answers[2])
+        assertEquals(StateChange(6, 3), answers[3])
+    }
+
+    @Test
+    fun `when initial state is non-null - does not trigger on first checkLazy`() {
+
+        // arrange
+        val answers: MutableList<StateChange<Int>> = mutableListOf()
+        val trigger = TriggerOnChange(stateReturns1()) {
+            answers.add(it)
+        }
+
+        // act
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, answers.size)
+    }
+
+    @Test
+    fun `when initial state stays null - does not trigger on second checkLazy`() {
+
+        // arrange
+        val answers: MutableList<StateChange<Int?>> = mutableListOf()
+        val trigger = TriggerOnChange(stateReturnsNull()) {
+            answers.add(it)
+        }
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, answers.size)
+    }
+
+    @Test
+    fun `when initial state is non-null - does not trigger on second checkLazy`() {
+
+        // arrange
+        val answers: MutableList<StateChange<Int>> = mutableListOf()
+        val trigger = TriggerOnChange(stateReturns3()) {
+            answers.add(it)
+        }
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, answers.size)
+    }
+
+    @Test
+    fun `when state changes multiple times - checkLazy triggers only on change`() {
+
+        // arrange
+        val answers: MutableList<StateChange<Int>> = mutableListOf()
+        val trigger = TriggerOnChange(stateReturns3_5_6_6_3()) {
+            answers.add(it)
+        }
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(3, answers.size)
+        assertEquals(StateChange(3, 5), answers[0])
+        assertEquals(StateChange(5, 6), answers[1])
+        assertEquals(StateChange(6, 3), answers[2])
+    }
+
+    @Test
+    fun `when state changes - second check does trigger`() {
+
+        // arrange
+        val answers: MutableList<StateChange<Int>> = mutableListOf()
+        val trigger = TriggerOnChange(stateReturns3_6()) {
+            answers.add(it)
+        }
+
+        // act
+        trigger.check()
+        trigger.check()
+
+        // assert
+        assertEquals(2, answers.size)
+        assertEquals(StateChange(null, 3), answers[0])
+        assertEquals(StateChange(3, 6), answers[1])
+    }
+
+    @Test
+    fun `when state does not change - second checkLazy does not trigger`() {
+
+        // arrange
+        val answers: MutableList<StateChange<Int>> = mutableListOf()
+        val trigger = TriggerOnChange(stateReturns3()) {
+            answers.add(it)
+        }
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, answers.size)
+    }
+}
diff --git a/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/ui/trigger/TriggerWhenTest.kt b/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/ui/trigger/TriggerWhenTest.kt
new file mode 100644
index 00000000..c4776049
--- /dev/null
+++ b/lib/fore-core/src/commonTest/kotlin/co/early/fore/core/ui/trigger/TriggerWhenTest.kt
@@ -0,0 +1,357 @@
+package co.early.fore.core.ui.trigger
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class TriggerWhenTest {
+
+    private val triggeredWhenReturnsTrue = Returns(true)
+    private val triggeredWhenReturnsFalse = Returns(false)
+    private val triggeredWhenReturnsTrueFalse = Returns(true, false)
+    private val triggeredWhenReturnsFalseTrue = Returns(false, true)
+    private val triggeredWhenReturnsTrueFalseTrue = Returns(true, false, true)
+
+    @Test
+    fun `default Trigger uses resetRule ONLY_AFTER_REVERSION`() {
+
+        // arrange
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) { }
+
+        // act
+
+        // assert
+        assertEquals(ResetRule.ONLY_AFTER_REVERSION, trigger.getResetRule())
+    }
+
+    @Test
+    fun `on first successful triggeredWhen - check DOES fire the trigger`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.check()
+
+        // assert
+        assertEquals(1, calledTimes)
+    }
+
+    @Test
+    fun `on first failed triggeredWhen - check DOES NOT fire the trigger`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsFalse()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.check()
+
+        // assert
+        assertEquals(0, calledTimes)
+    }
+
+    @Test
+    fun `on first successful triggeredWhen - checkLazy DOES NOT fire the trigger`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, calledTimes)
+    }
+
+    @Test
+    fun `on second successful triggeredWhen in a row - checkLazy DOES NOT fire the trigger`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, calledTimes)
+    }
+
+    @Test
+    fun `on TRUE then FALSE triggeredWhen - checkLazy DOES NOT fire the trigger`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrueFalse()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, calledTimes)
+    }
+
+    @Test
+    fun `on FALSE then TRUE triggeredWhen - checkLazy DOES fire the trigger`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsFalseTrue()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(1, calledTimes)
+    }
+
+    @Test
+    fun `with ONLY_AFTER_REVERSION resetRule and TRUE TRUE TRUE triggeredWhen - check fires the trigger only once`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.check()
+        trigger.check()
+        trigger.check()
+
+        // assert
+        assertEquals(1, calledTimes)
+    }
+
+    @Test
+    fun `with ONLY_AFTER_REVERSION resetRule and TRUE TRUE TRUE triggeredWhen - checkLazy does NOT fire the trigger`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, calledTimes)
+    }
+
+    @Test
+    fun `with ONLY_AFTER_REVERSION resetRule and TRUE FALSE TRUE triggeredWhen - check fires the trigger twice`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrueFalseTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.ONLY_AFTER_REVERSION)
+
+        // act
+        trigger.check()
+        trigger.check()
+        trigger.check()
+
+        // assert
+        assertEquals(2, calledTimes)
+    }
+
+    @Test
+    fun `with ONLY_AFTER_REVERSION resetRule and TRUE FALSE TRUE triggeredWhen - checkLazy fires the trigger only once`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrueFalseTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.ONLY_AFTER_REVERSION)
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(1, calledTimes)
+    }
+
+    @Test
+    fun `with IMMEDIATELY resetRule and TRUE TRUE TRUE triggeredWhen - check fires the trigger each time`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.IMMEDIATELY)
+
+        // act
+        trigger.check()
+        trigger.check()
+        trigger.check()
+
+        // assert
+        assertEquals(3, calledTimes)
+    }
+
+    @Test
+    fun `with IMMEDIATELY resetRule and TRUE TRUE TRUE triggeredWhen - check fires the trigger each time except the first`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.IMMEDIATELY)
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(2, calledTimes)
+    }
+
+    @Test
+    fun `with IMMEDIATELY resetRule and TRUE FALSE TRUE triggeredWhen - check fires the trigger twice`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrueFalseTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.IMMEDIATELY)
+
+        // act
+        trigger.check()
+        trigger.check()
+        trigger.check()
+
+        // assert
+        assertEquals(2, calledTimes)
+    }
+
+    @Test
+    fun `with IMMEDIATELY resetRule and TRUE FALSE TRUE triggeredWhen - check fires the trigger only once`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrueFalseTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.IMMEDIATELY)
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(1, calledTimes)
+    }
+
+    @Test
+    fun `with NEVER resetRule and TRUE TRUE TRUE triggeredWhen - check fires the trigger only once`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.NEVER)
+
+        // act
+        trigger.check()
+        trigger.check()
+        trigger.check()
+
+        // assert
+        assertEquals(1, calledTimes)
+    }
+
+    @Test
+    fun `with NEVER resetRule and TRUE TRUE TRUE triggeredWhen - checkLazy does NOT fire the trigger`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.NEVER)
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, calledTimes)
+    }
+
+    @Test
+    fun `with NEVER resetRule and TRUE FALSE TRUE triggeredWhen - check fires the trigger only once`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrueFalseTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.NEVER)
+
+        // act
+        trigger.check()
+        trigger.check()
+        trigger.check()
+
+        // assert
+        assertEquals(1, calledTimes)
+    }
+
+    @Test
+    fun `with NEVER resetRule and TRUE FALSE TRUE triggeredWhen - checkLazy does NOT fire`() {
+
+        // arrange
+        var calledTimes = 0
+        val trigger = TriggerWhen(triggeredWhenReturnsTrueFalseTrue()) {
+            calledTimes++
+        }.resetRule(ResetRule.NEVER)
+
+        // act
+        trigger.checkLazy()
+        trigger.checkLazy()
+        trigger.checkLazy()
+
+        // assert
+        assertEquals(0, calledTimes)
+    }
+}
+
+class Returns<T>(
+    vararg answers: T
+) {
+
+    private val answers: List<T> = listOf(*answers)
+    private var callCount = 0
+
+    operator fun invoke(): () -> T = {
+        val returnValue = when {
+            callCount < answers.size -> answers[callCount]
+            else -> answers[answers.size - 1]
+        }
+        callCount++
+        returnValue
+    }
+}
diff --git a/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/logging/TagInferer.ios.kt b/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/logging/TagInferer.ios.kt
new file mode 100644
index 00000000..5ce2c386
--- /dev/null
+++ b/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/logging/TagInferer.ios.kt
@@ -0,0 +1,29 @@
+package co.early.fore.core.logging
+
+import platform.Foundation.NSThread
+
+actual fun getTagInferer(): TagInferer = TagInfererIos()
+
+class TagInfererIos : TagInferer {
+
+    override fun inferTag(): String {
+
+        val stackSymbols = NSThread.callStackSymbols
+
+        return if (stackSymbols.size > 2) {
+            extractClassName(stackSymbols[2].toString()).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && stackSymbols.size > 3) {
+                    extractClassName(stackSymbols[3].toString())
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(symbol: String): String {
+        // Thread.callStackSymbols gives symbols with module name, memory address, and function signature
+        // Example symbol: 0   MyApp                         0x00000001022ecac8 main + 32
+        return symbol.substringAfter(" ").substringBefore(" ")
+    }
+}
diff --git a/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/observer/ThreadId.ios.kt b/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/observer/ThreadId.ios.kt
new file mode 100644
index 00000000..dba05d57
--- /dev/null
+++ b/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/observer/ThreadId.ios.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.Foundation.NSThread
+
+actual fun threadName(): String {
+    return NSThread.currentThread().name ?: "(no-thread-name)"
+}
diff --git a/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.ios.kt b/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.ios.kt
new file mode 100644
index 00000000..3ee7d463
--- /dev/null
+++ b/lib/fore-core/src/iosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.ios.kt
@@ -0,0 +1,29 @@
+package co.early.fore.core.time
+
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSDate
+import platform.Foundation.timeIntervalSince1970
+
+import kotlinx.cinterop.alloc
+import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.ptr
+import platform.posix.clock_gettime
+import platform.posix.timespec
+import platform.posix.CLOCK_UPTIME_RAW
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperIos()
+
+class SystemTimeWrapperIos : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return NSDate().timeIntervalSince1970.toLong() * 1000
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun nanoTime(): Long {
+        memScoped {
+            val timeSpec = alloc<timespec>()
+            clock_gettime(CLOCK_UPTIME_RAW.toUInt(), timeSpec.ptr)
+            return (timeSpec.tv_sec * 1_000_000_000) + timeSpec.tv_nsec
+        }
+    }
+}
diff --git a/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/logging/JsTagInferer.kt b/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/logging/JsTagInferer.kt
new file mode 100644
index 00000000..4bbc1261
--- /dev/null
+++ b/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/logging/JsTagInferer.kt
@@ -0,0 +1,30 @@
+package co.early.fore.core.logging
+
+actual fun getTagInferer(): TagInferer = JsTagInferer()
+
+class JsTagInferer : TagInferer {
+
+    override fun inferTag(): String {
+
+        val stack = js("new Error().stack") as String?
+
+        return if (stack != null) {
+            val traceLines = stack.split("\n")
+            if (traceLines.size > 2) {
+                extractFunctionName(traceLines[2])
+            } else {
+                "missing stacktrace"
+            }
+        } else {
+            "missing stacktrace"
+        }
+    }
+
+    private fun extractFunctionName(traceLine: String): String {
+        // Stack trace line typically looks like: at functionName (file.js:line:column)
+        return traceLine.substringAfter("at ").substringBefore("(").trim().ifEmpty {
+            // If there's no function name, fallback to the entire line or a default value
+            "unknownFunction"
+        }
+    }
+}
diff --git a/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/observer/ThreadId.kt b/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/observer/ThreadId.kt
new file mode 100644
index 00000000..b18da2a6
--- /dev/null
+++ b/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/observer/ThreadId.kt
@@ -0,0 +1,9 @@
+package co.early.fore.core.observer
+
+actual fun threadName(): String {
+    return if (js("typeof window !== 'undefined'") as Boolean) {
+        "main thread (browser)"
+    } else {
+        "main thread (node..js)"
+    }
+}
diff --git a/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/time/JsSystemTimeWrapper.kt b/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/time/JsSystemTimeWrapper.kt
new file mode 100644
index 00000000..bcba8110
--- /dev/null
+++ b/lib/fore-core/src/jsMain/kotlin/co/early/fore/core/time/JsSystemTimeWrapper.kt
@@ -0,0 +1,15 @@
+package co.early.fore.core.time
+
+import kotlinx.browser.window
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = JsSystemTimeWrapper()
+
+class JsSystemTimeWrapper : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return kotlin.js.Date.now().toLong()
+    }
+
+    override fun nanoTime(): Long {
+        return (window.performance.now() * 1_000_000).toLong()
+    }
+}
diff --git a/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/logging/Logger.jvm.kt b/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/logging/Logger.jvm.kt
new file mode 100644
index 00000000..0fa6608f
--- /dev/null
+++ b/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/logging/Logger.jvm.kt
@@ -0,0 +1,61 @@
+package co.early.fore.core.logging
+
+internal actual fun verbose(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(V) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun debug(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(D) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun info(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(I) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun warning(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(W) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun error(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(E) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
diff --git a/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/logging/TagInferer.jvm.kt b/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/logging/TagInferer.jvm.kt
new file mode 100644
index 00000000..a32e6e33
--- /dev/null
+++ b/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/logging/TagInferer.jvm.kt
@@ -0,0 +1,31 @@
+package co.early.fore.core.logging
+
+actual fun getTagInferer(): TagInferer = TagInfererJvm()
+
+class TagInfererJvm : TagInferer {
+
+    override fun inferTag(): String {
+        val trace = Throwable().stackTrace
+        return if (trace.size > 2) {
+            extractClassName(trace[2]).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && trace.size > 3) {
+                    extractClassName(trace[3])
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(element: StackTraceElement): String {
+        val simpleClassName = element.className.substringAfterLast('.')
+        val anonymousClass = ANONYMOUS_CLASS_SUFFIX.find(simpleClassName)
+        return anonymousClass?.let {
+            simpleClassName.replace(it.value, "") // remove anonymous class suffix
+        } ?: simpleClassName
+    }
+
+    companion object {
+        private val ANONYMOUS_CLASS_SUFFIX = Regex("(\\$\\d+)+$")
+    }
+}
diff --git a/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/observer/ThreadId.jvm.kt b/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/observer/ThreadId.jvm.kt
new file mode 100644
index 00000000..dcab73ab
--- /dev/null
+++ b/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/observer/ThreadId.jvm.kt
@@ -0,0 +1,5 @@
+package co.early.fore.core.observer
+
+actual fun threadName(): String {
+    return Thread.currentThread().name
+}
diff --git a/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.jvm.kt b/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.jvm.kt
new file mode 100644
index 00000000..1a9b28ad
--- /dev/null
+++ b/lib/fore-core/src/jvmMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.jvm.kt
@@ -0,0 +1,13 @@
+package co.early.fore.core.time
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperJvm()
+
+class SystemTimeWrapperJvm : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return System.currentTimeMillis()
+    }
+
+    override fun nanoTime(): Long {
+        return System.nanoTime()
+    }
+}
diff --git a/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/logging/Logger.linux.kt b/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/logging/Logger.linux.kt
new file mode 100644
index 00000000..0fa6608f
--- /dev/null
+++ b/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/logging/Logger.linux.kt
@@ -0,0 +1,61 @@
+package co.early.fore.core.logging
+
+internal actual fun verbose(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(V) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun debug(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(D) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun info(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(I) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun warning(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(W) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun error(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(E) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
diff --git a/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/logging/TagInferer.linux.kt b/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/logging/TagInferer.linux.kt
new file mode 100644
index 00000000..c2ac58d2
--- /dev/null
+++ b/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/logging/TagInferer.linux.kt
@@ -0,0 +1,10 @@
+package co.early.fore.core.logging
+
+actual fun getTagInferer(): TagInferer = TagInfererLinux()
+
+class TagInfererLinux : TagInferer {
+
+    override fun inferTag(): String {
+        return "Linux (Unknown Tag)"
+    }
+}
diff --git a/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/observer/ThreadId.linux.kt b/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/observer/ThreadId.linux.kt
new file mode 100644
index 00000000..76d2e5ff
--- /dev/null
+++ b/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/observer/ThreadId.linux.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.posix.pthread_self
+
+actual fun threadName(): String {
+    return pthread_self().toString()
+}
diff --git a/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.linux.kt b/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.linux.kt
new file mode 100644
index 00000000..beed84ef
--- /dev/null
+++ b/lib/fore-core/src/linuxMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.linux.kt
@@ -0,0 +1,15 @@
+package co.early.fore.core.time
+
+import kotlin.time.TimeSource
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperLinux()
+
+class SystemTimeWrapperLinux : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return TimeSource.Monotonic.markNow().elapsedNow().inWholeMilliseconds
+    }
+
+    override fun nanoTime(): Long {
+        return TimeSource.Monotonic.markNow().elapsedNow().inWholeNanoseconds
+    }
+}
\ No newline at end of file
diff --git a/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/logging/TagInferer.macos.kt b/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/logging/TagInferer.macos.kt
new file mode 100644
index 00000000..1316d93b
--- /dev/null
+++ b/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/logging/TagInferer.macos.kt
@@ -0,0 +1,30 @@
+package co.early.fore.core.logging
+
+import platform.Foundation.NSThread
+
+actual fun getTagInferer(): TagInferer = TagInfererMacos()
+
+class TagInfererMacos : TagInferer {
+
+    override fun inferTag(): String {
+        // Fetch the current thread's call stack symbols
+        val stackSymbols = NSThread.callStackSymbols
+
+        return if (stackSymbols.size > 2) {
+            extractClassName(stackSymbols[2].toString()).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && stackSymbols.size > 3) {
+                    extractClassName(stackSymbols[3].toString())
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(symbol: String): String {
+        // Thread.callStackSymbols gives symbols with module name, memory address, and function signature
+        // We can try to parse it to extract the meaningful class/function name
+        // Example symbol: 0   MyApp                         0x00000001022ecac8 main + 32
+        return symbol.substringAfter(" ").substringBefore(" ")
+    }
+}
diff --git a/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/observer/ThreadId.macos.kt b/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/observer/ThreadId.macos.kt
new file mode 100644
index 00000000..dba05d57
--- /dev/null
+++ b/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/observer/ThreadId.macos.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.Foundation.NSThread
+
+actual fun threadName(): String {
+    return NSThread.currentThread().name ?: "(no-thread-name)"
+}
diff --git a/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.macos.kt b/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.macos.kt
new file mode 100644
index 00000000..f9cf77fa
--- /dev/null
+++ b/lib/fore-core/src/macosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.macos.kt
@@ -0,0 +1,29 @@
+package co.early.fore.core.time
+
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSDate
+import platform.Foundation.timeIntervalSince1970
+
+import kotlinx.cinterop.alloc
+import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.ptr
+import platform.posix.clock_gettime
+import platform.posix.timespec
+import platform.posix.CLOCK_UPTIME_RAW
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperMacos()
+
+class SystemTimeWrapperMacos : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return NSDate().timeIntervalSince1970.toLong() * 1000
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun nanoTime(): Long {
+        memScoped {
+            val timeSpec = alloc<timespec>()
+            clock_gettime(CLOCK_UPTIME_RAW.toUInt(), timeSpec.ptr)
+            return (timeSpec.tv_sec * 1_000_000_000) + timeSpec.tv_nsec
+        }
+    }
+}
diff --git a/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/logging/Logger.mingw.kt b/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/logging/Logger.mingw.kt
new file mode 100644
index 00000000..0fa6608f
--- /dev/null
+++ b/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/logging/Logger.mingw.kt
@@ -0,0 +1,61 @@
+package co.early.fore.core.logging
+
+internal actual fun verbose(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(V) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun debug(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(D) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun info(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(I) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun warning(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(W) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
+
+internal actual fun error(tag: String, message: String, throwable: Throwable?) {
+    println(
+        buildString {
+            append("(E) $tag|$message")
+            throwable?.let {
+                append("\n")
+                append(it.stackTraceToString())
+            }
+        }
+    )
+}
diff --git a/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/logging/MingwTagInferer.kt b/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/logging/MingwTagInferer.kt
new file mode 100644
index 00000000..3d7d8fdb
--- /dev/null
+++ b/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/logging/MingwTagInferer.kt
@@ -0,0 +1,10 @@
+package co.early.fore.core.logging
+
+actual fun getTagInferer(): TagInferer = MingwTagInferer()
+
+class MingwTagInferer : TagInferer {
+
+    override fun inferTag(): String {
+        return "MinGW (Unknown Tag)"
+    }
+}
\ No newline at end of file
diff --git a/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/observer/ThreadId.kt b/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/observer/ThreadId.kt
new file mode 100644
index 00000000..28e90202
--- /dev/null
+++ b/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/observer/ThreadId.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.windows.GetCurrentThreadId
+
+actual fun threadName(): String {
+    return "Thread-${GetCurrentThreadId()}"
+}
diff --git a/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/time/MingwSystemTimeWrapper.kt b/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/time/MingwSystemTimeWrapper.kt
new file mode 100644
index 00000000..784034d1
--- /dev/null
+++ b/lib/fore-core/src/mingwMain/kotlin/co/early/fore/core/time/MingwSystemTimeWrapper.kt
@@ -0,0 +1,69 @@
+package co.early.fore.core.time
+
+import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.alignOf
+import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.pointed
+import kotlinx.cinterop.ptr
+import kotlinx.cinterop.reinterpret
+import kotlinx.cinterop.sizeOf
+import platform.windows.FILETIME
+import platform.windows.GetSystemTime
+import platform.windows.LARGE_INTEGER
+import platform.windows.QueryPerformanceCounter
+import platform.windows.QueryPerformanceFrequency
+import platform.windows.SYSTEMTIME
+import platform.windows.SystemTimeToFileTime
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = MingwSystemTimeWrapper()
+
+class MingwSystemTimeWrapper : SystemTimeWrapper {
+
+    private val EPOCH_DIFFERENCE_MS = 11644473600000L
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun currentTimeMillis(): Long {
+        memScoped {
+
+            val systemTime = alloc(sizeOf<SYSTEMTIME>(), alignOf<SYSTEMTIME>())
+            val systemTimePtr = systemTime.reinterpret<SYSTEMTIME>().ptr
+            GetSystemTime(systemTimePtr)
+
+            val fileTime = alloc(sizeOf<FILETIME>(), alignOf<FILETIME>())
+            val fileTimePtr = fileTime.reinterpret<FILETIME>().ptr
+            SystemTimeToFileTime(systemTimePtr, fileTimePtr)
+
+            // Combine high and low parts of FILETIME into a single 64-bit long
+            val high = fileTimePtr.pointed.dwHighDateTime.toLong() shl 32  // convert to 64-bits, then shift 32 bits to the left
+            val low = fileTimePtr.pointed.dwLowDateTime.toLong()  // dwLowDateTime is already unsigned 32-bit integer, convert to 64-bits
+            val fileTimeIn100Nano = high or low // bitwise OR
+
+            return (fileTimeIn100Nano / 10_000) - EPOCH_DIFFERENCE_MS
+        }
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun nanoTime(): Long {
+        memScoped {
+
+            val performanceCounter = alloc(sizeOf<LARGE_INTEGER>(), alignOf<LARGE_INTEGER>())
+            val performanceCounterPtr = performanceCounter.reinterpret<LARGE_INTEGER>().ptr
+
+            val performanceFrequency = alloc(sizeOf<LARGE_INTEGER>(), alignOf<LARGE_INTEGER>())
+            val performanceFrequencyPtr = performanceFrequency.reinterpret<LARGE_INTEGER>().ptr
+
+            // Get the frequency of the performance counter (counts per second)
+            QueryPerformanceFrequency(performanceFrequencyPtr)
+
+            // Get the current performance counter value
+            QueryPerformanceCounter(performanceCounterPtr)
+
+            // Convert the counter value to nanoseconds (as the counter is in counts, and we know the frequency)
+            val counts = performanceCounterPtr.pointed.QuadPart
+            val countsPerSecond = performanceFrequencyPtr.pointed.QuadPart
+
+            // Convert the time to nanoseconds
+            return (counts * 1_000_000_000) / countsPerSecond
+        }
+    }
+}
diff --git a/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/logging/TagInferer.tvos.kt b/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/logging/TagInferer.tvos.kt
new file mode 100644
index 00000000..bde2584a
--- /dev/null
+++ b/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/logging/TagInferer.tvos.kt
@@ -0,0 +1,30 @@
+package co.early.fore.core.logging
+
+import platform.Foundation.NSThread
+
+actual fun getTagInferer(): TagInferer = TagInfererTvos()
+
+class TagInfererTvos : TagInferer {
+
+    override fun inferTag(): String {
+        // Fetch the current thread's call stack symbols
+        val stackSymbols = NSThread.callStackSymbols
+
+        return if (stackSymbols.size > 2) {
+            extractClassName(stackSymbols[2].toString()).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && stackSymbols.size > 3) {
+                    extractClassName(stackSymbols[3].toString())
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(symbol: String): String {
+        // Thread.callStackSymbols gives symbols with module name, memory address, and function signature
+        // We can try to parse it to extract the meaningful class/function name
+        // Example symbol: 0   MyApp                         0x00000001022ecac8 main + 32
+        return symbol.substringAfter(" ").substringBefore(" ")
+    }
+}
diff --git a/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/observer/ThreadId.tvos.kt b/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/observer/ThreadId.tvos.kt
new file mode 100644
index 00000000..dba05d57
--- /dev/null
+++ b/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/observer/ThreadId.tvos.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.Foundation.NSThread
+
+actual fun threadName(): String {
+    return NSThread.currentThread().name ?: "(no-thread-name)"
+}
diff --git a/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.tvos.kt b/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.tvos.kt
new file mode 100644
index 00000000..a502cf8a
--- /dev/null
+++ b/lib/fore-core/src/tvosMain/kotlin/co/early/fore/core/time/SystemTimeWrapper.tvos.kt
@@ -0,0 +1,29 @@
+package co.early.fore.core.time
+
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSDate
+import platform.Foundation.timeIntervalSince1970
+
+import kotlinx.cinterop.alloc
+import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.ptr
+import platform.posix.clock_gettime
+import platform.posix.timespec
+import platform.posix.CLOCK_UPTIME_RAW
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperTvos()
+
+class SystemTimeWrapperTvos : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return NSDate().timeIntervalSince1970.toLong() * 1000
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun nanoTime(): Long {
+        memScoped {
+            val timeSpec = alloc<timespec>()
+            clock_gettime(CLOCK_UPTIME_RAW.toUInt(), timeSpec.ptr)
+            return (timeSpec.tv_sec * 1_000_000_000) + timeSpec.tv_nsec
+        }
+    }
+}
diff --git a/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/logging/TagInferer.watchosArm32.kt b/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/logging/TagInferer.watchosArm32.kt
new file mode 100644
index 00000000..58149f89
--- /dev/null
+++ b/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/logging/TagInferer.watchosArm32.kt
@@ -0,0 +1,30 @@
+package co.early.fore.core.logging
+
+import platform.Foundation.NSThread
+
+actual fun getTagInferer(): TagInferer = TagInfererWatchosArm32()
+
+class TagInfererWatchosArm32 : TagInferer {
+
+    override fun inferTag(): String {
+        // Fetch the current thread's call stack symbols
+        val stackSymbols = NSThread.callStackSymbols
+
+        return if (stackSymbols.size > 2) {
+            extractClassName(stackSymbols[2].toString()).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && stackSymbols.size > 3) {
+                    extractClassName(stackSymbols[3].toString())
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(symbol: String): String {
+        // Thread.callStackSymbols gives symbols with module name, memory address, and function signature
+        // We can try to parse it to extract the meaningful class/function name
+        // Example symbol: 0   MyApp                         0x00000001022ecac8 main + 32
+        return symbol.substringAfter(" ").substringBefore(" ")
+    }
+}
diff --git a/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/observer/ThreadId.watchosArm32.kt b/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/observer/ThreadId.watchosArm32.kt
new file mode 100644
index 00000000..dba05d57
--- /dev/null
+++ b/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/observer/ThreadId.watchosArm32.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.Foundation.NSThread
+
+actual fun threadName(): String {
+    return NSThread.currentThread().name ?: "(no-thread-name)"
+}
diff --git a/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosArm32.kt b/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosArm32.kt
new file mode 100644
index 00000000..60a395b8
--- /dev/null
+++ b/lib/fore-core/src/watchosArm32Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosArm32.kt
@@ -0,0 +1,29 @@
+package co.early.fore.core.time
+
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSDate
+import platform.Foundation.timeIntervalSince1970
+
+import kotlinx.cinterop.alloc
+import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.ptr
+import platform.posix.clock_gettime
+import platform.posix.timespec
+import platform.posix.CLOCK_UPTIME_RAW
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperWatchosArm32()
+
+class SystemTimeWrapperWatchosArm32 : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return NSDate().timeIntervalSince1970.toLong() * 1000
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun nanoTime(): Long {
+        memScoped {
+            val timeSpec = alloc<timespec>()
+            clock_gettime(CLOCK_UPTIME_RAW.toUInt(), timeSpec.ptr)
+            return (timeSpec.tv_sec.toLong() * 1_000_000_000) + timeSpec.tv_nsec.toLong()
+        }
+    }
+}
diff --git a/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosArm64.kt b/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosArm64.kt
new file mode 100644
index 00000000..12651a3a
--- /dev/null
+++ b/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosArm64.kt
@@ -0,0 +1,30 @@
+package co.early.fore.core.logging
+
+import platform.Foundation.NSThread
+
+actual fun getTagInferer(): TagInferer = TagInfererWatchosArm64()
+
+class TagInfererWatchosArm64 : TagInferer {
+
+    override fun inferTag(): String {
+        // Fetch the current thread's call stack symbols
+        val stackSymbols = NSThread.callStackSymbols
+
+        return if (stackSymbols.size > 2) {
+            extractClassName(stackSymbols[2].toString()).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && stackSymbols.size > 3) {
+                    extractClassName(stackSymbols[3].toString())
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(symbol: String): String {
+        // Thread.callStackSymbols gives symbols with module name, memory address, and function signature
+        // We can try to parse it to extract the meaningful class/function name
+        // Example symbol: 0   MyApp                         0x00000001022ecac8 main + 32
+        return symbol.substringAfter(" ").substringBefore(" ")
+    }
+}
diff --git a/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosArm64.kt b/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosArm64.kt
new file mode 100644
index 00000000..dba05d57
--- /dev/null
+++ b/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosArm64.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.Foundation.NSThread
+
+actual fun threadName(): String {
+    return NSThread.currentThread().name ?: "(no-thread-name)"
+}
diff --git a/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosArm64.kt b/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosArm64.kt
new file mode 100644
index 00000000..2da62346
--- /dev/null
+++ b/lib/fore-core/src/watchosArm64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosArm64.kt
@@ -0,0 +1,29 @@
+package co.early.fore.core.time
+
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSDate
+import platform.Foundation.timeIntervalSince1970
+
+import kotlinx.cinterop.alloc
+import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.ptr
+import platform.posix.clock_gettime
+import platform.posix.timespec
+import platform.posix.CLOCK_UPTIME_RAW
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperWatchosArm64()
+
+class SystemTimeWrapperWatchosArm64 : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return NSDate().timeIntervalSince1970.toLong() * 1000
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun nanoTime(): Long {
+        memScoped {
+            val timeSpec = alloc<timespec>()
+            clock_gettime(CLOCK_UPTIME_RAW.toUInt(), timeSpec.ptr)
+            return (timeSpec.tv_sec.toLong() * 1_000_000_000) + timeSpec.tv_nsec.toLong()
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosSimulatorArm64.kt b/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosSimulatorArm64.kt
new file mode 100644
index 00000000..e26e878e
--- /dev/null
+++ b/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosSimulatorArm64.kt
@@ -0,0 +1,30 @@
+package co.early.fore.core.logging
+
+import platform.Foundation.NSThread
+
+actual fun getTagInferer(): TagInferer = TagInfererWatchosSimulatorArm64()
+
+class TagInfererWatchosSimulatorArm64 : TagInferer {
+
+    override fun inferTag(): String {
+        // Fetch the current thread's call stack symbols
+        val stackSymbols = NSThread.callStackSymbols
+
+        return if (stackSymbols.size > 2) {
+            extractClassName(stackSymbols[2].toString()).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && stackSymbols.size > 3) {
+                    extractClassName(stackSymbols[3].toString())
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(symbol: String): String {
+        // Thread.callStackSymbols gives symbols with module name, memory address, and function signature
+        // We can try to parse it to extract the meaningful class/function name
+        // Example symbol: 0   MyApp                         0x00000001022ecac8 main + 32
+        return symbol.substringAfter(" ").substringBefore(" ")
+    }
+}
diff --git a/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosSimulatorArm64.kt b/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosSimulatorArm64.kt
new file mode 100644
index 00000000..dba05d57
--- /dev/null
+++ b/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosSimulatorArm64.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.Foundation.NSThread
+
+actual fun threadName(): String {
+    return NSThread.currentThread().name ?: "(no-thread-name)"
+}
diff --git a/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosSimulatorArm64.kt b/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosSimulatorArm64.kt
new file mode 100644
index 00000000..81f56684
--- /dev/null
+++ b/lib/fore-core/src/watchosSimulatorArm64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosSimulatorArm64.kt
@@ -0,0 +1,29 @@
+package co.early.fore.core.time
+
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSDate
+import platform.Foundation.timeIntervalSince1970
+
+import kotlinx.cinterop.alloc
+import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.ptr
+import platform.posix.clock_gettime
+import platform.posix.timespec
+import platform.posix.CLOCK_UPTIME_RAW
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperWatchosSimulatorArm64()
+
+class SystemTimeWrapperWatchosSimulatorArm64 : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return NSDate().timeIntervalSince1970.toLong() * 1000
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun nanoTime(): Long {
+        memScoped {
+            val timeSpec = alloc<timespec>()
+            clock_gettime(CLOCK_UPTIME_RAW.toUInt(), timeSpec.ptr)
+            return (timeSpec.tv_sec * 1_000_000_000) + timeSpec.tv_nsec
+        }
+    }
+}
diff --git a/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosX64.kt b/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosX64.kt
new file mode 100644
index 00000000..7080156f
--- /dev/null
+++ b/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/logging/TagInferer.watchosX64.kt
@@ -0,0 +1,30 @@
+package co.early.fore.core.logging
+
+import platform.Foundation.NSThread
+
+actual fun getTagInferer(): TagInferer = TagInfererWatchosX64()
+
+class TagInfererWatchosX64 : TagInferer {
+
+    override fun inferTag(): String {
+        // Fetch the current thread's call stack symbols
+        val stackSymbols = NSThread.callStackSymbols
+
+        return if (stackSymbols.size > 2) {
+            extractClassName(stackSymbols[2].toString()).let {
+                if ((it == "ObservableImp" || it == "Fore\$Companion") && stackSymbols.size > 3) {
+                    extractClassName(stackSymbols[3].toString())
+                } else {
+                    it
+                }
+            }
+        } else "missing stacktrace"
+    }
+
+    private fun extractClassName(symbol: String): String {
+        // Thread.callStackSymbols gives symbols with module name, memory address, and function signature
+        // We can try to parse it to extract the meaningful class/function name
+        // Example symbol: 0   MyApp                         0x00000001022ecac8 main + 32
+        return symbol.substringAfter(" ").substringBefore(" ")
+    }
+}
diff --git a/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosX64.kt b/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosX64.kt
new file mode 100644
index 00000000..dba05d57
--- /dev/null
+++ b/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/observer/ThreadId.watchosX64.kt
@@ -0,0 +1,7 @@
+package co.early.fore.core.observer
+
+import platform.Foundation.NSThread
+
+actual fun threadName(): String {
+    return NSThread.currentThread().name ?: "(no-thread-name)"
+}
diff --git a/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosX64.kt b/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosX64.kt
new file mode 100644
index 00000000..7a866ff2
--- /dev/null
+++ b/lib/fore-core/src/watchosX64Main/kotlin/co/early/fore/core/time/SystemTimeWrapper.watchosX64.kt
@@ -0,0 +1,29 @@
+package co.early.fore.core.time
+
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.Foundation.NSDate
+import platform.Foundation.timeIntervalSince1970
+
+import kotlinx.cinterop.alloc
+import kotlinx.cinterop.memScoped
+import kotlinx.cinterop.ptr
+import platform.posix.clock_gettime
+import platform.posix.timespec
+import platform.posix.CLOCK_UPTIME_RAW
+
+actual fun getSystemTimeWrapper(): SystemTimeWrapper = SystemTimeWrapperWatchosX64()
+
+class SystemTimeWrapperWatchosX64 : SystemTimeWrapper {
+    override fun currentTimeMillis(): Long {
+        return NSDate().timeIntervalSince1970.toLong() * 1000
+    }
+
+    @OptIn(ExperimentalForeignApi::class)
+    override fun nanoTime(): Long {
+        memScoped {
+            val timeSpec = alloc<timespec>()
+            clock_gettime(CLOCK_UPTIME_RAW.toUInt(), timeSpec.ptr)
+            return (timeSpec.tv_sec * 1_000_000_000) + timeSpec.tv_nsec
+        }
+    }
+}
diff --git a/lib/fore-net-apollo-test-fixtures/build.gradle.kts b/lib/fore-net-apollo-test-fixtures/build.gradle.kts
new file mode 100644
index 00000000..45887d07
--- /dev/null
+++ b/lib/fore-net-apollo-test-fixtures/build.gradle.kts
@@ -0,0 +1,125 @@
+import co.early.fore.Shared
+import co.early.fore.applyPublishingConfig
+import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiPlatformPlugin)
+    alias(libs.plugins.androidLibraryPlugin)
+    alias(libs.plugins.dokkaPlugin)
+    id("maven-publish")
+    id("signing")
+}
+
+kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
+    }
+
+    targets.withType<org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget> {
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+                }
+            }
+        }
+    }
+
+    androidTarget{
+        publishLibraryVariants("release")
+    }
+
+    jvm()
+
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
+
+    macosX64()
+    macosArm64()
+
+    watchosArm32()
+    watchosArm64()
+    watchosSimulatorArm64()
+
+    tvosArm64()
+    tvosX64()
+    tvosSimulatorArm64()
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(project(":lib:fore-net-apollo"))
+                api(project(":lib:fore-test-fixtures"))
+            }
+        }
+    }
+}
+
+android {
+
+    namespace = "co.early.fore.net.apollo.testfixtures"
+
+    compileSdk = Shared.Android.compileSdk
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+        targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+    }
+
+    lint {
+        abortOnError = true
+        lintConfig = File(project.rootDir, "lint-library.xml")
+    }
+
+    defaultConfig {
+        minSdk = Shared.Android.minSdk
+        multiDexEnabled = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildFeatures {
+        buildConfig = false
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            consumerProguardFiles("../../proguard-library-consumer.pro")
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    if (name.contains("android", ignoreCase = true)) {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+        }
+    }
+}
+
+ext.apply {
+    set("LIB_ARTIFACT_ID", "fore-net-apollo-test-fixtures")
+    set(
+        "LIB_DESCRIPTION",
+        "fore-core some test fixtures to avoid the need to use mocking frameworks during client code tests"
+    )
+}
+
+println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
+
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    from(tasks.dokkaHtml)
+}
+
+applyPublishingConfig()
diff --git a/lib/fore-net-apollo-test-fixtures/fore_core.podspec b/lib/fore-net-apollo-test-fixtures/fore_core.podspec
new file mode 100644
index 00000000..17b3724e
--- /dev/null
+++ b/lib/fore-net-apollo-test-fixtures/fore_core.podspec
@@ -0,0 +1,50 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'fore_core'
+    spec.version                  = '1.0'
+    spec.homepage                 = 'Link to the Shared Module homepage'
+    spec.source                   = { :http=> ''}
+    spec.authors                  = ''
+    spec.license                  = ''
+    spec.summary                  = 'Some description for the Shared Module'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
+    spec.libraries                = 'c++'
+    spec.ios.deployment_target = '16.0'
+                
+                
+    if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
+        raise "
+
+        Kotlin framework 'shared' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :lib:fore-core:generateDummyFramework
+
+        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
+    end
+                
+    spec.pod_target_xcconfig = {
+        'KOTLIN_PROJECT_PATH' => ':lib:fore-core',
+        'PRODUCT_MODULE_NAME' => 'shared',
+    }
+                
+    spec.script_phases = [
+        {
+            :name => 'Build fore_core',
+            :execution_position => :before_compile,
+            :shell_path => '/bin/sh',
+            :script => <<-SCRIPT
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                  exit 0
+                fi
+                set -ev
+                REPO_ROOT="$PODS_TARGET_SRCROOT"
+                "$REPO_ROOT/../../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
+                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
+                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
+                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
+            SCRIPT
+        }
+    ]
+                
+end
\ No newline at end of file
diff --git a/lib/fore-net-apollo-test-fixtures/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/FakeCallWrapperApollo.kt b/lib/fore-net-apollo-test-fixtures/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/FakeCallWrapperApollo.kt
new file mode 100644
index 00000000..9d2efe07
--- /dev/null
+++ b/lib/fore-net-apollo-test-fixtures/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/FakeCallWrapperApollo.kt
@@ -0,0 +1,82 @@
+package co.early.fore.net.wrap.apollo
+
+import co.early.fore.core.type.Either
+import co.early.fore.net.wrap.apollo.CallWrapperApollo.SuccessResult
+import co.early.fore.net.wrap.apollo.WrapperApollo
+import com.apollographql.apollo.api.ApolloResponse
+import com.apollographql.apollo.api.Operation
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+/**
+ * @param fakeResponses For simple test cases, just specify one fakeResponse here which will
+ * always be returned whenever this class is called. You can also specify multiple responses,
+ * in that case the responses will be made in order from first to last, once the last
+ * fakeResponse has been used it will be re-used for all subsequent calls.
+ *
+ * Be careful with the Success(S) generic of the fake responses you list here, there'll be a
+ * ClassCastException if it doesn't match what is expected by the client code
+ *
+ * Example use (see example apps in repo)
+ *
+ * fakeCallWrapperApollo = FakeCallWrapperApollo(
+ *     success1.toFakeSuccess(),
+ *     success2.toFakeSuccess(),
+ *     ErrorMessage.ERROR_NETWORK.toFakeFail(),
+ *     success3.toFakeSuccess(),
+ *     RuntimeException().toFakeThrowable()
+ * )
+ *
+ */
+class FakeCallWrapperApollo<F>(
+    vararg fakeResponses: Either<Throwable, Either<F, SuccessResult<*, F>>>,
+) : WrapperApollo<F> {
+
+    private val pendingFakeResponses: MutableList<Either<Throwable, Either<F, SuccessResult<*, F>>>> =
+        fakeResponses.toMutableList()
+    private val mutex = Mutex()
+
+    init {
+        require(fakeResponses.isNotEmpty()){
+            "you must include at least one fake response in the constructor"
+        }
+    }
+
+    /**
+     * @param call functional type that returns the result of an ApolloRequest
+     * @param S Success class you expect to be returned from the call (or Unit for an empty response)
+     *
+     * @return Either<F, SuccessResult<S>>
+     */
+    override suspend fun <S : Operation.Data> processCallAwait(call: suspend () -> ApolloResponse<S>): Either<F, SuccessResult<S, F>> {
+        return processCallAsync(call).await()
+    }
+
+    /**
+     * @param call functional type that returns the result of an ApolloRequest
+     * @param S Success class you expect to be returned from the call (or Unit for an empty response)
+     *
+     * @return Deferred<Either<F, SuccessResult<S>>>
+     */
+    override suspend fun <S : Operation.Data> processCallAsync(call: suspend () -> ApolloResponse<S>): Deferred<Either<F, SuccessResult<S, F>>> {
+
+        mutex.withLock {
+            val fakeResponse = if (pendingFakeResponses.size > 1) {
+                pendingFakeResponses.removeFirst()
+            } else {
+                pendingFakeResponses.first()
+            }
+
+            return when (fakeResponse) {
+                is Either.Fail<*> -> throw fakeResponse.value as Throwable
+                is Either.Success<*> -> {
+                    CompletableDeferred(
+                        @Suppress("UNCHECKED_CAST") (fakeResponse.value as Either<F, SuccessResult<S, F>>)
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/lib/fore-net-apollo/build.gradle.kts b/lib/fore-net-apollo/build.gradle.kts
new file mode 100644
index 00000000..c2006121
--- /dev/null
+++ b/lib/fore-net-apollo/build.gradle.kts
@@ -0,0 +1,130 @@
+import co.early.fore.Shared
+import co.early.fore.applyPublishingConfig
+import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiPlatformPlugin)
+    alias(libs.plugins.androidLibraryPlugin)
+    alias(libs.plugins.dokkaPlugin)
+    id("maven-publish")
+    id("signing")
+}
+
+kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
+    }
+
+    targets.withType<org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget> {
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+                }
+            }
+        }
+    }
+
+    androidTarget{
+        publishLibraryVariants("release")
+    }
+
+    jvm()
+
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
+
+    macosX64()
+    macosArm64()
+
+    watchosArm32()
+    watchosArm64()
+    watchosSimulatorArm64()
+
+    tvosArm64()
+    tvosX64()
+    tvosSimulatorArm64()
+
+    sourceSets {
+
+        val commonMain by getting {
+            dependencies {
+                api(project(":lib:fore-net"))
+                compileOnly(libs.apollo.runtime)
+                api(libs.apollo.runtime) // remove the api line if KMP ever supports compileOnly
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(libs.kotlin.test)
+            }
+        }
+    }
+}
+
+android {
+
+    namespace = "co.early.fore.net.apollo"
+
+    compileSdk = Shared.Android.compileSdk
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+        targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+    }
+
+    lint {
+        abortOnError = true
+        lintConfig = File(project.rootDir, "lint-library.xml")
+    }
+
+    defaultConfig {
+        minSdk = Shared.Android.minSdk
+        multiDexEnabled = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildFeatures {
+        buildConfig = false
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            consumerProguardFiles("../../proguard-library-consumer.pro")
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    if (name.contains("android", ignoreCase = true)) {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+        }
+    }
+}
+
+ext.apply {
+    set("LIB_ARTIFACT_ID", "fore-net-apollo")
+    set("LIB_DESCRIPTION", "fore - network code, apollo call wrapper")
+}
+
+println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
+
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    from(tasks.dokkaHtml)
+}
+
+applyPublishingConfig()
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/CallWrapperApollo3.kt b/lib/fore-net-apollo/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/CallWrapperApollo.kt
similarity index 75%
rename from fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/CallWrapperApollo3.kt
rename to lib/fore-net-apollo/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/CallWrapperApollo.kt
index 5d86c6b2..254e0393 100644
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/CallWrapperApollo3.kt
+++ b/lib/fore-net-apollo/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/CallWrapperApollo.kt
@@ -1,25 +1,27 @@
-package co.early.fore.kt.net.apollo3
+package co.early.fore.net.wrap.apollo
 
 import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.coroutine.asyncMain
-import co.early.fore.kt.core.coroutine.awaitIO
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.type.Either
-import co.early.fore.kt.core.type.Either.Companion.fail
-import co.early.fore.kt.core.type.Either.Companion.success
-import com.apollographql.apollo3.api.ApolloResponse
-import com.apollographql.apollo3.api.ExecutionContext
-import com.apollographql.apollo3.api.Operation
+import co.early.fore.core.coroutine.asyncMain
+import co.early.fore.core.coroutine.awaitIO
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.observer.threadName
+import co.early.fore.core.type.Either
+import co.early.fore.core.type.Either.Companion.fail
+import co.early.fore.core.type.Either.Companion.success
+import co.early.fore.net.wrap.CallWrapper
+import com.apollographql.apollo.api.ApolloResponse
+import com.apollographql.apollo.api.ExecutionContext
+import com.apollographql.apollo.api.Operation
 import kotlinx.coroutines.Deferred
 
-interface CallerApollo3<F> {
+interface WrapperApollo<F> {
     suspend fun <S : Operation.Data> processCallAwait(
         call: suspend () -> ApolloResponse<S>
-    ): Either<F, CallWrapperApollo3.SuccessResult<S, F>>
+    ): Either<F, CallWrapperApollo.SuccessResult<S, F>>
     suspend fun <S : Operation.Data> processCallAsync(
         call: suspend () -> ApolloResponse<S>
-    ): Deferred<Either<F, CallWrapperApollo3.SuccessResult<S, F>>>
+    ): Deferred<Either<F, CallWrapperApollo.SuccessResult<S, F>>>
 }
 
 /**
@@ -27,7 +29,7 @@ interface CallerApollo3<F> {
  * etc). This error handler is often the same across a range of services required by the app.
  * However, sometimes the APIs all have different error behaviours (say when the service APIs have
  * been developed at different times, or by different teams or different third parties). In this
- * case it might be easier to use a separate CallProcessorApollo3 instance (and ErrorHandler) for
+ * case it can sometimes be easier to use a separate CallProcessor instance (and ErrorHandler) for
  * each micro service.
  * @property logger (optional: ForeDelegateHolder will choose a sensible default)
  * @property workMode (optional: ForeDelegateHolder will choose a sensible default)
@@ -37,15 +39,18 @@ interface CallerApollo3<F> {
  * in the response. If allowPartialSuccesses=false, these types of responses will be delivered as
  * errors and the successful parts of the response will be dropped.
  *
- * @param F  The class type passed back in the event of a failure, Globally applicable
+ * @param F The class type passed back in the event of a failure, Globally applicable
  * failure message class, like an enum for example
  */
-class CallWrapperApollo3<F>(
+class CallWrapperApollo<F>(
     private val errorHandler: ErrorHandler<F>,
     private val logger: Logger? = null,
     private val workMode: WorkMode? = null,
     private val allowPartialSuccesses: Boolean = true
-) : CallerApollo3<F> {
+) : WrapperApollo<F> {
+
+    // this is for iOS target benefit which doesn't like default parameters in constructors
+    constructor(errorHandler: ErrorHandler<F>) : this(errorHandler, null, null, true)
 
     data class SuccessResult<S, F>(
         val data: S,
@@ -77,7 +82,7 @@ class CallWrapperApollo3<F>(
 
                 val result: ApolloResponse<S> = awaitIO(Fore.getWorkMode(workMode)) {
 
-                    Fore.getLogger(logger).d("about to make call from io dispatcher, thread:" + Thread.currentThread())
+                    Fore.getLogger(logger).d("about to make call from io dispatcher, thread:" + threadName())
 
                     call()
                 }
@@ -92,7 +97,7 @@ class CallWrapperApollo3<F>(
 
     private fun <S : Operation.Data> processSuccessResponse(
             response: ApolloResponse<S>
-    ): Either<F, SuccessResult<S,F>> {
+    ): Either<F, SuccessResult<S, F>> {
 
         val data: S? = response.data
 
@@ -101,7 +106,7 @@ class CallWrapperApollo3<F>(
                 success(
                     SuccessResult(
                         data,
-                        errorHandler.handlePartialErrors(response.errors),
+                        errorHandler.handlePartialErrors(response.errors ?: emptyList()),
                         response.extensions,
                         response.executionContext
                     )
@@ -116,14 +121,14 @@ class CallWrapperApollo3<F>(
 
     private fun <S> processFailResponse(
             t: Throwable?, errorResponse: ApolloResponse<*>?
-    ): Either<F, SuccessResult<S,F>> {
+    ): Either<F, SuccessResult<S, F>> {
 
         if (t != null) {
-            Fore.getLogger(logger).e("processFailResponse() t:" + Thread.currentThread(), t)
+            Fore.getLogger(logger).e("processFailResponse() t:" + threadName(), t)
         }
 
         if (errorResponse != null) {
-            Fore.getLogger(logger).e("processFailResponse() errorResponse:$errorResponse t:" + Thread.currentThread())
+            Fore.getLogger(logger).e("processFailResponse() errorResponse:$errorResponse t:" + threadName())
         }
 
         return fail(errorHandler.handleError(t, errorResponse))
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/ErrorHandler.kt b/lib/fore-net-apollo/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/ErrorHandler.kt
similarity index 71%
rename from fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/ErrorHandler.kt
rename to lib/fore-net-apollo/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/ErrorHandler.kt
index 6ed837c9..637922df 100644
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/apollo3/ErrorHandler.kt
+++ b/lib/fore-net-apollo/src/commonMain/kotlin/co/early/fore/net/wrap/apollo/ErrorHandler.kt
@@ -1,22 +1,24 @@
-package co.early.fore.kt.net.apollo3
+package co.early.fore.net.wrap.apollo
 
-import com.apollographql.apollo3.api.ApolloResponse
+import com.apollographql.apollo.api.ApolloResponse
 
 /**
- * @param <F> Failure message class to be used throughout the app, such as a sealed class or an enum
+ * @param <F> Failure message class to be used throughout the app, such as a sealed class
+ * or an enum
  */
 interface ErrorHandler<F> {
 
     /**
      * @param t throwable that caused the error, may be null
-     * @param errorResponse response from the server, the body of which may represent custom error(s), may be null
+     * @param errorResponse response from the server, the body of which may represent custom
+     * error(s), may be null
      * @return representative failure message
      */
     fun handleError(t: Throwable?, errorResponse: ApolloResponse<*>?): F
 
     /**
-     * @param errors partial graphql error responses from the server, may be null or empty
+     * @param errors partial graphql error responses from the server
      * @return list of representative failure messages
      */
-    fun handlePartialErrors(errors: List<com.apollographql.apollo3.api.Error?>?): List<F>
+    fun handlePartialErrors(errors: List<com.apollographql.apollo.api.Error>): List<F>
 }
diff --git a/lib/fore-net/build.gradle.kts b/lib/fore-net/build.gradle.kts
new file mode 100644
index 00000000..349f3e74
--- /dev/null
+++ b/lib/fore-net/build.gradle.kts
@@ -0,0 +1,138 @@
+import co.early.fore.Shared
+import co.early.fore.applyPublishingConfig
+import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiPlatformPlugin)
+    alias(libs.plugins.androidLibraryPlugin)
+    alias(libs.plugins.dokkaPlugin)
+    id("maven-publish")
+    id("signing")
+}
+
+kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
+    }
+
+    targets.withType<org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget> {
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+                }
+            }
+        }
+    }
+
+    androidTarget{
+        publishLibraryVariants("release")
+    }
+
+    jvm()
+
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
+
+    macosX64()
+    macosArm64()
+
+    watchosArm32()
+    watchosArm64()
+    watchosX64()
+    watchosSimulatorArm64()
+
+    tvosArm64()
+    tvosX64()
+    tvosSimulatorArm64()
+
+    linuxX64()
+    linuxArm64()
+
+    mingwX64()
+
+    sourceSets {
+
+        val commonMain by getting {
+            dependencies {
+                api(project(":lib:fore-core"))
+                implementation(libs.ktor.client.core)
+                implementation(libs.okio)
+                api(libs.kotlinx.serialization)
+                implementation(libs.kotlinx.io)
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(libs.kotlin.test)
+            }
+        }
+    }
+}
+
+android {
+
+    namespace = "co.early.fore.net"
+
+    compileSdk = Shared.Android.compileSdk
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+        targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+    }
+
+    lint {
+        abortOnError = true
+        lintConfig = File(project.rootDir, "lint-library.xml")
+    }
+
+    defaultConfig {
+        minSdk = Shared.Android.minSdk
+        multiDexEnabled = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildFeatures {
+        buildConfig = false
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            consumerProguardFiles("../../proguard-library-consumer.pro")
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    if (name.contains("android", ignoreCase = true)) {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+        }
+    }
+}
+
+ext.apply {
+    set("LIB_ARTIFACT_ID", "fore-net")
+    set("LIB_DESCRIPTION", "fore - network code")
+}
+
+println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
+
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    from(tasks.dokkaHtml)
+}
+
+applyPublishingConfig()
diff --git a/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/DataHeuristics.kt b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/DataHeuristics.kt
new file mode 100644
index 00000000..bbf5307f
--- /dev/null
+++ b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/DataHeuristics.kt
@@ -0,0 +1,250 @@
+package co.early.fore.net
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.net.BodyRenderFormat.Binary
+import co.early.fore.net.BodyRenderFormat.Html
+import co.early.fore.net.BodyRenderFormat.Json
+import co.early.fore.net.BodyRenderFormat.PlainText
+import co.early.fore.net.BodyRenderFormat.Xml
+import co.early.fore.net.EncodingGuess.AsciiIsh
+import co.early.fore.net.EncodingGuess.Big5
+import co.early.fore.net.EncodingGuess.Shift_Js
+import co.early.fore.net.EncodingGuess.Utf16_32
+import io.ktor.client.request.forms.MultiPartFormDataContent
+import io.ktor.http.content.OutgoingContent.ByteArrayContent
+import io.ktor.http.content.OutgoingContent.NoContent
+import io.ktor.http.content.OutgoingContent.ProtocolUpgrade
+import io.ktor.http.content.OutgoingContent.ReadChannelContent
+import io.ktor.http.content.OutgoingContent.WriteChannelContent
+import io.ktor.utils.io.ByteChannel
+import io.ktor.utils.io.ByteReadChannel
+import io.ktor.utils.io.availableForRead
+import io.ktor.utils.io.copyTo
+import io.ktor.utils.io.core.toByteArray
+import io.ktor.utils.io.readAvailable
+import io.ktor.utils.io.readFully
+import okio.Buffer
+
+
+internal sealed class BodyRenderFormat {
+    data object Json : BodyRenderFormat()
+    data object Xml : BodyRenderFormat()
+    data object Html : BodyRenderFormat()
+    data object PlainText : BodyRenderFormat()
+    data object Curl : BodyRenderFormat()
+    data object Binary : BodyRenderFormat()
+}
+
+internal sealed class EncodingGuess {
+    data object Utf8 : EncodingGuess()
+    data object Utf16_32 : EncodingGuess()
+    data object AsciiIsh : EncodingGuess()
+    data object Shift_Js : EncodingGuess()
+    data object Big5 : EncodingGuess()
+    data object Binary : EncodingGuess()
+}
+
+private const val sampleBytes: Long = 64
+private const val asciiThreshold = 2f / 3f
+private const val utf16Utf32Threshold = 1f / 2f
+private const val shiftJsThreshold = 1f / 3f
+private const val big5Threshold = 1f / 3f
+
+internal fun inferBodyRenderFormat(body: Buffer): BodyRenderFormat {
+
+    body.utf8TrimStart() // start by assuming utf-8
+    if (body.size == 0L || body.exhausted()) {
+        return PlainText
+    }
+
+    val sample = Buffer()
+    body.copyTo(sample, 0, minOf(body.size, sampleBytes))
+    val readCodePoint = {
+        // don't attempt a read if there are less than 4 bytes remaining
+        // as the remaining data could be an incomplete UTF-8 code point and will fail
+        if (sample.exhausted() && sample.size < 4) {
+            null
+        } else sample.readUtf8CodePoint()
+    }
+
+    return when (readCodePoint()) {
+        '{'.code -> Json
+        '['.code -> Json
+        '<'.code -> {
+            if (readCodePoint() == '?'.code) {
+                Xml
+            } else Html
+        }
+
+        else -> {
+            val encodingGuess = guessNonUtf8Encoding(sample)
+            Fore.i("Encoding Guess:$encodingGuess")
+            when (encodingGuess) {
+                EncodingGuess.Binary -> {
+
+                    // double check we are not UTF-8 with multibyte encoding
+                    // 0xFFFD would be okio 'fixing' malformed UTF-8 data for us, absence of that
+                    // means likely valid UTF-8.
+
+                    // Ignore any final 0xFFFD, because that could have been due to mid character
+                    // truncation of a valid 4 byte UTF-8 character
+                    val utf8 = body.readUtf8().let {
+                        if (it.endsWith(0xFFFD.toChar())) {
+                            it.dropLast(1)
+                        } else {
+                            it
+                        }
+                    }
+
+                    if (utf8.contains(0xFFFD.toChar())) {
+                        Binary
+                    } else {
+                        PlainText
+                    }
+                }
+
+                else -> PlainText
+            }
+        }
+    }
+}
+
+private fun guessNonUtf8Encoding(sample: Buffer): EncodingGuess {
+    var asciiIsh = 0
+    var binaryIsh = 0
+    var utf1632Ish = 0
+    var shiftJSIsh = 0
+    var big5Ish = 0
+    val peek = sample.peek()
+    val sampleSize = sample.size
+
+    while (!peek.exhausted()) {
+        val byte = peek.readByte().toInt() and 0xFF // otherwise we get a signed Int back
+        when (byte) {
+            in 0x20..0x80 -> asciiIsh++ // so likely to be ASCII  / ISO-8859-1 / Windows-1252
+            0x00, 0x04 -> utf1632Ish++
+            in 0x81..0x83, 0x8C, 0xA1 -> shiftJSIsh++
+            in 0xA1..0xA9 -> big5Ish++
+            else -> binaryIsh++
+        }
+    }
+
+//    Fore.i("ASCII LIKE $asciiIsh threshold:${sampleSize * asciiThreshold}")
+//    Fore.i("UTF-16-32 $utf1632Ish threshold:${sampleSize * utf16Utf32Threshold}")
+//    Fore.i("SHIFT-JS $shiftJSIsh threshold:${sampleSize * shiftJsThreshold}")
+//    Fore.i("BIG5 $big5Ish threshold:${sampleSize * big5Threshold}")
+
+    return if (met(asciiIsh, sampleSize, asciiThreshold)) {
+        AsciiIsh
+    } else if (met(utf1632Ish, sampleSize, utf16Utf32Threshold)) {
+        Utf16_32
+    } else if (met(shiftJSIsh, sampleSize, shiftJsThreshold)) {
+        Shift_Js
+    } else if (met(big5Ish, sampleSize, big5Threshold)) {
+        Big5
+    } else { // other unsupported encodings will get dumped in here
+        EncodingGuess.Binary
+    }
+}
+
+private fun met(count: Int, sampleSize: Long, threshold: Float): Boolean {
+    return (count > 0 && count >= (sampleSize * threshold).toInt())
+}
+
+private fun Buffer.utf8TrimStart() {
+    val bufferedSource = peek()
+    var whiteSpaceChars = 0
+    while (!bufferedSource.exhausted()) {
+        val codePoint = bufferedSource.readUtf8CodePoint()
+        if (codePoint.toChar().isWhitespace()) {
+            whiteSpaceChars++
+        } else {
+            break
+        }
+    }
+    repeat(whiteSpaceChars) {
+        readUtf8CodePoint() // burn the white space characters
+    }
+}
+
+internal suspend fun extractBodyInfo(
+    body: Any,
+    maxBodyLogBytes: Int,
+    logEmptyBody: Boolean = true,
+): Pair<Buffer, String> {
+
+    var message = ""
+
+    val bodyBuffer = when (body) {
+        /**
+         * Responses
+         */
+        is ByteReadChannel -> {
+
+            val buffer = Buffer()
+
+            val copiedChannel = ByteChannel(autoFlush = true)
+            var bytesRead: Int
+            maxBodyLogBytes.toLong().let {
+                bytesRead = body.copyTo(copiedChannel, it + 1).toInt()
+                if (bytesRead > it) {
+                    message =
+                        "[truncated, consider increasing maxBodyLogBytes from:$maxBodyLogBytes]"
+                    bytesRead--
+                }
+            }
+
+            if (bytesRead > 0 || logEmptyBody) {
+                val bytes = ByteArray(bytesRead)
+                copiedChannel.readFully(bytes, 0, bytesRead)
+                buffer.write(bytes)
+            }
+
+            buffer
+        }
+        /**
+         * Requests
+         */
+        is ByteArrayContent -> {
+            if (body.bytes().size > maxBodyLogBytes) {
+                message =
+                    "[truncated, consider increasing maxBodyLogBytes from:$maxBodyLogBytes, e.g try maxBodyLogBytes=BIG_LOG in PluginLogging constructor]"
+            }
+            val bytes = body.bytes().take(maxBodyLogBytes).toByteArray()
+            val buffer = Buffer()
+            buffer.write(bytes)
+            buffer
+        }
+
+        is MultiPartFormDataContent -> {
+            message =
+                "[multipart form data - boundary:${body.boundary} contentType:${body.contentType}]"
+            null
+        }
+
+        is ReadChannelContent, is WriteChannelContent, is ProtocolUpgrade -> {
+            message = "[body logging unsupported for $body]"
+            null
+        }
+
+        is String -> { //often how apollo gql will send requests
+            val buffer = Buffer()
+            buffer.write(body.toByteArray())
+            buffer
+        }
+
+        is NoContent -> {
+            message = if (logEmptyBody) {
+                "[no body]"
+            } else ""
+            null
+        }
+
+        else -> {
+            message = "[unrecognised body ${body}]"
+            null
+        }
+    }
+
+    return (bodyBuffer ?: Buffer()) to message
+}
diff --git a/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/ForeNetworkLogsPlugin.kt b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/ForeNetworkLogsPlugin.kt
new file mode 100644
index 00000000..a03d99ee
--- /dev/null
+++ b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/ForeNetworkLogsPlugin.kt
@@ -0,0 +1,353 @@
+package co.early.fore.net
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.logging.SilentLogger
+import co.early.fore.net.BodyRenderFormat.Binary
+import co.early.fore.net.BodyRenderFormat.Curl
+import co.early.fore.net.BodyRenderFormat.Html
+import co.early.fore.net.BodyRenderFormat.Json
+import co.early.fore.net.BodyRenderFormat.PlainText
+import co.early.fore.net.BodyRenderFormat.Xml
+import io.ktor.client.HttpClient
+import io.ktor.client.call.HttpClientCall
+import io.ktor.client.call.replaceResponse
+import io.ktor.client.plugins.api.ClientHook
+import io.ktor.client.plugins.api.createClientPlugin
+import io.ktor.client.plugins.isSaved
+import io.ktor.client.plugins.observer.wrapWithContent
+import io.ktor.client.request.HttpRequestBuilder
+import io.ktor.client.statement.HttpReceivePipeline
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.HttpResponseContainer
+import io.ktor.client.statement.HttpResponsePipeline
+import io.ktor.client.statement.bodyAsChannel
+import io.ktor.client.statement.request
+import io.ktor.http.Headers
+import io.ktor.http.HttpProtocolVersion
+import io.ktor.http.HttpStatusCode
+import io.ktor.util.AttributeKey
+import io.ktor.util.date.GMTDate
+import io.ktor.util.pipeline.PipelineContext
+import io.ktor.util.pipeline.PipelinePhase
+import io.ktor.util.split
+import io.ktor.utils.io.ByteReadChannel
+import io.ktor.utils.io.InternalAPI
+import io.ktor.utils.io.core.readBytes
+import io.ktor.utils.io.readRemaining
+import io.ktor.utils.io.toByteArray
+import kotlinx.io.readByteArray
+import okio.Buffer
+import kotlin.coroutines.CoroutineContext
+import kotlin.random.Random
+
+const val BIG_LOG = 250000
+private const val someCharacters = "ABDEFGH023456789"
+
+class ForeNetworkLogsConfig {
+    var preTag: String = "Net"
+    var curlStyleRequestLogs: Boolean = true
+    var prettifyResponseLogs: Boolean = true
+    var maxBodyLogBytes: Int = 4000
+    var networkingLogSanitizer: NetworkingLogSanitizer? = null
+    var filters: List<(HttpRequestBuilder) -> Boolean> = emptyList()
+    var logger: Logger? = null
+}
+
+val ForeNetworkLogs = createClientPlugin("ForeNetworkLogs", ::ForeNetworkLogsConfig) {
+
+    val config = pluginConfig
+    val logger = Fore.getLogger(config.logger)
+
+    val compositeTagKey = AttributeKey<String>("CompositeTag")
+    val enabledKey = AttributeKey<Boolean>("Enabled")
+    val methodKey = AttributeKey<String>("Method")
+    val urlKey = AttributeKey<String>("Url")
+
+    onRequest { request, _ ->
+
+        val enabled = (config.logger !is SilentLogger && shouldBeLogged(request, config.filters))
+
+        request.attributes.put(
+            enabledKey,
+            enabled
+        )
+
+        if (enabled) {
+
+            val compositeTag = "${config.preTag}${createRandomTag()}"
+
+            request.attributes.put(
+                compositeTagKey,
+                compositeTag
+            )
+
+            val url = logRequest(
+                request = request,
+                config = config,
+                compositeTag = compositeTag,
+                lggr = logger,
+            )
+
+            request.attributes.put(methodKey, request.method.value)
+            request.attributes.put(urlKey, url)
+        }
+    }
+
+    on(ResponseAfterEncodingHook) { response ->
+
+        val enabled = response.request.attributes[enabledKey]
+
+        if (enabled) {
+
+            val compositeTag = response.request.attributes[compositeTagKey]
+            val method = response.request.attributes[methodKey]
+            val url = response.request.attributes[urlKey]
+
+            val newResponse = logResponse(
+                response = response,
+                config = config,
+                method = method,
+                url = url,
+                compositeTag = compositeTag,
+                lggr = logger,
+            )
+
+            if (newResponse != response) {
+                proceedWith(newResponse)
+            }
+        }
+    }
+}
+
+private val someChars = someCharacters.toCharArray()
+
+private fun shouldBeLogged(
+    request: HttpRequestBuilder,
+    filters: List<(HttpRequestBuilder) -> Boolean>
+): Boolean =
+    filters.isEmpty() || filters.any { it(request) }
+
+private fun createRandomTag() = " " +
+        nextChar(someChars) +
+        nextChar(someChars) +
+        nextChar(someChars) +
+        nextChar(someChars) +
+        nextChar(someChars)
+
+private fun nextChar(someChars: CharArray) =
+    someChars[Random.Default.nextInt(someChars.size - 1)]
+
+private suspend fun logRequest(
+    request: HttpRequestBuilder,
+    config: ForeNetworkLogsConfig,
+    compositeTag: String,
+    lggr: Logger
+): String {
+    val requestStringBuilder = StringBuilder()
+    val requestBody = extractBodyInfo(request.body, config.maxBodyLogBytes, false)
+
+    val method = request.method.value
+    val url = request.url.buildString()
+
+    requestStringBuilder.logRequestInfo(
+        method = method,
+        url = url,
+        curlStyleRequestLogging = config.curlStyleRequestLogs,
+    )
+
+    requestStringBuilder.logHeaders(
+        headers = request.headers.entries(),
+        curlStyleRequestLogging = config.curlStyleRequestLogs,
+        networkingLogSanitizer = config.networkingLogSanitizer,
+    )
+
+    // remove the new line character of the curl request if there is no body
+    if (config.curlStyleRequestLogs &&
+        requestStringBuilder.length > 2 &&
+        requestStringBuilder[requestStringBuilder.length - 2] == '\\' &&
+        requestBody.first.size < 1
+    ) {
+        requestStringBuilder.setLength(requestStringBuilder.length - 2)
+        requestStringBuilder.appendLine()
+    }
+
+    requestStringBuilder.logBody(
+        bodyToLog = requestBody.first,
+        message = requestBody.second,
+        curlStyleLogging = config.curlStyleRequestLogs,
+        attemptToPrettify = false,
+        networkingLogSanitizer = config.networkingLogSanitizer,
+        logger = lggr,
+    )
+
+    lggr.d(compositeTag, requestStringBuilder.toString())
+
+    return url
+}
+
+private fun StringBuilder.logRequestInfo(
+    method: String,
+    url: String,
+    curlStyleRequestLogging: Boolean,
+) {
+    if (curlStyleRequestLogging) {
+        appendLine("curl -i --request $method \\")
+        appendLine(" --url '$url' \\")
+    } else {
+        appendLine("HTTP $method --> $url")
+    }
+}
+
+// internal because of the response.rawContent line (which is how ktor's
+// Logging plugin works) if we want our own logging we have no choice
+@OptIn(InternalAPI::class)
+private suspend fun logResponse(
+    response: HttpResponse,
+    config: ForeNetworkLogsConfig,
+    method: String,
+    url: String,
+    compositeTag: String,
+    lggr: Logger
+): HttpResponse {
+    val responseStringBuilder = StringBuilder()
+
+    responseStringBuilder.logResponseInfo(
+        method = method,
+        code = "${response.status.value}, ${response.status.description}",
+        url = url,
+        curlStyleRequestLogs = config.curlStyleRequestLogs
+    )
+
+    responseStringBuilder.logHeaders(
+        headers = response.headers.entries(),
+        curlStyleRequestLogging = false,
+        networkingLogSanitizer = config.networkingLogSanitizer,
+    )
+
+    var origChannel: ByteReadChannel? = null
+    val channel = if (response.isSaved) {
+        response.rawContent
+    } else {
+        val (original, newChannel) = response.rawContent.split(response)
+        origChannel = original
+        newChannel
+    }
+    val responseBody = extractBodyInfo(channel, config.maxBodyLogBytes)
+
+    responseStringBuilder.logBody(
+        bodyToLog = responseBody.first,
+        message = responseBody.second,
+        curlStyleLogging = false,
+        attemptToPrettify = config.prettifyResponseLogs,
+        networkingLogSanitizer = config.networkingLogSanitizer,
+        logger = lggr,
+    )
+    lggr.d(compositeTag, responseStringBuilder.toString())
+
+    return origChannel?.let { it ->
+        val call = response.call.replaceResponse { origChannel }
+        call.response
+    } ?: response
+}
+
+
+private fun StringBuilder.logResponseInfo(
+    method: String,
+    code: String,
+    url: String,
+    curlStyleRequestLogs: Boolean,
+) {
+    appendLine(
+        "HTTP $method ${if (curlStyleRequestLogs) "Response," else "<--"} Server replied: HTTP-${code} $url"
+    )
+}
+
+private fun StringBuilder.logHeaders(
+    headers: Set<Map.Entry<String, List<String>>>,
+    curlStyleRequestLogging: Boolean,
+    networkingLogSanitizer: NetworkingLogSanitizer?,
+) {
+
+    val sanitizedHeaderEntries =
+        networkingLogSanitizer?.sanitizeHeaders(headers) ?: headers
+
+    sanitizedHeaderEntries.forEach { (key, values) ->
+        if (curlStyleRequestLogging) {
+            appendLine(" --header '$key: ${values.joinToString(", ")}' \\")
+        } else {
+            appendLine("    $key: ${values.joinToString(", ")}")
+        }
+    }
+}
+
+private fun StringBuilder.logBody(
+    bodyToLog: Buffer,
+    message: String = "",
+    curlStyleLogging: Boolean,
+    attemptToPrettify: Boolean,
+    networkingLogSanitizer: NetworkingLogSanitizer? = null,
+    logger: Logger,
+) {
+
+    val size = bodyToLog.size
+    if (size > 0) {
+
+        try {
+
+            val inferredBodyType = if (curlStyleLogging) {
+                Curl
+            } else if (!attemptToPrettify) {
+                PlainText
+            } else {
+                inferBodyRenderFormat(bodyToLog)
+            }
+
+            val pretty = when (inferredBodyType) {
+                Binary -> {
+                    "(we think this body probably contains binary data - if not, " +
+                            "please open a PR at https://github.com/erdo/android-fore)"
+                }
+
+                Html, Xml -> bodyToLog.xmlPrettyPrint()
+                Json -> bodyToLog.jsonPrettyPrint()
+                PlainText, Curl -> bodyToLog.readUtf8() // make minimal changes
+            }
+
+            val sanitized = networkingLogSanitizer?.sanitizeBody(pretty) ?: pretty
+
+            if (curlStyleLogging) {
+                appendLine(" --data '$sanitized'")
+            } else {
+                appendLine(sanitized)
+            }
+
+        } catch (e: Exception) {
+            logger.e("too large to format nicely, consider reducing maxBodyLogBytes from:$size")
+            logger.e(e.toString())
+        }
+    }
+
+    if (message.isNotBlank()) {
+        append(message)
+    }
+}
+
+private object ResponseAfterEncodingHook :
+    ClientHook<suspend ResponseAfterEncodingHook.Context.(response: HttpResponse) -> Unit> {
+
+    class Context(private val context: PipelineContext<HttpResponse, Unit>) {
+        suspend fun proceedWith(response: HttpResponse) = context.proceedWith(response)
+    }
+
+    override fun install(
+        client: HttpClient,
+        handler: suspend Context.(response: HttpResponse) -> Unit
+    ) {
+        val afterState = PipelinePhase("AfterState")
+        client.receivePipeline.insertPhaseAfter(HttpReceivePipeline.State, afterState)
+        client.receivePipeline.intercept(afterState) {
+            handler(Context(this), subject)
+        }
+    }
+}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/net/MessageProvider.kt b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/MessageProvider.kt
similarity index 100%
rename from fore-kt/fore-kt-network/src/main/java/co/early/fore/net/MessageProvider.kt
rename to lib/fore-net/src/commonMain/kotlin/co/early/fore/net/MessageProvider.kt
diff --git a/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/NetworkingLogSanitizer.kt b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/NetworkingLogSanitizer.kt
new file mode 100644
index 00000000..6ee439aa
--- /dev/null
+++ b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/NetworkingLogSanitizer.kt
@@ -0,0 +1,6 @@
+package co.early.fore.net
+
+interface NetworkingLogSanitizer {
+    fun sanitizeHeaders(headers: Set<Map.Entry<String, List<String>>>): Set<Map.Entry<String, List<String>>>
+    fun sanitizeBody(text: String): String
+}
diff --git a/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/Prettifier.kt b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/Prettifier.kt
new file mode 100644
index 00000000..22fea5d3
--- /dev/null
+++ b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/Prettifier.kt
@@ -0,0 +1,83 @@
+package co.early.fore.net
+
+import okio.Buffer
+
+internal fun Buffer.jsonPrettyPrint() = readUtf8().let { jsonString ->
+    var indentLevel = 0
+    val indentWidth = 2
+    fun padding() = "".padStart((indentLevel * indentWidth).coerceAtLeast(0))
+
+    buildString {
+        var inString = false
+        jsonString.forEach { char ->
+            when {
+                char == '"' -> {
+                    inString = !inString
+                    append(char)
+                }
+
+                inString -> append(char)
+
+                char in listOf('(', '[', '{') -> {
+                    indentLevel++
+                    appendLine(char)
+                    append(padding())
+                }
+
+                char in listOf(')', ']', '}') -> {
+                    indentLevel--
+                    appendLine()
+                    append(padding())
+                    append(char)
+                }
+
+                char == ',' -> {
+                    appendLine(char)
+                    append(padding())
+                }
+
+                char.isWhitespace() -> {} // ignore whitespace outside of strings
+
+                else -> append(char)
+            }
+        }
+    }
+}
+
+internal fun Buffer.xmlPrettyPrint() = readUtf8().let { htmlString ->
+    val indentWidth = 2
+    var indentLevel = 0
+    val stringBuilder = StringBuilder(htmlString.length)
+    val regex =
+        Regex("<[^>]*>|<.+|[^<]+") // matches tags, content between tags, or truncated partial tags
+    var precededByText = true
+
+    fun padding() = "".padStart((indentLevel * indentWidth).coerceAtLeast(0))
+
+    regex.findAll(htmlString).forEach { match ->
+        val chunk = match.value.trim()
+        when {
+            chunk.startsWith("</") -> {
+                indentLevel--
+                if (!precededByText) stringBuilder.appendLine().append(padding())
+                stringBuilder.append(chunk)
+                precededByText = false
+            }
+
+            chunk.startsWith("<") -> {
+                if (!precededByText)stringBuilder.appendLine().append(padding())
+                stringBuilder.append(chunk)
+                if (!chunk.endsWith("/>") && !chunk.startsWith("<?") && !chunk.startsWith("<!")) {
+                    indentLevel++
+                }
+                precededByText = false
+            }
+
+            chunk.isNotEmpty() -> { // text content
+                stringBuilder.append(chunk)
+                precededByText = true
+            }
+        }
+    }
+    stringBuilder.toString()
+}
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/CallWrapperKtor.kt b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/wrap/CallWrapper.kt
similarity index 66%
rename from fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/CallWrapperKtor.kt
rename to lib/fore-net/src/commonMain/kotlin/co/early/fore/net/wrap/CallWrapper.kt
index de104a3a..e6eabcac 100644
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/CallWrapperKtor.kt
+++ b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/wrap/CallWrapper.kt
@@ -1,29 +1,34 @@
-package co.early.fore.kt.net.ktor
+package co.early.fore.net.wrap
 
 import co.early.fore.core.WorkMode
-import co.early.fore.kt.core.logging.Logger
-import co.early.fore.kt.core.coroutine.asyncMain
-import co.early.fore.kt.core.coroutine.awaitIO
-import co.early.fore.kt.core.delegate.Fore
-import co.early.fore.kt.core.type.Either
-import co.early.fore.kt.core.type.Either.Companion.fail
-import co.early.fore.kt.core.type.Either.Companion.success
+import co.early.fore.core.coroutine.asyncMain
+import co.early.fore.core.coroutine.awaitIO
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.logging.Logger
+import co.early.fore.core.observer.threadName
+import co.early.fore.core.type.Either
+import co.early.fore.core.type.Either.Companion.fail
+import co.early.fore.core.type.Either.Companion.success
 import co.early.fore.net.MessageProvider
 import kotlinx.coroutines.Deferred
+import kotlinx.serialization.KSerializer
 
-interface CallerKtor<F> {
+interface Wrapper<F> {
     suspend fun <S> processCallAwait(
         call: suspend () -> S
     ): Either<F, S>
+
     suspend fun <S, CE : MessageProvider<F>> processCallAwait(
-        customErrorKlazz: kotlin.reflect.KClass<CE>,
+        kSerializer: KSerializer<CE>,
         call: suspend () -> S
     ): Either<F, S>
+
     suspend fun <S> processCallAsync(
         call: suspend () -> S
     ): Deferred<Either<F, S>>
+
     suspend fun <S, CE : MessageProvider<F>> processCallAsync(
-        customErrorKlazz: kotlin.reflect.KClass<CE>,
+        kSerializer: KSerializer<CE>,
         call: suspend () -> S
     ): Deferred<Either<F, S>>
 }
@@ -51,14 +56,17 @@ interface CallerKtor<F> {
  * @param <F>  The class type passed back in the event of a failure, Globally applicable
  * failure message class, like an enum for example
  */
-class CallWrapperKtor<F>(
+class CallWrapper<F>(
     private val errorHandler: ErrorHandler<F>,
     private val workMode: WorkMode? = null,
     private val logger: Logger? = null
-) : CallerKtor<F> {
+) : Wrapper<F> {
+
+    // this is for iOS target benefit which doesn't like default parameters in constructors
+    constructor(errorHandler: ErrorHandler<F>) : this(errorHandler, null, null)
 
     /**
-     * @param call Retrofit call to be processed
+     * @param call network call to be processed
      * @param <S> Successful response body type
      */
     override suspend fun <S> processCallAwait(call: suspend () -> S): Either<F, S> {
@@ -66,18 +74,18 @@ class CallWrapperKtor<F>(
     }
 
     /**
-     * @param call Retrofit call to be processed
+     * @param call network call to be processed
      * @param <S> Successful response body type
      */
     override suspend fun <S, CE : MessageProvider<F>> processCallAwait(
-        customErrorKlazz: kotlin.reflect.KClass<CE>,
-            call: suspend () -> S
+        kSerializer: KSerializer<CE>,
+        call: suspend () -> S
     ): Either<F, S> {
-        return processCallAsync(customErrorKlazz, call).await()
+        return processCallAsync(kSerializer, call).await()
     }
 
     /**
-     * @param call Retrofit call to be processed
+     * @param call network call to be processed
      * @param <S> Successful response body type
      * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
      */
@@ -86,43 +94,46 @@ class CallWrapperKtor<F>(
     }
 
     /**
-     * @param call Retrofit call to be processed
+     * @param call network call to be processed
      * @param <S> Successful response body type
      * @param <CE> Class of error expected from server, must implement MessageProvider&lt;F&gt;
      */
     override suspend fun <S, CE : MessageProvider<F>> processCallAsync(
-        customErrorKlazz: kotlin.reflect.KClass<CE>,
-            call: suspend () -> S
+        kSerializer: KSerializer<CE>,
+        call: suspend () -> S
     ): Deferred<Either<F, S>> {
-        return doCallAsync(customErrorKlazz, call)
+        return doCallAsync(kSerializer, call)
     }
 
     private suspend fun <S, CE : MessageProvider<F>> doCallAsync(
-        customErrorKlazz: kotlin.reflect.KClass<CE>?,
-            call: suspend () -> S
+        kSerializer: KSerializer<CE>?,
+        call: suspend () -> S
     ): Deferred<Either<F, S>> {
 
-        Fore.getLogger(logger).d("doCallAsync() thread:" + Thread.currentThread())
+        Fore.getLogger(logger).v("doCallAsync() thread:" + threadName())
 
         return asyncMain(Fore.getWorkMode(workMode)) {
             try {
 
                 val result: S = awaitIO(Fore.getWorkMode(workMode)) {
 
-                    Fore.getLogger(logger).d("about to make call from io dispatcher, thread:" + Thread.currentThread())
+                    Fore.getLogger(logger)
+                        .v("about to make call from io dispatcher, thread:" + threadName())
 
                     call()
                 }
 
-                Fore.getLogger(logger).d("continuing back on main dispatcher thread:" + Thread.currentThread())
+                Fore.getLogger(logger)
+                    .v("continuing back on main dispatcher thread:" + threadName())
 
                 success(result)
 
             } catch (t: Throwable) {
 
-                Fore.getLogger(logger).w("processFailResponse() thread:${Thread.currentThread()} ${t.message}")
+                Fore.getLogger(logger)
+                    .w("processFailResponse() thread:${threadName()} ${t.message}")
 
-                fail(errorHandler.handleError(t, customErrorKlazz))
+                fail(errorHandler.handleError(t, kSerializer))
             }
         }
     }
diff --git a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/ErrorHandler.kt b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/wrap/ErrorHandler.kt
similarity index 69%
rename from fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/ErrorHandler.kt
rename to lib/fore-net/src/commonMain/kotlin/co/early/fore/net/wrap/ErrorHandler.kt
index 9cac71cf..2b07fd21 100644
--- a/fore-kt/fore-kt-network/src/main/java/co/early/fore/kt/net/ktor/ErrorHandler.kt
+++ b/lib/fore-net/src/commonMain/kotlin/co/early/fore/net/wrap/ErrorHandler.kt
@@ -1,6 +1,7 @@
-package co.early.fore.kt.net.ktor
+package co.early.fore.net.wrap
 
 import co.early.fore.net.MessageProvider
+import kotlinx.serialization.KSerializer
 
 /**
  *
@@ -11,9 +12,9 @@ interface ErrorHandler<F> {
     /**
      *
      * @param t throwable that caused the error
-     * @param customErrorClazz custom error class expected from the errorResponse, may be null
+     * @param KSerializer serializer for the custom error class expected from the errorResponse, may be null
      * @param <CE> class type of the custom error if specified
      * @return the parsed error from the server
     </CE> */
-    suspend fun <CE : MessageProvider<F>> handleError(t: Throwable, customErrorKlazz: kotlin.reflect.KClass<CE>?): F
+    suspend fun <CE : MessageProvider<F>> handleError(t: Throwable, kSerializer: KSerializer<CE>?): F
 }
diff --git a/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/DataHeuristicsTest.kt b/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/DataHeuristicsTest.kt
new file mode 100644
index 00000000..11ec1849
--- /dev/null
+++ b/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/DataHeuristicsTest.kt
@@ -0,0 +1,266 @@
+package co.early.fore.net
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import io.ktor.utils.io.core.toByteArray
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import okio.Buffer
+import okio.Path.Companion.toPath
+import okio.SYSTEM
+import kotlin.test.BeforeTest
+
+class DataHeuristicsTest {
+
+    @BeforeTest
+    fun setup(){
+        Fore.setDelegate(TestDelegateDefault())
+    }
+
+    @Test
+    fun testJsonFormatDetection() {
+        val body = Buffer().writeUtf8("{\"key\":\"value\"}")
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.Json, result)
+    }
+
+    @Test
+    fun testJsonFormatDetection2() {
+        val body = Buffer().writeUtf8("   [1, 2, 3]")
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.Json, result)
+    }
+
+    @Test
+    fun testJsonFormatDetection3() {
+        val body = Buffer().writeUtf8(
+            "{" +
+                    "   \"key\":\"value\"" +
+                    "}"
+        )
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.Json, result)
+    }
+
+    @Test
+    fun testXmlFormatDetection() {
+        val body = Buffer().writeUtf8("<?xml version=\"1.0\"?><root></root>")
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.Xml, result)
+    }
+
+    @Test
+    fun testHtmlFormatDetection() {
+        val body = Buffer().writeUtf8("<html><body>Hello</body></html>")
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.Html, result)
+    }
+
+    @Test
+    fun testJsFileFormatDetection() {
+        val body = Buffer().writeUtf8(readFileString("src/commonTest/resources/jquery.js"))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testPlainTextFormatDetection() {
+        val body = Buffer().writeUtf8("Just some plain text.")
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testPlainAsciiTextFormatDetection() {
+        val body = Buffer().write(byteArrayOf(0x68, 0x65, 0x6C, 0x6C, 0x6F)) // h e l l o in ASCII
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testPolishTextDetection3() {
+        val body = Buffer().writeUtf8(readFileString("src/commonTest/resources/polish.txt"))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testBinaryDataDetection() {
+        // PNG file
+        val body = Buffer().write(byteArrayOf(
+            0x89.toByte(), 0x50.toByte(), 0x4E.toByte(), 0x47.toByte(), // PNG Signature
+            0x0D.toByte(), 0x0A.toByte(), 0x1A.toByte(), 0x0A.toByte(),
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x0D.toByte(), // IHDR Chunk Length
+            0x49.toByte(), 0x48.toByte(), 0x44.toByte(), 0x52.toByte(), // IHDR Chunk Type
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x01.toByte(), // Width: 1
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x01.toByte(), // Height: 1
+            0x08.toByte(), 0x06.toByte(), 0x00.toByte(), 0x00.toByte(), // Bit Depth: 8, Color Type: 6 (RGBA)
+            0x00.toByte(), 0x1F.toByte(), 0x15.toByte(), 0xC4.toByte(), // CRC for IHDR
+            0x89.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), // IDAT Chunk Length
+            0x0A.toByte(), 0x49.toByte(), 0x44.toByte(), 0x41.toByte(), // IDAT Chunk Type
+            0x54.toByte(), 0x78.toByte(), 0x9C.toByte(), 0x63.toByte(), // Compressed Data
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x02.toByte(), // ZLIB Compressed Block
+            0x00.toByte(), 0x01.toByte(), 0xE2.toByte(), 0x21.toByte(), // CRC for IDAT
+            0xBC.toByte(), 0xA1.toByte(), 0xE6.toByte(), 0xF3.toByte(), // CRC for IDAT (continued)
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), // IEND Chunk Length
+            0x49.toByte(), 0x45.toByte(), 0x4E.toByte(), 0x44.toByte(), // IEND Chunk Type
+            0xAE.toByte(), 0x42.toByte(), 0x60.toByte(), 0x82.toByte()  // CRC for IEND
+        ))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.Binary, result)
+    }
+
+    @Test
+    fun testJpgBinaryDetection() {
+        val body = Buffer().writeUtf8(readFileString("src/commonTest/resources/test.jpg"))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.Binary, result)
+    }
+
+    @Test
+    fun testUTF16BigEndianPlainTextDetection() {
+        val body = Buffer().write(byteArrayOf(
+            // "Привет, мир!"
+            0x04.toByte(), 0x1F.toByte(), // 'П'
+            0x04.toByte(), 0x40.toByte(), // 'р'
+            0x04.toByte(), 0x38.toByte(), // 'и'
+            0x04.toByte(), 0x32.toByte(), // 'в'
+            0x04.toByte(), 0x35.toByte(), // 'е'
+            0x04.toByte(), 0x42.toByte(), // 'т'
+            0x00.toByte(), 0x2C.toByte(), // ','
+            0x00.toByte(), 0x20.toByte(), // ' '
+            0x04.toByte(), 0x3C.toByte(), // 'м'
+            0x04.toByte(), 0x38.toByte(), // 'и'
+            0x04.toByte(), 0x40.toByte(), // 'р'
+            0x00.toByte(), 0x21.toByte()  // '!'
+        ))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testUTF32BigEndianPlainTextDetection() {
+        val body = Buffer().write(byteArrayOf(
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x48.toByte(), // 'H'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x65.toByte(), // 'e'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x6C.toByte(), // 'l'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x6C.toByte(), // 'l'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x6F.toByte(), // 'o'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x2C.toByte(), // ','
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x20.toByte(), // ' '
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x77.toByte(), // 'w'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x6F.toByte(), // 'o'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x72.toByte(), // 'r'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x6C.toByte(), // 'l'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x64.toByte(), // 'd'
+            0x00.toByte(), 0x00.toByte(), 0x00.toByte(), 0x21.toByte(), // '!'
+        ))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testUTF32LittleEndianPlainTextDetection() {
+        val body = Buffer().write(byteArrayOf(
+            0x1F.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'П'
+            0x40.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'р'
+            0x38.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'и'
+            0x32.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'в'
+            0x35.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'е'
+            0x42.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'т'
+            0x2C.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), // ','
+            0x20.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), // ' '
+            0x3C.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'м'
+            0x38.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'и'
+            0x40.toByte(), 0x04.toByte(), 0x00.toByte(), 0x00.toByte(), // 'р'
+            0x21.toByte(), 0x00.toByte(), 0x00.toByte(), 0x00.toByte()  // '!'
+        ))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testBadlyTruncatedUTF8() {
+
+        val validUtf8With4ByteFinalCharacter = "\uD83E\uDD23\uD83D\uDCA9\uD83D\uDE0E\uFE0F\uD83D\uDE40\uD83D\uDE0D\uD83D\uDE2C\uD83D\uDC80"  // "🤣💩😎️🙀😍😬💀"
+
+        val body = Buffer().write(
+            validUtf8With4ByteFinalCharacter.toByteArray().dropLast(1).toByteArray()  // truncate 1 byte only
+        )
+
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testShiftJsPlainTextDetection() {
+        val body = Buffer().write(byteArrayOf(
+            // "こんにちは" (Hello)
+            0x82.toByte(), 0xA0.toByte(), // こ
+            0x82.toByte(), 0xA2.toByte(), // ん
+            0x82.toByte(), 0xA4.toByte(), // に
+            0x82.toByte(), 0xA6.toByte(), // ち
+            0x82.toByte(), 0xA8.toByte(), // は
+
+            // "世界" (World)
+            0x8C.toByte(), 0xF3.toByte(), // 世
+            0x8C.toByte(), 0xF1.toByte(), // 界
+        ))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testBig5PlainTextDetection() {
+        val body = Buffer().write(byteArrayOf(
+            0xA4.toByte(), 0xA4.toByte(),  // "中"
+            0xA4.toByte(), 0xA6.toByte(),  // "文"
+            0xA4.toByte(), 0xAB.toByte(),  // "国"
+            0xA5.toByte(), 0xB7.toByte(),  // "人"
+            0xA5.toByte(), 0xB6.toByte(),  // "大"
+            0xA4.toByte(), 0xAD.toByte(),  // "学"
+            0xA6.toByte(), 0xA1.toByte(),  // "生"
+            0xA5.toByte(), 0xD5.toByte(),  // "好"
+            0xA4.toByte(), 0xAE.toByte(),  // "天"
+            0xA6.toByte(), 0xA2.toByte(),  // "地"
+            0xA1.toByte(), 0xE4.toByte(),  // "的"
+            0xA1.toByte(), 0xC2.toByte(),  // "是"
+            0xA4.toByte(), 0xE4.toByte(),  // "文"
+            0xA9.toByte(), 0xAA.toByte(),  // "？"
+            0xA9.toByte(), 0xA8.toByte()   // "！"
+        ))
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testJsonWithLeadingWhiteSpaceFormatDetection() {
+        val body = Buffer().writeUtf8("   \n{\"key\":\"value\"}")
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.Json, result)
+    }
+
+    @Test
+    fun testVeryShortBuffer() {
+        val shortBuffer = Buffer().writeUtf8("a")
+        assertEquals(BodyRenderFormat.PlainText, inferBodyRenderFormat(shortBuffer))
+    }
+
+    @Test
+    fun testWhitespaceOnlyBuffer() {
+        val body = Buffer().writeUtf8("   \n\t   ")
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+
+    @Test
+    fun testEmptyBufferDetection() {
+        val body = Buffer()
+        val result = inferBodyRenderFormat(body)
+        assertEquals(BodyRenderFormat.PlainText, result)
+    }
+}
+
+fun readFileString(path: String): String {
+    return okio.FileSystem.SYSTEM.read(path.toPath()) { readUtf8() }
+}
diff --git a/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/PrettifierJsonTest.kt b/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/PrettifierJsonTest.kt
new file mode 100644
index 00000000..ec9819b7
--- /dev/null
+++ b/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/PrettifierJsonTest.kt
@@ -0,0 +1,153 @@
+package co.early.fore.net
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import okio.Buffer
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class PrettifierJsonTest {
+
+    @BeforeTest
+    fun setup(){
+        Fore.setDelegate(TestDelegateDefault())
+    }
+
+    @Test
+    fun `pretty print simple JSON object`() {
+        val input = """{"key":"value"}"""
+        val expected = """
+            {
+              "key":"value"
+            }
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print JSON list of objects`() {
+        val input = """[{"name":"orange","isCitrus":true,"tastyPercentScore":43}]"""
+        val expected = """
+            [
+              {
+                "name":"orange",
+                "isCitrus":true,
+                "tastyPercentScore":43
+              }
+            ]
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print already formatted JSON`() {
+        val input = """[
+              {
+                "name":"orange",
+                "isCitrus":true,
+                "tastyPercentScore":43
+              }
+            ]"""
+        val expected = """
+            [
+              {
+                "name":"orange",
+                "isCitrus":true,
+                "tastyPercentScore":43
+              }
+            ]
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print JSON with nested objects`() {
+        val input = """{"key1":{"key2":{"key3":"value"}}}"""
+        val expected = """
+            {
+              "key1":{
+                "key2":{
+                  "key3":"value"
+                }
+              }
+            }
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print JSON with arrays`() {
+        val input = """{"array":[1,2,3]}"""
+        val expected = """
+            {
+              "array":[
+                1,
+                2,
+                3
+              ]
+            }
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print JSON with mixed structures`() {
+        val input = """{"array":[1,{"key":"value"},3],"object":{"nestedKey":"nestedValue"}}"""
+        val expected = """
+            {
+              "array":[
+                1,
+                {
+                  "key":"value"
+                },
+                3
+              ],
+              "object":{
+                "nestedKey":"nestedValue"
+              }
+            }
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print invalid JSON structure`() {
+        val input = """{key: "value"}"""
+        val expected = """
+            {
+              key:"value"
+            }
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print empty input`() {
+        val input = ""
+        val expected = ""
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print truncated JSON`() {
+        val input = """{"array":[1,{"key":"value"},3],"obj"""
+        val expected = """
+            {
+              "array":[
+                1,
+                {
+                  "key":"value"
+                },
+                3
+              ],
+              "obj
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    private fun prettyPrint(json: String): String {
+        val buffer = Buffer().writeUtf8(json)
+        return buffer.jsonPrettyPrint()
+    }
+}
diff --git a/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/PrettifierXmlTest.kt b/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/PrettifierXmlTest.kt
new file mode 100644
index 00000000..904eb123
--- /dev/null
+++ b/lib/fore-net/src/commonTest/kotlin/co/early/fore/net/PrettifierXmlTest.kt
@@ -0,0 +1,223 @@
+package co.early.fore.net
+
+import co.early.fore.core.delegate.Fore
+import co.early.fore.core.delegate.TestDelegateDefault
+import okio.Buffer
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class PrettifierXmlTest {
+
+    @BeforeTest
+    fun setup(){
+        Fore.setDelegate(TestDelegateDefault())
+    }
+
+    @Test
+    fun `pretty print empty HTML`() {
+        val input = ""
+        val expected = ""
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print single tag`() {
+        val input = "<html>"
+        val expected = """
+            <html>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print self-closing tag`() {
+        val input = "<br/>"
+        val expected = """
+            <br/>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print single tag with content`() {
+        val input = "<p>Hello, World!</p>"
+        val expected = """
+            <p>Hello, World!</p>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print nested tags`() {
+        val input = "<html><body><p>Text</p></body></html>"
+        val expected = """
+            <html>
+              <body>
+                <p>Text</p>
+              </body>
+            </html>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print tags with attributes`() {
+        val input = """<div class="container"><p id="intro">Welcome</p></div>"""
+        val expected = """
+            <div class="container">
+              <p id="intro">Welcome</p>
+            </div>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print complex HTML`() {
+        val input = """
+            <html>
+            <head><title>Test</title></head>
+            <body>
+              <div>
+                <p>Hello</p>
+                <br/>
+              </div>
+            </body>
+            </html>
+        """.trimIndent()
+        val expected = """
+            <html>
+              <head>
+                <title>Test</title>
+              </head>
+              <body>
+                <div>
+                  <p>Hello</p>
+                  <br/>
+                </div>
+              </body>
+            </html>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print closing tags only`() {
+        val input = "</div></p></body>"
+        val expected = """
+            </div>
+            </p>
+            </body>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print with special comments`() {
+        val input = "<!-- This is a comment --><div></div>"
+        val expected = """
+            <!-- This is a comment -->
+            <div>
+            </div>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print with processing instructions`() {
+        val input = "<?xml version=\"1.0\"?><data></data>"
+        val expected = """
+            <?xml version="1.0"?>
+            <data>
+            </data>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print truncated HTML`() {
+        val input = """
+            <html>
+            <head><title>Test</title></head>
+            <body>
+              <div>
+                <p>Hello</p>
+                <br/>
+              </di
+        """.trimIndent()
+        val expected = """
+            <html>
+              <head>
+                <title>Test</title>
+              </head>
+              <body>
+                <div>
+                  <p>Hello</p>
+                  <br/>
+                </di
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print truncated HTML 2`() {
+        val input = """
+            <html>
+            <head><title>Test</title></head>
+            <body>
+              <div
+        """.trimIndent()
+        val expected = """
+            <html>
+              <head>
+                <title>Test</title>
+              </head>
+              <body>
+                <div
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    @Test
+    fun `pretty print XML`() {
+        val input = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <response><status>success</status><message>Request processed successfully</message>
+            <data><user><id>12345</id><username>john_doe</username>
+            <email>john.doe@example.com</email><fullName>John Doe</fullName>
+            <createdAt>2024-12-17T14:45:00Z</createdAt></user><transaction>
+            <transactionId>98765</transactionId><amount>150.00</amount><currency>USD</currency>
+            <status>completed</status><timestamp>2024-12-17T14:45:15Z</timestamp></transaction>
+            </data></response>
+        """.trimIndent()
+        val expected = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <response>
+              <status>success</status>
+              <message>Request processed successfully</message>
+              <data>
+                <user>
+                  <id>12345</id>
+                  <username>john_doe</username>
+                  <email>john.doe@example.com</email>
+                  <fullName>John Doe</fullName>
+                  <createdAt>2024-12-17T14:45:00Z</createdAt>
+                </user>
+                <transaction>
+                  <transactionId>98765</transactionId>
+                  <amount>150.00</amount>
+                  <currency>USD</currency>
+                  <status>completed</status>
+                  <timestamp>2024-12-17T14:45:15Z</timestamp>
+                </transaction>
+              </data>
+            </response>
+        """.trimIndent()
+        assertEquals(expected, prettyPrint(input))
+    }
+
+    private fun prettyPrint(input: String): String {
+        val buffer = Buffer().writeUtf8(input)
+        return buffer.xmlPrettyPrint()
+    }
+}
diff --git a/lib/fore-net/src/commonTest/resources/jquery.js b/lib/fore-net/src/commonTest/resources/jquery.js
new file mode 100644
index 00000000..f5296f10
--- /dev/null
+++ b/lib/fore-net/src/commonTest/resources/jquery.js
@@ -0,0 +1,763 @@
+import{$,c as commonjsGlobal,g as getDefaultExportFromCjs,a as getAugmentedNamespace,B as Base64,b as configs,p as parser,s as settings,i as i18n,u as urlParameters,o as overpass,h as htmlentities,l as lzw_decode,d as lzw_encode,_ as _$1,f as ffs_construct_query,e as ffs_repair_search}from"./urlParameters-2b23d0ae.js";/*! jQuery UI - v1.13.2 - 2022-07-14
+* http://jqueryui.com
+* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */(function(g){typeof define=="function"&&define.amd?define(["jquery"],g):g($)})(function(g){g.ui=g.ui||{},g.ui.version="1.13.2";/*!
+ * jQuery UI Widget 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */var B=0,x=Array.prototype.hasOwnProperty,Q=Array.prototype.slice;g.cleanData=function(d){return function(w){var C,b,I;for(I=0;(b=w[I])!=null;I++)C=g._data(b,"events"),C&&C.remove&&g(b).triggerHandler("remove");d(w)}}(g.cleanData),g.widget=function(d,w,C){var b,I,k,M={},K=d.split(".")[0];d=d.split(".")[1];var W=K+"-"+d;return C||(C=w,w=g.Widget),Array.isArray(C)&&(C=g.extend.apply(null,[{}].concat(C))),g.expr.pseudos[W.toLowerCase()]=function(q){return!!g.data(q,W)},g[K]=g[K]||{},b=g[K][d],I=g[K][d]=function(q,te){if(!this||!this._createWidget)return new I(q,te);arguments.length&&this._createWidget(q,te)},g.extend(I,b,{version:C.version,_proto:g.extend({},C),_childConstructors:[]}),k=new w,k.options=g.widget.extend({},k.options),g.each(C,function(q,te){if(typeof te!="function"){M[q]=te;return}M[q]=function(){function he(){return w.prototype[q].apply(this,arguments)}function ne(ie){return w.prototype[q].apply(this,ie)}return function(){var ie=this._super,re=this._superApply,ce;return this._super=he,this._superApply=ne,ce=te.apply(this,arguments),this._super=ie,this._superApply=re,ce}}()}),I.prototype=g.widget.extend(k,{widgetEventPrefix:b&&k.widgetEventPrefix||d},M,{constructor:I,namespace:K,widgetName:d,widgetFullName:W}),b?(g.each(b._childConstructors,function(q,te){var he=te.prototype;g.widget(he.namespace+"."+he.widgetName,I,te._proto)}),delete b._childConstructors):w._childConstructors.push(I),g.widget.bridge(d,I),I},g.widget.extend=function(d){for(var w=Q.call(arguments,1),C=0,b=w.length,I,k;C<b;C++)for(I in w[C])k=w[C][I],x.call(w[C],I)&&k!==void 0&&(g.isPlainObject(k)?d[I]=g.isPlainObject(d[I])?g.widget.extend({},d[I],k):g.widget.extend({},k):d[I]=k);return d},g.widget.bridge=function(d,w){var C=w.prototype.widgetFullName||d;g.fn[d]=function(b){var I=typeof b=="string",k=Q.call(arguments,1),M=this;return I?!this.length&&b==="instance"?M=void 0:this.each(function(){var K,W=g.data(this,C);if(b==="instance")return M=W,!1;if(!W)return g.error("cannot call methods on "+d+" prior to initialization; attempted to call method '"+b+"'");if(typeof W[b]!="function"||b.charAt(0)==="_")return g.error("no such method '"+b+"' for "+d+" widget instance");if(K=W[b].apply(W,k),K!==W&&K!==void 0)return M=K&&K.jquery?M.pushStack(K.get()):K,!1}):(k.length&&(b=g.widget.extend.apply(null,[b].concat(k))),this.each(function(){var K=g.data(this,C);K?(K.option(b||{}),K._init&&K._init()):g.data(this,C,new w(b,this))})),M}},g.Widget=function(){},g.Widget._childConstructors=[],g.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(d,w){w=g(w||this.defaultElement||this)[0],this.element=g(w),this.uuid=B++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=g(),this.hoverable=g(),this.focusable=g(),this.classesElementLookup={},w!==this&&(g.data(w,this.widgetFullName,this),this._on(!0,this.element,{remove:function(C){C.target===w&&this.destroy()}}),this.document=g(w.style?w.ownerDocument:w.document||w),this.window=g(this.document[0].defaultView||this.document[0].parentWindow)),this.options=g.widget.extend({},this.options,this._getCreateOptions(),d),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:g.noop,_create:g.noop,_init:g.noop,destroy:function(){var d=this;this._destroy(),g.each(this.classesElementLookup,function(w,C){d._removeClass(C,w)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:g.noop,widget:function(){return this.element},option:function(d,w){var C=d,b,I,k;if(arguments.length===0)return g.widget.extend({},this.options);if(typeof d=="string")if(C={},b=d.split("."),d=b.shift(),b.length){for(I=C[d]=g.widget.extend({},this.options[d]),k=0;k<b.length-1;k++)I[b[k]]=I[b[k]]||{},I=I[b[k]];if(d=b.pop(),arguments.length===1)return I[d]===void 0?null:I[d];I[d]=w}else{if(arguments.length===1)return this.options[d]===void 0?null:this.options[d];C[d]=w}return this._setOptions(C),this},_setOptions:function(d){var w;for(w in d)this._setOption(w,d[w]);return this},_setOption:function(d,w){return d==="classes"&&this._setOptionClasses(w),this.options[d]=w,d==="disabled"&&this._setOptionDisabled(w),this},_setOptionClasses:function(d){var w,C,b;for(w in d)b=this.classesElementLookup[w],!(d[w]===this.options.classes[w]||!b||!b.length)&&(C=g(b.get()),this._removeClass(b,w),C.addClass(this._classes({element:C,keys:w,classes:d,add:!0})))},_setOptionDisabled:function(d){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!d),d&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(d){var w=[],C=this;d=g.extend({element:this.element,classes:this.options.classes||{}},d);function b(){var k=[];d.element.each(function(M,K){var W=g.map(C.classesElementLookup,function(q){return q}).some(function(q){return q.is(K)});W||k.push(K)}),C._on(g(k),{remove:"_untrackClassesElement"})}function I(k,M){var K,W;for(W=0;W<k.length;W++)K=C.classesElementLookup[k[W]]||g(),d.add?(b(),K=g(g.uniqueSort(K.get().concat(d.element.get())))):K=g(K.not(d.element).get()),C.classesElementLookup[k[W]]=K,w.push(k[W]),M&&d.classes[k[W]]&&w.push(d.classes[k[W]])}return d.keys&&I(d.keys.match(/\S+/g)||[],!0),d.extra&&I(d.extra.match(/\S+/g)||[]),w.join(" ")},_untrackClassesElement:function(d){var w=this;g.each(w.classesElementLookup,function(C,b){g.inArray(d.target,b)!==-1&&(w.classesElementLookup[C]=g(b.not(d.target).get()))}),this._off(g(d.target))},_removeClass:function(d,w,C){return this._toggleClass(d,w,C,!1)},_addClass:function(d,w,C){return this._toggleClass(d,w,C,!0)},_toggleClass:function(d,w,C,b){b=typeof b=="boolean"?b:C;var I=typeof d=="string"||d===null,k={extra:I?w:C,keys:I?d:w,element:I?this.element:d,add:b};return k.element.toggleClass(this._classes(k),b),this},_on:function(d,w,C){var b,I=this;typeof d!="boolean"&&(C=w,w=d,d=!1),C?(w=b=g(w),this.bindings=this.bindings.add(w)):(C=w,w=this.element,b=this.widget()),g.each(C,function(k,M){function K(){if(!(!d&&(I.options.disabled===!0||g(this).hasClass("ui-state-disabled"))))return(typeof M=="string"?I[M]:M).apply(I,arguments)}typeof M!="string"&&(K.guid=M.guid=M.guid||K.guid||g.guid++);var W=k.match(/^([\w:-]*)\s*(.*)$/),q=W[1]+I.eventNamespace,te=W[2];te?b.on(q,te,K):w.on(q,K)})},_off:function(d,w){w=(w||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,d.off(w),this.bindings=g(this.bindings.not(d).get()),this.focusable=g(this.focusable.not(d).get()),this.hoverable=g(this.hoverable.not(d).get())},_delay:function(d,w){function C(){return(typeof d=="string"?b[d]:d).apply(b,arguments)}var b=this;return setTimeout(C,w||0)},_hoverable:function(d){this.hoverable=this.hoverable.add(d),this._on(d,{mouseenter:function(w){this._addClass(g(w.currentTarget),null,"ui-state-hover")},mouseleave:function(w){this._removeClass(g(w.currentTarget),null,"ui-state-hover")}})},_focusable:function(d){this.focusable=this.focusable.add(d),this._on(d,{focusin:function(w){this._addClass(g(w.currentTarget),null,"ui-state-focus")},focusout:function(w){this._removeClass(g(w.currentTarget),null,"ui-state-focus")}})},_trigger:function(d,w,C){var b,I,k=this.options[d];if(C=C||{},w=g.Event(w),w.type=(d===this.widgetEventPrefix?d:this.widgetEventPrefix+d).toLowerCase(),w.target=this.element[0],I=w.originalEvent,I)for(b in I)b in w||(w[b]=I[b]);return this.element.trigger(w,C),!(typeof k=="function"&&k.apply(this.element[0],[w].concat(C))===!1||w.isDefaultPrevented())}},g.each({show:"fadeIn",hide:"fadeOut"},function(d,w){g.Widget.prototype["_"+d]=function(C,b,I){typeof b=="string"&&(b={effect:b});var k,M=b?b===!0||typeof b=="number"?w:b.effect||w:d;b=b||{},typeof b=="number"?b={duration:b}:b===!0&&(b={}),k=!g.isEmptyObject(b),b.complete=I,b.delay&&C.delay(b.delay),k&&g.effects&&g.effects.effect[M]?C[d](b):M!==d&&C[M]?C[M](b.duration,b.easing,I):C.queue(function(K){g(this)[d](),I&&I.call(C[0]),K()})}}),g.widget;/*!
+ * jQuery UI Position 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/position/
+ */(function(){var d,w=Math.max,C=Math.abs,b=/left|center|right/,I=/top|center|bottom/,k=/[\+\-]\d+(\.[\d]+)?%?/,M=/^\w+/,K=/%$/,W=g.fn.position;function q(ie,re,ce){return[parseFloat(ie[0])*(K.test(ie[0])?re/100:1),parseFloat(ie[1])*(K.test(ie[1])?ce/100:1)]}function te(ie,re){return parseInt(g.css(ie,re),10)||0}function he(ie){return ie!=null&&ie===ie.window}function ne(ie){var re=ie[0];return re.nodeType===9?{width:ie.width(),height:ie.height(),offset:{top:0,left:0}}:he(re)?{width:ie.width(),height:ie.height(),offset:{top:ie.scrollTop(),left:ie.scrollLeft()}}:re.preventDefault?{width:0,height:0,offset:{top:re.pageY,left:re.pageX}}:{width:ie.outerWidth(),height:ie.outerHeight(),offset:ie.offset()}}g.position={scrollbarWidth:function(){if(d!==void 0)return d;var ie,re,ce=g("<div style='display:block;position:absolute;width:200px;height:200px;overflow:hidden;'><div style='height:300px;width:auto;'></div></div>"),Be=ce.children()[0];return g("body").append(ce),ie=Be.offsetWidth,ce.css("overflow","scroll"),re=Be.offsetWidth,ie===re&&(re=ce[0].clientWidth),ce.remove(),d=ie-re},getScrollInfo:function(ie){var re=ie.isWindow||ie.isDocument?"":ie.element.css("overflow-x"),ce=ie.isWindow||ie.isDocument?"":ie.element.css("overflow-y"),Be=re==="scroll"||re==="auto"&&ie.width<ie.element[0].scrollWidth,Fe=ce==="scroll"||ce==="auto"&&ie.height<ie.element[0].scrollHeight;return{width:Fe?g.position.scrollbarWidth():0,height:Be?g.position.scrollbarWidth():0}},getWithinInfo:function(ie){var re=g(ie||window),ce=he(re[0]),Be=!!re[0]&&re[0].nodeType===9,Fe=!ce&&!Be;return{element:re,isWindow:ce,isDocument:Be,offset:Fe?g(ie).offset():{left:0,top:0},scrollLeft:re.scrollLeft(),scrollTop:re.scrollTop(),width:re.outerWidth(),height:re.outerHeight()}}},g.fn.position=function(ie){if(!ie||!ie.of)return W.apply(this,arguments);ie=g.extend({},ie);var re,ce,Be,Fe,Te,Ne,Oe=typeof ie.of=="string"?g(document).find(ie.of):g(ie.of),De=g.position.getWithinInfo(ie.within),et=g.position.getScrollInfo(De),Ye=(ie.collision||"flip").split(" "),qe={};return Ne=ne(Oe),Oe[0].preventDefault&&(ie.at="left top"),ce=Ne.width,Be=Ne.height,Fe=Ne.offset,Te=g.extend({},Fe),g.each(["my","at"],function(){var Xe=(ie[this]||"").split(" "),rt,$e;Xe.length===1&&(Xe=b.test(Xe[0])?Xe.concat(["center"]):I.test(Xe[0])?["center"].concat(Xe):["center","center"]),Xe[0]=b.test(Xe[0])?Xe[0]:"center",Xe[1]=I.test(Xe[1])?Xe[1]:"center",rt=k.exec(Xe[0]),$e=k.exec(Xe[1]),qe[this]=[rt?rt[0]:0,$e?$e[0]:0],ie[this]=[M.exec(Xe[0])[0],M.exec(Xe[1])[0]]}),Ye.length===1&&(Ye[1]=Ye[0]),ie.at[0]==="right"?Te.left+=ce:ie.at[0]==="center"&&(Te.left+=ce/2),ie.at[1]==="bottom"?Te.top+=Be:ie.at[1]==="center"&&(Te.top+=Be/2),re=q(qe.at,ce,Be),Te.left+=re[0],Te.top+=re[1],this.each(function(){var Xe,rt,$e=g(this),pt=$e.outerWidth(),gt=$e.outerHeight(),Qt=te(this,"marginLeft"),xt=te(this,"marginTop"),qt=pt+Qt+te(this,"marginRight")+et.width,_t=gt+xt+te(this,"marginBottom")+et.height,Ge=g.extend({},Te),Kt=q(qe.my,$e.outerWidth(),$e.outerHeight());ie.my[0]==="right"?Ge.left-=pt:ie.my[0]==="center"&&(Ge.left-=pt/2),ie.my[1]==="bottom"?Ge.top-=gt:ie.my[1]==="center"&&(Ge.top-=gt/2),Ge.left+=Kt[0],Ge.top+=Kt[1],Xe={marginLeft:Qt,marginTop:xt},g.each(["left","top"],function(At,Ct){g.ui.position[Ye[At]]&&g.ui.position[Ye[At]][Ct](Ge,{targetWidth:ce,targetHeight:Be,elemWidth:pt,elemHeight:gt,collisionPosition:Xe,collisionWidth:qt,collisionHeight:_t,offset:[re[0]+Kt[0],re[1]+Kt[1]],my:ie.my,at:ie.at,within:De,elem:$e})}),ie.using&&(rt=function(At){var Ct=Fe.left-Ge.left,bt=Ct+ce-pt,kt=Fe.top-Ge.top,zt=kt+Be-gt,St={target:{element:Oe,left:Fe.left,top:Fe.top,width:ce,height:Be},element:{element:$e,left:Ge.left,top:Ge.top,width:pt,height:gt},horizontal:bt<0?"left":Ct>0?"right":"center",vertical:zt<0?"top":kt>0?"bottom":"middle"};ce<pt&&C(Ct+bt)<ce&&(St.horizontal="center"),Be<gt&&C(kt+zt)<Be&&(St.vertical="middle"),w(C(Ct),C(bt))>w(C(kt),C(zt))?St.important="horizontal":St.important="vertical",ie.using.call(this,At,St)}),$e.offset(g.extend(Ge,{using:rt}))})},g.ui.position={fit:{left:function(ie,re){var ce=re.within,Be=ce.isWindow?ce.scrollLeft:ce.offset.left,Fe=ce.width,Te=ie.left-re.collisionPosition.marginLeft,Ne=Be-Te,Oe=Te+re.collisionWidth-Fe-Be,De;re.collisionWidth>Fe?Ne>0&&Oe<=0?(De=ie.left+Ne+re.collisionWidth-Fe-Be,ie.left+=Ne-De):Oe>0&&Ne<=0?ie.left=Be:Ne>Oe?ie.left=Be+Fe-re.collisionWidth:ie.left=Be:Ne>0?ie.left+=Ne:Oe>0?ie.left-=Oe:ie.left=w(ie.left-Te,ie.left)},top:function(ie,re){var ce=re.within,Be=ce.isWindow?ce.scrollTop:ce.offset.top,Fe=re.within.height,Te=ie.top-re.collisionPosition.marginTop,Ne=Be-Te,Oe=Te+re.collisionHeight-Fe-Be,De;re.collisionHeight>Fe?Ne>0&&Oe<=0?(De=ie.top+Ne+re.collisionHeight-Fe-Be,ie.top+=Ne-De):Oe>0&&Ne<=0?ie.top=Be:Ne>Oe?ie.top=Be+Fe-re.collisionHeight:ie.top=Be:Ne>0?ie.top+=Ne:Oe>0?ie.top-=Oe:ie.top=w(ie.top-Te,ie.top)}},flip:{left:function(ie,re){var ce=re.within,Be=ce.offset.left+ce.scrollLeft,Fe=ce.width,Te=ce.isWindow?ce.scrollLeft:ce.offset.left,Ne=ie.left-re.collisionPosition.marginLeft,Oe=Ne-Te,De=Ne+re.collisionWidth-Fe-Te,et=re.my[0]==="left"?-re.elemWidth:re.my[0]==="right"?re.elemWidth:0,Ye=re.at[0]==="left"?re.targetWidth:re.at[0]==="right"?-re.targetWidth:0,qe=-2*re.offset[0],Xe,rt;Oe<0?(Xe=ie.left+et+Ye+qe+re.collisionWidth-Fe-Be,(Xe<0||Xe<C(Oe))&&(ie.left+=et+Ye+qe)):De>0&&(rt=ie.left-re.collisionPosition.marginLeft+et+Ye+qe-Te,(rt>0||C(rt)<De)&&(ie.left+=et+Ye+qe))},top:function(ie,re){var ce=re.within,Be=ce.offset.top+ce.scrollTop,Fe=ce.height,Te=ce.isWindow?ce.scrollTop:ce.offset.top,Ne=ie.top-re.collisionPosition.marginTop,Oe=Ne-Te,De=Ne+re.collisionHeight-Fe-Te,et=re.my[1]==="top",Ye=et?-re.elemHeight:re.my[1]==="bottom"?re.elemHeight:0,qe=re.at[1]==="top"?re.targetHeight:re.at[1]==="bottom"?-re.targetHeight:0,Xe=-2*re.offset[1],rt,$e;Oe<0?($e=ie.top+Ye+qe+Xe+re.collisionHeight-Fe-Be,($e<0||$e<C(Oe))&&(ie.top+=Ye+qe+Xe)):De>0&&(rt=ie.top-re.collisionPosition.marginTop+Ye+qe+Xe-Te,(rt>0||C(rt)<De)&&(ie.top+=Ye+qe+Xe))}},flipfit:{left:function(){g.ui.position.flip.left.apply(this,arguments),g.ui.position.fit.left.apply(this,arguments)},top:function(){g.ui.position.flip.top.apply(this,arguments),g.ui.position.fit.top.apply(this,arguments)}}}})(),g.ui.position;/*!
+ * jQuery UI :data 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.extend(g.expr.pseudos,{data:g.expr.createPseudo?g.expr.createPseudo(function(d){return function(w){return!!g.data(w,d)}}):function(d,w,C){return!!g.data(d,C[3])}});/*!
+ * jQuery UI Disable Selection 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.fn.extend({disableSelection:function(){var d="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(d+".ui-disableSelection",function(w){w.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}});var S=g;/*!
+ * jQuery Color Animations v2.2.0
+ * https://github.com/jquery/jquery-color
+ *
+ * Copyright OpenJS Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * Date: Sun May 10 09:02:36 2020 +0200
+ */var D="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",H={},P=H.toString,R=/^([\-+])=\s*(\d+\.?\d*)/,Y=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(d){return[d[1],d[2],d[3],d[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(d){return[d[1]*2.55,d[2]*2.55,d[3]*2.55,d[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})?/,parse:function(d){return[parseInt(d[1],16),parseInt(d[2],16),parseInt(d[3],16),d[4]?(parseInt(d[4],16)/255).toFixed(2):1]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])([a-f0-9])?/,parse:function(d){return[parseInt(d[1]+d[1],16),parseInt(d[2]+d[2],16),parseInt(d[3]+d[3],16),d[4]?(parseInt(d[4]+d[4],16)/255).toFixed(2):1]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(d){return[d[1],d[2]/100,d[3]/100,d[4]]}}],G=S.Color=function(d,w,C,b){return new S.Color.fn.parse(d,w,C,b)},X={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},ee={byte:{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},Ae=G.support={},le=S("<p>")[0],ae,ge=S.each;le.style.cssText="background-color:rgba(1,1,1,.5)",Ae.rgba=le.style.backgroundColor.indexOf("rgba")>-1,ge(X,function(d,w){w.cache="_"+d,w.props.alpha={idx:3,type:"percent",def:1}}),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(d,w){H["[object "+w+"]"]=w.toLowerCase()});function fe(d){return d==null?d+"":typeof d=="object"?H[P.call(d)]||"object":typeof d}function ye(d,w,C){var b=ee[w.type]||{};return d==null?C||!w.def?null:w.def:(d=b.floor?~~d:parseFloat(d),isNaN(d)?w.def:b.mod?(d+b.mod)%b.mod:Math.min(b.max,Math.max(0,d)))}function me(d){var w=G(),C=w._rgba=[];return d=d.toLowerCase(),ge(Y,function(b,I){var k,M=I.re.exec(d),K=M&&I.parse(M),W=I.space||"rgba";if(K)return k=w[W](K),w[X[W].cache]=k[X[W].cache],C=w._rgba=k._rgba,!1}),C.length?(C.join()==="0,0,0,0"&&S.extend(C,ae.transparent),w):ae[d]}G.fn=S.extend(G.prototype,{parse:function(d,w,C,b){if(d===void 0)return this._rgba=[null,null,null,null],this;(d.jquery||d.nodeType)&&(d=S(d).css(w),w=void 0);var I=this,k=fe(d),M=this._rgba=[];if(w!==void 0&&(d=[d,w,C,b],k="array"),k==="string")return this.parse(me(d)||ae._default);if(k==="array")return ge(X.rgba.props,function(K,W){M[W.idx]=ye(d[W.idx],W)}),this;if(k==="object")return d instanceof G?ge(X,function(K,W){d[W.cache]&&(I[W.cache]=d[W.cache].slice())}):ge(X,function(K,W){var q=W.cache;ge(W.props,function(te,he){if(!I[q]&&W.to){if(te==="alpha"||d[te]==null)return;I[q]=W.to(I._rgba)}I[q][he.idx]=ye(d[te],he,!0)}),I[q]&&S.inArray(null,I[q].slice(0,3))<0&&(I[q][3]==null&&(I[q][3]=1),W.from&&(I._rgba=W.from(I[q])))}),this},is:function(d){var w=G(d),C=!0,b=this;return ge(X,function(I,k){var M,K=w[k.cache];return K&&(M=b[k.cache]||k.to&&k.to(b._rgba)||[],ge(k.props,function(W,q){if(K[q.idx]!=null)return C=K[q.idx]===M[q.idx],C})),C}),C},_space:function(){var d=[],w=this;return ge(X,function(C,b){w[b.cache]&&d.push(C)}),d.pop()},transition:function(d,w){var C=G(d),b=C._space(),I=X[b],k=this.alpha()===0?G("transparent"):this,M=k[I.cache]||I.to(k._rgba),K=M.slice();return C=C[I.cache],ge(I.props,function(W,q){var te=q.idx,he=M[te],ne=C[te],ie=ee[q.type]||{};ne!==null&&(he===null?K[te]=ne:(ie.mod&&(ne-he>ie.mod/2?he+=ie.mod:he-ne>ie.mod/2&&(he-=ie.mod)),K[te]=ye((ne-he)*w+he,q)))}),this[b](K)},blend:function(d){if(this._rgba[3]===1)return this;var w=this._rgba.slice(),C=w.pop(),b=G(d)._rgba;return G(S.map(w,function(I,k){return(1-C)*b[k]+C*I}))},toRgbaString:function(){var d="rgba(",w=S.map(this._rgba,function(C,b){return C??(b>2?1:0)});return w[3]===1&&(w.pop(),d="rgb("),d+w.join()+")"},toHslaString:function(){var d="hsla(",w=S.map(this.hsla(),function(C,b){return C==null&&(C=b>2?1:0),b&&b<3&&(C=Math.round(C*100)+"%"),C});return w[3]===1&&(w.pop(),d="hsl("),d+w.join()+")"},toHexString:function(d){var w=this._rgba.slice(),C=w.pop();return d&&w.push(~~(C*255)),"#"+S.map(w,function(b){return b=(b||0).toString(16),b.length===1?"0"+b:b}).join("")},toString:function(){return this._rgba[3]===0?"transparent":this.toRgbaString()}}),G.fn.parse.prototype=G.fn;function we(d,w,C){return C=(C+1)%1,C*6<1?d+(w-d)*C*6:C*2<1?w:C*3<2?d+(w-d)*(2/3-C)*6:d}X.hsla.to=function(d){if(d[0]==null||d[1]==null||d[2]==null)return[null,null,null,d[3]];var w=d[0]/255,C=d[1]/255,b=d[2]/255,I=d[3],k=Math.max(w,C,b),M=Math.min(w,C,b),K=k-M,W=k+M,q=W*.5,te,he;return M===k?te=0:w===k?te=60*(C-b)/K+360:C===k?te=60*(b-w)/K+120:te=60*(w-C)/K+240,K===0?he=0:q<=.5?he=K/W:he=K/(2-W),[Math.round(te)%360,he,q,I??1]},X.hsla.from=function(d){if(d[0]==null||d[1]==null||d[2]==null)return[null,null,null,d[3]];var w=d[0]/360,C=d[1],b=d[2],I=d[3],k=b<=.5?b*(1+C):b+C-b*C,M=2*b-k;return[Math.round(we(M,k,w+1/3)*255),Math.round(we(M,k,w)*255),Math.round(we(M,k,w-1/3)*255),I]},ge(X,function(d,w){var C=w.props,b=w.cache,I=w.to,k=w.from;G.fn[d]=function(M){if(I&&!this[b]&&(this[b]=I(this._rgba)),M===void 0)return this[b].slice();var K,W=fe(M),q=W==="array"||W==="object"?M:arguments,te=this[b].slice();return ge(C,function(he,ne){var ie=q[W==="object"?he:ne.idx];ie==null&&(ie=te[ne.idx]),te[ne.idx]=ye(ie,ne)}),k?(K=G(k(te)),K[b]=te,K):G(te)},ge(C,function(M,K){G.fn[M]||(G.fn[M]=function(W){var q,te,he,ne,ie=fe(W);return M==="alpha"?ne=this._hsla?"hsla":"rgba":ne=d,q=this[ne](),te=q[K.idx],ie==="undefined"?te:(ie==="function"&&(W=W.call(this,te),ie=fe(W)),W==null&&K.empty?this:(ie==="string"&&(he=R.exec(W),he&&(W=te+parseFloat(he[2])*(he[1]==="+"?1:-1))),q[K.idx]=W,this[ne](q)))})})}),G.hook=function(d){var w=d.split(" ");ge(w,function(C,b){S.cssHooks[b]={set:function(I,k){var M,K,W="";if(k!=="transparent"&&(fe(k)!=="string"||(M=me(k)))){if(k=G(M||k),!Ae.rgba&&k._rgba[3]!==1){for(K=b==="backgroundColor"?I.parentNode:I;(W===""||W==="transparent")&&K&&K.style;)try{W=S.css(K,"backgroundColor"),K=K.parentNode}catch{}k=k.blend(W&&W!=="transparent"?W:"_default")}k=k.toRgbaString()}try{I.style[b]=k}catch{}}},S.fx.step[b]=function(I){I.colorInit||(I.start=G(I.elem,b),I.end=G(I.end),I.colorInit=!0),S.cssHooks[b].set(I.elem,I.start.transition(I.end,I.pos))}})},G.hook(D),S.cssHooks.borderColor={expand:function(d){var w={};return ge(["Top","Right","Bottom","Left"],function(C,b){w["border"+b+"Color"]=d}),w}},ae=S.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"};/*!
+ * jQuery UI Effects 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */var ve="ui-effects-",Ce="ui-effects-style",Se="ui-effects-animated";g.effects={effect:{}},function(){var d=["add","remove","toggle"],w={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};g.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(k,M){g.fx.step[M]=function(K){(K.end!=="none"&&!K.setAttr||K.pos===1&&!K.setAttr)&&(S.style(K.elem,M,K.end),K.setAttr=!0)}});function C(k){return k.replace(/-([\da-z])/gi,function(M,K){return K.toUpperCase()})}function b(k){var M,K,W=k.ownerDocument.defaultView?k.ownerDocument.defaultView.getComputedStyle(k,null):k.currentStyle,q={};if(W&&W.length&&W[0]&&W[W[0]])for(K=W.length;K--;)M=W[K],typeof W[M]=="string"&&(q[C(M)]=W[M]);else for(M in W)typeof W[M]=="string"&&(q[M]=W[M]);return q}function I(k,M){var K={},W,q;for(W in M)q=M[W],k[W]!==q&&(w[W]||(g.fx.step[W]||!isNaN(parseFloat(q)))&&(K[W]=q));return K}g.fn.addBack||(g.fn.addBack=function(k){return this.add(k==null?this.prevObject:this.prevObject.filter(k))}),g.effects.animateClass=function(k,M,K,W){var q=g.speed(M,K,W);return this.queue(function(){var te=g(this),he=te.attr("class")||"",ne,ie=q.children?te.find("*").addBack():te;ie=ie.map(function(){var re=g(this);return{el:re,start:b(this)}}),ne=function(){g.each(d,function(re,ce){k[ce]&&te[ce+"Class"](k[ce])})},ne(),ie=ie.map(function(){return this.end=b(this.el[0]),this.diff=I(this.start,this.end),this}),te.attr("class",he),ie=ie.map(function(){var re=this,ce=g.Deferred(),Be=g.extend({},q,{queue:!1,complete:function(){ce.resolve(re)}});return this.el.animate(this.diff,Be),ce.promise()}),g.when.apply(g,ie.get()).done(function(){ne(),g.each(arguments,function(){var re=this.el;g.each(this.diff,function(ce){re.css(ce,"")})}),q.complete.call(te[0])})})},g.fn.extend({addClass:function(k){return function(M,K,W,q){return K?g.effects.animateClass.call(this,{add:M},K,W,q):k.apply(this,arguments)}}(g.fn.addClass),removeClass:function(k){return function(M,K,W,q){return arguments.length>1?g.effects.animateClass.call(this,{remove:M},K,W,q):k.apply(this,arguments)}}(g.fn.removeClass),toggleClass:function(k){return function(M,K,W,q,te){return typeof K=="boolean"||K===void 0?W?g.effects.animateClass.call(this,K?{add:M}:{remove:M},W,q,te):k.apply(this,arguments):g.effects.animateClass.call(this,{toggle:M},K,W,q)}}(g.fn.toggleClass),switchClass:function(k,M,K,W,q){return g.effects.animateClass.call(this,{add:M,remove:k},K,W,q)}})}(),function(){g.expr&&g.expr.pseudos&&g.expr.pseudos.animated&&(g.expr.pseudos.animated=function(b){return function(I){return!!g(I).data(Se)||b(I)}}(g.expr.pseudos.animated)),g.uiBackCompat!==!1&&g.extend(g.effects,{save:function(b,I){for(var k=0,M=I.length;k<M;k++)I[k]!==null&&b.data(ve+I[k],b[0].style[I[k]])},restore:function(b,I){for(var k,M=0,K=I.length;M<K;M++)I[M]!==null&&(k=b.data(ve+I[M]),b.css(I[M],k))},setMode:function(b,I){return I==="toggle"&&(I=b.is(":hidden")?"show":"hide"),I},createWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return b.parent();var I={width:b.outerWidth(!0),height:b.outerHeight(!0),float:b.css("float")},k=g("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),M={width:b.width(),height:b.height()},K=document.activeElement;try{K.id}catch{K=document.body}return b.wrap(k),(b[0]===K||g.contains(b[0],K))&&g(K).trigger("focus"),k=b.parent(),b.css("position")==="static"?(k.css({position:"relative"}),b.css({position:"relative"})):(g.extend(I,{position:b.css("position"),zIndex:b.css("z-index")}),g.each(["top","left","bottom","right"],function(W,q){I[q]=b.css(q),isNaN(parseInt(I[q],10))&&(I[q]="auto")}),b.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),b.css(M),k.css(I).show()},removeWrapper:function(b){var I=document.activeElement;return b.parent().is(".ui-effects-wrapper")&&(b.parent().replaceWith(b),(b[0]===I||g.contains(b[0],I))&&g(I).trigger("focus")),b}}),g.extend(g.effects,{version:"1.13.2",define:function(b,I,k){return k||(k=I,I="effect"),g.effects.effect[b]=k,g.effects.effect[b].mode=I,k},scaledDimensions:function(b,I,k){if(I===0)return{height:0,width:0,outerHeight:0,outerWidth:0};var M=k!=="horizontal"?(I||100)/100:1,K=k!=="vertical"?(I||100)/100:1;return{height:b.height()*K,width:b.width()*M,outerHeight:b.outerHeight()*K,outerWidth:b.outerWidth()*M}},clipToBox:function(b){return{width:b.clip.right-b.clip.left,height:b.clip.bottom-b.clip.top,left:b.clip.left,top:b.clip.top}},unshift:function(b,I,k){var M=b.queue();I>1&&M.splice.apply(M,[1,0].concat(M.splice(I,k))),b.dequeue()},saveStyle:function(b){b.data(Ce,b[0].style.cssText)},restoreStyle:function(b){b[0].style.cssText=b.data(Ce)||"",b.removeData(Ce)},mode:function(b,I){var k=b.is(":hidden");return I==="toggle"&&(I=k?"show":"hide"),(k?I==="hide":I==="show")&&(I="none"),I},getBaseline:function(b,I){var k,M;switch(b[0]){case"top":k=0;break;case"middle":k=.5;break;case"bottom":k=1;break;default:k=b[0]/I.height}switch(b[1]){case"left":M=0;break;case"center":M=.5;break;case"right":M=1;break;default:M=b[1]/I.width}return{x:M,y:k}},createPlaceholder:function(b){var I,k=b.css("position"),M=b.position();return b.css({marginTop:b.css("marginTop"),marginBottom:b.css("marginBottom"),marginLeft:b.css("marginLeft"),marginRight:b.css("marginRight")}).outerWidth(b.outerWidth()).outerHeight(b.outerHeight()),/^(static|relative)/.test(k)&&(k="absolute",I=g("<"+b[0].nodeName+">").insertAfter(b).css({display:/^(inline|ruby)/.test(b.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:b.css("marginTop"),marginBottom:b.css("marginBottom"),marginLeft:b.css("marginLeft"),marginRight:b.css("marginRight"),float:b.css("float")}).outerWidth(b.outerWidth()).outerHeight(b.outerHeight()).addClass("ui-effects-placeholder"),b.data(ve+"placeholder",I)),b.css({position:k,left:M.left,top:M.top}),I},removePlaceholder:function(b){var I=ve+"placeholder",k=b.data(I);k&&(k.remove(),b.removeData(I))},cleanUp:function(b){g.effects.restoreStyle(b),g.effects.removePlaceholder(b)},setTransition:function(b,I,k,M){return M=M||{},g.each(I,function(K,W){var q=b.cssUnit(W);q[0]>0&&(M[W]=q[0]*k+q[1])}),M}});function d(b,I,k,M){return g.isPlainObject(b)&&(I=b,b=b.effect),b={effect:b},I==null&&(I={}),typeof I=="function"&&(M=I,k=null,I={}),(typeof I=="number"||g.fx.speeds[I])&&(M=k,k=I,I={}),typeof k=="function"&&(M=k,k=null),I&&g.extend(b,I),k=k||I.duration,b.duration=g.fx.off?0:typeof k=="number"?k:k in g.fx.speeds?g.fx.speeds[k]:g.fx.speeds._default,b.complete=M||I.complete,b}function w(b){return!!(!b||typeof b=="number"||g.fx.speeds[b]||typeof b=="string"&&!g.effects.effect[b]||typeof b=="function"||typeof b=="object"&&!b.effect)}g.fn.extend({effect:function(){var b=d.apply(this,arguments),I=g.effects.effect[b.effect],k=I.mode,M=b.queue,K=M||"fx",W=b.complete,q=b.mode,te=[],he=function(ie){var re=g(this),ce=g.effects.mode(re,q)||k;re.data(Se,!0),te.push(ce),k&&(ce==="show"||ce===k&&ce==="hide")&&re.show(),(!k||ce!=="none")&&g.effects.saveStyle(re),typeof ie=="function"&&ie()};if(g.fx.off||!I)return q?this[q](b.duration,W):this.each(function(){W&&W.call(this)});function ne(ie){var re=g(this);function ce(){re.removeData(Se),g.effects.cleanUp(re),b.mode==="hide"&&re.hide(),Be()}function Be(){typeof W=="function"&&W.call(re[0]),typeof ie=="function"&&ie()}b.mode=te.shift(),g.uiBackCompat!==!1&&!k?(re.is(":hidden")?q==="hide":q==="show")?(re[q](),Be()):I.call(re[0],b,Be):b.mode==="none"?(re[q](),Be()):I.call(re[0],b,ce)}return M===!1?this.each(he).each(ne):this.queue(K,he).queue(K,ne)},show:function(b){return function(I){if(w(I))return b.apply(this,arguments);var k=d.apply(this,arguments);return k.mode="show",this.effect.call(this,k)}}(g.fn.show),hide:function(b){return function(I){if(w(I))return b.apply(this,arguments);var k=d.apply(this,arguments);return k.mode="hide",this.effect.call(this,k)}}(g.fn.hide),toggle:function(b){return function(I){if(w(I)||typeof I=="boolean")return b.apply(this,arguments);var k=d.apply(this,arguments);return k.mode="toggle",this.effect.call(this,k)}}(g.fn.toggle),cssUnit:function(b){var I=this.css(b),k=[];return g.each(["em","px","%","pt"],function(M,K){I.indexOf(K)>0&&(k=[parseFloat(I),K])}),k},cssClip:function(b){return b?this.css("clip","rect("+b.top+"px "+b.right+"px "+b.bottom+"px "+b.left+"px)"):C(this.css("clip"),this)},transfer:function(b,I){var k=g(this),M=g(b.to),K=M.css("position")==="fixed",W=g("body"),q=K?W.scrollTop():0,te=K?W.scrollLeft():0,he=M.offset(),ne={top:he.top-q,left:he.left-te,height:M.innerHeight(),width:M.innerWidth()},ie=k.offset(),re=g("<div class='ui-effects-transfer'></div>");re.appendTo("body").addClass(b.className).css({top:ie.top-q,left:ie.left-te,height:k.innerHeight(),width:k.innerWidth(),position:K?"fixed":"absolute"}).animate(ne,b.duration,b.easing,function(){re.remove(),typeof I=="function"&&I()})}});function C(b,I){var k=I.outerWidth(),M=I.outerHeight(),K=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,W=K.exec(b)||["",0,k,M,0];return{top:parseFloat(W[1])||0,right:W[2]==="auto"?k:parseFloat(W[2]),bottom:W[3]==="auto"?M:parseFloat(W[3]),left:parseFloat(W[4])||0}}g.fx.step.clip=function(b){b.clipInit||(b.start=g(b.elem).cssClip(),typeof b.end=="string"&&(b.end=C(b.end,b.elem)),b.clipInit=!0),g(b.elem).cssClip({top:b.pos*(b.end.top-b.start.top)+b.start.top,right:b.pos*(b.end.right-b.start.right)+b.start.right,bottom:b.pos*(b.end.bottom-b.start.bottom)+b.start.bottom,left:b.pos*(b.end.left-b.start.left)+b.start.left})}}(),function(){var d={};g.each(["Quad","Cubic","Quart","Quint","Expo"],function(w,C){d[C]=function(b){return Math.pow(b,w+2)}}),g.extend(d,{Sine:function(w){return 1-Math.cos(w*Math.PI/2)},Circ:function(w){return 1-Math.sqrt(1-w*w)},Elastic:function(w){return w===0||w===1?w:-Math.pow(2,8*(w-1))*Math.sin(((w-1)*80-7.5)*Math.PI/15)},Back:function(w){return w*w*(3*w-2)},Bounce:function(w){for(var C,b=4;w<((C=Math.pow(2,--b))-1)/11;);return 1/Math.pow(4,3-b)-7.5625*Math.pow((C*3-2)/22-w,2)}}),g.each(d,function(w,C){g.easing["easeIn"+w]=C,g.easing["easeOut"+w]=function(b){return 1-C(1-b)},g.easing["easeInOut"+w]=function(b){return b<.5?C(b*2)/2:1-C(b*-2+2)/2}})}(),g.effects;/*!
+ * jQuery UI Effects Blind 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("blind","hide",function(d,w){var C={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},b=g(this),I=d.direction||"up",k=b.cssClip(),M={clip:g.extend({},k)},K=g.effects.createPlaceholder(b);M.clip[C[I][0]]=M.clip[C[I][1]],d.mode==="show"&&(b.cssClip(M.clip),K&&K.css(g.effects.clipToBox(M)),M.clip=k),K&&K.animate(g.effects.clipToBox(M),d.duration,d.easing),b.animate(M,{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Bounce 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("bounce",function(d,w){var C,b,I,k=g(this),M=d.mode,K=M==="hide",W=M==="show",q=d.direction||"up",te=d.distance,he=d.times||5,ne=he*2+(W||K?1:0),ie=d.duration/ne,re=d.easing,ce=q==="up"||q==="down"?"top":"left",Be=q==="up"||q==="left",Fe=0,Te=k.queue().length;for(g.effects.createPlaceholder(k),I=k.css(ce),te||(te=k[ce==="top"?"outerHeight":"outerWidth"]()/3),W&&(b={opacity:1},b[ce]=I,k.css("opacity",0).css(ce,Be?-te*2:te*2).animate(b,ie,re)),K&&(te=te/Math.pow(2,he-1)),b={},b[ce]=I;Fe<he;Fe++)C={},C[ce]=(Be?"-=":"+=")+te,k.animate(C,ie,re).animate(b,ie,re),te=K?te*2:te/2;K&&(C={opacity:0},C[ce]=(Be?"-=":"+=")+te,k.animate(C,ie,re)),k.queue(w),g.effects.unshift(k,Te,ne+1)});/*!
+ * jQuery UI Effects Clip 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("clip","hide",function(d,w){var C,b={},I=g(this),k=d.direction||"vertical",M=k==="both",K=M||k==="horizontal",W=M||k==="vertical";C=I.cssClip(),b.clip={top:W?(C.bottom-C.top)/2:C.top,right:K?(C.right-C.left)/2:C.right,bottom:W?(C.bottom-C.top)/2:C.bottom,left:K?(C.right-C.left)/2:C.left},g.effects.createPlaceholder(I),d.mode==="show"&&(I.cssClip(b.clip),b.clip=C),I.animate(b,{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Drop 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("drop","hide",function(d,w){var C,b=g(this),I=d.mode,k=I==="show",M=d.direction||"left",K=M==="up"||M==="down"?"top":"left",W=M==="up"||M==="left"?"-=":"+=",q=W==="+="?"-=":"+=",te={opacity:0};g.effects.createPlaceholder(b),C=d.distance||b[K==="top"?"outerHeight":"outerWidth"](!0)/2,te[K]=W+C,k&&(b.css(te),te[K]=q+C,te.opacity=1),b.animate(te,{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Explode 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("explode","hide",function(d,w){var C,b,I,k,M,K,W=d.pieces?Math.round(Math.sqrt(d.pieces)):3,q=W,te=g(this),he=d.mode,ne=he==="show",ie=te.show().css("visibility","hidden").offset(),re=Math.ceil(te.outerWidth()/q),ce=Math.ceil(te.outerHeight()/W),Be=[];function Fe(){Be.push(this),Be.length===W*q&&Te()}for(C=0;C<W;C++)for(k=ie.top+C*ce,K=C-(W-1)/2,b=0;b<q;b++)I=ie.left+b*re,M=b-(q-1)/2,te.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-b*re,top:-C*ce}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:re,height:ce,left:I+(ne?M*re:0),top:k+(ne?K*ce:0),opacity:ne?0:1}).animate({left:I+(ne?0:M*re),top:k+(ne?0:K*ce),opacity:ne?1:0},d.duration||500,d.easing,Fe);function Te(){te.css({visibility:"visible"}),g(Be).remove(),w()}});/*!
+ * jQuery UI Effects Fade 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("fade","toggle",function(d,w){var C=d.mode==="show";g(this).css("opacity",C?0:1).animate({opacity:C?1:0},{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Fold 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("fold","hide",function(d,w){var C=g(this),b=d.mode,I=b==="show",k=b==="hide",M=d.size||15,K=/([0-9]+)%/.exec(M),W=!!d.horizFirst,q=W?["right","bottom"]:["bottom","right"],te=d.duration/2,he=g.effects.createPlaceholder(C),ne=C.cssClip(),ie={clip:g.extend({},ne)},re={clip:g.extend({},ne)},ce=[ne[q[0]],ne[q[1]]],Be=C.queue().length;K&&(M=parseInt(K[1],10)/100*ce[k?0:1]),ie.clip[q[0]]=M,re.clip[q[0]]=M,re.clip[q[1]]=0,I&&(C.cssClip(re.clip),he&&he.css(g.effects.clipToBox(re)),re.clip=ne),C.queue(function(Fe){he&&he.animate(g.effects.clipToBox(ie),te,d.easing).animate(g.effects.clipToBox(re),te,d.easing),Fe()}).animate(ie,te,d.easing).animate(re,te,d.easing).queue(w),g.effects.unshift(C,Be,4)});/*!
+ * jQuery UI Effects Highlight 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("highlight","show",function(d,w){var C=g(this),b={backgroundColor:C.css("backgroundColor")};d.mode==="hide"&&(b.opacity=0),g.effects.saveStyle(C),C.css({backgroundImage:"none",backgroundColor:d.color||"#ffff99"}).animate(b,{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Size 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("size",function(d,w){var C,b,I,k=g(this),M=["fontSize"],K=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],W=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],q=d.mode,te=q!=="effect",he=d.scale||"both",ne=d.origin||["middle","center"],ie=k.css("position"),re=k.position(),ce=g.effects.scaledDimensions(k),Be=d.from||ce,Fe=d.to||g.effects.scaledDimensions(k,0);g.effects.createPlaceholder(k),q==="show"&&(I=Be,Be=Fe,Fe=I),b={from:{y:Be.height/ce.height,x:Be.width/ce.width},to:{y:Fe.height/ce.height,x:Fe.width/ce.width}},(he==="box"||he==="both")&&(b.from.y!==b.to.y&&(Be=g.effects.setTransition(k,K,b.from.y,Be),Fe=g.effects.setTransition(k,K,b.to.y,Fe)),b.from.x!==b.to.x&&(Be=g.effects.setTransition(k,W,b.from.x,Be),Fe=g.effects.setTransition(k,W,b.to.x,Fe))),(he==="content"||he==="both")&&b.from.y!==b.to.y&&(Be=g.effects.setTransition(k,M,b.from.y,Be),Fe=g.effects.setTransition(k,M,b.to.y,Fe)),ne&&(C=g.effects.getBaseline(ne,ce),Be.top=(ce.outerHeight-Be.outerHeight)*C.y+re.top,Be.left=(ce.outerWidth-Be.outerWidth)*C.x+re.left,Fe.top=(ce.outerHeight-Fe.outerHeight)*C.y+re.top,Fe.left=(ce.outerWidth-Fe.outerWidth)*C.x+re.left),delete Be.outerHeight,delete Be.outerWidth,k.css(Be),(he==="content"||he==="both")&&(K=K.concat(["marginTop","marginBottom"]).concat(M),W=W.concat(["marginLeft","marginRight"]),k.find("*[width]").each(function(){var Te=g(this),Ne=g.effects.scaledDimensions(Te),Oe={height:Ne.height*b.from.y,width:Ne.width*b.from.x,outerHeight:Ne.outerHeight*b.from.y,outerWidth:Ne.outerWidth*b.from.x},De={height:Ne.height*b.to.y,width:Ne.width*b.to.x,outerHeight:Ne.height*b.to.y,outerWidth:Ne.width*b.to.x};b.from.y!==b.to.y&&(Oe=g.effects.setTransition(Te,K,b.from.y,Oe),De=g.effects.setTransition(Te,K,b.to.y,De)),b.from.x!==b.to.x&&(Oe=g.effects.setTransition(Te,W,b.from.x,Oe),De=g.effects.setTransition(Te,W,b.to.x,De)),te&&g.effects.saveStyle(Te),Te.css(Oe),Te.animate(De,d.duration,d.easing,function(){te&&g.effects.restoreStyle(Te)})})),k.animate(Fe,{queue:!1,duration:d.duration,easing:d.easing,complete:function(){var Te=k.offset();Fe.opacity===0&&k.css("opacity",Be.opacity),te||(k.css("position",ie==="static"?"relative":ie).offset(Te),g.effects.saveStyle(k)),w()}})});/*!
+ * jQuery UI Effects Scale 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("scale",function(d,w){var C=g(this),b=d.mode,I=parseInt(d.percent,10)||(parseInt(d.percent,10)===0||b!=="effect"?0:100),k=g.extend(!0,{from:g.effects.scaledDimensions(C),to:g.effects.scaledDimensions(C,I,d.direction||"both"),origin:d.origin||["middle","center"]},d);d.fade&&(k.from.opacity=1,k.to.opacity=0),g.effects.effect.size.call(this,k,w)});/*!
+ * jQuery UI Effects Puff 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("puff","hide",function(d,w){var C=g.extend(!0,{},d,{fade:!0,percent:parseInt(d.percent,10)||150});g.effects.effect.scale.call(this,C,w)});/*!
+ * jQuery UI Effects Pulsate 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("pulsate","show",function(d,w){var C=g(this),b=d.mode,I=b==="show",k=b==="hide",M=I||k,K=(d.times||5)*2+(M?1:0),W=d.duration/K,q=0,te=1,he=C.queue().length;for((I||!C.is(":visible"))&&(C.css("opacity",0).show(),q=1);te<K;te++)C.animate({opacity:q},W,d.easing),q=1-q;C.animate({opacity:q},W,d.easing),C.queue(w),g.effects.unshift(C,he,K+1)});/*!
+ * jQuery UI Effects Shake 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("shake",function(d,w){var C=1,b=g(this),I=d.direction||"left",k=d.distance||20,M=d.times||3,K=M*2+1,W=Math.round(d.duration/K),q=I==="up"||I==="down"?"top":"left",te=I==="up"||I==="left",he={},ne={},ie={},re=b.queue().length;for(g.effects.createPlaceholder(b),he[q]=(te?"-=":"+=")+k,ne[q]=(te?"+=":"-=")+k*2,ie[q]=(te?"-=":"+=")+k*2,b.animate(he,W,d.easing);C<M;C++)b.animate(ne,W,d.easing).animate(ie,W,d.easing);b.animate(ne,W,d.easing).animate(he,W/2,d.easing).queue(w),g.effects.unshift(b,re,K+1)});/*!
+ * jQuery UI Effects Slide 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("slide","show",function(d,w){var C,b,I=g(this),k={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},M=d.mode,K=d.direction||"left",W=K==="up"||K==="down"?"top":"left",q=K==="up"||K==="left",te=d.distance||I[W==="top"?"outerHeight":"outerWidth"](!0),he={};g.effects.createPlaceholder(I),C=I.cssClip(),b=I.position()[W],he[W]=(q?-1:1)*te+b,he.clip=I.cssClip(),he.clip[k[K][1]]=he.clip[k[K][0]],M==="show"&&(I.cssClip(he.clip),I.css(W,he[W]),he.clip=C,he[W]=b),I.animate(he,{queue:!1,duration:d.duration,easing:d.easing,complete:w})}),g.uiBackCompat!==!1&&g.effects.define("transfer",function(d,w){g(this).transfer(d,w)});/*!
+ * jQuery UI Focusable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.ui.focusable=function(d,w){var C,b,I,k,M,K=d.nodeName.toLowerCase();return K==="area"?(C=d.parentNode,b=C.name,!d.href||!b||C.nodeName.toLowerCase()!=="map"?!1:(I=g("img[usemap='#"+b+"']"),I.length>0&&I.is(":visible"))):(/^(input|select|textarea|button|object)$/.test(K)?(k=!d.disabled,k&&(M=g(d).closest("fieldset")[0],M&&(k=!M.disabled))):K==="a"?k=d.href||w:k=w,k&&g(d).is(":visible")&&We(g(d)))};function We(d){for(var w=d.css("visibility");w==="inherit";)d=d.parent(),w=d.css("visibility");return w==="visible"}g.extend(g.expr.pseudos,{focusable:function(d){return g.ui.focusable(d,g.attr(d,"tabindex")!=null)}}),g.ui.focusable,g.fn._form=function(){return typeof this[0].form=="string"?this.closest("form"):g(this[0].form)};/*!
+ * jQuery UI Form Reset Mixin 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.ui.formResetMixin={_formResetHandler:function(){var d=g(this);setTimeout(function(){var w=d.data("ui-form-reset-instances");g.each(w,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element._form(),!!this.form.length){var d=this.form.data("ui-form-reset-instances")||[];d.length||this.form.on("reset.ui-form-reset",this._formResetHandler),d.push(this),this.form.data("ui-form-reset-instances",d)}},_unbindFormResetHandler:function(){if(this.form.length){var d=this.form.data("ui-form-reset-instances");d.splice(g.inArray(this,d),1),d.length?this.form.data("ui-form-reset-instances",d):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}};/*!
+ * jQuery UI Support for jQuery core 1.8.x and newer 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ */if(g.expr.pseudos||(g.expr.pseudos=g.expr[":"]),g.uniqueSort||(g.uniqueSort=g.unique),!g.escapeSelector){var Ke=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,Ue=function(d,w){return w?d==="\0"?"�":d.slice(0,-1)+"\\"+d.charCodeAt(d.length-1).toString(16)+" ":"\\"+d};g.escapeSelector=function(d){return(d+"").replace(Ke,Ue)}}(!g.fn.even||!g.fn.odd)&&g.fn.extend({even:function(){return this.filter(function(d){return d%2===0})},odd:function(){return this.filter(function(d){return d%2===1})}});/*!
+ * jQuery UI Keycode 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38};/*!
+ * jQuery UI Labels 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.fn.labels=function(){var d,w,C,b,I;return this.length?this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(b=this.eq(0).parents("label"),C=this.attr("id"),C&&(d=this.eq(0).parents().last(),I=d.add(d.length?d.siblings():this.siblings()),w="label[for='"+g.escapeSelector(C)+"']",b=b.add(I.find(w).addBack(w))),this.pushStack(b)):this.pushStack([])};/*!
+ * jQuery UI Scroll Parent 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.fn.scrollParent=function(d){var w=this.css("position"),C=w==="absolute",b=d?/(auto|scroll|hidden)/:/(auto|scroll)/,I=this.parents().filter(function(){var k=g(this);return C&&k.css("position")==="static"?!1:b.test(k.css("overflow")+k.css("overflow-y")+k.css("overflow-x"))}).eq(0);return w==="fixed"||!I.length?g(this[0].ownerDocument||document):I};/*!
+ * jQuery UI Tabbable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.extend(g.expr.pseudos,{tabbable:function(d){var w=g.attr(d,"tabindex"),C=w!=null;return(!C||w>=0)&&g.ui.focusable(d,C)}});/*!
+ * jQuery UI Unique ID 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.fn.extend({uniqueId:function(){var d=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++d)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&g(this).removeAttr("id")})}});/*!
+ * jQuery UI Accordion 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.accordion",{version:"1.13.2",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:function(d){return d.find("> li > :first-child").add(d.find("> :not(li)").even())},heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var d=this.options;this.prevShow=this.prevHide=g(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),!d.collapsible&&(d.active===!1||d.active==null)&&(d.active=0),this._processPanels(),d.active<0&&(d.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():g()}},_createIcons:function(){var d,w,C=this.options.icons;C&&(d=g("<span>"),this._addClass(d,"ui-accordion-header-icon","ui-icon "+C.header),d.prependTo(this.headers),w=this.active.children(".ui-accordion-header-icon"),this._removeClass(w,C.header)._addClass(w,null,C.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var d;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),d=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),this.options.heightStyle!=="content"&&d.css("height","")},_setOption:function(d,w){if(d==="active"){this._activate(w);return}d==="event"&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(w)),this._super(d,w),d==="collapsible"&&!w&&this.options.active===!1&&this._activate(0),d==="icons"&&(this._destroyIcons(),w&&this._createIcons())},_setOptionDisabled:function(d){this._super(d),this.element.attr("aria-disabled",d),this._toggleClass(null,"ui-state-disabled",!!d),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!d)},_keydown:function(d){if(!(d.altKey||d.ctrlKey)){var w=g.ui.keyCode,C=this.headers.length,b=this.headers.index(d.target),I=!1;switch(d.keyCode){case w.RIGHT:case w.DOWN:I=this.headers[(b+1)%C];break;case w.LEFT:case w.UP:I=this.headers[(b-1+C)%C];break;case w.SPACE:case w.ENTER:this._eventHandler(d);break;case w.HOME:I=this.headers[0];break;case w.END:I=this.headers[C-1];break}I&&(g(d.target).attr("tabIndex",-1),g(I).attr("tabIndex",0),g(I).trigger("focus"),d.preventDefault())}},_panelKeyDown:function(d){d.keyCode===g.ui.keyCode.UP&&d.ctrlKey&&g(d.currentTarget).prev().trigger("focus")},refresh:function(){var d=this.options;this._processPanels(),d.active===!1&&d.collapsible===!0||!this.headers.length?(d.active=!1,this.active=g()):d.active===!1?this._activate(0):this.active.length&&!g.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(d.active=!1,this.active=g()):this._activate(Math.max(0,d.active-1)):d.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var d=this.headers,w=this.panels;typeof this.options.header=="function"?this.headers=this.options.header(this.element):this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),w&&(this._off(d.not(this.headers)),this._off(w.not(this.panels)))},_refresh:function(){var d,w=this.options,C=w.heightStyle,b=this.element.parent();this.active=this._findActive(w.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var I=g(this),k=I.uniqueId().attr("id"),M=I.next(),K=M.uniqueId().attr("id");I.attr("aria-controls",K),M.attr("aria-labelledby",k)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(w.event),C==="fill"?(d=b.height(),this.element.siblings(":visible").each(function(){var I=g(this),k=I.css("position");k==="absolute"||k==="fixed"||(d-=I.outerHeight(!0))}),this.headers.each(function(){d-=g(this).outerHeight(!0)}),this.headers.next().each(function(){g(this).height(Math.max(0,d-g(this).innerHeight()+g(this).height()))}).css("overflow","auto")):C==="auto"&&(d=0,this.headers.next().each(function(){var I=g(this).is(":visible");I||g(this).show(),d=Math.max(d,g(this).css("height","").height()),I||g(this).hide()}).height(d))},_activate:function(d){var w=this._findActive(d)[0];w!==this.active[0]&&(w=w||this.active[0],this._eventHandler({target:w,currentTarget:w,preventDefault:g.noop}))},_findActive:function(d){return typeof d=="number"?this.headers.eq(d):g()},_setupEvents:function(d){var w={keydown:"_keydown"};d&&g.each(d.split(" "),function(C,b){w[b]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,w),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(d){var w,C,b=this.options,I=this.active,k=g(d.currentTarget),M=k[0]===I[0],K=M&&b.collapsible,W=K?g():k.next(),q=I.next(),te={oldHeader:I,oldPanel:q,newHeader:K?g():k,newPanel:W};d.preventDefault(),!(M&&!b.collapsible||this._trigger("beforeActivate",d,te)===!1)&&(b.active=K?!1:this.headers.index(k),this.active=M?g():k,this._toggle(te),this._removeClass(I,"ui-accordion-header-active","ui-state-active"),b.icons&&(w=I.children(".ui-accordion-header-icon"),this._removeClass(w,null,b.icons.activeHeader)._addClass(w,null,b.icons.header)),M||(this._removeClass(k,"ui-accordion-header-collapsed")._addClass(k,"ui-accordion-header-active","ui-state-active"),b.icons&&(C=k.children(".ui-accordion-header-icon"),this._removeClass(C,null,b.icons.header)._addClass(C,null,b.icons.activeHeader)),this._addClass(k.next(),"ui-accordion-content-active")))},_toggle:function(d){var w=d.newPanel,C=this.prevShow.length?this.prevShow:d.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=w,this.prevHide=C,this.options.animate?this._animate(w,C,d):(C.hide(),w.show(),this._toggleComplete(d)),C.attr({"aria-hidden":"true"}),C.prev().attr({"aria-selected":"false","aria-expanded":"false"}),w.length&&C.length?C.prev().attr({tabIndex:-1,"aria-expanded":"false"}):w.length&&this.headers.filter(function(){return parseInt(g(this).attr("tabIndex"),10)===0}).attr("tabIndex",-1),w.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(d,w,C){var b,I,k,M=this,K=0,W=d.css("box-sizing"),q=d.length&&(!w.length||d.index()<w.index()),te=this.options.animate||{},he=q&&te.down||te,ne=function(){M._toggleComplete(C)};if(typeof he=="number"&&(k=he),typeof he=="string"&&(I=he),I=I||he.easing||te.easing,k=k||he.duration||te.duration,!w.length)return d.animate(this.showProps,k,I,ne);if(!d.length)return w.animate(this.hideProps,k,I,ne);b=d.show().outerHeight(),w.animate(this.hideProps,{duration:k,easing:I,step:function(ie,re){re.now=Math.round(ie)}}),d.hide().animate(this.showProps,{duration:k,easing:I,complete:ne,step:function(ie,re){re.now=Math.round(ie),re.prop!=="height"?W==="content-box"&&(K+=re.now):M.options.heightStyle!=="content"&&(re.now=Math.round(b-w.outerHeight()-K),K=0)}})},_toggleComplete:function(d){var w=d.oldPanel,C=w.prev();this._removeClass(w,"ui-accordion-content-active"),this._removeClass(C,"ui-accordion-header-active")._addClass(C,"ui-accordion-header-collapsed"),w.length&&(w.parent()[0].className=w.parent()[0].className),this._trigger("activate",null,d)}}),g.ui.safeActiveElement=function(d){var w;try{w=d.activeElement}catch{w=d.body}return w||(w=d.body),w.nodeName||(w=d.body),w};/*!
+ * jQuery UI Menu 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.menu",{version:"1.13.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(d){d.preventDefault(),this._activateItem(d)},"click .ui-menu-item":function(d){var w=g(d.target),C=g(g.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&w.not(".ui-state-disabled").length&&(this.select(d),d.isPropagationStopped()||(this.mouseHandled=!0),w.has(".ui-menu").length?this.expand(d):!this.element.is(":focus")&&C.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(d,w){var C=this.active||this._menuItems().first();w||this.focus(d,C)},blur:function(d){this._delay(function(){var w=!g.contains(this.element[0],g.ui.safeActiveElement(this.document[0]));w&&this.collapseAll(d)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(d){this._closeOnDocumentClick(d)&&this.collapseAll(d,!0),this.mouseHandled=!1}})},_activateItem:function(d){if(!this.previousFilter&&!(d.clientX===this.lastMousePosition.x&&d.clientY===this.lastMousePosition.y)){this.lastMousePosition={x:d.clientX,y:d.clientY};var w=g(d.target).closest(".ui-menu-item"),C=g(d.currentTarget);w[0]===C[0]&&(C.is(".ui-state-active")||(this._removeClass(C.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(d,C)))}},_destroy:function(){var d=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),w=d.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),w.children().each(function(){var C=g(this);C.data("ui-menu-submenu-caret")&&C.remove()})},_keydown:function(d){var w,C,b,I,k=!0;switch(d.keyCode){case g.ui.keyCode.PAGE_UP:this.previousPage(d);break;case g.ui.keyCode.PAGE_DOWN:this.nextPage(d);break;case g.ui.keyCode.HOME:this._move("first","first",d);break;case g.ui.keyCode.END:this._move("last","last",d);break;case g.ui.keyCode.UP:this.previous(d);break;case g.ui.keyCode.DOWN:this.next(d);break;case g.ui.keyCode.LEFT:this.collapse(d);break;case g.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(d);break;case g.ui.keyCode.ENTER:case g.ui.keyCode.SPACE:this._activate(d);break;case g.ui.keyCode.ESCAPE:this.collapse(d);break;default:k=!1,C=this.previousFilter||"",I=!1,b=d.keyCode>=96&&d.keyCode<=105?(d.keyCode-96).toString():String.fromCharCode(d.keyCode),clearTimeout(this.filterTimer),b===C?I=!0:b=C+b,w=this._filterMenuItems(b),w=I&&w.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):w,w.length||(b=String.fromCharCode(d.keyCode),w=this._filterMenuItems(b)),w.length?(this.focus(d,w),this.previousFilter=b,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}k&&d.preventDefault()},_activate:function(d){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(d):this.select(d))},refresh:function(){var d,w,C,b,I,k=this,M=this.options.icons.submenu,K=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),C=K.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var W=g(this),q=W.prev(),te=g("<span>").data("ui-menu-submenu-caret",!0);k._addClass(te,"ui-menu-icon","ui-icon "+M),q.attr("aria-haspopup","true").prepend(te),W.attr("aria-labelledby",q.attr("id"))}),this._addClass(C,"ui-menu","ui-widget ui-widget-content ui-front"),d=K.add(this.element),w=d.find(this.options.items),w.not(".ui-menu-item").each(function(){var W=g(this);k._isDivider(W)&&k._addClass(W,"ui-menu-divider","ui-widget-content")}),b=w.not(".ui-menu-item, .ui-menu-divider"),I=b.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(b,"ui-menu-item")._addClass(I,"ui-menu-item-wrapper"),w.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!g.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(d,w){if(d==="icons"){var C=this.element.find(".ui-menu-icon");this._removeClass(C,null,this.options.icons.submenu)._addClass(C,null,w.submenu)}this._super(d,w)},_setOptionDisabled:function(d){this._super(d),this.element.attr("aria-disabled",String(d)),this._toggleClass(null,"ui-state-disabled",!!d)},focus:function(d,w){var C,b,I;this.blur(d,d&&d.type==="focus"),this._scrollIntoView(w),this.active=w.first(),b=this.active.children(".ui-menu-item-wrapper"),this._addClass(b,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",b.attr("id")),I=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(I,null,"ui-state-active"),d&&d.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),C=w.children(".ui-menu"),C.length&&d&&/^mouse/.test(d.type)&&this._startOpening(C),this.activeMenu=w.parent(),this._trigger("focus",d,{item:w})},_scrollIntoView:function(d){var w,C,b,I,k,M;this._hasScroll()&&(w=parseFloat(g.css(this.activeMenu[0],"borderTopWidth"))||0,C=parseFloat(g.css(this.activeMenu[0],"paddingTop"))||0,b=d.offset().top-this.activeMenu.offset().top-w-C,I=this.activeMenu.scrollTop(),k=this.activeMenu.height(),M=d.outerHeight(),b<0?this.activeMenu.scrollTop(I+b):b+M>k&&this.activeMenu.scrollTop(I+b-k+M))},blur:function(d,w){w||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",d,{item:this.active}),this.active=null)},_startOpening:function(d){clearTimeout(this.timer),d.attr("aria-hidden")==="true"&&(this.timer=this._delay(function(){this._close(),this._open(d)},this.delay))},_open:function(d){var w=g.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(d.parents(".ui-menu")).hide().attr("aria-hidden","true"),d.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(w)},collapseAll:function(d,w){clearTimeout(this.timer),this.timer=this._delay(function(){var C=w?this.element:g(d&&d.target).closest(this.element.find(".ui-menu"));C.length||(C=this.element),this._close(C),this.blur(d),this._removeClass(C.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=C},w?0:this.delay)},_close:function(d){d||(d=this.active?this.active.parent():this.element),d.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(d){return!g(d.target).closest(".ui-menu").length},_isDivider:function(d){return!/[^\-\u2014\u2013\s]/.test(d.text())},collapse:function(d){var w=this.active&&this.active.parent().closest(".ui-menu-item",this.element);w&&w.length&&(this._close(),this.focus(d,w))},expand:function(d){var w=this.active&&this._menuItems(this.active.children(".ui-menu")).first();w&&w.length&&(this._open(w.parent()),this._delay(function(){this.focus(d,w)}))},next:function(d){this._move("next","first",d)},previous:function(d){this._move("prev","last",d)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_menuItems:function(d){return(d||this.element).find(this.options.items).filter(".ui-menu-item")},_move:function(d,w,C){var b;this.active&&(d==="first"||d==="last"?b=this.active[d==="first"?"prevAll":"nextAll"](".ui-menu-item").last():b=this.active[d+"All"](".ui-menu-item").first()),(!b||!b.length||!this.active)&&(b=this._menuItems(this.activeMenu)[w]()),this.focus(C,b)},nextPage:function(d){var w,C,b;if(!this.active){this.next(d);return}this.isLastItem()||(this._hasScroll()?(C=this.active.offset().top,b=this.element.innerHeight(),g.fn.jquery.indexOf("3.2.")===0&&(b+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.nextAll(".ui-menu-item").each(function(){return w=g(this),w.offset().top-C-b<0}),this.focus(d,w)):this.focus(d,this._menuItems(this.activeMenu)[this.active?"last":"first"]()))},previousPage:function(d){var w,C,b;if(!this.active){this.next(d);return}this.isFirstItem()||(this._hasScroll()?(C=this.active.offset().top,b=this.element.innerHeight(),g.fn.jquery.indexOf("3.2.")===0&&(b+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.prevAll(".ui-menu-item").each(function(){return w=g(this),w.offset().top-C+b>0}),this.focus(d,w)):this.focus(d,this._menuItems(this.activeMenu).first()))},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(d){this.active=this.active||g(d.target).closest(".ui-menu-item");var w={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(d,!0),this._trigger("select",d,w)},_filterMenuItems:function(d){var w=d.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),C=new RegExp("^"+w,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return C.test(String.prototype.trim.call(g(this).children(".ui-menu-item-wrapper").text()))})}});/*!
+ * jQuery UI Autocomplete 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.autocomplete",{version:"1.13.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var d,w,C,b=this.element[0].nodeName.toLowerCase(),I=b==="textarea",k=b==="input";this.isMultiLine=I||!k&&this._isContentEditable(this.element),this.valueMethod=this.element[I||k?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(M){if(this.element.prop("readOnly")){d=!0,C=!0,w=!0;return}d=!1,C=!1,w=!1;var K=g.ui.keyCode;switch(M.keyCode){case K.PAGE_UP:d=!0,this._move("previousPage",M);break;case K.PAGE_DOWN:d=!0,this._move("nextPage",M);break;case K.UP:d=!0,this._keyEvent("previous",M);break;case K.DOWN:d=!0,this._keyEvent("next",M);break;case K.ENTER:this.menu.active&&(d=!0,M.preventDefault(),this.menu.select(M));break;case K.TAB:this.menu.active&&this.menu.select(M);break;case K.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(M),M.preventDefault());break;default:w=!0,this._searchTimeout(M);break}},keypress:function(M){if(d){d=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&M.preventDefault();return}if(!w){var K=g.ui.keyCode;switch(M.keyCode){case K.PAGE_UP:this._move("previousPage",M);break;case K.PAGE_DOWN:this._move("nextPage",M);break;case K.UP:this._keyEvent("previous",M);break;case K.DOWN:this._keyEvent("next",M);break}}},input:function(M){if(C){C=!1,M.preventDefault();return}this._searchTimeout(M)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(M){clearTimeout(this.searching),this.close(M),this._change(M)}}),this._initSource(),this.menu=g("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(M){M.preventDefault()},menufocus:function(M,K){var W,q;if(this.isNewMenu&&(this.isNewMenu=!1,M.originalEvent&&/^mouse/.test(M.originalEvent.type))){this.menu.blur(),this.document.one("mousemove",function(){g(M.target).trigger(M.originalEvent)});return}q=K.item.data("ui-autocomplete-item"),this._trigger("focus",M,{item:q})!==!1&&M.originalEvent&&/^key/.test(M.originalEvent.type)&&this._value(q.value),W=K.item.attr("aria-label")||q.value,W&&String.prototype.trim.call(W).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(g("<div>").text(W))},100))},menuselect:function(M,K){var W=K.item.data("ui-autocomplete-item"),q=this.previous;this.element[0]!==g.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=q,this._delay(function(){this.previous=q,this.selectedItem=W})),this._trigger("select",M,{item:W})!==!1&&this._value(W.value),this.term=this._value(),this.close(M),this.selectedItem=W}}),this.liveRegion=g("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(d,w){this._super(d,w),d==="source"&&this._initSource(),d==="appendTo"&&this.menu.element.appendTo(this._appendTo()),d==="disabled"&&w&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(d){var w=this.menu.element[0];return d.target===this.element[0]||d.target===w||g.contains(w,d.target)},_closeOnClickOutside:function(d){this._isEventTargetInWidget(d)||this.close()},_appendTo:function(){var d=this.options.appendTo;return d&&(d=d.jquery||d.nodeType?g(d):this.document.find(d).eq(0)),(!d||!d[0])&&(d=this.element.closest(".ui-front, dialog")),d.length||(d=this.document[0].body),d},_initSource:function(){var d,w,C=this;Array.isArray(this.options.source)?(d=this.options.source,this.source=function(b,I){I(g.ui.autocomplete.filter(d,b.term))}):typeof this.options.source=="string"?(w=this.options.source,this.source=function(b,I){C.xhr&&C.xhr.abort(),C.xhr=g.ajax({url:w,data:b,dataType:"json",success:function(k){I(k)},error:function(){I([])}})}):this.source=this.options.source},_searchTimeout:function(d){clearTimeout(this.searching),this.searching=this._delay(function(){var w=this.term===this._value(),C=this.menu.element.is(":visible"),b=d.altKey||d.ctrlKey||d.metaKey||d.shiftKey;(!w||w&&!C&&!b)&&(this.selectedItem=null,this.search(null,d))},this.options.delay)},search:function(d,w){if(d=d??this._value(),this.term=this._value(),d.length<this.options.minLength)return this.close(w);if(this._trigger("search",w)!==!1)return this._search(d)},_search:function(d){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:d},this._response())},_response:function(){var d=++this.requestIndex;return(function(w){d===this.requestIndex&&this.__response(w),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")}).bind(this)},__response:function(d){d&&(d=this._normalize(d)),this._trigger("response",null,{content:d}),!this.options.disabled&&d&&d.length&&!this.cancelSearch?(this._suggest(d),this._trigger("open")):this._close()},close:function(d){this.cancelSearch=!0,this._close(d)},_close:function(d){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",d))},_change:function(d){this.previous!==this._value()&&this._trigger("change",d,{item:this.selectedItem})},_normalize:function(d){return d.length&&d[0].label&&d[0].value?d:g.map(d,function(w){return typeof w=="string"?{label:w,value:w}:g.extend({},w,{label:w.label||w.value,value:w.value||w.label})})},_suggest:function(d){var w=this.menu.element.empty();this._renderMenu(w,d),this.isNewMenu=!0,this.menu.refresh(),w.show(),this._resizeMenu(),w.position(g.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var d=this.menu.element;d.outerWidth(Math.max(d.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(d,w){var C=this;g.each(w,function(b,I){C._renderItemData(d,I)})},_renderItemData:function(d,w){return this._renderItem(d,w).data("ui-autocomplete-item",w)},_renderItem:function(d,w){return g("<li>").append(g("<div>").text(w.label)).appendTo(d)},_move:function(d,w){if(!this.menu.element.is(":visible")){this.search(null,w);return}if(this.menu.isFirstItem()&&/^previous/.test(d)||this.menu.isLastItem()&&/^next/.test(d)){this.isMultiLine||this._value(this.term),this.menu.blur();return}this.menu[d](w)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(d,w){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(d,w),w.preventDefault())},_isContentEditable:function(d){if(!d.length)return!1;var w=d.prop("contentEditable");return w==="inherit"?this._isContentEditable(d.parent()):w==="true"}}),g.extend(g.ui.autocomplete,{escapeRegex:function(d){return d.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(d,w){var C=new RegExp(g.ui.autocomplete.escapeRegex(w),"i");return g.grep(d,function(b){return C.test(b.label||b.value||b)})}}),g.widget("ui.autocomplete",g.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(d){return d+(d>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(d){var w;this._superApply(arguments),!(this.options.disabled||this.cancelSearch)&&(d&&d.length?w=this.options.messages.results(d.length):w=this.options.messages.noResults,clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(g("<div>").text(w))},100))}}),g.ui.autocomplete;/*!
+ * jQuery UI Controlgroup 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */var ke=/ui-corner-([a-z]){2,6}/g;g.widget("ui.controlgroup",{version:"1.13.2",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var d=this,w=[];g.each(this.options.items,function(C,b){var I,k={};if(b){if(C==="controlgroupLabel"){I=d.element.find(b),I.each(function(){var M=g(this);M.children(".ui-controlgroup-label-contents").length||M.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),d._addClass(I,null,"ui-widget ui-widget-content ui-state-default"),w=w.concat(I.get());return}g.fn[C]&&(d["_"+C+"Options"]?k=d["_"+C+"Options"]("middle"):k={classes:{}},d.element.find(b).each(function(){var M=g(this),K=M[C]("instance"),W=g.widget.extend({},k);if(!(C==="button"&&M.parent(".ui-spinner").length)){K||(K=M[C]()[C]("instance")),K&&(W.classes=d._resolveClassesValues(W.classes,K)),M[C](W);var q=M[C]("widget");g.data(q[0],"ui-controlgroup-data",K||M[C]("instance")),w.push(q[0])}}))}}),this.childWidgets=g(g.uniqueSort(w)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(d){this.childWidgets.each(function(){var w=g(this),C=w.data("ui-controlgroup-data");C&&C[d]&&C[d]()})},_updateCornerClass:function(d,w){var C="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",b=this._buildSimpleOptions(w,"label").classes.label;this._removeClass(d,null,C),this._addClass(d,null,b)},_buildSimpleOptions:function(d,w){var C=this.options.direction==="vertical",b={classes:{}};return b.classes[w]={middle:"",first:"ui-corner-"+(C?"top":"left"),last:"ui-corner-"+(C?"bottom":"right"),only:"ui-corner-all"}[d],b},_spinnerOptions:function(d){var w=this._buildSimpleOptions(d,"ui-spinner");return w.classes["ui-spinner-up"]="",w.classes["ui-spinner-down"]="",w},_buttonOptions:function(d){return this._buildSimpleOptions(d,"ui-button")},_checkboxradioOptions:function(d){return this._buildSimpleOptions(d,"ui-checkboxradio-label")},_selectmenuOptions:function(d){var w=this.options.direction==="vertical";return{width:w?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(w?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(w?"top":"left")},last:{"ui-selectmenu-button-open":w?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(w?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[d]}},_resolveClassesValues:function(d,w){var C={};return g.each(d,function(b){var I=w.options.classes[b]||"";I=String.prototype.trim.call(I.replace(ke,"")),C[b]=(I+" "+d[b]).replace(/\s+/g," ")}),C},_setOption:function(d,w){if(d==="direction"&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(d,w),d==="disabled"){this._callChildMethod(w?"disable":"enable");return}this.refresh()},refresh:function(){var d,w=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),this.options.direction==="horizontal"&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),d=this.childWidgets,this.options.onlyVisible&&(d=d.filter(":visible")),d.length&&(g.each(["first","last"],function(C,b){var I=d[b]().data("ui-controlgroup-data");if(I&&w["_"+I.widgetName+"Options"]){var k=w["_"+I.widgetName+"Options"](d.length===1?"only":b);k.classes=w._resolveClassesValues(k.classes,I),I.element[I.widgetName](k)}else w._updateCornerClass(d[b](),b)}),this._callChildMethod("refresh"))}});/*!
+ * jQuery UI Checkboxradio 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.checkboxradio",[g.ui.formResetMixin,{version:"1.13.2",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var d,w,C,b=this._super()||{};return this._readType(),w=this.element.labels(),this.label=g(w[w.length-1]),this.label.length||g.error("No label found for checkboxradio widget"),this.originalLabel="",C=this.label.contents().not(this.element[0]),C.length&&(this.originalLabel+=C.clone().wrapAll("<div></div>").parent().html()),this.originalLabel&&(b.label=this.originalLabel),d=this.element[0].disabled,d!=null&&(b.disabled=d),b},_create:function(){var d=this.element[0].checked;this._bindFormResetHandler(),this.options.disabled==null&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),this.type==="radio"&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),d&&this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var d=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,(d!=="input"||!/radio|checkbox/.test(this.type))&&g.error("Can't create checkboxradio on element.nodeName="+d+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var d,w=this.element[0].name,C="input[name='"+g.escapeSelector(w)+"']";return w?(this.form.length?d=g(this.form[0].elements).filter(C):d=g(C).filter(function(){return g(this)._form().length===0}),d.not(this.element)):g([])},_toggleClasses:function(){var d=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",d),this.options.icon&&this.type==="checkbox"&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",d)._toggleClass(this.icon,null,"ui-icon-blank",!d),this.type==="radio"&&this._getRadioGroup().each(function(){var w=g(this).checkboxradio("instance");w&&w._removeClass(w.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(d,w){if(!(d==="label"&&!w)){if(this._super(d,w),d==="disabled"){this._toggleClass(this.label,null,"ui-state-disabled",w),this.element[0].disabled=w;return}this.refresh()}},_updateIcon:function(d){var w="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=g("<span>"),this.iconSpace=g("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),this.type==="checkbox"?(w+=d?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,d?"ui-icon-blank":"ui-icon-check")):w+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",w),d||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):this.icon!==void 0&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var d=this.label.contents().not(this.element[0]);this.icon&&(d=d.not(this.icon[0])),this.iconSpace&&(d=d.not(this.iconSpace[0])),d.remove(),this.label.append(this.options.label)},refresh:function(){var d=this.element[0].checked,w=this.element[0].disabled;this._updateIcon(d),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",d),this.options.label!==null&&this._updateLabel(),w!==this.options.disabled&&this._setOptions({disabled:w})}}]),g.ui.checkboxradio;/*!
+ * jQuery UI Button 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.button",{version:"1.13.2",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var d,w=this._super()||{};return this.isInput=this.element.is("input"),d=this.element[0].disabled,d!=null&&(w.disabled=d),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(w.label=this.originalLabel),w},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),this.options.disabled==null&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(d){d.keyCode===g.ui.keyCode.SPACE&&(d.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),!this.options.showLabel&&!this.title&&this.element.attr("title",this.options.label)},_updateIcon:function(d,w){var C=d!=="iconPosition",b=C?this.options.iconPosition:w,I=b==="top"||b==="bottom";this.icon?C&&this._removeClass(this.icon,null,this.options.icon):(this.icon=g("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),C&&this._addClass(this.icon,null,w),this._attachIcon(b),I?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=g("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(b))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(d){this.icon[/^(?:end|bottom)/.test(d)?"before":"after"](this.iconSpace)},_attachIcon:function(d){this.element[/^(?:end|bottom)/.test(d)?"append":"prepend"](this.icon)},_setOptions:function(d){var w=d.showLabel===void 0?this.options.showLabel:d.showLabel,C=d.icon===void 0?this.options.icon:d.icon;!w&&!C&&(d.showLabel=!0),this._super(d)},_setOption:function(d,w){d==="icon"&&(w?this._updateIcon(d,w):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),d==="iconPosition"&&this._updateIcon(d,w),d==="showLabel"&&(this._toggleClass("ui-button-icon-only",null,!w),this._updateTooltip()),d==="label"&&(this.isInput?this.element.val(w):(this.element.html(w),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(d,w),d==="disabled"&&(this._toggleClass(null,"ui-state-disabled",w),this.element[0].disabled=w,w&&this.element.trigger("blur"))},refresh:function(){var d=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");d!==this.options.disabled&&this._setOptions({disabled:d}),this._updateTooltip()}}),g.uiBackCompat!==!1&&(g.widget("ui.button",g.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),!this.options.icon&&(this.options.icons.primary||this.options.icons.secondary)?this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"):this.options.icon&&(this.options.icons.primary=this.options.icon),this._super()},_setOption:function(d,w){if(d==="text"){this._super("showLabel",w);return}d==="showLabel"&&(this.options.text=w),d==="icon"&&(this.options.icons.primary=w),d==="icons"&&(w.primary?(this._super("icon",w.primary),this._super("iconPosition","beginning")):w.secondary&&(this._super("icon",w.secondary),this._super("iconPosition","end"))),this._superApply(arguments)}}),g.fn.button=function(d){return function(w){var C=typeof w=="string",b=Array.prototype.slice.call(arguments,1),I=this;return C?!this.length&&w==="instance"?I=void 0:this.each(function(){var k,M=g(this).attr("type"),K=M!=="checkbox"&&M!=="radio"?"button":"checkboxradio",W=g.data(this,"ui-"+K);if(w==="instance")return I=W,!1;if(!W)return g.error("cannot call methods on button prior to initialization; attempted to call method '"+w+"'");if(typeof W[w]!="function"||w.charAt(0)==="_")return g.error("no such method '"+w+"' for button widget instance");if(k=W[w].apply(W,b),k!==W&&k!==void 0)return I=k&&k.jquery?I.pushStack(k.get()):k,!1}):(b.length&&(w=g.widget.extend.apply(null,[w].concat(b))),this.each(function(){var k=g(this).attr("type"),M=k!=="checkbox"&&k!=="radio"?"button":"checkboxradio",K=g.data(this,"ui-"+M);if(K)K.option(w||{}),K._init&&K._init();else{if(M==="button"){d.call(g(this),w);return}g(this).checkboxradio(g.extend({icon:!1},w))}})),I}}(g.fn.button),g.fn.buttonset=function(){return g.ui.controlgroup||g.error("Controlgroup widget missing"),arguments[0]==="option"&&arguments[1]==="items"&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):arguments[0]==="option"&&arguments[1]==="items"?this.controlgroup.apply(this,[arguments[0],"items.button"]):(typeof arguments[0]=="object"&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),g.ui.button;/*!
+ * jQuery UI Datepicker 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.extend(g.ui,{datepicker:{version:"1.13.2"}});var Me;function ze(d){for(var w,C;d.length&&d[0]!==document;){if(w=d.css("position"),(w==="absolute"||w==="relative"||w==="fixed")&&(C=parseInt(d.css("zIndex"),10),!isNaN(C)&&C!==0))return C;d=d.parent()}return 0}function Je(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:"",selectMonthLabel:"Select month",selectYearLabel:"Select year"},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,onUpdateDatepicker:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},g.extend(this._defaults,this.regional[""]),this.regional.en=g.extend(!0,{},this.regional[""]),this.regional["en-US"]=g.extend(!0,{},this.regional.en),this.dpDiv=ft(g("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}g.extend(Je.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(d){return ht(this._defaults,d||{}),this},_attachDatepicker:function(d,w){var C,b,I;C=d.nodeName.toLowerCase(),b=C==="div"||C==="span",d.id||(this.uuid+=1,d.id="dp"+this.uuid),I=this._newInst(g(d),b),I.settings=g.extend({},w||{}),C==="input"?this._connectDatepicker(d,I):b&&this._inlineDatepicker(d,I)},_newInst:function(d,w){var C=d[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:C,input:d,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:w,dpDiv:w?ft(g("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(d,w){var C=g(d);w.append=g([]),w.trigger=g([]),!C.hasClass(this.markerClassName)&&(this._attachments(C,w),C.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(w),g.data(d,"datepicker",w),w.settings.disabled&&this._disableDatepicker(d))},_attachments:function(d,w){var C,b,I,k=this._get(w,"appendText"),M=this._get(w,"isRTL");w.append&&w.append.remove(),k&&(w.append=g("<span>").addClass(this._appendClass).text(k),d[M?"before":"after"](w.append)),d.off("focus",this._showDatepicker),w.trigger&&w.trigger.remove(),C=this._get(w,"showOn"),(C==="focus"||C==="both")&&d.on("focus",this._showDatepicker),(C==="button"||C==="both")&&(b=this._get(w,"buttonText"),I=this._get(w,"buttonImage"),this._get(w,"buttonImageOnly")?w.trigger=g("<img>").addClass(this._triggerClass).attr({src:I,alt:b,title:b}):(w.trigger=g("<button type='button'>").addClass(this._triggerClass),I?w.trigger.html(g("<img>").attr({src:I,alt:b,title:b})):w.trigger.text(b)),d[M?"before":"after"](w.trigger),w.trigger.on("click",function(){return g.datepicker._datepickerShowing&&g.datepicker._lastInput===d[0]?g.datepicker._hideDatepicker():(g.datepicker._datepickerShowing&&g.datepicker._lastInput!==d[0]&&g.datepicker._hideDatepicker(),g.datepicker._showDatepicker(d[0])),!1}))},_autoSize:function(d){if(this._get(d,"autoSize")&&!d.inline){var w,C,b,I,k=new Date(2009,11,20),M=this._get(d,"dateFormat");M.match(/[DM]/)&&(w=function(K){for(C=0,b=0,I=0;I<K.length;I++)K[I].length>C&&(C=K[I].length,b=I);return b},k.setMonth(w(this._get(d,M.match(/MM/)?"monthNames":"monthNamesShort"))),k.setDate(w(this._get(d,M.match(/DD/)?"dayNames":"dayNamesShort"))+20-k.getDay())),d.input.attr("size",this._formatDate(d,k).length)}},_inlineDatepicker:function(d,w){var C=g(d);C.hasClass(this.markerClassName)||(C.addClass(this.markerClassName).append(w.dpDiv),g.data(d,"datepicker",w),this._setDate(w,this._getDefaultDate(w),!0),this._updateDatepicker(w),this._updateAlternate(w),w.settings.disabled&&this._disableDatepicker(d),w.dpDiv.css("display","block"))},_dialogDatepicker:function(d,w,C,b,I){var k,M,K,W,q,te=this._dialogInst;return te||(this.uuid+=1,k="dp"+this.uuid,this._dialogInput=g("<input type='text' id='"+k+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),g("body").append(this._dialogInput),te=this._dialogInst=this._newInst(this._dialogInput,!1),te.settings={},g.data(this._dialogInput[0],"datepicker",te)),ht(te.settings,b||{}),w=w&&w.constructor===Date?this._formatDate(te,w):w,this._dialogInput.val(w),this._pos=I?I.length?I:[I.pageX,I.pageY]:null,this._pos||(M=document.documentElement.clientWidth,K=document.documentElement.clientHeight,W=document.documentElement.scrollLeft||document.body.scrollLeft,q=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[M/2-100+W,K/2-150+q]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),te.settings.onSelect=C,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),g.blockUI&&g.blockUI(this.dpDiv),g.data(this._dialogInput[0],"datepicker",te),this},_destroyDatepicker:function(d){var w,C=g(d),b=g.data(d,"datepicker");C.hasClass(this.markerClassName)&&(w=d.nodeName.toLowerCase(),g.removeData(d,"datepicker"),w==="input"?(b.append.remove(),b.trigger.remove(),C.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):(w==="div"||w==="span")&&C.removeClass(this.markerClassName).empty(),Me===b&&(Me=null,this._curInst=null))},_enableDatepicker:function(d){var w,C,b=g(d),I=g.data(d,"datepicker");b.hasClass(this.markerClassName)&&(w=d.nodeName.toLowerCase(),w==="input"?(d.disabled=!1,I.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):(w==="div"||w==="span")&&(C=b.children("."+this._inlineClass),C.children().removeClass("ui-state-disabled"),C.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=g.map(this._disabledInputs,function(k){return k===d?null:k}))},_disableDatepicker:function(d){var w,C,b=g(d),I=g.data(d,"datepicker");b.hasClass(this.markerClassName)&&(w=d.nodeName.toLowerCase(),w==="input"?(d.disabled=!0,I.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):(w==="div"||w==="span")&&(C=b.children("."+this._inlineClass),C.children().addClass("ui-state-disabled"),C.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=g.map(this._disabledInputs,function(k){return k===d?null:k}),this._disabledInputs[this._disabledInputs.length]=d)},_isDisabledDatepicker:function(d){if(!d)return!1;for(var w=0;w<this._disabledInputs.length;w++)if(this._disabledInputs[w]===d)return!0;return!1},_getInst:function(d){try{return g.data(d,"datepicker")}catch{throw"Missing instance data for this datepicker"}},_optionDatepicker:function(d,w,C){var b,I,k,M,K=this._getInst(d);if(arguments.length===2&&typeof w=="string")return w==="defaults"?g.extend({},g.datepicker._defaults):K?w==="all"?g.extend({},K.settings):this._get(K,w):null;b=w||{},typeof w=="string"&&(b={},b[w]=C),K&&(this._curInst===K&&this._hideDatepicker(),I=this._getDateDatepicker(d,!0),k=this._getMinMaxDate(K,"min"),M=this._getMinMaxDate(K,"max"),ht(K.settings,b),k!==null&&b.dateFormat!==void 0&&b.minDate===void 0&&(K.settings.minDate=this._formatDate(K,k)),M!==null&&b.dateFormat!==void 0&&b.maxDate===void 0&&(K.settings.maxDate=this._formatDate(K,M)),"disabled"in b&&(b.disabled?this._disableDatepicker(d):this._enableDatepicker(d)),this._attachments(g(d),K),this._autoSize(K),this._setDate(K,I),this._updateAlternate(K),this._updateDatepicker(K))},_changeDatepicker:function(d,w,C){this._optionDatepicker(d,w,C)},_refreshDatepicker:function(d){var w=this._getInst(d);w&&this._updateDatepicker(w)},_setDateDatepicker:function(d,w){var C=this._getInst(d);C&&(this._setDate(C,w),this._updateDatepicker(C),this._updateAlternate(C))},_getDateDatepicker:function(d,w){var C=this._getInst(d);return C&&!C.inline&&this._setDateFromField(C,w),C?this._getDate(C):null},_doKeyDown:function(d){var w,C,b,I=g.datepicker._getInst(d.target),k=!0,M=I.dpDiv.is(".ui-datepicker-rtl");if(I._keyEvent=!0,g.datepicker._datepickerShowing)switch(d.keyCode){case 9:g.datepicker._hideDatepicker(),k=!1;break;case 13:return b=g("td."+g.datepicker._dayOverClass+":not(."+g.datepicker._currentClass+")",I.dpDiv),b[0]&&g.datepicker._selectDay(d.target,I.selectedMonth,I.selectedYear,b[0]),w=g.datepicker._get(I,"onSelect"),w?(C=g.datepicker._formatDate(I),w.apply(I.input?I.input[0]:null,[C,I])):g.datepicker._hideDatepicker(),!1;case 27:g.datepicker._hideDatepicker();break;case 33:g.datepicker._adjustDate(d.target,d.ctrlKey?-g.datepicker._get(I,"stepBigMonths"):-g.datepicker._get(I,"stepMonths"),"M");break;case 34:g.datepicker._adjustDate(d.target,d.ctrlKey?+g.datepicker._get(I,"stepBigMonths"):+g.datepicker._get(I,"stepMonths"),"M");break;case 35:(d.ctrlKey||d.metaKey)&&g.datepicker._clearDate(d.target),k=d.ctrlKey||d.metaKey;break;case 36:(d.ctrlKey||d.metaKey)&&g.datepicker._gotoToday(d.target),k=d.ctrlKey||d.metaKey;break;case 37:(d.ctrlKey||d.metaKey)&&g.datepicker._adjustDate(d.target,M?1:-1,"D"),k=d.ctrlKey||d.metaKey,d.originalEvent.altKey&&g.datepicker._adjustDate(d.target,d.ctrlKey?-g.datepicker._get(I,"stepBigMonths"):-g.datepicker._get(I,"stepMonths"),"M");break;case 38:(d.ctrlKey||d.metaKey)&&g.datepicker._adjustDate(d.target,-7,"D"),k=d.ctrlKey||d.metaKey;break;case 39:(d.ctrlKey||d.metaKey)&&g.datepicker._adjustDate(d.target,M?-1:1,"D"),k=d.ctrlKey||d.metaKey,d.originalEvent.altKey&&g.datepicker._adjustDate(d.target,d.ctrlKey?+g.datepicker._get(I,"stepBigMonths"):+g.datepicker._get(I,"stepMonths"),"M");break;case 40:(d.ctrlKey||d.metaKey)&&g.datepicker._adjustDate(d.target,7,"D"),k=d.ctrlKey||d.metaKey;break;default:k=!1}else d.keyCode===36&&d.ctrlKey?g.datepicker._showDatepicker(this):k=!1;k&&(d.preventDefault(),d.stopPropagation())},_doKeyPress:function(d){var w,C,b=g.datepicker._getInst(d.target);if(g.datepicker._get(b,"constrainInput"))return w=g.datepicker._possibleChars(g.datepicker._get(b,"dateFormat")),C=String.fromCharCode(d.charCode==null?d.keyCode:d.charCode),d.ctrlKey||d.metaKey||C<" "||!w||w.indexOf(C)>-1},_doKeyUp:function(d){var w,C=g.datepicker._getInst(d.target);if(C.input.val()!==C.lastVal)try{w=g.datepicker.parseDate(g.datepicker._get(C,"dateFormat"),C.input?C.input.val():null,g.datepicker._getFormatConfig(C)),w&&(g.datepicker._setDateFromField(C),g.datepicker._updateAlternate(C),g.datepicker._updateDatepicker(C))}catch{}return!0},_showDatepicker:function(d){if(d=d.target||d,d.nodeName.toLowerCase()!=="input"&&(d=g("input",d.parentNode)[0]),!(g.datepicker._isDisabledDatepicker(d)||g.datepicker._lastInput===d)){var w,C,b,I,k,M,K;w=g.datepicker._getInst(d),g.datepicker._curInst&&g.datepicker._curInst!==w&&(g.datepicker._curInst.dpDiv.stop(!0,!0),w&&g.datepicker._datepickerShowing&&g.datepicker._hideDatepicker(g.datepicker._curInst.input[0])),C=g.datepicker._get(w,"beforeShow"),b=C?C.apply(d,[d,w]):{},b!==!1&&(ht(w.settings,b),w.lastVal=null,g.datepicker._lastInput=d,g.datepicker._setDateFromField(w),g.datepicker._inDialog&&(d.value=""),g.datepicker._pos||(g.datepicker._pos=g.datepicker._findPos(d),g.datepicker._pos[1]+=d.offsetHeight),I=!1,g(d).parents().each(function(){return I|=g(this).css("position")==="fixed",!I}),k={left:g.datepicker._pos[0],top:g.datepicker._pos[1]},g.datepicker._pos=null,w.dpDiv.empty(),w.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),g.datepicker._updateDatepicker(w),k=g.datepicker._checkOffset(w,k,I),w.dpDiv.css({position:g.datepicker._inDialog&&g.blockUI?"static":I?"fixed":"absolute",display:"none",left:k.left+"px",top:k.top+"px"}),w.inline||(M=g.datepicker._get(w,"showAnim"),K=g.datepicker._get(w,"duration"),w.dpDiv.css("z-index",ze(g(d))+1),g.datepicker._datepickerShowing=!0,g.effects&&g.effects.effect[M]?w.dpDiv.show(M,g.datepicker._get(w,"showOptions"),K):w.dpDiv[M||"show"](M?K:null),g.datepicker._shouldFocusInput(w)&&w.input.trigger("focus"),g.datepicker._curInst=w))}},_updateDatepicker:function(d){this.maxRows=4,Me=d,d.dpDiv.empty().append(this._generateHTML(d)),this._attachHandlers(d);var w,C=this._getNumberOfMonths(d),b=C[1],I=17,k=d.dpDiv.find("."+this._dayOverClass+" a"),M=g.datepicker._get(d,"onUpdateDatepicker");k.length>0&&at.apply(k.get(0)),d.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),b>1&&d.dpDiv.addClass("ui-datepicker-multi-"+b).css("width",I*b+"em"),d.dpDiv[(C[0]!==1||C[1]!==1?"add":"remove")+"Class"]("ui-datepicker-multi"),d.dpDiv[(this._get(d,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),d===g.datepicker._curInst&&g.datepicker._datepickerShowing&&g.datepicker._shouldFocusInput(d)&&d.input.trigger("focus"),d.yearshtml&&(w=d.yearshtml,setTimeout(function(){w===d.yearshtml&&d.yearshtml&&d.dpDiv.find("select.ui-datepicker-year").first().replaceWith(d.yearshtml),w=d.yearshtml=null},0)),M&&M.apply(d.input?d.input[0]:null,[d])},_shouldFocusInput:function(d){return d.input&&d.input.is(":visible")&&!d.input.is(":disabled")&&!d.input.is(":focus")},_checkOffset:function(d,w,C){var b=d.dpDiv.outerWidth(),I=d.dpDiv.outerHeight(),k=d.input?d.input.outerWidth():0,M=d.input?d.input.outerHeight():0,K=document.documentElement.clientWidth+(C?0:g(document).scrollLeft()),W=document.documentElement.clientHeight+(C?0:g(document).scrollTop());return w.left-=this._get(d,"isRTL")?b-k:0,w.left-=C&&w.left===d.input.offset().left?g(document).scrollLeft():0,w.top-=C&&w.top===d.input.offset().top+M?g(document).scrollTop():0,w.left-=Math.min(w.left,w.left+b>K&&K>b?Math.abs(w.left+b-K):0),w.top-=Math.min(w.top,w.top+I>W&&W>I?Math.abs(I+M):0),w},_findPos:function(d){for(var w,C=this._getInst(d),b=this._get(C,"isRTL");d&&(d.type==="hidden"||d.nodeType!==1||g.expr.pseudos.hidden(d));)d=d[b?"previousSibling":"nextSibling"];return w=g(d).offset(),[w.left,w.top]},_hideDatepicker:function(d){var w,C,b,I,k=this._curInst;!k||d&&k!==g.data(d,"datepicker")||this._datepickerShowing&&(w=this._get(k,"showAnim"),C=this._get(k,"duration"),b=function(){g.datepicker._tidyDialog(k)},g.effects&&(g.effects.effect[w]||g.effects[w])?k.dpDiv.hide(w,g.datepicker._get(k,"showOptions"),C,b):k.dpDiv[w==="slideDown"?"slideUp":w==="fadeIn"?"fadeOut":"hide"](w?C:null,b),w||b(),this._datepickerShowing=!1,I=this._get(k,"onClose"),I&&I.apply(k.input?k.input[0]:null,[k.input?k.input.val():"",k]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),g.blockUI&&(g.unblockUI(),g("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(d){d.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(d){if(g.datepicker._curInst){var w=g(d.target),C=g.datepicker._getInst(w[0]);(w[0].id!==g.datepicker._mainDivId&&w.parents("#"+g.datepicker._mainDivId).length===0&&!w.hasClass(g.datepicker.markerClassName)&&!w.closest("."+g.datepicker._triggerClass).length&&g.datepicker._datepickerShowing&&!(g.datepicker._inDialog&&g.blockUI)||w.hasClass(g.datepicker.markerClassName)&&g.datepicker._curInst!==C)&&g.datepicker._hideDatepicker()}},_adjustDate:function(d,w,C){var b=g(d),I=this._getInst(b[0]);this._isDisabledDatepicker(b[0])||(this._adjustInstDate(I,w,C),this._updateDatepicker(I))},_gotoToday:function(d){var w,C=g(d),b=this._getInst(C[0]);this._get(b,"gotoCurrent")&&b.currentDay?(b.selectedDay=b.currentDay,b.drawMonth=b.selectedMonth=b.currentMonth,b.drawYear=b.selectedYear=b.currentYear):(w=new Date,b.selectedDay=w.getDate(),b.drawMonth=b.selectedMonth=w.getMonth(),b.drawYear=b.selectedYear=w.getFullYear()),this._notifyChange(b),this._adjustDate(C)},_selectMonthYear:function(d,w,C){var b=g(d),I=this._getInst(b[0]);I["selected"+(C==="M"?"Month":"Year")]=I["draw"+(C==="M"?"Month":"Year")]=parseInt(w.options[w.selectedIndex].value,10),this._notifyChange(I),this._adjustDate(b)},_selectDay:function(d,w,C,b){var I,k=g(d);g(b).hasClass(this._unselectableClass)||this._isDisabledDatepicker(k[0])||(I=this._getInst(k[0]),I.selectedDay=I.currentDay=parseInt(g("a",b).attr("data-date")),I.selectedMonth=I.currentMonth=w,I.selectedYear=I.currentYear=C,this._selectDate(d,this._formatDate(I,I.currentDay,I.currentMonth,I.currentYear)))},_clearDate:function(d){var w=g(d);this._selectDate(w,"")},_selectDate:function(d,w){var C,b=g(d),I=this._getInst(b[0]);w=w??this._formatDate(I),I.input&&I.input.val(w),this._updateAlternate(I),C=this._get(I,"onSelect"),C?C.apply(I.input?I.input[0]:null,[w,I]):I.input&&I.input.trigger("change"),I.inline?this._updateDatepicker(I):(this._hideDatepicker(),this._lastInput=I.input[0],typeof I.input[0]!="object"&&I.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(d){var w,C,b,I=this._get(d,"altField");I&&(w=this._get(d,"altFormat")||this._get(d,"dateFormat"),C=this._getDate(d),b=this.formatDate(w,C,this._getFormatConfig(d)),g(document).find(I).val(b))},noWeekends:function(d){var w=d.getDay();return[w>0&&w<6,""]},iso8601Week:function(d){var w,C=new Date(d.getTime());return C.setDate(C.getDate()+4-(C.getDay()||7)),w=C.getTime(),C.setMonth(0),C.setDate(1),Math.floor(Math.round((w-C)/864e5)/7)+1},parseDate:function(d,w,C){if(d==null||w==null)throw"Invalid arguments";if(w=typeof w=="object"?w.toString():w+"",w==="")return null;var b,I,k,M=0,K=(C?C.shortYearCutoff:null)||this._defaults.shortYearCutoff,W=typeof K!="string"?K:new Date().getFullYear()%100+parseInt(K,10),q=(C?C.dayNamesShort:null)||this._defaults.dayNamesShort,te=(C?C.dayNames:null)||this._defaults.dayNames,he=(C?C.monthNamesShort:null)||this._defaults.monthNamesShort,ne=(C?C.monthNames:null)||this._defaults.monthNames,ie=-1,re=-1,ce=-1,Be=-1,Fe=!1,Te,Ne=function(Ye){var qe=b+1<d.length&&d.charAt(b+1)===Ye;return qe&&b++,qe},Oe=function(Ye){var qe=Ne(Ye),Xe=Ye==="@"?14:Ye==="!"?20:Ye==="y"&&qe?4:Ye==="o"?3:2,rt=Ye==="y"?Xe:1,$e=new RegExp("^\\d{"+rt+","+Xe+"}"),pt=w.substring(M).match($e);if(!pt)throw"Missing number at position "+M;return M+=pt[0].length,parseInt(pt[0],10)},De=function(Ye,qe,Xe){var rt=-1,$e=g.map(Ne(Ye)?Xe:qe,function(pt,gt){return[[gt,pt]]}).sort(function(pt,gt){return-(pt[1].length-gt[1].length)});if(g.each($e,function(pt,gt){var Qt=gt[1];if(w.substr(M,Qt.length).toLowerCase()===Qt.toLowerCase())return rt=gt[0],M+=Qt.length,!1}),rt!==-1)return rt+1;throw"Unknown name at position "+M},et=function(){if(w.charAt(M)!==d.charAt(b))throw"Unexpected literal at position "+M;M++};for(b=0;b<d.length;b++)if(Fe)d.charAt(b)==="'"&&!Ne("'")?Fe=!1:et();else switch(d.charAt(b)){case"d":ce=Oe("d");break;case"D":De("D",q,te);break;case"o":Be=Oe("o");break;case"m":re=Oe("m");break;case"M":re=De("M",he,ne);break;case"y":ie=Oe("y");break;case"@":Te=new Date(Oe("@")),ie=Te.getFullYear(),re=Te.getMonth()+1,ce=Te.getDate();break;case"!":Te=new Date((Oe("!")-this._ticksTo1970)/1e4),ie=Te.getFullYear(),re=Te.getMonth()+1,ce=Te.getDate();break;case"'":Ne("'")?et():Fe=!0;break;default:et()}if(M<w.length&&(k=w.substr(M),!/^\s+/.test(k)))throw"Extra/unparsed characters found in date: "+k;if(ie===-1?ie=new Date().getFullYear():ie<100&&(ie+=new Date().getFullYear()-new Date().getFullYear()%100+(ie<=W?0:-100)),Be>-1){re=1,ce=Be;do{if(I=this._getDaysInMonth(ie,re-1),ce<=I)break;re++,ce-=I}while(!0)}if(Te=this._daylightSavingAdjust(new Date(ie,re-1,ce)),Te.getFullYear()!==ie||Te.getMonth()+1!==re||Te.getDate()!==ce)throw"Invalid date";return Te},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:((1970-1)*365+Math.floor(1970/4)-Math.floor(1970/100)+Math.floor(1970/400))*24*60*60*1e7,formatDate:function(d,w,C){if(!w)return"";var b,I=(C?C.dayNamesShort:null)||this._defaults.dayNamesShort,k=(C?C.dayNames:null)||this._defaults.dayNames,M=(C?C.monthNamesShort:null)||this._defaults.monthNamesShort,K=(C?C.monthNames:null)||this._defaults.monthNames,W=function(ie){var re=b+1<d.length&&d.charAt(b+1)===ie;return re&&b++,re},q=function(ie,re,ce){var Be=""+re;if(W(ie))for(;Be.length<ce;)Be="0"+Be;return Be},te=function(ie,re,ce,Be){return W(ie)?Be[re]:ce[re]},he="",ne=!1;if(w)for(b=0;b<d.length;b++)if(ne)d.charAt(b)==="'"&&!W("'")?ne=!1:he+=d.charAt(b);else switch(d.charAt(b)){case"d":he+=q("d",w.getDate(),2);break;case"D":he+=te("D",w.getDay(),I,k);break;case"o":he+=q("o",Math.round((new Date(w.getFullYear(),w.getMonth(),w.getDate()).getTime()-new Date(w.getFullYear(),0,0).getTime())/864e5),3);break;case"m":he+=q("m",w.getMonth()+1,2);break;case"M":he+=te("M",w.getMonth(),M,K);break;case"y":he+=W("y")?w.getFullYear():(w.getFullYear()%100<10?"0":"")+w.getFullYear()%100;break;case"@":he+=w.getTime();break;case"!":he+=w.getTime()*1e4+this._ticksTo1970;break;case"'":W("'")?he+="'":ne=!0;break;default:he+=d.charAt(b)}return he},_possibleChars:function(d){var w,C="",b=!1,I=function(k){var M=w+1<d.length&&d.charAt(w+1)===k;return M&&w++,M};for(w=0;w<d.length;w++)if(b)d.charAt(w)==="'"&&!I("'")?b=!1:C+=d.charAt(w);else switch(d.charAt(w)){case"d":case"m":case"y":case"@":C+="0123456789";break;case"D":case"M":return null;case"'":I("'")?C+="'":b=!0;break;default:C+=d.charAt(w)}return C},_get:function(d,w){return d.settings[w]!==void 0?d.settings[w]:this._defaults[w]},_setDateFromField:function(d,w){if(d.input.val()!==d.lastVal){var C=this._get(d,"dateFormat"),b=d.lastVal=d.input?d.input.val():null,I=this._getDefaultDate(d),k=I,M=this._getFormatConfig(d);try{k=this.parseDate(C,b,M)||I}catch{b=w?"":b}d.selectedDay=k.getDate(),d.drawMonth=d.selectedMonth=k.getMonth(),d.drawYear=d.selectedYear=k.getFullYear(),d.currentDay=b?k.getDate():0,d.currentMonth=b?k.getMonth():0,d.currentYear=b?k.getFullYear():0,this._adjustInstDate(d)}},_getDefaultDate:function(d){return this._restrictMinMax(d,this._determineDate(d,this._get(d,"defaultDate"),new Date))},_determineDate:function(d,w,C){var b=function(M){var K=new Date;return K.setDate(K.getDate()+M),K},I=function(M){try{return g.datepicker.parseDate(g.datepicker._get(d,"dateFormat"),M,g.datepicker._getFormatConfig(d))}catch{}for(var K=(M.toLowerCase().match(/^c/)?g.datepicker._getDate(d):null)||new Date,W=K.getFullYear(),q=K.getMonth(),te=K.getDate(),he=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,ne=he.exec(M);ne;){switch(ne[2]||"d"){case"d":case"D":te+=parseInt(ne[1],10);break;case"w":case"W":te+=parseInt(ne[1],10)*7;break;case"m":case"M":q+=parseInt(ne[1],10),te=Math.min(te,g.datepicker._getDaysInMonth(W,q));break;case"y":case"Y":W+=parseInt(ne[1],10),te=Math.min(te,g.datepicker._getDaysInMonth(W,q));break}ne=he.exec(M)}return new Date(W,q,te)},k=w==null||w===""?C:typeof w=="string"?I(w):typeof w=="number"?isNaN(w)?C:b(w):new Date(w.getTime());return k=k&&k.toString()==="Invalid Date"?C:k,k&&(k.setHours(0),k.setMinutes(0),k.setSeconds(0),k.setMilliseconds(0)),this._daylightSavingAdjust(k)},_daylightSavingAdjust:function(d){return d?(d.setHours(d.getHours()>12?d.getHours()+2:0),d):null},_setDate:function(d,w,C){var b=!w,I=d.selectedMonth,k=d.selectedYear,M=this._restrictMinMax(d,this._determineDate(d,w,new Date));d.selectedDay=d.currentDay=M.getDate(),d.drawMonth=d.selectedMonth=d.currentMonth=M.getMonth(),d.drawYear=d.selectedYear=d.currentYear=M.getFullYear(),(I!==d.selectedMonth||k!==d.selectedYear)&&!C&&this._notifyChange(d),this._adjustInstDate(d),d.input&&d.input.val(b?"":this._formatDate(d))},_getDate:function(d){var w=!d.currentYear||d.input&&d.input.val()===""?null:this._daylightSavingAdjust(new Date(d.currentYear,d.currentMonth,d.currentDay));return w},_attachHandlers:function(d){var w=this._get(d,"stepMonths"),C="#"+d.id.replace(/\\\\/g,"\\");d.dpDiv.find("[data-handler]").map(function(){var b={prev:function(){g.datepicker._adjustDate(C,-w,"M")},next:function(){g.datepicker._adjustDate(C,+w,"M")},hide:function(){g.datepicker._hideDatepicker()},today:function(){g.datepicker._gotoToday(C)},selectDay:function(){return g.datepicker._selectDay(C,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return g.datepicker._selectMonthYear(C,this,"M"),!1},selectYear:function(){return g.datepicker._selectMonthYear(C,this,"Y"),!1}};g(this).on(this.getAttribute("data-event"),b[this.getAttribute("data-handler")])})},_generateHTML:function(d){var w,C,b,I,k,M,K,W,q,te,he,ne,ie,re,ce,Be,Fe,Te,Ne,Oe,De,et,Ye,qe,Xe,rt,$e,pt,gt,Qt,xt,qt,_t,Ge,Kt,At,Ct,bt,kt,zt=new Date,St=this._daylightSavingAdjust(new Date(zt.getFullYear(),zt.getMonth(),zt.getDate())),wt=this._get(d,"isRTL"),Fi=this._get(d,"showButtonPanel"),pi=this._get(d,"hideIfNoPrevNext"),Bi=this._get(d,"navigationAsDateFormat"),Ut=this._getNumberOfMonths(d),se=this._get(d,"showCurrentAtPos"),pe=this._get(d,"stepMonths"),de=Ut[0]!==1||Ut[1]!==1,Ee=this._daylightSavingAdjust(d.currentDay?new Date(d.currentYear,d.currentMonth,d.currentDay):new Date(9999,9,9)),Ie=this._getMinMaxDate(d,"min"),be=this._getMinMaxDate(d,"max"),Le=d.drawMonth-se,je=d.drawYear;if(Le<0&&(Le+=12,je--),be)for(w=this._daylightSavingAdjust(new Date(be.getFullYear(),be.getMonth()-Ut[0]*Ut[1]+1,be.getDate())),w=Ie&&w<Ie?Ie:w;this._daylightSavingAdjust(new Date(je,Le,1))>w;)Le--,Le<0&&(Le=11,je--);for(d.drawMonth=Le,d.drawYear=je,C=this._get(d,"prevText"),C=Bi?this.formatDate(C,this._daylightSavingAdjust(new Date(je,Le-pe,1)),this._getFormatConfig(d)):C,this._canAdjustMonth(d,-1,je,Le)?b=g("<a>").attr({class:"ui-datepicker-prev ui-corner-all","data-handler":"prev","data-event":"click",title:C}).append(g("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(wt?"e":"w")).text(C))[0].outerHTML:pi?b="":b=g("<a>").attr({class:"ui-datepicker-prev ui-corner-all ui-state-disabled",title:C}).append(g("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(wt?"e":"w")).text(C))[0].outerHTML,I=this._get(d,"nextText"),I=Bi?this.formatDate(I,this._daylightSavingAdjust(new Date(je,Le+pe,1)),this._getFormatConfig(d)):I,this._canAdjustMonth(d,1,je,Le)?k=g("<a>").attr({class:"ui-datepicker-next ui-corner-all","data-handler":"next","data-event":"click",title:I}).append(g("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(wt?"w":"e")).text(I))[0].outerHTML:pi?k="":k=g("<a>").attr({class:"ui-datepicker-next ui-corner-all ui-state-disabled",title:I}).append(g("<span>").attr("class","ui-icon ui-icon-circle-triangle-"+(wt?"w":"e")).text(I))[0].outerHTML,M=this._get(d,"currentText"),K=this._get(d,"gotoCurrent")&&d.currentDay?Ee:St,M=Bi?this.formatDate(M,K,this._getFormatConfig(d)):M,W="",d.inline||(W=g("<button>").attr({type:"button",class:"ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all","data-handler":"hide","data-event":"click"}).text(this._get(d,"closeText"))[0].outerHTML),q="",Fi&&(q=g("<div class='ui-datepicker-buttonpane ui-widget-content'>").append(wt?W:"").append(this._isInRange(d,K)?g("<button>").attr({type:"button",class:"ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all","data-handler":"today","data-event":"click"}).text(M):"").append(wt?"":W)[0].outerHTML),te=parseInt(this._get(d,"firstDay"),10),te=isNaN(te)?0:te,he=this._get(d,"showWeek"),ne=this._get(d,"dayNames"),ie=this._get(d,"dayNamesMin"),re=this._get(d,"monthNames"),ce=this._get(d,"monthNamesShort"),Be=this._get(d,"beforeShowDay"),Fe=this._get(d,"showOtherMonths"),Te=this._get(d,"selectOtherMonths"),Ne=this._getDefaultDate(d),Oe="",et=0;et<Ut[0];et++){for(Ye="",this.maxRows=4,qe=0;qe<Ut[1];qe++){if(Xe=this._daylightSavingAdjust(new Date(je,Le,d.selectedDay)),rt=" ui-corner-all",$e="",de){if($e+="<div class='ui-datepicker-group",Ut[1]>1)switch(qe){case 0:$e+=" ui-datepicker-group-first",rt=" ui-corner-"+(wt?"right":"left");break;case Ut[1]-1:$e+=" ui-datepicker-group-last",rt=" ui-corner-"+(wt?"left":"right");break;default:$e+=" ui-datepicker-group-middle",rt="";break}$e+="'>"}for($e+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+rt+"'>"+(/all|left/.test(rt)&&et===0?wt?k:b:"")+(/all|right/.test(rt)&&et===0?wt?b:k:"")+this._generateMonthYearHeader(d,Le,je,Ie,be,et>0||qe>0,re,ce)+"</div><table class='ui-datepicker-calendar'><thead><tr>",pt=he?"<th class='ui-datepicker-week-col'>"+this._get(d,"weekHeader")+"</th>":"",De=0;De<7;De++)gt=(De+te)%7,pt+="<th scope='col'"+((De+te+6)%7>=5?" class='ui-datepicker-week-end'":"")+"><span title='"+ne[gt]+"'>"+ie[gt]+"</span></th>";for($e+=pt+"</tr></thead><tbody>",Qt=this._getDaysInMonth(je,Le),je===d.selectedYear&&Le===d.selectedMonth&&(d.selectedDay=Math.min(d.selectedDay,Qt)),xt=(this._getFirstDayOfMonth(je,Le)-te+7)%7,qt=Math.ceil((xt+Qt)/7),_t=de&&this.maxRows>qt?this.maxRows:qt,this.maxRows=_t,Ge=this._daylightSavingAdjust(new Date(je,Le,1-xt)),Kt=0;Kt<_t;Kt++){for($e+="<tr>",At=he?"<td class='ui-datepicker-week-col'>"+this._get(d,"calculateWeek")(Ge)+"</td>":"",De=0;De<7;De++)Ct=Be?Be.apply(d.input?d.input[0]:null,[Ge]):[!0,""],bt=Ge.getMonth()!==Le,kt=bt&&!Te||!Ct[0]||Ie&&Ge<Ie||be&&Ge>be,At+="<td class='"+((De+te+6)%7>=5?" ui-datepicker-week-end":"")+(bt?" ui-datepicker-other-month":"")+(Ge.getTime()===Xe.getTime()&&Le===d.selectedMonth&&d._keyEvent||Ne.getTime()===Ge.getTime()&&Ne.getTime()===Xe.getTime()?" "+this._dayOverClass:"")+(kt?" "+this._unselectableClass+" ui-state-disabled":"")+(bt&&!Fe?"":" "+Ct[1]+(Ge.getTime()===Ee.getTime()?" "+this._currentClass:"")+(Ge.getTime()===St.getTime()?" ui-datepicker-today":""))+"'"+((!bt||Fe)&&Ct[2]?" title='"+Ct[2].replace(/'/g,"&#39;")+"'":"")+(kt?"":" data-handler='selectDay' data-event='click' data-month='"+Ge.getMonth()+"' data-year='"+Ge.getFullYear()+"'")+">"+(bt&&!Fe?"&#xa0;":kt?"<span class='ui-state-default'>"+Ge.getDate()+"</span>":"<a class='ui-state-default"+(Ge.getTime()===St.getTime()?" ui-state-highlight":"")+(Ge.getTime()===Ee.getTime()?" ui-state-active":"")+(bt?" ui-priority-secondary":"")+"' href='#' aria-current='"+(Ge.getTime()===Ee.getTime()?"true":"false")+"' data-date='"+Ge.getDate()+"'>"+Ge.getDate()+"</a>")+"</td>",Ge.setDate(Ge.getDate()+1),Ge=this._daylightSavingAdjust(Ge);$e+=At+"</tr>"}Le++,Le>11&&(Le=0,je++),$e+="</tbody></table>"+(de?"</div>"+(Ut[0]>0&&qe===Ut[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),Ye+=$e}Oe+=Ye}return Oe+=q,d._keyEvent=!1,Oe},_generateMonthYearHeader:function(d,w,C,b,I,k,M,K){var W,q,te,he,ne,ie,re,ce,Be=this._get(d,"changeMonth"),Fe=this._get(d,"changeYear"),Te=this._get(d,"showMonthAfterYear"),Ne=this._get(d,"selectMonthLabel"),Oe=this._get(d,"selectYearLabel"),De="<div class='ui-datepicker-title'>",et="";if(k||!Be)et+="<span class='ui-datepicker-month'>"+M[w]+"</span>";else{for(W=b&&b.getFullYear()===C,q=I&&I.getFullYear()===C,et+="<select class='ui-datepicker-month' aria-label='"+Ne+"' data-handler='selectMonth' data-event='change'>",te=0;te<12;te++)(!W||te>=b.getMonth())&&(!q||te<=I.getMonth())&&(et+="<option value='"+te+"'"+(te===w?" selected='selected'":"")+">"+K[te]+"</option>");et+="</select>"}if(Te||(De+=et+(k||!(Be&&Fe)?"&#xa0;":"")),!d.yearshtml)if(d.yearshtml="",k||!Fe)De+="<span class='ui-datepicker-year'>"+C+"</span>";else{for(he=this._get(d,"yearRange").split(":"),ne=new Date().getFullYear(),ie=function(Ye){var qe=Ye.match(/c[+\-].*/)?C+parseInt(Ye.substring(1),10):Ye.match(/[+\-].*/)?ne+parseInt(Ye,10):parseInt(Ye,10);return isNaN(qe)?ne:qe},re=ie(he[0]),ce=Math.max(re,ie(he[1]||"")),re=b?Math.max(re,b.getFullYear()):re,ce=I?Math.min(ce,I.getFullYear()):ce,d.yearshtml+="<select class='ui-datepicker-year' aria-label='"+Oe+"' data-handler='selectYear' data-event='change'>";re<=ce;re++)d.yearshtml+="<option value='"+re+"'"+(re===C?" selected='selected'":"")+">"+re+"</option>";d.yearshtml+="</select>",De+=d.yearshtml,d.yearshtml=null}return De+=this._get(d,"yearSuffix"),Te&&(De+=(k||!(Be&&Fe)?"&#xa0;":"")+et),De+="</div>",De},_adjustInstDate:function(d,w,C){var b=d.selectedYear+(C==="Y"?w:0),I=d.selectedMonth+(C==="M"?w:0),k=Math.min(d.selectedDay,this._getDaysInMonth(b,I))+(C==="D"?w:0),M=this._restrictMinMax(d,this._daylightSavingAdjust(new Date(b,I,k)));d.selectedDay=M.getDate(),d.drawMonth=d.selectedMonth=M.getMonth(),d.drawYear=d.selectedYear=M.getFullYear(),(C==="M"||C==="Y")&&this._notifyChange(d)},_restrictMinMax:function(d,w){var C=this._getMinMaxDate(d,"min"),b=this._getMinMaxDate(d,"max"),I=C&&w<C?C:w;return b&&I>b?b:I},_notifyChange:function(d){var w=this._get(d,"onChangeMonthYear");w&&w.apply(d.input?d.input[0]:null,[d.selectedYear,d.selectedMonth+1,d])},_getNumberOfMonths:function(d){var w=this._get(d,"numberOfMonths");return w==null?[1,1]:typeof w=="number"?[1,w]:w},_getMinMaxDate:function(d,w){return this._determineDate(d,this._get(d,w+"Date"),null)},_getDaysInMonth:function(d,w){return 32-this._daylightSavingAdjust(new Date(d,w,32)).getDate()},_getFirstDayOfMonth:function(d,w){return new Date(d,w,1).getDay()},_canAdjustMonth:function(d,w,C,b){var I=this._getNumberOfMonths(d),k=this._daylightSavingAdjust(new Date(C,b+(w<0?w:I[0]*I[1]),1));return w<0&&k.setDate(this._getDaysInMonth(k.getFullYear(),k.getMonth())),this._isInRange(d,k)},_isInRange:function(d,w){var C,b,I=this._getMinMaxDate(d,"min"),k=this._getMinMaxDate(d,"max"),M=null,K=null,W=this._get(d,"yearRange");return W&&(C=W.split(":"),b=new Date().getFullYear(),M=parseInt(C[0],10),K=parseInt(C[1],10),C[0].match(/[+\-].*/)&&(M+=b),C[1].match(/[+\-].*/)&&(K+=b)),(!I||w.getTime()>=I.getTime())&&(!k||w.getTime()<=k.getTime())&&(!M||w.getFullYear()>=M)&&(!K||w.getFullYear()<=K)},_getFormatConfig:function(d){var w=this._get(d,"shortYearCutoff");return w=typeof w!="string"?w:new Date().getFullYear()%100+parseInt(w,10),{shortYearCutoff:w,dayNamesShort:this._get(d,"dayNamesShort"),dayNames:this._get(d,"dayNames"),monthNamesShort:this._get(d,"monthNamesShort"),monthNames:this._get(d,"monthNames")}},_formatDate:function(d,w,C,b){w||(d.currentDay=d.selectedDay,d.currentMonth=d.selectedMonth,d.currentYear=d.selectedYear);var I=w?typeof w=="object"?w:this._daylightSavingAdjust(new Date(b,C,w)):this._daylightSavingAdjust(new Date(d.currentYear,d.currentMonth,d.currentDay));return this.formatDate(this._get(d,"dateFormat"),I,this._getFormatConfig(d))}});function ft(d){var w="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return d.on("mouseout",w,function(){g(this).removeClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!==-1&&g(this).removeClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!==-1&&g(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",w,at)}function at(){g.datepicker._isDisabledDatepicker(Me.inline?Me.dpDiv.parent()[0]:Me.input[0])||(g(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),g(this).addClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!==-1&&g(this).addClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!==-1&&g(this).addClass("ui-datepicker-next-hover"))}function ht(d,w){g.extend(d,w);for(var C in w)w[C]==null&&(d[C]=w[C]);return d}g.fn.datepicker=function(d){if(!this.length)return this;g.datepicker.initialized||(g(document).on("mousedown",g.datepicker._checkExternalClick),g.datepicker.initialized=!0),g("#"+g.datepicker._mainDivId).length===0&&g("body").append(g.datepicker.dpDiv);var w=Array.prototype.slice.call(arguments,1);return typeof d=="string"&&(d==="isDisabled"||d==="getDate"||d==="widget")?g.datepicker["_"+d+"Datepicker"].apply(g.datepicker,[this[0]].concat(w)):d==="option"&&arguments.length===2&&typeof arguments[1]=="string"?g.datepicker["_"+d+"Datepicker"].apply(g.datepicker,[this[0]].concat(w)):this.each(function(){typeof d=="string"?g.datepicker["_"+d+"Datepicker"].apply(g.datepicker,[this].concat(w)):g.datepicker._attachDatepicker(this,d)})},g.datepicker=new Je,g.datepicker.initialized=!1,g.datepicker.uuid=new Date().getTime(),g.datepicker.version="1.13.2",g.datepicker,g.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());/*!
+ * jQuery UI Mouse 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */var vt=!1;g(document).on("mouseup",function(){vt=!1}),g.widget("ui.mouse",{version:"1.13.2",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var d=this;this.element.on("mousedown."+this.widgetName,function(w){return d._mouseDown(w)}).on("click."+this.widgetName,function(w){if(g.data(w.target,d.widgetName+".preventClickEvent")===!0)return g.removeData(w.target,d.widgetName+".preventClickEvent"),w.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(d){if(!vt){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(d),this._mouseDownEvent=d;var w=this,C=d.which===1,b=typeof this.options.cancel=="string"&&d.target.nodeName?g(d.target).closest(this.options.cancel).length:!1;return!C||b||!this._mouseCapture(d)?!0:(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){w.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(d)&&this._mouseDelayMet(d)&&(this._mouseStarted=this._mouseStart(d)!==!1,!this._mouseStarted)?(d.preventDefault(),!0):(g.data(d.target,this.widgetName+".preventClickEvent")===!0&&g.removeData(d.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(I){return w._mouseMove(I)},this._mouseUpDelegate=function(I){return w._mouseUp(I)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),d.preventDefault(),vt=!0,!0))}},_mouseMove:function(d){if(this._mouseMoved){if(g.ui.ie&&(!document.documentMode||document.documentMode<9)&&!d.button)return this._mouseUp(d);if(!d.which){if(d.originalEvent.altKey||d.originalEvent.ctrlKey||d.originalEvent.metaKey||d.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(d)}}return(d.which||d.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(d),d.preventDefault()):(this._mouseDistanceMet(d)&&this._mouseDelayMet(d)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,d)!==!1,this._mouseStarted?this._mouseDrag(d):this._mouseUp(d)),!this._mouseStarted)},_mouseUp:function(d){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,d.target===this._mouseDownEvent.target&&g.data(d.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(d)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,vt=!1,d.preventDefault()},_mouseDistanceMet:function(d){return Math.max(Math.abs(this._mouseDownEvent.pageX-d.pageX),Math.abs(this._mouseDownEvent.pageY-d.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),g.ui.plugin={add:function(d,w,C){var b,I=g.ui[d].prototype;for(b in C)I.plugins[b]=I.plugins[b]||[],I.plugins[b].push([w,C[b]])},call:function(d,w,C,b){var I,k=d.plugins[w];if(k&&!(!b&&(!d.element[0].parentNode||d.element[0].parentNode.nodeType===11)))for(I=0;I<k.length;I++)d.options[k[I][0]]&&k[I][1].apply(d.element,C)}},g.ui.safeBlur=function(d){d&&d.nodeName.toLowerCase()!=="body"&&g(d).trigger("blur")};/*!
+ * jQuery UI Draggable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.draggable",g.ui.mouse,{version:"1.13.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){this.options.helper==="original"&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(d,w){this._super(d,w),d==="handle"&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){if((this.helper||this.element).is(".ui-draggable-dragging")){this.destroyOnClear=!0;return}this._removeHandleClassName(),this._mouseDestroy()},_mouseCapture:function(d){var w=this.options;return this.helper||w.disabled||g(d.target).closest(".ui-resizable-handle").length>0||(this.handle=this._getHandle(d),!this.handle)?!1:(this._blurActiveElement(d),this._blockFrames(w.iframeFix===!0?"iframe":w.iframeFix),!0)},_blockFrames:function(d){this.iframeBlocks=this.document.find(d).map(function(){var w=g(this);return g("<div>").css("position","absolute").appendTo(w.parent()).outerWidth(w.outerWidth()).outerHeight(w.outerHeight()).offset(w.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(d){var w=g.ui.safeActiveElement(this.document[0]),C=g(d.target);C.closest(w).length||g.ui.safeBlur(w)},_mouseStart:function(d){var w=this.options;return this.helper=this._createHelper(d),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),g.ui.ddmanager&&(g.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return g(this).css("position")==="fixed"}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(d),this.originalPosition=this.position=this._generatePosition(d,!1),this.originalPageX=d.pageX,this.originalPageY=d.pageY,w.cursorAt&&this._adjustOffsetFromHelper(w.cursorAt),this._setContainment(),this._trigger("start",d)===!1?(this._clear(),!1):(this._cacheHelperProportions(),g.ui.ddmanager&&!w.dropBehaviour&&g.ui.ddmanager.prepareOffsets(this,d),this._mouseDrag(d,!0),g.ui.ddmanager&&g.ui.ddmanager.dragStart(this,d),!0)},_refreshOffsets:function(d){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:d.pageX-this.offset.left,top:d.pageY-this.offset.top}},_mouseDrag:function(d,w){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(d,!0),this.positionAbs=this._convertPositionTo("absolute"),!w){var C=this._uiHash();if(this._trigger("drag",d,C)===!1)return this._mouseUp(new g.Event("mouseup",d)),!1;this.position=C.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",g.ui.ddmanager&&g.ui.ddmanager.drag(this,d),!1},_mouseStop:function(d){var w=this,C=!1;return g.ui.ddmanager&&!this.options.dropBehaviour&&(C=g.ui.ddmanager.drop(this,d)),this.dropped&&(C=this.dropped,this.dropped=!1),this.options.revert==="invalid"&&!C||this.options.revert==="valid"&&C||this.options.revert===!0||typeof this.options.revert=="function"&&this.options.revert.call(this.element,C)?g(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){w._trigger("stop",d)!==!1&&w._clear()}):this._trigger("stop",d)!==!1&&this._clear(),!1},_mouseUp:function(d){return this._unblockFrames(),g.ui.ddmanager&&g.ui.ddmanager.dragStop(this,d),this.handleElement.is(d.target)&&this.element.trigger("focus"),g.ui.mouse.prototype._mouseUp.call(this,d)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new g.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(d){return this.options.handle?!!g(d.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(d){var w=this.options,C=typeof w.helper=="function",b=C?g(w.helper.apply(this.element[0],[d])):w.helper==="clone"?this.element.clone().removeAttr("id"):this.element;return b.parents("body").length||b.appendTo(w.appendTo==="parent"?this.element[0].parentNode:w.appendTo),C&&b[0]===this.element[0]&&this._setPositionRelative(),b[0]!==this.element[0]&&!/(fixed|absolute)/.test(b.css("position"))&&b.css("position","absolute"),b},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(d){typeof d=="string"&&(d=d.split(" ")),Array.isArray(d)&&(d={left:+d[0],top:+d[1]||0}),"left"in d&&(this.offset.click.left=d.left+this.margins.left),"right"in d&&(this.offset.click.left=this.helperProportions.width-d.right+this.margins.left),"top"in d&&(this.offset.click.top=d.top+this.margins.top),"bottom"in d&&(this.offset.click.top=this.helperProportions.height-d.bottom+this.margins.top)},_isRootNode:function(d){return/(html|body)/i.test(d.tagName)||d===this.document[0]},_getParentOffset:function(){var d=this.offsetParent.offset(),w=this.document[0];return this.cssPosition==="absolute"&&this.scrollParent[0]!==w&&g.contains(this.scrollParent[0],this.offsetParent[0])&&(d.left+=this.scrollParent.scrollLeft(),d.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(d={top:0,left:0}),{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition!=="relative")return{top:0,left:0};var d=this.element.position(),w=this._isRootNode(this.scrollParent[0]);return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+(w?0:this.scrollParent.scrollTop()),left:d.left-(parseInt(this.helper.css("left"),10)||0)+(w?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d,w,C,b=this.options,I=this.document[0];if(this.relativeContainer=null,!b.containment){this.containment=null;return}if(b.containment==="window"){this.containment=[g(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,g(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,g(window).scrollLeft()+g(window).width()-this.helperProportions.width-this.margins.left,g(window).scrollTop()+(g(window).height()||I.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];return}if(b.containment==="document"){this.containment=[0,0,g(I).width()-this.helperProportions.width-this.margins.left,(g(I).height()||I.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];return}if(b.containment.constructor===Array){this.containment=b.containment;return}b.containment==="parent"&&(b.containment=this.helper[0].parentNode),w=g(b.containment),C=w[0],C&&(d=/(scroll|auto)/.test(w.css("overflow")),this.containment=[(parseInt(w.css("borderLeftWidth"),10)||0)+(parseInt(w.css("paddingLeft"),10)||0),(parseInt(w.css("borderTopWidth"),10)||0)+(parseInt(w.css("paddingTop"),10)||0),(d?Math.max(C.scrollWidth,C.offsetWidth):C.offsetWidth)-(parseInt(w.css("borderRightWidth"),10)||0)-(parseInt(w.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(d?Math.max(C.scrollHeight,C.offsetHeight):C.offsetHeight)-(parseInt(w.css("borderBottomWidth"),10)||0)-(parseInt(w.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=w)},_convertPositionTo:function(d,w){w||(w=this.position);var C=d==="absolute"?1:-1,b=this._isRootNode(this.scrollParent[0]);return{top:w.top+this.offset.relative.top*C+this.offset.parent.top*C-(this.cssPosition==="fixed"?-this.offset.scroll.top:b?0:this.offset.scroll.top)*C,left:w.left+this.offset.relative.left*C+this.offset.parent.left*C-(this.cssPosition==="fixed"?-this.offset.scroll.left:b?0:this.offset.scroll.left)*C}},_generatePosition:function(d,w){var C,b,I,k,M=this.options,K=this._isRootNode(this.scrollParent[0]),W=d.pageX,q=d.pageY;return(!K||!this.offset.scroll)&&(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),w&&(this.containment&&(this.relativeContainer?(b=this.relativeContainer.offset(),C=[this.containment[0]+b.left,this.containment[1]+b.top,this.containment[2]+b.left,this.containment[3]+b.top]):C=this.containment,d.pageX-this.offset.click.left<C[0]&&(W=C[0]+this.offset.click.left),d.pageY-this.offset.click.top<C[1]&&(q=C[1]+this.offset.click.top),d.pageX-this.offset.click.left>C[2]&&(W=C[2]+this.offset.click.left),d.pageY-this.offset.click.top>C[3]&&(q=C[3]+this.offset.click.top)),M.grid&&(I=M.grid[1]?this.originalPageY+Math.round((q-this.originalPageY)/M.grid[1])*M.grid[1]:this.originalPageY,q=C?I-this.offset.click.top>=C[1]||I-this.offset.click.top>C[3]?I:I-this.offset.click.top>=C[1]?I-M.grid[1]:I+M.grid[1]:I,k=M.grid[0]?this.originalPageX+Math.round((W-this.originalPageX)/M.grid[0])*M.grid[0]:this.originalPageX,W=C?k-this.offset.click.left>=C[0]||k-this.offset.click.left>C[2]?k:k-this.offset.click.left>=C[0]?k-M.grid[0]:k+M.grid[0]:k),M.axis==="y"&&(W=this.originalPageX),M.axis==="x"&&(q=this.originalPageY)),{top:q-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.offset.scroll.top:K?0:this.offset.scroll.top),left:W-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.offset.scroll.left:K?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]!==this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(d,w,C){return C=C||this._uiHash(),g.ui.plugin.call(this,d,[w,C,this],!0),/^(drag|start|stop)/.test(d)&&(this.positionAbs=this._convertPositionTo("absolute"),C.offset=this.positionAbs),g.Widget.prototype._trigger.call(this,d,w,C)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),g.ui.plugin.add("draggable","connectToSortable",{start:function(d,w,C){var b=g.extend({},w,{item:C.element});C.sortables=[],g(C.options.connectToSortable).each(function(){var I=g(this).sortable("instance");I&&!I.options.disabled&&(C.sortables.push(I),I.refreshPositions(),I._trigger("activate",d,b))})},stop:function(d,w,C){var b=g.extend({},w,{item:C.element});C.cancelHelperRemoval=!1,g.each(C.sortables,function(){var I=this;I.isOver?(I.isOver=0,C.cancelHelperRemoval=!0,I.cancelHelperRemoval=!1,I._storedCSS={position:I.placeholder.css("position"),top:I.placeholder.css("top"),left:I.placeholder.css("left")},I._mouseStop(d),I.options.helper=I.options._helper):(I.cancelHelperRemoval=!0,I._trigger("deactivate",d,b))})},drag:function(d,w,C){g.each(C.sortables,function(){var b=!1,I=this;I.positionAbs=C.positionAbs,I.helperProportions=C.helperProportions,I.offset.click=C.offset.click,I._intersectsWith(I.containerCache)&&(b=!0,g.each(C.sortables,function(){return this.positionAbs=C.positionAbs,this.helperProportions=C.helperProportions,this.offset.click=C.offset.click,this!==I&&this._intersectsWith(this.containerCache)&&g.contains(I.element[0],this.element[0])&&(b=!1),b})),b?(I.isOver||(I.isOver=1,C._parent=w.helper.parent(),I.currentItem=w.helper.appendTo(I.element).data("ui-sortable-item",!0),I.options._helper=I.options.helper,I.options.helper=function(){return w.helper[0]},d.target=I.currentItem[0],I._mouseCapture(d,!0),I._mouseStart(d,!0,!0),I.offset.click.top=C.offset.click.top,I.offset.click.left=C.offset.click.left,I.offset.parent.left-=C.offset.parent.left-I.offset.parent.left,I.offset.parent.top-=C.offset.parent.top-I.offset.parent.top,C._trigger("toSortable",d),C.dropped=I.element,g.each(C.sortables,function(){this.refreshPositions()}),C.currentItem=C.element,I.fromOutside=C),I.currentItem&&(I._mouseDrag(d),w.position=I.position)):I.isOver&&(I.isOver=0,I.cancelHelperRemoval=!0,I.options._revert=I.options.revert,I.options.revert=!1,I._trigger("out",d,I._uiHash(I)),I._mouseStop(d,!0),I.options.revert=I.options._revert,I.options.helper=I.options._helper,I.placeholder&&I.placeholder.remove(),w.helper.appendTo(C._parent),C._refreshOffsets(d),w.position=C._generatePosition(d,!0),C._trigger("fromSortable",d),C.dropped=!1,g.each(C.sortables,function(){this.refreshPositions()}))})}}),g.ui.plugin.add("draggable","cursor",{start:function(d,w,C){var b=g("body"),I=C.options;b.css("cursor")&&(I._cursor=b.css("cursor")),b.css("cursor",I.cursor)},stop:function(d,w,C){var b=C.options;b._cursor&&g("body").css("cursor",b._cursor)}}),g.ui.plugin.add("draggable","opacity",{start:function(d,w,C){var b=g(w.helper),I=C.options;b.css("opacity")&&(I._opacity=b.css("opacity")),b.css("opacity",I.opacity)},stop:function(d,w,C){var b=C.options;b._opacity&&g(w.helper).css("opacity",b._opacity)}}),g.ui.plugin.add("draggable","scroll",{start:function(d,w,C){C.scrollParentNotHidden||(C.scrollParentNotHidden=C.helper.scrollParent(!1)),C.scrollParentNotHidden[0]!==C.document[0]&&C.scrollParentNotHidden[0].tagName!=="HTML"&&(C.overflowOffset=C.scrollParentNotHidden.offset())},drag:function(d,w,C){var b=C.options,I=!1,k=C.scrollParentNotHidden[0],M=C.document[0];k!==M&&k.tagName!=="HTML"?((!b.axis||b.axis!=="x")&&(C.overflowOffset.top+k.offsetHeight-d.pageY<b.scrollSensitivity?k.scrollTop=I=k.scrollTop+b.scrollSpeed:d.pageY-C.overflowOffset.top<b.scrollSensitivity&&(k.scrollTop=I=k.scrollTop-b.scrollSpeed)),(!b.axis||b.axis!=="y")&&(C.overflowOffset.left+k.offsetWidth-d.pageX<b.scrollSensitivity?k.scrollLeft=I=k.scrollLeft+b.scrollSpeed:d.pageX-C.overflowOffset.left<b.scrollSensitivity&&(k.scrollLeft=I=k.scrollLeft-b.scrollSpeed))):((!b.axis||b.axis!=="x")&&(d.pageY-g(M).scrollTop()<b.scrollSensitivity?I=g(M).scrollTop(g(M).scrollTop()-b.scrollSpeed):g(window).height()-(d.pageY-g(M).scrollTop())<b.scrollSensitivity&&(I=g(M).scrollTop(g(M).scrollTop()+b.scrollSpeed))),(!b.axis||b.axis!=="y")&&(d.pageX-g(M).scrollLeft()<b.scrollSensitivity?I=g(M).scrollLeft(g(M).scrollLeft()-b.scrollSpeed):g(window).width()-(d.pageX-g(M).scrollLeft())<b.scrollSensitivity&&(I=g(M).scrollLeft(g(M).scrollLeft()+b.scrollSpeed)))),I!==!1&&g.ui.ddmanager&&!b.dropBehaviour&&g.ui.ddmanager.prepareOffsets(C,d)}}),g.ui.plugin.add("draggable","snap",{start:function(d,w,C){var b=C.options;C.snapElements=[],g(b.snap.constructor!==String?b.snap.items||":data(ui-draggable)":b.snap).each(function(){var I=g(this),k=I.offset();this!==C.element[0]&&C.snapElements.push({item:this,width:I.outerWidth(),height:I.outerHeight(),top:k.top,left:k.left})})},drag:function(d,w,C){var b,I,k,M,K,W,q,te,he,ne,ie=C.options,re=ie.snapTolerance,ce=w.offset.left,Be=ce+C.helperProportions.width,Fe=w.offset.top,Te=Fe+C.helperProportions.height;for(he=C.snapElements.length-1;he>=0;he--){if(K=C.snapElements[he].left-C.margins.left,W=K+C.snapElements[he].width,q=C.snapElements[he].top-C.margins.top,te=q+C.snapElements[he].height,Be<K-re||ce>W+re||Te<q-re||Fe>te+re||!g.contains(C.snapElements[he].item.ownerDocument,C.snapElements[he].item)){C.snapElements[he].snapping&&C.options.snap.release&&C.options.snap.release.call(C.element,d,g.extend(C._uiHash(),{snapItem:C.snapElements[he].item})),C.snapElements[he].snapping=!1;continue}ie.snapMode!=="inner"&&(b=Math.abs(q-Te)<=re,I=Math.abs(te-Fe)<=re,k=Math.abs(K-Be)<=re,M=Math.abs(W-ce)<=re,b&&(w.position.top=C._convertPositionTo("relative",{top:q-C.helperProportions.height,left:0}).top),I&&(w.position.top=C._convertPositionTo("relative",{top:te,left:0}).top),k&&(w.position.left=C._convertPositionTo("relative",{top:0,left:K-C.helperProportions.width}).left),M&&(w.position.left=C._convertPositionTo("relative",{top:0,left:W}).left)),ne=b||I||k||M,ie.snapMode!=="outer"&&(b=Math.abs(q-Fe)<=re,I=Math.abs(te-Te)<=re,k=Math.abs(K-ce)<=re,M=Math.abs(W-Be)<=re,b&&(w.position.top=C._convertPositionTo("relative",{top:q,left:0}).top),I&&(w.position.top=C._convertPositionTo("relative",{top:te-C.helperProportions.height,left:0}).top),k&&(w.position.left=C._convertPositionTo("relative",{top:0,left:K}).left),M&&(w.position.left=C._convertPositionTo("relative",{top:0,left:W-C.helperProportions.width}).left)),!C.snapElements[he].snapping&&(b||I||k||M||ne)&&C.options.snap.snap&&C.options.snap.snap.call(C.element,d,g.extend(C._uiHash(),{snapItem:C.snapElements[he].item})),C.snapElements[he].snapping=b||I||k||M||ne}}}),g.ui.plugin.add("draggable","stack",{start:function(d,w,C){var b,I=C.options,k=g.makeArray(g(I.stack)).sort(function(M,K){return(parseInt(g(M).css("zIndex"),10)||0)-(parseInt(g(K).css("zIndex"),10)||0)});k.length&&(b=parseInt(g(k[0]).css("zIndex"),10)||0,g(k).each(function(M){g(this).css("zIndex",b+M)}),this.css("zIndex",b+k.length))}}),g.ui.plugin.add("draggable","zIndex",{start:function(d,w,C){var b=g(w.helper),I=C.options;b.css("zIndex")&&(I._zIndex=b.css("zIndex")),b.css("zIndex",I.zIndex)},stop:function(d,w,C){var b=C.options;b._zIndex&&g(w.helper).css("zIndex",b._zIndex)}}),g.ui.draggable;/*!
+ * jQuery UI Resizable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.resizable",g.ui.mouse,{version:"1.13.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(d){return parseFloat(d)||0},_isNumber:function(d){return!isNaN(parseFloat(d))},_hasScroll:function(d,w){if(g(d).css("overflow")==="hidden")return!1;var C=w&&w==="left"?"scrollLeft":"scrollTop",b=!1;if(d[C]>0)return!0;try{d[C]=1,b=d[C]>0,d[C]=0}catch{}return b},_create:function(){var d,w=this.options,C=this;this._addClass("ui-resizable"),g.extend(this,{_aspectRatio:!!w.aspectRatio,aspectRatio:w.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:w.helper||w.ghost||w.animate?w.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(g("<div class='ui-wrapper'></div>").css({overflow:"hidden",position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,d={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(d),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(d),this._proportionallyResize()),this._setupHandles(),w.autoHide&&g(this.element).on("mouseenter",function(){w.disabled||(C._removeClass("ui-resizable-autohide"),C._handles.show())}).on("mouseleave",function(){w.disabled||C.resizing||(C._addClass("ui-resizable-autohide"),C._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy(),this._addedHandles.remove();var d,w=function(C){g(C).removeData("resizable").removeData("ui-resizable").off(".resizable")};return this.elementIsWrapper&&(w(this.element),d=this.element,this.originalElement.css({position:d.css("position"),width:d.outerWidth(),height:d.outerHeight(),top:d.css("top"),left:d.css("left")}).insertAfter(d),d.remove()),this.originalElement.css("resize",this.originalResizeStyle),w(this.originalElement),this},_setOption:function(d,w){switch(this._super(d,w),d){case"handles":this._removeHandles(),this._setupHandles();break;case"aspectRatio":this._aspectRatio=!!w;break}},_setupHandles:function(){var d=this.options,w,C,b,I,k,M=this;if(this.handles=d.handles||(g(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=g(),this._addedHandles=g(),this.handles.constructor===String)for(this.handles==="all"&&(this.handles="n,e,s,w,se,sw,ne,nw"),b=this.handles.split(","),this.handles={},C=0;C<b.length;C++)w=String.prototype.trim.call(b[C]),I="ui-resizable-"+w,k=g("<div>"),this._addClass(k,"ui-resizable-handle "+I),k.css({zIndex:d.zIndex}),this.handles[w]=".ui-resizable-"+w,this.element.children(this.handles[w]).length||(this.element.append(k),this._addedHandles=this._addedHandles.add(k));this._renderAxis=function(K){var W,q,te,he;K=K||this.element;for(W in this.handles)this.handles[W].constructor===String?this.handles[W]=this.element.children(this.handles[W]).first().show():(this.handles[W].jquery||this.handles[W].nodeType)&&(this.handles[W]=g(this.handles[W]),this._on(this.handles[W],{mousedown:M._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(q=g(this.handles[W],this.element),he=/sw|ne|nw|se|n|s/.test(W)?q.outerHeight():q.outerWidth(),te=["padding",/ne|nw|n/.test(W)?"Top":/se|sw|s/.test(W)?"Bottom":/^e$/.test(W)?"Right":"Left"].join(""),K.css(te,he),this._proportionallyResize()),this._handles=this._handles.add(this.handles[W])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){M.resizing||(this.className&&(k=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),M.axis=k&&k[1]?k[1]:"se")}),d.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._addedHandles.remove()},_mouseCapture:function(d){var w,C,b=!1;for(w in this.handles)C=g(this.handles[w])[0],(C===d.target||g.contains(C,d.target))&&(b=!0);return!this.options.disabled&&b},_mouseStart:function(d){var w,C,b,I=this.options,k=this.element;return this.resizing=!0,this._renderProxy(),w=this._num(this.helper.css("left")),C=this._num(this.helper.css("top")),I.containment&&(w+=g(I.containment).scrollLeft()||0,C+=g(I.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:w,top:C},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:k.width(),height:k.height()},this.originalSize=this._helper?{width:k.outerWidth(),height:k.outerHeight()}:{width:k.width(),height:k.height()},this.sizeDiff={width:k.outerWidth()-k.width(),height:k.outerHeight()-k.height()},this.originalPosition={left:w,top:C},this.originalMousePosition={left:d.pageX,top:d.pageY},this.aspectRatio=typeof I.aspectRatio=="number"?I.aspectRatio:this.originalSize.width/this.originalSize.height||1,b=g(".ui-resizable-"+this.axis).css("cursor"),g("body").css("cursor",b==="auto"?this.axis+"-resize":b),this._addClass("ui-resizable-resizing"),this._propagate("start",d),!0},_mouseDrag:function(d){var w,C,b=this.originalMousePosition,I=this.axis,k=d.pageX-b.left||0,M=d.pageY-b.top||0,K=this._change[I];return this._updatePrevProperties(),K&&(w=K.apply(this,[d,k,M]),this._updateVirtualBoundaries(d.shiftKey),(this._aspectRatio||d.shiftKey)&&(w=this._updateRatio(w,d)),w=this._respectSize(w,d),this._updateCache(w),this._propagate("resize",d),C=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),g.isEmptyObject(C)||(this._updatePrevProperties(),this._trigger("resize",d,this.ui()),this._applyChanges())),!1},_mouseStop:function(d){this.resizing=!1;var w,C,b,I,k,M,K,W=this.options,q=this;return this._helper&&(w=this._proportionallyResizeElements,C=w.length&&/textarea/i.test(w[0].nodeName),b=C&&this._hasScroll(w[0],"left")?0:q.sizeDiff.height,I=C?0:q.sizeDiff.width,k={width:q.helper.width()-I,height:q.helper.height()-b},M=parseFloat(q.element.css("left"))+(q.position.left-q.originalPosition.left)||null,K=parseFloat(q.element.css("top"))+(q.position.top-q.originalPosition.top)||null,W.animate||this.element.css(g.extend(k,{top:K,left:M})),q.helper.height(q.size.height),q.helper.width(q.size.width),this._helper&&!W.animate&&this._proportionallyResize()),g("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",d),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var d={};return this.position.top!==this.prevPosition.top&&(d.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(d.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(d.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(d.height=this.size.height+"px"),this.helper.css(d),d},_updateVirtualBoundaries:function(d){var w,C,b,I,k,M=this.options;k={minWidth:this._isNumber(M.minWidth)?M.minWidth:0,maxWidth:this._isNumber(M.maxWidth)?M.maxWidth:1/0,minHeight:this._isNumber(M.minHeight)?M.minHeight:0,maxHeight:this._isNumber(M.maxHeight)?M.maxHeight:1/0},(this._aspectRatio||d)&&(w=k.minHeight*this.aspectRatio,b=k.minWidth/this.aspectRatio,C=k.maxHeight*this.aspectRatio,I=k.maxWidth/this.aspectRatio,w>k.minWidth&&(k.minWidth=w),b>k.minHeight&&(k.minHeight=b),C<k.maxWidth&&(k.maxWidth=C),I<k.maxHeight&&(k.maxHeight=I)),this._vBoundaries=k},_updateCache:function(d){this.offset=this.helper.offset(),this._isNumber(d.left)&&(this.position.left=d.left),this._isNumber(d.top)&&(this.position.top=d.top),this._isNumber(d.height)&&(this.size.height=d.height),this._isNumber(d.width)&&(this.size.width=d.width)},_updateRatio:function(d){var w=this.position,C=this.size,b=this.axis;return this._isNumber(d.height)?d.width=d.height*this.aspectRatio:this._isNumber(d.width)&&(d.height=d.width/this.aspectRatio),b==="sw"&&(d.left=w.left+(C.width-d.width),d.top=null),b==="nw"&&(d.top=w.top+(C.height-d.height),d.left=w.left+(C.width-d.width)),d},_respectSize:function(d){var w=this._vBoundaries,C=this.axis,b=this._isNumber(d.width)&&w.maxWidth&&w.maxWidth<d.width,I=this._isNumber(d.height)&&w.maxHeight&&w.maxHeight<d.height,k=this._isNumber(d.width)&&w.minWidth&&w.minWidth>d.width,M=this._isNumber(d.height)&&w.minHeight&&w.minHeight>d.height,K=this.originalPosition.left+this.originalSize.width,W=this.originalPosition.top+this.originalSize.height,q=/sw|nw|w/.test(C),te=/nw|ne|n/.test(C);return k&&(d.width=w.minWidth),M&&(d.height=w.minHeight),b&&(d.width=w.maxWidth),I&&(d.height=w.maxHeight),k&&q&&(d.left=K-w.minWidth),b&&q&&(d.left=K-w.maxWidth),M&&te&&(d.top=W-w.minHeight),I&&te&&(d.top=W-w.maxHeight),!d.width&&!d.height&&!d.left&&d.top?d.top=null:!d.width&&!d.height&&!d.top&&d.left&&(d.left=null),d},_getPaddingPlusBorderDimensions:function(d){for(var w=0,C=[],b=[d.css("borderTopWidth"),d.css("borderRightWidth"),d.css("borderBottomWidth"),d.css("borderLeftWidth")],I=[d.css("paddingTop"),d.css("paddingRight"),d.css("paddingBottom"),d.css("paddingLeft")];w<4;w++)C[w]=parseFloat(b[w])||0,C[w]+=parseFloat(I[w])||0;return{height:C[0]+C[2],width:C[1]+C[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var d,w=0,C=this.helper||this.element;w<this._proportionallyResizeElements.length;w++)d=this._proportionallyResizeElements[w],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(d)),d.css({height:C.height()-this.outerDimensions.height||0,width:C.width()-this.outerDimensions.width||0})},_renderProxy:function(){var d=this.element,w=this.options;this.elementOffset=d.offset(),this._helper?(this.helper=this.helper||g("<div></div>").css({overflow:"hidden"}),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++w.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(d,w){return{width:this.originalSize.width+w}},w:function(d,w){var C=this.originalSize,b=this.originalPosition;return{left:b.left+w,width:C.width-w}},n:function(d,w,C){var b=this.originalSize,I=this.originalPosition;return{top:I.top+C,height:b.height-C}},s:function(d,w,C){return{height:this.originalSize.height+C}},se:function(d,w,C){return g.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[d,w,C]))},sw:function(d,w,C){return g.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[d,w,C]))},ne:function(d,w,C){return g.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[d,w,C]))},nw:function(d,w,C){return g.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[d,w,C]))}},_propagate:function(d,w){g.ui.plugin.call(this,d,[w,this.ui()]),d!=="resize"&&this._trigger(d,w,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),g.ui.plugin.add("resizable","animate",{stop:function(d){var w=g(this).resizable("instance"),C=w.options,b=w._proportionallyResizeElements,I=b.length&&/textarea/i.test(b[0].nodeName),k=I&&w._hasScroll(b[0],"left")?0:w.sizeDiff.height,M=I?0:w.sizeDiff.width,K={width:w.size.width-M,height:w.size.height-k},W=parseFloat(w.element.css("left"))+(w.position.left-w.originalPosition.left)||null,q=parseFloat(w.element.css("top"))+(w.position.top-w.originalPosition.top)||null;w.element.animate(g.extend(K,q&&W?{top:q,left:W}:{}),{duration:C.animateDuration,easing:C.animateEasing,step:function(){var te={width:parseFloat(w.element.css("width")),height:parseFloat(w.element.css("height")),top:parseFloat(w.element.css("top")),left:parseFloat(w.element.css("left"))};b&&b.length&&g(b[0]).css({width:te.width,height:te.height}),w._updateCache(te),w._propagate("resize",d)}})}}),g.ui.plugin.add("resizable","containment",{start:function(){var d,w,C,b,I,k,M,K=g(this).resizable("instance"),W=K.options,q=K.element,te=W.containment,he=te instanceof g?te.get(0):/parent/.test(te)?q.parent().get(0):te;he&&(K.containerElement=g(he),/document/.test(te)||te===document?(K.containerOffset={left:0,top:0},K.containerPosition={left:0,top:0},K.parentData={element:g(document),left:0,top:0,width:g(document).width(),height:g(document).height()||document.body.parentNode.scrollHeight}):(d=g(he),w=[],g(["Top","Right","Left","Bottom"]).each(function(ne,ie){w[ne]=K._num(d.css("padding"+ie))}),K.containerOffset=d.offset(),K.containerPosition=d.position(),K.containerSize={height:d.innerHeight()-w[3],width:d.innerWidth()-w[1]},C=K.containerOffset,b=K.containerSize.height,I=K.containerSize.width,k=K._hasScroll(he,"left")?he.scrollWidth:I,M=K._hasScroll(he)?he.scrollHeight:b,K.parentData={element:he,left:C.left,top:C.top,width:k,height:M}))},resize:function(d){var w,C,b,I,k=g(this).resizable("instance"),M=k.options,K=k.containerOffset,W=k.position,q=k._aspectRatio||d.shiftKey,te={top:0,left:0},he=k.containerElement,ne=!0;he[0]!==document&&/static/.test(he.css("position"))&&(te=K),W.left<(k._helper?K.left:0)&&(k.size.width=k.size.width+(k._helper?k.position.left-K.left:k.position.left-te.left),q&&(k.size.height=k.size.width/k.aspectRatio,ne=!1),k.position.left=M.helper?K.left:0),W.top<(k._helper?K.top:0)&&(k.size.height=k.size.height+(k._helper?k.position.top-K.top:k.position.top),q&&(k.size.width=k.size.height*k.aspectRatio,ne=!1),k.position.top=k._helper?K.top:0),b=k.containerElement.get(0)===k.element.parent().get(0),I=/relative|absolute/.test(k.containerElement.css("position")),b&&I?(k.offset.left=k.parentData.left+k.position.left,k.offset.top=k.parentData.top+k.position.top):(k.offset.left=k.element.offset().left,k.offset.top=k.element.offset().top),w=Math.abs(k.sizeDiff.width+(k._helper?k.offset.left-te.left:k.offset.left-K.left)),C=Math.abs(k.sizeDiff.height+(k._helper?k.offset.top-te.top:k.offset.top-K.top)),w+k.size.width>=k.parentData.width&&(k.size.width=k.parentData.width-w,q&&(k.size.height=k.size.width/k.aspectRatio,ne=!1)),C+k.size.height>=k.parentData.height&&(k.size.height=k.parentData.height-C,q&&(k.size.width=k.size.height*k.aspectRatio,ne=!1)),ne||(k.position.left=k.prevPosition.left,k.position.top=k.prevPosition.top,k.size.width=k.prevSize.width,k.size.height=k.prevSize.height)},stop:function(){var d=g(this).resizable("instance"),w=d.options,C=d.containerOffset,b=d.containerPosition,I=d.containerElement,k=g(d.helper),M=k.offset(),K=k.outerWidth()-d.sizeDiff.width,W=k.outerHeight()-d.sizeDiff.height;d._helper&&!w.animate&&/relative/.test(I.css("position"))&&g(this).css({left:M.left-b.left-C.left,width:K,height:W}),d._helper&&!w.animate&&/static/.test(I.css("position"))&&g(this).css({left:M.left-b.left-C.left,width:K,height:W})}}),g.ui.plugin.add("resizable","alsoResize",{start:function(){var d=g(this).resizable("instance"),w=d.options;g(w.alsoResize).each(function(){var C=g(this);C.data("ui-resizable-alsoresize",{width:parseFloat(C.width()),height:parseFloat(C.height()),left:parseFloat(C.css("left")),top:parseFloat(C.css("top"))})})},resize:function(d,w){var C=g(this).resizable("instance"),b=C.options,I=C.originalSize,k=C.originalPosition,M={height:C.size.height-I.height||0,width:C.size.width-I.width||0,top:C.position.top-k.top||0,left:C.position.left-k.left||0};g(b.alsoResize).each(function(){var K=g(this),W=g(this).data("ui-resizable-alsoresize"),q={},te=K.parents(w.originalElement[0]).length?["width","height"]:["width","height","top","left"];g.each(te,function(he,ne){var ie=(W[ne]||0)+(M[ne]||0);ie&&ie>=0&&(q[ne]=ie||null)}),K.css(q)})},stop:function(){g(this).removeData("ui-resizable-alsoresize")}}),g.ui.plugin.add("resizable","ghost",{start:function(){var d=g(this).resizable("instance"),w=d.size;d.ghost=d.originalElement.clone(),d.ghost.css({opacity:.25,display:"block",position:"relative",height:w.height,width:w.width,margin:0,left:0,top:0}),d._addClass(d.ghost,"ui-resizable-ghost"),g.uiBackCompat!==!1&&typeof d.options.ghost=="string"&&d.ghost.addClass(this.options.ghost),d.ghost.appendTo(d.helper)},resize:function(){var d=g(this).resizable("instance");d.ghost&&d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})},stop:function(){var d=g(this).resizable("instance");d.ghost&&d.helper&&d.helper.get(0).removeChild(d.ghost.get(0))}}),g.ui.plugin.add("resizable","grid",{resize:function(){var d,w=g(this).resizable("instance"),C=w.options,b=w.size,I=w.originalSize,k=w.originalPosition,M=w.axis,K=typeof C.grid=="number"?[C.grid,C.grid]:C.grid,W=K[0]||1,q=K[1]||1,te=Math.round((b.width-I.width)/W)*W,he=Math.round((b.height-I.height)/q)*q,ne=I.width+te,ie=I.height+he,re=C.maxWidth&&C.maxWidth<ne,ce=C.maxHeight&&C.maxHeight<ie,Be=C.minWidth&&C.minWidth>ne,Fe=C.minHeight&&C.minHeight>ie;C.grid=K,Be&&(ne+=W),Fe&&(ie+=q),re&&(ne-=W),ce&&(ie-=q),/^(se|s|e)$/.test(M)?(w.size.width=ne,w.size.height=ie):/^(ne)$/.test(M)?(w.size.width=ne,w.size.height=ie,w.position.top=k.top-he):/^(sw)$/.test(M)?(w.size.width=ne,w.size.height=ie,w.position.left=k.left-te):((ie-q<=0||ne-W<=0)&&(d=w._getPaddingPlusBorderDimensions(this)),ie-q>0?(w.size.height=ie,w.position.top=k.top-he):(ie=q-d.height,w.size.height=ie,w.position.top=k.top+I.height-ie),ne-W>0?(w.size.width=ne,w.position.left=k.left-te):(ne=W-d.width,w.size.width=ne,w.position.left=k.left+I.width-ne))}}),g.ui.resizable;/*!
+ * jQuery UI Dialog 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.dialog",{version:"1.13.2",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(d){var w=g(this).css(d).offset().top;w<0&&g(this).css("top",d.top-w)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title==null&&this.originalTitle!=null&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&g.fn.draggable&&this._makeDraggable(),this.options.resizable&&g.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var d=this.options.appendTo;return d&&(d.jquery||d.nodeType)?g(d):this.document.find(d||"body").eq(0)},_destroy:function(){var d,w=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),d=w.parent.children().eq(w.index),d.length&&d[0]!==this.element[0]?d.before(this.element):w.parent.append(this.element)},widget:function(){return this.uiDialog},disable:g.noop,enable:g.noop,close:function(d){var w=this;!this._isOpen||this._trigger("beforeClose",d)===!1||(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||g.ui.safeBlur(g.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){w._trigger("close",d)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(d,w){var C=!1,b=this.uiDialog.siblings(".ui-front:visible").map(function(){return+g(this).css("z-index")}).get(),I=Math.max.apply(null,b);return I>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",I+1),C=!0),C&&!w&&this._trigger("focus",d),C},open:function(){var d=this;if(this._isOpen){this._moveToTop()&&this._focusTabbable();return}this._isOpen=!0,this.opener=g(g.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){d._focusTabbable(),d._trigger("focus")}),this._makeFocusTarget(),this._trigger("open")},_focusTabbable:function(){var d=this._focusedElement;d||(d=this.element.find("[autofocus]")),d.length||(d=this.element.find(":tabbable")),d.length||(d=this.uiDialogButtonPane.find(":tabbable")),d.length||(d=this.uiDialogTitlebarClose.filter(":tabbable")),d.length||(d=this.uiDialog),d.eq(0).trigger("focus")},_restoreTabbableFocus:function(){var d=g.ui.safeActiveElement(this.document[0]),w=this.uiDialog[0]===d||g.contains(this.uiDialog[0],d);w||this._focusTabbable()},_keepFocus:function(d){d.preventDefault(),this._restoreTabbableFocus(),this._delay(this._restoreTabbableFocus)},_createWrapper:function(){this.uiDialog=g("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(d){if(this.options.closeOnEscape&&!d.isDefaultPrevented()&&d.keyCode&&d.keyCode===g.ui.keyCode.ESCAPE){d.preventDefault(),this.close(d);return}if(!(d.keyCode!==g.ui.keyCode.TAB||d.isDefaultPrevented())){var w=this.uiDialog.find(":tabbable"),C=w.first(),b=w.last();(d.target===b[0]||d.target===this.uiDialog[0])&&!d.shiftKey?(this._delay(function(){C.trigger("focus")}),d.preventDefault()):(d.target===C[0]||d.target===this.uiDialog[0])&&d.shiftKey&&(this._delay(function(){b.trigger("focus")}),d.preventDefault())}},mousedown:function(d){this._moveToTop(d)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var d;this.uiDialogTitlebar=g("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(w){g(w.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=g("<button type='button'></button>").button({label:g("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(w){w.preventDefault(),this.close(w)}}),d=g("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(d,"ui-dialog-title"),this._title(d),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":d.attr("id")})},_title:function(d){this.options.title?d.text(this.options.title):d.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=g("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=g("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var d=this,w=this.options.buttons;if(this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),g.isEmptyObject(w)||Array.isArray(w)&&!w.length){this._removeClass(this.uiDialog,"ui-dialog-buttons");return}g.each(w,function(C,b){var I,k;b=typeof b=="function"?{click:b,text:C}:b,b=g.extend({type:"button"},b),I=b.click,k={icon:b.icon,iconPosition:b.iconPosition,showLabel:b.showLabel,icons:b.icons,text:b.text},delete b.click,delete b.icon,delete b.iconPosition,delete b.showLabel,delete b.icons,typeof b.text=="boolean"&&delete b.text,g("<button></button>",b).button(k).appendTo(d.uiButtonSet).on("click",function(){I.apply(d.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog)},_makeDraggable:function(){var d=this,w=this.options;function C(b){return{position:b.position,offset:b.offset}}this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(b,I){d._addClass(g(this),"ui-dialog-dragging"),d._blockFrames(),d._trigger("dragStart",b,C(I))},drag:function(b,I){d._trigger("drag",b,C(I))},stop:function(b,I){var k=I.offset.left-d.document.scrollLeft(),M=I.offset.top-d.document.scrollTop();w.position={my:"left top",at:"left"+(k>=0?"+":"")+k+" top"+(M>=0?"+":"")+M,of:d.window},d._removeClass(g(this),"ui-dialog-dragging"),d._unblockFrames(),d._trigger("dragStop",b,C(I))}})},_makeResizable:function(){var d=this,w=this.options,C=w.resizable,b=this.uiDialog.css("position"),I=typeof C=="string"?C:"n,e,s,w,se,sw,ne,nw";function k(M){return{originalPosition:M.originalPosition,originalSize:M.originalSize,position:M.position,size:M.size}}this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:w.maxWidth,maxHeight:w.maxHeight,minWidth:w.minWidth,minHeight:this._minHeight(),handles:I,start:function(M,K){d._addClass(g(this),"ui-dialog-resizing"),d._blockFrames(),d._trigger("resizeStart",M,k(K))},resize:function(M,K){d._trigger("resize",M,k(K))},stop:function(M,K){var W=d.uiDialog.offset(),q=W.left-d.document.scrollLeft(),te=W.top-d.document.scrollTop();w.height=d.uiDialog.height(),w.width=d.uiDialog.width(),w.position={my:"left top",at:"left"+(q>=0?"+":"")+q+" top"+(te>=0?"+":"")+te,of:d.window},d._removeClass(g(this),"ui-dialog-resizing"),d._unblockFrames(),d._trigger("resizeStop",M,k(K))}}).css("position",b)},_trackFocus:function(){this._on(this.widget(),{focusin:function(d){this._makeFocusTarget(),this._focusedElement=g(d.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var d=this._trackingInstances(),w=g.inArray(this,d);w!==-1&&d.splice(w,1)},_trackingInstances:function(){var d=this.document.data("ui-dialog-instances");return d||(d=[],this.document.data("ui-dialog-instances",d)),d},_minHeight:function(){var d=this.options;return d.height==="auto"?d.minHeight:Math.min(d.minHeight,d.height)},_position:function(){var d=this.uiDialog.is(":visible");d||this.uiDialog.show(),this.uiDialog.position(this.options.position),d||this.uiDialog.hide()},_setOptions:function(d){var w=this,C=!1,b={};g.each(d,function(I,k){w._setOption(I,k),I in w.sizeRelatedOptions&&(C=!0),I in w.resizableRelatedOptions&&(b[I]=k)}),C&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",b)},_setOption:function(d,w){var C,b,I=this.uiDialog;d!=="disabled"&&(this._super(d,w),d==="appendTo"&&this.uiDialog.appendTo(this._appendTo()),d==="buttons"&&this._createButtons(),d==="closeText"&&this.uiDialogTitlebarClose.button({label:g("<a>").text(""+this.options.closeText).html()}),d==="draggable"&&(C=I.is(":data(ui-draggable)"),C&&!w&&I.draggable("destroy"),!C&&w&&this._makeDraggable()),d==="position"&&this._position(),d==="resizable"&&(b=I.is(":data(ui-resizable)"),b&&!w&&I.resizable("destroy"),b&&typeof w=="string"&&I.resizable("option","handles",w),!b&&w!==!1&&this._makeResizable()),d==="title"&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var d,w,C,b=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),b.minWidth>b.width&&(b.width=b.minWidth),d=this.uiDialog.css({height:"auto",width:b.width}).outerHeight(),w=Math.max(0,b.minHeight-d),C=typeof b.maxHeight=="number"?Math.max(0,b.maxHeight-d):"none",b.height==="auto"?this.element.css({minHeight:w,maxHeight:C,height:"auto"}):this.element.height(Math.max(0,b.height-d)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var d=g(this);return g("<div>").css({position:"absolute",width:d.outerWidth(),height:d.outerHeight()}).appendTo(d.parent()).offset(d.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(d){return g(d.target).closest(".ui-dialog").length?!0:!!g(d.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var d=g.fn.jquery.substring(0,4),w=!0;this._delay(function(){w=!1}),this.document.data("ui-dialog-overlays")||this.document.on("focusin.ui-dialog",(function(C){if(!w){var b=this._trackingInstances()[0];b._allowInteraction(C)||(C.preventDefault(),b._focusTabbable(),(d==="3.4."||d==="3.5.")&&b._delay(b._restoreTabbableFocus))}}).bind(this)),this.overlay=g("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var d=this.document.data("ui-dialog-overlays")-1;d?this.document.data("ui-dialog-overlays",d):(this.document.off("focusin.ui-dialog"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),g.uiBackCompat!==!1&&g.widget("ui.dialog",g.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(d,w){d==="dialogClass"&&this.uiDialog.removeClass(this.options.dialogClass).addClass(w),this._superApply(arguments)}}),g.ui.dialog;/*!
+ * jQuery UI Droppable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.droppable",{version:"1.13.2",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var d,w=this.options,C=w.accept;this.isover=!1,this.isout=!0,this.accept=typeof C=="function"?C:function(b){return b.is(C)},this.proportions=function(){if(arguments.length)d=arguments[0];else return d||(d={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight})},this._addToManager(w.scope),w.addClasses&&this._addClass("ui-droppable")},_addToManager:function(d){g.ui.ddmanager.droppables[d]=g.ui.ddmanager.droppables[d]||[],g.ui.ddmanager.droppables[d].push(this)},_splice:function(d){for(var w=0;w<d.length;w++)d[w]===this&&d.splice(w,1)},_destroy:function(){var d=g.ui.ddmanager.droppables[this.options.scope];this._splice(d)},_setOption:function(d,w){if(d==="accept")this.accept=typeof w=="function"?w:function(b){return b.is(w)};else if(d==="scope"){var C=g.ui.ddmanager.droppables[this.options.scope];this._splice(C),this._addToManager(w)}this._super(d,w)},_activate:function(d){var w=g.ui.ddmanager.current;this._addActiveClass(),w&&this._trigger("activate",d,this.ui(w))},_deactivate:function(d){var w=g.ui.ddmanager.current;this._removeActiveClass(),w&&this._trigger("deactivate",d,this.ui(w))},_over:function(d){var w=g.ui.ddmanager.current;!w||(w.currentItem||w.element)[0]===this.element[0]||this.accept.call(this.element[0],w.currentItem||w.element)&&(this._addHoverClass(),this._trigger("over",d,this.ui(w)))},_out:function(d){var w=g.ui.ddmanager.current;!w||(w.currentItem||w.element)[0]===this.element[0]||this.accept.call(this.element[0],w.currentItem||w.element)&&(this._removeHoverClass(),this._trigger("out",d,this.ui(w)))},_drop:function(d,w){var C=w||g.ui.ddmanager.current,b=!1;return!C||(C.currentItem||C.element)[0]===this.element[0]||(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var I=g(this).droppable("instance");if(I.options.greedy&&!I.options.disabled&&I.options.scope===C.options.scope&&I.accept.call(I.element[0],C.currentItem||C.element)&&g.ui.intersect(C,g.extend(I,{offset:I.element.offset()}),I.options.tolerance,d))return b=!0,!1}),b)?!1:this.accept.call(this.element[0],C.currentItem||C.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",d,this.ui(C)),this.element):!1},ui:function(d){return{draggable:d.currentItem||d.element,helper:d.helper,position:d.position,offset:d.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}}),g.ui.intersect=function(){function d(w,C,b){return w>=C&&w<C+b}return function(w,C,b,I){if(!C.offset)return!1;var k=(w.positionAbs||w.position.absolute).left+w.margins.left,M=(w.positionAbs||w.position.absolute).top+w.margins.top,K=k+w.helperProportions.width,W=M+w.helperProportions.height,q=C.offset.left,te=C.offset.top,he=q+C.proportions().width,ne=te+C.proportions().height;switch(b){case"fit":return q<=k&&K<=he&&te<=M&&W<=ne;case"intersect":return q<k+w.helperProportions.width/2&&K-w.helperProportions.width/2<he&&te<M+w.helperProportions.height/2&&W-w.helperProportions.height/2<ne;case"pointer":return d(I.pageY,te,C.proportions().height)&&d(I.pageX,q,C.proportions().width);case"touch":return(M>=te&&M<=ne||W>=te&&W<=ne||M<te&&W>ne)&&(k>=q&&k<=he||K>=q&&K<=he||k<q&&K>he);default:return!1}}}(),g.ui.ddmanager={current:null,droppables:{default:[]},prepareOffsets:function(d,w){var C,b,I=g.ui.ddmanager.droppables[d.options.scope]||[],k=w?w.type:null,M=(d.currentItem||d.element).find(":data(ui-droppable)").addBack();e:for(C=0;C<I.length;C++)if(!(I[C].options.disabled||d&&!I[C].accept.call(I[C].element[0],d.currentItem||d.element))){for(b=0;b<M.length;b++)if(M[b]===I[C].element[0]){I[C].proportions().height=0;continue e}I[C].visible=I[C].element.css("display")!=="none",I[C].visible&&(k==="mousedown"&&I[C]._activate.call(I[C],w),I[C].offset=I[C].element.offset(),I[C].proportions({width:I[C].element[0].offsetWidth,height:I[C].element[0].offsetHeight}))}},drop:function(d,w){var C=!1;return g.each((g.ui.ddmanager.droppables[d.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&g.ui.intersect(d,this,this.options.tolerance,w)&&(C=this._drop.call(this,w)||C),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],d.currentItem||d.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,w)))}),C},dragStart:function(d,w){d.element.parentsUntil("body").on("scroll.droppable",function(){d.options.refreshPositions||g.ui.ddmanager.prepareOffsets(d,w)})},drag:function(d,w){d.options.refreshPositions&&g.ui.ddmanager.prepareOffsets(d,w),g.each(g.ui.ddmanager.droppables[d.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var C,b,I,k=g.ui.intersect(d,this,this.options.tolerance,w),M=!k&&this.isover?"isout":k&&!this.isover?"isover":null;M&&(this.options.greedy&&(b=this.options.scope,I=this.element.parents(":data(ui-droppable)").filter(function(){return g(this).droppable("instance").options.scope===b}),I.length&&(C=g(I[0]).droppable("instance"),C.greedyChild=M==="isover")),C&&M==="isover"&&(C.isover=!1,C.isout=!0,C._out.call(C,w)),this[M]=!0,this[M==="isout"?"isover":"isout"]=!1,this[M==="isover"?"_over":"_out"].call(this,w),C&&M==="isout"&&(C.isout=!1,C.isover=!0,C._over.call(C,w)))}})},dragStop:function(d,w){d.element.parentsUntil("body").off("scroll.droppable"),d.options.refreshPositions||g.ui.ddmanager.prepareOffsets(d,w)}},g.uiBackCompat!==!1&&g.widget("ui.droppable",g.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),g.ui.droppable;/*!
+ * jQuery UI Progressbar 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.progressbar",{version:"1.13.2",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=g("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(d){if(d===void 0)return this.options.value;this.options.value=this._constrainedValue(d),this._refreshValue()},_constrainedValue:function(d){return d===void 0&&(d=this.options.value),this.indeterminate=d===!1,typeof d!="number"&&(d=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,d))},_setOptions:function(d){var w=d.value;delete d.value,this._super(d),this.options.value=this._constrainedValue(w),this._refreshValue()},_setOption:function(d,w){d==="max"&&(w=Math.max(this.min,w)),this._super(d,w)},_setOptionDisabled:function(d){this._super(d),this.element.attr("aria-disabled",d),this._toggleClass(null,"ui-state-disabled",!!d)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var d=this.options.value,w=this._percentage();this.valueDiv.toggle(this.indeterminate||d>this.min).width(w.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,d===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=g("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":d}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==d&&(this.oldValue=d,this._trigger("change")),d===this.options.max&&this._trigger("complete")}});/*!
+ * jQuery UI Selectable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.selectable",g.ui.mouse,{version:"1.13.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var d=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){d.elementPos=g(d.element[0]).offset(),d.selectees=g(d.options.filter,d.element[0]),d._addClass(d.selectees,"ui-selectee"),d.selectees.each(function(){var w=g(this),C=w.offset(),b={left:C.left-d.elementPos.left,top:C.top-d.elementPos.top};g.data(this,"selectable-item",{element:this,$element:w,left:b.left,top:b.top,right:b.left+w.outerWidth(),bottom:b.top+w.outerHeight(),startselected:!1,selected:w.hasClass("ui-selected"),selecting:w.hasClass("ui-selecting"),unselecting:w.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=g("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(d){var w=this,C=this.options;this.opos=[d.pageX,d.pageY],this.elementPos=g(this.element[0]).offset(),!this.options.disabled&&(this.selectees=g(C.filter,this.element[0]),this._trigger("start",d),g(C.appendTo).append(this.helper),this.helper.css({left:d.pageX,top:d.pageY,width:0,height:0}),C.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var b=g.data(this,"selectable-item");b.startselected=!0,!d.metaKey&&!d.ctrlKey&&(w._removeClass(b.$element,"ui-selected"),b.selected=!1,w._addClass(b.$element,"ui-unselecting"),b.unselecting=!0,w._trigger("unselecting",d,{unselecting:b.element}))}),g(d.target).parents().addBack().each(function(){var b,I=g.data(this,"selectable-item");if(I)return b=!d.metaKey&&!d.ctrlKey||!I.$element.hasClass("ui-selected"),w._removeClass(I.$element,b?"ui-unselecting":"ui-selected")._addClass(I.$element,b?"ui-selecting":"ui-unselecting"),I.unselecting=!b,I.selecting=b,I.selected=b,b?w._trigger("selecting",d,{selecting:I.element}):w._trigger("unselecting",d,{unselecting:I.element}),!1}))},_mouseDrag:function(d){if(this.dragged=!0,!this.options.disabled){var w,C=this,b=this.options,I=this.opos[0],k=this.opos[1],M=d.pageX,K=d.pageY;return I>M&&(w=M,M=I,I=w),k>K&&(w=K,K=k,k=w),this.helper.css({left:I,top:k,width:M-I,height:K-k}),this.selectees.each(function(){var W=g.data(this,"selectable-item"),q=!1,te={};!W||W.element===C.element[0]||(te.left=W.left+C.elementPos.left,te.right=W.right+C.elementPos.left,te.top=W.top+C.elementPos.top,te.bottom=W.bottom+C.elementPos.top,b.tolerance==="touch"?q=!(te.left>M||te.right<I||te.top>K||te.bottom<k):b.tolerance==="fit"&&(q=te.left>I&&te.right<M&&te.top>k&&te.bottom<K),q?(W.selected&&(C._removeClass(W.$element,"ui-selected"),W.selected=!1),W.unselecting&&(C._removeClass(W.$element,"ui-unselecting"),W.unselecting=!1),W.selecting||(C._addClass(W.$element,"ui-selecting"),W.selecting=!0,C._trigger("selecting",d,{selecting:W.element}))):(W.selecting&&((d.metaKey||d.ctrlKey)&&W.startselected?(C._removeClass(W.$element,"ui-selecting"),W.selecting=!1,C._addClass(W.$element,"ui-selected"),W.selected=!0):(C._removeClass(W.$element,"ui-selecting"),W.selecting=!1,W.startselected&&(C._addClass(W.$element,"ui-unselecting"),W.unselecting=!0),C._trigger("unselecting",d,{unselecting:W.element}))),W.selected&&!d.metaKey&&!d.ctrlKey&&!W.startselected&&(C._removeClass(W.$element,"ui-selected"),W.selected=!1,C._addClass(W.$element,"ui-unselecting"),W.unselecting=!0,C._trigger("unselecting",d,{unselecting:W.element}))))}),!1}},_mouseStop:function(d){var w=this;return this.dragged=!1,g(".ui-unselecting",this.element[0]).each(function(){var C=g.data(this,"selectable-item");w._removeClass(C.$element,"ui-unselecting"),C.unselecting=!1,C.startselected=!1,w._trigger("unselected",d,{unselected:C.element})}),g(".ui-selecting",this.element[0]).each(function(){var C=g.data(this,"selectable-item");w._removeClass(C.$element,"ui-selecting")._addClass(C.$element,"ui-selected"),C.selecting=!1,C.selected=!0,C.startselected=!0,w._trigger("selected",d,{selected:C.element})}),this._trigger("stop",d),this.helper.remove(),!1}});/*!
+ * jQuery UI Selectmenu 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.selectmenu",[g.ui.formResetMixin,{version:"1.13.2",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var d=this.element.uniqueId().attr("id");this.ids={element:d,button:d+"-button",menu:d+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=g()},_drawButton:function(){var d,w=this,C=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(b){this.button.trigger("focus"),b.preventDefault()}}),this.element.hide(),this.button=g("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),d=g("<span>").appendTo(this.button),this._addClass(d,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(C).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){w._rendered||w._refreshMenu()})},_drawMenu:function(){var d=this;this.menu=g("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=g("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(w,C){w.preventDefault(),d._setSelection(),d._select(C.item.data("ui-selectmenu-item"),w)},focus:function(w,C){var b=C.item.data("ui-selectmenu-item");d.focusIndex!=null&&b.index!==d.focusIndex&&(d._trigger("focus",w,{item:b}),d.isOpen||d._select(b,w)),d.focusIndex=b.index,d.button.attr("aria-activedescendant",d.menuItems.eq(b.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),this.options.width===null&&this._resizeButton()},_refreshMenu:function(){var d,w=this.element.find("option");this.menu.empty(),this._parseOptions(w),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,w.length&&(d=this._getSelectedItem(),this.menuInstance.focus(null,d),this._setAria(d.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(d){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",d)))},_position:function(){this.menuWrap.position(g.extend({of:this.button},this.options.position))},close:function(d){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",d))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(d){var w=g("<span>");return this._setText(w,d.label),this._addClass(w,"ui-selectmenu-text"),w},_renderMenu:function(d,w){var C=this,b="";g.each(w,function(I,k){var M;k.optgroup!==b&&(M=g("<li>",{text:k.optgroup}),C._addClass(M,"ui-selectmenu-optgroup","ui-menu-divider"+(k.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),M.appendTo(d),b=k.optgroup),C._renderItemData(d,k)})},_renderItemData:function(d,w){return this._renderItem(d,w).data("ui-selectmenu-item",w)},_renderItem:function(d,w){var C=g("<li>"),b=g("<div>",{title:w.element.attr("title")});return w.disabled&&this._addClass(C,null,"ui-state-disabled"),this._setText(b,w.label),C.append(b).appendTo(d)},_setText:function(d,w){w?d.text(w):d.html("&#160;")},_move:function(d,w){var C,b,I=".ui-menu-item";this.isOpen?C=this.menuItems.eq(this.focusIndex).parent("li"):(C=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),I+=":not(.ui-state-disabled)"),d==="first"||d==="last"?b=C[d==="first"?"prevAll":"nextAll"](I).eq(-1):b=C[d+"All"](I).eq(0),b.length&&this.menuInstance.focus(w,b)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(d){this[this.isOpen?"close":"open"](d)},_setSelection:function(){var d;this.range&&(window.getSelection?(d=window.getSelection(),d.removeAllRanges(),d.addRange(this.range)):this.range.select(),this.button.trigger("focus"))},_documentClick:{mousedown:function(d){this.isOpen&&(g(d.target).closest(".ui-selectmenu-menu, #"+g.escapeSelector(this.ids.button)).length||this.close(d))}},_buttonEvents:{mousedown:function(){var d;window.getSelection?(d=window.getSelection(),d.rangeCount&&(this.range=d.getRangeAt(0))):this.range=document.selection.createRange()},click:function(d){this._setSelection(),this._toggle(d)},keydown:function(d){var w=!0;switch(d.keyCode){case g.ui.keyCode.TAB:case g.ui.keyCode.ESCAPE:this.close(d),w=!1;break;case g.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(d);break;case g.ui.keyCode.UP:d.altKey?this._toggle(d):this._move("prev",d);break;case g.ui.keyCode.DOWN:d.altKey?this._toggle(d):this._move("next",d);break;case g.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(d):this._toggle(d);break;case g.ui.keyCode.LEFT:this._move("prev",d);break;case g.ui.keyCode.RIGHT:this._move("next",d);break;case g.ui.keyCode.HOME:case g.ui.keyCode.PAGE_UP:this._move("first",d);break;case g.ui.keyCode.END:case g.ui.keyCode.PAGE_DOWN:this._move("last",d);break;default:this.menu.trigger(d),w=!1}w&&d.preventDefault()}},_selectFocusedItem:function(d){var w=this.menuItems.eq(this.focusIndex).parent("li");w.hasClass("ui-state-disabled")||this._select(w.data("ui-selectmenu-item"),d)},_select:function(d,w){var C=this.element[0].selectedIndex;this.element[0].selectedIndex=d.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(d)),this._setAria(d),this._trigger("select",w,{item:d}),d.index!==C&&this._trigger("change",w,{item:d}),this.close(w)},_setAria:function(d){var w=this.menuItems.eq(d.index).attr("id");this.button.attr({"aria-labelledby":w,"aria-activedescendant":w}),this.menu.attr("aria-activedescendant",w)},_setOption:function(d,w){if(d==="icons"){var C=this.button.find("span.ui-icon");this._removeClass(C,null,this.options.icons.button)._addClass(C,null,w.button)}this._super(d,w),d==="appendTo"&&this.menuWrap.appendTo(this._appendTo()),d==="width"&&this._resizeButton()},_setOptionDisabled:function(d){this._super(d),this.menuInstance.option("disabled",d),this.button.attr("aria-disabled",d),this._toggleClass(this.button,null,"ui-state-disabled",d),this.element.prop("disabled",d),d?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var d=this.options.appendTo;return d&&(d=d.jquery||d.nodeType?g(d):this.document.find(d).eq(0)),(!d||!d[0])&&(d=this.element.closest(".ui-front, dialog")),d.length||(d=this.document[0].body),d},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var d=this.options.width;if(d===!1){this.button.css("width","");return}d===null&&(d=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(d)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var d=this._super();return d.disabled=this.element.prop("disabled"),d},_parseOptions:function(d){var w=this,C=[];d.each(function(b,I){I.hidden||C.push(w._parseOption(g(I),b))}),this.items=C},_parseOption:function(d,w){var C=d.parent("optgroup");return{element:d,index:w,value:d.val(),label:d.text(),optgroup:C.attr("label")||"",disabled:C.prop("disabled")||d.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]);/*!
+ * jQuery UI Slider 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.slider",g.ui.mouse,{version:"1.13.2",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var d,w,C=this.options,b=this.element.find(".ui-slider-handle"),I="<span tabindex='0'></span>",k=[];for(w=C.values&&C.values.length||1,b.length>w&&(b.slice(w).remove(),b=b.slice(0,w)),d=b.length;d<w;d++)k.push(I);this.handles=b.add(g(k.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(M){g(this).data("ui-slider-handle-index",M).attr("tabIndex",0)})},_createRange:function(){var d=this.options;d.range?(d.range===!0&&(d.values?d.values.length&&d.values.length!==2?d.values=[d.values[0],d.values[0]]:Array.isArray(d.values)&&(d.values=d.values.slice(0)):d.values=[this._valueMin(),this._valueMin()]),!this.range||!this.range.length?(this.range=g("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")):(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})),(d.range==="min"||d.range==="max")&&this._addClass(this.range,"ui-slider-range-"+d.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(d){var w,C,b,I,k,M,K,W,q=this,te=this.options;return te.disabled||(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),w={x:d.pageX,y:d.pageY},C=this._normValueFromMouse(w),b=this._valueMax()-this._valueMin()+1,this.handles.each(function(he){var ne=Math.abs(C-q.values(he));(b>ne||b===ne&&(he===q._lastChangedValue||q.values(he)===te.min))&&(b=ne,I=g(this),k=he)}),M=this._start(d,k),M===!1)?!1:(this._mouseSliding=!0,this._handleIndex=k,this._addClass(I,null,"ui-state-active"),I.trigger("focus"),K=I.offset(),W=!g(d.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=W?{left:0,top:0}:{left:d.pageX-K.left-I.width()/2,top:d.pageY-K.top-I.height()/2-(parseInt(I.css("borderTopWidth"),10)||0)-(parseInt(I.css("borderBottomWidth"),10)||0)+(parseInt(I.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(d,k,C),this._animateOff=!0,!0)},_mouseStart:function(){return!0},_mouseDrag:function(d){var w={x:d.pageX,y:d.pageY},C=this._normValueFromMouse(w);return this._slide(d,this._handleIndex,C),!1},_mouseStop:function(d){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(d,this._handleIndex),this._change(d,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(d){var w,C,b,I,k;return this.orientation==="horizontal"?(w=this.elementSize.width,C=d.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(w=this.elementSize.height,C=d.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),b=C/w,b>1&&(b=1),b<0&&(b=0),this.orientation==="vertical"&&(b=1-b),I=this._valueMax()-this._valueMin(),k=this._valueMin()+b*I,this._trimAlignValue(k)},_uiHash:function(d,w,C){var b={handle:this.handles[d],handleIndex:d,value:w!==void 0?w:this.value()};return this._hasMultipleValues()&&(b.value=w!==void 0?w:this.values(d),b.values=C||this.values()),b},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(d,w){return this._trigger("start",d,this._uiHash(w))},_slide:function(d,w,C){var b,I,k=this.value(),M=this.values();this._hasMultipleValues()&&(I=this.values(w?0:1),k=this.values(w),this.options.values.length===2&&this.options.range===!0&&(C=w===0?Math.min(I,C):Math.max(I,C)),M[w]=C),C!==k&&(b=this._trigger("slide",d,this._uiHash(w,C,M)),b!==!1&&(this._hasMultipleValues()?this.values(w,C):this.value(C)))},_stop:function(d,w){this._trigger("stop",d,this._uiHash(w))},_change:function(d,w){!this._keySliding&&!this._mouseSliding&&(this._lastChangedValue=w,this._trigger("change",d,this._uiHash(w)))},value:function(d){if(arguments.length){this.options.value=this._trimAlignValue(d),this._refreshValue(),this._change(null,0);return}return this._value()},values:function(d,w){var C,b,I;if(arguments.length>1){this.options.values[d]=this._trimAlignValue(w),this._refreshValue(),this._change(null,d);return}if(arguments.length)if(Array.isArray(arguments[0])){for(C=this.options.values,b=arguments[0],I=0;I<C.length;I+=1)C[I]=this._trimAlignValue(b[I]),this._change(null,I);this._refreshValue()}else return this._hasMultipleValues()?this._values(d):this.value();else return this._values()},_setOption:function(d,w){var C,b=0;switch(d==="range"&&this.options.range===!0&&(w==="min"?(this.options.value=this._values(0),this.options.values=null):w==="max"&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),Array.isArray(this.options.values)&&(b=this.options.values.length),this._super(d,w),d){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(w),this.handles.css(w==="horizontal"?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),C=b-1;C>=0;C--)this._change(null,C);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1;break}},_setOptionDisabled:function(d){this._super(d),this._toggleClass(null,"ui-state-disabled",!!d)},_value:function(){var d=this.options.value;return d=this._trimAlignValue(d),d},_values:function(d){var w,C,b;if(arguments.length)return w=this.options.values[d],w=this._trimAlignValue(w),w;if(this._hasMultipleValues()){for(C=this.options.values.slice(),b=0;b<C.length;b+=1)C[b]=this._trimAlignValue(C[b]);return C}else return[]},_trimAlignValue:function(d){if(d<=this._valueMin())return this._valueMin();if(d>=this._valueMax())return this._valueMax();var w=this.options.step>0?this.options.step:1,C=(d-this._valueMin())%w,b=d-C;return Math.abs(C)*2>=w&&(b+=C>0?w:-w),parseFloat(b.toFixed(5))},_calculateNewMax:function(){var d=this.options.max,w=this._valueMin(),C=this.options.step,b=Math.round((d-w)/C)*C;d=b+w,d>this.options.max&&(d-=C),this.max=parseFloat(d.toFixed(this._precision()))},_precision:function(){var d=this._precisionOf(this.options.step);return this.options.min!==null&&(d=Math.max(d,this._precisionOf(this.options.min))),d},_precisionOf:function(d){var w=d.toString(),C=w.indexOf(".");return C===-1?0:w.length-C-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(d){d==="vertical"&&this.range.css({width:"",left:""}),d==="horizontal"&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var d,w,C,b,I,k=this.options.range,M=this.options,K=this,W=this._animateOff?!1:M.animate,q={};this._hasMultipleValues()?this.handles.each(function(te){w=(K.values(te)-K._valueMin())/(K._valueMax()-K._valueMin())*100,q[K.orientation==="horizontal"?"left":"bottom"]=w+"%",g(this).stop(1,1)[W?"animate":"css"](q,M.animate),K.options.range===!0&&(K.orientation==="horizontal"?(te===0&&K.range.stop(1,1)[W?"animate":"css"]({left:w+"%"},M.animate),te===1&&K.range[W?"animate":"css"]({width:w-d+"%"},{queue:!1,duration:M.animate})):(te===0&&K.range.stop(1,1)[W?"animate":"css"]({bottom:w+"%"},M.animate),te===1&&K.range[W?"animate":"css"]({height:w-d+"%"},{queue:!1,duration:M.animate}))),d=w}):(C=this.value(),b=this._valueMin(),I=this._valueMax(),w=I!==b?(C-b)/(I-b)*100:0,q[this.orientation==="horizontal"?"left":"bottom"]=w+"%",this.handle.stop(1,1)[W?"animate":"css"](q,M.animate),k==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[W?"animate":"css"]({width:w+"%"},M.animate),k==="max"&&this.orientation==="horizontal"&&this.range.stop(1,1)[W?"animate":"css"]({width:100-w+"%"},M.animate),k==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[W?"animate":"css"]({height:w+"%"},M.animate),k==="max"&&this.orientation==="vertical"&&this.range.stop(1,1)[W?"animate":"css"]({height:100-w+"%"},M.animate))},_handleEvents:{keydown:function(d){var w,C,b,I,k=g(d.target).data("ui-slider-handle-index");switch(d.keyCode){case g.ui.keyCode.HOME:case g.ui.keyCode.END:case g.ui.keyCode.PAGE_UP:case g.ui.keyCode.PAGE_DOWN:case g.ui.keyCode.UP:case g.ui.keyCode.RIGHT:case g.ui.keyCode.DOWN:case g.ui.keyCode.LEFT:if(d.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(g(d.target),null,"ui-state-active"),w=this._start(d,k),w===!1))return;break}switch(I=this.options.step,this._hasMultipleValues()?C=b=this.values(k):C=b=this.value(),d.keyCode){case g.ui.keyCode.HOME:b=this._valueMin();break;case g.ui.keyCode.END:b=this._valueMax();break;case g.ui.keyCode.PAGE_UP:b=this._trimAlignValue(C+(this._valueMax()-this._valueMin())/this.numPages);break;case g.ui.keyCode.PAGE_DOWN:b=this._trimAlignValue(C-(this._valueMax()-this._valueMin())/this.numPages);break;case g.ui.keyCode.UP:case g.ui.keyCode.RIGHT:if(C===this._valueMax())return;b=this._trimAlignValue(C+I);break;case g.ui.keyCode.DOWN:case g.ui.keyCode.LEFT:if(C===this._valueMin())return;b=this._trimAlignValue(C-I);break}this._slide(d,k,b)},keyup:function(d){var w=g(d.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(d,w),this._change(d,w),this._removeClass(g(d.target),null,"ui-state-active"))}}});/*!
+ * jQuery UI Sortable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.sortable",g.ui.mouse,{version:"1.13.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(d,w,C){return d>=w&&d<w+C},_isFloating:function(d){return/left|right/.test(d.css("float"))||/inline|table-cell/.test(d.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(d,w){this._super(d,w),d==="handle"&&this._setHandleClassName()},_setHandleClassName:function(){var d=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),g.each(this.items,function(){d._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var d=this.items.length-1;d>=0;d--)this.items[d].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(d,w){var C=null,b=!1,I=this;return this.reverting||this.options.disabled||this.options.type==="static"||(this._refreshItems(d),g(d.target).parents().each(function(){if(g.data(this,I.widgetName+"-item")===I)return C=g(this),!1}),g.data(d.target,I.widgetName+"-item")===I&&(C=g(d.target)),!C)||this.options.handle&&!w&&(g(this.options.handle,C).find("*").addBack().each(function(){this===d.target&&(b=!0)}),!b)?!1:(this.currentItem=C,this._removeCurrentsFromItems(),!0)},_mouseStart:function(d,w,C){var b,I,k=this.options;if(this.currentContainer=this,this.refreshPositions(),this.appendTo=g(k.appendTo!=="parent"?k.appendTo:this.currentItem.parent()),this.helper=this._createHelper(d),this._cacheHelperProportions(),this._cacheMargins(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},g.extend(this.offset,{click:{left:d.pageX-this.offset.left,top:d.pageY-this.offset.top},relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),k.cursorAt&&this._adjustOffsetFromHelper(k.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),this.scrollParent=this.placeholder.scrollParent(),g.extend(this.offset,{parent:this._getParentOffset()}),k.containment&&this._setContainment(),k.cursor&&k.cursor!=="auto"&&(I=this.document.find("body"),this.storedCursor=I.css("cursor"),I.css("cursor",k.cursor),this.storedStylesheet=g("<style>*{ cursor: "+k.cursor+" !important; }</style>").appendTo(I)),k.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",k.zIndex)),k.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",k.opacity)),this.scrollParent[0]!==this.document[0]&&this.scrollParent[0].tagName!=="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",d,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!C)for(b=this.containers.length-1;b>=0;b--)this.containers[b]._trigger("activate",d,this._uiHash(this));return g.ui.ddmanager&&(g.ui.ddmanager.current=this),g.ui.ddmanager&&!k.dropBehaviour&&g.ui.ddmanager.prepareOffsets(this,d),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this.helper.parent().is(this.appendTo)||(this.helper.detach().appendTo(this.appendTo),this.offset.parent=this._getParentOffset()),this.position=this.originalPosition=this._generatePosition(d),this.originalPageX=d.pageX,this.originalPageY=d.pageY,this.lastPositionAbs=this.positionAbs=this._convertPositionTo("absolute"),this._mouseDrag(d),!0},_scroll:function(d){var w=this.options,C=!1;return this.scrollParent[0]!==this.document[0]&&this.scrollParent[0].tagName!=="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-d.pageY<w.scrollSensitivity?this.scrollParent[0].scrollTop=C=this.scrollParent[0].scrollTop+w.scrollSpeed:d.pageY-this.overflowOffset.top<w.scrollSensitivity&&(this.scrollParent[0].scrollTop=C=this.scrollParent[0].scrollTop-w.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-d.pageX<w.scrollSensitivity?this.scrollParent[0].scrollLeft=C=this.scrollParent[0].scrollLeft+w.scrollSpeed:d.pageX-this.overflowOffset.left<w.scrollSensitivity&&(this.scrollParent[0].scrollLeft=C=this.scrollParent[0].scrollLeft-w.scrollSpeed)):(d.pageY-this.document.scrollTop()<w.scrollSensitivity?C=this.document.scrollTop(this.document.scrollTop()-w.scrollSpeed):this.window.height()-(d.pageY-this.document.scrollTop())<w.scrollSensitivity&&(C=this.document.scrollTop(this.document.scrollTop()+w.scrollSpeed)),d.pageX-this.document.scrollLeft()<w.scrollSensitivity?C=this.document.scrollLeft(this.document.scrollLeft()-w.scrollSpeed):this.window.width()-(d.pageX-this.document.scrollLeft())<w.scrollSensitivity&&(C=this.document.scrollLeft(this.document.scrollLeft()+w.scrollSpeed))),C},_mouseDrag:function(d){var w,C,b,I,k=this.options;for(this.position=this._generatePosition(d),this.positionAbs=this._convertPositionTo("absolute"),(!this.options.axis||this.options.axis!=="y")&&(this.helper[0].style.left=this.position.left+"px"),(!this.options.axis||this.options.axis!=="x")&&(this.helper[0].style.top=this.position.top+"px"),k.scroll&&this._scroll(d)!==!1&&(this._refreshItemPositions(!0),g.ui.ddmanager&&!k.dropBehaviour&&g.ui.ddmanager.prepareOffsets(this,d)),this.dragDirection={vertical:this._getDragVerticalDirection(),horizontal:this._getDragHorizontalDirection()},w=this.items.length-1;w>=0;w--)if(C=this.items[w],b=C.item[0],I=this._intersectsWithPointer(C),!!I&&C.instance===this.currentContainer&&b!==this.currentItem[0]&&this.placeholder[I===1?"next":"prev"]()[0]!==b&&!g.contains(this.placeholder[0],b)&&(this.options.type!=="semi-dynamic"||!g.contains(this.element[0],b))){if(this.direction=I===1?"down":"up",this.options.tolerance==="pointer"||this._intersectsWithSides(C))this._rearrange(d,C);else break;this._trigger("change",d,this._uiHash());break}return this._contactContainers(d),g.ui.ddmanager&&g.ui.ddmanager.drag(this,d),this._trigger("sort",d,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(d,w){if(d){if(g.ui.ddmanager&&!this.options.dropBehaviour&&g.ui.ddmanager.drop(this,d),this.options.revert){var C=this,b=this.placeholder.offset(),I=this.options.axis,k={};(!I||I==="x")&&(k.left=b.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),(!I||I==="y")&&(k.top=b.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,g(this.helper).animate(k,parseInt(this.options.revert,10)||500,function(){C._clear(d)})}else this._clear(d,w);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new g.Event("mouseup",{target:null})),this.options.helper==="original"?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var d=this.containers.length-1;d>=0;d--)this.containers[d]._trigger("deactivate",null,this._uiHash(this)),this.containers[d].containerCache.over&&(this.containers[d]._trigger("out",null,this._uiHash(this)),this.containers[d].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!=="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),g.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?g(this.domPosition.prev).after(this.currentItem):g(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(d){var w=this._getItemsAsjQuery(d&&d.connected),C=[];return d=d||{},g(w).each(function(){var b=(g(d.item||this).attr(d.attribute||"id")||"").match(d.expression||/(.+)[\-=_](.+)/);b&&C.push((d.key||b[1]+"[]")+"="+(d.key&&d.expression?b[1]:b[2]))}),!C.length&&d.key&&C.push(d.key+"="),C.join("&")},toArray:function(d){var w=this._getItemsAsjQuery(d&&d.connected),C=[];return d=d||{},w.each(function(){C.push(g(d.item||this).attr(d.attribute||"id")||"")}),C},_intersectsWith:function(d){var w=this.positionAbs.left,C=w+this.helperProportions.width,b=this.positionAbs.top,I=b+this.helperProportions.height,k=d.left,M=k+d.width,K=d.top,W=K+d.height,q=this.offset.click.top,te=this.offset.click.left,he=this.options.axis==="x"||b+q>K&&b+q<W,ne=this.options.axis==="y"||w+te>k&&w+te<M,ie=he&&ne;return this.options.tolerance==="pointer"||this.options.forcePointerForContainers||this.options.tolerance!=="pointer"&&this.helperProportions[this.floating?"width":"height"]>d[this.floating?"width":"height"]?ie:k<w+this.helperProportions.width/2&&C-this.helperProportions.width/2<M&&K<b+this.helperProportions.height/2&&I-this.helperProportions.height/2<W},_intersectsWithPointer:function(d){var w,C,b=this.options.axis==="x"||this._isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height),I=this.options.axis==="y"||this._isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width),k=b&&I;return k?(w=this.dragDirection.vertical,C=this.dragDirection.horizontal,this.floating?C==="right"||w==="down"?2:1:w&&(w==="down"?2:1)):!1},_intersectsWithSides:function(d){var w=this._isOverAxis(this.positionAbs.top+this.offset.click.top,d.top+d.height/2,d.height),C=this._isOverAxis(this.positionAbs.left+this.offset.click.left,d.left+d.width/2,d.width),b=this.dragDirection.vertical,I=this.dragDirection.horizontal;return this.floating&&I?I==="right"&&C||I==="left"&&!C:b&&(b==="down"&&w||b==="up"&&!w)},_getDragVerticalDirection:function(){var d=this.positionAbs.top-this.lastPositionAbs.top;return d!==0&&(d>0?"down":"up")},_getDragHorizontalDirection:function(){var d=this.positionAbs.left-this.lastPositionAbs.left;return d!==0&&(d>0?"right":"left")},refresh:function(d){return this._refreshItems(d),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var d=this.options;return d.connectWith.constructor===String?[d.connectWith]:d.connectWith},_getItemsAsjQuery:function(d){var w,C,b,I,k=[],M=[],K=this._connectWith();if(K&&d)for(w=K.length-1;w>=0;w--)for(b=g(K[w],this.document[0]),C=b.length-1;C>=0;C--)I=g.data(b[C],this.widgetFullName),I&&I!==this&&!I.options.disabled&&M.push([typeof I.options.items=="function"?I.options.items.call(I.element):g(I.options.items,I.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),I]);M.push([typeof this.options.items=="function"?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):g(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);function W(){k.push(this)}for(w=M.length-1;w>=0;w--)M[w][0].each(W);return g(k)},_removeCurrentsFromItems:function(){var d=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=g.grep(this.items,function(w){for(var C=0;C<d.length;C++)if(d[C]===w.item[0])return!1;return!0})},_refreshItems:function(d){this.items=[],this.containers=[this];var w,C,b,I,k,M,K,W,q=this.items,te=[[typeof this.options.items=="function"?this.options.items.call(this.element[0],d,{item:this.currentItem}):g(this.options.items,this.element),this]],he=this._connectWith();if(he&&this.ready)for(w=he.length-1;w>=0;w--)for(b=g(he[w],this.document[0]),C=b.length-1;C>=0;C--)I=g.data(b[C],this.widgetFullName),I&&I!==this&&!I.options.disabled&&(te.push([typeof I.options.items=="function"?I.options.items.call(I.element[0],d,{item:this.currentItem}):g(I.options.items,I.element),I]),this.containers.push(I));for(w=te.length-1;w>=0;w--)for(k=te[w][1],M=te[w][0],C=0,W=M.length;C<W;C++)K=g(M[C]),K.data(this.widgetName+"-item",k),q.push({item:K,instance:k,width:0,height:0,left:0,top:0})},_refreshItemPositions:function(d){var w,C,b,I;for(w=this.items.length-1;w>=0;w--)C=this.items[w],!(this.currentContainer&&C.instance!==this.currentContainer&&C.item[0]!==this.currentItem[0])&&(b=this.options.toleranceElement?g(this.options.toleranceElement,C.item):C.item,d||(C.width=b.outerWidth(),C.height=b.outerHeight()),I=b.offset(),C.left=I.left,C.top=I.top)},refreshPositions:function(d){this.floating=this.items.length?this.options.axis==="x"||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset()),this._refreshItemPositions(d);var w,C;if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(w=this.containers.length-1;w>=0;w--)C=this.containers[w].element.offset(),this.containers[w].containerCache.left=C.left,this.containers[w].containerCache.top=C.top,this.containers[w].containerCache.width=this.containers[w].element.outerWidth(),this.containers[w].containerCache.height=this.containers[w].element.outerHeight();return this},_createPlaceholder:function(d){d=d||this;var w,C,b=d.options;(!b.placeholder||b.placeholder.constructor===String)&&(w=b.placeholder,C=d.currentItem[0].nodeName.toLowerCase(),b.placeholder={element:function(){var I=g("<"+C+">",d.document[0]);return d._addClass(I,"ui-sortable-placeholder",w||d.currentItem[0].className)._removeClass(I,"ui-sortable-helper"),C==="tbody"?d._createTrPlaceholder(d.currentItem.find("tr").eq(0),g("<tr>",d.document[0]).appendTo(I)):C==="tr"?d._createTrPlaceholder(d.currentItem,I):C==="img"&&I.attr("src",d.currentItem.attr("src")),w||I.css("visibility","hidden"),I},update:function(I,k){w&&!b.forcePlaceholderSize||((!k.height()||b.forcePlaceholderSize&&(C==="tbody"||C==="tr"))&&k.height(d.currentItem.innerHeight()-parseInt(d.currentItem.css("paddingTop")||0,10)-parseInt(d.currentItem.css("paddingBottom")||0,10)),k.width()||k.width(d.currentItem.innerWidth()-parseInt(d.currentItem.css("paddingLeft")||0,10)-parseInt(d.currentItem.css("paddingRight")||0,10)))}}),d.placeholder=g(b.placeholder.element.call(d.element,d.currentItem)),d.currentItem.after(d.placeholder),b.placeholder.update(d,d.placeholder)},_createTrPlaceholder:function(d,w){var C=this;d.children().each(function(){g("<td>&#160;</td>",C.document[0]).attr("colspan",g(this).attr("colspan")||1).appendTo(w)})},_contactContainers:function(d){var w,C,b,I,k,M,K,W,q,te,he=null,ne=null;for(w=this.containers.length-1;w>=0;w--)if(!g.contains(this.currentItem[0],this.containers[w].element[0]))if(this._intersectsWith(this.containers[w].containerCache)){if(he&&g.contains(this.containers[w].element[0],he.element[0]))continue;he=this.containers[w],ne=w}else this.containers[w].containerCache.over&&(this.containers[w]._trigger("out",d,this._uiHash(this)),this.containers[w].containerCache.over=0);if(he)if(this.containers.length===1)this.containers[ne].containerCache.over||(this.containers[ne]._trigger("over",d,this._uiHash(this)),this.containers[ne].containerCache.over=1);else{for(b=1e4,I=null,q=he.floating||this._isFloating(this.currentItem),k=q?"left":"top",M=q?"width":"height",te=q?"pageX":"pageY",C=this.items.length-1;C>=0;C--)g.contains(this.containers[ne].element[0],this.items[C].item[0])&&this.items[C].item[0]!==this.currentItem[0]&&(K=this.items[C].item.offset()[k],W=!1,d[te]-K>this.items[C][M]/2&&(W=!0),Math.abs(d[te]-K)<b&&(b=Math.abs(d[te]-K),I=this.items[C],this.direction=W?"up":"down"));if(!I&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[ne]){this.currentContainer.containerCache.over||(this.containers[ne]._trigger("over",d,this._uiHash()),this.currentContainer.containerCache.over=1);return}I?this._rearrange(d,I,null,!0):this._rearrange(d,null,this.containers[ne].element,!0),this._trigger("change",d,this._uiHash()),this.containers[ne]._trigger("change",d,this._uiHash(this)),this.currentContainer=this.containers[ne],this.options.placeholder.update(this.currentContainer,this.placeholder),this.scrollParent=this.placeholder.scrollParent(),this.scrollParent[0]!==this.document[0]&&this.scrollParent[0].tagName!=="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this.containers[ne]._trigger("over",d,this._uiHash(this)),this.containers[ne].containerCache.over=1}},_createHelper:function(d){var w=this.options,C=typeof w.helper=="function"?g(w.helper.apply(this.element[0],[d,this.currentItem])):w.helper==="clone"?this.currentItem.clone():this.currentItem;return C.parents("body").length||this.appendTo[0].appendChild(C[0]),C[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!C[0].style.width||w.forceHelperSize)&&C.width(this.currentItem.width()),(!C[0].style.height||w.forceHelperSize)&&C.height(this.currentItem.height()),C},_adjustOffsetFromHelper:function(d){typeof d=="string"&&(d=d.split(" ")),Array.isArray(d)&&(d={left:+d[0],top:+d[1]||0}),"left"in d&&(this.offset.click.left=d.left+this.margins.left),"right"in d&&(this.offset.click.left=this.helperProportions.width-d.right+this.margins.left),"top"in d&&(this.offset.click.top=d.top+this.margins.top),"bottom"in d&&(this.offset.click.top=this.helperProportions.height-d.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var d=this.offsetParent.offset();return this.cssPosition==="absolute"&&this.scrollParent[0]!==this.document[0]&&g.contains(this.scrollParent[0],this.offsetParent[0])&&(d.left+=this.scrollParent.scrollLeft(),d.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()==="html"&&g.ui.ie)&&(d={top:0,left:0}),{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==="relative"){var d=this.currentItem.position();return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:d.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d,w,C,b=this.options;b.containment==="parent"&&(b.containment=this.helper[0].parentNode),(b.containment==="document"||b.containment==="window")&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,b.containment==="document"?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,(b.containment==="document"?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(b.containment)||(d=g(b.containment)[0],w=g(b.containment).offset(),C=g(d).css("overflow")!=="hidden",this.containment=[w.left+(parseInt(g(d).css("borderLeftWidth"),10)||0)+(parseInt(g(d).css("paddingLeft"),10)||0)-this.margins.left,w.top+(parseInt(g(d).css("borderTopWidth"),10)||0)+(parseInt(g(d).css("paddingTop"),10)||0)-this.margins.top,w.left+(C?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(g(d).css("borderLeftWidth"),10)||0)-(parseInt(g(d).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,w.top+(C?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(g(d).css("borderTopWidth"),10)||0)-(parseInt(g(d).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(d,w){w||(w=this.position);var C=d==="absolute"?1:-1,b=this.cssPosition==="absolute"&&!(this.scrollParent[0]!==this.document[0]&&g.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,I=/(html|body)/i.test(b[0].tagName);return{top:w.top+this.offset.relative.top*C+this.offset.parent.top*C-(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():I?0:b.scrollTop())*C,left:w.left+this.offset.relative.left*C+this.offset.parent.left*C-(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():I?0:b.scrollLeft())*C}},_generatePosition:function(d){var w,C,b=this.options,I=d.pageX,k=d.pageY,M=this.cssPosition==="absolute"&&!(this.scrollParent[0]!==this.document[0]&&g.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,K=/(html|body)/i.test(M[0].tagName);return this.cssPosition==="relative"&&!(this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(d.pageX-this.offset.click.left<this.containment[0]&&(I=this.containment[0]+this.offset.click.left),d.pageY-this.offset.click.top<this.containment[1]&&(k=this.containment[1]+this.offset.click.top),d.pageX-this.offset.click.left>this.containment[2]&&(I=this.containment[2]+this.offset.click.left),d.pageY-this.offset.click.top>this.containment[3]&&(k=this.containment[3]+this.offset.click.top)),b.grid&&(w=this.originalPageY+Math.round((k-this.originalPageY)/b.grid[1])*b.grid[1],k=this.containment?w-this.offset.click.top>=this.containment[1]&&w-this.offset.click.top<=this.containment[3]?w:w-this.offset.click.top>=this.containment[1]?w-b.grid[1]:w+b.grid[1]:w,C=this.originalPageX+Math.round((I-this.originalPageX)/b.grid[0])*b.grid[0],I=this.containment?C-this.offset.click.left>=this.containment[0]&&C-this.offset.click.left<=this.containment[2]?C:C-this.offset.click.left>=this.containment[0]?C-b.grid[0]:C+b.grid[0]:C)),{top:k-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():K?0:M.scrollTop()),left:I-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():K?0:M.scrollLeft())}},_rearrange:function(d,w,C,b){C?C[0].appendChild(this.placeholder[0]):w.item[0].parentNode.insertBefore(this.placeholder[0],this.direction==="down"?w.item[0]:w.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var I=this.counter;this._delay(function(){I===this.counter&&this.refreshPositions(!b)})},_clear:function(d,w){this.reverting=!1;var C,b=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(C in this._storedCSS)(this._storedCSS[C]==="auto"||this._storedCSS[C]==="static")&&(this._storedCSS[C]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!w&&b.push(function(k){this._trigger("receive",k,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!==this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!==this.currentItem.parent()[0])&&!w&&b.push(function(k){this._trigger("update",k,this._uiHash())}),this!==this.currentContainer&&(w||(b.push(function(k){this._trigger("remove",k,this._uiHash())}),b.push((function(k){return function(M){k._trigger("receive",M,this._uiHash(this))}}).call(this,this.currentContainer)),b.push((function(k){return function(M){k._trigger("update",M,this._uiHash(this))}}).call(this,this.currentContainer))));function I(k,M,K){return function(W){K._trigger(k,W,M._uiHash(M))}}for(C=this.containers.length-1;C>=0;C--)w||b.push(I("deactivate",this,this.containers[C])),this.containers[C].containerCache.over&&(b.push(I("out",this,this.containers[C])),this.containers[C].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex==="auto"?"":this._storedZIndex),this.dragging=!1,w||this._trigger("beforeStop",d,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!w){for(C=0;C<b.length;C++)b[C].call(this,d);this._trigger("stop",d,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){g.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(d){var w=d||this;return{helper:w.helper,placeholder:w.placeholder||g([]),position:w.position,originalPosition:w.originalPosition,offset:w.positionAbs,item:w.currentItem,sender:d?d.element:null}}});/*!
+ * jQuery UI Spinner 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */function tt(d){return function(){var w=this.element.val();d.apply(this,arguments),this._refresh(),w!==this.element.val()&&this._trigger("change")}}g.widget("ui.spinner",{version:"1.13.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this.value()!==""&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var d=this._super(),w=this.element;return g.each(["min","max","step"],function(C,b){var I=w.attr(b);I!=null&&I.length&&(d[b]=I)}),d},_events:{keydown:function(d){this._start(d)&&this._keydown(d)&&d.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(d){if(this.cancelBlur){delete this.cancelBlur;return}this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",d)},mousewheel:function(d,w){var C=g.ui.safeActiveElement(this.document[0]),b=this.element[0]===C;if(!(!b||!w)){if(!this.spinning&&!this._start(d))return!1;this._spin((w>0?1:-1)*this.options.step,d),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(d)},100),d.preventDefault()}},"mousedown .ui-spinner-button":function(d){var w;w=this.element[0]===g.ui.safeActiveElement(this.document[0])?this.previous:this.element.val();function C(){var b=this.element[0]===g.ui.safeActiveElement(this.document[0]);b||(this.element.trigger("focus"),this.previous=w,this._delay(function(){this.previous=w}))}d.preventDefault(),C.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,C.call(this)}),this._start(d)!==!1&&this._repeat(null,g(d.currentTarget).hasClass("ui-spinner-up")?1:-1,d)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(d){if(g(d.currentTarget).hasClass("ui-state-active")){if(this._start(d)===!1)return!1;this._repeat(null,g(d.currentTarget).hasClass("ui-spinner-up")?1:-1,d)}},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(this.uiSpinner.height()*.5)&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(d){var w=this.options,C=g.ui.keyCode;switch(d.keyCode){case C.UP:return this._repeat(null,1,d),!0;case C.DOWN:return this._repeat(null,-1,d),!0;case C.PAGE_UP:return this._repeat(null,w.page,d),!0;case C.PAGE_DOWN:return this._repeat(null,-w.page,d),!0}return!1},_start:function(d){return!this.spinning&&this._trigger("start",d)===!1?!1:(this.counter||(this.counter=1),this.spinning=!0,!0)},_repeat:function(d,w,C){d=d||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,w,C)},d),this._spin(w*this.options.step,C)},_spin:function(d,w){var C=this.value()||0;this.counter||(this.counter=1),C=this._adjustValue(C+d*this._increment(this.counter)),(!this.spinning||this._trigger("spin",w,{value:C})!==!1)&&(this._value(C),this.counter++)},_increment:function(d){var w=this.options.incremental;return w?typeof w=="function"?w(d):Math.floor(d*d*d/5e4-d*d/500+17*d/200+1):1},_precision:function(){var d=this._precisionOf(this.options.step);return this.options.min!==null&&(d=Math.max(d,this._precisionOf(this.options.min))),d},_precisionOf:function(d){var w=d.toString(),C=w.indexOf(".");return C===-1?0:w.length-C-1},_adjustValue:function(d){var w,C,b=this.options;return w=b.min!==null?b.min:0,C=d-w,C=Math.round(C/b.step)*b.step,d=w+C,d=parseFloat(d.toFixed(this._precision())),b.max!==null&&d>b.max?b.max:b.min!==null&&d<b.min?b.min:d},_stop:function(d){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",d))},_setOption:function(d,w){var C,b,I;if(d==="culture"||d==="numberFormat"){C=this._parse(this.element.val()),this.options[d]=w,this.element.val(this._format(C));return}(d==="max"||d==="min"||d==="step")&&typeof w=="string"&&(w=this._parse(w)),d==="icons"&&(b=this.buttons.first().find(".ui-icon"),this._removeClass(b,null,this.options.icons.up),this._addClass(b,null,w.up),I=this.buttons.last().find(".ui-icon"),this._removeClass(I,null,this.options.icons.down),this._addClass(I,null,w.down)),this._super(d,w)},_setOptionDisabled:function(d){this._super(d),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!d),this.element.prop("disabled",!!d),this.buttons.button(d?"disable":"enable")},_setOptions:tt(function(d){this._super(d)}),_parse:function(d){return typeof d=="string"&&d!==""&&(d=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(d,10,this.options.culture):+d),d===""||isNaN(d)?null:d},_format:function(d){return d===""?"":window.Globalize&&this.options.numberFormat?Globalize.format(d,this.options.numberFormat,this.options.culture):d},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var d=this.value();return d===null?!1:d===this._adjustValue(d)},_value:function(d,w){var C;d!==""&&(C=this._parse(d),C!==null&&(w||(C=this._adjustValue(C)),d=this._format(C))),this.element.val(d),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:tt(function(d){this._stepUp(d)}),_stepUp:function(d){this._start()&&(this._spin((d||1)*this.options.step),this._stop())},stepDown:tt(function(d){this._stepDown(d)}),_stepDown:function(d){this._start()&&(this._spin((d||1)*-this.options.step),this._stop())},pageUp:tt(function(d){this._stepUp((d||1)*this.options.page)}),pageDown:tt(function(d){this._stepDown((d||1)*this.options.page)}),value:function(d){if(!arguments.length)return this._parse(this.element.val());tt(this._value).call(this,d)},widget:function(){return this.uiSpinner}}),g.uiBackCompat!==!1&&g.widget("ui.spinner",g.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),g.ui.spinner;/*!
+ * jQuery UI Tabs 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.tabs",{version:"1.13.2",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var d=/#.*$/;return function(w){var C,b;C=w.href.replace(d,""),b=location.href.replace(d,"");try{C=decodeURIComponent(C)}catch{}try{b=decodeURIComponent(b)}catch{}return w.hash.length>1&&C===b}}(),_create:function(){var d=this,w=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,w.collapsible),this._processTabs(),w.active=this._initialActive(),Array.isArray(w.disabled)&&(w.disabled=g.uniqueSort(w.disabled.concat(g.map(this.tabs.filter(".ui-state-disabled"),function(C){return d.tabs.index(C)}))).sort()),this.options.active!==!1&&this.anchors.length?this.active=this._findActive(w.active):this.active=g(),this._refresh(),this.active.length&&this.load(w.active)},_initialActive:function(){var d=this.options.active,w=this.options.collapsible,C=location.hash.substring(1);return d===null&&(C&&this.tabs.each(function(b,I){if(g(I).attr("aria-controls")===C)return d=b,!1}),d===null&&(d=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(d===null||d===-1)&&(d=this.tabs.length?0:!1)),d!==!1&&(d=this.tabs.index(this.tabs.eq(d)),d===-1&&(d=w?!1:0)),!w&&d===!1&&this.anchors.length&&(d=0),d},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):g()}},_tabKeydown:function(d){var w=g(g.ui.safeActiveElement(this.document[0])).closest("li"),C=this.tabs.index(w),b=!0;if(!this._handlePageNav(d)){switch(d.keyCode){case g.ui.keyCode.RIGHT:case g.ui.keyCode.DOWN:C++;break;case g.ui.keyCode.UP:case g.ui.keyCode.LEFT:b=!1,C--;break;case g.ui.keyCode.END:C=this.anchors.length-1;break;case g.ui.keyCode.HOME:C=0;break;case g.ui.keyCode.SPACE:d.preventDefault(),clearTimeout(this.activating),this._activate(C);return;case g.ui.keyCode.ENTER:d.preventDefault(),clearTimeout(this.activating),this._activate(C===this.options.active?!1:C);return;default:return}d.preventDefault(),clearTimeout(this.activating),C=this._focusNextTab(C,b),!d.ctrlKey&&!d.metaKey&&(w.attr("aria-selected","false"),this.tabs.eq(C).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",C)},this.delay))}},_panelKeydown:function(d){this._handlePageNav(d)||d.ctrlKey&&d.keyCode===g.ui.keyCode.UP&&(d.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(d){if(d.altKey&&d.keyCode===g.ui.keyCode.PAGE_UP)return this._activate(this._focusNextTab(this.options.active-1,!1)),!0;if(d.altKey&&d.keyCode===g.ui.keyCode.PAGE_DOWN)return this._activate(this._focusNextTab(this.options.active+1,!0)),!0},_findNextTab:function(d,w){var C=this.tabs.length-1;function b(){return d>C&&(d=0),d<0&&(d=C),d}for(;g.inArray(b(),this.options.disabled)!==-1;)d=w?d+1:d-1;return d},_focusNextTab:function(d,w){return d=this._findNextTab(d,w),this.tabs.eq(d).trigger("focus"),d},_setOption:function(d,w){if(d==="active"){this._activate(w);return}this._super(d,w),d==="collapsible"&&(this._toggleClass("ui-tabs-collapsible",null,w),!w&&this.options.active===!1&&this._activate(0)),d==="event"&&this._setupEvents(w),d==="heightStyle"&&this._setupHeightStyle(w)},_sanitizeSelector:function(d){return d?d.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var d=this.options,w=this.tablist.children(":has(a[href])");d.disabled=g.map(w.filter(".ui-state-disabled"),function(C){return w.index(C)}),this._processTabs(),d.active===!1||!this.anchors.length?(d.active=!1,this.active=g()):this.active.length&&!g.contains(this.tablist[0],this.active[0])?this.tabs.length===d.disabled.length?(d.active=!1,this.active=g()):this._activate(this._findNextTab(Math.max(0,d.active-1),!1)):d.active=this.tabs.index(this.active),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var d=this,w=this.tabs,C=this.anchors,b=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(I){g(this).is(".ui-state-disabled")&&I.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){g(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return g("a",this)[0]}).attr({tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=g(),this.anchors.each(function(I,k){var M,K,W,q=g(k).uniqueId().attr("id"),te=g(k).closest("li"),he=te.attr("aria-controls");d._isLocal(k)?(M=k.hash,W=M.substring(1),K=d.element.find(d._sanitizeSelector(M))):(W=te.attr("aria-controls")||g({}).uniqueId()[0].id,M="#"+W,K=d.element.find(M),K.length||(K=d._createPanel(W),K.insertAfter(d.panels[I-1]||d.tablist)),K.attr("aria-live","polite")),K.length&&(d.panels=d.panels.add(K)),he&&te.data("ui-tabs-aria-controls",he),te.attr({"aria-controls":W,"aria-labelledby":q}),K.attr("aria-labelledby",q)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),w&&(this._off(w.not(this.tabs)),this._off(C.not(this.anchors)),this._off(b.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(d){return g("<div>").attr("id",d).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(d){var w,C,b;for(Array.isArray(d)&&(d.length?d.length===this.anchors.length&&(d=!0):d=!1),b=0;C=this.tabs[b];b++)w=g(C),d===!0||g.inArray(b,d)!==-1?(w.attr("aria-disabled","true"),this._addClass(w,null,"ui-state-disabled")):(w.removeAttr("aria-disabled"),this._removeClass(w,null,"ui-state-disabled"));this.options.disabled=d,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,d===!0)},_setupEvents:function(d){var w={};d&&g.each(d.split(" "),function(C,b){w[b]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(C){C.preventDefault()}}),this._on(this.anchors,w),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(d){var w,C=this.element.parent();d==="fill"?(w=C.height(),w-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var b=g(this),I=b.css("position");I==="absolute"||I==="fixed"||(w-=b.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){w-=g(this).outerHeight(!0)}),this.panels.each(function(){g(this).height(Math.max(0,w-g(this).innerHeight()+g(this).height()))}).css("overflow","auto")):d==="auto"&&(w=0,this.panels.each(function(){w=Math.max(w,g(this).height("").height())}).height(w))},_eventHandler:function(d){var w=this.options,C=this.active,b=g(d.currentTarget),I=b.closest("li"),k=I[0]===C[0],M=k&&w.collapsible,K=M?g():this._getPanelForTab(I),W=C.length?this._getPanelForTab(C):g(),q={oldTab:C,oldPanel:W,newTab:M?g():I,newPanel:K};d.preventDefault(),!(I.hasClass("ui-state-disabled")||I.hasClass("ui-tabs-loading")||this.running||k&&!w.collapsible||this._trigger("beforeActivate",d,q)===!1)&&(w.active=M?!1:this.tabs.index(I),this.active=k?g():I,this.xhr&&this.xhr.abort(),!W.length&&!K.length&&g.error("jQuery UI Tabs: Mismatching fragment identifier."),K.length&&this.load(this.tabs.index(I),d),this._toggle(d,q))},_toggle:function(d,w){var C=this,b=w.newPanel,I=w.oldPanel;this.running=!0;function k(){C.running=!1,C._trigger("activate",d,w)}function M(){C._addClass(w.newTab.closest("li"),"ui-tabs-active","ui-state-active"),b.length&&C.options.show?C._show(b,C.options.show,k):(b.show(),k())}I.length&&this.options.hide?this._hide(I,this.options.hide,function(){C._removeClass(w.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),M()}):(this._removeClass(w.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),I.hide(),M()),I.attr("aria-hidden","true"),w.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),b.length&&I.length?w.oldTab.attr("tabIndex",-1):b.length&&this.tabs.filter(function(){return g(this).attr("tabIndex")===0}).attr("tabIndex",-1),b.attr("aria-hidden","false"),w.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(d){var w,C=this._findActive(d);C[0]!==this.active[0]&&(C.length||(C=this.active),w=C.find(".ui-tabs-anchor")[0],this._eventHandler({target:w,currentTarget:w,preventDefault:g.noop}))},_findActive:function(d){return d===!1?g():this.tabs.eq(d)},_getIndex:function(d){return typeof d=="string"&&(d=this.anchors.index(this.anchors.filter("[href$='"+g.escapeSelector(d)+"']"))),d},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){g.data(this,"ui-tabs-destroy")?g(this).remove():g(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var d=g(this),w=d.data("ui-tabs-aria-controls");w?d.attr("aria-controls",w).removeData("ui-tabs-aria-controls"):d.removeAttr("aria-controls")}),this.panels.show(),this.options.heightStyle!=="content"&&this.panels.css("height","")},enable:function(d){var w=this.options.disabled;w!==!1&&(d===void 0?w=!1:(d=this._getIndex(d),Array.isArray(w)?w=g.map(w,function(C){return C!==d?C:null}):w=g.map(this.tabs,function(C,b){return b!==d?b:null})),this._setOptionDisabled(w))},disable:function(d){var w=this.options.disabled;if(w!==!0){if(d===void 0)w=!0;else{if(d=this._getIndex(d),g.inArray(d,w)!==-1)return;Array.isArray(w)?w=g.merge([d],w).sort():w=[d]}this._setOptionDisabled(w)}},load:function(d,w){d=this._getIndex(d);var C=this,b=this.tabs.eq(d),I=b.find(".ui-tabs-anchor"),k=this._getPanelForTab(b),M={tab:b,panel:k},K=function(W,q){q==="abort"&&C.panels.stop(!1,!0),C._removeClass(b,"ui-tabs-loading"),k.removeAttr("aria-busy"),W===C.xhr&&delete C.xhr};this._isLocal(I[0])||(this.xhr=g.ajax(this._ajaxSettings(I,w,M)),this.xhr&&this.xhr.statusText!=="canceled"&&(this._addClass(b,"ui-tabs-loading"),k.attr("aria-busy","true"),this.xhr.done(function(W,q,te){setTimeout(function(){k.html(W),C._trigger("load",w,M),K(te,q)},1)}).fail(function(W,q){setTimeout(function(){K(W,q)},1)})))},_ajaxSettings:function(d,w,C){var b=this;return{url:d.attr("href").replace(/#.*$/,""),beforeSend:function(I,k){return b._trigger("beforeLoad",w,g.extend({jqXHR:I,ajaxSettings:k},C))}}},_getPanelForTab:function(d){var w=g(d).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+w))}}),g.uiBackCompat!==!1&&g.widget("ui.tabs",g.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),g.ui.tabs;/*!
+ * jQuery UI Tooltip 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.tooltip",{version:"1.13.2",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var d=g(this).attr("title");return g("<a>").text(d).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(d,w){var C=(d.attr("aria-describedby")||"").split(/\s+/);C.push(w),d.data("ui-tooltip-id",w).attr("aria-describedby",String.prototype.trim.call(C.join(" ")))},_removeDescribedBy:function(d){var w=d.data("ui-tooltip-id"),C=(d.attr("aria-describedby")||"").split(/\s+/),b=g.inArray(w,C);b!==-1&&C.splice(b,1),d.removeData("ui-tooltip-id"),C=String.prototype.trim.call(C.join(" ")),C?d.attr("aria-describedby",C):d.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=g("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=g([])},_setOption:function(d,w){var C=this;this._super(d,w),d==="content"&&g.each(this.tooltips,function(b,I){C._updateContent(I.element)})},_setOptionDisabled:function(d){this[d?"_disable":"_enable"]()},_disable:function(){var d=this;g.each(this.tooltips,function(w,C){var b=g.Event("blur");b.target=b.currentTarget=C.element[0],d.close(b,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var w=g(this);if(w.is("[title]"))return w.data("ui-tooltip-title",w.attr("title")).removeAttr("title")}))},_enable:function(){this.disabledTitles.each(function(){var d=g(this);d.data("ui-tooltip-title")&&d.attr("title",d.data("ui-tooltip-title"))}),this.disabledTitles=g([])},open:function(d){var w=this,C=g(d?d.target:this.element).closest(this.options.items);!C.length||C.data("ui-tooltip-id")||(C.attr("title")&&C.data("ui-tooltip-title",C.attr("title")),C.data("ui-tooltip-open",!0),d&&d.type==="mouseover"&&C.parents().each(function(){var b=g(this),I;b.data("ui-tooltip-open")&&(I=g.Event("blur"),I.target=I.currentTarget=this,w.close(I,!0)),b.attr("title")&&(b.uniqueId(),w.parents[this.id]={element:this,title:b.attr("title")},b.attr("title",""))}),this._registerCloseHandlers(d,C),this._updateContent(C,d))},_updateContent:function(d,w){var C,b=this.options.content,I=this,k=w?w.type:null;if(typeof b=="string"||b.nodeType||b.jquery)return this._open(w,d,b);C=b.call(d[0],function(M){I._delay(function(){d.data("ui-tooltip-open")&&(w&&(w.type=k),this._open(w,d,M))})}),C&&this._open(w,d,C)},_open:function(d,w,C){var b,I,k,M,K=g.extend({},this.options.position);if(!C)return;if(b=this._find(w),b){b.tooltip.find(".ui-tooltip-content").html(C);return}w.is("[title]")&&(d&&d.type==="mouseover"?w.attr("title",""):w.removeAttr("title")),b=this._tooltip(w),I=b.tooltip,this._addDescribedBy(w,I.attr("id")),I.find(".ui-tooltip-content").html(C),this.liveRegion.children().hide(),M=g("<div>").html(I.find(".ui-tooltip-content").html()),M.removeAttr("name").find("[name]").removeAttr("name"),M.removeAttr("id").find("[id]").removeAttr("id"),M.appendTo(this.liveRegion);function W(q){K.of=q,!I.is(":hidden")&&I.position(K)}this.options.track&&d&&/^mouse/.test(d.type)?(this._on(this.document,{mousemove:W}),W(d)):I.position(g.extend({of:w},this.options.position)),I.hide(),this._show(I,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(k=this.delayedShow=setInterval(function(){I.is(":visible")&&(W(K.of),clearInterval(k))},13)),this._trigger("open",d,{tooltip:I})},_registerCloseHandlers:function(d,w){var C={keyup:function(b){if(b.keyCode===g.ui.keyCode.ESCAPE){var I=g.Event(b);I.currentTarget=w[0],this.close(I,!0)}}};w[0]!==this.element[0]&&(C.remove=function(){var b=this._find(w);b&&this._removeTooltip(b.tooltip)}),(!d||d.type==="mouseover")&&(C.mouseleave="close"),(!d||d.type==="focusin")&&(C.focusout="close"),this._on(!0,w,C)},close:function(d){var w,C=this,b=g(d?d.currentTarget:this.element),I=this._find(b);if(!I){b.removeData("ui-tooltip-open");return}w=I.tooltip,!I.closing&&(clearInterval(this.delayedShow),b.data("ui-tooltip-title")&&!b.attr("title")&&b.attr("title",b.data("ui-tooltip-title")),this._removeDescribedBy(b),I.hiding=!0,w.stop(!0),this._hide(w,this.options.hide,function(){C._removeTooltip(g(this))}),b.removeData("ui-tooltip-open"),this._off(b,"mouseleave focusout keyup"),b[0]!==this.element[0]&&this._off(b,"remove"),this._off(this.document,"mousemove"),d&&d.type==="mouseleave"&&g.each(this.parents,function(k,M){g(M.element).attr("title",M.title),delete C.parents[k]}),I.closing=!0,this._trigger("close",d,{tooltip:w}),I.hiding||(I.closing=!1))},_tooltip:function(d){var w=g("<div>").attr("role","tooltip"),C=g("<div>").appendTo(w),b=w.uniqueId().attr("id");return this._addClass(C,"ui-tooltip-content"),this._addClass(w,"ui-tooltip","ui-widget ui-widget-content"),w.appendTo(this._appendTo(d)),this.tooltips[b]={element:d,tooltip:w}},_find:function(d){var w=d.data("ui-tooltip-id");return w?this.tooltips[w]:null},_removeTooltip:function(d){clearInterval(this.delayedShow),d.remove(),delete this.tooltips[d.attr("id")]},_appendTo:function(d){var w=d.closest(".ui-front, dialog");return w.length||(w=this.document[0].body),w},_destroy:function(){var d=this;g.each(this.tooltips,function(w,C){var b=g.Event("blur"),I=C.element;b.target=b.currentTarget=I[0],d.close(b,!0),g("#"+w).remove(),I.data("ui-tooltip-title")&&(I.attr("title")||I.attr("title",I.data("ui-tooltip-title")),I.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),g.uiBackCompat!==!1&&g.widget("ui.tooltip",g.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var d=this._superApply(arguments);return this.options.tooltipClass&&d.tooltip.addClass(this.options.tooltipClass),d}}),g.ui.tooltip});/*! jQuery UI - v1.13.2 - 2022-07-14
+* http://jqueryui.com
+* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */(function(g){typeof define=="function"&&define.amd?define(["jquery"],g):g($)})(function(g){g.ui=g.ui||{},g.ui.version="1.13.2";/*!
+ * jQuery UI Widget 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */var B=0,x=Array.prototype.hasOwnProperty,Q=Array.prototype.slice;g.cleanData=function(d){return function(w){var C,b,I;for(I=0;(b=w[I])!=null;I++)C=g._data(b,"events"),C&&C.remove&&g(b).triggerHandler("remove");d(w)}}(g.cleanData),g.widget=function(d,w,C){var b,I,k,M={},K=d.split(".")[0];d=d.split(".")[1];var W=K+"-"+d;return C||(C=w,w=g.Widget),Array.isArray(C)&&(C=g.extend.apply(null,[{}].concat(C))),g.expr.pseudos[W.toLowerCase()]=function(q){return!!g.data(q,W)},g[K]=g[K]||{},b=g[K][d],I=g[K][d]=function(q,te){if(!this||!this._createWidget)return new I(q,te);arguments.length&&this._createWidget(q,te)},g.extend(I,b,{version:C.version,_proto:g.extend({},C),_childConstructors:[]}),k=new w,k.options=g.widget.extend({},k.options),g.each(C,function(q,te){if(typeof te!="function"){M[q]=te;return}M[q]=function(){function he(){return w.prototype[q].apply(this,arguments)}function ne(ie){return w.prototype[q].apply(this,ie)}return function(){var ie=this._super,re=this._superApply,ce;return this._super=he,this._superApply=ne,ce=te.apply(this,arguments),this._super=ie,this._superApply=re,ce}}()}),I.prototype=g.widget.extend(k,{widgetEventPrefix:b&&k.widgetEventPrefix||d},M,{constructor:I,namespace:K,widgetName:d,widgetFullName:W}),b?(g.each(b._childConstructors,function(q,te){var he=te.prototype;g.widget(he.namespace+"."+he.widgetName,I,te._proto)}),delete b._childConstructors):w._childConstructors.push(I),g.widget.bridge(d,I),I},g.widget.extend=function(d){for(var w=Q.call(arguments,1),C=0,b=w.length,I,k;C<b;C++)for(I in w[C])k=w[C][I],x.call(w[C],I)&&k!==void 0&&(g.isPlainObject(k)?d[I]=g.isPlainObject(d[I])?g.widget.extend({},d[I],k):g.widget.extend({},k):d[I]=k);return d},g.widget.bridge=function(d,w){var C=w.prototype.widgetFullName||d;g.fn[d]=function(b){var I=typeof b=="string",k=Q.call(arguments,1),M=this;return I?!this.length&&b==="instance"?M=void 0:this.each(function(){var K,W=g.data(this,C);if(b==="instance")return M=W,!1;if(!W)return g.error("cannot call methods on "+d+" prior to initialization; attempted to call method '"+b+"'");if(typeof W[b]!="function"||b.charAt(0)==="_")return g.error("no such method '"+b+"' for "+d+" widget instance");if(K=W[b].apply(W,k),K!==W&&K!==void 0)return M=K&&K.jquery?M.pushStack(K.get()):K,!1}):(k.length&&(b=g.widget.extend.apply(null,[b].concat(k))),this.each(function(){var K=g.data(this,C);K?(K.option(b||{}),K._init&&K._init()):g.data(this,C,new w(b,this))})),M}},g.Widget=function(){},g.Widget._childConstructors=[],g.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(d,w){w=g(w||this.defaultElement||this)[0],this.element=g(w),this.uuid=B++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=g(),this.hoverable=g(),this.focusable=g(),this.classesElementLookup={},w!==this&&(g.data(w,this.widgetFullName,this),this._on(!0,this.element,{remove:function(C){C.target===w&&this.destroy()}}),this.document=g(w.style?w.ownerDocument:w.document||w),this.window=g(this.document[0].defaultView||this.document[0].parentWindow)),this.options=g.widget.extend({},this.options,this._getCreateOptions(),d),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:g.noop,_create:g.noop,_init:g.noop,destroy:function(){var d=this;this._destroy(),g.each(this.classesElementLookup,function(w,C){d._removeClass(C,w)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:g.noop,widget:function(){return this.element},option:function(d,w){var C=d,b,I,k;if(arguments.length===0)return g.widget.extend({},this.options);if(typeof d=="string")if(C={},b=d.split("."),d=b.shift(),b.length){for(I=C[d]=g.widget.extend({},this.options[d]),k=0;k<b.length-1;k++)I[b[k]]=I[b[k]]||{},I=I[b[k]];if(d=b.pop(),arguments.length===1)return I[d]===void 0?null:I[d];I[d]=w}else{if(arguments.length===1)return this.options[d]===void 0?null:this.options[d];C[d]=w}return this._setOptions(C),this},_setOptions:function(d){var w;for(w in d)this._setOption(w,d[w]);return this},_setOption:function(d,w){return d==="classes"&&this._setOptionClasses(w),this.options[d]=w,d==="disabled"&&this._setOptionDisabled(w),this},_setOptionClasses:function(d){var w,C,b;for(w in d)b=this.classesElementLookup[w],!(d[w]===this.options.classes[w]||!b||!b.length)&&(C=g(b.get()),this._removeClass(b,w),C.addClass(this._classes({element:C,keys:w,classes:d,add:!0})))},_setOptionDisabled:function(d){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!d),d&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(d){var w=[],C=this;d=g.extend({element:this.element,classes:this.options.classes||{}},d);function b(){var k=[];d.element.each(function(M,K){var W=g.map(C.classesElementLookup,function(q){return q}).some(function(q){return q.is(K)});W||k.push(K)}),C._on(g(k),{remove:"_untrackClassesElement"})}function I(k,M){var K,W;for(W=0;W<k.length;W++)K=C.classesElementLookup[k[W]]||g(),d.add?(b(),K=g(g.uniqueSort(K.get().concat(d.element.get())))):K=g(K.not(d.element).get()),C.classesElementLookup[k[W]]=K,w.push(k[W]),M&&d.classes[k[W]]&&w.push(d.classes[k[W]])}return d.keys&&I(d.keys.match(/\S+/g)||[],!0),d.extra&&I(d.extra.match(/\S+/g)||[]),w.join(" ")},_untrackClassesElement:function(d){var w=this;g.each(w.classesElementLookup,function(C,b){g.inArray(d.target,b)!==-1&&(w.classesElementLookup[C]=g(b.not(d.target).get()))}),this._off(g(d.target))},_removeClass:function(d,w,C){return this._toggleClass(d,w,C,!1)},_addClass:function(d,w,C){return this._toggleClass(d,w,C,!0)},_toggleClass:function(d,w,C,b){b=typeof b=="boolean"?b:C;var I=typeof d=="string"||d===null,k={extra:I?w:C,keys:I?d:w,element:I?this.element:d,add:b};return k.element.toggleClass(this._classes(k),b),this},_on:function(d,w,C){var b,I=this;typeof d!="boolean"&&(C=w,w=d,d=!1),C?(w=b=g(w),this.bindings=this.bindings.add(w)):(C=w,w=this.element,b=this.widget()),g.each(C,function(k,M){function K(){if(!(!d&&(I.options.disabled===!0||g(this).hasClass("ui-state-disabled"))))return(typeof M=="string"?I[M]:M).apply(I,arguments)}typeof M!="string"&&(K.guid=M.guid=M.guid||K.guid||g.guid++);var W=k.match(/^([\w:-]*)\s*(.*)$/),q=W[1]+I.eventNamespace,te=W[2];te?b.on(q,te,K):w.on(q,K)})},_off:function(d,w){w=(w||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,d.off(w),this.bindings=g(this.bindings.not(d).get()),this.focusable=g(this.focusable.not(d).get()),this.hoverable=g(this.hoverable.not(d).get())},_delay:function(d,w){function C(){return(typeof d=="string"?b[d]:d).apply(b,arguments)}var b=this;return setTimeout(C,w||0)},_hoverable:function(d){this.hoverable=this.hoverable.add(d),this._on(d,{mouseenter:function(w){this._addClass(g(w.currentTarget),null,"ui-state-hover")},mouseleave:function(w){this._removeClass(g(w.currentTarget),null,"ui-state-hover")}})},_focusable:function(d){this.focusable=this.focusable.add(d),this._on(d,{focusin:function(w){this._addClass(g(w.currentTarget),null,"ui-state-focus")},focusout:function(w){this._removeClass(g(w.currentTarget),null,"ui-state-focus")}})},_trigger:function(d,w,C){var b,I,k=this.options[d];if(C=C||{},w=g.Event(w),w.type=(d===this.widgetEventPrefix?d:this.widgetEventPrefix+d).toLowerCase(),w.target=this.element[0],I=w.originalEvent,I)for(b in I)b in w||(w[b]=I[b]);return this.element.trigger(w,C),!(typeof k=="function"&&k.apply(this.element[0],[w].concat(C))===!1||w.isDefaultPrevented())}},g.each({show:"fadeIn",hide:"fadeOut"},function(d,w){g.Widget.prototype["_"+d]=function(C,b,I){typeof b=="string"&&(b={effect:b});var k,M=b?b===!0||typeof b=="number"?w:b.effect||w:d;b=b||{},typeof b=="number"?b={duration:b}:b===!0&&(b={}),k=!g.isEmptyObject(b),b.complete=I,b.delay&&C.delay(b.delay),k&&g.effects&&g.effects.effect[M]?C[d](b):M!==d&&C[M]?C[M](b.duration,b.easing,I):C.queue(function(K){g(this)[d](),I&&I.call(C[0]),K()})}}),g.widget;/*!
+ * jQuery UI Position 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/position/
+ */(function(){var d,w=Math.max,C=Math.abs,b=/left|center|right/,I=/top|center|bottom/,k=/[\+\-]\d+(\.[\d]+)?%?/,M=/^\w+/,K=/%$/,W=g.fn.position;function q(ie,re,ce){return[parseFloat(ie[0])*(K.test(ie[0])?re/100:1),parseFloat(ie[1])*(K.test(ie[1])?ce/100:1)]}function te(ie,re){return parseInt(g.css(ie,re),10)||0}function he(ie){return ie!=null&&ie===ie.window}function ne(ie){var re=ie[0];return re.nodeType===9?{width:ie.width(),height:ie.height(),offset:{top:0,left:0}}:he(re)?{width:ie.width(),height:ie.height(),offset:{top:ie.scrollTop(),left:ie.scrollLeft()}}:re.preventDefault?{width:0,height:0,offset:{top:re.pageY,left:re.pageX}}:{width:ie.outerWidth(),height:ie.outerHeight(),offset:ie.offset()}}g.position={scrollbarWidth:function(){if(d!==void 0)return d;var ie,re,ce=g("<div style='display:block;position:absolute;width:200px;height:200px;overflow:hidden;'><div style='height:300px;width:auto;'></div></div>"),Be=ce.children()[0];return g("body").append(ce),ie=Be.offsetWidth,ce.css("overflow","scroll"),re=Be.offsetWidth,ie===re&&(re=ce[0].clientWidth),ce.remove(),d=ie-re},getScrollInfo:function(ie){var re=ie.isWindow||ie.isDocument?"":ie.element.css("overflow-x"),ce=ie.isWindow||ie.isDocument?"":ie.element.css("overflow-y"),Be=re==="scroll"||re==="auto"&&ie.width<ie.element[0].scrollWidth,Fe=ce==="scroll"||ce==="auto"&&ie.height<ie.element[0].scrollHeight;return{width:Fe?g.position.scrollbarWidth():0,height:Be?g.position.scrollbarWidth():0}},getWithinInfo:function(ie){var re=g(ie||window),ce=he(re[0]),Be=!!re[0]&&re[0].nodeType===9,Fe=!ce&&!Be;return{element:re,isWindow:ce,isDocument:Be,offset:Fe?g(ie).offset():{left:0,top:0},scrollLeft:re.scrollLeft(),scrollTop:re.scrollTop(),width:re.outerWidth(),height:re.outerHeight()}}},g.fn.position=function(ie){if(!ie||!ie.of)return W.apply(this,arguments);ie=g.extend({},ie);var re,ce,Be,Fe,Te,Ne,Oe=typeof ie.of=="string"?g(document).find(ie.of):g(ie.of),De=g.position.getWithinInfo(ie.within),et=g.position.getScrollInfo(De),Ye=(ie.collision||"flip").split(" "),qe={};return Ne=ne(Oe),Oe[0].preventDefault&&(ie.at="left top"),ce=Ne.width,Be=Ne.height,Fe=Ne.offset,Te=g.extend({},Fe),g.each(["my","at"],function(){var Xe=(ie[this]||"").split(" "),rt,$e;Xe.length===1&&(Xe=b.test(Xe[0])?Xe.concat(["center"]):I.test(Xe[0])?["center"].concat(Xe):["center","center"]),Xe[0]=b.test(Xe[0])?Xe[0]:"center",Xe[1]=I.test(Xe[1])?Xe[1]:"center",rt=k.exec(Xe[0]),$e=k.exec(Xe[1]),qe[this]=[rt?rt[0]:0,$e?$e[0]:0],ie[this]=[M.exec(Xe[0])[0],M.exec(Xe[1])[0]]}),Ye.length===1&&(Ye[1]=Ye[0]),ie.at[0]==="right"?Te.left+=ce:ie.at[0]==="center"&&(Te.left+=ce/2),ie.at[1]==="bottom"?Te.top+=Be:ie.at[1]==="center"&&(Te.top+=Be/2),re=q(qe.at,ce,Be),Te.left+=re[0],Te.top+=re[1],this.each(function(){var Xe,rt,$e=g(this),pt=$e.outerWidth(),gt=$e.outerHeight(),Qt=te(this,"marginLeft"),xt=te(this,"marginTop"),qt=pt+Qt+te(this,"marginRight")+et.width,_t=gt+xt+te(this,"marginBottom")+et.height,Ge=g.extend({},Te),Kt=q(qe.my,$e.outerWidth(),$e.outerHeight());ie.my[0]==="right"?Ge.left-=pt:ie.my[0]==="center"&&(Ge.left-=pt/2),ie.my[1]==="bottom"?Ge.top-=gt:ie.my[1]==="center"&&(Ge.top-=gt/2),Ge.left+=Kt[0],Ge.top+=Kt[1],Xe={marginLeft:Qt,marginTop:xt},g.each(["left","top"],function(At,Ct){g.ui.position[Ye[At]]&&g.ui.position[Ye[At]][Ct](Ge,{targetWidth:ce,targetHeight:Be,elemWidth:pt,elemHeight:gt,collisionPosition:Xe,collisionWidth:qt,collisionHeight:_t,offset:[re[0]+Kt[0],re[1]+Kt[1]],my:ie.my,at:ie.at,within:De,elem:$e})}),ie.using&&(rt=function(At){var Ct=Fe.left-Ge.left,bt=Ct+ce-pt,kt=Fe.top-Ge.top,zt=kt+Be-gt,St={target:{element:Oe,left:Fe.left,top:Fe.top,width:ce,height:Be},element:{element:$e,left:Ge.left,top:Ge.top,width:pt,height:gt},horizontal:bt<0?"left":Ct>0?"right":"center",vertical:zt<0?"top":kt>0?"bottom":"middle"};ce<pt&&C(Ct+bt)<ce&&(St.horizontal="center"),Be<gt&&C(kt+zt)<Be&&(St.vertical="middle"),w(C(Ct),C(bt))>w(C(kt),C(zt))?St.important="horizontal":St.important="vertical",ie.using.call(this,At,St)}),$e.offset(g.extend(Ge,{using:rt}))})},g.ui.position={fit:{left:function(ie,re){var ce=re.within,Be=ce.isWindow?ce.scrollLeft:ce.offset.left,Fe=ce.width,Te=ie.left-re.collisionPosition.marginLeft,Ne=Be-Te,Oe=Te+re.collisionWidth-Fe-Be,De;re.collisionWidth>Fe?Ne>0&&Oe<=0?(De=ie.left+Ne+re.collisionWidth-Fe-Be,ie.left+=Ne-De):Oe>0&&Ne<=0?ie.left=Be:Ne>Oe?ie.left=Be+Fe-re.collisionWidth:ie.left=Be:Ne>0?ie.left+=Ne:Oe>0?ie.left-=Oe:ie.left=w(ie.left-Te,ie.left)},top:function(ie,re){var ce=re.within,Be=ce.isWindow?ce.scrollTop:ce.offset.top,Fe=re.within.height,Te=ie.top-re.collisionPosition.marginTop,Ne=Be-Te,Oe=Te+re.collisionHeight-Fe-Be,De;re.collisionHeight>Fe?Ne>0&&Oe<=0?(De=ie.top+Ne+re.collisionHeight-Fe-Be,ie.top+=Ne-De):Oe>0&&Ne<=0?ie.top=Be:Ne>Oe?ie.top=Be+Fe-re.collisionHeight:ie.top=Be:Ne>0?ie.top+=Ne:Oe>0?ie.top-=Oe:ie.top=w(ie.top-Te,ie.top)}},flip:{left:function(ie,re){var ce=re.within,Be=ce.offset.left+ce.scrollLeft,Fe=ce.width,Te=ce.isWindow?ce.scrollLeft:ce.offset.left,Ne=ie.left-re.collisionPosition.marginLeft,Oe=Ne-Te,De=Ne+re.collisionWidth-Fe-Te,et=re.my[0]==="left"?-re.elemWidth:re.my[0]==="right"?re.elemWidth:0,Ye=re.at[0]==="left"?re.targetWidth:re.at[0]==="right"?-re.targetWidth:0,qe=-2*re.offset[0],Xe,rt;Oe<0?(Xe=ie.left+et+Ye+qe+re.collisionWidth-Fe-Be,(Xe<0||Xe<C(Oe))&&(ie.left+=et+Ye+qe)):De>0&&(rt=ie.left-re.collisionPosition.marginLeft+et+Ye+qe-Te,(rt>0||C(rt)<De)&&(ie.left+=et+Ye+qe))},top:function(ie,re){var ce=re.within,Be=ce.offset.top+ce.scrollTop,Fe=ce.height,Te=ce.isWindow?ce.scrollTop:ce.offset.top,Ne=ie.top-re.collisionPosition.marginTop,Oe=Ne-Te,De=Ne+re.collisionHeight-Fe-Te,et=re.my[1]==="top",Ye=et?-re.elemHeight:re.my[1]==="bottom"?re.elemHeight:0,qe=re.at[1]==="top"?re.targetHeight:re.at[1]==="bottom"?-re.targetHeight:0,Xe=-2*re.offset[1],rt,$e;Oe<0?($e=ie.top+Ye+qe+Xe+re.collisionHeight-Fe-Be,($e<0||$e<C(Oe))&&(ie.top+=Ye+qe+Xe)):De>0&&(rt=ie.top-re.collisionPosition.marginTop+Ye+qe+Xe-Te,(rt>0||C(rt)<De)&&(ie.top+=Ye+qe+Xe))}},flipfit:{left:function(){g.ui.position.flip.left.apply(this,arguments),g.ui.position.fit.left.apply(this,arguments)},top:function(){g.ui.position.flip.top.apply(this,arguments),g.ui.position.fit.top.apply(this,arguments)}}}})(),g.ui.position;/*!
+ * jQuery UI :data 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.extend(g.expr.pseudos,{data:g.expr.createPseudo?g.expr.createPseudo(function(d){return function(w){return!!g.data(w,d)}}):function(d,w,C){return!!g.data(d,C[3])}});/*!
+ * jQuery UI Disable Selection 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.fn.extend({disableSelection:function(){var d="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(d+".ui-disableSelection",function(w){w.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}});var S=g;/*!
+ * jQuery Color Animations v2.2.0
+ * https://github.com/jquery/jquery-color
+ *
+ * Copyright OpenJS Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * Date: Sun May 10 09:02:36 2020 +0200
+ */var D="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",H={},P=H.toString,R=/^([\-+])=\s*(\d+\.?\d*)/,Y=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(d){return[d[1],d[2],d[3],d[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(d){return[d[1]*2.55,d[2]*2.55,d[3]*2.55,d[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})?/,parse:function(d){return[parseInt(d[1],16),parseInt(d[2],16),parseInt(d[3],16),d[4]?(parseInt(d[4],16)/255).toFixed(2):1]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])([a-f0-9])?/,parse:function(d){return[parseInt(d[1]+d[1],16),parseInt(d[2]+d[2],16),parseInt(d[3]+d[3],16),d[4]?(parseInt(d[4]+d[4],16)/255).toFixed(2):1]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(d){return[d[1],d[2]/100,d[3]/100,d[4]]}}],G=S.Color=function(d,w,C,b){return new S.Color.fn.parse(d,w,C,b)},X={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},ee={byte:{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},Ae=G.support={},le=S("<p>")[0],ae,ge=S.each;le.style.cssText="background-color:rgba(1,1,1,.5)",Ae.rgba=le.style.backgroundColor.indexOf("rgba")>-1,ge(X,function(d,w){w.cache="_"+d,w.props.alpha={idx:3,type:"percent",def:1}}),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(d,w){H["[object "+w+"]"]=w.toLowerCase()});function fe(d){return d==null?d+"":typeof d=="object"?H[P.call(d)]||"object":typeof d}function ye(d,w,C){var b=ee[w.type]||{};return d==null?C||!w.def?null:w.def:(d=b.floor?~~d:parseFloat(d),isNaN(d)?w.def:b.mod?(d+b.mod)%b.mod:Math.min(b.max,Math.max(0,d)))}function me(d){var w=G(),C=w._rgba=[];return d=d.toLowerCase(),ge(Y,function(b,I){var k,M=I.re.exec(d),K=M&&I.parse(M),W=I.space||"rgba";if(K)return k=w[W](K),w[X[W].cache]=k[X[W].cache],C=w._rgba=k._rgba,!1}),C.length?(C.join()==="0,0,0,0"&&S.extend(C,ae.transparent),w):ae[d]}G.fn=S.extend(G.prototype,{parse:function(d,w,C,b){if(d===void 0)return this._rgba=[null,null,null,null],this;(d.jquery||d.nodeType)&&(d=S(d).css(w),w=void 0);var I=this,k=fe(d),M=this._rgba=[];if(w!==void 0&&(d=[d,w,C,b],k="array"),k==="string")return this.parse(me(d)||ae._default);if(k==="array")return ge(X.rgba.props,function(K,W){M[W.idx]=ye(d[W.idx],W)}),this;if(k==="object")return d instanceof G?ge(X,function(K,W){d[W.cache]&&(I[W.cache]=d[W.cache].slice())}):ge(X,function(K,W){var q=W.cache;ge(W.props,function(te,he){if(!I[q]&&W.to){if(te==="alpha"||d[te]==null)return;I[q]=W.to(I._rgba)}I[q][he.idx]=ye(d[te],he,!0)}),I[q]&&S.inArray(null,I[q].slice(0,3))<0&&(I[q][3]==null&&(I[q][3]=1),W.from&&(I._rgba=W.from(I[q])))}),this},is:function(d){var w=G(d),C=!0,b=this;return ge(X,function(I,k){var M,K=w[k.cache];return K&&(M=b[k.cache]||k.to&&k.to(b._rgba)||[],ge(k.props,function(W,q){if(K[q.idx]!=null)return C=K[q.idx]===M[q.idx],C})),C}),C},_space:function(){var d=[],w=this;return ge(X,function(C,b){w[b.cache]&&d.push(C)}),d.pop()},transition:function(d,w){var C=G(d),b=C._space(),I=X[b],k=this.alpha()===0?G("transparent"):this,M=k[I.cache]||I.to(k._rgba),K=M.slice();return C=C[I.cache],ge(I.props,function(W,q){var te=q.idx,he=M[te],ne=C[te],ie=ee[q.type]||{};ne!==null&&(he===null?K[te]=ne:(ie.mod&&(ne-he>ie.mod/2?he+=ie.mod:he-ne>ie.mod/2&&(he-=ie.mod)),K[te]=ye((ne-he)*w+he,q)))}),this[b](K)},blend:function(d){if(this._rgba[3]===1)return this;var w=this._rgba.slice(),C=w.pop(),b=G(d)._rgba;return G(S.map(w,function(I,k){return(1-C)*b[k]+C*I}))},toRgbaString:function(){var d="rgba(",w=S.map(this._rgba,function(C,b){return C??(b>2?1:0)});return w[3]===1&&(w.pop(),d="rgb("),d+w.join()+")"},toHslaString:function(){var d="hsla(",w=S.map(this.hsla(),function(C,b){return C==null&&(C=b>2?1:0),b&&b<3&&(C=Math.round(C*100)+"%"),C});return w[3]===1&&(w.pop(),d="hsl("),d+w.join()+")"},toHexString:function(d){var w=this._rgba.slice(),C=w.pop();return d&&w.push(~~(C*255)),"#"+S.map(w,function(b){return b=(b||0).toString(16),b.length===1?"0"+b:b}).join("")},toString:function(){return this._rgba[3]===0?"transparent":this.toRgbaString()}}),G.fn.parse.prototype=G.fn;function we(d,w,C){return C=(C+1)%1,C*6<1?d+(w-d)*C*6:C*2<1?w:C*3<2?d+(w-d)*(2/3-C)*6:d}X.hsla.to=function(d){if(d[0]==null||d[1]==null||d[2]==null)return[null,null,null,d[3]];var w=d[0]/255,C=d[1]/255,b=d[2]/255,I=d[3],k=Math.max(w,C,b),M=Math.min(w,C,b),K=k-M,W=k+M,q=W*.5,te,he;return M===k?te=0:w===k?te=60*(C-b)/K+360:C===k?te=60*(b-w)/K+120:te=60*(w-C)/K+240,K===0?he=0:q<=.5?he=K/W:he=K/(2-W),[Math.round(te)%360,he,q,I??1]},X.hsla.from=function(d){if(d[0]==null||d[1]==null||d[2]==null)return[null,null,null,d[3]];var w=d[0]/360,C=d[1],b=d[2],I=d[3],k=b<=.5?b*(1+C):b+C-b*C,M=2*b-k;return[Math.round(we(M,k,w+1/3)*255),Math.round(we(M,k,w)*255),Math.round(we(M,k,w-1/3)*255),I]},ge(X,function(d,w){var C=w.props,b=w.cache,I=w.to,k=w.from;G.fn[d]=function(M){if(I&&!this[b]&&(this[b]=I(this._rgba)),M===void 0)return this[b].slice();var K,W=fe(M),q=W==="array"||W==="object"?M:arguments,te=this[b].slice();return ge(C,function(he,ne){var ie=q[W==="object"?he:ne.idx];ie==null&&(ie=te[ne.idx]),te[ne.idx]=ye(ie,ne)}),k?(K=G(k(te)),K[b]=te,K):G(te)},ge(C,function(M,K){G.fn[M]||(G.fn[M]=function(W){var q,te,he,ne,ie=fe(W);return M==="alpha"?ne=this._hsla?"hsla":"rgba":ne=d,q=this[ne](),te=q[K.idx],ie==="undefined"?te:(ie==="function"&&(W=W.call(this,te),ie=fe(W)),W==null&&K.empty?this:(ie==="string"&&(he=R.exec(W),he&&(W=te+parseFloat(he[2])*(he[1]==="+"?1:-1))),q[K.idx]=W,this[ne](q)))})})}),G.hook=function(d){var w=d.split(" ");ge(w,function(C,b){S.cssHooks[b]={set:function(I,k){var M,K,W="";if(k!=="transparent"&&(fe(k)!=="string"||(M=me(k)))){if(k=G(M||k),!Ae.rgba&&k._rgba[3]!==1){for(K=b==="backgroundColor"?I.parentNode:I;(W===""||W==="transparent")&&K&&K.style;)try{W=S.css(K,"backgroundColor"),K=K.parentNode}catch{}k=k.blend(W&&W!=="transparent"?W:"_default")}k=k.toRgbaString()}try{I.style[b]=k}catch{}}},S.fx.step[b]=function(I){I.colorInit||(I.start=G(I.elem,b),I.end=G(I.end),I.colorInit=!0),S.cssHooks[b].set(I.elem,I.start.transition(I.end,I.pos))}})},G.hook(D),S.cssHooks.borderColor={expand:function(d){var w={};return ge(["Top","Right","Bottom","Left"],function(C,b){w["border"+b+"Color"]=d}),w}},ae=S.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"};/*!
+ * jQuery UI Effects 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */var ve="ui-effects-",Ce="ui-effects-style",Se="ui-effects-animated";g.effects={effect:{}},function(){var d=["add","remove","toggle"],w={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};g.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(k,M){g.fx.step[M]=function(K){(K.end!=="none"&&!K.setAttr||K.pos===1&&!K.setAttr)&&(S.style(K.elem,M,K.end),K.setAttr=!0)}});function C(k){return k.replace(/-([\da-z])/gi,function(M,K){return K.toUpperCase()})}function b(k){var M,K,W=k.ownerDocument.defaultView?k.ownerDocument.defaultView.getComputedStyle(k,null):k.currentStyle,q={};if(W&&W.length&&W[0]&&W[W[0]])for(K=W.length;K--;)M=W[K],typeof W[M]=="string"&&(q[C(M)]=W[M]);else for(M in W)typeof W[M]=="string"&&(q[M]=W[M]);return q}function I(k,M){var K={},W,q;for(W in M)q=M[W],k[W]!==q&&(w[W]||(g.fx.step[W]||!isNaN(parseFloat(q)))&&(K[W]=q));return K}g.fn.addBack||(g.fn.addBack=function(k){return this.add(k==null?this.prevObject:this.prevObject.filter(k))}),g.effects.animateClass=function(k,M,K,W){var q=g.speed(M,K,W);return this.queue(function(){var te=g(this),he=te.attr("class")||"",ne,ie=q.children?te.find("*").addBack():te;ie=ie.map(function(){var re=g(this);return{el:re,start:b(this)}}),ne=function(){g.each(d,function(re,ce){k[ce]&&te[ce+"Class"](k[ce])})},ne(),ie=ie.map(function(){return this.end=b(this.el[0]),this.diff=I(this.start,this.end),this}),te.attr("class",he),ie=ie.map(function(){var re=this,ce=g.Deferred(),Be=g.extend({},q,{queue:!1,complete:function(){ce.resolve(re)}});return this.el.animate(this.diff,Be),ce.promise()}),g.when.apply(g,ie.get()).done(function(){ne(),g.each(arguments,function(){var re=this.el;g.each(this.diff,function(ce){re.css(ce,"")})}),q.complete.call(te[0])})})},g.fn.extend({addClass:function(k){return function(M,K,W,q){return K?g.effects.animateClass.call(this,{add:M},K,W,q):k.apply(this,arguments)}}(g.fn.addClass),removeClass:function(k){return function(M,K,W,q){return arguments.length>1?g.effects.animateClass.call(this,{remove:M},K,W,q):k.apply(this,arguments)}}(g.fn.removeClass),toggleClass:function(k){return function(M,K,W,q,te){return typeof K=="boolean"||K===void 0?W?g.effects.animateClass.call(this,K?{add:M}:{remove:M},W,q,te):k.apply(this,arguments):g.effects.animateClass.call(this,{toggle:M},K,W,q)}}(g.fn.toggleClass),switchClass:function(k,M,K,W,q){return g.effects.animateClass.call(this,{add:M,remove:k},K,W,q)}})}(),function(){g.expr&&g.expr.pseudos&&g.expr.pseudos.animated&&(g.expr.pseudos.animated=function(b){return function(I){return!!g(I).data(Se)||b(I)}}(g.expr.pseudos.animated)),g.uiBackCompat!==!1&&g.extend(g.effects,{save:function(b,I){for(var k=0,M=I.length;k<M;k++)I[k]!==null&&b.data(ve+I[k],b[0].style[I[k]])},restore:function(b,I){for(var k,M=0,K=I.length;M<K;M++)I[M]!==null&&(k=b.data(ve+I[M]),b.css(I[M],k))},setMode:function(b,I){return I==="toggle"&&(I=b.is(":hidden")?"show":"hide"),I},createWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return b.parent();var I={width:b.outerWidth(!0),height:b.outerHeight(!0),float:b.css("float")},k=g("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),M={width:b.width(),height:b.height()},K=document.activeElement;try{K.id}catch{K=document.body}return b.wrap(k),(b[0]===K||g.contains(b[0],K))&&g(K).trigger("focus"),k=b.parent(),b.css("position")==="static"?(k.css({position:"relative"}),b.css({position:"relative"})):(g.extend(I,{position:b.css("position"),zIndex:b.css("z-index")}),g.each(["top","left","bottom","right"],function(W,q){I[q]=b.css(q),isNaN(parseInt(I[q],10))&&(I[q]="auto")}),b.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),b.css(M),k.css(I).show()},removeWrapper:function(b){var I=document.activeElement;return b.parent().is(".ui-effects-wrapper")&&(b.parent().replaceWith(b),(b[0]===I||g.contains(b[0],I))&&g(I).trigger("focus")),b}}),g.extend(g.effects,{version:"1.13.2",define:function(b,I,k){return k||(k=I,I="effect"),g.effects.effect[b]=k,g.effects.effect[b].mode=I,k},scaledDimensions:function(b,I,k){if(I===0)return{height:0,width:0,outerHeight:0,outerWidth:0};var M=k!=="horizontal"?(I||100)/100:1,K=k!=="vertical"?(I||100)/100:1;return{height:b.height()*K,width:b.width()*M,outerHeight:b.outerHeight()*K,outerWidth:b.outerWidth()*M}},clipToBox:function(b){return{width:b.clip.right-b.clip.left,height:b.clip.bottom-b.clip.top,left:b.clip.left,top:b.clip.top}},unshift:function(b,I,k){var M=b.queue();I>1&&M.splice.apply(M,[1,0].concat(M.splice(I,k))),b.dequeue()},saveStyle:function(b){b.data(Ce,b[0].style.cssText)},restoreStyle:function(b){b[0].style.cssText=b.data(Ce)||"",b.removeData(Ce)},mode:function(b,I){var k=b.is(":hidden");return I==="toggle"&&(I=k?"show":"hide"),(k?I==="hide":I==="show")&&(I="none"),I},getBaseline:function(b,I){var k,M;switch(b[0]){case"top":k=0;break;case"middle":k=.5;break;case"bottom":k=1;break;default:k=b[0]/I.height}switch(b[1]){case"left":M=0;break;case"center":M=.5;break;case"right":M=1;break;default:M=b[1]/I.width}return{x:M,y:k}},createPlaceholder:function(b){var I,k=b.css("position"),M=b.position();return b.css({marginTop:b.css("marginTop"),marginBottom:b.css("marginBottom"),marginLeft:b.css("marginLeft"),marginRight:b.css("marginRight")}).outerWidth(b.outerWidth()).outerHeight(b.outerHeight()),/^(static|relative)/.test(k)&&(k="absolute",I=g("<"+b[0].nodeName+">").insertAfter(b).css({display:/^(inline|ruby)/.test(b.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:b.css("marginTop"),marginBottom:b.css("marginBottom"),marginLeft:b.css("marginLeft"),marginRight:b.css("marginRight"),float:b.css("float")}).outerWidth(b.outerWidth()).outerHeight(b.outerHeight()).addClass("ui-effects-placeholder"),b.data(ve+"placeholder",I)),b.css({position:k,left:M.left,top:M.top}),I},removePlaceholder:function(b){var I=ve+"placeholder",k=b.data(I);k&&(k.remove(),b.removeData(I))},cleanUp:function(b){g.effects.restoreStyle(b),g.effects.removePlaceholder(b)},setTransition:function(b,I,k,M){return M=M||{},g.each(I,function(K,W){var q=b.cssUnit(W);q[0]>0&&(M[W]=q[0]*k+q[1])}),M}});function d(b,I,k,M){return g.isPlainObject(b)&&(I=b,b=b.effect),b={effect:b},I==null&&(I={}),typeof I=="function"&&(M=I,k=null,I={}),(typeof I=="number"||g.fx.speeds[I])&&(M=k,k=I,I={}),typeof k=="function"&&(M=k,k=null),I&&g.extend(b,I),k=k||I.duration,b.duration=g.fx.off?0:typeof k=="number"?k:k in g.fx.speeds?g.fx.speeds[k]:g.fx.speeds._default,b.complete=M||I.complete,b}function w(b){return!!(!b||typeof b=="number"||g.fx.speeds[b]||typeof b=="string"&&!g.effects.effect[b]||typeof b=="function"||typeof b=="object"&&!b.effect)}g.fn.extend({effect:function(){var b=d.apply(this,arguments),I=g.effects.effect[b.effect],k=I.mode,M=b.queue,K=M||"fx",W=b.complete,q=b.mode,te=[],he=function(ie){var re=g(this),ce=g.effects.mode(re,q)||k;re.data(Se,!0),te.push(ce),k&&(ce==="show"||ce===k&&ce==="hide")&&re.show(),(!k||ce!=="none")&&g.effects.saveStyle(re),typeof ie=="function"&&ie()};if(g.fx.off||!I)return q?this[q](b.duration,W):this.each(function(){W&&W.call(this)});function ne(ie){var re=g(this);function ce(){re.removeData(Se),g.effects.cleanUp(re),b.mode==="hide"&&re.hide(),Be()}function Be(){typeof W=="function"&&W.call(re[0]),typeof ie=="function"&&ie()}b.mode=te.shift(),g.uiBackCompat!==!1&&!k?(re.is(":hidden")?q==="hide":q==="show")?(re[q](),Be()):I.call(re[0],b,Be):b.mode==="none"?(re[q](),Be()):I.call(re[0],b,ce)}return M===!1?this.each(he).each(ne):this.queue(K,he).queue(K,ne)},show:function(b){return function(I){if(w(I))return b.apply(this,arguments);var k=d.apply(this,arguments);return k.mode="show",this.effect.call(this,k)}}(g.fn.show),hide:function(b){return function(I){if(w(I))return b.apply(this,arguments);var k=d.apply(this,arguments);return k.mode="hide",this.effect.call(this,k)}}(g.fn.hide),toggle:function(b){return function(I){if(w(I)||typeof I=="boolean")return b.apply(this,arguments);var k=d.apply(this,arguments);return k.mode="toggle",this.effect.call(this,k)}}(g.fn.toggle),cssUnit:function(b){var I=this.css(b),k=[];return g.each(["em","px","%","pt"],function(M,K){I.indexOf(K)>0&&(k=[parseFloat(I),K])}),k},cssClip:function(b){return b?this.css("clip","rect("+b.top+"px "+b.right+"px "+b.bottom+"px "+b.left+"px)"):C(this.css("clip"),this)},transfer:function(b,I){var k=g(this),M=g(b.to),K=M.css("position")==="fixed",W=g("body"),q=K?W.scrollTop():0,te=K?W.scrollLeft():0,he=M.offset(),ne={top:he.top-q,left:he.left-te,height:M.innerHeight(),width:M.innerWidth()},ie=k.offset(),re=g("<div class='ui-effects-transfer'></div>");re.appendTo("body").addClass(b.className).css({top:ie.top-q,left:ie.left-te,height:k.innerHeight(),width:k.innerWidth(),position:K?"fixed":"absolute"}).animate(ne,b.duration,b.easing,function(){re.remove(),typeof I=="function"&&I()})}});function C(b,I){var k=I.outerWidth(),M=I.outerHeight(),K=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,W=K.exec(b)||["",0,k,M,0];return{top:parseFloat(W[1])||0,right:W[2]==="auto"?k:parseFloat(W[2]),bottom:W[3]==="auto"?M:parseFloat(W[3]),left:parseFloat(W[4])||0}}g.fx.step.clip=function(b){b.clipInit||(b.start=g(b.elem).cssClip(),typeof b.end=="string"&&(b.end=C(b.end,b.elem)),b.clipInit=!0),g(b.elem).cssClip({top:b.pos*(b.end.top-b.start.top)+b.start.top,right:b.pos*(b.end.right-b.start.right)+b.start.right,bottom:b.pos*(b.end.bottom-b.start.bottom)+b.start.bottom,left:b.pos*(b.end.left-b.start.left)+b.start.left})}}(),function(){var d={};g.each(["Quad","Cubic","Quart","Quint","Expo"],function(w,C){d[C]=function(b){return Math.pow(b,w+2)}}),g.extend(d,{Sine:function(w){return 1-Math.cos(w*Math.PI/2)},Circ:function(w){return 1-Math.sqrt(1-w*w)},Elastic:function(w){return w===0||w===1?w:-Math.pow(2,8*(w-1))*Math.sin(((w-1)*80-7.5)*Math.PI/15)},Back:function(w){return w*w*(3*w-2)},Bounce:function(w){for(var C,b=4;w<((C=Math.pow(2,--b))-1)/11;);return 1/Math.pow(4,3-b)-7.5625*Math.pow((C*3-2)/22-w,2)}}),g.each(d,function(w,C){g.easing["easeIn"+w]=C,g.easing["easeOut"+w]=function(b){return 1-C(1-b)},g.easing["easeInOut"+w]=function(b){return b<.5?C(b*2)/2:1-C(b*-2+2)/2}})}(),g.effects;/*!
+ * jQuery UI Effects Blind 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("blind","hide",function(d,w){var C={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},b=g(this),I=d.direction||"up",k=b.cssClip(),M={clip:g.extend({},k)},K=g.effects.createPlaceholder(b);M.clip[C[I][0]]=M.clip[C[I][1]],d.mode==="show"&&(b.cssClip(M.clip),K&&K.css(g.effects.clipToBox(M)),M.clip=k),K&&K.animate(g.effects.clipToBox(M),d.duration,d.easing),b.animate(M,{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Bounce 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("bounce",function(d,w){var C,b,I,k=g(this),M=d.mode,K=M==="hide",W=M==="show",q=d.direction||"up",te=d.distance,he=d.times||5,ne=he*2+(W||K?1:0),ie=d.duration/ne,re=d.easing,ce=q==="up"||q==="down"?"top":"left",Be=q==="up"||q==="left",Fe=0,Te=k.queue().length;for(g.effects.createPlaceholder(k),I=k.css(ce),te||(te=k[ce==="top"?"outerHeight":"outerWidth"]()/3),W&&(b={opacity:1},b[ce]=I,k.css("opacity",0).css(ce,Be?-te*2:te*2).animate(b,ie,re)),K&&(te=te/Math.pow(2,he-1)),b={},b[ce]=I;Fe<he;Fe++)C={},C[ce]=(Be?"-=":"+=")+te,k.animate(C,ie,re).animate(b,ie,re),te=K?te*2:te/2;K&&(C={opacity:0},C[ce]=(Be?"-=":"+=")+te,k.animate(C,ie,re)),k.queue(w),g.effects.unshift(k,Te,ne+1)});/*!
+ * jQuery UI Effects Clip 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("clip","hide",function(d,w){var C,b={},I=g(this),k=d.direction||"vertical",M=k==="both",K=M||k==="horizontal",W=M||k==="vertical";C=I.cssClip(),b.clip={top:W?(C.bottom-C.top)/2:C.top,right:K?(C.right-C.left)/2:C.right,bottom:W?(C.bottom-C.top)/2:C.bottom,left:K?(C.right-C.left)/2:C.left},g.effects.createPlaceholder(I),d.mode==="show"&&(I.cssClip(b.clip),b.clip=C),I.animate(b,{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Drop 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("drop","hide",function(d,w){var C,b=g(this),I=d.mode,k=I==="show",M=d.direction||"left",K=M==="up"||M==="down"?"top":"left",W=M==="up"||M==="left"?"-=":"+=",q=W==="+="?"-=":"+=",te={opacity:0};g.effects.createPlaceholder(b),C=d.distance||b[K==="top"?"outerHeight":"outerWidth"](!0)/2,te[K]=W+C,k&&(b.css(te),te[K]=q+C,te.opacity=1),b.animate(te,{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Explode 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("explode","hide",function(d,w){var C,b,I,k,M,K,W=d.pieces?Math.round(Math.sqrt(d.pieces)):3,q=W,te=g(this),he=d.mode,ne=he==="show",ie=te.show().css("visibility","hidden").offset(),re=Math.ceil(te.outerWidth()/q),ce=Math.ceil(te.outerHeight()/W),Be=[];function Fe(){Be.push(this),Be.length===W*q&&Te()}for(C=0;C<W;C++)for(k=ie.top+C*ce,K=C-(W-1)/2,b=0;b<q;b++)I=ie.left+b*re,M=b-(q-1)/2,te.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-b*re,top:-C*ce}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:re,height:ce,left:I+(ne?M*re:0),top:k+(ne?K*ce:0),opacity:ne?0:1}).animate({left:I+(ne?0:M*re),top:k+(ne?0:K*ce),opacity:ne?1:0},d.duration||500,d.easing,Fe);function Te(){te.css({visibility:"visible"}),g(Be).remove(),w()}});/*!
+ * jQuery UI Effects Fade 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("fade","toggle",function(d,w){var C=d.mode==="show";g(this).css("opacity",C?0:1).animate({opacity:C?1:0},{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Fold 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("fold","hide",function(d,w){var C=g(this),b=d.mode,I=b==="show",k=b==="hide",M=d.size||15,K=/([0-9]+)%/.exec(M),W=!!d.horizFirst,q=W?["right","bottom"]:["bottom","right"],te=d.duration/2,he=g.effects.createPlaceholder(C),ne=C.cssClip(),ie={clip:g.extend({},ne)},re={clip:g.extend({},ne)},ce=[ne[q[0]],ne[q[1]]],Be=C.queue().length;K&&(M=parseInt(K[1],10)/100*ce[k?0:1]),ie.clip[q[0]]=M,re.clip[q[0]]=M,re.clip[q[1]]=0,I&&(C.cssClip(re.clip),he&&he.css(g.effects.clipToBox(re)),re.clip=ne),C.queue(function(Fe){he&&he.animate(g.effects.clipToBox(ie),te,d.easing).animate(g.effects.clipToBox(re),te,d.easing),Fe()}).animate(ie,te,d.easing).animate(re,te,d.easing).queue(w),g.effects.unshift(C,Be,4)});/*!
+ * jQuery UI Effects Highlight 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("highlight","show",function(d,w){var C=g(this),b={backgroundColor:C.css("backgroundColor")};d.mode==="hide"&&(b.opacity=0),g.effects.saveStyle(C),C.css({backgroundImage:"none",backgroundColor:d.color||"#ffff99"}).animate(b,{queue:!1,duration:d.duration,easing:d.easing,complete:w})});/*!
+ * jQuery UI Effects Size 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("size",function(d,w){var C,b,I,k=g(this),M=["fontSize"],K=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],W=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],q=d.mode,te=q!=="effect",he=d.scale||"both",ne=d.origin||["middle","center"],ie=k.css("position"),re=k.position(),ce=g.effects.scaledDimensions(k),Be=d.from||ce,Fe=d.to||g.effects.scaledDimensions(k,0);g.effects.createPlaceholder(k),q==="show"&&(I=Be,Be=Fe,Fe=I),b={from:{y:Be.height/ce.height,x:Be.width/ce.width},to:{y:Fe.height/ce.height,x:Fe.width/ce.width}},(he==="box"||he==="both")&&(b.from.y!==b.to.y&&(Be=g.effects.setTransition(k,K,b.from.y,Be),Fe=g.effects.setTransition(k,K,b.to.y,Fe)),b.from.x!==b.to.x&&(Be=g.effects.setTransition(k,W,b.from.x,Be),Fe=g.effects.setTransition(k,W,b.to.x,Fe))),(he==="content"||he==="both")&&b.from.y!==b.to.y&&(Be=g.effects.setTransition(k,M,b.from.y,Be),Fe=g.effects.setTransition(k,M,b.to.y,Fe)),ne&&(C=g.effects.getBaseline(ne,ce),Be.top=(ce.outerHeight-Be.outerHeight)*C.y+re.top,Be.left=(ce.outerWidth-Be.outerWidth)*C.x+re.left,Fe.top=(ce.outerHeight-Fe.outerHeight)*C.y+re.top,Fe.left=(ce.outerWidth-Fe.outerWidth)*C.x+re.left),delete Be.outerHeight,delete Be.outerWidth,k.css(Be),(he==="content"||he==="both")&&(K=K.concat(["marginTop","marginBottom"]).concat(M),W=W.concat(["marginLeft","marginRight"]),k.find("*[width]").each(function(){var Te=g(this),Ne=g.effects.scaledDimensions(Te),Oe={height:Ne.height*b.from.y,width:Ne.width*b.from.x,outerHeight:Ne.outerHeight*b.from.y,outerWidth:Ne.outerWidth*b.from.x},De={height:Ne.height*b.to.y,width:Ne.width*b.to.x,outerHeight:Ne.height*b.to.y,outerWidth:Ne.width*b.to.x};b.from.y!==b.to.y&&(Oe=g.effects.setTransition(Te,K,b.from.y,Oe),De=g.effects.setTransition(Te,K,b.to.y,De)),b.from.x!==b.to.x&&(Oe=g.effects.setTransition(Te,W,b.from.x,Oe),De=g.effects.setTransition(Te,W,b.to.x,De)),te&&g.effects.saveStyle(Te),Te.css(Oe),Te.animate(De,d.duration,d.easing,function(){te&&g.effects.restoreStyle(Te)})})),k.animate(Fe,{queue:!1,duration:d.duration,easing:d.easing,complete:function(){var Te=k.offset();Fe.opacity===0&&k.css("opacity",Be.opacity),te||(k.css("position",ie==="static"?"relative":ie).offset(Te),g.effects.saveStyle(k)),w()}})});/*!
+ * jQuery UI Effects Scale 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("scale",function(d,w){var C=g(this),b=d.mode,I=parseInt(d.percent,10)||(parseInt(d.percent,10)===0||b!=="effect"?0:100),k=g.extend(!0,{from:g.effects.scaledDimensions(C),to:g.effects.scaledDimensions(C,I,d.direction||"both"),origin:d.origin||["middle","center"]},d);d.fade&&(k.from.opacity=1,k.to.opacity=0),g.effects.effect.size.call(this,k,w)});/*!
+ * jQuery UI Effects Puff 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("puff","hide",function(d,w){var C=g.extend(!0,{},d,{fade:!0,percent:parseInt(d.percent,10)||150});g.effects.effect.scale.call(this,C,w)});/*!
+ * jQuery UI Effects Pulsate 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("pulsate","show",function(d,w){var C=g(this),b=d.mode,I=b==="show",k=b==="hide",M=I||k,K=(d.times||5)*2+(M?1:0),W=d.duration/K,q=0,te=1,he=C.queue().length;for((I||!C.is(":visible"))&&(C.css("opacity",0).show(),q=1);te<K;te++)C.animate({opacity:q},W,d.easing),q=1-q;C.animate({opacity:q},W,d.easing),C.queue(w),g.effects.unshift(C,he,K+1)});/*!
+ * jQuery UI Effects Shake 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("shake",function(d,w){var C=1,b=g(this),I=d.direction||"left",k=d.distance||20,M=d.times||3,K=M*2+1,W=Math.round(d.duration/K),q=I==="up"||I==="down"?"top":"left",te=I==="up"||I==="left",he={},ne={},ie={},re=b.queue().length;for(g.effects.createPlaceholder(b),he[q]=(te?"-=":"+=")+k,ne[q]=(te?"+=":"-=")+k*2,ie[q]=(te?"-=":"+=")+k*2,b.animate(he,W,d.easing);C<M;C++)b.animate(ne,W,d.easing).animate(ie,W,d.easing);b.animate(ne,W,d.easing).animate(he,W/2,d.easing).queue(w),g.effects.unshift(b,re,K+1)});/*!
+ * jQuery UI Effects Slide 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.effects.define("slide","show",function(d,w){var C,b,I=g(this),k={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},M=d.mode,K=d.direction||"left",W=K==="up"||K==="down"?"top":"left",q=K==="up"||K==="left",te=d.distance||I[W==="top"?"outerHeight":"outerWidth"](!0),he={};g.effects.createPlaceholder(I),C=I.cssClip(),b=I.position()[W],he[W]=(q?-1:1)*te+b,he.clip=I.cssClip(),he.clip[k[K][1]]=he.clip[k[K][0]],M==="show"&&(I.cssClip(he.clip),I.css(W,he[W]),he.clip=C,he[W]=b),I.animate(he,{queue:!1,duration:d.duration,easing:d.easing,complete:w})}),g.uiBackCompat!==!1&&g.effects.define("transfer",function(d,w){g(this).transfer(d,w)});/*!
+ * jQuery UI Focusable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.ui.focusable=function(d,w){var C,b,I,k,M,K=d.nodeName.toLowerCase();return K==="area"?(C=d.parentNode,b=C.name,!d.href||!b||C.nodeName.toLowerCase()!=="map"?!1:(I=g("img[usemap='#"+b+"']"),I.length>0&&I.is(":visible"))):(/^(input|select|textarea|button|object)$/.test(K)?(k=!d.disabled,k&&(M=g(d).closest("fieldset")[0],M&&(k=!M.disabled))):K==="a"?k=d.href||w:k=w,k&&g(d).is(":visible")&&We(g(d)))};function We(d){for(var w=d.css("visibility");w==="inherit";)d=d.parent(),w=d.css("visibility");return w==="visible"}g.extend(g.expr.pseudos,{focusable:function(d){return g.ui.focusable(d,g.attr(d,"tabindex")!=null)}}),g.ui.focusable,g.fn._form=function(){return typeof this[0].form=="string"?this.closest("form"):g(this[0].form)};/*!
+ * jQuery UI Form Reset Mixin 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.ui.formResetMixin={_formResetHandler:function(){var d=g(this);setTimeout(function(){var w=d.data("ui-form-reset-instances");g.each(w,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element._form(),!!this.form.length){var d=this.form.data("ui-form-reset-instances")||[];d.length||this.form.on("reset.ui-form-reset",this._formResetHandler),d.push(this),this.form.data("ui-form-reset-instances",d)}},_unbindFormResetHandler:function(){if(this.form.length){var d=this.form.data("ui-form-reset-instances");d.splice(g.inArray(this,d),1),d.length?this.form.data("ui-form-reset-instances",d):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}};/*!
+ * jQuery UI Support for jQuery core 1.8.x and newer 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ */if(g.expr.pseudos||(g.expr.pseudos=g.expr[":"]),g.uniqueSort||(g.uniqueSort=g.unique),!g.escapeSelector){var Ke=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,Ue=function(d,w){return w?d==="\0"?"�":d.slice(0,-1)+"\\"+d.charCodeAt(d.length-1).toString(16)+" ":"\\"+d};g.escapeSelector=function(d){return(d+"").replace(Ke,Ue)}}(!g.fn.even||!g.fn.odd)&&g.fn.extend({even:function(){return this.filter(function(d){return d%2===0})},odd:function(){return this.filter(function(d){return d%2===1})}});/*!
+ * jQuery UI Keycode 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38};/*!
+ * jQuery UI Labels 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.fn.labels=function(){var d,w,C,b,I;return this.length?this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(b=this.eq(0).parents("label"),C=this.attr("id"),C&&(d=this.eq(0).parents().last(),I=d.add(d.length?d.siblings():this.siblings()),w="label[for='"+g.escapeSelector(C)+"']",b=b.add(I.find(w).addBack(w))),this.pushStack(b)):this.pushStack([])};/*!
+ * jQuery UI Scroll Parent 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.fn.scrollParent=function(d){var w=this.css("position"),C=w==="absolute",b=d?/(auto|scroll|hidden)/:/(auto|scroll)/,I=this.parents().filter(function(){var k=g(this);return C&&k.css("position")==="static"?!1:b.test(k.css("overflow")+k.css("overflow-y")+k.css("overflow-x"))}).eq(0);return w==="fixed"||!I.length?g(this[0].ownerDocument||document):I};/*!
+ * jQuery UI Tabbable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.extend(g.expr.pseudos,{tabbable:function(d){var w=g.attr(d,"tabindex"),C=w!=null;return(!C||w>=0)&&g.ui.focusable(d,C)}});/*!
+ * jQuery UI Unique ID 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.fn.extend({uniqueId:function(){var d=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++d)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&g(this).removeAttr("id")})}});/*!
+ * jQuery UI Accordion 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.accordion",{version:"1.13.2",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:function(d){return d.find("> li > :first-child").add(d.find("> :not(li)").even())},heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var d=this.options;this.prevShow=this.prevHide=g(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),!d.collapsible&&(d.active===!1||d.active==null)&&(d.active=0),this._processPanels(),d.active<0&&(d.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():g()}},_createIcons:function(){var d,w,C=this.options.icons;C&&(d=g("<span>"),this._addClass(d,"ui-accordion-header-icon","ui-icon "+C.header),d.prependTo(this.headers),w=this.active.children(".ui-accordion-header-icon"),this._removeClass(w,C.header)._addClass(w,null,C.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var d;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),d=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),this.options.heightStyle!=="content"&&d.css("height","")},_setOption:function(d,w){if(d==="active"){this._activate(w);return}d==="event"&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(w)),this._super(d,w),d==="collapsible"&&!w&&this.options.active===!1&&this._activate(0),d==="icons"&&(this._destroyIcons(),w&&this._createIcons())},_setOptionDisabled:function(d){this._super(d),this.element.attr("aria-disabled",d),this._toggleClass(null,"ui-state-disabled",!!d),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!d)},_keydown:function(d){if(!(d.altKey||d.ctrlKey)){var w=g.ui.keyCode,C=this.headers.length,b=this.headers.index(d.target),I=!1;switch(d.keyCode){case w.RIGHT:case w.DOWN:I=this.headers[(b+1)%C];break;case w.LEFT:case w.UP:I=this.headers[(b-1+C)%C];break;case w.SPACE:case w.ENTER:this._eventHandler(d);break;case w.HOME:I=this.headers[0];break;case w.END:I=this.headers[C-1];break}I&&(g(d.target).attr("tabIndex",-1),g(I).attr("tabIndex",0),g(I).trigger("focus"),d.preventDefault())}},_panelKeyDown:function(d){d.keyCode===g.ui.keyCode.UP&&d.ctrlKey&&g(d.currentTarget).prev().trigger("focus")},refresh:function(){var d=this.options;this._processPanels(),d.active===!1&&d.collapsible===!0||!this.headers.length?(d.active=!1,this.active=g()):d.active===!1?this._activate(0):this.active.length&&!g.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(d.active=!1,this.active=g()):this._activate(Math.max(0,d.active-1)):d.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var d=this.headers,w=this.panels;typeof this.options.header=="function"?this.headers=this.options.header(this.element):this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),w&&(this._off(d.not(this.headers)),this._off(w.not(this.panels)))},_refresh:function(){var d,w=this.options,C=w.heightStyle,b=this.element.parent();this.active=this._findActive(w.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var I=g(this),k=I.uniqueId().attr("id"),M=I.next(),K=M.uniqueId().attr("id");I.attr("aria-controls",K),M.attr("aria-labelledby",k)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(w.event),C==="fill"?(d=b.height(),this.element.siblings(":visible").each(function(){var I=g(this),k=I.css("position");k==="absolute"||k==="fixed"||(d-=I.outerHeight(!0))}),this.headers.each(function(){d-=g(this).outerHeight(!0)}),this.headers.next().each(function(){g(this).height(Math.max(0,d-g(this).innerHeight()+g(this).height()))}).css("overflow","auto")):C==="auto"&&(d=0,this.headers.next().each(function(){var I=g(this).is(":visible");I||g(this).show(),d=Math.max(d,g(this).css("height","").height()),I||g(this).hide()}).height(d))},_activate:function(d){var w=this._findActive(d)[0];w!==this.active[0]&&(w=w||this.active[0],this._eventHandler({target:w,currentTarget:w,preventDefault:g.noop}))},_findActive:function(d){return typeof d=="number"?this.headers.eq(d):g()},_setupEvents:function(d){var w={keydown:"_keydown"};d&&g.each(d.split(" "),function(C,b){w[b]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,w),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(d){var w,C,b=this.options,I=this.active,k=g(d.currentTarget),M=k[0]===I[0],K=M&&b.collapsible,W=K?g():k.next(),q=I.next(),te={oldHeader:I,oldPanel:q,newHeader:K?g():k,newPanel:W};d.preventDefault(),!(M&&!b.collapsible||this._trigger("beforeActivate",d,te)===!1)&&(b.active=K?!1:this.headers.index(k),this.active=M?g():k,this._toggle(te),this._removeClass(I,"ui-accordion-header-active","ui-state-active"),b.icons&&(w=I.children(".ui-accordion-header-icon"),this._removeClass(w,null,b.icons.activeHeader)._addClass(w,null,b.icons.header)),M||(this._removeClass(k,"ui-accordion-header-collapsed")._addClass(k,"ui-accordion-header-active","ui-state-active"),b.icons&&(C=k.children(".ui-accordion-header-icon"),this._removeClass(C,null,b.icons.header)._addClass(C,null,b.icons.activeHeader)),this._addClass(k.next(),"ui-accordion-content-active")))},_toggle:function(d){var w=d.newPanel,C=this.prevShow.length?this.prevShow:d.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=w,this.prevHide=C,this.options.animate?this._animate(w,C,d):(C.hide(),w.show(),this._toggleComplete(d)),C.attr({"aria-hidden":"true"}),C.prev().attr({"aria-selected":"false","aria-expanded":"false"}),w.length&&C.length?C.prev().attr({tabIndex:-1,"aria-expanded":"false"}):w.length&&this.headers.filter(function(){return parseInt(g(this).attr("tabIndex"),10)===0}).attr("tabIndex",-1),w.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(d,w,C){var b,I,k,M=this,K=0,W=d.css("box-sizing"),q=d.length&&(!w.length||d.index()<w.index()),te=this.options.animate||{},he=q&&te.down||te,ne=function(){M._toggleComplete(C)};if(typeof he=="number"&&(k=he),typeof he=="string"&&(I=he),I=I||he.easing||te.easing,k=k||he.duration||te.duration,!w.length)return d.animate(this.showProps,k,I,ne);if(!d.length)return w.animate(this.hideProps,k,I,ne);b=d.show().outerHeight(),w.animate(this.hideProps,{duration:k,easing:I,step:function(ie,re){re.now=Math.round(ie)}}),d.hide().animate(this.showProps,{duration:k,easing:I,complete:ne,step:function(ie,re){re.now=Math.round(ie),re.prop!=="height"?W==="content-box"&&(K+=re.now):M.options.heightStyle!=="content"&&(re.now=Math.round(b-w.outerHeight()-K),K=0)}})},_toggleComplete:function(d){var w=d.oldPanel,C=w.prev();this._removeClass(w,"ui-accordion-content-active"),this._removeClass(C,"ui-accordion-header-active")._addClass(C,"ui-accordion-header-collapsed"),w.length&&(w.parent()[0].className=w.parent()[0].className),this._trigger("activate",null,d)}}),g.ui.safeActiveElement=function(d){var w;try{w=d.activeElement}catch{w=d.body}return w||(w=d.body),w.nodeName||(w=d.body),w};/*!
+ * jQuery UI Menu 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.menu",{version:"1.13.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(d){d.preventDefault(),this._activateItem(d)},"click .ui-menu-item":function(d){var w=g(d.target),C=g(g.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&w.not(".ui-state-disabled").length&&(this.select(d),d.isPropagationStopped()||(this.mouseHandled=!0),w.has(".ui-menu").length?this.expand(d):!this.element.is(":focus")&&C.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(d,w){var C=this.active||this._menuItems().first();w||this.focus(d,C)},blur:function(d){this._delay(function(){var w=!g.contains(this.element[0],g.ui.safeActiveElement(this.document[0]));w&&this.collapseAll(d)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(d){this._closeOnDocumentClick(d)&&this.collapseAll(d,!0),this.mouseHandled=!1}})},_activateItem:function(d){if(!this.previousFilter&&!(d.clientX===this.lastMousePosition.x&&d.clientY===this.lastMousePosition.y)){this.lastMousePosition={x:d.clientX,y:d.clientY};var w=g(d.target).closest(".ui-menu-item"),C=g(d.currentTarget);w[0]===C[0]&&(C.is(".ui-state-active")||(this._removeClass(C.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(d,C)))}},_destroy:function(){var d=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),w=d.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),w.children().each(function(){var C=g(this);C.data("ui-menu-submenu-caret")&&C.remove()})},_keydown:function(d){var w,C,b,I,k=!0;switch(d.keyCode){case g.ui.keyCode.PAGE_UP:this.previousPage(d);break;case g.ui.keyCode.PAGE_DOWN:this.nextPage(d);break;case g.ui.keyCode.HOME:this._move("first","first",d);break;case g.ui.keyCode.END:this._move("last","last",d);break;case g.ui.keyCode.UP:this.previous(d);break;case g.ui.keyCode.DOWN:this.next(d);break;case g.ui.keyCode.LEFT:this.collapse(d);break;case g.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(d);break;case g.ui.keyCode.ENTER:case g.ui.keyCode.SPACE:this._activate(d);break;case g.ui.keyCode.ESCAPE:this.collapse(d);break;default:k=!1,C=this.previousFilter||"",I=!1,b=d.keyCode>=96&&d.keyCode<=105?(d.keyCode-96).toString():String.fromCharCode(d.keyCode),clearTimeout(this.filterTimer),b===C?I=!0:b=C+b,w=this._filterMenuItems(b),w=I&&w.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):w,w.length||(b=String.fromCharCode(d.keyCode),w=this._filterMenuItems(b)),w.length?(this.focus(d,w),this.previousFilter=b,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}k&&d.preventDefault()},_activate:function(d){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(d):this.select(d))},refresh:function(){var d,w,C,b,I,k=this,M=this.options.icons.submenu,K=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),C=K.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var W=g(this),q=W.prev(),te=g("<span>").data("ui-menu-submenu-caret",!0);k._addClass(te,"ui-menu-icon","ui-icon "+M),q.attr("aria-haspopup","true").prepend(te),W.attr("aria-labelledby",q.attr("id"))}),this._addClass(C,"ui-menu","ui-widget ui-widget-content ui-front"),d=K.add(this.element),w=d.find(this.options.items),w.not(".ui-menu-item").each(function(){var W=g(this);k._isDivider(W)&&k._addClass(W,"ui-menu-divider","ui-widget-content")}),b=w.not(".ui-menu-item, .ui-menu-divider"),I=b.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(b,"ui-menu-item")._addClass(I,"ui-menu-item-wrapper"),w.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!g.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(d,w){if(d==="icons"){var C=this.element.find(".ui-menu-icon");this._removeClass(C,null,this.options.icons.submenu)._addClass(C,null,w.submenu)}this._super(d,w)},_setOptionDisabled:function(d){this._super(d),this.element.attr("aria-disabled",String(d)),this._toggleClass(null,"ui-state-disabled",!!d)},focus:function(d,w){var C,b,I;this.blur(d,d&&d.type==="focus"),this._scrollIntoView(w),this.active=w.first(),b=this.active.children(".ui-menu-item-wrapper"),this._addClass(b,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",b.attr("id")),I=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(I,null,"ui-state-active"),d&&d.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),C=w.children(".ui-menu"),C.length&&d&&/^mouse/.test(d.type)&&this._startOpening(C),this.activeMenu=w.parent(),this._trigger("focus",d,{item:w})},_scrollIntoView:function(d){var w,C,b,I,k,M;this._hasScroll()&&(w=parseFloat(g.css(this.activeMenu[0],"borderTopWidth"))||0,C=parseFloat(g.css(this.activeMenu[0],"paddingTop"))||0,b=d.offset().top-this.activeMenu.offset().top-w-C,I=this.activeMenu.scrollTop(),k=this.activeMenu.height(),M=d.outerHeight(),b<0?this.activeMenu.scrollTop(I+b):b+M>k&&this.activeMenu.scrollTop(I+b-k+M))},blur:function(d,w){w||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",d,{item:this.active}),this.active=null)},_startOpening:function(d){clearTimeout(this.timer),d.attr("aria-hidden")==="true"&&(this.timer=this._delay(function(){this._close(),this._open(d)},this.delay))},_open:function(d){var w=g.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(d.parents(".ui-menu")).hide().attr("aria-hidden","true"),d.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(w)},collapseAll:function(d,w){clearTimeout(this.timer),this.timer=this._delay(function(){var C=w?this.element:g(d&&d.target).closest(this.element.find(".ui-menu"));C.length||(C=this.element),this._close(C),this.blur(d),this._removeClass(C.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=C},w?0:this.delay)},_close:function(d){d||(d=this.active?this.active.parent():this.element),d.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(d){return!g(d.target).closest(".ui-menu").length},_isDivider:function(d){return!/[^\-\u2014\u2013\s]/.test(d.text())},collapse:function(d){var w=this.active&&this.active.parent().closest(".ui-menu-item",this.element);w&&w.length&&(this._close(),this.focus(d,w))},expand:function(d){var w=this.active&&this._menuItems(this.active.children(".ui-menu")).first();w&&w.length&&(this._open(w.parent()),this._delay(function(){this.focus(d,w)}))},next:function(d){this._move("next","first",d)},previous:function(d){this._move("prev","last",d)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_menuItems:function(d){return(d||this.element).find(this.options.items).filter(".ui-menu-item")},_move:function(d,w,C){var b;this.active&&(d==="first"||d==="last"?b=this.active[d==="first"?"prevAll":"nextAll"](".ui-menu-item").last():b=this.active[d+"All"](".ui-menu-item").first()),(!b||!b.length||!this.active)&&(b=this._menuItems(this.activeMenu)[w]()),this.focus(C,b)},nextPage:function(d){var w,C,b;if(!this.active){this.next(d);return}this.isLastItem()||(this._hasScroll()?(C=this.active.offset().top,b=this.element.innerHeight(),g.fn.jquery.indexOf("3.2.")===0&&(b+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.nextAll(".ui-menu-item").each(function(){return w=g(this),w.offset().top-C-b<0}),this.focus(d,w)):this.focus(d,this._menuItems(this.activeMenu)[this.active?"last":"first"]()))},previousPage:function(d){var w,C,b;if(!this.active){this.next(d);return}this.isFirstItem()||(this._hasScroll()?(C=this.active.offset().top,b=this.element.innerHeight(),g.fn.jquery.indexOf("3.2.")===0&&(b+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.prevAll(".ui-menu-item").each(function(){return w=g(this),w.offset().top-C+b>0}),this.focus(d,w)):this.focus(d,this._menuItems(this.activeMenu).first()))},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(d){this.active=this.active||g(d.target).closest(".ui-menu-item");var w={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(d,!0),this._trigger("select",d,w)},_filterMenuItems:function(d){var w=d.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),C=new RegExp("^"+w,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return C.test(String.prototype.trim.call(g(this).children(".ui-menu-item-wrapper").text()))})}});/*!
+ * jQuery UI Autocomplete 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.autocomplete",{version:"1.13.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var d,w,C,b=this.element[0].nodeName.toLowerCase(),I=b==="textarea",k=b==="input";this.isMultiLine=I||!k&&this._isContentEditable(this.element),this.valueMethod=this.element[I||k?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(M){if(this.element.prop("readOnly")){d=!0,C=!0,w=!0;return}d=!1,C=!1,w=!1;var K=g.ui.keyCode;switch(M.keyCode){case K.PAGE_UP:d=!0,this._move("previousPage",M);break;case K.PAGE_DOWN:d=!0,this._move("nextPage",M);break;case K.UP:d=!0,this._keyEvent("previous",M);break;case K.DOWN:d=!0,this._keyEvent("next",M);break;case K.ENTER:this.menu.active&&(d=!0,M.preventDefault(),this.menu.select(M));break;case K.TAB:this.menu.active&&this.menu.select(M);break;case K.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(M),M.preventDefault());break;default:w=!0,this._searchTimeout(M);break}},keypress:function(M){if(d){d=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&M.preventDefault();return}if(!w){var K=g.ui.keyCode;switch(M.keyCode){case K.PAGE_UP:this._move("previousPage",M);break;case K.PAGE_DOWN:this._move("nextPage",M);break;case K.UP:this._keyEvent("previous",M);break;case K.DOWN:this._keyEvent("next",M);break}}},input:function(M){if(C){C=!1,M.preventDefault();return}this._searchTimeout(M)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(M){clearTimeout(this.searching),this.close(M),this._change(M)}}),this._initSource(),this.menu=g("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(M){M.preventDefault()},menufocus:function(M,K){var W,q;if(this.isNewMenu&&(this.isNewMenu=!1,M.originalEvent&&/^mouse/.test(M.originalEvent.type))){this.menu.blur(),this.document.one("mousemove",function(){g(M.target).trigger(M.originalEvent)});return}q=K.item.data("ui-autocomplete-item"),this._trigger("focus",M,{item:q})!==!1&&M.originalEvent&&/^key/.test(M.originalEvent.type)&&this._value(q.value),W=K.item.attr("aria-label")||q.value,W&&String.prototype.trim.call(W).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(g("<div>").text(W))},100))},menuselect:function(M,K){var W=K.item.data("ui-autocomplete-item"),q=this.previous;this.element[0]!==g.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=q,this._delay(function(){this.previous=q,this.selectedItem=W})),this._trigger("select",M,{item:W})!==!1&&this._value(W.value),this.term=this._value(),this.close(M),this.selectedItem=W}}),this.liveRegion=g("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(d,w){this._super(d,w),d==="source"&&this._initSource(),d==="appendTo"&&this.menu.element.appendTo(this._appendTo()),d==="disabled"&&w&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(d){var w=this.menu.element[0];return d.target===this.element[0]||d.target===w||g.contains(w,d.target)},_closeOnClickOutside:function(d){this._isEventTargetInWidget(d)||this.close()},_appendTo:function(){var d=this.options.appendTo;return d&&(d=d.jquery||d.nodeType?g(d):this.document.find(d).eq(0)),(!d||!d[0])&&(d=this.element.closest(".ui-front, dialog")),d.length||(d=this.document[0].body),d},_initSource:function(){var d,w,C=this;Array.isArray(this.options.source)?(d=this.options.source,this.source=function(b,I){I(g.ui.autocomplete.filter(d,b.term))}):typeof this.options.source=="string"?(w=this.options.source,this.source=function(b,I){C.xhr&&C.xhr.abort(),C.xhr=g.ajax({url:w,data:b,dataType:"json",success:function(k){I(k)},error:function(){I([])}})}):this.source=this.options.source},_searchTimeout:function(d){clearTimeout(this.searching),this.searching=this._delay(function(){var w=this.term===this._value(),C=this.menu.element.is(":visible"),b=d.altKey||d.ctrlKey||d.metaKey||d.shiftKey;(!w||w&&!C&&!b)&&(this.selectedItem=null,this.search(null,d))},this.options.delay)},search:function(d,w){if(d=d??this._value(),this.term=this._value(),d.length<this.options.minLength)return this.close(w);if(this._trigger("search",w)!==!1)return this._search(d)},_search:function(d){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:d},this._response())},_response:function(){var d=++this.requestIndex;return(function(w){d===this.requestIndex&&this.__response(w),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")}).bind(this)},__response:function(d){d&&(d=this._normalize(d)),this._trigger("response",null,{content:d}),!this.options.disabled&&d&&d.length&&!this.cancelSearch?(this._suggest(d),this._trigger("open")):this._close()},close:function(d){this.cancelSearch=!0,this._close(d)},_close:function(d){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",d))},_change:function(d){this.previous!==this._value()&&this._trigger("change",d,{item:this.selectedItem})},_normalize:function(d){return d.length&&d[0].label&&d[0].value?d:g.map(d,function(w){return typeof w=="string"?{label:w,value:w}:g.extend({},w,{label:w.label||w.value,value:w.value||w.label})})},_suggest:function(d){var w=this.menu.element.empty();this._renderMenu(w,d),this.isNewMenu=!0,this.menu.refresh(),w.show(),this._resizeMenu(),w.position(g.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var d=this.menu.element;d.outerWidth(Math.max(d.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(d,w){var C=this;g.each(w,function(b,I){C._renderItemData(d,I)})},_renderItemData:function(d,w){return this._renderItem(d,w).data("ui-autocomplete-item",w)},_renderItem:function(d,w){return g("<li>").append(g("<div>").text(w.label)).appendTo(d)},_move:function(d,w){if(!this.menu.element.is(":visible")){this.search(null,w);return}if(this.menu.isFirstItem()&&/^previous/.test(d)||this.menu.isLastItem()&&/^next/.test(d)){this.isMultiLine||this._value(this.term),this.menu.blur();return}this.menu[d](w)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(d,w){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(d,w),w.preventDefault())},_isContentEditable:function(d){if(!d.length)return!1;var w=d.prop("contentEditable");return w==="inherit"?this._isContentEditable(d.parent()):w==="true"}}),g.extend(g.ui.autocomplete,{escapeRegex:function(d){return d.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(d,w){var C=new RegExp(g.ui.autocomplete.escapeRegex(w),"i");return g.grep(d,function(b){return C.test(b.label||b.value||b)})}}),g.widget("ui.autocomplete",g.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(d){return d+(d>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(d){var w;this._superApply(arguments),!(this.options.disabled||this.cancelSearch)&&(d&&d.length?w=this.options.messages.results(d.length):w=this.options.messages.noResults,clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(g("<div>").text(w))},100))}}),g.ui.autocomplete;/*!
+ * jQuery UI Controlgroup 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */var ke=/ui-corner-([a-z]){2,6}/g;g.widget("ui.controlgroup",{version:"1.13.2",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var d=this,w=[];g.each(this.options.items,function(C,b){var I,k={};if(b){if(C==="controlgroupLabel"){I=d.element.find(b),I.each(function(){var M=g(this);M.children(".ui-controlgroup-label-contents").length||M.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),d._addClass(I,null,"ui-widget ui-widget-content ui-state-default"),w=w.concat(I.get());return}g.fn[C]&&(d["_"+C+"Options"]?k=d["_"+C+"Options"]("middle"):k={classes:{}},d.element.find(b).each(function(){var M=g(this),K=M[C]("instance"),W=g.widget.extend({},k);if(!(C==="button"&&M.parent(".ui-spinner").length)){K||(K=M[C]()[C]("instance")),K&&(W.classes=d._resolveClassesValues(W.classes,K)),M[C](W);var q=M[C]("widget");g.data(q[0],"ui-controlgroup-data",K||M[C]("instance")),w.push(q[0])}}))}}),this.childWidgets=g(g.uniqueSort(w)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(d){this.childWidgets.each(function(){var w=g(this),C=w.data("ui-controlgroup-data");C&&C[d]&&C[d]()})},_updateCornerClass:function(d,w){var C="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",b=this._buildSimpleOptions(w,"label").classes.label;this._removeClass(d,null,C),this._addClass(d,null,b)},_buildSimpleOptions:function(d,w){var C=this.options.direction==="vertical",b={classes:{}};return b.classes[w]={middle:"",first:"ui-corner-"+(C?"top":"left"),last:"ui-corner-"+(C?"bottom":"right"),only:"ui-corner-all"}[d],b},_spinnerOptions:function(d){var w=this._buildSimpleOptions(d,"ui-spinner");return w.classes["ui-spinner-up"]="",w.classes["ui-spinner-down"]="",w},_buttonOptions:function(d){return this._buildSimpleOptions(d,"ui-button")},_checkboxradioOptions:function(d){return this._buildSimpleOptions(d,"ui-checkboxradio-label")},_selectmenuOptions:function(d){var w=this.options.direction==="vertical";return{width:w?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(w?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(w?"top":"left")},last:{"ui-selectmenu-button-open":w?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(w?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[d]}},_resolveClassesValues:function(d,w){var C={};return g.each(d,function(b){var I=w.options.classes[b]||"";I=String.prototype.trim.call(I.replace(ke,"")),C[b]=(I+" "+d[b]).replace(/\s+/g," ")}),C},_setOption:function(d,w){if(d==="direction"&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(d,w),d==="disabled"){this._callChildMethod(w?"disable":"enable");return}this.refresh()},refresh:function(){var d,w=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),this.options.direction==="horizontal"&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),d=this.childWidgets,this.options.onlyVisible&&(d=d.filter(":visible")),d.length&&(g.each(["first","last"],function(C,b){var I=d[b]().data("ui-controlgroup-data");if(I&&w["_"+I.widgetName+"Options"]){var k=w["_"+I.widgetName+"Options"](d.length===1?"only":b);k.classes=w._resolveClassesValues(k.classes,I),I.element[I.widgetName](k)}else w._updateCornerClass(d[b](),b)}),this._callChildMethod("refresh"))}});/*!
+ * jQuery UI Checkboxradio 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.checkboxradio",[g.ui.formResetMixin,{version:"1.13.2",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var d,w,C,b=this._super()||{};return this._readType(),w=this.element.labels(),this.label=g(w[w.length-1]),this.label.length||g.error("No label found for checkboxradio widget"),this.originalLabel="",C=this.label.contents().not(this.element[0]),C.length&&(this.originalLabel+=C.clone().wrapAll("<div></div>").parent().html()),this.originalLabel&&(b.label=this.originalLabel),d=this.element[0].disabled,d!=null&&(b.disabled=d),b},_create:function(){var d=this.element[0].checked;this._bindFormResetHandler(),this.options.disabled==null&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),this.type==="radio"&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),d&&this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var d=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,(d!=="input"||!/radio|checkbox/.test(this.type))&&g.error("Can't create checkboxradio on element.nodeName="+d+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var d,w=this.element[0].name,C="input[name='"+g.escapeSelector(w)+"']";return w?(this.form.length?d=g(this.form[0].elements).filter(C):d=g(C).filter(function(){return g(this)._form().length===0}),d.not(this.element)):g([])},_toggleClasses:function(){var d=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",d),this.options.icon&&this.type==="checkbox"&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",d)._toggleClass(this.icon,null,"ui-icon-blank",!d),this.type==="radio"&&this._getRadioGroup().each(function(){var w=g(this).checkboxradio("instance");w&&w._removeClass(w.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(d,w){if(!(d==="label"&&!w)){if(this._super(d,w),d==="disabled"){this._toggleClass(this.label,null,"ui-state-disabled",w),this.element[0].disabled=w;return}this.refresh()}},_updateIcon:function(d){var w="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=g("<span>"),this.iconSpace=g("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),this.type==="checkbox"?(w+=d?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,d?"ui-icon-blank":"ui-icon-check")):w+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",w),d||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):this.icon!==void 0&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var d=this.label.contents().not(this.element[0]);this.icon&&(d=d.not(this.icon[0])),this.iconSpace&&(d=d.not(this.iconSpace[0])),d.remove(),this.label.append(this.options.label)},refresh:function(){var d=this.element[0].checked,w=this.element[0].disabled;this._updateIcon(d),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",d),this.options.label!==null&&this._updateLabel(),w!==this.options.disabled&&this._setOptions({disabled:w})}}]),g.ui.checkboxradio;/*!
+ * jQuery UI Button 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.button",{version:"1.13.2",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var d,w=this._super()||{};return this.isInput=this.element.is("input"),d=this.element[0].disabled,d!=null&&(w.disabled=d),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(w.label=this.originalLabel),w},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),this.options.disabled==null&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(d){d.keyCode===g.ui.keyCode.SPACE&&(d.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),!this.options.showLabel&&!this.title&&this.element.attr("title",this.options.label)},_updateIcon:function(d,w){var C=d!=="iconPosition",b=C?this.options.iconPosition:w,I=b==="top"||b==="bottom";this.icon?C&&this._removeClass(this.icon,null,this.options.icon):(this.icon=g("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),C&&this._addClass(this.icon,null,w),this._attachIcon(b),I?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=g("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(b))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(d){this.icon[/^(?:end|bottom)/.test(d)?"before":"after"](this.iconSpace)},_attachIcon:function(d){this.element[/^(?:end|bottom)/.test(d)?"append":"prepend"](this.icon)},_setOptions:function(d){var w=d.showLabel===void 0?this.options.showLabel:d.showLabel,C=d.icon===void 0?this.options.icon:d.icon;!w&&!C&&(d.showLabel=!0),this._super(d)},_setOption:function(d,w){d==="icon"&&(w?this._updateIcon(d,w):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),d==="iconPosition"&&this._updateIcon(d,w),d==="showLabel"&&(this._toggleClass("ui-button-icon-only",null,!w),this._updateTooltip()),d==="label"&&(this.isInput?this.element.val(w):(this.element.html(w),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(d,w),d==="disabled"&&(this._toggleClass(null,"ui-state-disabled",w),this.element[0].disabled=w,w&&this.element.trigger("blur"))},refresh:function(){var d=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");d!==this.options.disabled&&this._setOptions({disabled:d}),this._updateTooltip()}}),g.uiBackCompat!==!1&&(g.widget("ui.button",g.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),!this.options.icon&&(this.options.icons.primary||this.options.icons.secondary)?this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"):this.options.icon&&(this.options.icons.primary=this.options.icon),this._super()},_setOption:function(d,w){if(d==="text"){this._super("showLabel",w);return}d==="showLabel"&&(this.options.text=w),d==="icon"&&(this.options.icons.primary=w),d==="icons"&&(w.primary?(this._super("icon",w.primary),this._super("iconPosition","beginning")):w.secondary&&(this._super("icon",w.secondary),this._super("iconPosition","end"))),this._superApply(arguments)}}),g.fn.button=function(d){return function(w){var C=typeof w=="string",b=Array.prototype.slice.call(arguments,1),I=this;return C?!this.length&&w==="instance"?I=void 0:this.each(function(){var k,M=g(this).attr("type"),K=M!=="checkbox"&&M!=="radio"?"button":"checkboxradio",W=g.data(this,"ui-"+K);if(w==="instance")return I=W,!1;if(!W)return g.error("cannot call methods on button prior to initialization; attempted to call method '"+w+"'");if(typeof W[w]!="function"||w.charAt(0)==="_")return g.error("no such method '"+w+"' for button widget instance");if(k=W[w].apply(W,b),k!==W&&k!==void 0)return I=k&&k.jquery?I.pushStack(k.get()):k,!1}):(b.length&&(w=g.widget.extend.apply(null,[w].concat(b))),this.each(function(){var k=g(this).attr("type"),M=k!=="checkbox"&&k!=="radio"?"button":"checkboxradio",K=g.data(this,"ui-"+M);if(K)K.option(w||{}),K._init&&K._init();else{if(M==="button"){d.call(g(this),w);return}g(this).checkboxradio(g.extend({icon:!1},w))}})),I}}(g.fn.button),g.fn.buttonset=function(){return g.ui.controlgroup||g.error("Controlgroup widget missing"),arguments[0]==="option"&&arguments[1]==="items"&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):arguments[0]==="option"&&arguments[1]==="items"?this.controlgroup.apply(this,[arguments[0],"items.button"]):(typeof arguments[0]=="object"&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),g.ui.button;/*!
+ * jQuery UI Datepicker 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.extend(g.ui,{datepicker:{version:"1.13.2"}});var Me;function ze(d){for(var w,C;d.length&&d[0]!==document;){if(w=d.css("position"),(w==="absolute"||w==="relative"||w==="fixed")&&(C=parseInt(d.css("zIndex"),10),!isNaN(C)&&C!==0))return C;d=d.parent()}return 0}function Je(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:"",selectMonthLabel:"Select month",selectYearLabel:"Select year"},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,onUpdateDatepicker:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},g.extend(this._defaults,this.regional[""]),this.regional.en=g.extend(!0,{},this.regional[""]),this.regional["en-US"]=g.extend(!0,{},this.regional.en),this.dpDiv=ft(g("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}g.extend(Je.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(d){return ht(this._defaults,d||{}),this},_attachDatepicker:function(d,w){var C,b,I;C=d.nodeName.toLowerCase(),b=C==="div"||C==="span",d.id||(this.uuid+=1,d.id="dp"+this.uuid),I=this._newInst(g(d),b),I.settings=g.extend({},w||{}),C==="input"?this._connectDatepicker(d,I):b&&this._inlineDatepicker(d,I)},_newInst:function(d,w){var C=d[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:C,input:d,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:w,dpDiv:w?ft(g("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(d,w){var C=g(d);w.append=g([]),w.trigger=g([]),!C.hasClass(this.markerClassName)&&(this._attachments(C,w),C.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(w),g.data(d,"datepicker",w),w.settings.disabled&&this._disableDatepicker(d))},_attachments:function(d,w){var C,b,I,k=this._get(w,"appendText"),M=this._get(w,"isRTL");w.append&&w.append.remove(),k&&(w.append=g("<span>").addClass(this._appendClass).text(k),d[M?"before":"after"](w.append)),d.off("focus",this._showDatepicker),w.trigger&&w.trigger.remove(),C=this._get(w,"showOn"),(C==="focus"||C==="both")&&d.on("focus",this._showDatepicker),(C==="button"||C==="both")&&(b=this._get(w,"buttonText"),I=this._get(w,"buttonImage"),this._get(w,"buttonImageOnly")?w.trigger=g("<img>").addClass(this._triggerClass).attr({src:I,alt:b,title:b}):(w.trigger=g("<button type='button'>").addClass(this._triggerClass),I?w.trigger.html(g("<img>").attr({src:I,alt:b,title:b})):w.trigger.text(b)),d[M?"before":"after"](w.trigger),w.trigger.on("click",function(){return g.datepicker._datepickerShowing&&g.datepicker._lastInput===d[0]?g.datepicker._hideDatepicker():(g.datepicker._datepickerShowing&&g.datepicker._lastInput!==d[0]&&g.datepicker._hideDatepicker(),g.datepicker._showDatepicker(d[0])),!1}))},_autoSize:function(d){if(this._get(d,"autoSize")&&!d.inline){var w,C,b,I,k=new Date(2009,11,20),M=this._get(d,"dateFormat");M.match(/[DM]/)&&(w=function(K){for(C=0,b=0,I=0;I<K.length;I++)K[I].length>C&&(C=K[I].length,b=I);return b},k.setMonth(w(this._get(d,M.match(/MM/)?"monthNames":"monthNamesShort"))),k.setDate(w(this._get(d,M.match(/DD/)?"dayNames":"dayNamesShort"))+20-k.getDay())),d.input.attr("size",this._formatDate(d,k).length)}},_inlineDatepicker:function(d,w){var C=g(d);C.hasClass(this.markerClassName)||(C.addClass(this.markerClassName).append(w.dpDiv),g.data(d,"datepicker",w),this._setDate(w,this._getDefaultDate(w),!0),this._updateDatepicker(w),this._updateAlternate(w),w.settings.disabled&&this._disableDatepicker(d),w.dpDiv.css("display","block"))},_dialogDatepicker:function(d,w,C,b,I){var k,M,K,W,q,te=this._dialogInst;return te||(this.uuid+=1,k="dp"+this.uuid,this._dialogInput=g("<input type='text' id='"+k+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),g("body").append(this._dialogInput),te=this._dialogInst=this._newInst(this._dialogInput,!1),te.settings={},g.data(this._dialogInput[0],"datepicker",te)),ht(te.settings,b||{}),w=w&&w.constructor===Date?this._formatDate(te,w):w,this._dialogInput.val(w),this._pos=I?I.length?I:[I.pageX,I.pageY]:null,this._pos||(M=document.documentElement.clientWidth,K=document.documentElement.clientHeight,W=document.documentElement.scrollLeft||document.body.scrollLeft,q=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[M/2-100+W,K/2-150+q]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),te.settings.onSelect=C,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),g.blockUI&&g.blockUI(this.dpDiv),g.data(this._dialogInput[0],"datepicker",te),this},_destroyDatepicker:function(d){var w,C=g(d),b=g.data(d,"datepicker");C.hasClass(this.markerClassName)&&(w=d.nodeName.toLowerCase(),g.removeData(d,"datepicker"),w==="input"?(b.append.remove(),b.trigger.remove(),C.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):(w==="div"||w==="span")&&C.removeClass(this.markerClassName).empty(),Me===b&&(Me=null,this._curInst=null))},_enableDatepicker:function(d){var w,C,b=g(d),I=g.data(d,"datepicker");b.hasClass(this.markerClassName)&&(w=d.nodeName.toLowerCase(),w==="input"?(d.disabled=!1,I.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):(w==="div"||w==="span")&&(C=b.children("."+this._inlineClass),C.children().removeClass("ui-state-disabled"),C.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=g.map(this._disabledInputs,function(k){return k===d?null:k}))},_disableDatepicker:function(d){var w,C,b=g(d),I=g.data(d,"datepicker");b.hasClass(this.markerClassName)&&(w=d.nodeName.toLowerCase(),w==="input"?(d.disabled=!0,I.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):(w==="div"||w==="span")&&(C=b.children("."+this._inlineClass),C.children().addClass("ui-state-disabled"),C.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=g.map(this._disabledInputs,function(k){return k===d?null:k}),this._disabledInputs[this._disabledInputs.length]=d)},_isDisabledDatepicker:function(d){if(!d)return!1;for(var w=0;w<this._disabledInputs.length;w++)if(this._disabledInputs[w]===d)return!0;return!1},_getInst:function(d){try{return g.data(d,"datepicker")}catch{throw"Missing instance data for this datepicker"}},_optionDatepicker:function(d,w,C){var b,I,k,M,K=this._getInst(d);if(arguments.length===2&&typeof w=="string")return w==="defaults"?g.extend({},g.datepicker._defaults):K?w==="all"?g.extend({},K.settings):this._get(K,w):null;b=w||{},typeof w=="string"&&(b={},b[w]=C),K&&(this._curInst===K&&this._hideDatepicker(),I=this._getDateDatepicker(d,!0),k=this._getMinMaxDate(K,"min"),M=this._getMinMaxDate(K,"max"),ht(K.settings,b),k!==null&&b.dateFormat!==void 0&&b.minDate===void 0&&(K.settings.minDate=this._formatDate(K,k)),M!==null&&b.dateFormat!==void 0&&b.maxDate===void 0&&(K.settings.maxDate=this._formatDate(K,M)),"disabled"in b&&(b.disabled?this._disableDatepicker(d):this._enableDatepicker(d)),this._attachments(g(d),K),this._autoSize(K),this._setDate(K,I),this._updateAlternate(K),this._updateDatepicker(K))},_changeDatepicker:function(d,w,C){this._optionDatepicker(d,w,C)},_refreshDatepicker:function(d){var w=this._getInst(d);w&&this._updateDatepicker(w)},_setDateDatepicker:function(d,w){var C=this._getInst(d);C&&(this._setDate(C,w),this._updateDatepicker(C),this._updateAlternate(C))},_getDateDatepicker:function(d,w){var C=this._getInst(d);return C&&!C.inline&&this._setDateFromField(C,w),C?this._getDate(C):null},_doKeyDown:function(d){var w,C,b,I=g.datepicker._getInst(d.target),k=!0,M=I.dpDiv.is(".ui-datepicker-rtl");if(I._keyEvent=!0,g.datepicker._datepickerShowing)switch(d.keyCode){case 9:g.datepicker._hideDatepicker(),k=!1;break;case 13:return b=g("td."+g.datepicker._dayOverClass+":not(."+g.datepicker._currentClass+")",I.dpDiv),b[0]&&g.datepicker._selectDay(d.target,I.selectedMonth,I.selectedYear,b[0]),w=g.datepicker._get(I,"onSelect"),w?(C=g.datepicker._formatDate(I),w.apply(I.input?I.input[0]:null,[C,I])):g.datepicker._hideDatepicker(),!1;case 27:g.datepicker._hideDatepicker();break;case 33:g.datepicker._adjustDate(d.target,d.ctrlKey?-g.datepicker._get(I,"stepBigMonths"):-g.datepicker._get(I,"stepMonths"),"M");break;case 34:g.datepicker._adjustDate(d.target,d.ctrlKey?+g.datepicker._get(I,"stepBigMonths"):+g.datepicker._get(I,"stepMonths"),"M");break;case 35:(d.ctrlKey||d.metaKey)&&g.datepicker._clearDate(d.target),k=d.ctrlKey||d.metaKey;break;case 36:(d.ctrlKey||d.metaKey)&&g.datepicker._gotoToday(d.target),k=d.ctrlKey||d.metaKey;break;case 37:(d.ctrlKey||d.metaKey)&&g.datepicker._adjustDate(d.target,M?1:-1,"D"),k=d.ctrlKey||d.metaKey,d.originalEvent.altKey&&g.datepicker._adjustDate(d.target,d.ctrlKey?-g.datepicker._get(I,"stepBigMonths"):-g.datepicker._get(I,"stepMonths"),"M");break;case 38:(d.ctrlKey||d.metaKey)&&g.datepicker._adjustDate(d.target,-7,"D"),k=d.ctrlKey||d.metaKey;break;case 39:(d.ctrlKey||d.metaKey)&&g.datepicker._adjustDate(d.target,M?-1:1,"D"),k=d.ctrlKey||d.metaKey,d.originalEvent.altKey&&g.datepicker._adjustDate(d.target,d.ctrlKey?+g.datepicker._get(I,"stepBigMonths"):+g.datepicker._get(I,"stepMonths"),"M");break;case 40:(d.ctrlKey||d.metaKey)&&g.datepicker._adjustDate(d.target,7,"D"),k=d.ctrlKey||d.metaKey;break;default:k=!1}else d.keyCode===36&&d.ctrlKey?g.datepicker._showDatepicker(this):k=!1;k&&(d.preventDefault(),d.stopPropagation())},_doKeyPress:function(d){var w,C,b=g.datepicker._getInst(d.target);if(g.datepicker._get(b,"constrainInput"))return w=g.datepicker._possibleChars(g.datepicker._get(b,"dateFormat")),C=String.fromCharCode(d.charCode==null?d.keyCode:d.charCode),d.ctrlKey||d.metaKey||C<" "||!w||w.indexOf(C)>-1},_doKeyUp:function(d){var w,C=g.datepicker._getInst(d.target);if(C.input.val()!==C.lastVal)try{w=g.datepicker.parseDate(g.datepicker._get(C,"dateFormat"),C.input?C.input.val():null,g.datepicker._getFormatConfig(C)),w&&(g.datepicker._setDateFromField(C),g.datepicker._updateAlternate(C),g.datepicker._updateDatepicker(C))}catch{}return!0},_showDatepicker:function(d){if(d=d.target||d,d.nodeName.toLowerCase()!=="input"&&(d=g("input",d.parentNode)[0]),!(g.datepicker._isDisabledDatepicker(d)||g.datepicker._lastInput===d)){var w,C,b,I,k,M,K;w=g.datepicker._getInst(d),g.datepicker._curInst&&g.datepicker._curInst!==w&&(g.datepicker._curInst.dpDiv.stop(!0,!0),w&&g.datepicker._datepickerShowing&&g.datepicker._hideDatepicker(g.datepicker._curInst.input[0])),C=g.datepicker._get(w,"beforeShow"),b=C?C.apply(d,[d,w]):{},b!==!1&&(ht(w.settings,b),w.lastVal=null,g.datepicker._lastInput=d,g.datepicker._setDateFromField(w),g.datepicker._inDialog&&(d.value=""),g.datepicker._pos||(g.datepicker._pos=g.datepicker._findPos(d),g.datepicker._pos[1]+=d.offsetHeight),I=!1,g(d).parents().each(function(){return I|=g(this).css("position")==="fixed",!I}),k={left:g.datepicker._pos[0],top:g.datepicker._pos[1]},g.datepicker._pos=null,w.dpDiv.empty(),w.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),g.datepicker._updateDatepicker(w),k=g.datepicker._checkOffset(w,k,I),w.dpDiv.css({position:g.datepicker._inDialog&&g.blockUI?"static":I?"fixed":"absolute",display:"none",left:k.left+"px",top:k.top+"px"}),w.inline||(M=g.datepicker._get(w,"showAnim"),K=g.datepicker._get(w,"duration"),w.dpDiv.css("z-index",ze(g(d))+1),g.datepicker._datepickerShowing=!0,g.effects&&g.effects.effect[M]?w.dpDiv.show(M,g.datepicker._get(w,"showOptions"),K):w.dpDiv[M||"show"](M?K:null),g.datepicker._shouldFocusInput(w)&&w.input.trigger("focus"),g.datepicker._curInst=w))}},_updateDatepicker:function(d){this.maxRows=4,Me=d,d.dpDiv.empty().append(this._generateHTML(d)),this._attachHandlers(d);var w,C=this._getNumberOfMonths(d),b=C[1],I=17,k=d.dpDiv.find("."+this._dayOverClass+" a"),M=g.datepicker._get(d,"onUpdateDatepicker");k.length>0&&at.apply(k.get(0)),d.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),b>1&&d.dpDiv.addClass("ui-datepicker-multi-"+b).css("width",I*b+"em"),d.dpDiv[(C[0]!==1||C[1]!==1?"add":"remove")+"Class"]("ui-datepicker-multi"),d.dpDiv[(this._get(d,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),d===g.datepicker._curInst&&g.datepicker._datepickerShowing&&g.datepicker._shouldFocusInput(d)&&d.input.trigger("focus"),d.yearshtml&&(w=d.yearshtml,setTimeout(function(){w===d.yearshtml&&d.yearshtml&&d.dpDiv.find("select.ui-datepicker-year").first().replaceWith(d.yearshtml),w=d.yearshtml=null},0)),M&&M.apply(d.input?d.input[0]:null,[d])},_shouldFocusInput:function(d){return d.input&&d.input.is(":visible")&&!d.input.is(":disabled")&&!d.input.is(":focus")},_checkOffset:function(d,w,C){var b=d.dpDiv.outerWidth(),I=d.dpDiv.outerHeight(),k=d.input?d.input.outerWidth():0,M=d.input?d.input.outerHeight():0,K=document.documentElement.clientWidth+(C?0:g(document).scrollLeft()),W=document.documentElement.clientHeight+(C?0:g(document).scrollTop());return w.left-=this._get(d,"isRTL")?b-k:0,w.left-=C&&w.left===d.input.offset().left?g(document).scrollLeft():0,w.top-=C&&w.top===d.input.offset().top+M?g(document).scrollTop():0,w.left-=Math.min(w.left,w.left+b>K&&K>b?Math.abs(w.left+b-K):0),w.top-=Math.min(w.top,w.top+I>W&&W>I?Math.abs(I+M):0),w},_findPos:function(d){for(var w,C=this._getInst(d),b=this._get(C,"isRTL");d&&(d.type==="hidden"||d.nodeType!==1||g.expr.pseudos.hidden(d));)d=d[b?"previousSibling":"nextSibling"];return w=g(d).offset(),[w.left,w.top]},_hideDatepicker:function(d){var w,C,b,I,k=this._curInst;!k||d&&k!==g.data(d,"datepicker")||this._datepickerShowing&&(w=this._get(k,"showAnim"),C=this._get(k,"duration"),b=function(){g.datepicker._tidyDialog(k)},g.effects&&(g.effects.effect[w]||g.effects[w])?k.dpDiv.hide(w,g.datepicker._get(k,"showOptions"),C,b):k.dpDiv[w==="slideDown"?"slideUp":w==="fadeIn"?"fadeOut":"hide"](w?C:null,b),w||b(),this._datepickerShowing=!1,I=this._get(k,"onClose"),I&&I.apply(k.input?k.input[0]:null,[k.input?k.input.val():"",k]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),g.blockUI&&(g.unblockUI(),g("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(d){d.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(d){if(g.datepicker._curInst){var w=g(d.target),C=g.datepicker._getInst(w[0]);(w[0].id!==g.datepicker._mainDivId&&w.parents("#"+g.datepicker._mainDivId).length===0&&!w.hasClass(g.datepicker.markerClassName)&&!w.closest("."+g.datepicker._triggerClass).length&&g.datepicker._datepickerShowing&&!(g.datepicker._inDialog&&g.blockUI)||w.hasClass(g.datepicker.markerClassName)&&g.datepicker._curInst!==C)&&g.datepicker._hideDatepicker()}},_adjustDate:function(d,w,C){var b=g(d),I=this._getInst(b[0]);this._isDisabledDatepicker(b[0])||(this._adjustInstDate(I,w,C),this._updateDatepicker(I))},_gotoToday:function(d){var w,C=g(d),b=this._getInst(C[0]);this._get(b,"gotoCurrent")&&b.currentDay?(b.selectedDay=b.currentDay,b.drawMonth=b.selectedMonth=b.currentMonth,b.drawYear=b.selectedYear=b.currentYear):(w=new Date,b.selectedDay=w.getDate(),b.drawMonth=b.selectedMonth=w.getMonth(),b.drawYear=b.selectedYear=w.getFullYear()),this._notifyChange(b),this._adjustDate(C)},_selectMonthYear:function(d,w,C){var b=g(d),I=this._getInst(b[0]);I["selected"+(C==="M"?"Month":"Year")]=I["draw"+(C==="M"?"Month":"Year")]=parseInt(w.options[w.selectedIndex].value,10),this._notifyChange(I),this._adjustDate(b)},_selectDay:function(d,w,C,b){var I,k=g(d);g(b).hasClass(this._unselectableClass)||this._isDisabledDatepicker(k[0])||(I=this._getInst(k[0]),I.selectedDay=I.currentDay=parseInt(g("a",b).attr("data-date")),I.selectedMonth=I.currentMonth=w,I.selectedYear=I.currentYear=C,this._selectDate(d,this._formatDate(I,I.currentDay,I.currentMonth,I.currentYear)))},_clearDate:function(d){var w=g(d);this._selectDate(w,"")},_selectDate:function(d,w){var C,b=g(d),I=this._getInst(b[0]);w=w??this._formatDate(I),I.input&&I.input.val(w),this._updateAlternate(I),C=this._get(I,"onSelect"),C?C.apply(I.input?I.input[0]:null,[w,I]):I.input&&I.input.trigger("change"),I.inline?this._updateDatepicker(I):(this._hideDatepicker(),this._lastInput=I.input[0],typeof I.input[0]!="object"&&I.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(d){var w,C,b,I=this._get(d,"altField");I&&(w=this._get(d,"altFormat")||this._get(d,"dateFormat"),C=this._getDate(d),b=this.formatDate(w,C,this._getFormatConfig(d)),g(document).find(I).val(b))},noWeekends:function(d){var w=d.getDay();return[w>0&&w<6,""]},iso8601Week:function(d){var w,C=new Date(d.getTime());return C.setDate(C.getDate()+4-(C.getDay()||7)),w=C.getTime(),C.setMonth(0),C.setDate(1),Math.floor(Math.round((w-C)/864e5)/7)+1},parseDate:function(d,w,C){if(d==null||w==null)throw"Invalid arguments";if(w=typeof w=="object"?w.toString():w+"",w==="")return null;var b,I,k,M=0,K=(C?C.shortYearCutoff:null)||this._defaults.shortYearCutoff,W=typeof K!="string"?K:new Date().getFullYear()%100+parseInt(K,10),q=(C?C.dayNamesShort:null)||this._defaults.dayNamesShort,te=(C?C.dayNames:null)||this._defaults.dayNames,he=(C?C.monthNamesShort:null)||this._defaults.monthNamesShort,ne=(C?C.monthNames:null)||this._defaults.monthNames,ie=-1,re=-1,ce=-1,Be=-1,Fe=!1,Te,Ne=function(Ye){var qe=b+1<d.length&&d.charAt(b+1)===Ye;return qe&&b++,qe},Oe=function(Ye){var qe=Ne(Ye),Xe=Ye==="@"?14:Ye==="!"?20:Ye==="y"&&qe?4:Ye==="o"?3:2,rt=Ye==="y"?Xe:1,$e=new RegExp("^\\d{"+rt+","+Xe+"}"),pt=w.substring(M).match($e);if(!pt)throw"Missing number at position "+M;return M+=pt[0].length,parseInt(pt[0],10)},De=function(Ye,qe,Xe){var rt=-1,$e=g.map(Ne(Ye)?Xe:qe,function(pt,gt){return[[gt,pt]]}).sort(function(pt,gt){return-(pt[1].length-gt[1].length)});if(g.each($e,function(pt,gt){var Qt=gt[1];if(w.substr(M,Qt.length).toLowerCase()===Qt.toLowerCase())return rt=gt[0],M+=Qt.length,!1}),rt!==-1)return rt+1;throw"Unknown name at position "+M},et=function(){if(w.charAt(M)!==d.charAt(b))throw"Unexpected literal at position "+M;M++};for(b=0;b<d.length;b++)if(Fe)d.charAt(b)==="'"&&!Ne("'")?Fe=!1:et();else switch(d.charAt(b)){case"d":ce=Oe("d");break;case"D":De("D",q,te);break;case"o":Be=Oe("o");break;case"m":re=Oe("m");break;case"M":re=De("M",he,ne);break;case"y":ie=Oe("y");break;case"@":Te=new Date(Oe("@")),ie=Te.getFullYear(),re=Te.getMonth()+1,ce=Te.getDate();break;case"!":Te=new Date((Oe("!")-this._ticksTo1970)/1e4),ie=Te.getFullYear(),re=Te.getMonth()+1,ce=Te.getDate();break;case"'":Ne("'")?et():Fe=!0;break;default:et()}if(M<w.length&&(k=w.substr(M),!/^\s+/.test(k)))throw"Extra/unparsed characters found in date: "+k;if(ie===-1?ie=new Date().getFullYear():ie<100&&(ie+=new Date().getFullYear()-new Date().getFullYear()%100+(ie<=W?0:-100)),Be>-1){re=1,ce=Be;do{if(I=this._getDaysInMonth(ie,re-1),ce<=I)break;re++,ce-=I}while(!0)}if(Te=this._daylightSavingAdjust(new Date(ie,re-1,ce)),Te.getFullYear()!==ie||Te.getMonth()+1!==re||Te.getDate()!==ce)throw"Invalid date";return Te},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:((1970-1)*365+Math.floor(1970/4)-Math.floor(1970/100)+Math.floor(1970/400))*24*60*60*1e7,formatDate:function(d,w,C){if(!w)return"";var b,I=(C?C.dayNamesShort:null)||this._defaults.dayNamesShort,k=(C?C.dayNames:null)||this._defaults.dayNames,M=(C?C.monthNamesShort:null)||this._defaults.monthNamesShort,K=(C?C.monthNames:null)||this._defaults.monthNames,W=function(ie){var re=b+1<d.length&&d.charAt(b+1)===ie;return re&&b++,re},q=function(ie,re,ce){var Be=""+re;if(W(ie))for(;Be.length<ce;)Be="0"+Be;return Be},te=function(ie,re,ce,Be){return W(ie)?Be[re]:ce[re]},he="",ne=!1;if(w)for(b=0;b<d.length;b++)if(ne)d.charAt(b)==="'"&&!W("'")?ne=!1:he+=d.charAt(b);else switch(d.charAt(b)){case"d":he+=q("d",w.getDate(),2);break;case"D":he+=te("D",w.getDay(),I,k);break;case"o":he+=q("o",Math.round((new Date(w.getFullYear(),w.getMonth(),w.getDate()).getTime()-new Date(w.getFullYear(),0,0).getTime())/864e5),3);break;case"m":he+=q("m",w.getMonth()+1,2);break;case"M":he+=te("M",w.getMonth(),M,K);break;case"y":he+=W("y")?w.getFullYear():(w.getFullYear()%100<10?"0":"")+w.getFullYear()%100;break;case"@":he+=w.getTime();break;case"!":he+=w.getTime()*1e4+this._ticksTo1970;break;case"'":W("'")?he+="'":ne=!0;break;default:he+=d.charAt(b)}return he},_possibleChars:function(d){var w,C="",b=!1,I=function(k){var M=w+1<d.length&&d.charAt(w+1)===k;return M&&w++,M};for(w=0;w<d.length;w++)if(b)d.charAt(w)==="'"&&!I("'")?b=!1:C+=d.charAt(w);else switch(d.charAt(w)){case"d":case"m":case"y":case"@":C+="0123456789";break;case"D":case"M":return null;case"'":I("'")?C+="'":b=!0;break;default:C+=d.charAt(w)}return C},_get:function(d,w){return d.settings[w]!==void 0?d.settings[w]:this._defaults[w]},_setDateFromField:function(d,w){if(d.input.val()!==d.lastVal){var C=this._get(d,"dateFormat"),b=d.lastVal=d.input?d.input.val():null,I=this._getDefaultDate(d),k=I,M=this._getFormatConfig(d);try{k=this.parseDate(C,b,M)||I}catch{b=w?"":b}d.selectedDay=k.getDate(),d.drawMonth=d.selectedMonth=k.getMonth(),d.drawYear=d.selectedYear=k.getFullYear(),d.currentDay=b?k.getDate():0,d.currentMonth=b?k.getMonth():0,d.currentYear=b?k.getFullYear():0,this._adjustInstDate(d)}},_getDefaultDate:function(d){return this._restrictMinMax(d,this._determineDate(d,this._get(d,"defaultDate"),new Date))},_determineDate:function(d,w,C){var b=function(M){var K=new Date;return K.setDate(K.getDate()+M),K},I=function(M){try{return g.datepicker.parseDate(g.datepicker._get(d,"dateFormat"),M,g.datepicker._getFormatConfig(d))}catch{}for(var K=(M.toLowerCase().match(/^c/)?g.datepicker._getDate(d):null)||new Date,W=K.getFullYear(),q=K.getMonth(),te=K.getDate(),he=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,ne=he.exec(M);ne;){switch(ne[2]||"d"){case"d":case"D":te+=parseInt(ne[1],10);break;case"w":case"W":te+=parseInt(ne[1],10)*7;break;case"m":case"M":q+=parseInt(ne[1],10),te=Math.min(te,g.datepicker._getDaysInMonth(W,q));break;case"y":case"Y":W+=parseInt(ne[1],10),te=Math.min(te,g.datepicker._getDaysInMonth(W,q));break}ne=he.exec(M)}return new Date(W,q,te)},k=w==null||w===""?C:typeof w=="string"?I(w):typeof w=="number"?isNaN(w)?C:b(w):new Date(w.getTime());return k=k&&k.toString()==="Invalid Date"?C:k,k&&(k.setHours(0),k.setMinutes(0),k.setSeconds(0),k.setMilliseconds(0)),this._daylightSavingAdjust(k)},_daylightSavingAdjust:function(d){return d?(d.setHours(d.getHours()>12?d.getHours()+2:0),d):null},_setDate:function(d,w,C){var b=!w,I=d.selectedMonth,k=d.selectedYear,M=this._restrictMinMax(d,this._determineDate(d,w,new Date));d.selectedDay=d.currentDay=M.getDate(),d.drawMonth=d.selectedMonth=d.currentMonth=M.getMonth(),d.drawYear=d.selectedYear=d.currentYear=M.getFullYear(),(I!==d.selectedMonth||k!==d.selectedYear)&&!C&&this._notifyChange(d),this._adjustInstDate(d),d.input&&d.input.val(b?"":this._formatDate(d))},_getDate:function(d){var w=!d.currentYear||d.input&&d.input.val()===""?null:this._daylightSavingAdjust(new Date(d.currentYear,d.currentMonth,d.currentDay));return w},_attachHandlers:function(d){var w=this._get(d,"stepMonths"),C="#"+d.id.replace(/\\\\/g,"\\");d.dpDiv.find("[data-handler]").map(function(){var b={prev:function(){g.datepicker._adjustDate(C,-w,"M")},next:function(){g.datepicker._adjustDate(C,+w,"M")},hide:function(){g.datepicker._hideDatepicker()},today:function(){g.datepicker._gotoToday(C)},selectDay:function(){return g.datepicker._selectDay(C,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return g.datepicker._selectMonthYear(C,this,"M"),!1},selectYear:function(){return g.datepicker._selectMonthYear(C,this,"Y"),!1}};g(this).on(this.getAttribute("data-event"),b[this.getAttribute("data-handler")])})},_generateHTML:function(d){var w,C,b,I,k,M,K,W,q,te,he,ne,ie,re,ce,Be,Fe,Te,Ne,Oe,De,et,Ye,qe,Xe,rt,$e,pt,gt,Qt,xt,qt,_t,Ge,Kt,At,Ct,bt,kt,zt=new Date,St=this._daylightSavingAdjust(new Date(zt.getFullYear(),zt.getMonth(),zt.getDate())),wt=this._get(d,"isRTL"),Fi=this._get(d,"showButtonPanel"),pi=this._get(d,"hideIfNoPrevNext"),Bi=this._get(d,"navigationAsDateFormat"),Ut=this._getNumberOfMonths(d),se=this._get(d,"showCurrentAtPos"),pe=this._get(d,"stepMonths"),de=Ut[0]!==1||Ut[1]!==1,Ee=this._daylightSavingAdjust(d.currentDay?new Date(d.currentYear,d.currentMonth,d.currentDay):new Date(9999,9,9)),Ie=this._getMinMaxDate(d,"min"),be=this._getMinMaxDate(d,"max"),Le=d.drawMonth-se,je=d.drawYear;if(Le<0&&(Le+=12,je--),be)for(w=this._daylightSavingAdjust(new Date(be.getFullYear(),be.getMonth()-Ut[0]*Ut[1]+1,be.getDate())),w=Ie&&w<Ie?Ie:w;this._daylightSavingAdjust(new Date(je,Le,1))>w;)Le--,Le<0&&(Le=11,je--);for(d.drawMonth=Le,d.drawYear=je,C=this._get(d,"prevText"),C=Bi?this.formatDate(C,this._daylightSavingAdjust(new Date(je,Le-pe,1)),this._getFormatConfig(d)):C,this._canAdjustMonth(d,-1,je,Le)?b=g("<a>").attr({class:"ui-datepicker-prev ui-corner-all","data-handler":"prev","data-event":"click",title:C}).append(g("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(wt?"e":"w")).text(C))[0].outerHTML:pi?b="":b=g("<a>").attr({class:"ui-datepicker-prev ui-corner-all ui-state-disabled",title:C}).append(g("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(wt?"e":"w")).text(C))[0].outerHTML,I=this._get(d,"nextText"),I=Bi?this.formatDate(I,this._daylightSavingAdjust(new Date(je,Le+pe,1)),this._getFormatConfig(d)):I,this._canAdjustMonth(d,1,je,Le)?k=g("<a>").attr({class:"ui-datepicker-next ui-corner-all","data-handler":"next","data-event":"click",title:I}).append(g("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(wt?"w":"e")).text(I))[0].outerHTML:pi?k="":k=g("<a>").attr({class:"ui-datepicker-next ui-corner-all ui-state-disabled",title:I}).append(g("<span>").attr("class","ui-icon ui-icon-circle-triangle-"+(wt?"w":"e")).text(I))[0].outerHTML,M=this._get(d,"currentText"),K=this._get(d,"gotoCurrent")&&d.currentDay?Ee:St,M=Bi?this.formatDate(M,K,this._getFormatConfig(d)):M,W="",d.inline||(W=g("<button>").attr({type:"button",class:"ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all","data-handler":"hide","data-event":"click"}).text(this._get(d,"closeText"))[0].outerHTML),q="",Fi&&(q=g("<div class='ui-datepicker-buttonpane ui-widget-content'>").append(wt?W:"").append(this._isInRange(d,K)?g("<button>").attr({type:"button",class:"ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all","data-handler":"today","data-event":"click"}).text(M):"").append(wt?"":W)[0].outerHTML),te=parseInt(this._get(d,"firstDay"),10),te=isNaN(te)?0:te,he=this._get(d,"showWeek"),ne=this._get(d,"dayNames"),ie=this._get(d,"dayNamesMin"),re=this._get(d,"monthNames"),ce=this._get(d,"monthNamesShort"),Be=this._get(d,"beforeShowDay"),Fe=this._get(d,"showOtherMonths"),Te=this._get(d,"selectOtherMonths"),Ne=this._getDefaultDate(d),Oe="",et=0;et<Ut[0];et++){for(Ye="",this.maxRows=4,qe=0;qe<Ut[1];qe++){if(Xe=this._daylightSavingAdjust(new Date(je,Le,d.selectedDay)),rt=" ui-corner-all",$e="",de){if($e+="<div class='ui-datepicker-group",Ut[1]>1)switch(qe){case 0:$e+=" ui-datepicker-group-first",rt=" ui-corner-"+(wt?"right":"left");break;case Ut[1]-1:$e+=" ui-datepicker-group-last",rt=" ui-corner-"+(wt?"left":"right");break;default:$e+=" ui-datepicker-group-middle",rt="";break}$e+="'>"}for($e+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+rt+"'>"+(/all|left/.test(rt)&&et===0?wt?k:b:"")+(/all|right/.test(rt)&&et===0?wt?b:k:"")+this._generateMonthYearHeader(d,Le,je,Ie,be,et>0||qe>0,re,ce)+"</div><table class='ui-datepicker-calendar'><thead><tr>",pt=he?"<th class='ui-datepicker-week-col'>"+this._get(d,"weekHeader")+"</th>":"",De=0;De<7;De++)gt=(De+te)%7,pt+="<th scope='col'"+((De+te+6)%7>=5?" class='ui-datepicker-week-end'":"")+"><span title='"+ne[gt]+"'>"+ie[gt]+"</span></th>";for($e+=pt+"</tr></thead><tbody>",Qt=this._getDaysInMonth(je,Le),je===d.selectedYear&&Le===d.selectedMonth&&(d.selectedDay=Math.min(d.selectedDay,Qt)),xt=(this._getFirstDayOfMonth(je,Le)-te+7)%7,qt=Math.ceil((xt+Qt)/7),_t=de&&this.maxRows>qt?this.maxRows:qt,this.maxRows=_t,Ge=this._daylightSavingAdjust(new Date(je,Le,1-xt)),Kt=0;Kt<_t;Kt++){for($e+="<tr>",At=he?"<td class='ui-datepicker-week-col'>"+this._get(d,"calculateWeek")(Ge)+"</td>":"",De=0;De<7;De++)Ct=Be?Be.apply(d.input?d.input[0]:null,[Ge]):[!0,""],bt=Ge.getMonth()!==Le,kt=bt&&!Te||!Ct[0]||Ie&&Ge<Ie||be&&Ge>be,At+="<td class='"+((De+te+6)%7>=5?" ui-datepicker-week-end":"")+(bt?" ui-datepicker-other-month":"")+(Ge.getTime()===Xe.getTime()&&Le===d.selectedMonth&&d._keyEvent||Ne.getTime()===Ge.getTime()&&Ne.getTime()===Xe.getTime()?" "+this._dayOverClass:"")+(kt?" "+this._unselectableClass+" ui-state-disabled":"")+(bt&&!Fe?"":" "+Ct[1]+(Ge.getTime()===Ee.getTime()?" "+this._currentClass:"")+(Ge.getTime()===St.getTime()?" ui-datepicker-today":""))+"'"+((!bt||Fe)&&Ct[2]?" title='"+Ct[2].replace(/'/g,"&#39;")+"'":"")+(kt?"":" data-handler='selectDay' data-event='click' data-month='"+Ge.getMonth()+"' data-year='"+Ge.getFullYear()+"'")+">"+(bt&&!Fe?"&#xa0;":kt?"<span class='ui-state-default'>"+Ge.getDate()+"</span>":"<a class='ui-state-default"+(Ge.getTime()===St.getTime()?" ui-state-highlight":"")+(Ge.getTime()===Ee.getTime()?" ui-state-active":"")+(bt?" ui-priority-secondary":"")+"' href='#' aria-current='"+(Ge.getTime()===Ee.getTime()?"true":"false")+"' data-date='"+Ge.getDate()+"'>"+Ge.getDate()+"</a>")+"</td>",Ge.setDate(Ge.getDate()+1),Ge=this._daylightSavingAdjust(Ge);$e+=At+"</tr>"}Le++,Le>11&&(Le=0,je++),$e+="</tbody></table>"+(de?"</div>"+(Ut[0]>0&&qe===Ut[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),Ye+=$e}Oe+=Ye}return Oe+=q,d._keyEvent=!1,Oe},_generateMonthYearHeader:function(d,w,C,b,I,k,M,K){var W,q,te,he,ne,ie,re,ce,Be=this._get(d,"changeMonth"),Fe=this._get(d,"changeYear"),Te=this._get(d,"showMonthAfterYear"),Ne=this._get(d,"selectMonthLabel"),Oe=this._get(d,"selectYearLabel"),De="<div class='ui-datepicker-title'>",et="";if(k||!Be)et+="<span class='ui-datepicker-month'>"+M[w]+"</span>";else{for(W=b&&b.getFullYear()===C,q=I&&I.getFullYear()===C,et+="<select class='ui-datepicker-month' aria-label='"+Ne+"' data-handler='selectMonth' data-event='change'>",te=0;te<12;te++)(!W||te>=b.getMonth())&&(!q||te<=I.getMonth())&&(et+="<option value='"+te+"'"+(te===w?" selected='selected'":"")+">"+K[te]+"</option>");et+="</select>"}if(Te||(De+=et+(k||!(Be&&Fe)?"&#xa0;":"")),!d.yearshtml)if(d.yearshtml="",k||!Fe)De+="<span class='ui-datepicker-year'>"+C+"</span>";else{for(he=this._get(d,"yearRange").split(":"),ne=new Date().getFullYear(),ie=function(Ye){var qe=Ye.match(/c[+\-].*/)?C+parseInt(Ye.substring(1),10):Ye.match(/[+\-].*/)?ne+parseInt(Ye,10):parseInt(Ye,10);return isNaN(qe)?ne:qe},re=ie(he[0]),ce=Math.max(re,ie(he[1]||"")),re=b?Math.max(re,b.getFullYear()):re,ce=I?Math.min(ce,I.getFullYear()):ce,d.yearshtml+="<select class='ui-datepicker-year' aria-label='"+Oe+"' data-handler='selectYear' data-event='change'>";re<=ce;re++)d.yearshtml+="<option value='"+re+"'"+(re===C?" selected='selected'":"")+">"+re+"</option>";d.yearshtml+="</select>",De+=d.yearshtml,d.yearshtml=null}return De+=this._get(d,"yearSuffix"),Te&&(De+=(k||!(Be&&Fe)?"&#xa0;":"")+et),De+="</div>",De},_adjustInstDate:function(d,w,C){var b=d.selectedYear+(C==="Y"?w:0),I=d.selectedMonth+(C==="M"?w:0),k=Math.min(d.selectedDay,this._getDaysInMonth(b,I))+(C==="D"?w:0),M=this._restrictMinMax(d,this._daylightSavingAdjust(new Date(b,I,k)));d.selectedDay=M.getDate(),d.drawMonth=d.selectedMonth=M.getMonth(),d.drawYear=d.selectedYear=M.getFullYear(),(C==="M"||C==="Y")&&this._notifyChange(d)},_restrictMinMax:function(d,w){var C=this._getMinMaxDate(d,"min"),b=this._getMinMaxDate(d,"max"),I=C&&w<C?C:w;return b&&I>b?b:I},_notifyChange:function(d){var w=this._get(d,"onChangeMonthYear");w&&w.apply(d.input?d.input[0]:null,[d.selectedYear,d.selectedMonth+1,d])},_getNumberOfMonths:function(d){var w=this._get(d,"numberOfMonths");return w==null?[1,1]:typeof w=="number"?[1,w]:w},_getMinMaxDate:function(d,w){return this._determineDate(d,this._get(d,w+"Date"),null)},_getDaysInMonth:function(d,w){return 32-this._daylightSavingAdjust(new Date(d,w,32)).getDate()},_getFirstDayOfMonth:function(d,w){return new Date(d,w,1).getDay()},_canAdjustMonth:function(d,w,C,b){var I=this._getNumberOfMonths(d),k=this._daylightSavingAdjust(new Date(C,b+(w<0?w:I[0]*I[1]),1));return w<0&&k.setDate(this._getDaysInMonth(k.getFullYear(),k.getMonth())),this._isInRange(d,k)},_isInRange:function(d,w){var C,b,I=this._getMinMaxDate(d,"min"),k=this._getMinMaxDate(d,"max"),M=null,K=null,W=this._get(d,"yearRange");return W&&(C=W.split(":"),b=new Date().getFullYear(),M=parseInt(C[0],10),K=parseInt(C[1],10),C[0].match(/[+\-].*/)&&(M+=b),C[1].match(/[+\-].*/)&&(K+=b)),(!I||w.getTime()>=I.getTime())&&(!k||w.getTime()<=k.getTime())&&(!M||w.getFullYear()>=M)&&(!K||w.getFullYear()<=K)},_getFormatConfig:function(d){var w=this._get(d,"shortYearCutoff");return w=typeof w!="string"?w:new Date().getFullYear()%100+parseInt(w,10),{shortYearCutoff:w,dayNamesShort:this._get(d,"dayNamesShort"),dayNames:this._get(d,"dayNames"),monthNamesShort:this._get(d,"monthNamesShort"),monthNames:this._get(d,"monthNames")}},_formatDate:function(d,w,C,b){w||(d.currentDay=d.selectedDay,d.currentMonth=d.selectedMonth,d.currentYear=d.selectedYear);var I=w?typeof w=="object"?w:this._daylightSavingAdjust(new Date(b,C,w)):this._daylightSavingAdjust(new Date(d.currentYear,d.currentMonth,d.currentDay));return this.formatDate(this._get(d,"dateFormat"),I,this._getFormatConfig(d))}});function ft(d){var w="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return d.on("mouseout",w,function(){g(this).removeClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!==-1&&g(this).removeClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!==-1&&g(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",w,at)}function at(){g.datepicker._isDisabledDatepicker(Me.inline?Me.dpDiv.parent()[0]:Me.input[0])||(g(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),g(this).addClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!==-1&&g(this).addClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!==-1&&g(this).addClass("ui-datepicker-next-hover"))}function ht(d,w){g.extend(d,w);for(var C in w)w[C]==null&&(d[C]=w[C]);return d}g.fn.datepicker=function(d){if(!this.length)return this;g.datepicker.initialized||(g(document).on("mousedown",g.datepicker._checkExternalClick),g.datepicker.initialized=!0),g("#"+g.datepicker._mainDivId).length===0&&g("body").append(g.datepicker.dpDiv);var w=Array.prototype.slice.call(arguments,1);return typeof d=="string"&&(d==="isDisabled"||d==="getDate"||d==="widget")?g.datepicker["_"+d+"Datepicker"].apply(g.datepicker,[this[0]].concat(w)):d==="option"&&arguments.length===2&&typeof arguments[1]=="string"?g.datepicker["_"+d+"Datepicker"].apply(g.datepicker,[this[0]].concat(w)):this.each(function(){typeof d=="string"?g.datepicker["_"+d+"Datepicker"].apply(g.datepicker,[this].concat(w)):g.datepicker._attachDatepicker(this,d)})},g.datepicker=new Je,g.datepicker.initialized=!1,g.datepicker.uuid=new Date().getTime(),g.datepicker.version="1.13.2",g.datepicker,g.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());/*!
+ * jQuery UI Mouse 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */var vt=!1;g(document).on("mouseup",function(){vt=!1}),g.widget("ui.mouse",{version:"1.13.2",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var d=this;this.element.on("mousedown."+this.widgetName,function(w){return d._mouseDown(w)}).on("click."+this.widgetName,function(w){if(g.data(w.target,d.widgetName+".preventClickEvent")===!0)return g.removeData(w.target,d.widgetName+".preventClickEvent"),w.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(d){if(!vt){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(d),this._mouseDownEvent=d;var w=this,C=d.which===1,b=typeof this.options.cancel=="string"&&d.target.nodeName?g(d.target).closest(this.options.cancel).length:!1;return!C||b||!this._mouseCapture(d)?!0:(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){w.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(d)&&this._mouseDelayMet(d)&&(this._mouseStarted=this._mouseStart(d)!==!1,!this._mouseStarted)?(d.preventDefault(),!0):(g.data(d.target,this.widgetName+".preventClickEvent")===!0&&g.removeData(d.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(I){return w._mouseMove(I)},this._mouseUpDelegate=function(I){return w._mouseUp(I)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),d.preventDefault(),vt=!0,!0))}},_mouseMove:function(d){if(this._mouseMoved){if(g.ui.ie&&(!document.documentMode||document.documentMode<9)&&!d.button)return this._mouseUp(d);if(!d.which){if(d.originalEvent.altKey||d.originalEvent.ctrlKey||d.originalEvent.metaKey||d.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(d)}}return(d.which||d.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(d),d.preventDefault()):(this._mouseDistanceMet(d)&&this._mouseDelayMet(d)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,d)!==!1,this._mouseStarted?this._mouseDrag(d):this._mouseUp(d)),!this._mouseStarted)},_mouseUp:function(d){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,d.target===this._mouseDownEvent.target&&g.data(d.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(d)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,vt=!1,d.preventDefault()},_mouseDistanceMet:function(d){return Math.max(Math.abs(this._mouseDownEvent.pageX-d.pageX),Math.abs(this._mouseDownEvent.pageY-d.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),g.ui.plugin={add:function(d,w,C){var b,I=g.ui[d].prototype;for(b in C)I.plugins[b]=I.plugins[b]||[],I.plugins[b].push([w,C[b]])},call:function(d,w,C,b){var I,k=d.plugins[w];if(k&&!(!b&&(!d.element[0].parentNode||d.element[0].parentNode.nodeType===11)))for(I=0;I<k.length;I++)d.options[k[I][0]]&&k[I][1].apply(d.element,C)}},g.ui.safeBlur=function(d){d&&d.nodeName.toLowerCase()!=="body"&&g(d).trigger("blur")};/*!
+ * jQuery UI Draggable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.draggable",g.ui.mouse,{version:"1.13.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){this.options.helper==="original"&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(d,w){this._super(d,w),d==="handle"&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){if((this.helper||this.element).is(".ui-draggable-dragging")){this.destroyOnClear=!0;return}this._removeHandleClassName(),this._mouseDestroy()},_mouseCapture:function(d){var w=this.options;return this.helper||w.disabled||g(d.target).closest(".ui-resizable-handle").length>0||(this.handle=this._getHandle(d),!this.handle)?!1:(this._blurActiveElement(d),this._blockFrames(w.iframeFix===!0?"iframe":w.iframeFix),!0)},_blockFrames:function(d){this.iframeBlocks=this.document.find(d).map(function(){var w=g(this);return g("<div>").css("position","absolute").appendTo(w.parent()).outerWidth(w.outerWidth()).outerHeight(w.outerHeight()).offset(w.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(d){var w=g.ui.safeActiveElement(this.document[0]),C=g(d.target);C.closest(w).length||g.ui.safeBlur(w)},_mouseStart:function(d){var w=this.options;return this.helper=this._createHelper(d),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),g.ui.ddmanager&&(g.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return g(this).css("position")==="fixed"}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(d),this.originalPosition=this.position=this._generatePosition(d,!1),this.originalPageX=d.pageX,this.originalPageY=d.pageY,w.cursorAt&&this._adjustOffsetFromHelper(w.cursorAt),this._setContainment(),this._trigger("start",d)===!1?(this._clear(),!1):(this._cacheHelperProportions(),g.ui.ddmanager&&!w.dropBehaviour&&g.ui.ddmanager.prepareOffsets(this,d),this._mouseDrag(d,!0),g.ui.ddmanager&&g.ui.ddmanager.dragStart(this,d),!0)},_refreshOffsets:function(d){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:d.pageX-this.offset.left,top:d.pageY-this.offset.top}},_mouseDrag:function(d,w){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(d,!0),this.positionAbs=this._convertPositionTo("absolute"),!w){var C=this._uiHash();if(this._trigger("drag",d,C)===!1)return this._mouseUp(new g.Event("mouseup",d)),!1;this.position=C.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",g.ui.ddmanager&&g.ui.ddmanager.drag(this,d),!1},_mouseStop:function(d){var w=this,C=!1;return g.ui.ddmanager&&!this.options.dropBehaviour&&(C=g.ui.ddmanager.drop(this,d)),this.dropped&&(C=this.dropped,this.dropped=!1),this.options.revert==="invalid"&&!C||this.options.revert==="valid"&&C||this.options.revert===!0||typeof this.options.revert=="function"&&this.options.revert.call(this.element,C)?g(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){w._trigger("stop",d)!==!1&&w._clear()}):this._trigger("stop",d)!==!1&&this._clear(),!1},_mouseUp:function(d){return this._unblockFrames(),g.ui.ddmanager&&g.ui.ddmanager.dragStop(this,d),this.handleElement.is(d.target)&&this.element.trigger("focus"),g.ui.mouse.prototype._mouseUp.call(this,d)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new g.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(d){return this.options.handle?!!g(d.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(d){var w=this.options,C=typeof w.helper=="function",b=C?g(w.helper.apply(this.element[0],[d])):w.helper==="clone"?this.element.clone().removeAttr("id"):this.element;return b.parents("body").length||b.appendTo(w.appendTo==="parent"?this.element[0].parentNode:w.appendTo),C&&b[0]===this.element[0]&&this._setPositionRelative(),b[0]!==this.element[0]&&!/(fixed|absolute)/.test(b.css("position"))&&b.css("position","absolute"),b},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(d){typeof d=="string"&&(d=d.split(" ")),Array.isArray(d)&&(d={left:+d[0],top:+d[1]||0}),"left"in d&&(this.offset.click.left=d.left+this.margins.left),"right"in d&&(this.offset.click.left=this.helperProportions.width-d.right+this.margins.left),"top"in d&&(this.offset.click.top=d.top+this.margins.top),"bottom"in d&&(this.offset.click.top=this.helperProportions.height-d.bottom+this.margins.top)},_isRootNode:function(d){return/(html|body)/i.test(d.tagName)||d===this.document[0]},_getParentOffset:function(){var d=this.offsetParent.offset(),w=this.document[0];return this.cssPosition==="absolute"&&this.scrollParent[0]!==w&&g.contains(this.scrollParent[0],this.offsetParent[0])&&(d.left+=this.scrollParent.scrollLeft(),d.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(d={top:0,left:0}),{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition!=="relative")return{top:0,left:0};var d=this.element.position(),w=this._isRootNode(this.scrollParent[0]);return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+(w?0:this.scrollParent.scrollTop()),left:d.left-(parseInt(this.helper.css("left"),10)||0)+(w?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d,w,C,b=this.options,I=this.document[0];if(this.relativeContainer=null,!b.containment){this.containment=null;return}if(b.containment==="window"){this.containment=[g(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,g(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,g(window).scrollLeft()+g(window).width()-this.helperProportions.width-this.margins.left,g(window).scrollTop()+(g(window).height()||I.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];return}if(b.containment==="document"){this.containment=[0,0,g(I).width()-this.helperProportions.width-this.margins.left,(g(I).height()||I.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];return}if(b.containment.constructor===Array){this.containment=b.containment;return}b.containment==="parent"&&(b.containment=this.helper[0].parentNode),w=g(b.containment),C=w[0],C&&(d=/(scroll|auto)/.test(w.css("overflow")),this.containment=[(parseInt(w.css("borderLeftWidth"),10)||0)+(parseInt(w.css("paddingLeft"),10)||0),(parseInt(w.css("borderTopWidth"),10)||0)+(parseInt(w.css("paddingTop"),10)||0),(d?Math.max(C.scrollWidth,C.offsetWidth):C.offsetWidth)-(parseInt(w.css("borderRightWidth"),10)||0)-(parseInt(w.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(d?Math.max(C.scrollHeight,C.offsetHeight):C.offsetHeight)-(parseInt(w.css("borderBottomWidth"),10)||0)-(parseInt(w.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=w)},_convertPositionTo:function(d,w){w||(w=this.position);var C=d==="absolute"?1:-1,b=this._isRootNode(this.scrollParent[0]);return{top:w.top+this.offset.relative.top*C+this.offset.parent.top*C-(this.cssPosition==="fixed"?-this.offset.scroll.top:b?0:this.offset.scroll.top)*C,left:w.left+this.offset.relative.left*C+this.offset.parent.left*C-(this.cssPosition==="fixed"?-this.offset.scroll.left:b?0:this.offset.scroll.left)*C}},_generatePosition:function(d,w){var C,b,I,k,M=this.options,K=this._isRootNode(this.scrollParent[0]),W=d.pageX,q=d.pageY;return(!K||!this.offset.scroll)&&(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),w&&(this.containment&&(this.relativeContainer?(b=this.relativeContainer.offset(),C=[this.containment[0]+b.left,this.containment[1]+b.top,this.containment[2]+b.left,this.containment[3]+b.top]):C=this.containment,d.pageX-this.offset.click.left<C[0]&&(W=C[0]+this.offset.click.left),d.pageY-this.offset.click.top<C[1]&&(q=C[1]+this.offset.click.top),d.pageX-this.offset.click.left>C[2]&&(W=C[2]+this.offset.click.left),d.pageY-this.offset.click.top>C[3]&&(q=C[3]+this.offset.click.top)),M.grid&&(I=M.grid[1]?this.originalPageY+Math.round((q-this.originalPageY)/M.grid[1])*M.grid[1]:this.originalPageY,q=C?I-this.offset.click.top>=C[1]||I-this.offset.click.top>C[3]?I:I-this.offset.click.top>=C[1]?I-M.grid[1]:I+M.grid[1]:I,k=M.grid[0]?this.originalPageX+Math.round((W-this.originalPageX)/M.grid[0])*M.grid[0]:this.originalPageX,W=C?k-this.offset.click.left>=C[0]||k-this.offset.click.left>C[2]?k:k-this.offset.click.left>=C[0]?k-M.grid[0]:k+M.grid[0]:k),M.axis==="y"&&(W=this.originalPageX),M.axis==="x"&&(q=this.originalPageY)),{top:q-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.offset.scroll.top:K?0:this.offset.scroll.top),left:W-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.offset.scroll.left:K?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]!==this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(d,w,C){return C=C||this._uiHash(),g.ui.plugin.call(this,d,[w,C,this],!0),/^(drag|start|stop)/.test(d)&&(this.positionAbs=this._convertPositionTo("absolute"),C.offset=this.positionAbs),g.Widget.prototype._trigger.call(this,d,w,C)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),g.ui.plugin.add("draggable","connectToSortable",{start:function(d,w,C){var b=g.extend({},w,{item:C.element});C.sortables=[],g(C.options.connectToSortable).each(function(){var I=g(this).sortable("instance");I&&!I.options.disabled&&(C.sortables.push(I),I.refreshPositions(),I._trigger("activate",d,b))})},stop:function(d,w,C){var b=g.extend({},w,{item:C.element});C.cancelHelperRemoval=!1,g.each(C.sortables,function(){var I=this;I.isOver?(I.isOver=0,C.cancelHelperRemoval=!0,I.cancelHelperRemoval=!1,I._storedCSS={position:I.placeholder.css("position"),top:I.placeholder.css("top"),left:I.placeholder.css("left")},I._mouseStop(d),I.options.helper=I.options._helper):(I.cancelHelperRemoval=!0,I._trigger("deactivate",d,b))})},drag:function(d,w,C){g.each(C.sortables,function(){var b=!1,I=this;I.positionAbs=C.positionAbs,I.helperProportions=C.helperProportions,I.offset.click=C.offset.click,I._intersectsWith(I.containerCache)&&(b=!0,g.each(C.sortables,function(){return this.positionAbs=C.positionAbs,this.helperProportions=C.helperProportions,this.offset.click=C.offset.click,this!==I&&this._intersectsWith(this.containerCache)&&g.contains(I.element[0],this.element[0])&&(b=!1),b})),b?(I.isOver||(I.isOver=1,C._parent=w.helper.parent(),I.currentItem=w.helper.appendTo(I.element).data("ui-sortable-item",!0),I.options._helper=I.options.helper,I.options.helper=function(){return w.helper[0]},d.target=I.currentItem[0],I._mouseCapture(d,!0),I._mouseStart(d,!0,!0),I.offset.click.top=C.offset.click.top,I.offset.click.left=C.offset.click.left,I.offset.parent.left-=C.offset.parent.left-I.offset.parent.left,I.offset.parent.top-=C.offset.parent.top-I.offset.parent.top,C._trigger("toSortable",d),C.dropped=I.element,g.each(C.sortables,function(){this.refreshPositions()}),C.currentItem=C.element,I.fromOutside=C),I.currentItem&&(I._mouseDrag(d),w.position=I.position)):I.isOver&&(I.isOver=0,I.cancelHelperRemoval=!0,I.options._revert=I.options.revert,I.options.revert=!1,I._trigger("out",d,I._uiHash(I)),I._mouseStop(d,!0),I.options.revert=I.options._revert,I.options.helper=I.options._helper,I.placeholder&&I.placeholder.remove(),w.helper.appendTo(C._parent),C._refreshOffsets(d),w.position=C._generatePosition(d,!0),C._trigger("fromSortable",d),C.dropped=!1,g.each(C.sortables,function(){this.refreshPositions()}))})}}),g.ui.plugin.add("draggable","cursor",{start:function(d,w,C){var b=g("body"),I=C.options;b.css("cursor")&&(I._cursor=b.css("cursor")),b.css("cursor",I.cursor)},stop:function(d,w,C){var b=C.options;b._cursor&&g("body").css("cursor",b._cursor)}}),g.ui.plugin.add("draggable","opacity",{start:function(d,w,C){var b=g(w.helper),I=C.options;b.css("opacity")&&(I._opacity=b.css("opacity")),b.css("opacity",I.opacity)},stop:function(d,w,C){var b=C.options;b._opacity&&g(w.helper).css("opacity",b._opacity)}}),g.ui.plugin.add("draggable","scroll",{start:function(d,w,C){C.scrollParentNotHidden||(C.scrollParentNotHidden=C.helper.scrollParent(!1)),C.scrollParentNotHidden[0]!==C.document[0]&&C.scrollParentNotHidden[0].tagName!=="HTML"&&(C.overflowOffset=C.scrollParentNotHidden.offset())},drag:function(d,w,C){var b=C.options,I=!1,k=C.scrollParentNotHidden[0],M=C.document[0];k!==M&&k.tagName!=="HTML"?((!b.axis||b.axis!=="x")&&(C.overflowOffset.top+k.offsetHeight-d.pageY<b.scrollSensitivity?k.scrollTop=I=k.scrollTop+b.scrollSpeed:d.pageY-C.overflowOffset.top<b.scrollSensitivity&&(k.scrollTop=I=k.scrollTop-b.scrollSpeed)),(!b.axis||b.axis!=="y")&&(C.overflowOffset.left+k.offsetWidth-d.pageX<b.scrollSensitivity?k.scrollLeft=I=k.scrollLeft+b.scrollSpeed:d.pageX-C.overflowOffset.left<b.scrollSensitivity&&(k.scrollLeft=I=k.scrollLeft-b.scrollSpeed))):((!b.axis||b.axis!=="x")&&(d.pageY-g(M).scrollTop()<b.scrollSensitivity?I=g(M).scrollTop(g(M).scrollTop()-b.scrollSpeed):g(window).height()-(d.pageY-g(M).scrollTop())<b.scrollSensitivity&&(I=g(M).scrollTop(g(M).scrollTop()+b.scrollSpeed))),(!b.axis||b.axis!=="y")&&(d.pageX-g(M).scrollLeft()<b.scrollSensitivity?I=g(M).scrollLeft(g(M).scrollLeft()-b.scrollSpeed):g(window).width()-(d.pageX-g(M).scrollLeft())<b.scrollSensitivity&&(I=g(M).scrollLeft(g(M).scrollLeft()+b.scrollSpeed)))),I!==!1&&g.ui.ddmanager&&!b.dropBehaviour&&g.ui.ddmanager.prepareOffsets(C,d)}}),g.ui.plugin.add("draggable","snap",{start:function(d,w,C){var b=C.options;C.snapElements=[],g(b.snap.constructor!==String?b.snap.items||":data(ui-draggable)":b.snap).each(function(){var I=g(this),k=I.offset();this!==C.element[0]&&C.snapElements.push({item:this,width:I.outerWidth(),height:I.outerHeight(),top:k.top,left:k.left})})},drag:function(d,w,C){var b,I,k,M,K,W,q,te,he,ne,ie=C.options,re=ie.snapTolerance,ce=w.offset.left,Be=ce+C.helperProportions.width,Fe=w.offset.top,Te=Fe+C.helperProportions.height;for(he=C.snapElements.length-1;he>=0;he--){if(K=C.snapElements[he].left-C.margins.left,W=K+C.snapElements[he].width,q=C.snapElements[he].top-C.margins.top,te=q+C.snapElements[he].height,Be<K-re||ce>W+re||Te<q-re||Fe>te+re||!g.contains(C.snapElements[he].item.ownerDocument,C.snapElements[he].item)){C.snapElements[he].snapping&&C.options.snap.release&&C.options.snap.release.call(C.element,d,g.extend(C._uiHash(),{snapItem:C.snapElements[he].item})),C.snapElements[he].snapping=!1;continue}ie.snapMode!=="inner"&&(b=Math.abs(q-Te)<=re,I=Math.abs(te-Fe)<=re,k=Math.abs(K-Be)<=re,M=Math.abs(W-ce)<=re,b&&(w.position.top=C._convertPositionTo("relative",{top:q-C.helperProportions.height,left:0}).top),I&&(w.position.top=C._convertPositionTo("relative",{top:te,left:0}).top),k&&(w.position.left=C._convertPositionTo("relative",{top:0,left:K-C.helperProportions.width}).left),M&&(w.position.left=C._convertPositionTo("relative",{top:0,left:W}).left)),ne=b||I||k||M,ie.snapMode!=="outer"&&(b=Math.abs(q-Fe)<=re,I=Math.abs(te-Te)<=re,k=Math.abs(K-ce)<=re,M=Math.abs(W-Be)<=re,b&&(w.position.top=C._convertPositionTo("relative",{top:q,left:0}).top),I&&(w.position.top=C._convertPositionTo("relative",{top:te-C.helperProportions.height,left:0}).top),k&&(w.position.left=C._convertPositionTo("relative",{top:0,left:K}).left),M&&(w.position.left=C._convertPositionTo("relative",{top:0,left:W-C.helperProportions.width}).left)),!C.snapElements[he].snapping&&(b||I||k||M||ne)&&C.options.snap.snap&&C.options.snap.snap.call(C.element,d,g.extend(C._uiHash(),{snapItem:C.snapElements[he].item})),C.snapElements[he].snapping=b||I||k||M||ne}}}),g.ui.plugin.add("draggable","stack",{start:function(d,w,C){var b,I=C.options,k=g.makeArray(g(I.stack)).sort(function(M,K){return(parseInt(g(M).css("zIndex"),10)||0)-(parseInt(g(K).css("zIndex"),10)||0)});k.length&&(b=parseInt(g(k[0]).css("zIndex"),10)||0,g(k).each(function(M){g(this).css("zIndex",b+M)}),this.css("zIndex",b+k.length))}}),g.ui.plugin.add("draggable","zIndex",{start:function(d,w,C){var b=g(w.helper),I=C.options;b.css("zIndex")&&(I._zIndex=b.css("zIndex")),b.css("zIndex",I.zIndex)},stop:function(d,w,C){var b=C.options;b._zIndex&&g(w.helper).css("zIndex",b._zIndex)}}),g.ui.draggable;/*!
+ * jQuery UI Resizable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.resizable",g.ui.mouse,{version:"1.13.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(d){return parseFloat(d)||0},_isNumber:function(d){return!isNaN(parseFloat(d))},_hasScroll:function(d,w){if(g(d).css("overflow")==="hidden")return!1;var C=w&&w==="left"?"scrollLeft":"scrollTop",b=!1;if(d[C]>0)return!0;try{d[C]=1,b=d[C]>0,d[C]=0}catch{}return b},_create:function(){var d,w=this.options,C=this;this._addClass("ui-resizable"),g.extend(this,{_aspectRatio:!!w.aspectRatio,aspectRatio:w.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:w.helper||w.ghost||w.animate?w.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(g("<div class='ui-wrapper'></div>").css({overflow:"hidden",position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,d={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(d),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(d),this._proportionallyResize()),this._setupHandles(),w.autoHide&&g(this.element).on("mouseenter",function(){w.disabled||(C._removeClass("ui-resizable-autohide"),C._handles.show())}).on("mouseleave",function(){w.disabled||C.resizing||(C._addClass("ui-resizable-autohide"),C._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy(),this._addedHandles.remove();var d,w=function(C){g(C).removeData("resizable").removeData("ui-resizable").off(".resizable")};return this.elementIsWrapper&&(w(this.element),d=this.element,this.originalElement.css({position:d.css("position"),width:d.outerWidth(),height:d.outerHeight(),top:d.css("top"),left:d.css("left")}).insertAfter(d),d.remove()),this.originalElement.css("resize",this.originalResizeStyle),w(this.originalElement),this},_setOption:function(d,w){switch(this._super(d,w),d){case"handles":this._removeHandles(),this._setupHandles();break;case"aspectRatio":this._aspectRatio=!!w;break}},_setupHandles:function(){var d=this.options,w,C,b,I,k,M=this;if(this.handles=d.handles||(g(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=g(),this._addedHandles=g(),this.handles.constructor===String)for(this.handles==="all"&&(this.handles="n,e,s,w,se,sw,ne,nw"),b=this.handles.split(","),this.handles={},C=0;C<b.length;C++)w=String.prototype.trim.call(b[C]),I="ui-resizable-"+w,k=g("<div>"),this._addClass(k,"ui-resizable-handle "+I),k.css({zIndex:d.zIndex}),this.handles[w]=".ui-resizable-"+w,this.element.children(this.handles[w]).length||(this.element.append(k),this._addedHandles=this._addedHandles.add(k));this._renderAxis=function(K){var W,q,te,he;K=K||this.element;for(W in this.handles)this.handles[W].constructor===String?this.handles[W]=this.element.children(this.handles[W]).first().show():(this.handles[W].jquery||this.handles[W].nodeType)&&(this.handles[W]=g(this.handles[W]),this._on(this.handles[W],{mousedown:M._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(q=g(this.handles[W],this.element),he=/sw|ne|nw|se|n|s/.test(W)?q.outerHeight():q.outerWidth(),te=["padding",/ne|nw|n/.test(W)?"Top":/se|sw|s/.test(W)?"Bottom":/^e$/.test(W)?"Right":"Left"].join(""),K.css(te,he),this._proportionallyResize()),this._handles=this._handles.add(this.handles[W])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){M.resizing||(this.className&&(k=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),M.axis=k&&k[1]?k[1]:"se")}),d.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._addedHandles.remove()},_mouseCapture:function(d){var w,C,b=!1;for(w in this.handles)C=g(this.handles[w])[0],(C===d.target||g.contains(C,d.target))&&(b=!0);return!this.options.disabled&&b},_mouseStart:function(d){var w,C,b,I=this.options,k=this.element;return this.resizing=!0,this._renderProxy(),w=this._num(this.helper.css("left")),C=this._num(this.helper.css("top")),I.containment&&(w+=g(I.containment).scrollLeft()||0,C+=g(I.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:w,top:C},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:k.width(),height:k.height()},this.originalSize=this._helper?{width:k.outerWidth(),height:k.outerHeight()}:{width:k.width(),height:k.height()},this.sizeDiff={width:k.outerWidth()-k.width(),height:k.outerHeight()-k.height()},this.originalPosition={left:w,top:C},this.originalMousePosition={left:d.pageX,top:d.pageY},this.aspectRatio=typeof I.aspectRatio=="number"?I.aspectRatio:this.originalSize.width/this.originalSize.height||1,b=g(".ui-resizable-"+this.axis).css("cursor"),g("body").css("cursor",b==="auto"?this.axis+"-resize":b),this._addClass("ui-resizable-resizing"),this._propagate("start",d),!0},_mouseDrag:function(d){var w,C,b=this.originalMousePosition,I=this.axis,k=d.pageX-b.left||0,M=d.pageY-b.top||0,K=this._change[I];return this._updatePrevProperties(),K&&(w=K.apply(this,[d,k,M]),this._updateVirtualBoundaries(d.shiftKey),(this._aspectRatio||d.shiftKey)&&(w=this._updateRatio(w,d)),w=this._respectSize(w,d),this._updateCache(w),this._propagate("resize",d),C=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),g.isEmptyObject(C)||(this._updatePrevProperties(),this._trigger("resize",d,this.ui()),this._applyChanges())),!1},_mouseStop:function(d){this.resizing=!1;var w,C,b,I,k,M,K,W=this.options,q=this;return this._helper&&(w=this._proportionallyResizeElements,C=w.length&&/textarea/i.test(w[0].nodeName),b=C&&this._hasScroll(w[0],"left")?0:q.sizeDiff.height,I=C?0:q.sizeDiff.width,k={width:q.helper.width()-I,height:q.helper.height()-b},M=parseFloat(q.element.css("left"))+(q.position.left-q.originalPosition.left)||null,K=parseFloat(q.element.css("top"))+(q.position.top-q.originalPosition.top)||null,W.animate||this.element.css(g.extend(k,{top:K,left:M})),q.helper.height(q.size.height),q.helper.width(q.size.width),this._helper&&!W.animate&&this._proportionallyResize()),g("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",d),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var d={};return this.position.top!==this.prevPosition.top&&(d.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(d.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(d.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(d.height=this.size.height+"px"),this.helper.css(d),d},_updateVirtualBoundaries:function(d){var w,C,b,I,k,M=this.options;k={minWidth:this._isNumber(M.minWidth)?M.minWidth:0,maxWidth:this._isNumber(M.maxWidth)?M.maxWidth:1/0,minHeight:this._isNumber(M.minHeight)?M.minHeight:0,maxHeight:this._isNumber(M.maxHeight)?M.maxHeight:1/0},(this._aspectRatio||d)&&(w=k.minHeight*this.aspectRatio,b=k.minWidth/this.aspectRatio,C=k.maxHeight*this.aspectRatio,I=k.maxWidth/this.aspectRatio,w>k.minWidth&&(k.minWidth=w),b>k.minHeight&&(k.minHeight=b),C<k.maxWidth&&(k.maxWidth=C),I<k.maxHeight&&(k.maxHeight=I)),this._vBoundaries=k},_updateCache:function(d){this.offset=this.helper.offset(),this._isNumber(d.left)&&(this.position.left=d.left),this._isNumber(d.top)&&(this.position.top=d.top),this._isNumber(d.height)&&(this.size.height=d.height),this._isNumber(d.width)&&(this.size.width=d.width)},_updateRatio:function(d){var w=this.position,C=this.size,b=this.axis;return this._isNumber(d.height)?d.width=d.height*this.aspectRatio:this._isNumber(d.width)&&(d.height=d.width/this.aspectRatio),b==="sw"&&(d.left=w.left+(C.width-d.width),d.top=null),b==="nw"&&(d.top=w.top+(C.height-d.height),d.left=w.left+(C.width-d.width)),d},_respectSize:function(d){var w=this._vBoundaries,C=this.axis,b=this._isNumber(d.width)&&w.maxWidth&&w.maxWidth<d.width,I=this._isNumber(d.height)&&w.maxHeight&&w.maxHeight<d.height,k=this._isNumber(d.width)&&w.minWidth&&w.minWidth>d.width,M=this._isNumber(d.height)&&w.minHeight&&w.minHeight>d.height,K=this.originalPosition.left+this.originalSize.width,W=this.originalPosition.top+this.originalSize.height,q=/sw|nw|w/.test(C),te=/nw|ne|n/.test(C);return k&&(d.width=w.minWidth),M&&(d.height=w.minHeight),b&&(d.width=w.maxWidth),I&&(d.height=w.maxHeight),k&&q&&(d.left=K-w.minWidth),b&&q&&(d.left=K-w.maxWidth),M&&te&&(d.top=W-w.minHeight),I&&te&&(d.top=W-w.maxHeight),!d.width&&!d.height&&!d.left&&d.top?d.top=null:!d.width&&!d.height&&!d.top&&d.left&&(d.left=null),d},_getPaddingPlusBorderDimensions:function(d){for(var w=0,C=[],b=[d.css("borderTopWidth"),d.css("borderRightWidth"),d.css("borderBottomWidth"),d.css("borderLeftWidth")],I=[d.css("paddingTop"),d.css("paddingRight"),d.css("paddingBottom"),d.css("paddingLeft")];w<4;w++)C[w]=parseFloat(b[w])||0,C[w]+=parseFloat(I[w])||0;return{height:C[0]+C[2],width:C[1]+C[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var d,w=0,C=this.helper||this.element;w<this._proportionallyResizeElements.length;w++)d=this._proportionallyResizeElements[w],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(d)),d.css({height:C.height()-this.outerDimensions.height||0,width:C.width()-this.outerDimensions.width||0})},_renderProxy:function(){var d=this.element,w=this.options;this.elementOffset=d.offset(),this._helper?(this.helper=this.helper||g("<div></div>").css({overflow:"hidden"}),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++w.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(d,w){return{width:this.originalSize.width+w}},w:function(d,w){var C=this.originalSize,b=this.originalPosition;return{left:b.left+w,width:C.width-w}},n:function(d,w,C){var b=this.originalSize,I=this.originalPosition;return{top:I.top+C,height:b.height-C}},s:function(d,w,C){return{height:this.originalSize.height+C}},se:function(d,w,C){return g.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[d,w,C]))},sw:function(d,w,C){return g.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[d,w,C]))},ne:function(d,w,C){return g.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[d,w,C]))},nw:function(d,w,C){return g.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[d,w,C]))}},_propagate:function(d,w){g.ui.plugin.call(this,d,[w,this.ui()]),d!=="resize"&&this._trigger(d,w,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),g.ui.plugin.add("resizable","animate",{stop:function(d){var w=g(this).resizable("instance"),C=w.options,b=w._proportionallyResizeElements,I=b.length&&/textarea/i.test(b[0].nodeName),k=I&&w._hasScroll(b[0],"left")?0:w.sizeDiff.height,M=I?0:w.sizeDiff.width,K={width:w.size.width-M,height:w.size.height-k},W=parseFloat(w.element.css("left"))+(w.position.left-w.originalPosition.left)||null,q=parseFloat(w.element.css("top"))+(w.position.top-w.originalPosition.top)||null;w.element.animate(g.extend(K,q&&W?{top:q,left:W}:{}),{duration:C.animateDuration,easing:C.animateEasing,step:function(){var te={width:parseFloat(w.element.css("width")),height:parseFloat(w.element.css("height")),top:parseFloat(w.element.css("top")),left:parseFloat(w.element.css("left"))};b&&b.length&&g(b[0]).css({width:te.width,height:te.height}),w._updateCache(te),w._propagate("resize",d)}})}}),g.ui.plugin.add("resizable","containment",{start:function(){var d,w,C,b,I,k,M,K=g(this).resizable("instance"),W=K.options,q=K.element,te=W.containment,he=te instanceof g?te.get(0):/parent/.test(te)?q.parent().get(0):te;he&&(K.containerElement=g(he),/document/.test(te)||te===document?(K.containerOffset={left:0,top:0},K.containerPosition={left:0,top:0},K.parentData={element:g(document),left:0,top:0,width:g(document).width(),height:g(document).height()||document.body.parentNode.scrollHeight}):(d=g(he),w=[],g(["Top","Right","Left","Bottom"]).each(function(ne,ie){w[ne]=K._num(d.css("padding"+ie))}),K.containerOffset=d.offset(),K.containerPosition=d.position(),K.containerSize={height:d.innerHeight()-w[3],width:d.innerWidth()-w[1]},C=K.containerOffset,b=K.containerSize.height,I=K.containerSize.width,k=K._hasScroll(he,"left")?he.scrollWidth:I,M=K._hasScroll(he)?he.scrollHeight:b,K.parentData={element:he,left:C.left,top:C.top,width:k,height:M}))},resize:function(d){var w,C,b,I,k=g(this).resizable("instance"),M=k.options,K=k.containerOffset,W=k.position,q=k._aspectRatio||d.shiftKey,te={top:0,left:0},he=k.containerElement,ne=!0;he[0]!==document&&/static/.test(he.css("position"))&&(te=K),W.left<(k._helper?K.left:0)&&(k.size.width=k.size.width+(k._helper?k.position.left-K.left:k.position.left-te.left),q&&(k.size.height=k.size.width/k.aspectRatio,ne=!1),k.position.left=M.helper?K.left:0),W.top<(k._helper?K.top:0)&&(k.size.height=k.size.height+(k._helper?k.position.top-K.top:k.position.top),q&&(k.size.width=k.size.height*k.aspectRatio,ne=!1),k.position.top=k._helper?K.top:0),b=k.containerElement.get(0)===k.element.parent().get(0),I=/relative|absolute/.test(k.containerElement.css("position")),b&&I?(k.offset.left=k.parentData.left+k.position.left,k.offset.top=k.parentData.top+k.position.top):(k.offset.left=k.element.offset().left,k.offset.top=k.element.offset().top),w=Math.abs(k.sizeDiff.width+(k._helper?k.offset.left-te.left:k.offset.left-K.left)),C=Math.abs(k.sizeDiff.height+(k._helper?k.offset.top-te.top:k.offset.top-K.top)),w+k.size.width>=k.parentData.width&&(k.size.width=k.parentData.width-w,q&&(k.size.height=k.size.width/k.aspectRatio,ne=!1)),C+k.size.height>=k.parentData.height&&(k.size.height=k.parentData.height-C,q&&(k.size.width=k.size.height*k.aspectRatio,ne=!1)),ne||(k.position.left=k.prevPosition.left,k.position.top=k.prevPosition.top,k.size.width=k.prevSize.width,k.size.height=k.prevSize.height)},stop:function(){var d=g(this).resizable("instance"),w=d.options,C=d.containerOffset,b=d.containerPosition,I=d.containerElement,k=g(d.helper),M=k.offset(),K=k.outerWidth()-d.sizeDiff.width,W=k.outerHeight()-d.sizeDiff.height;d._helper&&!w.animate&&/relative/.test(I.css("position"))&&g(this).css({left:M.left-b.left-C.left,width:K,height:W}),d._helper&&!w.animate&&/static/.test(I.css("position"))&&g(this).css({left:M.left-b.left-C.left,width:K,height:W})}}),g.ui.plugin.add("resizable","alsoResize",{start:function(){var d=g(this).resizable("instance"),w=d.options;g(w.alsoResize).each(function(){var C=g(this);C.data("ui-resizable-alsoresize",{width:parseFloat(C.width()),height:parseFloat(C.height()),left:parseFloat(C.css("left")),top:parseFloat(C.css("top"))})})},resize:function(d,w){var C=g(this).resizable("instance"),b=C.options,I=C.originalSize,k=C.originalPosition,M={height:C.size.height-I.height||0,width:C.size.width-I.width||0,top:C.position.top-k.top||0,left:C.position.left-k.left||0};g(b.alsoResize).each(function(){var K=g(this),W=g(this).data("ui-resizable-alsoresize"),q={},te=K.parents(w.originalElement[0]).length?["width","height"]:["width","height","top","left"];g.each(te,function(he,ne){var ie=(W[ne]||0)+(M[ne]||0);ie&&ie>=0&&(q[ne]=ie||null)}),K.css(q)})},stop:function(){g(this).removeData("ui-resizable-alsoresize")}}),g.ui.plugin.add("resizable","ghost",{start:function(){var d=g(this).resizable("instance"),w=d.size;d.ghost=d.originalElement.clone(),d.ghost.css({opacity:.25,display:"block",position:"relative",height:w.height,width:w.width,margin:0,left:0,top:0}),d._addClass(d.ghost,"ui-resizable-ghost"),g.uiBackCompat!==!1&&typeof d.options.ghost=="string"&&d.ghost.addClass(this.options.ghost),d.ghost.appendTo(d.helper)},resize:function(){var d=g(this).resizable("instance");d.ghost&&d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})},stop:function(){var d=g(this).resizable("instance");d.ghost&&d.helper&&d.helper.get(0).removeChild(d.ghost.get(0))}}),g.ui.plugin.add("resizable","grid",{resize:function(){var d,w=g(this).resizable("instance"),C=w.options,b=w.size,I=w.originalSize,k=w.originalPosition,M=w.axis,K=typeof C.grid=="number"?[C.grid,C.grid]:C.grid,W=K[0]||1,q=K[1]||1,te=Math.round((b.width-I.width)/W)*W,he=Math.round((b.height-I.height)/q)*q,ne=I.width+te,ie=I.height+he,re=C.maxWidth&&C.maxWidth<ne,ce=C.maxHeight&&C.maxHeight<ie,Be=C.minWidth&&C.minWidth>ne,Fe=C.minHeight&&C.minHeight>ie;C.grid=K,Be&&(ne+=W),Fe&&(ie+=q),re&&(ne-=W),ce&&(ie-=q),/^(se|s|e)$/.test(M)?(w.size.width=ne,w.size.height=ie):/^(ne)$/.test(M)?(w.size.width=ne,w.size.height=ie,w.position.top=k.top-he):/^(sw)$/.test(M)?(w.size.width=ne,w.size.height=ie,w.position.left=k.left-te):((ie-q<=0||ne-W<=0)&&(d=w._getPaddingPlusBorderDimensions(this)),ie-q>0?(w.size.height=ie,w.position.top=k.top-he):(ie=q-d.height,w.size.height=ie,w.position.top=k.top+I.height-ie),ne-W>0?(w.size.width=ne,w.position.left=k.left-te):(ne=W-d.width,w.size.width=ne,w.position.left=k.left+I.width-ne))}}),g.ui.resizable;/*!
+ * jQuery UI Dialog 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.dialog",{version:"1.13.2",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(d){var w=g(this).css(d).offset().top;w<0&&g(this).css("top",d.top-w)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title==null&&this.originalTitle!=null&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&g.fn.draggable&&this._makeDraggable(),this.options.resizable&&g.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var d=this.options.appendTo;return d&&(d.jquery||d.nodeType)?g(d):this.document.find(d||"body").eq(0)},_destroy:function(){var d,w=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),d=w.parent.children().eq(w.index),d.length&&d[0]!==this.element[0]?d.before(this.element):w.parent.append(this.element)},widget:function(){return this.uiDialog},disable:g.noop,enable:g.noop,close:function(d){var w=this;!this._isOpen||this._trigger("beforeClose",d)===!1||(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||g.ui.safeBlur(g.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){w._trigger("close",d)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(d,w){var C=!1,b=this.uiDialog.siblings(".ui-front:visible").map(function(){return+g(this).css("z-index")}).get(),I=Math.max.apply(null,b);return I>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",I+1),C=!0),C&&!w&&this._trigger("focus",d),C},open:function(){var d=this;if(this._isOpen){this._moveToTop()&&this._focusTabbable();return}this._isOpen=!0,this.opener=g(g.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){d._focusTabbable(),d._trigger("focus")}),this._makeFocusTarget(),this._trigger("open")},_focusTabbable:function(){var d=this._focusedElement;d||(d=this.element.find("[autofocus]")),d.length||(d=this.element.find(":tabbable")),d.length||(d=this.uiDialogButtonPane.find(":tabbable")),d.length||(d=this.uiDialogTitlebarClose.filter(":tabbable")),d.length||(d=this.uiDialog),d.eq(0).trigger("focus")},_restoreTabbableFocus:function(){var d=g.ui.safeActiveElement(this.document[0]),w=this.uiDialog[0]===d||g.contains(this.uiDialog[0],d);w||this._focusTabbable()},_keepFocus:function(d){d.preventDefault(),this._restoreTabbableFocus(),this._delay(this._restoreTabbableFocus)},_createWrapper:function(){this.uiDialog=g("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(d){if(this.options.closeOnEscape&&!d.isDefaultPrevented()&&d.keyCode&&d.keyCode===g.ui.keyCode.ESCAPE){d.preventDefault(),this.close(d);return}if(!(d.keyCode!==g.ui.keyCode.TAB||d.isDefaultPrevented())){var w=this.uiDialog.find(":tabbable"),C=w.first(),b=w.last();(d.target===b[0]||d.target===this.uiDialog[0])&&!d.shiftKey?(this._delay(function(){C.trigger("focus")}),d.preventDefault()):(d.target===C[0]||d.target===this.uiDialog[0])&&d.shiftKey&&(this._delay(function(){b.trigger("focus")}),d.preventDefault())}},mousedown:function(d){this._moveToTop(d)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var d;this.uiDialogTitlebar=g("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(w){g(w.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=g("<button type='button'></button>").button({label:g("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(w){w.preventDefault(),this.close(w)}}),d=g("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(d,"ui-dialog-title"),this._title(d),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":d.attr("id")})},_title:function(d){this.options.title?d.text(this.options.title):d.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=g("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=g("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var d=this,w=this.options.buttons;if(this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),g.isEmptyObject(w)||Array.isArray(w)&&!w.length){this._removeClass(this.uiDialog,"ui-dialog-buttons");return}g.each(w,function(C,b){var I,k;b=typeof b=="function"?{click:b,text:C}:b,b=g.extend({type:"button"},b),I=b.click,k={icon:b.icon,iconPosition:b.iconPosition,showLabel:b.showLabel,icons:b.icons,text:b.text},delete b.click,delete b.icon,delete b.iconPosition,delete b.showLabel,delete b.icons,typeof b.text=="boolean"&&delete b.text,g("<button></button>",b).button(k).appendTo(d.uiButtonSet).on("click",function(){I.apply(d.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog)},_makeDraggable:function(){var d=this,w=this.options;function C(b){return{position:b.position,offset:b.offset}}this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(b,I){d._addClass(g(this),"ui-dialog-dragging"),d._blockFrames(),d._trigger("dragStart",b,C(I))},drag:function(b,I){d._trigger("drag",b,C(I))},stop:function(b,I){var k=I.offset.left-d.document.scrollLeft(),M=I.offset.top-d.document.scrollTop();w.position={my:"left top",at:"left"+(k>=0?"+":"")+k+" top"+(M>=0?"+":"")+M,of:d.window},d._removeClass(g(this),"ui-dialog-dragging"),d._unblockFrames(),d._trigger("dragStop",b,C(I))}})},_makeResizable:function(){var d=this,w=this.options,C=w.resizable,b=this.uiDialog.css("position"),I=typeof C=="string"?C:"n,e,s,w,se,sw,ne,nw";function k(M){return{originalPosition:M.originalPosition,originalSize:M.originalSize,position:M.position,size:M.size}}this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:w.maxWidth,maxHeight:w.maxHeight,minWidth:w.minWidth,minHeight:this._minHeight(),handles:I,start:function(M,K){d._addClass(g(this),"ui-dialog-resizing"),d._blockFrames(),d._trigger("resizeStart",M,k(K))},resize:function(M,K){d._trigger("resize",M,k(K))},stop:function(M,K){var W=d.uiDialog.offset(),q=W.left-d.document.scrollLeft(),te=W.top-d.document.scrollTop();w.height=d.uiDialog.height(),w.width=d.uiDialog.width(),w.position={my:"left top",at:"left"+(q>=0?"+":"")+q+" top"+(te>=0?"+":"")+te,of:d.window},d._removeClass(g(this),"ui-dialog-resizing"),d._unblockFrames(),d._trigger("resizeStop",M,k(K))}}).css("position",b)},_trackFocus:function(){this._on(this.widget(),{focusin:function(d){this._makeFocusTarget(),this._focusedElement=g(d.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var d=this._trackingInstances(),w=g.inArray(this,d);w!==-1&&d.splice(w,1)},_trackingInstances:function(){var d=this.document.data("ui-dialog-instances");return d||(d=[],this.document.data("ui-dialog-instances",d)),d},_minHeight:function(){var d=this.options;return d.height==="auto"?d.minHeight:Math.min(d.minHeight,d.height)},_position:function(){var d=this.uiDialog.is(":visible");d||this.uiDialog.show(),this.uiDialog.position(this.options.position),d||this.uiDialog.hide()},_setOptions:function(d){var w=this,C=!1,b={};g.each(d,function(I,k){w._setOption(I,k),I in w.sizeRelatedOptions&&(C=!0),I in w.resizableRelatedOptions&&(b[I]=k)}),C&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",b)},_setOption:function(d,w){var C,b,I=this.uiDialog;d!=="disabled"&&(this._super(d,w),d==="appendTo"&&this.uiDialog.appendTo(this._appendTo()),d==="buttons"&&this._createButtons(),d==="closeText"&&this.uiDialogTitlebarClose.button({label:g("<a>").text(""+this.options.closeText).html()}),d==="draggable"&&(C=I.is(":data(ui-draggable)"),C&&!w&&I.draggable("destroy"),!C&&w&&this._makeDraggable()),d==="position"&&this._position(),d==="resizable"&&(b=I.is(":data(ui-resizable)"),b&&!w&&I.resizable("destroy"),b&&typeof w=="string"&&I.resizable("option","handles",w),!b&&w!==!1&&this._makeResizable()),d==="title"&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var d,w,C,b=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),b.minWidth>b.width&&(b.width=b.minWidth),d=this.uiDialog.css({height:"auto",width:b.width}).outerHeight(),w=Math.max(0,b.minHeight-d),C=typeof b.maxHeight=="number"?Math.max(0,b.maxHeight-d):"none",b.height==="auto"?this.element.css({minHeight:w,maxHeight:C,height:"auto"}):this.element.height(Math.max(0,b.height-d)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var d=g(this);return g("<div>").css({position:"absolute",width:d.outerWidth(),height:d.outerHeight()}).appendTo(d.parent()).offset(d.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(d){return g(d.target).closest(".ui-dialog").length?!0:!!g(d.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var d=g.fn.jquery.substring(0,4),w=!0;this._delay(function(){w=!1}),this.document.data("ui-dialog-overlays")||this.document.on("focusin.ui-dialog",(function(C){if(!w){var b=this._trackingInstances()[0];b._allowInteraction(C)||(C.preventDefault(),b._focusTabbable(),(d==="3.4."||d==="3.5.")&&b._delay(b._restoreTabbableFocus))}}).bind(this)),this.overlay=g("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var d=this.document.data("ui-dialog-overlays")-1;d?this.document.data("ui-dialog-overlays",d):(this.document.off("focusin.ui-dialog"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),g.uiBackCompat!==!1&&g.widget("ui.dialog",g.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(d,w){d==="dialogClass"&&this.uiDialog.removeClass(this.options.dialogClass).addClass(w),this._superApply(arguments)}}),g.ui.dialog;/*!
+ * jQuery UI Droppable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.droppable",{version:"1.13.2",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var d,w=this.options,C=w.accept;this.isover=!1,this.isout=!0,this.accept=typeof C=="function"?C:function(b){return b.is(C)},this.proportions=function(){if(arguments.length)d=arguments[0];else return d||(d={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight})},this._addToManager(w.scope),w.addClasses&&this._addClass("ui-droppable")},_addToManager:function(d){g.ui.ddmanager.droppables[d]=g.ui.ddmanager.droppables[d]||[],g.ui.ddmanager.droppables[d].push(this)},_splice:function(d){for(var w=0;w<d.length;w++)d[w]===this&&d.splice(w,1)},_destroy:function(){var d=g.ui.ddmanager.droppables[this.options.scope];this._splice(d)},_setOption:function(d,w){if(d==="accept")this.accept=typeof w=="function"?w:function(b){return b.is(w)};else if(d==="scope"){var C=g.ui.ddmanager.droppables[this.options.scope];this._splice(C),this._addToManager(w)}this._super(d,w)},_activate:function(d){var w=g.ui.ddmanager.current;this._addActiveClass(),w&&this._trigger("activate",d,this.ui(w))},_deactivate:function(d){var w=g.ui.ddmanager.current;this._removeActiveClass(),w&&this._trigger("deactivate",d,this.ui(w))},_over:function(d){var w=g.ui.ddmanager.current;!w||(w.currentItem||w.element)[0]===this.element[0]||this.accept.call(this.element[0],w.currentItem||w.element)&&(this._addHoverClass(),this._trigger("over",d,this.ui(w)))},_out:function(d){var w=g.ui.ddmanager.current;!w||(w.currentItem||w.element)[0]===this.element[0]||this.accept.call(this.element[0],w.currentItem||w.element)&&(this._removeHoverClass(),this._trigger("out",d,this.ui(w)))},_drop:function(d,w){var C=w||g.ui.ddmanager.current,b=!1;return!C||(C.currentItem||C.element)[0]===this.element[0]||(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var I=g(this).droppable("instance");if(I.options.greedy&&!I.options.disabled&&I.options.scope===C.options.scope&&I.accept.call(I.element[0],C.currentItem||C.element)&&g.ui.intersect(C,g.extend(I,{offset:I.element.offset()}),I.options.tolerance,d))return b=!0,!1}),b)?!1:this.accept.call(this.element[0],C.currentItem||C.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",d,this.ui(C)),this.element):!1},ui:function(d){return{draggable:d.currentItem||d.element,helper:d.helper,position:d.position,offset:d.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}}),g.ui.intersect=function(){function d(w,C,b){return w>=C&&w<C+b}return function(w,C,b,I){if(!C.offset)return!1;var k=(w.positionAbs||w.position.absolute).left+w.margins.left,M=(w.positionAbs||w.position.absolute).top+w.margins.top,K=k+w.helperProportions.width,W=M+w.helperProportions.height,q=C.offset.left,te=C.offset.top,he=q+C.proportions().width,ne=te+C.proportions().height;switch(b){case"fit":return q<=k&&K<=he&&te<=M&&W<=ne;case"intersect":return q<k+w.helperProportions.width/2&&K-w.helperProportions.width/2<he&&te<M+w.helperProportions.height/2&&W-w.helperProportions.height/2<ne;case"pointer":return d(I.pageY,te,C.proportions().height)&&d(I.pageX,q,C.proportions().width);case"touch":return(M>=te&&M<=ne||W>=te&&W<=ne||M<te&&W>ne)&&(k>=q&&k<=he||K>=q&&K<=he||k<q&&K>he);default:return!1}}}(),g.ui.ddmanager={current:null,droppables:{default:[]},prepareOffsets:function(d,w){var C,b,I=g.ui.ddmanager.droppables[d.options.scope]||[],k=w?w.type:null,M=(d.currentItem||d.element).find(":data(ui-droppable)").addBack();e:for(C=0;C<I.length;C++)if(!(I[C].options.disabled||d&&!I[C].accept.call(I[C].element[0],d.currentItem||d.element))){for(b=0;b<M.length;b++)if(M[b]===I[C].element[0]){I[C].proportions().height=0;continue e}I[C].visible=I[C].element.css("display")!=="none",I[C].visible&&(k==="mousedown"&&I[C]._activate.call(I[C],w),I[C].offset=I[C].element.offset(),I[C].proportions({width:I[C].element[0].offsetWidth,height:I[C].element[0].offsetHeight}))}},drop:function(d,w){var C=!1;return g.each((g.ui.ddmanager.droppables[d.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&g.ui.intersect(d,this,this.options.tolerance,w)&&(C=this._drop.call(this,w)||C),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],d.currentItem||d.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,w)))}),C},dragStart:function(d,w){d.element.parentsUntil("body").on("scroll.droppable",function(){d.options.refreshPositions||g.ui.ddmanager.prepareOffsets(d,w)})},drag:function(d,w){d.options.refreshPositions&&g.ui.ddmanager.prepareOffsets(d,w),g.each(g.ui.ddmanager.droppables[d.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var C,b,I,k=g.ui.intersect(d,this,this.options.tolerance,w),M=!k&&this.isover?"isout":k&&!this.isover?"isover":null;M&&(this.options.greedy&&(b=this.options.scope,I=this.element.parents(":data(ui-droppable)").filter(function(){return g(this).droppable("instance").options.scope===b}),I.length&&(C=g(I[0]).droppable("instance"),C.greedyChild=M==="isover")),C&&M==="isover"&&(C.isover=!1,C.isout=!0,C._out.call(C,w)),this[M]=!0,this[M==="isout"?"isover":"isout"]=!1,this[M==="isover"?"_over":"_out"].call(this,w),C&&M==="isout"&&(C.isout=!1,C.isover=!0,C._over.call(C,w)))}})},dragStop:function(d,w){d.element.parentsUntil("body").off("scroll.droppable"),d.options.refreshPositions||g.ui.ddmanager.prepareOffsets(d,w)}},g.uiBackCompat!==!1&&g.widget("ui.droppable",g.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),g.ui.droppable;/*!
+ * jQuery UI Progressbar 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.progressbar",{version:"1.13.2",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=g("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(d){if(d===void 0)return this.options.value;this.options.value=this._constrainedValue(d),this._refreshValue()},_constrainedValue:function(d){return d===void 0&&(d=this.options.value),this.indeterminate=d===!1,typeof d!="number"&&(d=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,d))},_setOptions:function(d){var w=d.value;delete d.value,this._super(d),this.options.value=this._constrainedValue(w),this._refreshValue()},_setOption:function(d,w){d==="max"&&(w=Math.max(this.min,w)),this._super(d,w)},_setOptionDisabled:function(d){this._super(d),this.element.attr("aria-disabled",d),this._toggleClass(null,"ui-state-disabled",!!d)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var d=this.options.value,w=this._percentage();this.valueDiv.toggle(this.indeterminate||d>this.min).width(w.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,d===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=g("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":d}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==d&&(this.oldValue=d,this._trigger("change")),d===this.options.max&&this._trigger("complete")}});/*!
+ * jQuery UI Selectable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.selectable",g.ui.mouse,{version:"1.13.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var d=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){d.elementPos=g(d.element[0]).offset(),d.selectees=g(d.options.filter,d.element[0]),d._addClass(d.selectees,"ui-selectee"),d.selectees.each(function(){var w=g(this),C=w.offset(),b={left:C.left-d.elementPos.left,top:C.top-d.elementPos.top};g.data(this,"selectable-item",{element:this,$element:w,left:b.left,top:b.top,right:b.left+w.outerWidth(),bottom:b.top+w.outerHeight(),startselected:!1,selected:w.hasClass("ui-selected"),selecting:w.hasClass("ui-selecting"),unselecting:w.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=g("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(d){var w=this,C=this.options;this.opos=[d.pageX,d.pageY],this.elementPos=g(this.element[0]).offset(),!this.options.disabled&&(this.selectees=g(C.filter,this.element[0]),this._trigger("start",d),g(C.appendTo).append(this.helper),this.helper.css({left:d.pageX,top:d.pageY,width:0,height:0}),C.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var b=g.data(this,"selectable-item");b.startselected=!0,!d.metaKey&&!d.ctrlKey&&(w._removeClass(b.$element,"ui-selected"),b.selected=!1,w._addClass(b.$element,"ui-unselecting"),b.unselecting=!0,w._trigger("unselecting",d,{unselecting:b.element}))}),g(d.target).parents().addBack().each(function(){var b,I=g.data(this,"selectable-item");if(I)return b=!d.metaKey&&!d.ctrlKey||!I.$element.hasClass("ui-selected"),w._removeClass(I.$element,b?"ui-unselecting":"ui-selected")._addClass(I.$element,b?"ui-selecting":"ui-unselecting"),I.unselecting=!b,I.selecting=b,I.selected=b,b?w._trigger("selecting",d,{selecting:I.element}):w._trigger("unselecting",d,{unselecting:I.element}),!1}))},_mouseDrag:function(d){if(this.dragged=!0,!this.options.disabled){var w,C=this,b=this.options,I=this.opos[0],k=this.opos[1],M=d.pageX,K=d.pageY;return I>M&&(w=M,M=I,I=w),k>K&&(w=K,K=k,k=w),this.helper.css({left:I,top:k,width:M-I,height:K-k}),this.selectees.each(function(){var W=g.data(this,"selectable-item"),q=!1,te={};!W||W.element===C.element[0]||(te.left=W.left+C.elementPos.left,te.right=W.right+C.elementPos.left,te.top=W.top+C.elementPos.top,te.bottom=W.bottom+C.elementPos.top,b.tolerance==="touch"?q=!(te.left>M||te.right<I||te.top>K||te.bottom<k):b.tolerance==="fit"&&(q=te.left>I&&te.right<M&&te.top>k&&te.bottom<K),q?(W.selected&&(C._removeClass(W.$element,"ui-selected"),W.selected=!1),W.unselecting&&(C._removeClass(W.$element,"ui-unselecting"),W.unselecting=!1),W.selecting||(C._addClass(W.$element,"ui-selecting"),W.selecting=!0,C._trigger("selecting",d,{selecting:W.element}))):(W.selecting&&((d.metaKey||d.ctrlKey)&&W.startselected?(C._removeClass(W.$element,"ui-selecting"),W.selecting=!1,C._addClass(W.$element,"ui-selected"),W.selected=!0):(C._removeClass(W.$element,"ui-selecting"),W.selecting=!1,W.startselected&&(C._addClass(W.$element,"ui-unselecting"),W.unselecting=!0),C._trigger("unselecting",d,{unselecting:W.element}))),W.selected&&!d.metaKey&&!d.ctrlKey&&!W.startselected&&(C._removeClass(W.$element,"ui-selected"),W.selected=!1,C._addClass(W.$element,"ui-unselecting"),W.unselecting=!0,C._trigger("unselecting",d,{unselecting:W.element}))))}),!1}},_mouseStop:function(d){var w=this;return this.dragged=!1,g(".ui-unselecting",this.element[0]).each(function(){var C=g.data(this,"selectable-item");w._removeClass(C.$element,"ui-unselecting"),C.unselecting=!1,C.startselected=!1,w._trigger("unselected",d,{unselected:C.element})}),g(".ui-selecting",this.element[0]).each(function(){var C=g.data(this,"selectable-item");w._removeClass(C.$element,"ui-selecting")._addClass(C.$element,"ui-selected"),C.selecting=!1,C.selected=!0,C.startselected=!0,w._trigger("selected",d,{selected:C.element})}),this._trigger("stop",d),this.helper.remove(),!1}});/*!
+ * jQuery UI Selectmenu 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.selectmenu",[g.ui.formResetMixin,{version:"1.13.2",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var d=this.element.uniqueId().attr("id");this.ids={element:d,button:d+"-button",menu:d+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=g()},_drawButton:function(){var d,w=this,C=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(b){this.button.trigger("focus"),b.preventDefault()}}),this.element.hide(),this.button=g("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),d=g("<span>").appendTo(this.button),this._addClass(d,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(C).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){w._rendered||w._refreshMenu()})},_drawMenu:function(){var d=this;this.menu=g("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=g("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(w,C){w.preventDefault(),d._setSelection(),d._select(C.item.data("ui-selectmenu-item"),w)},focus:function(w,C){var b=C.item.data("ui-selectmenu-item");d.focusIndex!=null&&b.index!==d.focusIndex&&(d._trigger("focus",w,{item:b}),d.isOpen||d._select(b,w)),d.focusIndex=b.index,d.button.attr("aria-activedescendant",d.menuItems.eq(b.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),this.options.width===null&&this._resizeButton()},_refreshMenu:function(){var d,w=this.element.find("option");this.menu.empty(),this._parseOptions(w),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,w.length&&(d=this._getSelectedItem(),this.menuInstance.focus(null,d),this._setAria(d.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(d){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",d)))},_position:function(){this.menuWrap.position(g.extend({of:this.button},this.options.position))},close:function(d){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",d))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(d){var w=g("<span>");return this._setText(w,d.label),this._addClass(w,"ui-selectmenu-text"),w},_renderMenu:function(d,w){var C=this,b="";g.each(w,function(I,k){var M;k.optgroup!==b&&(M=g("<li>",{text:k.optgroup}),C._addClass(M,"ui-selectmenu-optgroup","ui-menu-divider"+(k.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),M.appendTo(d),b=k.optgroup),C._renderItemData(d,k)})},_renderItemData:function(d,w){return this._renderItem(d,w).data("ui-selectmenu-item",w)},_renderItem:function(d,w){var C=g("<li>"),b=g("<div>",{title:w.element.attr("title")});return w.disabled&&this._addClass(C,null,"ui-state-disabled"),this._setText(b,w.label),C.append(b).appendTo(d)},_setText:function(d,w){w?d.text(w):d.html("&#160;")},_move:function(d,w){var C,b,I=".ui-menu-item";this.isOpen?C=this.menuItems.eq(this.focusIndex).parent("li"):(C=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),I+=":not(.ui-state-disabled)"),d==="first"||d==="last"?b=C[d==="first"?"prevAll":"nextAll"](I).eq(-1):b=C[d+"All"](I).eq(0),b.length&&this.menuInstance.focus(w,b)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(d){this[this.isOpen?"close":"open"](d)},_setSelection:function(){var d;this.range&&(window.getSelection?(d=window.getSelection(),d.removeAllRanges(),d.addRange(this.range)):this.range.select(),this.button.trigger("focus"))},_documentClick:{mousedown:function(d){this.isOpen&&(g(d.target).closest(".ui-selectmenu-menu, #"+g.escapeSelector(this.ids.button)).length||this.close(d))}},_buttonEvents:{mousedown:function(){var d;window.getSelection?(d=window.getSelection(),d.rangeCount&&(this.range=d.getRangeAt(0))):this.range=document.selection.createRange()},click:function(d){this._setSelection(),this._toggle(d)},keydown:function(d){var w=!0;switch(d.keyCode){case g.ui.keyCode.TAB:case g.ui.keyCode.ESCAPE:this.close(d),w=!1;break;case g.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(d);break;case g.ui.keyCode.UP:d.altKey?this._toggle(d):this._move("prev",d);break;case g.ui.keyCode.DOWN:d.altKey?this._toggle(d):this._move("next",d);break;case g.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(d):this._toggle(d);break;case g.ui.keyCode.LEFT:this._move("prev",d);break;case g.ui.keyCode.RIGHT:this._move("next",d);break;case g.ui.keyCode.HOME:case g.ui.keyCode.PAGE_UP:this._move("first",d);break;case g.ui.keyCode.END:case g.ui.keyCode.PAGE_DOWN:this._move("last",d);break;default:this.menu.trigger(d),w=!1}w&&d.preventDefault()}},_selectFocusedItem:function(d){var w=this.menuItems.eq(this.focusIndex).parent("li");w.hasClass("ui-state-disabled")||this._select(w.data("ui-selectmenu-item"),d)},_select:function(d,w){var C=this.element[0].selectedIndex;this.element[0].selectedIndex=d.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(d)),this._setAria(d),this._trigger("select",w,{item:d}),d.index!==C&&this._trigger("change",w,{item:d}),this.close(w)},_setAria:function(d){var w=this.menuItems.eq(d.index).attr("id");this.button.attr({"aria-labelledby":w,"aria-activedescendant":w}),this.menu.attr("aria-activedescendant",w)},_setOption:function(d,w){if(d==="icons"){var C=this.button.find("span.ui-icon");this._removeClass(C,null,this.options.icons.button)._addClass(C,null,w.button)}this._super(d,w),d==="appendTo"&&this.menuWrap.appendTo(this._appendTo()),d==="width"&&this._resizeButton()},_setOptionDisabled:function(d){this._super(d),this.menuInstance.option("disabled",d),this.button.attr("aria-disabled",d),this._toggleClass(this.button,null,"ui-state-disabled",d),this.element.prop("disabled",d),d?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var d=this.options.appendTo;return d&&(d=d.jquery||d.nodeType?g(d):this.document.find(d).eq(0)),(!d||!d[0])&&(d=this.element.closest(".ui-front, dialog")),d.length||(d=this.document[0].body),d},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var d=this.options.width;if(d===!1){this.button.css("width","");return}d===null&&(d=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(d)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var d=this._super();return d.disabled=this.element.prop("disabled"),d},_parseOptions:function(d){var w=this,C=[];d.each(function(b,I){I.hidden||C.push(w._parseOption(g(I),b))}),this.items=C},_parseOption:function(d,w){var C=d.parent("optgroup");return{element:d,index:w,value:d.val(),label:d.text(),optgroup:C.attr("label")||"",disabled:C.prop("disabled")||d.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]);/*!
+ * jQuery UI Slider 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.slider",g.ui.mouse,{version:"1.13.2",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var d,w,C=this.options,b=this.element.find(".ui-slider-handle"),I="<span tabindex='0'></span>",k=[];for(w=C.values&&C.values.length||1,b.length>w&&(b.slice(w).remove(),b=b.slice(0,w)),d=b.length;d<w;d++)k.push(I);this.handles=b.add(g(k.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(M){g(this).data("ui-slider-handle-index",M).attr("tabIndex",0)})},_createRange:function(){var d=this.options;d.range?(d.range===!0&&(d.values?d.values.length&&d.values.length!==2?d.values=[d.values[0],d.values[0]]:Array.isArray(d.values)&&(d.values=d.values.slice(0)):d.values=[this._valueMin(),this._valueMin()]),!this.range||!this.range.length?(this.range=g("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")):(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})),(d.range==="min"||d.range==="max")&&this._addClass(this.range,"ui-slider-range-"+d.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(d){var w,C,b,I,k,M,K,W,q=this,te=this.options;return te.disabled||(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),w={x:d.pageX,y:d.pageY},C=this._normValueFromMouse(w),b=this._valueMax()-this._valueMin()+1,this.handles.each(function(he){var ne=Math.abs(C-q.values(he));(b>ne||b===ne&&(he===q._lastChangedValue||q.values(he)===te.min))&&(b=ne,I=g(this),k=he)}),M=this._start(d,k),M===!1)?!1:(this._mouseSliding=!0,this._handleIndex=k,this._addClass(I,null,"ui-state-active"),I.trigger("focus"),K=I.offset(),W=!g(d.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=W?{left:0,top:0}:{left:d.pageX-K.left-I.width()/2,top:d.pageY-K.top-I.height()/2-(parseInt(I.css("borderTopWidth"),10)||0)-(parseInt(I.css("borderBottomWidth"),10)||0)+(parseInt(I.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(d,k,C),this._animateOff=!0,!0)},_mouseStart:function(){return!0},_mouseDrag:function(d){var w={x:d.pageX,y:d.pageY},C=this._normValueFromMouse(w);return this._slide(d,this._handleIndex,C),!1},_mouseStop:function(d){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(d,this._handleIndex),this._change(d,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(d){var w,C,b,I,k;return this.orientation==="horizontal"?(w=this.elementSize.width,C=d.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(w=this.elementSize.height,C=d.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),b=C/w,b>1&&(b=1),b<0&&(b=0),this.orientation==="vertical"&&(b=1-b),I=this._valueMax()-this._valueMin(),k=this._valueMin()+b*I,this._trimAlignValue(k)},_uiHash:function(d,w,C){var b={handle:this.handles[d],handleIndex:d,value:w!==void 0?w:this.value()};return this._hasMultipleValues()&&(b.value=w!==void 0?w:this.values(d),b.values=C||this.values()),b},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(d,w){return this._trigger("start",d,this._uiHash(w))},_slide:function(d,w,C){var b,I,k=this.value(),M=this.values();this._hasMultipleValues()&&(I=this.values(w?0:1),k=this.values(w),this.options.values.length===2&&this.options.range===!0&&(C=w===0?Math.min(I,C):Math.max(I,C)),M[w]=C),C!==k&&(b=this._trigger("slide",d,this._uiHash(w,C,M)),b!==!1&&(this._hasMultipleValues()?this.values(w,C):this.value(C)))},_stop:function(d,w){this._trigger("stop",d,this._uiHash(w))},_change:function(d,w){!this._keySliding&&!this._mouseSliding&&(this._lastChangedValue=w,this._trigger("change",d,this._uiHash(w)))},value:function(d){if(arguments.length){this.options.value=this._trimAlignValue(d),this._refreshValue(),this._change(null,0);return}return this._value()},values:function(d,w){var C,b,I;if(arguments.length>1){this.options.values[d]=this._trimAlignValue(w),this._refreshValue(),this._change(null,d);return}if(arguments.length)if(Array.isArray(arguments[0])){for(C=this.options.values,b=arguments[0],I=0;I<C.length;I+=1)C[I]=this._trimAlignValue(b[I]),this._change(null,I);this._refreshValue()}else return this._hasMultipleValues()?this._values(d):this.value();else return this._values()},_setOption:function(d,w){var C,b=0;switch(d==="range"&&this.options.range===!0&&(w==="min"?(this.options.value=this._values(0),this.options.values=null):w==="max"&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),Array.isArray(this.options.values)&&(b=this.options.values.length),this._super(d,w),d){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(w),this.handles.css(w==="horizontal"?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),C=b-1;C>=0;C--)this._change(null,C);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1;break}},_setOptionDisabled:function(d){this._super(d),this._toggleClass(null,"ui-state-disabled",!!d)},_value:function(){var d=this.options.value;return d=this._trimAlignValue(d),d},_values:function(d){var w,C,b;if(arguments.length)return w=this.options.values[d],w=this._trimAlignValue(w),w;if(this._hasMultipleValues()){for(C=this.options.values.slice(),b=0;b<C.length;b+=1)C[b]=this._trimAlignValue(C[b]);return C}else return[]},_trimAlignValue:function(d){if(d<=this._valueMin())return this._valueMin();if(d>=this._valueMax())return this._valueMax();var w=this.options.step>0?this.options.step:1,C=(d-this._valueMin())%w,b=d-C;return Math.abs(C)*2>=w&&(b+=C>0?w:-w),parseFloat(b.toFixed(5))},_calculateNewMax:function(){var d=this.options.max,w=this._valueMin(),C=this.options.step,b=Math.round((d-w)/C)*C;d=b+w,d>this.options.max&&(d-=C),this.max=parseFloat(d.toFixed(this._precision()))},_precision:function(){var d=this._precisionOf(this.options.step);return this.options.min!==null&&(d=Math.max(d,this._precisionOf(this.options.min))),d},_precisionOf:function(d){var w=d.toString(),C=w.indexOf(".");return C===-1?0:w.length-C-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(d){d==="vertical"&&this.range.css({width:"",left:""}),d==="horizontal"&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var d,w,C,b,I,k=this.options.range,M=this.options,K=this,W=this._animateOff?!1:M.animate,q={};this._hasMultipleValues()?this.handles.each(function(te){w=(K.values(te)-K._valueMin())/(K._valueMax()-K._valueMin())*100,q[K.orientation==="horizontal"?"left":"bottom"]=w+"%",g(this).stop(1,1)[W?"animate":"css"](q,M.animate),K.options.range===!0&&(K.orientation==="horizontal"?(te===0&&K.range.stop(1,1)[W?"animate":"css"]({left:w+"%"},M.animate),te===1&&K.range[W?"animate":"css"]({width:w-d+"%"},{queue:!1,duration:M.animate})):(te===0&&K.range.stop(1,1)[W?"animate":"css"]({bottom:w+"%"},M.animate),te===1&&K.range[W?"animate":"css"]({height:w-d+"%"},{queue:!1,duration:M.animate}))),d=w}):(C=this.value(),b=this._valueMin(),I=this._valueMax(),w=I!==b?(C-b)/(I-b)*100:0,q[this.orientation==="horizontal"?"left":"bottom"]=w+"%",this.handle.stop(1,1)[W?"animate":"css"](q,M.animate),k==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[W?"animate":"css"]({width:w+"%"},M.animate),k==="max"&&this.orientation==="horizontal"&&this.range.stop(1,1)[W?"animate":"css"]({width:100-w+"%"},M.animate),k==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[W?"animate":"css"]({height:w+"%"},M.animate),k==="max"&&this.orientation==="vertical"&&this.range.stop(1,1)[W?"animate":"css"]({height:100-w+"%"},M.animate))},_handleEvents:{keydown:function(d){var w,C,b,I,k=g(d.target).data("ui-slider-handle-index");switch(d.keyCode){case g.ui.keyCode.HOME:case g.ui.keyCode.END:case g.ui.keyCode.PAGE_UP:case g.ui.keyCode.PAGE_DOWN:case g.ui.keyCode.UP:case g.ui.keyCode.RIGHT:case g.ui.keyCode.DOWN:case g.ui.keyCode.LEFT:if(d.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(g(d.target),null,"ui-state-active"),w=this._start(d,k),w===!1))return;break}switch(I=this.options.step,this._hasMultipleValues()?C=b=this.values(k):C=b=this.value(),d.keyCode){case g.ui.keyCode.HOME:b=this._valueMin();break;case g.ui.keyCode.END:b=this._valueMax();break;case g.ui.keyCode.PAGE_UP:b=this._trimAlignValue(C+(this._valueMax()-this._valueMin())/this.numPages);break;case g.ui.keyCode.PAGE_DOWN:b=this._trimAlignValue(C-(this._valueMax()-this._valueMin())/this.numPages);break;case g.ui.keyCode.UP:case g.ui.keyCode.RIGHT:if(C===this._valueMax())return;b=this._trimAlignValue(C+I);break;case g.ui.keyCode.DOWN:case g.ui.keyCode.LEFT:if(C===this._valueMin())return;b=this._trimAlignValue(C-I);break}this._slide(d,k,b)},keyup:function(d){var w=g(d.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(d,w),this._change(d,w),this._removeClass(g(d.target),null,"ui-state-active"))}}});/*!
+ * jQuery UI Sortable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.sortable",g.ui.mouse,{version:"1.13.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(d,w,C){return d>=w&&d<w+C},_isFloating:function(d){return/left|right/.test(d.css("float"))||/inline|table-cell/.test(d.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(d,w){this._super(d,w),d==="handle"&&this._setHandleClassName()},_setHandleClassName:function(){var d=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),g.each(this.items,function(){d._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var d=this.items.length-1;d>=0;d--)this.items[d].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(d,w){var C=null,b=!1,I=this;return this.reverting||this.options.disabled||this.options.type==="static"||(this._refreshItems(d),g(d.target).parents().each(function(){if(g.data(this,I.widgetName+"-item")===I)return C=g(this),!1}),g.data(d.target,I.widgetName+"-item")===I&&(C=g(d.target)),!C)||this.options.handle&&!w&&(g(this.options.handle,C).find("*").addBack().each(function(){this===d.target&&(b=!0)}),!b)?!1:(this.currentItem=C,this._removeCurrentsFromItems(),!0)},_mouseStart:function(d,w,C){var b,I,k=this.options;if(this.currentContainer=this,this.refreshPositions(),this.appendTo=g(k.appendTo!=="parent"?k.appendTo:this.currentItem.parent()),this.helper=this._createHelper(d),this._cacheHelperProportions(),this._cacheMargins(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},g.extend(this.offset,{click:{left:d.pageX-this.offset.left,top:d.pageY-this.offset.top},relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),k.cursorAt&&this._adjustOffsetFromHelper(k.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),this.scrollParent=this.placeholder.scrollParent(),g.extend(this.offset,{parent:this._getParentOffset()}),k.containment&&this._setContainment(),k.cursor&&k.cursor!=="auto"&&(I=this.document.find("body"),this.storedCursor=I.css("cursor"),I.css("cursor",k.cursor),this.storedStylesheet=g("<style>*{ cursor: "+k.cursor+" !important; }</style>").appendTo(I)),k.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",k.zIndex)),k.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",k.opacity)),this.scrollParent[0]!==this.document[0]&&this.scrollParent[0].tagName!=="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",d,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!C)for(b=this.containers.length-1;b>=0;b--)this.containers[b]._trigger("activate",d,this._uiHash(this));return g.ui.ddmanager&&(g.ui.ddmanager.current=this),g.ui.ddmanager&&!k.dropBehaviour&&g.ui.ddmanager.prepareOffsets(this,d),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this.helper.parent().is(this.appendTo)||(this.helper.detach().appendTo(this.appendTo),this.offset.parent=this._getParentOffset()),this.position=this.originalPosition=this._generatePosition(d),this.originalPageX=d.pageX,this.originalPageY=d.pageY,this.lastPositionAbs=this.positionAbs=this._convertPositionTo("absolute"),this._mouseDrag(d),!0},_scroll:function(d){var w=this.options,C=!1;return this.scrollParent[0]!==this.document[0]&&this.scrollParent[0].tagName!=="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-d.pageY<w.scrollSensitivity?this.scrollParent[0].scrollTop=C=this.scrollParent[0].scrollTop+w.scrollSpeed:d.pageY-this.overflowOffset.top<w.scrollSensitivity&&(this.scrollParent[0].scrollTop=C=this.scrollParent[0].scrollTop-w.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-d.pageX<w.scrollSensitivity?this.scrollParent[0].scrollLeft=C=this.scrollParent[0].scrollLeft+w.scrollSpeed:d.pageX-this.overflowOffset.left<w.scrollSensitivity&&(this.scrollParent[0].scrollLeft=C=this.scrollParent[0].scrollLeft-w.scrollSpeed)):(d.pageY-this.document.scrollTop()<w.scrollSensitivity?C=this.document.scrollTop(this.document.scrollTop()-w.scrollSpeed):this.window.height()-(d.pageY-this.document.scrollTop())<w.scrollSensitivity&&(C=this.document.scrollTop(this.document.scrollTop()+w.scrollSpeed)),d.pageX-this.document.scrollLeft()<w.scrollSensitivity?C=this.document.scrollLeft(this.document.scrollLeft()-w.scrollSpeed):this.window.width()-(d.pageX-this.document.scrollLeft())<w.scrollSensitivity&&(C=this.document.scrollLeft(this.document.scrollLeft()+w.scrollSpeed))),C},_mouseDrag:function(d){var w,C,b,I,k=this.options;for(this.position=this._generatePosition(d),this.positionAbs=this._convertPositionTo("absolute"),(!this.options.axis||this.options.axis!=="y")&&(this.helper[0].style.left=this.position.left+"px"),(!this.options.axis||this.options.axis!=="x")&&(this.helper[0].style.top=this.position.top+"px"),k.scroll&&this._scroll(d)!==!1&&(this._refreshItemPositions(!0),g.ui.ddmanager&&!k.dropBehaviour&&g.ui.ddmanager.prepareOffsets(this,d)),this.dragDirection={vertical:this._getDragVerticalDirection(),horizontal:this._getDragHorizontalDirection()},w=this.items.length-1;w>=0;w--)if(C=this.items[w],b=C.item[0],I=this._intersectsWithPointer(C),!!I&&C.instance===this.currentContainer&&b!==this.currentItem[0]&&this.placeholder[I===1?"next":"prev"]()[0]!==b&&!g.contains(this.placeholder[0],b)&&(this.options.type!=="semi-dynamic"||!g.contains(this.element[0],b))){if(this.direction=I===1?"down":"up",this.options.tolerance==="pointer"||this._intersectsWithSides(C))this._rearrange(d,C);else break;this._trigger("change",d,this._uiHash());break}return this._contactContainers(d),g.ui.ddmanager&&g.ui.ddmanager.drag(this,d),this._trigger("sort",d,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(d,w){if(d){if(g.ui.ddmanager&&!this.options.dropBehaviour&&g.ui.ddmanager.drop(this,d),this.options.revert){var C=this,b=this.placeholder.offset(),I=this.options.axis,k={};(!I||I==="x")&&(k.left=b.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),(!I||I==="y")&&(k.top=b.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,g(this.helper).animate(k,parseInt(this.options.revert,10)||500,function(){C._clear(d)})}else this._clear(d,w);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new g.Event("mouseup",{target:null})),this.options.helper==="original"?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var d=this.containers.length-1;d>=0;d--)this.containers[d]._trigger("deactivate",null,this._uiHash(this)),this.containers[d].containerCache.over&&(this.containers[d]._trigger("out",null,this._uiHash(this)),this.containers[d].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!=="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),g.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?g(this.domPosition.prev).after(this.currentItem):g(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(d){var w=this._getItemsAsjQuery(d&&d.connected),C=[];return d=d||{},g(w).each(function(){var b=(g(d.item||this).attr(d.attribute||"id")||"").match(d.expression||/(.+)[\-=_](.+)/);b&&C.push((d.key||b[1]+"[]")+"="+(d.key&&d.expression?b[1]:b[2]))}),!C.length&&d.key&&C.push(d.key+"="),C.join("&")},toArray:function(d){var w=this._getItemsAsjQuery(d&&d.connected),C=[];return d=d||{},w.each(function(){C.push(g(d.item||this).attr(d.attribute||"id")||"")}),C},_intersectsWith:function(d){var w=this.positionAbs.left,C=w+this.helperProportions.width,b=this.positionAbs.top,I=b+this.helperProportions.height,k=d.left,M=k+d.width,K=d.top,W=K+d.height,q=this.offset.click.top,te=this.offset.click.left,he=this.options.axis==="x"||b+q>K&&b+q<W,ne=this.options.axis==="y"||w+te>k&&w+te<M,ie=he&&ne;return this.options.tolerance==="pointer"||this.options.forcePointerForContainers||this.options.tolerance!=="pointer"&&this.helperProportions[this.floating?"width":"height"]>d[this.floating?"width":"height"]?ie:k<w+this.helperProportions.width/2&&C-this.helperProportions.width/2<M&&K<b+this.helperProportions.height/2&&I-this.helperProportions.height/2<W},_intersectsWithPointer:function(d){var w,C,b=this.options.axis==="x"||this._isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height),I=this.options.axis==="y"||this._isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width),k=b&&I;return k?(w=this.dragDirection.vertical,C=this.dragDirection.horizontal,this.floating?C==="right"||w==="down"?2:1:w&&(w==="down"?2:1)):!1},_intersectsWithSides:function(d){var w=this._isOverAxis(this.positionAbs.top+this.offset.click.top,d.top+d.height/2,d.height),C=this._isOverAxis(this.positionAbs.left+this.offset.click.left,d.left+d.width/2,d.width),b=this.dragDirection.vertical,I=this.dragDirection.horizontal;return this.floating&&I?I==="right"&&C||I==="left"&&!C:b&&(b==="down"&&w||b==="up"&&!w)},_getDragVerticalDirection:function(){var d=this.positionAbs.top-this.lastPositionAbs.top;return d!==0&&(d>0?"down":"up")},_getDragHorizontalDirection:function(){var d=this.positionAbs.left-this.lastPositionAbs.left;return d!==0&&(d>0?"right":"left")},refresh:function(d){return this._refreshItems(d),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var d=this.options;return d.connectWith.constructor===String?[d.connectWith]:d.connectWith},_getItemsAsjQuery:function(d){var w,C,b,I,k=[],M=[],K=this._connectWith();if(K&&d)for(w=K.length-1;w>=0;w--)for(b=g(K[w],this.document[0]),C=b.length-1;C>=0;C--)I=g.data(b[C],this.widgetFullName),I&&I!==this&&!I.options.disabled&&M.push([typeof I.options.items=="function"?I.options.items.call(I.element):g(I.options.items,I.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),I]);M.push([typeof this.options.items=="function"?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):g(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);function W(){k.push(this)}for(w=M.length-1;w>=0;w--)M[w][0].each(W);return g(k)},_removeCurrentsFromItems:function(){var d=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=g.grep(this.items,function(w){for(var C=0;C<d.length;C++)if(d[C]===w.item[0])return!1;return!0})},_refreshItems:function(d){this.items=[],this.containers=[this];var w,C,b,I,k,M,K,W,q=this.items,te=[[typeof this.options.items=="function"?this.options.items.call(this.element[0],d,{item:this.currentItem}):g(this.options.items,this.element),this]],he=this._connectWith();if(he&&this.ready)for(w=he.length-1;w>=0;w--)for(b=g(he[w],this.document[0]),C=b.length-1;C>=0;C--)I=g.data(b[C],this.widgetFullName),I&&I!==this&&!I.options.disabled&&(te.push([typeof I.options.items=="function"?I.options.items.call(I.element[0],d,{item:this.currentItem}):g(I.options.items,I.element),I]),this.containers.push(I));for(w=te.length-1;w>=0;w--)for(k=te[w][1],M=te[w][0],C=0,W=M.length;C<W;C++)K=g(M[C]),K.data(this.widgetName+"-item",k),q.push({item:K,instance:k,width:0,height:0,left:0,top:0})},_refreshItemPositions:function(d){var w,C,b,I;for(w=this.items.length-1;w>=0;w--)C=this.items[w],!(this.currentContainer&&C.instance!==this.currentContainer&&C.item[0]!==this.currentItem[0])&&(b=this.options.toleranceElement?g(this.options.toleranceElement,C.item):C.item,d||(C.width=b.outerWidth(),C.height=b.outerHeight()),I=b.offset(),C.left=I.left,C.top=I.top)},refreshPositions:function(d){this.floating=this.items.length?this.options.axis==="x"||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset()),this._refreshItemPositions(d);var w,C;if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(w=this.containers.length-1;w>=0;w--)C=this.containers[w].element.offset(),this.containers[w].containerCache.left=C.left,this.containers[w].containerCache.top=C.top,this.containers[w].containerCache.width=this.containers[w].element.outerWidth(),this.containers[w].containerCache.height=this.containers[w].element.outerHeight();return this},_createPlaceholder:function(d){d=d||this;var w,C,b=d.options;(!b.placeholder||b.placeholder.constructor===String)&&(w=b.placeholder,C=d.currentItem[0].nodeName.toLowerCase(),b.placeholder={element:function(){var I=g("<"+C+">",d.document[0]);return d._addClass(I,"ui-sortable-placeholder",w||d.currentItem[0].className)._removeClass(I,"ui-sortable-helper"),C==="tbody"?d._createTrPlaceholder(d.currentItem.find("tr").eq(0),g("<tr>",d.document[0]).appendTo(I)):C==="tr"?d._createTrPlaceholder(d.currentItem,I):C==="img"&&I.attr("src",d.currentItem.attr("src")),w||I.css("visibility","hidden"),I},update:function(I,k){w&&!b.forcePlaceholderSize||((!k.height()||b.forcePlaceholderSize&&(C==="tbody"||C==="tr"))&&k.height(d.currentItem.innerHeight()-parseInt(d.currentItem.css("paddingTop")||0,10)-parseInt(d.currentItem.css("paddingBottom")||0,10)),k.width()||k.width(d.currentItem.innerWidth()-parseInt(d.currentItem.css("paddingLeft")||0,10)-parseInt(d.currentItem.css("paddingRight")||0,10)))}}),d.placeholder=g(b.placeholder.element.call(d.element,d.currentItem)),d.currentItem.after(d.placeholder),b.placeholder.update(d,d.placeholder)},_createTrPlaceholder:function(d,w){var C=this;d.children().each(function(){g("<td>&#160;</td>",C.document[0]).attr("colspan",g(this).attr("colspan")||1).appendTo(w)})},_contactContainers:function(d){var w,C,b,I,k,M,K,W,q,te,he=null,ne=null;for(w=this.containers.length-1;w>=0;w--)if(!g.contains(this.currentItem[0],this.containers[w].element[0]))if(this._intersectsWith(this.containers[w].containerCache)){if(he&&g.contains(this.containers[w].element[0],he.element[0]))continue;he=this.containers[w],ne=w}else this.containers[w].containerCache.over&&(this.containers[w]._trigger("out",d,this._uiHash(this)),this.containers[w].containerCache.over=0);if(he)if(this.containers.length===1)this.containers[ne].containerCache.over||(this.containers[ne]._trigger("over",d,this._uiHash(this)),this.containers[ne].containerCache.over=1);else{for(b=1e4,I=null,q=he.floating||this._isFloating(this.currentItem),k=q?"left":"top",M=q?"width":"height",te=q?"pageX":"pageY",C=this.items.length-1;C>=0;C--)g.contains(this.containers[ne].element[0],this.items[C].item[0])&&this.items[C].item[0]!==this.currentItem[0]&&(K=this.items[C].item.offset()[k],W=!1,d[te]-K>this.items[C][M]/2&&(W=!0),Math.abs(d[te]-K)<b&&(b=Math.abs(d[te]-K),I=this.items[C],this.direction=W?"up":"down"));if(!I&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[ne]){this.currentContainer.containerCache.over||(this.containers[ne]._trigger("over",d,this._uiHash()),this.currentContainer.containerCache.over=1);return}I?this._rearrange(d,I,null,!0):this._rearrange(d,null,this.containers[ne].element,!0),this._trigger("change",d,this._uiHash()),this.containers[ne]._trigger("change",d,this._uiHash(this)),this.currentContainer=this.containers[ne],this.options.placeholder.update(this.currentContainer,this.placeholder),this.scrollParent=this.placeholder.scrollParent(),this.scrollParent[0]!==this.document[0]&&this.scrollParent[0].tagName!=="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this.containers[ne]._trigger("over",d,this._uiHash(this)),this.containers[ne].containerCache.over=1}},_createHelper:function(d){var w=this.options,C=typeof w.helper=="function"?g(w.helper.apply(this.element[0],[d,this.currentItem])):w.helper==="clone"?this.currentItem.clone():this.currentItem;return C.parents("body").length||this.appendTo[0].appendChild(C[0]),C[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!C[0].style.width||w.forceHelperSize)&&C.width(this.currentItem.width()),(!C[0].style.height||w.forceHelperSize)&&C.height(this.currentItem.height()),C},_adjustOffsetFromHelper:function(d){typeof d=="string"&&(d=d.split(" ")),Array.isArray(d)&&(d={left:+d[0],top:+d[1]||0}),"left"in d&&(this.offset.click.left=d.left+this.margins.left),"right"in d&&(this.offset.click.left=this.helperProportions.width-d.right+this.margins.left),"top"in d&&(this.offset.click.top=d.top+this.margins.top),"bottom"in d&&(this.offset.click.top=this.helperProportions.height-d.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var d=this.offsetParent.offset();return this.cssPosition==="absolute"&&this.scrollParent[0]!==this.document[0]&&g.contains(this.scrollParent[0],this.offsetParent[0])&&(d.left+=this.scrollParent.scrollLeft(),d.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()==="html"&&g.ui.ie)&&(d={top:0,left:0}),{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==="relative"){var d=this.currentItem.position();return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:d.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d,w,C,b=this.options;b.containment==="parent"&&(b.containment=this.helper[0].parentNode),(b.containment==="document"||b.containment==="window")&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,b.containment==="document"?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,(b.containment==="document"?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(b.containment)||(d=g(b.containment)[0],w=g(b.containment).offset(),C=g(d).css("overflow")!=="hidden",this.containment=[w.left+(parseInt(g(d).css("borderLeftWidth"),10)||0)+(parseInt(g(d).css("paddingLeft"),10)||0)-this.margins.left,w.top+(parseInt(g(d).css("borderTopWidth"),10)||0)+(parseInt(g(d).css("paddingTop"),10)||0)-this.margins.top,w.left+(C?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(g(d).css("borderLeftWidth"),10)||0)-(parseInt(g(d).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,w.top+(C?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(g(d).css("borderTopWidth"),10)||0)-(parseInt(g(d).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(d,w){w||(w=this.position);var C=d==="absolute"?1:-1,b=this.cssPosition==="absolute"&&!(this.scrollParent[0]!==this.document[0]&&g.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,I=/(html|body)/i.test(b[0].tagName);return{top:w.top+this.offset.relative.top*C+this.offset.parent.top*C-(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():I?0:b.scrollTop())*C,left:w.left+this.offset.relative.left*C+this.offset.parent.left*C-(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():I?0:b.scrollLeft())*C}},_generatePosition:function(d){var w,C,b=this.options,I=d.pageX,k=d.pageY,M=this.cssPosition==="absolute"&&!(this.scrollParent[0]!==this.document[0]&&g.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,K=/(html|body)/i.test(M[0].tagName);return this.cssPosition==="relative"&&!(this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(d.pageX-this.offset.click.left<this.containment[0]&&(I=this.containment[0]+this.offset.click.left),d.pageY-this.offset.click.top<this.containment[1]&&(k=this.containment[1]+this.offset.click.top),d.pageX-this.offset.click.left>this.containment[2]&&(I=this.containment[2]+this.offset.click.left),d.pageY-this.offset.click.top>this.containment[3]&&(k=this.containment[3]+this.offset.click.top)),b.grid&&(w=this.originalPageY+Math.round((k-this.originalPageY)/b.grid[1])*b.grid[1],k=this.containment?w-this.offset.click.top>=this.containment[1]&&w-this.offset.click.top<=this.containment[3]?w:w-this.offset.click.top>=this.containment[1]?w-b.grid[1]:w+b.grid[1]:w,C=this.originalPageX+Math.round((I-this.originalPageX)/b.grid[0])*b.grid[0],I=this.containment?C-this.offset.click.left>=this.containment[0]&&C-this.offset.click.left<=this.containment[2]?C:C-this.offset.click.left>=this.containment[0]?C-b.grid[0]:C+b.grid[0]:C)),{top:k-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():K?0:M.scrollTop()),left:I-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():K?0:M.scrollLeft())}},_rearrange:function(d,w,C,b){C?C[0].appendChild(this.placeholder[0]):w.item[0].parentNode.insertBefore(this.placeholder[0],this.direction==="down"?w.item[0]:w.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var I=this.counter;this._delay(function(){I===this.counter&&this.refreshPositions(!b)})},_clear:function(d,w){this.reverting=!1;var C,b=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(C in this._storedCSS)(this._storedCSS[C]==="auto"||this._storedCSS[C]==="static")&&(this._storedCSS[C]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!w&&b.push(function(k){this._trigger("receive",k,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!==this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!==this.currentItem.parent()[0])&&!w&&b.push(function(k){this._trigger("update",k,this._uiHash())}),this!==this.currentContainer&&(w||(b.push(function(k){this._trigger("remove",k,this._uiHash())}),b.push((function(k){return function(M){k._trigger("receive",M,this._uiHash(this))}}).call(this,this.currentContainer)),b.push((function(k){return function(M){k._trigger("update",M,this._uiHash(this))}}).call(this,this.currentContainer))));function I(k,M,K){return function(W){K._trigger(k,W,M._uiHash(M))}}for(C=this.containers.length-1;C>=0;C--)w||b.push(I("deactivate",this,this.containers[C])),this.containers[C].containerCache.over&&(b.push(I("out",this,this.containers[C])),this.containers[C].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex==="auto"?"":this._storedZIndex),this.dragging=!1,w||this._trigger("beforeStop",d,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!w){for(C=0;C<b.length;C++)b[C].call(this,d);this._trigger("stop",d,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){g.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(d){var w=d||this;return{helper:w.helper,placeholder:w.placeholder||g([]),position:w.position,originalPosition:w.originalPosition,offset:w.positionAbs,item:w.currentItem,sender:d?d.element:null}}});/*!
+ * jQuery UI Spinner 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */function tt(d){return function(){var w=this.element.val();d.apply(this,arguments),this._refresh(),w!==this.element.val()&&this._trigger("change")}}g.widget("ui.spinner",{version:"1.13.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this.value()!==""&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var d=this._super(),w=this.element;return g.each(["min","max","step"],function(C,b){var I=w.attr(b);I!=null&&I.length&&(d[b]=I)}),d},_events:{keydown:function(d){this._start(d)&&this._keydown(d)&&d.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(d){if(this.cancelBlur){delete this.cancelBlur;return}this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",d)},mousewheel:function(d,w){var C=g.ui.safeActiveElement(this.document[0]),b=this.element[0]===C;if(!(!b||!w)){if(!this.spinning&&!this._start(d))return!1;this._spin((w>0?1:-1)*this.options.step,d),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(d)},100),d.preventDefault()}},"mousedown .ui-spinner-button":function(d){var w;w=this.element[0]===g.ui.safeActiveElement(this.document[0])?this.previous:this.element.val();function C(){var b=this.element[0]===g.ui.safeActiveElement(this.document[0]);b||(this.element.trigger("focus"),this.previous=w,this._delay(function(){this.previous=w}))}d.preventDefault(),C.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,C.call(this)}),this._start(d)!==!1&&this._repeat(null,g(d.currentTarget).hasClass("ui-spinner-up")?1:-1,d)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(d){if(g(d.currentTarget).hasClass("ui-state-active")){if(this._start(d)===!1)return!1;this._repeat(null,g(d.currentTarget).hasClass("ui-spinner-up")?1:-1,d)}},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(this.uiSpinner.height()*.5)&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(d){var w=this.options,C=g.ui.keyCode;switch(d.keyCode){case C.UP:return this._repeat(null,1,d),!0;case C.DOWN:return this._repeat(null,-1,d),!0;case C.PAGE_UP:return this._repeat(null,w.page,d),!0;case C.PAGE_DOWN:return this._repeat(null,-w.page,d),!0}return!1},_start:function(d){return!this.spinning&&this._trigger("start",d)===!1?!1:(this.counter||(this.counter=1),this.spinning=!0,!0)},_repeat:function(d,w,C){d=d||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,w,C)},d),this._spin(w*this.options.step,C)},_spin:function(d,w){var C=this.value()||0;this.counter||(this.counter=1),C=this._adjustValue(C+d*this._increment(this.counter)),(!this.spinning||this._trigger("spin",w,{value:C})!==!1)&&(this._value(C),this.counter++)},_increment:function(d){var w=this.options.incremental;return w?typeof w=="function"?w(d):Math.floor(d*d*d/5e4-d*d/500+17*d/200+1):1},_precision:function(){var d=this._precisionOf(this.options.step);return this.options.min!==null&&(d=Math.max(d,this._precisionOf(this.options.min))),d},_precisionOf:function(d){var w=d.toString(),C=w.indexOf(".");return C===-1?0:w.length-C-1},_adjustValue:function(d){var w,C,b=this.options;return w=b.min!==null?b.min:0,C=d-w,C=Math.round(C/b.step)*b.step,d=w+C,d=parseFloat(d.toFixed(this._precision())),b.max!==null&&d>b.max?b.max:b.min!==null&&d<b.min?b.min:d},_stop:function(d){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",d))},_setOption:function(d,w){var C,b,I;if(d==="culture"||d==="numberFormat"){C=this._parse(this.element.val()),this.options[d]=w,this.element.val(this._format(C));return}(d==="max"||d==="min"||d==="step")&&typeof w=="string"&&(w=this._parse(w)),d==="icons"&&(b=this.buttons.first().find(".ui-icon"),this._removeClass(b,null,this.options.icons.up),this._addClass(b,null,w.up),I=this.buttons.last().find(".ui-icon"),this._removeClass(I,null,this.options.icons.down),this._addClass(I,null,w.down)),this._super(d,w)},_setOptionDisabled:function(d){this._super(d),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!d),this.element.prop("disabled",!!d),this.buttons.button(d?"disable":"enable")},_setOptions:tt(function(d){this._super(d)}),_parse:function(d){return typeof d=="string"&&d!==""&&(d=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(d,10,this.options.culture):+d),d===""||isNaN(d)?null:d},_format:function(d){return d===""?"":window.Globalize&&this.options.numberFormat?Globalize.format(d,this.options.numberFormat,this.options.culture):d},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var d=this.value();return d===null?!1:d===this._adjustValue(d)},_value:function(d,w){var C;d!==""&&(C=this._parse(d),C!==null&&(w||(C=this._adjustValue(C)),d=this._format(C))),this.element.val(d),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:tt(function(d){this._stepUp(d)}),_stepUp:function(d){this._start()&&(this._spin((d||1)*this.options.step),this._stop())},stepDown:tt(function(d){this._stepDown(d)}),_stepDown:function(d){this._start()&&(this._spin((d||1)*-this.options.step),this._stop())},pageUp:tt(function(d){this._stepUp((d||1)*this.options.page)}),pageDown:tt(function(d){this._stepDown((d||1)*this.options.page)}),value:function(d){if(!arguments.length)return this._parse(this.element.val());tt(this._value).call(this,d)},widget:function(){return this.uiSpinner}}),g.uiBackCompat!==!1&&g.widget("ui.spinner",g.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),g.ui.spinner;/*!
+ * jQuery UI Tabs 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.tabs",{version:"1.13.2",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var d=/#.*$/;return function(w){var C,b;C=w.href.replace(d,""),b=location.href.replace(d,"");try{C=decodeURIComponent(C)}catch{}try{b=decodeURIComponent(b)}catch{}return w.hash.length>1&&C===b}}(),_create:function(){var d=this,w=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,w.collapsible),this._processTabs(),w.active=this._initialActive(),Array.isArray(w.disabled)&&(w.disabled=g.uniqueSort(w.disabled.concat(g.map(this.tabs.filter(".ui-state-disabled"),function(C){return d.tabs.index(C)}))).sort()),this.options.active!==!1&&this.anchors.length?this.active=this._findActive(w.active):this.active=g(),this._refresh(),this.active.length&&this.load(w.active)},_initialActive:function(){var d=this.options.active,w=this.options.collapsible,C=location.hash.substring(1);return d===null&&(C&&this.tabs.each(function(b,I){if(g(I).attr("aria-controls")===C)return d=b,!1}),d===null&&(d=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(d===null||d===-1)&&(d=this.tabs.length?0:!1)),d!==!1&&(d=this.tabs.index(this.tabs.eq(d)),d===-1&&(d=w?!1:0)),!w&&d===!1&&this.anchors.length&&(d=0),d},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):g()}},_tabKeydown:function(d){var w=g(g.ui.safeActiveElement(this.document[0])).closest("li"),C=this.tabs.index(w),b=!0;if(!this._handlePageNav(d)){switch(d.keyCode){case g.ui.keyCode.RIGHT:case g.ui.keyCode.DOWN:C++;break;case g.ui.keyCode.UP:case g.ui.keyCode.LEFT:b=!1,C--;break;case g.ui.keyCode.END:C=this.anchors.length-1;break;case g.ui.keyCode.HOME:C=0;break;case g.ui.keyCode.SPACE:d.preventDefault(),clearTimeout(this.activating),this._activate(C);return;case g.ui.keyCode.ENTER:d.preventDefault(),clearTimeout(this.activating),this._activate(C===this.options.active?!1:C);return;default:return}d.preventDefault(),clearTimeout(this.activating),C=this._focusNextTab(C,b),!d.ctrlKey&&!d.metaKey&&(w.attr("aria-selected","false"),this.tabs.eq(C).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",C)},this.delay))}},_panelKeydown:function(d){this._handlePageNav(d)||d.ctrlKey&&d.keyCode===g.ui.keyCode.UP&&(d.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(d){if(d.altKey&&d.keyCode===g.ui.keyCode.PAGE_UP)return this._activate(this._focusNextTab(this.options.active-1,!1)),!0;if(d.altKey&&d.keyCode===g.ui.keyCode.PAGE_DOWN)return this._activate(this._focusNextTab(this.options.active+1,!0)),!0},_findNextTab:function(d,w){var C=this.tabs.length-1;function b(){return d>C&&(d=0),d<0&&(d=C),d}for(;g.inArray(b(),this.options.disabled)!==-1;)d=w?d+1:d-1;return d},_focusNextTab:function(d,w){return d=this._findNextTab(d,w),this.tabs.eq(d).trigger("focus"),d},_setOption:function(d,w){if(d==="active"){this._activate(w);return}this._super(d,w),d==="collapsible"&&(this._toggleClass("ui-tabs-collapsible",null,w),!w&&this.options.active===!1&&this._activate(0)),d==="event"&&this._setupEvents(w),d==="heightStyle"&&this._setupHeightStyle(w)},_sanitizeSelector:function(d){return d?d.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var d=this.options,w=this.tablist.children(":has(a[href])");d.disabled=g.map(w.filter(".ui-state-disabled"),function(C){return w.index(C)}),this._processTabs(),d.active===!1||!this.anchors.length?(d.active=!1,this.active=g()):this.active.length&&!g.contains(this.tablist[0],this.active[0])?this.tabs.length===d.disabled.length?(d.active=!1,this.active=g()):this._activate(this._findNextTab(Math.max(0,d.active-1),!1)):d.active=this.tabs.index(this.active),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var d=this,w=this.tabs,C=this.anchors,b=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(I){g(this).is(".ui-state-disabled")&&I.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){g(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return g("a",this)[0]}).attr({tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=g(),this.anchors.each(function(I,k){var M,K,W,q=g(k).uniqueId().attr("id"),te=g(k).closest("li"),he=te.attr("aria-controls");d._isLocal(k)?(M=k.hash,W=M.substring(1),K=d.element.find(d._sanitizeSelector(M))):(W=te.attr("aria-controls")||g({}).uniqueId()[0].id,M="#"+W,K=d.element.find(M),K.length||(K=d._createPanel(W),K.insertAfter(d.panels[I-1]||d.tablist)),K.attr("aria-live","polite")),K.length&&(d.panels=d.panels.add(K)),he&&te.data("ui-tabs-aria-controls",he),te.attr({"aria-controls":W,"aria-labelledby":q}),K.attr("aria-labelledby",q)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),w&&(this._off(w.not(this.tabs)),this._off(C.not(this.anchors)),this._off(b.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(d){return g("<div>").attr("id",d).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(d){var w,C,b;for(Array.isArray(d)&&(d.length?d.length===this.anchors.length&&(d=!0):d=!1),b=0;C=this.tabs[b];b++)w=g(C),d===!0||g.inArray(b,d)!==-1?(w.attr("aria-disabled","true"),this._addClass(w,null,"ui-state-disabled")):(w.removeAttr("aria-disabled"),this._removeClass(w,null,"ui-state-disabled"));this.options.disabled=d,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,d===!0)},_setupEvents:function(d){var w={};d&&g.each(d.split(" "),function(C,b){w[b]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(C){C.preventDefault()}}),this._on(this.anchors,w),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(d){var w,C=this.element.parent();d==="fill"?(w=C.height(),w-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var b=g(this),I=b.css("position");I==="absolute"||I==="fixed"||(w-=b.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){w-=g(this).outerHeight(!0)}),this.panels.each(function(){g(this).height(Math.max(0,w-g(this).innerHeight()+g(this).height()))}).css("overflow","auto")):d==="auto"&&(w=0,this.panels.each(function(){w=Math.max(w,g(this).height("").height())}).height(w))},_eventHandler:function(d){var w=this.options,C=this.active,b=g(d.currentTarget),I=b.closest("li"),k=I[0]===C[0],M=k&&w.collapsible,K=M?g():this._getPanelForTab(I),W=C.length?this._getPanelForTab(C):g(),q={oldTab:C,oldPanel:W,newTab:M?g():I,newPanel:K};d.preventDefault(),!(I.hasClass("ui-state-disabled")||I.hasClass("ui-tabs-loading")||this.running||k&&!w.collapsible||this._trigger("beforeActivate",d,q)===!1)&&(w.active=M?!1:this.tabs.index(I),this.active=k?g():I,this.xhr&&this.xhr.abort(),!W.length&&!K.length&&g.error("jQuery UI Tabs: Mismatching fragment identifier."),K.length&&this.load(this.tabs.index(I),d),this._toggle(d,q))},_toggle:function(d,w){var C=this,b=w.newPanel,I=w.oldPanel;this.running=!0;function k(){C.running=!1,C._trigger("activate",d,w)}function M(){C._addClass(w.newTab.closest("li"),"ui-tabs-active","ui-state-active"),b.length&&C.options.show?C._show(b,C.options.show,k):(b.show(),k())}I.length&&this.options.hide?this._hide(I,this.options.hide,function(){C._removeClass(w.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),M()}):(this._removeClass(w.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),I.hide(),M()),I.attr("aria-hidden","true"),w.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),b.length&&I.length?w.oldTab.attr("tabIndex",-1):b.length&&this.tabs.filter(function(){return g(this).attr("tabIndex")===0}).attr("tabIndex",-1),b.attr("aria-hidden","false"),w.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(d){var w,C=this._findActive(d);C[0]!==this.active[0]&&(C.length||(C=this.active),w=C.find(".ui-tabs-anchor")[0],this._eventHandler({target:w,currentTarget:w,preventDefault:g.noop}))},_findActive:function(d){return d===!1?g():this.tabs.eq(d)},_getIndex:function(d){return typeof d=="string"&&(d=this.anchors.index(this.anchors.filter("[href$='"+g.escapeSelector(d)+"']"))),d},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){g.data(this,"ui-tabs-destroy")?g(this).remove():g(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var d=g(this),w=d.data("ui-tabs-aria-controls");w?d.attr("aria-controls",w).removeData("ui-tabs-aria-controls"):d.removeAttr("aria-controls")}),this.panels.show(),this.options.heightStyle!=="content"&&this.panels.css("height","")},enable:function(d){var w=this.options.disabled;w!==!1&&(d===void 0?w=!1:(d=this._getIndex(d),Array.isArray(w)?w=g.map(w,function(C){return C!==d?C:null}):w=g.map(this.tabs,function(C,b){return b!==d?b:null})),this._setOptionDisabled(w))},disable:function(d){var w=this.options.disabled;if(w!==!0){if(d===void 0)w=!0;else{if(d=this._getIndex(d),g.inArray(d,w)!==-1)return;Array.isArray(w)?w=g.merge([d],w).sort():w=[d]}this._setOptionDisabled(w)}},load:function(d,w){d=this._getIndex(d);var C=this,b=this.tabs.eq(d),I=b.find(".ui-tabs-anchor"),k=this._getPanelForTab(b),M={tab:b,panel:k},K=function(W,q){q==="abort"&&C.panels.stop(!1,!0),C._removeClass(b,"ui-tabs-loading"),k.removeAttr("aria-busy"),W===C.xhr&&delete C.xhr};this._isLocal(I[0])||(this.xhr=g.ajax(this._ajaxSettings(I,w,M)),this.xhr&&this.xhr.statusText!=="canceled"&&(this._addClass(b,"ui-tabs-loading"),k.attr("aria-busy","true"),this.xhr.done(function(W,q,te){setTimeout(function(){k.html(W),C._trigger("load",w,M),K(te,q)},1)}).fail(function(W,q){setTimeout(function(){K(W,q)},1)})))},_ajaxSettings:function(d,w,C){var b=this;return{url:d.attr("href").replace(/#.*$/,""),beforeSend:function(I,k){return b._trigger("beforeLoad",w,g.extend({jqXHR:I,ajaxSettings:k},C))}}},_getPanelForTab:function(d){var w=g(d).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+w))}}),g.uiBackCompat!==!1&&g.widget("ui.tabs",g.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),g.ui.tabs;/*!
+ * jQuery UI Tooltip 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */g.widget("ui.tooltip",{version:"1.13.2",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var d=g(this).attr("title");return g("<a>").text(d).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(d,w){var C=(d.attr("aria-describedby")||"").split(/\s+/);C.push(w),d.data("ui-tooltip-id",w).attr("aria-describedby",String.prototype.trim.call(C.join(" ")))},_removeDescribedBy:function(d){var w=d.data("ui-tooltip-id"),C=(d.attr("aria-describedby")||"").split(/\s+/),b=g.inArray(w,C);b!==-1&&C.splice(b,1),d.removeData("ui-tooltip-id"),C=String.prototype.trim.call(C.join(" ")),C?d.attr("aria-describedby",C):d.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=g("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=g([])},_setOption:function(d,w){var C=this;this._super(d,w),d==="content"&&g.each(this.tooltips,function(b,I){C._updateContent(I.element)})},_setOptionDisabled:function(d){this[d?"_disable":"_enable"]()},_disable:function(){var d=this;g.each(this.tooltips,function(w,C){var b=g.Event("blur");b.target=b.currentTarget=C.element[0],d.close(b,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var w=g(this);if(w.is("[title]"))return w.data("ui-tooltip-title",w.attr("title")).removeAttr("title")}))},_enable:function(){this.disabledTitles.each(function(){var d=g(this);d.data("ui-tooltip-title")&&d.attr("title",d.data("ui-tooltip-title"))}),this.disabledTitles=g([])},open:function(d){var w=this,C=g(d?d.target:this.element).closest(this.options.items);!C.length||C.data("ui-tooltip-id")||(C.attr("title")&&C.data("ui-tooltip-title",C.attr("title")),C.data("ui-tooltip-open",!0),d&&d.type==="mouseover"&&C.parents().each(function(){var b=g(this),I;b.data("ui-tooltip-open")&&(I=g.Event("blur"),I.target=I.currentTarget=this,w.close(I,!0)),b.attr("title")&&(b.uniqueId(),w.parents[this.id]={element:this,title:b.attr("title")},b.attr("title",""))}),this._registerCloseHandlers(d,C),this._updateContent(C,d))},_updateContent:function(d,w){var C,b=this.options.content,I=this,k=w?w.type:null;if(typeof b=="string"||b.nodeType||b.jquery)return this._open(w,d,b);C=b.call(d[0],function(M){I._delay(function(){d.data("ui-tooltip-open")&&(w&&(w.type=k),this._open(w,d,M))})}),C&&this._open(w,d,C)},_open:function(d,w,C){var b,I,k,M,K=g.extend({},this.options.position);if(!C)return;if(b=this._find(w),b){b.tooltip.find(".ui-tooltip-content").html(C);return}w.is("[title]")&&(d&&d.type==="mouseover"?w.attr("title",""):w.removeAttr("title")),b=this._tooltip(w),I=b.tooltip,this._addDescribedBy(w,I.attr("id")),I.find(".ui-tooltip-content").html(C),this.liveRegion.children().hide(),M=g("<div>").html(I.find(".ui-tooltip-content").html()),M.removeAttr("name").find("[name]").removeAttr("name"),M.removeAttr("id").find("[id]").removeAttr("id"),M.appendTo(this.liveRegion);function W(q){K.of=q,!I.is(":hidden")&&I.position(K)}this.options.track&&d&&/^mouse/.test(d.type)?(this._on(this.document,{mousemove:W}),W(d)):I.position(g.extend({of:w},this.options.position)),I.hide(),this._show(I,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(k=this.delayedShow=setInterval(function(){I.is(":visible")&&(W(K.of),clearInterval(k))},13)),this._trigger("open",d,{tooltip:I})},_registerCloseHandlers:function(d,w){var C={keyup:function(b){if(b.keyCode===g.ui.keyCode.ESCAPE){var I=g.Event(b);I.currentTarget=w[0],this.close(I,!0)}}};w[0]!==this.element[0]&&(C.remove=function(){var b=this._find(w);b&&this._removeTooltip(b.tooltip)}),(!d||d.type==="mouseover")&&(C.mouseleave="close"),(!d||d.type==="focusin")&&(C.focusout="close"),this._on(!0,w,C)},close:function(d){var w,C=this,b=g(d?d.currentTarget:this.element),I=this._find(b);if(!I){b.removeData("ui-tooltip-open");return}w=I.tooltip,!I.closing&&(clearInterval(this.delayedShow),b.data("ui-tooltip-title")&&!b.attr("title")&&b.attr("title",b.data("ui-tooltip-title")),this._removeDescribedBy(b),I.hiding=!0,w.stop(!0),this._hide(w,this.options.hide,function(){C._removeTooltip(g(this))}),b.removeData("ui-tooltip-open"),this._off(b,"mouseleave focusout keyup"),b[0]!==this.element[0]&&this._off(b,"remove"),this._off(this.document,"mousemove"),d&&d.type==="mouseleave"&&g.each(this.parents,function(k,M){g(M.element).attr("title",M.title),delete C.parents[k]}),I.closing=!0,this._trigger("close",d,{tooltip:w}),I.hiding||(I.closing=!1))},_tooltip:function(d){var w=g("<div>").attr("role","tooltip"),C=g("<div>").appendTo(w),b=w.uniqueId().attr("id");return this._addClass(C,"ui-tooltip-content"),this._addClass(w,"ui-tooltip","ui-widget ui-widget-content"),w.appendTo(this._appendTo(d)),this.tooltips[b]={element:d,tooltip:w}},_find:function(d){var w=d.data("ui-tooltip-id");return w?this.tooltips[w]:null},_removeTooltip:function(d){clearInterval(this.delayedShow),d.remove(),delete this.tooltips[d.attr("id")]},_appendTo:function(d){var w=d.closest(".ui-front, dialog");return w.length||(w=this.document[0].body),w},_destroy:function(){var d=this;g.each(this.tooltips,function(w,C){var b=g.Event("blur"),I=C.element;b.target=b.currentTarget=I[0],d.close(b,!0),g("#"+w).remove(),I.data("ui-tooltip-title")&&(I.attr("title")||I.attr("title",I.data("ui-tooltip-title")),I.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),g.uiBackCompat!==!1&&g.widget("ui.tooltip",g.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var d=this._superApply(arguments);return this.options.tooltipClass&&d.tooltip.addClass(this.options.tooltipClass),d}}),g.ui.tooltip});/**
+ * @author bbecquet
+ * @license MIT
+ * @see github.com/bbecquet/Leaflet.PolylineOffset
+ */function forEachPair(g,B){if(!(!g||g.length<1))for(let x=1,Q=g.length;x<Q;x++)B(g[x-1],g[x])}function lineEquation(g,B){if(g.x===B.x)return g.y===B.y?null:{x:g.x};const x=(B.y-g.y)/(B.x-g.x);return{a:x,b:g.y-x*g.x}}function intersection(g,B,x,Q){const S=lineEquation(g,B),D=lineEquation(x,Q);if(S===null||D===null)return null;if(S.hasOwnProperty("x"))return D.hasOwnProperty("x")?null:{x:S.x,y:D.a*S.x+D.b};if(D.hasOwnProperty("x"))return{x:D.x,y:S.a*D.x+S.b};if(S.a===D.a)return null;const H=(D.b-S.b)/(S.a-D.a);return{x:H,y:S.a*H+S.b}}function translatePoint(g,B,x){return{x:g.x+B*Math.cos(x),y:g.y+B*Math.sin(x)}}const PolylineOffset={offsetPointLine:function(g,B){const x=[];return forEachPair(g,L.bind((Q,S)=>{if(Q.x===S.x&&Q.y===S.y)return;const H=Math.atan2(Q.y-S.y,Q.x-S.x)-Math.PI/2;x.push({offsetAngle:H,original:[Q,S],offset:[translatePoint(Q,B,H),translatePoint(S,B,H)]})},this)),x},offsetPoints:function(g,B){const x=this.offsetPointLine(L.LineUtil.simplify(g,B.smoothFactor),B.offset);return this.joinLineSegments(x,B.offset)},joinSegments:function(g,B,x){return this.circularArc(g,B,x).filter(Q=>Q)},joinLineSegments:function(g,B){let x=[];const Q=g[0],S=g[g.length-1];return Q&&S&&(x.push(Q.offset[0]),forEachPair(g,L.bind(function(D,H){x=x.concat(this.joinSegments(D,H,B))},this)),x.push(S.offset[1])),x},segmentAsVector:function(g){return{x:g[1].x-g[0].x,y:g[1].y-g[0].y}},getSignedAngle:function(g,B){const x=this.segmentAsVector(g),Q=this.segmentAsVector(B);return Math.atan2(x.x*Q.y-x.y*Q.x,x.x*Q.x+x.y*Q.y)},circularArc:function(g,B,x){if(g.offsetAngle===B.offsetAngle)return[g.offset[1]];const Q=this.getSignedAngle(g.offset,B.offset);if(Q*x>0&&Q*this.getSignedAngle(g.offset,[g.offset[0],B.offset[1]])>0)return[intersection(g.offset[0],g.offset[1],B.offset[0],B.offset[1])];const S=[],D=g.original[1],H=x>0,P=H?B.offsetAngle:g.offsetAngle;let R=H?g.offsetAngle:B.offsetAngle;R<P&&(R+=Math.PI*2);const Y=Math.PI/8;for(let G=P;G<R;G+=Y)S.push(translatePoint(D,x,G));return S.push(translatePoint(D,x,R)),H?S.reverse():S}};L.Polyline.include({_projectLatlngs:function(g,B,x){if(g.length>0&&g[0]instanceof L.LatLng){let S=g.map(L.bind(function(D){const H=this._map.latLngToLayerPoint(D);return x&&x.extend(H),H},this));this.options.offset&&(S=PolylineOffset.offsetPoints(S,this.options)),B.push(S.map(D=>L.point(D.x,D.y)))}else g.forEach(L.bind(function(S){this._projectLatlngs(S,B,x)},this))}});L.Polyline.include({setOffset:function(g){return this.options.offset=g,this.redraw(),this}});L.LatLngBounds.prototype.modify=function(g,B){var x=this.getSouthWest(),Q=this.getNorthEast(),S=g.latLngToLayerPoint(x),D=g.latLngToLayerPoint(Q);return x=g.layerPointToLatLng(new L.Point(S.x-B,S.y+B)),Q=g.layerPointToLatLng(new L.Point(D.x+B,D.y-B)),new L.LatLngBounds(x,Q)};L.Control.Button=L.Class.extend({initialize:function(g){L.Util.setOptions(this,g)},addTo:function(g){return g.addButton(this),this},onAdd:function(g){this._buttonContainer=g,this._button=L.DomUtil.create("a",this.options.className,this._buttonContainer.getContainer()),this._button.href="#",this.setText(this.options.text);var B=this;this._onClick=function(x){B.options.onClick.call(B,x)},L.DomEvent.on(this._button,"click",L.DomEvent.stopPropagation).on(this._button,"mousedown",L.DomEvent.stopPropagation).on(this._button,"dblclick",L.DomEvent.stopPropagation).on(this._button,"click",L.DomEvent.preventDefault).on(this._button,"click",this._onClick,this)},remove:function(){L.DomEvent.off(this._button,"click",this._onClick),this._buttonContainer.getContainer().removeChild(this._button)},setText:function(g){this._button.title=g,this._button.innerHTML=g}});L.Control.ButtonContainer=L.Control.extend({options:{position:"topleft"},getContainer:function(){return this._container||(this._container=L.DomUtil.create("div",this.options.className)),this._container},onAdd:function(g){return this._map=g,this.getContainer()},addButton:function(g){g.onAdd(this)},addClass:function(g){L.DomUtil.addClass(this.getContainer(),g)},removeClass:function(g){L.DomUtil.removeClass(this.getContainer(),g)}});L.LocationFilter=L.Layer.extend({includes:L.Mixin.Events,options:{enableButton:{enableText:"Select area",disableText:"Remove selection"},adjustButton:{text:"Select area within current zoom"},buttonPosition:"topleft",showButtons:!0,locked:!1,fixed:!1},initialize:function(g){L.Util.setOptions(this,g)},addTo:function(g){return g.addLayer(this),this},onAdd:function(g){this._map=g,this.options.showButtons&&(this.options.enableButton||this.options.adjustButton)&&this._initializeButtonContainer(),this.options.enable&&this.enable()},onRemove:function(g){this.disable(),this._buttonContainer&&this._buttonContainer.removeFrom(g)},getBounds:function(){return new L.LatLngBounds(this._sw,this._ne)},setBounds:function(g){this._nw=g.getNorthWest(),this._ne=g.getNorthEast(),this._sw=g.getSouthWest(),this._se=g.getSouthEast(),this.isEnabled()&&(this._draw(),this.fire("change",{bounds:g}))},isEnabled:function(){return this._enabled},setLocked:function(g){this.options.locked=g,this._toggleMarkerDragging(this._moveMarker,g,"hide-marker")},isLocked:function(){return this.options.locked},setFixed:function(g){this.options.fixed=g,this._toggleMarkerDragging(this._neMarker,g,"hide-marker"),this._toggleMarkerDragging(this._nwMarker,g,"hide-marker"),this._toggleMarkerDragging(this._seMarker,g,"hide-marker"),this._toggleMarkerDragging(this._swMarker,g,"hide-marker")},_toggleMarkerDragging(g,B,x){B?(g.dragging.disable(),g._icon.classList.add(x)):(g.dragging.enable(),g._icon.classList.remove(x))},_drawRectangle:function(g,B){B=B||{};var x={stroke:!1,fill:!0,fillColor:"black",fillOpacity:.3,clickable:!1};B=L.Util.extend(x,B);var Q=new L.Rectangle(g,B);return Q.addTo(this._layer),Q},_drawImageMarker:function(g,B){var x=new L.Marker(g,{icon:new L.DivIcon({iconAnchor:B.anchor,iconSize:B.size,className:B.className}),draggable:!0});return x.addTo(this._layer),x},_drawMoveMarker:function(g){var B=this;return this._moveMarker=this._drawImageMarker(g,{className:"location-filter move-marker "+(this.options.locked?"hide-marker":""),anchor:[-10,-10],size:[13,13]}),this._moveMarker.on("drag",function(x){var Q=B._moveMarker.getLatLng(),S=Q.lat-B._nw.lat,D=Q.lng-B._nw.lng;B._nw=new L.LatLng(B._nw.lat+S,B._nw.lng+D,!0),B._ne=new L.LatLng(B._ne.lat+S,B._ne.lng+D,!0),B._sw=new L.LatLng(B._sw.lat+S,B._sw.lng+D,!0),B._se=new L.LatLng(B._se.lat+S,B._se.lng+D,!0),B._draw()}),this._setupDragendListener(this._moveMarker),this._moveMarker},_drawResizeMarker:function(g,B,x,Q,S){return this._drawImageMarker(g,{className:"location-filter resize-marker "+B+" "+(this.options.fixed?"hide-marker":""),anchor:[7,6],size:[13,12]})},_setupResizeMarkerTracking:function(g,B){var x=this;g.on("drag",function(Q){var S=g.getLatLng(),D=B.moveAlong.lat,H=B.moveAlong.lng;D.setLatLng(new L.LatLng(S.lat,D.getLatLng().lng,!0)),H.setLatLng(new L.LatLng(H.getLatLng().lat,S.lng,!0));var P=[x._nwMarker.getLatLng(),x._neMarker.getLatLng(),x._swMarker.getLatLng(),x._seMarker.getLatLng()];P.sort(function(R,Y){return R.lat!=Y.lat?Y.lat-R.lat:R.lng-Y.lng}),x._nw=P[0],x._ne=P[1],x._sw=P[2],x._se=P[3],x._draw({repositionResizeMarkers:!1})}),this._setupDragendListener(g)},_setupDragendListener:function(g){var B=this;g.on("dragend",function(x){B.fire("change",{bounds:B.getBounds()})})},_calculateBounds:function(){var g=this._map.getBounds(),B=new L.LatLngBounds(new L.LatLng(g.getSouthWest().lat-.1,g.getSouthWest().lng-.1,!0),new L.LatLng(g.getNorthEast().lat+.1,g.getNorthEast().lng+.1,!0));this._osw=B.getSouthWest(),this._one=B.getNorthEast(),this._northBounds=new L.LatLngBounds(new L.LatLng(this._ne.lat,this._osw.lng,!0),this._one),this._westBounds=new L.LatLngBounds(new L.LatLng(this._sw.lat,this._osw.lng,!0),this._nw),this._eastBounds=new L.LatLngBounds(this._se,new L.LatLng(this._ne.lat,this._one.lng,!0)),this._southBounds=new L.LatLngBounds(this._osw,new L.LatLng(this._sw.lat,this._one.lng,!0))},_initialDraw:function(){this._initialDrawCalled||(this._layer=new L.LayerGroup,this._calculateBounds(),this._northRect=this._drawRectangle(this._northBounds),this._westRect=this._drawRectangle(this._westBounds),this._eastRect=this._drawRectangle(this._eastBounds),this._southRect=this._drawRectangle(this._southBounds),this._innerRect=this._drawRectangle(this.getBounds(),{fillOpacity:0,stroke:!0,color:"white",weight:1,opacity:.9}),this._nwMarker=this._drawResizeMarker(this._nw,"nw"),this._neMarker=this._drawResizeMarker(this._ne,"ne"),this._swMarker=this._drawResizeMarker(this._sw,"sw"),this._seMarker=this._drawResizeMarker(this._se,"se"),this._setupResizeMarkerTracking(this._nwMarker,{moveAlong:{lat:this._neMarker,lng:this._swMarker}}),this._setupResizeMarkerTracking(this._neMarker,{moveAlong:{lat:this._nwMarker,lng:this._seMarker}}),this._setupResizeMarkerTracking(this._swMarker,{moveAlong:{lat:this._seMarker,lng:this._nwMarker}}),this._setupResizeMarkerTracking(this._seMarker,{moveAlong:{lat:this._swMarker,lng:this._neMarker}}),this._moveMarker=this._drawMoveMarker(this._nw),this._initialDrawCalled=!0)},_draw:function(g){g=L.Util.extend({repositionResizeMarkers:!0},g),this._calculateBounds(),this._northRect.setBounds(this._northBounds),this._westRect.setBounds(this._westBounds),this._eastRect.setBounds(this._eastBounds),this._southRect.setBounds(this._southBounds),this._innerRect.setBounds(this.getBounds()),g.repositionResizeMarkers&&(this._nwMarker.setLatLng(this._nw),this._neMarker.setLatLng(this._ne),this._swMarker.setLatLng(this._sw),this._seMarker.setLatLng(this._se)),this._moveMarker.setLatLng(this._nw)},_adjustToMap:function(){this.setBounds(this._map.getBounds()),this._map.zoomOut()},enable:function(){if(!this._enabled){var g;this._sw&&this._ne?g=new L.LatLngBounds(this._sw,this._ne):this.options.bounds?g=this.options.bounds:g=this._map.getBounds(),this._map.invalidateSize(),this._nw=g.getNorthWest(),this._ne=g.getNorthEast(),this._sw=g.getSouthWest(),this._se=g.getSouthEast(),this.options.showButtons&&(this._buttonContainer&&this._buttonContainer.addClass("enabled"),this._enableButton&&this._enableButton.setText(this.options.enableButton.disableText),this.options.adjustButton&&this._createAdjustButton()),this._initialDraw(),this._draw();var B=this;this._moveHandler=function(){B._draw()},this._map.on("move",this._moveHandler),this._layer.addTo(this._map);var x=this._map.getBounds();g=new L.LatLngBounds(this._sw,this._ne).modify(this._map,10),(!x.contains(g.getSouthWest())||!x.contains(g.getNorthEast()))&&this._map.fitBounds(g),this._enabled=!0,this.fire("enabled")}},disable:function(){this._enabled&&(this.options.showButtons&&(this._buttonContainer&&this._buttonContainer.removeClass("enabled"),this._enableButton&&this._enableButton.setText(this.options.enableButton.enableText),this._adjustButton&&this._adjustButton.remove()),this._map.off("move",this._moveHandler),this._map.removeLayer(this._layer),this._enabled=!1,this.fire("disabled"))},_createAdjustButton:function(){var g=this;this._adjustButton=new L.Control.Button({className:"adjust-button",text:this.options.adjustButton.text,onClick:function(B){g._adjustToMap(),g.fire("adjustToZoomClick")}}).addTo(this._buttonContainer)},_initializeButtonContainer:function(){var g=this;this._buttonContainer=new L.Control.ButtonContainer({className:"location-filter button-container",position:this.options.buttonPosition}),this.options.enableButton&&(this._enableButton=new L.Control.Button({className:"enable-button",text:this.options.enableButton.enableText,onClick:function(B){g._enabled?(g.disable(),g.fire("disableClick")):(g.enable(),g.fire("enableClick"))}}).addTo(this._buttonContainer)),this._buttonContainer.addTo(this._map)}});window.CodeMirror=function(){function g(se,pe){var de={},Ee=g.defaults;for(var Ie in Ee)Ee.hasOwnProperty(Ie)&&(de[Ie]=(pe&&pe.hasOwnProperty(Ie)?pe:Ee)[Ie]);var be=At("textarea",null,null,"position: absolute; padding: 0; width: 1px; height: 1em");be.setAttribute("wrap","off"),be.setAttribute("autocorrect","off"),be.setAttribute("autocapitalize","off");var Le=At("div",[be],null,"overflow: hidden; position: relative; width: 3px; height: 0px;"),je=At("div",null,"CodeMirror-scrollbar-inner"),nt=At("div",[je],"CodeMirror-scrollbar"),ut=At("div"),Mt=At("div",null,null,"position: relative; z-index: -1"),Dt=At("pre"," ","CodeMirror-cursor"),ci=At("pre"," ","CodeMirror-cursor","visibility: hidden"),ti=At("div",null,null,"position: absolute; width: 100%; height: 0px; overflow: hidden; visibility: hidden;"),Et=At("div",[ti,Dt,ci,Mt,ut],null,"position: relative; z-index: 0"),_i=At("div",null,"CodeMirror-gutter-text"),Gt=At("div",[_i],"CodeMirror-gutter"),yi=At("div",[Gt,At("div",[Et],"CodeMirror-lines")],null,"position: relative"),ri=At("div",[yi],null,"position: relative"),it=At("div",[ri],"CodeMirror-scroll");it.setAttribute("tabIndex","-1");var ii=At("div",[Le,nt,it],"CodeMirror"+(de.lineWrapping?" CodeMirror-wrap":""));se.appendChild?se.appendChild(ii):se(ii),er(),tr(),B&&(be.style.width="0px"),ye||(it.draggable=!0),Et.style.outline="none",de.tabindex!=null&&(be.tabIndex=de.tabindex),de.autofocus&&ui(),!de.gutter&&!de.lineNumbers&&(Gt.style.display="none"),Se&&(Le.style.height="1px",Le.style.position="absolute"),We?(nt.style.zIndex=-2,nt.style.visibility="hidden"):ae&&(nt.style.minWidth="18px");var Ai=new et,Ci=new et,bi,Ot,st=new K([new M([new k("")])]),ni=0,Xt;$s();var He={from:{line:0,ch:0},to:{line:0,ch:0},inverted:!1},jt,Qi,oi,Vt=0,Nt,Zt=!1,Yt=!1,Rt=!1,si,xi,li,Ei,Ui,gi,Ni,Hi=0,Jt=0,$t=0,ks=0,Ii,mi=Bt(0),Ri=!1,Ji=!0,Li=!1,qi=null;dt(function(){Ms(de.value||""),si=!1})();var ei=new ne;De(it,"mousedown",dt(gr)),De(it,"dblclick",dt(mr)),De(Et,"selectstart",ce),Ae||De(it,"contextmenu",Ar),De(it,"scroll",pr),De(nt,"scroll",dr),De(nt,"mousedown",function(){Xt&&setTimeout(ui,0)});var ur=De(window,"resize",function(){ii.parentNode?Si(!0):ur()},!0);De(be,"keyup",dt(yr)),De(be,"input",Wi),De(be,"keydown",dt(Ns)),De(be,"keypress",dt(_r)),De(be,"focus",Mi),De(be,"blur",ds);function Ds(J){de.onDragEvent&&de.onDragEvent(Pt,re(J))||Fe(J)}de.dragDrop&&(De(it,"dragstart",wr),De(it,"dragenter",Ds),De(it,"dragover",Ds),De(it,"drop",dt(vr))),De(it,"paste",function(){ui(),Wi()}),De(be,"paste",function(){Rt=!0,Wi()}),De(be,"cut",dt(function(){de.readOnly||Vi("")})),Se&&De(ri,"mouseup",function(){document.activeElement==be&&be.blur(),ui()});var Hs;try{Hs=document.activeElement==be}catch{}Hs||de.autofocus?setTimeout(Mi,20):ds();function ki(J){return J>=0&&J<st.size}var Pt=ii.CodeMirror={getValue:fr,setValue:dt(Ms),getSelection:gs,replaceSelection:dt(Vi),focus:function(){window.focus(),ui(),Mi(),Wi()},setOption:function(J,oe){var ue=de[J];de[J]=oe,J=="mode"||J=="indentUnit"?$s():J=="readOnly"&&oe=="nocursor"?(ds(),be.blur()):J=="readOnly"&&!oe?es(!0):J=="theme"?er():J=="lineWrapping"&&ue!=oe?dt(Dr)():J=="tabSize"?Si(!0):J=="keyMap"?tr():J=="tabindex"?be.tabIndex=oe:J=="showCursorWhenSelecting"&&ws(),(J=="lineNumbers"||J=="gutter"||J=="firstLineNumber"||J=="theme"||J=="lineNumberFormatter")&&(kr(),Si(!0))},getOption:function(J){return de[J]},getMode:function(){return Ot},undo:dt(Cr),redo:dt(br),indentLine:dt(function(J,oe){typeof oe!="string"&&(oe==null?oe=de.smartIndent?"smart":"prev":oe=oe?"add":"subtract"),ki(J)&&ss(J,oe)}),indentSelection:dt(Tr),historySize:function(){return{undo:ei.done.length,redo:ei.undone.length}},clearHistory:function(){ei=new ne},setHistory:function(J){ei=new ne,ei.done=J.done,ei.undone=J.undone},getHistory:function(){function J(oe){for(var ue=0,_e=[],xe;ue<oe.length;++ue){_e.push(xe=[]);for(var Qe=0,Pe=oe[ue];Qe<Pe.length;++Qe){var Ve=[],Ze=Pe[Qe];xe.push({start:Ze.start,added:Ze.added,old:Ve});for(var Re=0;Re<Ze.old.length;++Re)Ve.push(tt(Ze.old[Re]))}}return _e}return{done:J(ei.done),undone:J(ei.undone)}},matchBrackets:dt(function(){ar(!0)}),getTokenAt:dt(function(J){return J=Tt(J),Bt(J.line).getTokenAt(Ot,Yi(J.line),de.tabSize,J.ch)}),getStateAfter:function(J){return J=is(J??st.size-1),Yi(J+1)},cursorCoords:function(J,oe){return J==null&&(J=He.inverted),this.charCoords(J?He.from:He.to,oe)},charCoords:function(J,oe){return J=Tt(J),oe=="local"?wi(J,!1):oe=="div"?wi(J,!0):Rr(J)},coordsChar:function(J){var oe=$e(Et);return ns(J.x-oe.left,J.y-oe.top)},defaultTextHeight:function(){return di()},markText:dt(_s),setBookmark:Hr,findMarksAt:Lr,setMarker:dt(Mr),clearMarker:dt(Pr),setLineClass:dt(Or),hideLine:dt(function(J){return ys(J,!0)}),showLine:dt(function(J){return ys(J,!1)}),onDeleteLine:function(J,oe){if(typeof J=="number"){if(!ki(J))return null;J=Bt(J)}return(J.handlers||(J.handlers=[])).push(oe),J},lineInfo:Nr,getViewport:function(){return{from:Jt,to:$t}},addWidget:function(J,oe,ue,_e,xe){J=wi(Tt(J));var Qe=J.yBot,Pe=J.x;if(oe.style.position="absolute",ri.appendChild(oe),_e=="over")Qe=J.y;else if(_e=="near"){var Ve=Math.max(it.offsetHeight,st.height*di()),Ze=Math.max(ri.clientWidth,Et.clientWidth)-Es();J.yBot+oe.offsetHeight>Ve&&J.y>oe.offsetHeight&&(Qe=J.y-oe.offsetHeight),Pe+oe.offsetWidth>Ze&&(Pe=Ze-oe.offsetWidth)}oe.style.top=Qe+As()+"px",oe.style.left=oe.style.right="",xe=="right"?(Pe=ri.clientWidth-oe.offsetWidth,oe.style.right="0px"):(xe=="left"?Pe=0:xe=="middle"&&(Pe=(ri.clientWidth-oe.offsetWidth)/2),oe.style.left=Pe+Es()+"px"),ue&&ms(Pe,Qe,Pe+oe.offsetWidth,Qe+oe.offsetHeight)},lineCount:function(){return st.size},clipPos:Tt,getCursor:function(J){return(J==null||J=="head")&&(J=He.inverted),J=="anchor"&&(J=!He.inverted),J=="end"&&(J=!1),Kt(J?He.from:He.to)},somethingSelected:function(){return!_t(He.from,He.to)},setCursor:dt(function(J,oe,ue){oe==null&&typeof J.line=="number"?Ti(J.line,J.ch,ue):Ti(J,oe,ue)}),setSelection:dt(function(J,oe,ue){(ue?fi:zi)(Tt(J),Tt(oe||J))}),getLine:function(J){if(ki(J))return Bt(J).text},getLineHandle:function(J){if(ki(J))return Bt(J)},setLine:dt(function(J,oe){ki(J)&&vi(oe,{line:J,ch:0},{line:J,ch:Bt(J).text.length})}),removeLine:dt(function(J){ki(J)&&vi("",{line:J,ch:0},Tt({line:J+1,ch:0}))}),replaceRange:dt(vi),getRange:function(J,oe,ue){return Ys(Tt(J),Tt(oe),ue)},triggerOnKeyDown:dt(Ns),execCommand:function(J){return R[J](Pt)},moveH:dt(Qr),deleteH:dt(Ur),moveV:dt(Ir),toggleOverwrite:function(){Zt?(Zt=!1,Dt.className=Dt.className.replace(" CodeMirror-overwrite","")):(Zt=!0,Dt.className+=" CodeMirror-overwrite")},posFromIndex:function(J){var oe=0,ue;return st.iter(0,st.size,function(_e){var xe=_e.text.length+1;if(xe>J)return ue=J,!0;J-=xe,++oe}),Tt({line:oe,ch:ue})},indexFromPos:function(J){if(J.line<0||J.ch<0)return 0;var oe=J.ch;return st.iter(0,J.line,function(ue){oe+=ue.text.length+1}),oe},scrollTo:function(J,oe){J!=null&&(it.scrollLeft=J),oe!=null&&(nt.scrollTop=it.scrollTop=oe),Si([])},getScrollInfo:function(){return{x:it.scrollLeft,y:nt.scrollTop,height:nt.scrollHeight,width:it.scrollWidth}},scrollIntoView:function(J){var oe=wi(J?Tt(J):He.inverted?He.from:He.to);ms(oe.x,oe.y,oe.x,oe.yBot)},setSize:function(J,oe){function ue(_e){return _e=String(_e),/^\d+$/.test(_e)?_e+"px":_e}J!=null&&(ii.style.width=ue(J)),oe!=null&&(it.style.height=ue(oe)),Pt.refresh()},operation:function(J){return dt(J)()},compoundChange:function(J){return hr(J)},refresh:function(){Si(!0,null,Vt),nt.scrollHeight>Vt&&(nt.scrollTop=Vt)},getInputField:function(){return be},getWrapperElement:function(){return ii},getScrollerElement:function(){return it},getGutterElement:function(){return Gt}};function Bt(J){return W(st,J)}function Ki(J,oe){gi=!0;for(var ue=oe-J.height,_e=J;_e;_e=_e.parent)_e.height+=ue}function Ls(J,oe){return J.styles||J.highlight(Ot,J.stateAfter=Yi(q(J)),de.tabSize),J.getContent(de.tabSize,oe,de.lineWrapping)}function Ms(J){var oe={line:0,ch:0};Rs(oe,{line:st.size-1,ch:Bt(st.size-1).text.length},pi(J),oe,oe),si=!0}function fr(J){var oe=[];return st.iter(0,st.size,function(ue){oe.push(ue.text)}),oe.join(J||`
+`)}function dr(J){Math.abs(nt.scrollTop-Vt)>1&&(Vt=it.scrollTop=nt.scrollTop,Si([]))}function pr(J){de.fixedGutter&&Gt.style.left!=it.scrollLeft+"px"&&(Gt.style.left=it.scrollLeft+"px"),Math.abs(it.scrollTop-Vt)>1&&(Vt=it.scrollTop,nt.scrollTop!=Vt&&(nt.scrollTop=Vt),Si([])),de.onScroll&&de.onScroll(Pt)}function gr(J){js(Oe(J,"shiftKey"));for(var oe=Te(J);oe!=ii;oe=oe.parentNode)if(oe.parentNode==ri&&oe!=yi)return;for(var oe=Te(J);oe!=ii;oe=oe.parentNode)if(oe.parentNode==_i)return de.onGutterClick&&de.onGutterClick(Pt,St(_i.childNodes,oe)+Jt,J),ce(J);var ue=Gi(J);switch(Ne(J)){case 3:Ae&&Ar(J);return;case 2:ue&&Ti(ue.line,ue.ch,!0),setTimeout(ui,20),ce(J);return}if(!ue){Te(J)==it&&ce(J);return}Xt||Mi();var _e=+new Date,xe="single";if(oi&&oi.time>_e-400&&_t(oi.pos,ue))xe="triple",ce(J),setTimeout(ui,20),Sr(ue.line);else if(Qi&&Qi.time>_e-400&&_t(Qi.pos,ue)){xe="double",oi={time:_e,pos:ue},ce(J);var Qe=Zs(ue);fi(Qe.from,Qe.to)}else Qi={time:_e,pos:ue};function Pe(mt){ye&&(it.draggable=!1),Nt=!1,Lt(),Re(),Math.abs(J.clientX-mt.clientX)+Math.abs(J.clientY-mt.clientY)<10&&(ce(mt),Ti(ue.line,ue.ch,!0),ui())}var Ve=ue,Ze;if(de.dragDrop&&qe&&!de.readOnly&&!_t(He.from,He.to)&&!Ge(ue,He.from)&&!Ge(He.to,ue)&&xe=="single"){ye&&(it.draggable=!0);var Lt=De(document,"mouseup",dt(Pe),!0),Re=De(it,"drop",dt(Pe),!0);Nt=!0,it.dragDrop&&it.dragDrop();return}ce(J),xe=="single"&&Ti(ue.line,ue.ch,!0);var ct=He.from,ot=He.to;function lt(mt){if(xe=="single"){fi(Tt(ue),mt);return}if(ct=Tt(ct),ot=Tt(ot),xe=="double"){var Wt=Zs(mt);Ge(mt,ct)?fi(Wt.from,ot):fi(ct,Wt.to)}else xe=="triple"&&(Ge(mt,ct)?fi(ot,Tt({line:mt.line,ch:0})):fi(ct,Tt({line:mt.line+1,ch:0})))}function It(mt){var Wt=Gi(mt,!0);if(Wt&&!_t(Wt,Ve)){Xt||Mi(),Ve=Wt,lt(Wt),si=!1;var Ht=qs();(Wt.line>=Ht.to||Wt.line<Ht.from)&&(Ze=setTimeout(dt(function(){It(mt)}),150))}}function yt(mt){clearTimeout(Ze);var Wt=Gi(mt);Wt&&lt(Wt),ce(mt),ui(),si=!0,Ft(),Lt()}var Ft=De(document,"mousemove",dt(function(mt){clearTimeout(Ze),ce(mt),!le&&!Ne(mt)?yt(mt):It(mt)}),!0),Lt=De(document,"mouseup",dt(yt),!0)}function mr(J){for(var oe=Te(J);oe!=ii;oe=oe.parentNode)if(oe.parentNode==_i)return ce(J);ce(J)}function vr(J){if(!(de.onDragEvent&&de.onDragEvent(Pt,re(J)))){ce(J);var oe=Gi(J,!0),ue=J.dataTransfer.files;if(!(!oe||de.readOnly))if(ue&&ue.length&&window.FileReader&&window.File)for(var _e=ue.length,xe=Array(_e),Qe=0,Pe=function(Ze,Re){var ct=new FileReader;ct.onload=function(){xe[Re]=ct.result,++Qe==_e&&(oe=Tt(oe),dt(function(){var ot=vi(xe.join(""),oe,oe);fi(oe,ot)})())},ct.readAsText(Ze)},Ve=0;Ve<_e;++Ve)Pe(ue[Ve],Ve);else{if(Nt&&!(Ge(oe,He.from)||Ge(He.to,oe)))return;try{var xe=J.dataTransfer.getData("Text");xe&&hr(function(){var Re=He.from,ct=He.to;fi(oe,oe),Nt&&vi("",Re,ct),Vi(xe),ui()})}catch{}}}}function wr(J){var oe=gs();J.dataTransfer.setData("Text",oe),J.dataTransfer.setDragImage&&J.dataTransfer.setDragImage(At("img"),0,0)}function ji(J,oe){if(typeof J=="string"&&(J=R[J],!J))return!1;var ue=jt;try{de.readOnly&&(Yt=!0),oe&&(jt=null),J(Pt)}catch(_e){if(_e!=Ye)throw _e;return!1}finally{jt=ue,Yt=!1}return!0}var Ps;function Os(J){var oe=G(de.keyMap),ue=oe.auto;clearTimeout(Ps),ue&&!ee(J)&&(Ps=setTimeout(function(){G(de.keyMap)==oe&&(de.keyMap=ue.call?ue.call(null,Pt):ue)},50));var _e=Ut[Oe(J,"keyCode")],xe=!1;if(_e==null||J.altGraphKey)return!1;Oe(J,"altKey")&&(_e="Alt-"+_e),Oe(J,Ue?"metaKey":"ctrlKey")&&(_e="Ctrl-"+_e),Oe(J,Ue?"ctrlKey":"metaKey")&&(_e="Cmd-"+_e);var Qe=!1;function Pe(){Qe=!0}return Oe(J,"shiftKey")?xe=X("Shift-"+_e,de.extraKeys,de.keyMap,function(Ve){return ji(Ve,!0)},Pe)||X(_e,de.extraKeys,de.keyMap,function(Ve){if(typeof Ve=="string"&&/^go[A-Z]/.test(Ve))return ji(Ve)},Pe):xe=X(_e,de.extraKeys,de.keyMap,ji,Pe),Qe&&(xe=!1),xe&&(ce(J),as(),ge&&(J.oldKeyCode=J.keyCode,J.keyCode=0)),xe}function Br(J,oe){var ue=X("'"+oe+"'",de.extraKeys,de.keyMap,function(_e){return ji(_e,!0)});return ue&&(ce(J),as()),ue}var fs=null;function Ns(J){if(Xt||Mi(),le&&J.keyCode==27&&(J.returnValue=!1),Li&&$i()&&(Li=!1),!(de.onKeyEvent&&de.onKeyEvent(Pt,re(J)))){var oe=Oe(J,"keyCode");js(oe==16||Oe(J,"shiftKey"));var ue=Os(J);ve&&(fs=ue?oe:null,!ue&&oe==88&&Oe(J,x?"metaKey":"ctrlKey")&&Vi(""))}}function _r(J){if(Li&&$i(),!(de.onKeyEvent&&de.onKeyEvent(Pt,re(J)))){var oe=Oe(J,"keyCode"),ue=Oe(J,"charCode");if(ve&&oe==fs){fs=null,ce(J);return}if(!((ve&&(!J.which||J.which<10)||Se)&&Os(J))){var _e=String.fromCharCode(ue??oe);de.electricChars&&Ot.electricChars&&de.smartIndent&&!de.readOnly&&Ot.electricChars.indexOf(_e)>-1&&setTimeout(dt(function(){ss(He.to.line,"smart")}),75),!Br(J,_e)&&Wi()}}}function yr(J){de.onKeyEvent&&de.onKeyEvent(Pt,re(J))||Oe(J,"keyCode")==16&&(jt=null)}function Mi(){de.readOnly!="nocursor"&&(Xt||(de.onFocus&&de.onFocus(Pt),Xt=!0,it.className.search(/\bCodeMirror-focused\b/)==-1&&(it.className+=" CodeMirror-focused")),Zi(),as())}function ds(){Xt&&(de.onBlur&&de.onBlur(Pt),Xt=!1,Ii&&dt(function(){Ii&&(Ii(),Ii=null)})(),it.className=it.className.replace(" CodeMirror-focused","")),clearInterval(bi),setTimeout(function(){Xt||(jt=null)},150)}function Rs(J,oe,ue,_e,xe){if(!Yt){var Qe=[];if(st.iter(J.line,oe.line+1,function(Ve){Qe.push(w(Ve.text,Ve.markedSpans))}),ei)for(ei.addChange(J.line,ue.length,Qe);ei.done.length>de.undoDepth;)ei.done.shift();var Pe=vt(d(Qe[0]),d(xt(Qe)),J.ch,oe.ch,ue);Vs(J,oe,Pe,_e,xe)}}function Ks(J,oe){if(J.length){for(var ue=J.pop(),_e=[],xe=ue.length-1;xe>=0;xe-=1){var Qe=ue[xe],Pe=[],Ve=Qe.start+Qe.added;st.iter(Qe.start,Ve,function(Re){Pe.push(w(Re.text,Re.markedSpans))}),_e.push({start:Qe.start,added:Qe.old.length,old:Pe});var Ze={line:Qe.start+Qe.old.length-1,ch:zt(tt(xt(Pe)),tt(xt(Qe.old)))};Vs({line:Qe.start,ch:0},{line:Ve-1,ch:Bt(Ve-1).text.length},Qe.old,Ze,Ze)}si=!0,oe.push(_e)}}function Cr(){Ks(ei.done,ei.undone)}function br(){Ks(ei.undone,ei.done)}function Vs(J,oe,ue,_e,xe){if(Yt)return;var Qe=!1,Pe=mi.text.length;de.lineWrapping||st.iter(J.line,oe.line+1,function(Ht){if(!Ht.hidden&&Ht.text.length==Pe)return Qe=!0,!0}),(J.line!=oe.line||ue.length>1)&&(gi=!0);var Ve=oe.line-J.line,Ze=Bt(J.line),Re=Bt(oe.line),ct=xt(ue);if(J.ch==0&&oe.ch==0&&tt(ct)==""){for(var ot=[],lt=0,It=ue.length-1;lt<It;++lt)ot.push(new k(tt(ue[lt]),d(ue[lt])));Re.update(Re.text,d(ct)),Ve&&st.remove(J.line,Ve,Ni),ot.length&&st.insert(J.line,ot)}else if(Ze==Re)if(ue.length==1)Ze.update(Ze.text.slice(0,J.ch)+tt(ue[0])+Ze.text.slice(oe.ch),d(ue[0]));else{for(var ot=[],lt=1,It=ue.length-1;lt<It;++lt)ot.push(new k(tt(ue[lt]),d(ue[lt])));ot.push(new k(tt(ct)+Ze.text.slice(oe.ch),d(ct))),Ze.update(Ze.text.slice(0,J.ch)+tt(ue[0]),d(ue[0])),st.insert(J.line+1,ot)}else if(ue.length==1)Ze.update(Ze.text.slice(0,J.ch)+tt(ue[0])+Re.text.slice(oe.ch),d(ue[0])),st.remove(J.line+1,Ve,Ni);else{var ot=[];Ze.update(Ze.text.slice(0,J.ch)+tt(ue[0]),d(ue[0])),Re.update(tt(ct)+Re.text.slice(oe.ch),d(ct));for(var lt=1,It=ue.length-1;lt<It;++lt)ot.push(new k(tt(ue[lt]),d(ue[lt])));Ve>1&&st.remove(J.line+1,Ve-1,Ni),st.insert(J.line+1,ot)}if(de.lineWrapping){var yt=Math.max(5,it.clientWidth/xs()-3);st.iter(J.line,J.line+ue.length,function(Ht){if(!Ht.hidden){var ai=Math.ceil(Ht.text.length/yt)||1;ai!=Ht.height&&Ki(Ht,ai)}})}else st.iter(J.line,J.line+ue.length,function(Ht){var ai=Ht.text;!Ht.hidden&&ai.length>Pe&&(mi=Ht,Pe=ai.length,Ji=!0,Qe=!1)}),Qe&&(Ri=!0);ni=Math.min(ni,J.line),os(400);var Ft=ue.length-Ve-1;if(li.push({from:J.line,to:oe.line+1,diff:Ft}),de.onChange){for(var lt=0;lt<ue.length;++lt)typeof ue[lt]!="string"&&(ue[lt]=ue[lt].text);var Lt={from:J,to:oe,text:ue};if(Ei){for(var mt=Ei;mt.next;mt=mt.next);mt.next=Lt}else Ei=Lt}function Wt(Ht){return Ht<=Math.min(oe.line,oe.line+Ft)?Ht:Ht+Ft}zi(Tt(_e),Tt(xe),Wt(He.from.line),Wt(He.to.line))}function Ws(){var J=st.height*di()+2*As();return J*.99>it.offsetHeight?J:!1}function ps(J){var oe=Ws();nt.style.display=oe?"block":"none",oe?(je.style.height=ri.style.minHeight=oe+"px",nt.style.height=it.clientHeight+"px",J!=null&&(nt.scrollTop=it.scrollTop=J,ye&&setTimeout(function(){nt.scrollTop==J&&(nt.scrollTop=J+(J?-1:1),nt.scrollTop=J)},0))):ri.style.minHeight="",yi.style.top=Hi*di()+"px"}function zs(){mi=Bt(0),Ji=!0;var J=mi.text.length;st.iter(1,st.size,function(oe){var ue=oe.text;!oe.hidden&&ue.length>J&&(J=ue.length,mi=oe)}),Ri=!1}function vi(J,oe,ue){oe=Tt(oe),ue?ue=Tt(ue):ue=oe,J=pi(J);function _e(Qe){if(Ge(Qe,oe))return Qe;if(!Ge(ue,Qe))return xe;var Pe=Qe.line+J.length-(ue.line-oe.line)-1,Ve=Qe.ch;return Qe.line==ue.line&&(Ve+=xt(J).length-(ue.ch-(ue.line==oe.line?oe.ch:0))),{line:Pe,ch:Ve}}var xe;return Gs(J,oe,ue,function(Qe){return xe=Qe,{from:_e(He.from),to:_e(He.to)}}),xe}function Vi(J,oe){Gs(pi(J),He.from,He.to,function(ue){return oe=="end"?{from:ue,to:ue}:oe=="start"?{from:He.from,to:He.from}:{from:He.from,to:ue}})}function Gs(J,oe,ue,_e){var xe=J.length==1?J[0].length+oe.ch:xt(J).length,Qe=_e({line:oe.line+J.length-1,ch:xe});Rs(oe,ue,J,Qe.from,Qe.to)}function Ys(J,oe,ue){var _e=J.line,xe=oe.line;if(_e==xe)return Bt(_e).text.slice(J.ch,oe.ch);var Qe=[Bt(_e).text.slice(J.ch)];return st.iter(_e+1,xe,function(Pe){Qe.push(Pe.text)}),Qe.push(Bt(xe).text.slice(0,oe.ch)),Qe.join(ue||`
+`)}function gs(J){return Ys(He.from,He.to,J)}function Zi(){Li||Ai.set(de.pollInterval,function(){$i(),Xt&&Zi()})}function Wi(){var J=!1;Li=!0;function oe(){var ue=$i();!ue&&!J?(J=!0,Ai.set(60,oe)):(Li=!1,Zi())}Ai.set(20,oe)}var hi="";function $i(){if(!Xt||Bi(be)||de.readOnly)return!1;var J=be.value;if(J==hi)return!1;ls||or(),jt=null;for(var oe=0,ue=Math.min(hi.length,J.length);oe<ue&&hi[oe]==J[oe];)++oe;return oe<hi.length?He.from={line:He.from.line,ch:He.from.ch-(hi.length-oe)}:Zt&&_t(He.from,He.to)&&!Rt&&(He.to={line:He.to.line,ch:Math.min(Bt(He.to.line).text.length,He.to.ch+(J.length-oe))}),Vi(J.slice(oe),"end"),J.length>1e3?be.value=hi="":hi=J,ls||lr(),Rt=!1,!0}function es(J){_t(He.from,He.to)?J&&(hi=be.value=""):(hi="",be.value=gs(),Xt&&qt(be))}function ui(){de.readOnly!="nocursor"&&(ge||document.activeElement!=be)&&be.focus()}function xr(){var J=Xs();if(ms(J.x,J.y,J.x,J.yBot),!!Xt){var oe=ri.getBoundingClientRect(),ue=null;if(J.y+oe.top<0?ue=!0:J.y+oe.top+di()>(window.innerHeight||document.documentElement.clientHeight)&&(ue=!1),ue!=null){var _e=Dt.style.display=="none";_e&&(Dt.style.display="",Dt.style.left=J.x+"px",Dt.style.top=J.y-Hi+"px"),Dt.scrollIntoView(ue),_e&&(Dt.style.display="none")}}}function Xs(){var J=wi(He.inverted?He.from:He.to),oe=de.lineWrapping?Math.min(J.x,Et.offsetWidth):J.x;return{x:oe,y:J.y,yBot:J.yBot}}function ms(J,oe,ue,_e){var xe=Js(J,oe,ue,_e);xe.scrollLeft!=null&&(it.scrollLeft=xe.scrollLeft),xe.scrollTop!=null&&(nt.scrollTop=it.scrollTop=xe.scrollTop)}function Js(J,oe,ue,_e){var xe=Es(),Qe=As();oe+=Qe,_e+=Qe,J+=xe,ue+=xe;var Pe=it.clientHeight,Ve=nt.scrollTop,Ze={},Re=Ws()||1/0,ct=oe<Qe+10,ot=_e+Qe>Re-10;oe<Ve?Ze.scrollTop=ct?0:Math.max(0,oe):_e>Ve+Pe&&(Ze.scrollTop=(ot?Re:_e)-Pe);var lt=it.clientWidth,It=it.scrollLeft,yt=de.fixedGutter?Gt.clientWidth:0,Ft=J<yt+xe+10;return J<It+yt||Ft?(Ft&&(J=0),Ze.scrollLeft=Math.max(0,J-10-yt)):ue>lt+It-3&&(Ze.scrollLeft=ue+10-lt),Ze}function qs(J){var oe=di(),ue=(J??nt.scrollTop)-As(),_e=Math.max(0,Math.floor(ue/oe)),xe=Math.ceil((ue+it.clientHeight)/oe);return{from:te(st,_e),to:te(st,xe)}}function Si(J,oe,ue){if(!it.clientWidth){Jt=$t=Hi=0;return}var _e=qs(ue);if(J!==!0&&J.length==0&&_e.from>Jt&&_e.to<$t){ps(ue);return}var xe=Math.max(_e.from-100,0),Qe=Math.min(st.size,_e.to+100);Jt<xe&&xe-Jt<20&&(xe=Jt),$t>Qe&&$t-Qe<20&&(Qe=Math.min(st.size,$t));for(var Pe=J===!0?[]:Er([{from:Jt,to:$t,domStart:0}],J),Ve=0,Ze=0;Ze<Pe.length;++Ze){var Re=Pe[Ze];Re.from<xe&&(Re.domStart+=xe-Re.from,Re.from=xe),Re.to>Qe&&(Re.to=Qe),Re.from>=Re.to?Pe.splice(Ze--,1):Ve+=Re.to-Re.from}if(Ve==Qe-xe&&xe==Jt&&Qe==$t){ps(ue);return}Pe.sort(function(yt,Ft){return yt.domStart-Ft.domStart});var ct=di(),ot=Gt.style.display;ut.style.display="none",Fr(xe,Qe,Pe),ut.style.display=Gt.style.display="";var lt=xe!=Jt||Qe!=$t||ks!=it.clientHeight+ct;if(lt&&(ks=it.clientHeight+ct),(xe!=Jt||Qe!=$t&&de.onViewportChange)&&setTimeout(function(){de.onViewportChange&&de.onViewportChange(Pt,xe,Qe)}),Jt=xe,$t=Qe,Hi=he(st,xe),os(100),ut.childNodes.length!=$t-Jt)throw new Error("BAD PATCH! "+JSON.stringify(Pe)+" size="+($t-Jt)+" nodes="+ut.childNodes.length);function It(){var yt=ut.firstChild,Ft=!1;return st.iter(Jt,$t,function(Lt){if(yt){if(!Lt.hidden){var mt=Math.round(yt.offsetHeight/ct)||1;Lt.height!=mt&&(Ki(Lt,mt),gi=Ft=!0)}yt=yt.nextSibling}}),Ft}return de.lineWrapping&&It(),Gt.style.display=ot,(lt||gi)&&vs()&&de.lineWrapping&&It()&&vs(),ps(ue),ws(),!oe&&de.onUpdate&&de.onUpdate(Pt),!0}function Er(J,oe){for(var ue=0,_e=oe.length||0;ue<_e;++ue){for(var xe=oe[ue],Qe=[],Pe=xe.diff||0,Ve=0,Ze=J.length;Ve<Ze;++Ve){var Re=J[Ve];xe.to<=Re.from&&xe.diff?Qe.push({from:Re.from+Pe,to:Re.to+Pe,domStart:Re.domStart}):xe.to<=Re.from||xe.from>=Re.to?Qe.push(Re):(xe.from>Re.from&&Qe.push({from:Re.from,to:xe.from,domStart:Re.domStart}),xe.to<Re.to&&Qe.push({from:xe.to+Pe,to:Re.to+Pe,domStart:Re.domStart+(xe.to-Re.from)}))}J=Qe}return J}function Fr(J,oe,ue){function _e(ot){var lt=ot.nextSibling;return ot.parentNode.removeChild(ot),lt}if(!ue.length)Ct(ut);else{for(var xe=0,Re=ut.firstChild,Qe=0;Qe<ue.length;++Qe){for(var Pe=ue[Qe];Pe.domStart>xe;)Re=_e(Re),xe++;for(var ct=0,Ve=Pe.to-Pe.from;ct<Ve;++ct)Re=Re.nextSibling,xe++}for(;Re;)Re=_e(Re)}var Ze=ue.shift(),Re=ut.firstChild,ct=J;st.iter(J,oe,function(ot){if(Ze&&Ze.to==ct&&(Ze=ue.shift()),!Ze||Ze.from>ct){if(ot.hidden)var lt=At("pre");else{var lt=Ls(ot);if(ot.className&&(lt.className=ot.className),ot.bgClassName){var It=At("pre"," ",ot.bgClassName,"position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: -2");lt=At("div",[It,lt],null,"position: relative")}}ut.insertBefore(lt,Re)}else Re=Re.nextSibling;++ct})}function vs(){if(!(!de.gutter&&!de.lineNumbers)){var J=yi.offsetHeight,oe=it.clientHeight;Gt.style.height=(J-oe<2?oe:J)+"px";var ue=document.createDocumentFragment(),_e=Jt,xe;if(st.iter(Jt,Math.max($t,Jt+1),function(ct){if(ct.hidden)ue.appendChild(At("pre"));else{var ot=ct.gutterMarker,lt=de.lineNumbers?de.lineNumberFormatter(_e+de.firstLineNumber):null;ot&&ot.text?lt=ot.text.replace("%N%",lt??""):lt==null&&(lt=" ");var It=ue.appendChild(At("pre",null,ot&&ot.style));It.innerHTML=lt;for(var yt=1;yt<ct.height;++yt)It.appendChild(At("br")),It.appendChild(document.createTextNode(" "));ot||(xe=_e)}++_e}),Gt.style.display="none",bt(_i,ue),xe!=null&&de.lineNumbers){for(var Qe=_i.childNodes[xe-Jt],Pe=String(st.size).length,Ve=pt(Qe.firstChild),Ze="";Ve.length+Ze.length<Pe;)Ze+=" ";Ze&&Qe.insertBefore(document.createTextNode(Ze),Qe.firstChild)}Gt.style.display="";var Re=Math.abs((parseInt(Et.style.marginLeft)||0)-Gt.offsetWidth)>2;return Et.style.marginLeft=Gt.offsetWidth+"px",gi=!1,Re}}function ws(){var J=_t(He.from,He.to),oe=wi(He.from,!0),ue=J?oe:wi(He.to,!0),_e=He.inverted?oe:ue,xe=di(),Qe=$e(ii),Pe=$e(ut);if(Le.style.top=Math.max(0,Math.min(it.offsetHeight,_e.y+Pe.top-Qe.top))+"px",Le.style.left=Math.max(0,Math.min(it.offsetWidth,_e.x+Pe.left-Qe.left))+"px",J||de.showCursorWhenSelecting?(Dt.style.top=_e.y+"px",Dt.style.left=(de.lineWrapping?Math.min(_e.x,Et.offsetWidth):_e.x)+"px",Dt.style.display=""):Dt.style.display="none",J)Mt.style.display="none";else{var Ve=oe.y==ue.y,Ze=document.createDocumentFragment(),Re=Et.clientWidth||Et.offsetWidth,ct=Et.clientHeight||Et.offsetHeight,ot=function(Ft,Lt,mt,Wt){var Ht=fe?"width: "+(mt?Re-mt-Ft:Re)+"px":"right: "+(mt-1)+"px";Ze.appendChild(At("div",null,"CodeMirror-selected","position: absolute; left: "+Ft+"px; top: "+Lt+"px; "+Ht+"; height: "+Wt+"px"))};if(He.from.ch&&oe.y>=0){var lt=Ve?Re-ue.x:0;ot(oe.x,oe.y,lt,xe)}var It=Math.max(0,oe.y+(He.from.ch?xe:0)),yt=Math.min(ue.y,ct)-It;yt>.2*xe&&ot(0,It,0,yt),(!Ve||!He.from.ch)&&ue.y<ct-.5*xe&&ot(0,ue.y,Re-ue.x,xe),bt(Mt,Ze),Mt.style.display=""}}function js(J){J?jt=jt||(He.inverted?He.to:He.from):jt=null}function fi(J,oe){var ue=jt&&Tt(jt);ue&&(Ge(ue,J)?J=ue:Ge(oe,ue)&&(oe=ue)),zi(J,oe),xi=!0}function zi(J,oe,ue,_e){if(qi=null,ue==null&&(ue=He.from.line,_e=He.to.line),!(_t(He.from,J)&&_t(He.to,oe))){if(Ge(oe,J)){var xe=oe;oe=J,J=xe}if(J.line!=ue){var Qe=ts(J,ue,He.from.ch);Qe?J=Qe:ys(J.line,!1)}if(oe.line!=_e&&(oe=ts(oe,_e,He.to.ch)),_t(J,oe)||_t(J,He.to)?He.inverted=!1:_t(oe,He.from)&&(He.inverted=!0),de.autoClearEmptyLines&&_t(He.from,He.to)){var Pe=He.inverted?J:oe;if(Pe.line!=He.from.line&&He.from.line<st.size){var Ve=Bt(He.from.line);/^\s+$/.test(Ve.text)&&setTimeout(dt(function(){if(Ve.parent&&/^\s+$/.test(Ve.text)){var Ze=q(Ve);vi("",{line:Ze,ch:0},{line:Ze,ch:Ve.text.length})}}))}}He.from=J,He.to=oe,Ui=!0}}function ts(J,oe,ue){function _e(Pe){for(var Ve=J.line+Pe,Ze=Pe==1?st.size:-1;Ve!=Ze;){var Re=Bt(Ve);if(!Re.hidden){var ct=J.ch;return(Qe||ct>ue||ct>Re.text.length)&&(ct=Re.text.length),{line:Ve,ch:ct}}Ve+=Pe}}var xe=Bt(J.line),Qe=J.ch==xe.text.length&&J.ch!=ue;return xe.hidden?J.line>=oe?_e(1)||_e(-1):_e(-1)||_e(1):J}function Ti(J,oe,ue){var _e=Tt({line:J,ch:oe||0});(ue?fi:zi)(_e,_e)}function is(J){return Math.max(0,Math.min(J,st.size-1))}function Tt(J){if(J.line<0)return{line:0,ch:0};if(J.line>=st.size)return{line:st.size-1,ch:Bt(st.size-1).text.length};var oe=J.ch,ue=Bt(J.line).text.length;return oe==null||oe>ue?{line:J.line,ch:ue}:oe<0?{line:J.line,ch:0}:J}function Bs(J,oe){var ue=He.inverted?He.from:He.to,_e=ue.line,xe=ue.ch,Qe=Bt(_e);function Pe(){for(var Re=_e+J,ct=J<0?-1:st.size;Re!=ct;Re+=J){var ot=Bt(Re);if(!ot.hidden)return _e=Re,Qe=ot,!0}}function Ve(Re){if(xe==(J<0?0:Qe.text.length))if(!Re&&Pe())xe=J<0?Qe.text.length:0;else return!1;else xe+=J;return!0}if(oe=="char")Ve();else if(oe=="column")Ve(!0);else if(oe=="word")for(var Ze=!1;!(J<0&&!Ve());){if(Fi(Qe.text.charAt(xe)))Ze=!0;else if(Ze){J<0&&(J=1,Ve());break}if(J>0&&!Ve())break}return{line:_e,ch:xe}}function Qr(J,oe){var ue=J<0?He.from:He.to;(jt||_t(He.from,He.to))&&(ue=Bs(J,oe)),Ti(ue.line,ue.ch,!0)}function Ur(J,oe){_t(He.from,He.to)?J<0?vi("",Bs(J,oe),He.to):vi("",He.from,Bs(J,oe)):vi("",He.from,He.to),xi=!0}function Ir(J,oe){var ue=wi(He.inverted?He.from:He.to,!0);if(qi!=null&&(ue.x=qi),oe=="page")var _e=Math.min(it.clientHeight,window.innerHeight||document.documentElement.clientHeight),xe=ns(ue.x,ue.y+_e*J);else if(oe=="line")var Qe=di(),xe=ns(ue.x,ue.y+.5*Qe+J*Qe);oe=="page"&&(nt.scrollTop+=wi(xe,!0).y-ue.y),Ti(xe.line,xe.ch,!0),qi=ue.x}function Zs(J){var oe=Bt(J.line).text,ue=J.ch,_e=J.ch;if(oe){J.after===!1||_e==oe.length?--ue:++_e;for(var xe=oe.charAt(ue),Qe=Fi(xe)?Fi:/\s/.test(xe)?function(Pe){return/\s/.test(Pe)}:function(Pe){return!/\s/.test(Pe)&&Fi(Pe)};ue>0&&Qe(oe.charAt(ue-1));)--ue;for(;_e<oe.length&&Qe(oe.charAt(_e));)++_e}return{from:{line:J.line,ch:ue},to:{line:J.line,ch:_e}}}function Sr(J){fi({line:J,ch:0},Tt({line:J+1,ch:0}))}function Tr(J){if(_t(He.from,He.to))return ss(He.from.line,J);for(var oe=He.to.line-(He.to.ch?0:1),ue=He.from.line;ue<=oe;++ue)ss(ue,J)}function ss(J,oe){if(oe||(oe="add"),oe=="smart")if(!Ot.indent)oe="prev";else var ue=Yi(J);var _e=Bt(J),xe=_e.indentation(de.tabSize),Qe=_e.text.match(/^\s*/)[0],Pe;oe=="smart"&&(Pe=Ot.indent(ue,_e.text.slice(Qe.length),_e.text),Pe==Ye&&(oe="prev")),oe=="prev"?J?Pe=Bt(J-1).indentation(de.tabSize):Pe=0:oe=="add"?Pe=xe+de.indentUnit:oe=="subtract"&&(Pe=xe-de.indentUnit),Pe=Math.max(0,Pe);var Ve="",Ze=0;if(de.indentWithTabs)for(var Re=Math.floor(Pe/de.tabSize);Re;--Re)Ze+=de.tabSize,Ve+="	";Ze<Pe&&(Ve+=Qt(Pe-Ze)),Ve!=Qe&&vi(Ve,{line:J,ch:0},{line:J,ch:Qe.length}),_e.stateAfter=null}function $s(){Ot=g.getMode(de,de.mode),st.iter(0,st.size,function(J){J.stateAfter=null}),ni=0,os(100)}function kr(){var J=de.gutter||de.lineNumbers;Gt.style.display=J?"":"none",J?gi=!0:ut.parentNode.style.marginLeft=0}function Dr(J,oe){if(de.lineWrapping){ii.className+=" CodeMirror-wrap";var ue=it.clientWidth/xs()-3;st.iter(0,st.size,function(_e){if(!_e.hidden){var xe=Math.ceil(_e.text.length/ue)||1;xe!=1&&Ki(_e,xe)}}),Et.style.minWidth=ci.style.left=""}else ii.className=ii.className.replace(" CodeMirror-wrap",""),zs(),st.iter(0,st.size,function(_e){_e.height!=1&&!_e.hidden&&Ki(_e,1)});li.push({from:0,to:st.size})}function er(){it.className=it.className.replace(/\s*cm-s-\S+/g,"")+de.theme.replace(/(^|\s)\s*/g," cm-s-")}function tr(){var J=Y[de.keyMap].style;ii.className=ii.className.replace(/\s*cm-keymap-\S+/g,"")+(J?" cm-keymap-"+J:"")}function rs(J,oe){this.lines=[],this.type=J,oe&&(this.style=oe)}rs.prototype.clear=dt(function(){for(var J,oe,ue=0;ue<this.lines.length;++ue){var _e=this.lines[ue],xe=Je(_e.markedSpans,this);xe.from!=null&&(J=q(_e)),xe.to!=null&&(oe=q(_e)),_e.markedSpans=ft(_e.markedSpans,xe)}J!=null&&li.push({from:J,to:oe+1}),this.lines.length=0,this.explicitlyCleared=!0}),rs.prototype.find=function(){for(var J,oe,ue=0;ue<this.lines.length;++ue){var _e=this.lines[ue],xe=Je(_e.markedSpans,this);if(xe.from!=null||xe.to!=null){var Qe=q(_e);xe.from!=null&&(J={line:Qe,ch:xe.from}),xe.to!=null&&(oe={line:Qe,ch:xe.to})}}return this.type=="bookmark"?J:J&&{from:J,to:oe}};function _s(J,oe,ue,_e){J=Tt(J),oe=Tt(oe);var xe=new rs("range",ue);if(_e)for(var Qe in _e)_e.hasOwnProperty(Qe)&&(xe[Qe]=_e[Qe]);var Pe=J.line;return st.iter(Pe,oe.line+1,function(Ve){var Ze={from:Pe==J.line?J.ch:null,to:Pe==oe.line?oe.ch:null,marker:xe};Ve.markedSpans=(Ve.markedSpans||[]).concat([Ze]),xe.lines.push(Ve),++Pe}),li.push({from:J.line,to:oe.line+1}),xe}function Hr(J){J=Tt(J);var oe=new rs("bookmark"),ue=Bt(J.line);ei.addChange(J.line,1,[w(ue.text,ue.markedSpans)],!0);var _e={from:J.ch,to:J.ch,marker:oe};return ue.markedSpans=(ue.markedSpans||[]).concat([_e]),oe.lines.push(ue),oe}function Lr(J){J=Tt(J);var oe=[],ue=Bt(J.line).markedSpans;if(ue)for(var _e=0;_e<ue.length;++_e){var xe=ue[_e];(xe.from==null||xe.from<=J.ch)&&(xe.to==null||xe.to>=J.ch)&&oe.push(xe.marker)}return oe}function Mr(J,oe,ue){return typeof J=="number"&&(J=Bt(is(J))),J.gutterMarker={text:oe,style:ue},gi=!0,J}function Pr(J){typeof J=="number"&&(J=Bt(is(J))),J.gutterMarker=null,gi=!0}function ir(J,oe){var ue=J,_e=J;if(typeof J=="number"?_e=Bt(is(J)):ue=q(J),ue==null)return null;if(oe(_e,ue))li.push({from:ue,to:ue+1});else return null;return _e}function Or(J,oe,ue){return ir(J,function(_e){if(_e.className!=oe||_e.bgClassName!=ue)return _e.className=oe,_e.bgClassName=ue,!0})}function ys(J,oe){return ir(J,function(ue,_e){if(ue.hidden!=oe){ue.hidden=oe,de.lineWrapping||(oe&&ue.text.length==mi.text.length?Ri=!0:!oe&&ue.text.length>mi.text.length&&(mi=ue,Ri=!1)),Ki(ue,oe?0:1);var xe=He.from.line,Qe=He.to.line;if(oe&&(xe==_e||Qe==_e)){var Pe=xe==_e?ts({line:xe,ch:0},xe,0):He.from,Ve=Qe==_e?ts({line:Qe,ch:0},Qe,0):He.to;if(!Ve)return;zi(Pe,Ve)}return gi=!0}})}function Nr(J){if(typeof J=="number"){if(!ki(J))return null;var oe=J;if(J=Bt(J),!J)return null}else{var oe=q(J);if(oe==null)return null}var ue=J.gutterMarker;return{line:oe,handle:J,text:J.text,markerText:ue&&ue.text,markerClass:ue&&ue.style,lineClass:J.className,bgClass:J.bgClassName}}function Cs(J,oe){if(oe==0)return{top:0,left:0};var ue=Ls(J,oe);bt(ti,ue);var _e=ue.anchor,xe=_e.offsetTop,Qe=_e.offsetLeft;if(le&&xe==0&&Qe==0){var Pe=At("span","x");_e.parentNode.insertBefore(Pe,_e.nextSibling),xe=Pe.offsetTop}return{top:xe,left:Qe}}function wi(J,oe){var ue,_e=di(),xe=_e*(he(st,J.line)-(oe?Hi:0));if(J.ch==0)ue=0;else{var Qe=Cs(Bt(J.line),J.ch);ue=Qe.left,de.lineWrapping&&(xe+=Math.max(0,Qe.top))}return{x:ue,y:xe,yBot:xe+_e}}function ns(J,oe){var ue=di(),_e=xs(),xe=Hi+Math.floor(oe/ue);if(xe<0)return{line:0,ch:0};var Qe=te(st,xe);if(Qe>=st.size)return{line:st.size-1,ch:Bt(st.size-1).text.length};var Pe=Bt(Qe),Ve=Pe.text,Ze=de.lineWrapping,Re=Ze?xe-he(st,Qe):0;if(J<=0&&Re==0)return{line:Qe,ch:0};var ct=!1;function ot(Is){var Xi=Cs(Pe,Is);if(Ze){var Di=Math.round(Xi.top/ue);return ct=Di!=Re,Math.max(0,Xi.left+(Di-Re)*it.clientWidth)}return Xi.left}for(var lt=0,It=0,yt=Ve.length,Ft,Lt=Math.min(yt,Math.ceil((J+Re*it.clientWidth*.9)/_e));;){var mt=ot(Lt);if(mt<=J&&Lt<yt)Lt=Math.min(yt,Math.ceil(Lt*1.2));else{Ft=mt,yt=Lt;break}}if(J>Ft)return{line:Qe,ch:yt};for(Lt=Math.floor(yt*.8),mt=ot(Lt),mt<J&&(lt=Lt,It=mt);;){if(yt-lt<=1){var Wt=J-It<Ft-J;return{line:Qe,ch:Wt?lt:yt,after:Wt}}var Ht=Math.ceil((lt+yt)/2),ai=ot(Ht);ai>J?(yt=Ht,Ft=ai,ct&&(Ft+=1e3)):(lt=Ht,It=ai)}}function Rr(J){var oe=wi(J,!0),ue=$e(Et);return{x:ue.left+oe.x,y:ue.top+oe.y,yBot:ue.top+oe.yBot}}var bs,sr,Pi;function di(){if(Pi==null){Pi=At("pre");for(var J=0;J<49;++J)Pi.appendChild(document.createTextNode("x")),Pi.appendChild(At("br"));Pi.appendChild(document.createTextNode("x"))}var oe=ut.clientHeight;return oe==sr||(sr=oe,bt(ti,Pi.cloneNode(!0)),bs=ti.firstChild.offsetHeight/50||1,Ct(ti)),bs}var rr,nr=0;function xs(){if(it.clientWidth==nr)return rr;nr=it.clientWidth;var J=At("span","x"),oe=At("pre",[J]);return bt(ti,oe),rr=J.offsetWidth||10}function As(){return Et.offsetTop}function Es(){return Et.offsetLeft}function Gi(J,oe){var ue=$e(it,!0),_e,xe;try{_e=J.clientX,xe=J.clientY}catch{return null}if(!oe&&(_e-ue.left>it.clientWidth||xe-ue.top>it.clientHeight))return null;var Qe=$e(Et,!0);return ns(_e-Qe.left,xe-Qe.top)}var Fs;function Ar(J){var oe=Gi(J),ue=nt.scrollTop;if(!oe||ve)return;(_t(He.from,He.to)||Ge(oe,He.from)||!Ge(oe,He.to))&&dt(Ti)(oe.line,oe.ch);var _e=be.style.cssText;Le.style.position="absolute",be.style.cssText="position: fixed; width: 30px; height: 30px; top: "+(J.clientY-5)+"px; left: "+(J.clientX-5)+"px; z-index: 1000; background: white; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",ui(),es(!0),_t(He.from,He.to)&&(be.value=hi=" ");function xe(){if(Le.style.position="relative",be.style.cssText=_e,ge&&(nt.scrollTop=ue),Zi(),be.selectionStart!=null){clearTimeout(Fs);var Pe=be.value=" "+(_t(He.from,He.to)?"":be.value),Ve=0;hi=" ",be.selectionStart=1,be.selectionEnd=Pe.length,Fs=setTimeout(function Ze(){hi==" "&&be.selectionStart==0?dt(R.selectAll)(Pt):Ve++<10?Fs=setTimeout(Ze,500):es()},200)}}if(Ae){Fe(J);var Qe=De(window,"mouseup",function(){Qe(),setTimeout(xe,20)},!0)}else setTimeout(xe,50)}function as(){clearInterval(bi);var J=!0;Dt.style.visibility="",bi=setInterval(function(){Dt.style.visibility=(J=!J)?"":"hidden"},de.cursorBlinkRate)}var Qs={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"};function ar(J){var oe=He.inverted?He.from:He.to,ue=Bt(oe.line),_e=oe.ch-1,xe=_e>=0&&Qs[ue.text.charAt(_e)]||Qs[ue.text.charAt(++_e)];if(!xe)return;xe.charAt(0);for(var Qe=xe.charAt(1)==">",Pe=Qe?1:-1,Ve=ue.styles,Ze=_e+1,Re=0,ct=Ve.length;Re<ct;Re+=2)if((Ze-=Ve[Re].length)<=0){var Lt=Ve[Re+1];break}var ot=[ue.text.charAt(_e)],lt=/[(){}[\]]/;function It(ai,Is,Xi){if(ai.text)for(var Di=ai.styles,Oi=Qe?0:ai.text.length-1,Ss,cs=Qe?0:Di.length-2,Wr=Qe?Di.length:-2;cs!=Wr;cs+=2*Pe){var us=Di[cs];if(Di[cs+1]!=Lt){Oi+=Pe*us.length;continue}for(var Ts=Qe?0:us.length-1,zr=Qe?us.length:-1;Ts!=zr;Ts+=Pe,Oi+=Pe)if(Oi>=Is&&Oi<Xi&&lt.test(Ss=us.charAt(Ts))){var cr=Qs[Ss];if(cr.charAt(1)==">"==Qe)ot.push(Ss);else{if(ot.pop()!=cr.charAt(0))return{pos:Oi,match:!1};if(!ot.length)return{pos:Oi,match:!0}}}}}for(var Re=oe.line,ct=Qe?Math.min(Re+100,st.size):Math.max(-1,Re-100);Re!=ct;Re+=Pe){var ue=Bt(Re),yt=Re==oe.line,Ft=It(ue,yt&&Qe?_e+1:0,yt&&!Qe?_e:ue.text.length);if(Ft)break}Ft||(Ft={pos:null,match:!1});var Lt=Ft.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket",mt=_s({line:oe.line,ch:_e},{line:oe.line,ch:_e+1},Lt),Wt=Ft.pos!=null&&_s({line:Re,ch:Ft.pos},{line:Re,ch:Ft.pos+1},Lt),Ht=dt(function(){mt.clear(),Wt&&Wt.clear()});J?setTimeout(Ht,800):Ii=Ht}function Kr(J){for(var oe,ue,_e=J,xe=J-40;_e>xe;--_e){if(_e==0)return 0;var Qe=Bt(_e-1);if(Qe.stateAfter)return _e;var Pe=Qe.indentation(de.tabSize);(ue==null||oe>Pe)&&(ue=_e-1,oe=Pe)}return ue}function Yi(J){var oe=Kr(J),ue=oe&&Bt(oe-1).stateAfter;return ue?ue=ke(Ot,ue):ue=Me(Ot),st.iter(oe,J,function(_e){_e.process(Ot,ue,de.tabSize),_e.stateAfter=oe==J-1||oe%5==0?ke(Ot,ue):null}),ue}function Vr(){if(!(ni>=$t)){var J=+new Date+de.workTime,oe=ke(Ot,Yi(ni)),ue=ni;st.iter(ni,$t,function(_e){if(ni>=Jt?(_e.highlight(Ot,oe,de.tabSize),_e.stateAfter=ke(Ot,oe)):(_e.process(Ot,oe,de.tabSize),_e.stateAfter=ni%5==0?ke(Ot,oe):null),++ni,+new Date>J)return os(de.workDelay),!0}),$t>ue&&ni>=Jt&&dt(function(){li.push({from:ue,to:ni})})()}}function os(J){ni<$t&&Ci.set(J,Vr)}function or(){si=xi=Ei=null,li=[],Ui=!1,Ni=[]}function lr(){if(Ri&&zs(),Ji&&!de.lineWrapping){var J=ci.offsetWidth,oe=Cs(mi,mi.text.length).left;ae||(ci.style.left=oe+"px",Et.style.minWidth=oe+J+"px"),Ji=!1}var ue,_e;if(Ui){var xe=Xs();ue=Js(xe.x,xe.y,xe.x,xe.yBot)}(li.length||ue&&ue.scrollTop!=null)&&(_e=Si(li,!0,ue&&ue.scrollTop)),_e||(Ui&&ws(),gi&&vs()),ue&&xr(),Ui&&as(),Xt&&(si===!0||si!==!1&&Ui)&&es(xi),Ui&&de.matchBrackets&&setTimeout(dt(function(){Ii&&(Ii(),Ii=null),_t(He.from,He.to)&&ar(!1)}),20);var Qe=Ui,Pe=Ni;Ei&&de.onChange&&Pt&&de.onChange(Pt,Ei),Qe&&de.onCursorActivity&&de.onCursorActivity(Pt);for(var Ve=0;Ve<Pe.length;++Ve)Pe[Ve](Pt);_e&&de.onUpdate&&de.onUpdate(Pt)}var ls=0;function dt(J){return function(){ls++||or();try{var oe=J.apply(this,arguments)}finally{--ls||lr()}return oe}}function hr(J){ei.startCompound();try{return J()}finally{ei.endCompound()}}for(var hs in D)D.propertyIsEnumerable(hs)&&!Pt.propertyIsEnumerable(hs)&&(Pt[hs]=D[hs]);for(var Us=0;Us<H.length;++Us)H[Us](Pt);return Pt}g.defaults={value:"",mode:null,theme:"default",indentUnit:2,indentWithTabs:!1,smartIndent:!0,tabSize:4,keyMap:"default",extraKeys:null,electricChars:!0,autoClearEmptyLines:!1,onKeyEvent:null,onDragEvent:null,lineWrapping:!1,lineNumbers:!1,gutter:!1,fixedGutter:!1,firstLineNumber:1,showCursorWhenSelecting:!1,readOnly:!1,dragDrop:!0,onChange:null,onCursorActivity:null,onViewportChange:null,onGutterClick:null,onUpdate:null,onFocus:null,onBlur:null,onScroll:null,matchBrackets:!1,cursorBlinkRate:530,workTime:100,workDelay:200,pollInterval:100,undoDepth:40,tabindex:null,autofocus:null,lineNumberFormatter:function(se){return se}};var B=/AppleWebKit/.test(navigator.userAgent)&&/Mobile\/\w+/.test(navigator.userAgent),x=B||/Mac/.test(navigator.platform),Q=g.modes={},S=g.mimeModes={};g.defineMode=function(se,pe){if(!g.defaults.mode&&se!="null"&&(g.defaults.mode=se),arguments.length>2){pe.dependencies=[];for(var de=2;de<arguments.length;++de)pe.dependencies.push(arguments[de])}Q[se]=pe},g.defineMIME=function(se,pe){S[se]=pe},g.resolveMode=function(se){if(typeof se=="string"&&S.hasOwnProperty(se))se=S[se];else if(typeof se=="string"&&/^[\w\-]+\/[\w\-]+\+xml$/.test(se))return g.resolveMode("application/xml");return typeof se=="string"?{name:se}:se||{name:"null"}},g.getMode=function(se,de){var de=g.resolveMode(de),Ee=Q[de.name];if(!Ee)return g.getMode(se,"text/plain");var Ie=Ee(se,de);if(P.hasOwnProperty(de.name)){var be=P[de.name];for(var Le in be)be.hasOwnProperty(Le)&&(Ie.hasOwnProperty(Le)&&(Ie["_"+Le]=Ie[Le]),Ie[Le]=be[Le])}return Ie.name=de.name,Ie},g.listModes=function(){var se=[];for(var pe in Q)Q.propertyIsEnumerable(pe)&&se.push(pe);return se},g.listMIMEs=function(){var se=[];for(var pe in S)S.propertyIsEnumerable(pe)&&se.push({mime:pe,mode:S[pe]});return se};var D=g.extensions={};g.defineExtension=function(se,pe){D[se]=pe};var H=[];g.defineInitHook=function(se){H.push(se)};var P=g.modeExtensions={};g.extendMode=function(se,pe){var de=P.hasOwnProperty(se)?P[se]:P[se]={};for(var Ee in pe)pe.hasOwnProperty(Ee)&&(de[Ee]=pe[Ee])};var R=g.commands={selectAll:function(se){se.setSelection({line:0,ch:0},{line:se.lineCount()-1})},killLine:function(se){var pe=se.getCursor(!0),de=se.getCursor(!1),Ee=!_t(pe,de);!Ee&&se.getLine(pe.line).length==pe.ch?se.replaceRange("",pe,{line:pe.line+1,ch:0}):se.replaceRange("",pe,Ee?de:{line:pe.line})},deleteLine:function(se){var pe=se.getCursor().line;se.replaceRange("",{line:pe,ch:0},{line:pe})},undo:function(se){se.undo()},redo:function(se){se.redo()},goDocStart:function(se){se.setCursor(0,0,!0)},goDocEnd:function(se){se.setSelection({line:se.lineCount()-1},null,!0)},goLineStart:function(se){se.setCursor(se.getCursor().line,0,!0)},goLineStartSmart:function(se){var pe=se.getCursor(),de=se.getLine(pe.line),Ee=Math.max(0,de.search(/\S/));se.setCursor(pe.line,pe.ch<=Ee&&pe.ch?0:Ee,!0)},goLineEnd:function(se){se.setSelection({line:se.getCursor().line},null,!0)},goLineUp:function(se){se.moveV(-1,"line")},goLineDown:function(se){se.moveV(1,"line")},goPageUp:function(se){se.moveV(-1,"page")},goPageDown:function(se){se.moveV(1,"page")},goCharLeft:function(se){se.moveH(-1,"char")},goCharRight:function(se){se.moveH(1,"char")},goColumnLeft:function(se){se.moveH(-1,"column")},goColumnRight:function(se){se.moveH(1,"column")},goWordLeft:function(se){se.moveH(-1,"word")},goWordRight:function(se){se.moveH(1,"word")},delCharLeft:function(se){se.deleteH(-1,"char")},delCharRight:function(se){se.deleteH(1,"char")},delWordLeft:function(se){se.deleteH(-1,"word")},delWordRight:function(se){se.deleteH(1,"word")},indentAuto:function(se){se.indentSelection("smart")},indentMore:function(se){se.indentSelection("add")},indentLess:function(se){se.indentSelection("subtract")},insertTab:function(se){se.replaceSelection("	","end")},defaultTab:function(se){se.somethingSelected()?se.indentSelection("add"):se.replaceSelection("	","end")},transposeChars:function(se){var pe=se.getCursor(),de=se.getLine(pe.line);pe.ch>0&&pe.ch<de.length-1&&se.replaceRange(de.charAt(pe.ch)+de.charAt(pe.ch-1),{line:pe.line,ch:pe.ch-1},{line:pe.line,ch:pe.ch+1})},newlineAndIndent:function(se){se.replaceSelection(`
+`,"end"),se.indentLine(se.getCursor().line)},toggleOverwrite:function(se){se.toggleOverwrite()}},Y=g.keyMap={};Y.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharRight",Backspace:"delCharLeft",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite"},Y.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Alt-Up":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Down":"goDocEnd","Ctrl-Left":"goWordLeft","Ctrl-Right":"goWordRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delWordLeft","Ctrl-Delete":"delWordRight","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore",fallthrough:"basic"},Y.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goWordLeft","Alt-Right":"goWordRight","Cmd-Left":"goLineStart","Cmd-Right":"goLineEnd","Alt-Backspace":"delWordLeft","Ctrl-Alt-Backspace":"delWordRight","Alt-Delete":"delWordRight","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore",fallthrough:["basic","emacsy"]},Y.default=x?Y.macDefault:Y.pcDefault,Y.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharRight","Ctrl-H":"delCharLeft","Alt-D":"delWordRight","Alt-Backspace":"delWordLeft","Ctrl-K":"killLine","Ctrl-T":"transposeChars"};function G(se){return typeof se=="string"?Y[se]:se}function X(se,pe,de,Ee,Ie){function be(Le){Le=G(Le);var je=Le[se];if(je===!1)return Ie&&Ie(),!0;if(je!=null&&Ee(je))return!0;if(Le.nofallthrough)return Ie&&Ie(),!0;var nt=Le.fallthrough;if(nt==null)return!1;if(Object.prototype.toString.call(nt)!="[object Array]")return be(nt);for(var ut=0,Mt=nt.length;ut<Mt;++ut)if(be(nt[ut]))return!0;return!1}return pe&&be(pe)?!0:be(de)}function ee(se){var pe=Ut[Oe(se,"keyCode")];return pe=="Ctrl"||pe=="Alt"||pe=="Shift"||pe=="Mod"}g.isModifierKey=ee,g.fromTextArea=function(se,pe){if(pe||(pe={}),pe.value=se.value,!pe.tabindex&&se.tabindex&&(pe.tabindex=se.tabindex),pe.autofocus==null){var de=document.body;try{de=document.activeElement}catch{}pe.autofocus=de==se||se.getAttribute("autofocus")!=null&&de==document.body}function Ee(){se.value=je.getValue()}if(se.form){var Ie=De(se.form,"submit",Ee,!0),be=se.form,Le=be.submit;se.form.submit=function nt(){Ee(),be.submit=Le,be.submit(),be.submit=nt}}se.style.display="none";var je=g(function(nt){se.parentNode.insertBefore(nt,se.nextSibling)},pe);return je.save=Ee,je.getTextArea=function(){return se},je.toTextArea=function(){Ee(),se.parentNode.removeChild(je.getWrapperElement()),se.style.display="",se.form&&(Ie(),typeof se.form.submit=="function"&&(se.form.submit=Le))},je};var Ae=/gecko\/\d/i.test(navigator.userAgent),le=/MSIE \d/.test(navigator.userAgent),ae=/MSIE [1-7]\b/.test(navigator.userAgent),ge=/MSIE [1-8]\b/.test(navigator.userAgent),fe=le&&document.documentMode==5,ye=/WebKit\//.test(navigator.userAgent),me=ye&&/Qt\/\d+\.\d+/.test(navigator.userAgent),we=/Chrome\//.test(navigator.userAgent),ve=/Opera\//.test(navigator.userAgent),Ce=/Apple Computer/.test(navigator.vendor),Se=/KHTML\//.test(navigator.userAgent),We=/Mac OS X 10\D([7-9]|\d\d)\D/.test(navigator.userAgent),Ke=ve&&navigator.userAgent.match(/Version\/(\d*\.\d*)/);Ke&&(Ke=Number(Ke[1]));var Ue=x&&(me||ve&&(Ke==null||Ke<12.11));function ke(se,pe){if(pe===!0)return pe;if(se.copyState)return se.copyState(pe);var de={};for(var Ee in pe){var Ie=pe[Ee];Ie instanceof Array&&(Ie=Ie.concat([])),de[Ee]=Ie}return de}g.copyState=ke;function Me(se,pe,de){return se.startState?se.startState(pe,de):!0}g.startState=Me,g.innerMode=function(se,pe){for(;se.innerMode;){var de=se.innerMode(pe);pe=de.state,se=de.mode}return de||{mode:se,state:pe}};function ze(se,pe){this.pos=this.start=0,this.string=se,this.tabSize=pe||8}ze.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==0},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(se){var pe=this.string.charAt(this.pos);if(typeof se=="string")var de=pe==se;else var de=pe&&(se.test?se.test(pe):se(pe));if(de)return++this.pos,pe},eatWhile:function(se){for(var pe=this.pos;this.eat(se););return this.pos>pe},eatSpace:function(){for(var se=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>se},skipToEnd:function(){this.pos=this.string.length},skipTo:function(se){var pe=this.string.indexOf(se,this.pos);if(pe>-1)return this.pos=pe,!0},backUp:function(se){this.pos-=se},column:function(){return rt(this.string,this.start,this.tabSize)},indentation:function(){return rt(this.string,null,this.tabSize)},match:function(se,pe,de){if(typeof se=="string"){var Ee=function(be){return de?be.toLowerCase():be};if(Ee(this.string).indexOf(Ee(se),this.pos)==this.pos)return pe!==!1&&(this.pos+=se.length),!0}else{var Ie=this.string.slice(this.pos).match(se);return Ie&&Ie.index>0?null:(Ie&&pe!==!1&&(this.pos+=Ie[0].length),Ie)}},current:function(){return this.string.slice(this.start,this.pos)}},g.StringStream=ze;function Je(se,pe){if(se)for(var de=0;de<se.length;++de){var Ee=se[de];if(Ee.marker==pe)return Ee}}function ft(se,pe){for(var de,Ee=0;Ee<se.length;++Ee)se[Ee]!=pe&&(de||(de=[])).push(se[Ee]);return de}function at(se,pe,de){if(se)for(var Ee=0,Ie;Ee<se.length;++Ee){var be=se[Ee],Le=be.marker,je=be.from==null||(Le.inclusiveLeft?be.from<=pe:be.from<pe);if(je||Le.type=="bookmark"&&be.from==pe&&be.from!=de){var nt=be.to==null||(Le.inclusiveRight?be.to>=pe:be.to>pe);(Ie||(Ie=[])).push({from:be.from,to:nt?null:be.to,marker:Le})}}return Ie}function ht(se,pe){if(se)for(var de=0,Ee;de<se.length;++de){var Ie=se[de],be=Ie.marker,Le=Ie.to==null||(be.inclusiveRight?Ie.to>=pe:Ie.to>pe);if(Le||be.type=="bookmark"&&Ie.from==pe){var je=Ie.from==null||(be.inclusiveLeft?Ie.from<=pe:Ie.from<pe);(Ee||(Ee=[])).push({from:je?null:Ie.from-pe,to:Ie.to==null?null:Ie.to-pe,marker:be})}}return Ee}function vt(se,pe,de,Ee,Ie){if(!se&&!pe)return Ie;var be=at(se,de),Le=ht(pe,Ee),je=Ie.length==1,nt=xt(Ie).length+(je?de:0);if(be)for(var ut=0;ut<be.length;++ut){var Mt=be[ut];if(Mt.to==null){var Dt=Je(Le,Mt.marker);Dt?je&&(Mt.to=Dt.to==null?null:Dt.to+nt):Mt.to=de}}if(Le)for(var ut=0;ut<Le.length;++ut){var Mt=Le[ut];if(Mt.to!=null&&(Mt.to+=nt),Mt.from==null){var Dt=Je(be,Mt.marker);Dt||(Mt.from=nt,je&&(be||(be=[])).push(Mt))}else Mt.from+=nt,je&&(be||(be=[])).push(Mt)}var ci=[w(Ie[0],be)];if(!je){var ti=Ie.length-2,Et;if(ti>0&&be)for(var ut=0;ut<be.length;++ut)be[ut].to==null&&(Et||(Et=[])).push({from:null,to:null,marker:be[ut].marker});for(var ut=0;ut<ti;++ut)ci.push(w(Ie[ut+1],Et));ci.push(w(xt(Ie),Le))}return ci}function tt(se){return typeof se=="string"?se:se.text}function d(se){if(typeof se=="string")return null;for(var pe=se.markedSpans,de=null,Ee=0;Ee<pe.length;++Ee)pe[Ee].marker.explicitlyCleared?de||(de=pe.slice(0,Ee)):de&&de.push(pe[Ee]);return de?de.length?de:null:pe}function w(se,pe){return pe?{text:se,markedSpans:pe}:se}function C(se){var pe=se.markedSpans;if(pe){for(var de=0;de<pe.length;++de){var Ee=pe[de].marker.lines,Ie=St(Ee,se);Ee.splice(Ie,1)}se.markedSpans=null}}function b(se,pe){if(pe){for(var de=0;de<pe.length;++de)var Ee=pe[de].marker.lines.push(se);se.markedSpans=pe}}var I=" ";Ae||le&&!ae?I="​":ve&&(I="");function k(se,pe){this.text=se,this.height=1,b(this,pe)}k.prototype={update:function(se,pe){this.text=se,this.stateAfter=this.styles=null,C(this),b(this,pe)},highlight:function(se,pe,de){var Ee=new ze(this.text,de),Ie=this.styles||(this.styles=[]),be=Ie.length=0;for(this.text==""&&se.blankLine&&se.blankLine(pe);!Ee.eol();){var Le=se.token(Ee,pe),je=Ee.current();if(Ee.start=Ee.pos,be&&Ie[be-1]==Le?Ie[be-2]+=je:je&&(Ie[be++]=je,Ie[be++]=Le),Ee.pos>5e3){Ie[be++]=this.text.slice(Ee.pos),Ie[be++]=null;break}}},process:function(se,pe,de){var Ee=new ze(this.text,de);for(this.text==""&&se.blankLine&&se.blankLine(pe);!Ee.eol()&&Ee.pos<=5e3;)se.token(Ee,pe),Ee.start=Ee.pos},getTokenAt:function(se,pe,de,Ee){for(var Ie=this.text,be=new ze(Ie,de);be.pos<Ee&&!be.eol();){be.start=be.pos;var Le=se.token(be,pe)}return{start:be.start,end:be.pos,string:be.current(),className:Le||null,state:pe}},indentation:function(se){return rt(this.text,null,se)},getContent:function(se,pe,de){var Ee=!0,Ie=0,be=/[\t\u0000-\u0019\u200b\u2028\u2029\uFEFF]/g,Le=At("pre");function je(Vt,Nt,Zt){if(Nt){if(Ee&&le&&Nt.charAt(0)==" "&&(Nt=" "+Nt.slice(1)),Ee=!1,be.test(Nt))for(var Yt=document.createDocumentFragment(),Rt=0;;){be.lastIndex=Rt;var si=be.exec(Nt),xi=si?si.index-Rt:Nt.length-Rt;if(xi&&(Yt.appendChild(document.createTextNode(Nt.slice(Rt,Rt+xi))),Ie+=xi),!si)break;if(Rt+=xi+1,si[0]=="	"){var li=se-Ie%se;Yt.appendChild(At("span",Qt(li),"cm-tab")),Ie+=li}else{var Ei=At("span","•","cm-invalidchar");Ei.title="\\u"+si[0].charCodeAt(0).toString(16),Yt.appendChild(Ei),Ie+=1}}else{Ie+=Nt.length;var Yt=document.createTextNode(Nt)}Zt?Vt.appendChild(At("span",[Yt],Zt)):Vt.appendChild(Yt)}}var nt=je;if(pe!=null){var ut=0,Mt=Le.anchor=At("span");nt=function(Vt,Nt,Zt){var Yt=Nt.length;if(pe>=ut&&pe<ut+Yt){var Rt=pe-ut;if(Rt&&(je(Vt,Nt.slice(0,Rt),Zt),de)){var si=Nt.slice(Rt-1,Rt+1);Xe.test(si)?Vt.appendChild(At("wbr")):!ae&&/\w\w/.test(si)&&Vt.appendChild(document.createTextNode("‍"))}Vt.appendChild(Mt),je(Mt,ve?Nt.slice(Rt,Rt+1):Nt.slice(Rt),Zt),ve&&je(Vt,Nt.slice(Rt+1),Zt),pe--,ut+=Yt}else ut+=Yt,je(Vt,Nt,Zt),ut==pe&&ut==Et?(kt(Mt,I),Vt.appendChild(Mt)):ut>pe+10&&/\s/.test(Nt)&&(nt=function(){})}}var Dt=this.styles,ci=this.text,ti=this.markedSpans,Et=ci.length;function _i(Vt){return Vt?"cm-"+Vt.replace(/ +/g," cm-"):null}if(!ci&&pe==null)nt(Le," ");else if(!ti||!ti.length)for(var Gt=0,yi=0;yi<Et;Gt+=2){var ri=Dt[Gt],it=Dt[Gt+1],ii=ri.length;yi+ii>Et&&(ri=ri.slice(0,Et-yi)),yi+=ii,nt(Le,ri,_i(it))}else{ti.sort(function(Zt,Yt){return Zt.from-Yt.from});for(var Ai=0,Gt=0,Ci="",it,bi=ti[0].from||0,Ot=[],st=0,ni=function(){for(var Zt;st<ti.length&&((Zt=ti[st]).from==Ai||Zt.from==null);)Zt.marker.type=="range"&&Ot.push(Zt),++st;bi=st<ti.length?ti[st].from:1/0;for(var Yt=0;Yt<Ot.length;++Yt){var Rt=Ot[Yt].to;Rt==null&&(Rt=1/0),Rt==Ai?Ot.splice(Yt--,1):bi=Math.min(Rt,bi)}};Ai<Et;){bi==Ai&&ni();for(var Xt=Math.min(Et,bi);;){if(Ci){for(var He=Ai+Ci.length,jt=it,Qi=0;Qi<Ot.length;++Qi){var oi=Ot[Qi];jt=(jt?jt+" ":"")+oi.marker.style,oi.marker.endStyle&&oi.to===Math.min(He,Xt)&&(jt+=" "+oi.marker.endStyle),oi.marker.startStyle&&oi.from===Ai&&(jt+=" "+oi.marker.startStyle)}if(nt(Le,He>Xt?Ci.slice(0,Xt-Ai):Ci,jt),He>=Xt){Ci=Ci.slice(Xt-Ai),Ai=Xt;break}Ai=He}Ci=Dt[Gt++],it=_i(Dt[Gt++])}}}return Le},cleanUp:function(){this.parent=null,C(this)}};function M(se){this.lines=se,this.parent=null;for(var pe=0,de=se.length,Ee=0;pe<de;++pe)se[pe].parent=this,Ee+=se[pe].height;this.height=Ee}M.prototype={chunkSize:function(){return this.lines.length},remove:function(se,pe,de){for(var Ee=se,Ie=se+pe;Ee<Ie;++Ee){var be=this.lines[Ee];if(this.height-=be.height,be.cleanUp(),be.handlers)for(var Le=0;Le<be.handlers.length;++Le)de.push(be.handlers[Le])}this.lines.splice(se,pe)},collapse:function(se){se.splice.apply(se,[se.length,0].concat(this.lines))},insertHeight:function(se,pe,de){this.height+=de,this.lines=this.lines.slice(0,se).concat(pe).concat(this.lines.slice(se));for(var Ee=0,Ie=pe.length;Ee<Ie;++Ee)pe[Ee].parent=this},iterN:function(se,pe,de){for(var Ee=se+pe;se<Ee;++se)if(de(this.lines[se]))return!0}};function K(se){this.children=se;for(var pe=0,de=0,Ee=0,Ie=se.length;Ee<Ie;++Ee){var be=se[Ee];pe+=be.chunkSize(),de+=be.height,be.parent=this}this.size=pe,this.height=de,this.parent=null}K.prototype={chunkSize:function(){return this.size},remove:function(se,pe,de){this.size-=pe;for(var Ee=0;Ee<this.children.length;++Ee){var Ie=this.children[Ee],be=Ie.chunkSize();if(se<be){var Le=Math.min(pe,be-se),je=Ie.height;if(Ie.remove(se,Le,de),this.height-=je-Ie.height,be==Le&&(this.children.splice(Ee--,1),Ie.parent=null),(pe-=Le)==0)break;se=0}else se-=be}if(this.size-pe<25){var nt=[];this.collapse(nt),this.children=[new M(nt)],this.children[0].parent=this}},collapse:function(se){for(var pe=0,de=this.children.length;pe<de;++pe)this.children[pe].collapse(se)},insert:function(se,pe){for(var de=0,Ee=0,Ie=pe.length;Ee<Ie;++Ee)de+=pe[Ee].height;this.insertHeight(se,pe,de)},insertHeight:function(se,pe,de){this.size+=pe.length,this.height+=de;for(var Ee=0,Ie=this.children.length;Ee<Ie;++Ee){var be=this.children[Ee],Le=be.chunkSize();if(se<=Le){if(be.insertHeight(se,pe,de),be.lines&&be.lines.length>50){for(;be.lines.length>50;){var je=be.lines.splice(be.lines.length-25,25),nt=new M(je);be.height-=nt.height,this.children.splice(Ee+1,0,nt),nt.parent=this}this.maybeSpill()}break}se-=Le}},maybeSpill:function(){if(!(this.children.length<=10)){var se=this;do{var pe=se.children.splice(se.children.length-5,5),de=new K(pe);if(se.parent){se.size-=de.size,se.height-=de.height;var Ie=St(se.parent.children,se);se.parent.children.splice(Ie+1,0,de)}else{var Ee=new K(se.children);Ee.parent=se,se.children=[Ee,de],se=Ee}de.parent=se.parent}while(se.children.length>10);se.parent.maybeSpill()}},iter:function(se,pe,de){this.iterN(se,pe-se,de)},iterN:function(se,pe,de){for(var Ee=0,Ie=this.children.length;Ee<Ie;++Ee){var be=this.children[Ee],Le=be.chunkSize();if(se<Le){var je=Math.min(pe,Le-se);if(be.iterN(se,je,de))return!0;if((pe-=je)==0)break;se=0}else se-=Le}}};function W(se,pe){for(;!se.lines;)for(var de=0;;++de){var Ee=se.children[de],Ie=Ee.chunkSize();if(pe<Ie){se=Ee;break}pe-=Ie}return se.lines[pe]}function q(se){if(se.parent==null)return null;for(var pe=se.parent,de=St(pe.lines,se),Ee=pe.parent;Ee;pe=Ee,Ee=Ee.parent)for(var Ie=0;Ee.children[Ie]!=pe;++Ie)de+=Ee.children[Ie].chunkSize();return de}function te(se,pe){var de=0;e:do{for(var Ee=0,Ie=se.children.length;Ee<Ie;++Ee){var be=se.children[Ee],Le=be.height;if(pe<Le){se=be;continue e}pe-=Le,de+=be.chunkSize()}return de}while(!se.lines);for(var Ee=0,Ie=se.lines.length;Ee<Ie;++Ee){var je=se.lines[Ee],nt=je.height;if(pe<nt)break;pe-=nt}return de+Ee}function he(se,pe){var de=0;e:do{for(var Ee=0,Ie=se.children.length;Ee<Ie;++Ee){var be=se.children[Ee],Le=be.chunkSize();if(pe<Le){se=be;continue e}pe-=Le,de+=be.height}return de}while(!se.lines);for(var Ee=0;Ee<pe;++Ee)de+=se.lines[Ee].height;return de}function ne(){this.time=0,this.done=[],this.undone=[],this.compound=0,this.closed=!1}ne.prototype={addChange:function(se,pe,de){this.undone.length=0;var Ee=+new Date,Ie=xt(this.done),be=Ie&&xt(Ie),Le=Ee-this.time;if(Ie&&!this.closed&&this.compound)Ie.push({start:se,added:pe,old:de});else if(Le>400||!be||this.closed||be.start>se+de.length||be.start+be.added<se)this.done.push([{start:se,added:pe,old:de}]),this.closed=!1;else{for(var je=Math.max(0,be.start-se),nt=Math.max(0,se+de.length-(be.start+be.added)),ut=je;ut>0;--ut)be.old.unshift(de[ut-1]);for(var ut=nt;ut>0;--ut)be.old.push(de[de.length-ut]);je&&(be.start=se),be.added+=pe-(de.length-je-nt)}this.time=Ee},startCompound:function(){this.compound++||(this.closed=!0)},endCompound:function(){--this.compound||(this.closed=!0)}};function ie(){Fe(this)}function re(se){return se.stop||(se.stop=ie),se}function ce(se){se.preventDefault?se.preventDefault():se.returnValue=!1}function Be(se){se.stopPropagation?se.stopPropagation():se.cancelBubble=!0}function Fe(se){ce(se),Be(se)}g.e_stop=Fe,g.e_preventDefault=ce,g.e_stopPropagation=Be;function Te(se){return se.target||se.srcElement}function Ne(se){var pe=se.which;return pe==null&&(se.button&1?pe=1:se.button&2?pe=3:se.button&4&&(pe=2)),x&&se.ctrlKey&&pe==1&&(pe=3),pe}function Oe(se,pe){var de=se.override&&se.override.hasOwnProperty(pe);return de?se.override[pe]:se[pe]}function De(se,pe,de,Ee){if(typeof se.addEventListener=="function"){if(se.addEventListener(pe,de,!1),Ee)return function(){se.removeEventListener(pe,de,!1)}}else{var Ie=function(be){de(be||window.event)};if(se.attachEvent("on"+pe,Ie),Ee)return function(){se.detachEvent("on"+pe,Ie)}}}g.connect=De;function et(){this.id=null}et.prototype={set:function(se,pe){clearTimeout(this.id),this.id=setTimeout(pe,se)}};var Ye=g.Pass={toString:function(){return"CodeMirror.Pass"}},qe=function(){if(ge)return!1;var se=At("div");return"draggable"in se||"dragDrop"in se}();(function(){var se=At("textarea");return se.value=`foo
+bar`,se.value.indexOf("\r")>-1?`\r
+`:`
+`})();var Xe=/^$/;Ae?Xe=/$'/:Ce?Xe=/\-[^ \-?]|\?[^ !'\"\),.\-\/:;\?\]\}]/:we&&(Xe=/\-[^ \-\.?]|\?[^ \-\.?\]\}:;!'\"\),\/]|[\.!\"#&%\)*+,:;=>\]|\}~][\(\{\[<]|\$'/);function rt(se,pe,de){pe==null&&(pe=se.search(/[^\s\u00a0]/),pe==-1&&(pe=se.length));for(var Ee=0,Ie=0;Ee<pe;++Ee)se.charAt(Ee)=="	"?Ie+=de-Ie%de:++Ie;return Ie}function $e(se,pe){try{var de=se.getBoundingClientRect();de={top:de.top,left:de.left}}catch{de={top:0,left:0}}if(!pe)if(window.pageYOffset==null){var Ee=document.documentElement||document.body.parentNode;Ee.scrollTop==null&&(Ee=document.body),de.top+=Ee.scrollTop,de.left+=Ee.scrollLeft}else de.top+=window.pageYOffset,de.left+=window.pageXOffset;return de}function pt(se){return se.textContent||se.innerText||se.nodeValue||""}var gt=[""];function Qt(se){for(;gt.length<=se;)gt.push(xt(gt)+" ");return gt[se]}function xt(se){return se[se.length-1]}function qt(se){B?(se.selectionStart=0,se.selectionEnd=se.value.length):se.select()}function _t(se,pe){return se.line==pe.line&&se.ch==pe.ch}function Ge(se,pe){return se.line<pe.line||se.line==pe.line&&se.ch<pe.ch}function Kt(se){return{line:se.line,ch:se.ch}}function At(se,pe,de,Ee){var Ie=document.createElement(se);if(de&&(Ie.className=de),Ee&&(Ie.style.cssText=Ee),typeof pe=="string")kt(Ie,pe);else if(pe)for(var be=0;be<pe.length;++be)Ie.appendChild(pe[be]);return Ie}function Ct(se){return se.innerHTML="",se}function bt(se,pe){Ct(se).appendChild(pe)}function kt(se,pe){ge?(se.innerHTML="",se.appendChild(document.createTextNode(pe))):se.textContent=pe}function zt(se,pe){if(!pe)return 0;if(!se)return pe.length;for(var de=se.length,Ee=pe.length;de>=0&&Ee>=0&&se.charAt(de)==pe.charAt(Ee);--de,--Ee);return Ee+1}function St(se,pe){if(se.indexOf)return se.indexOf(pe);for(var de=0,Ee=se.length;de<Ee;++de)if(se[de]==pe)return de;return-1}var wt=/[\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc]/;function Fi(se){return/\w/.test(se)||se>"€"&&(se.toUpperCase()!=se.toLowerCase()||wt.test(se))}var pi=`
+
+b`.split(/\n/).length!=3?function(se){for(var pe=0,de=[],Ee=se.length;pe<=Ee;){var Ie=se.indexOf(`
+`,pe);Ie==-1&&(Ie=se.length);var be=se.slice(pe,se.charAt(Ie-1)=="\r"?Ie-1:Ie),Le=be.indexOf("\r");Le!=-1?(de.push(be.slice(0,Le)),pe+=Le+1):(de.push(be),pe=Ie+1)}return de}:function(se){return se.split(/\r\n?|\n/)};g.splitLines=pi;var Bi=window.getSelection?function(se){try{return se.selectionStart!=se.selectionEnd}catch{return!1}}:function(se){try{var pe=se.ownerDocument.selection.createRange()}catch{}return!pe||pe.parentElement()!=se?!1:pe.compareEndPoints("StartToEnd",pe)!=0};g.defineMode("null",function(){return{token:function(se){se.skipToEnd()}}}),g.defineMIME("text/plain","null");var Ut={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",91:"Mod",92:"Mod",93:"Mod",109:"-",107:"=",127:"Delete",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63276:"PageUp",63277:"PageDown",63275:"End",63273:"Home",63234:"Left",63232:"Up",63235:"Right",63233:"Down",63302:"Insert",63272:"Delete"};return g.keyNames=Ut,function(){for(var se=0;se<10;se++)Ut[se+48]=String(se);for(var se=65;se<=90;se++)Ut[se]=String.fromCharCode(se);for(var se=1;se<=12;se++)Ut[se+111]=Ut[se+63235]="F"+se}(),g.version="2.38",g}();CodeMirror.defineMode("javascript",function(g,B){var x=g.indentUnit,Q=B.json,S=B.typescript,D=function(){function ne(et){return{type:et,style:"keyword"}}var ie=ne("keyword a"),re=ne("keyword b"),ce=ne("keyword c"),Be=ne("operator"),Fe={type:"atom",style:"atom"},Te={if:ie,while:ie,with:ie,else:re,do:re,try:re,finally:re,return:ce,break:ce,continue:ce,new:ce,delete:ce,throw:ce,var:ne("var"),const:ne("var"),let:ne("var"),function:ne("function"),catch:ne("catch"),for:ne("for"),switch:ne("switch"),case:ne("case"),default:ne("default"),in:Be,typeof:Be,instanceof:Be,true:Fe,false:Fe,null:Fe,undefined:Fe,NaN:Fe,Infinity:Fe};if(S){var Ne={type:"variable",style:"variable-3"},Oe={interface:ne("interface"),class:ne("class"),extends:ne("extends"),constructor:ne("constructor"),public:ne("public"),private:ne("private"),protected:ne("protected"),static:ne("static"),super:ne("super"),string:Ne,number:Ne,bool:Ne,any:Ne};for(var De in Oe)Te[De]=Oe[De]}return Te}(),H=/[+\-*&%=<>!?|]/;function P(ne,ie,re){return ie.tokenize=re,re(ne,ie)}function R(ne,ie){for(var re=!1,ce;(ce=ne.next())!=null;){if(ce==ie&&!re)return!1;re=!re&&ce=="\\"}return re}var Y,G;function X(ne,ie,re){return Y=ne,G=re,ie}function ee(ne,ie){var re=ne.next();if(re=='"'||re=="'")return P(ne,ie,Ae(re));if(/[\[\]{}\(\),;\:\.]/.test(re))return X(re);if(re=="0"&&ne.eat(/x/i))return ne.eatWhile(/[\da-f]/i),X("number","number");if(/\d/.test(re)||re=="-"&&ne.eat(/\d/))return ne.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),X("number","number");if(re=="/")return ne.eat("*")?P(ne,ie,le):ne.eat("/")?(ne.skipToEnd(),X("comment","comment")):ie.lastType=="operator"||ie.lastType=="keyword c"||/^[\[{}\(,;:]$/.test(ie.lastType)?(R(ne,"/"),ne.eatWhile(/[gimy]/),X("regexp","string-2")):(ne.eatWhile(H),X("operator",null,ne.current()));if(re=="#")return ne.skipToEnd(),X("error","error");if(H.test(re))return ne.eatWhile(H),X("operator",null,ne.current());ne.eatWhile(/[\w\$_]/);var ce=ne.current(),Be=D.propertyIsEnumerable(ce)&&D[ce];return Be&&ie.lastType!="."?X(Be.type,Be.style,ce):X("variable","variable",ce)}function Ae(ne){return function(ie,re){return R(ie,ne)||(re.tokenize=ee),X("string","string")}}function le(ne,ie){for(var re=!1,ce;ce=ne.next();){if(ce=="/"&&re){ie.tokenize=ee;break}re=ce=="*"}return X("comment","comment")}var ae={atom:!0,number:!0,variable:!0,string:!0,regexp:!0};function ge(ne,ie,re,ce,Be,Fe){this.indented=ne,this.column=ie,this.type=re,this.prev=Be,this.info=Fe,ce!=null&&(this.align=ce)}function fe(ne,ie){for(var re=ne.localVars;re;re=re.next)if(re.name==ie)return!0}function ye(ne,ie,re,ce,Be){var Fe=ne.cc;for(me.state=ne,me.stream=Be,me.marked=null,me.cc=Fe,ne.lexical.hasOwnProperty("align")||(ne.lexical.align=!0);;){var Te=Fe.length?Fe.pop():Q?Je:ze;if(Te(re,ce)){for(;Fe.length&&Fe[Fe.length-1].lex;)Fe.pop()();return me.marked?me.marked:re=="variable"&&fe(ne,ce)?"variable-2":ie}}}var me={state:null,column:null,marked:null,cc:null};function we(){for(var ne=arguments.length-1;ne>=0;ne--)me.cc.push(arguments[ne])}function ve(){return we.apply(null,arguments),!0}function Ce(ne){function ie(ce){for(var Be=ce;Be;Be=Be.next)if(Be.name==ne)return!0;return!1}var re=me.state;if(re.context){if(me.marked="def",ie(re.localVars))return;re.localVars={name:ne,next:re.localVars}}else{if(ie(re.globalVars))return;re.globalVars={name:ne,next:re.globalVars}}}var Se={name:"this",next:{name:"arguments"}};function We(){me.state.context={prev:me.state.context,vars:me.state.localVars},me.state.localVars=Se}function Ke(){me.state.localVars=me.state.context.vars,me.state.context=me.state.context.prev}function Ue(ne,ie){var re=function(){var ce=me.state;ce.lexical=new ge(ce.indented,me.stream.column(),ne,null,ce.lexical,ie)};return re.lex=!0,re}function ke(){var ne=me.state;ne.lexical.prev&&(ne.lexical.type==")"&&(ne.indented=ne.lexical.indented),ne.lexical=ne.lexical.prev)}ke.lex=!0;function Me(ne){return function(re){return re==ne?ve():ne==";"?we():ve(arguments.callee)}}function ze(ne){return ne=="var"?ve(Ue("vardef"),I,Me(";"),ke):ne=="keyword a"?ve(Ue("form"),Je,ze,ke):ne=="keyword b"?ve(Ue("form"),ze,ke):ne=="{"?ve(Ue("}"),w,ke):ne==";"?ve():ne=="function"?ve(te):ne=="for"?ve(Ue("form"),Me("("),Ue(")"),M,Me(")"),ke,ze,ke):ne=="variable"?ve(Ue("stat"),ht):ne=="switch"?ve(Ue("form"),Je,Ue("}","switch"),Me("{"),w,ke,ke):ne=="case"?ve(Je,Me(":")):ne=="default"?ve(Me(":")):ne=="catch"?ve(Ue("form"),We,Me("("),he,Me(")"),ze,ke,Ke):we(Ue("stat"),Je,Me(";"),ke)}function Je(ne){return ae.hasOwnProperty(ne)?ve(at):ne=="function"?ve(te):ne=="keyword c"?ve(ft):ne=="("?ve(Ue(")"),ft,Me(")"),ke,at):ne=="operator"?ve(Je):ne=="["?ve(Ue("]"),d(Je,"]"),ke,at):ne=="{"?ve(Ue("}"),d(tt,"}"),ke,at):ve()}function ft(ne){return ne.match(/[;\}\)\],]/)?we():we(Je)}function at(ne,ie){if(ne=="operator"&&/\+\+|--/.test(ie))return ve(at);if(ne=="operator"&&ie=="?")return ve(Je,Me(":"),Je);if(ne!=";"){if(ne=="(")return ve(Ue(")"),d(Je,")"),ke,at);if(ne==".")return ve(vt,at);if(ne=="[")return ve(Ue("]"),Je,Me("]"),ke,at)}}function ht(ne){return ne==":"?ve(ke,ze):we(at,Me(";"),ke)}function vt(ne){if(ne=="variable")return me.marked="property",ve()}function tt(ne){if(ne=="variable"&&(me.marked="property"),ae.hasOwnProperty(ne))return ve(Me(":"),Je)}function d(ne,ie){function re(ce){return ce==","?ve(ne,re):ce==ie?ve():ve(Me(ie))}return function(Be){return Be==ie?ve():we(ne,re)}}function w(ne){return ne=="}"?ve():we(ze,w)}function C(ne){return ne==":"?ve(b):we()}function b(ne){return ne=="variable"?(me.marked="variable-3",ve()):we()}function I(ne,ie){return ne=="variable"?(Ce(ie),S?ve(C,k):ve(k)):we()}function k(ne,ie){if(ie=="=")return ve(Je,k);if(ne==",")return ve(I)}function M(ne){return ne=="var"?ve(I,Me(";"),W):ne==";"?ve(W):ne=="variable"?ve(K):ve(W)}function K(ne,ie){return ie=="in"?ve(Je):ve(at,W)}function W(ne,ie){return ne==";"?ve(q):ie=="in"?ve(Je):ve(Je,Me(";"),q)}function q(ne){ne!=")"&&ve(Je)}function te(ne,ie){if(ne=="variable")return Ce(ie),ve(te);if(ne=="(")return ve(Ue(")"),We,d(he,")"),ke,ze,Ke)}function he(ne,ie){if(ne=="variable")return Ce(ie),S?ve(C):ve()}return{startState:function(ne){return{tokenize:ee,lastType:null,cc:[],lexical:new ge((ne||0)-x,0,"block",!1),localVars:B.localVars,globalVars:B.globalVars,context:B.localVars&&{vars:B.localVars},indented:0}},token:function(ne,ie){if(ne.sol()&&(ie.lexical.hasOwnProperty("align")||(ie.lexical.align=!1),ie.indented=ne.indentation()),ne.eatSpace())return null;var re=ie.tokenize(ne,ie);return Y=="comment"?re:(ie.lastType=Y,ye(ie,re,Y,G,ne))},indent:function(ne,ie){if(ne.tokenize==le)return CodeMirror.Pass;if(ne.tokenize!=ee)return 0;var re=ie&&ie.charAt(0),ce=ne.lexical;ce.type=="stat"&&re=="}"&&(ce=ce.prev);var Be=ce.type,Fe=re==Be;return Be=="vardef"?ce.indented+(ne.lastType=="operator"||ne.lastType==","?4:0):Be=="form"&&re=="{"?ce.indented:Be=="form"?ce.indented+x:Be=="stat"?ce.indented+(ne.lastType=="operator"||ne.lastType==","?x:0):ce.info=="switch"&&!Fe?ce.indented+(/^(?:case|default)\b/.test(ie)?x:2*x):ce.align?ce.column+(Fe?0:1):ce.indented+(Fe?0:x)},electricChars:":{}",jsonMode:Q}});CodeMirror.defineMIME("text/javascript","javascript");CodeMirror.defineMIME("text/ecmascript","javascript");CodeMirror.defineMIME("application/javascript","javascript");CodeMirror.defineMIME("application/ecmascript","javascript");CodeMirror.defineMIME("application/json",{name:"javascript",json:!0});CodeMirror.defineMIME("text/typescript",{name:"javascript",typescript:!0});CodeMirror.defineMIME("application/typescript",{name:"javascript",typescript:!0});CodeMirror.defineMode("xml",function(g,B){var x=g.indentUnit,Q=B.htmlMode?{autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0}:{autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1},S=B.alignCDATA,D,H;function P(Ue,ke){function Me(ht){return ke.tokenize=ht,ht(Ue,ke)}var ze=Ue.next();if(ze=="<"){if(Ue.eat("!"))return Ue.eat("[")?Ue.match("CDATA[")?Me(G("atom","]]>")):null:Ue.match("--")?Me(G("comment","-->")):Ue.match("DOCTYPE",!0,!0)?(Ue.eatWhile(/[\w\._\-]/),Me(X(1))):null;if(Ue.eat("?"))return Ue.eatWhile(/[\w\._\-]/),ke.tokenize=G("meta","?>"),"meta";var Je=Ue.eat("/");D="";for(var ft;ft=Ue.eat(/[^\s\u00a0=<>\"\'\/?]/);)D+=ft;return D?(H=Je?"closeTag":"openTag",ke.tokenize=R,"tag"):"error"}else if(ze=="&"){var at;return Ue.eat("#")?Ue.eat("x")?at=Ue.eatWhile(/[a-fA-F\d]/)&&Ue.eat(";"):at=Ue.eatWhile(/[\d]/)&&Ue.eat(";"):at=Ue.eatWhile(/[\w\.\-:]/)&&Ue.eat(";"),at?"atom":"error"}else return Ue.eatWhile(/[^&<]/),null}function R(Ue,ke){var Me=Ue.next();return Me==">"||Me=="/"&&Ue.eat(">")?(ke.tokenize=P,H=Me==">"?"endTag":"selfcloseTag","tag"):Me=="="?(H="equals",null):/[\'\"]/.test(Me)?(ke.tokenize=Y(Me),ke.tokenize(Ue,ke)):(Ue.eatWhile(/[^\s\u00a0=<>\"\']/),"word")}function Y(Ue){return function(ke,Me){for(;!ke.eol();)if(ke.next()==Ue){Me.tokenize=R;break}return"string"}}function G(Ue,ke){return function(Me,ze){for(;!Me.eol();){if(Me.match(ke)){ze.tokenize=P;break}Me.next()}return Ue}}function X(Ue){return function(ke,Me){for(var ze;(ze=ke.next())!=null;){if(ze=="<")return Me.tokenize=X(Ue+1),Me.tokenize(ke,Me);if(ze==">")if(Ue==1){Me.tokenize=P;break}else return Me.tokenize=X(Ue-1),Me.tokenize(ke,Me)}return"meta"}}var ee,Ae;function le(){for(var Ue=arguments.length-1;Ue>=0;Ue--)ee.cc.push(arguments[Ue])}function ae(){return le.apply(null,arguments),!0}function ge(Ue,ke){var Me=Q.doNotIndent.hasOwnProperty(Ue)||ee.context&&ee.context.noIndent;ee.context={prev:ee.context,tagName:Ue,indent:ee.indented,startOfLine:ke,noIndent:Me}}function fe(){ee.context&&(ee.context=ee.context.prev)}function ye(Ue){if(Ue=="openTag")return ee.tagName=D,ae(Ce,me(ee.startOfLine));if(Ue=="closeTag"){var ke=!1;return ee.context?ee.context.tagName!=D&&(Q.implicitlyClosed.hasOwnProperty(ee.context.tagName.toLowerCase())&&fe(),ke=!ee.context||ee.context.tagName!=D):ke=!0,ke&&(Ae="error"),ae(we(ke))}return ae()}function me(Ue){return function(ke){return ke=="selfcloseTag"||ke=="endTag"&&Q.autoSelfClosers.hasOwnProperty(ee.tagName.toLowerCase())?(ve(ee.tagName.toLowerCase()),ae()):(ke=="endTag"&&(ve(ee.tagName.toLowerCase()),ge(ee.tagName,Ue)),ae())}}function we(Ue){return function(ke){return Ue&&(Ae="error"),ke=="endTag"?(fe(),ae()):(Ae="error",ae(arguments.callee))}}function ve(Ue){for(var ke;;){if(!ee.context||(ke=ee.context.tagName.toLowerCase(),!Q.contextGrabbers.hasOwnProperty(ke)||!Q.contextGrabbers[ke].hasOwnProperty(Ue)))return;fe()}}function Ce(Ue){return Ue=="word"?(Ae="attribute",ae(Se,Ce)):Ue=="endTag"||Ue=="selfcloseTag"?le():(Ae="error",ae(Ce))}function Se(Ue){return Ue=="equals"?ae(We,Ce):(Q.allowMissing?Ue=="word"&&(Ae="attribute"):Ae="error",Ue=="endTag"||Ue=="selfcloseTag"?le():ae())}function We(Ue){return Ue=="string"?ae(Ke):Ue=="word"&&Q.allowUnquoted?(Ae="string",ae()):(Ae="error",Ue=="endTag"||Ue=="selfCloseTag"?le():ae())}function Ke(Ue){return Ue=="string"?ae(Ke):le()}return{startState:function(){return{tokenize:P,cc:[],indented:0,startOfLine:!0,tagName:null,context:null}},token:function(Ue,ke){if(Ue.sol()&&(ke.startOfLine=!0,ke.indented=Ue.indentation()),Ue.eatSpace())return null;Ae=H=D=null;var Me=ke.tokenize(Ue,ke);if(ke.type=H,(Me||H)&&Me!="comment")for(ee=ke;;){var ze=ke.cc.pop()||ye;if(ze(H||Me))break}return ke.startOfLine=!1,Ae||Me},indent:function(Ue,ke,Me){var ze=Ue.context;if(Ue.tokenize!=R&&Ue.tokenize!=P||ze&&ze.noIndent)return Me?Me.match(/^(\s*)/)[0].length:0;if(S&&/<!\[CDATA\[/.test(ke))return 0;for(ze&&/^<\//.test(ke)&&(ze=ze.prev);ze&&!ze.startOfLine;)ze=ze.prev;return ze?ze.indent+x:0},electricChars:"/",configuration:B.htmlMode?"html":"xml"}});CodeMirror.defineMIME("text/xml","xml");CodeMirror.defineMIME("application/xml","xml");CodeMirror.mimeModes.hasOwnProperty("text/html")||CodeMirror.defineMIME("text/html",{name:"xml",htmlMode:!0});CodeMirror.defineMode("clike",function(g,B){var x=g.indentUnit,Q=B.statementIndentUnit||x,S=B.dontAlignCalls,D=B.keywords||{},H=B.builtin||{},P=B.blockKeywords||{},R=B.atoms||{},Y=B.hooks||{},G=B.multiLineStrings,X=/[+\-*&%=<>!?|\/]/,ee;function Ae(me,we){var ve=me.next();if(Y[ve]){var Ce=Y[ve](me,we);if(Ce!==!1)return Ce}if(ve=='"'||ve=="'")return we.tokenize=le(ve),we.tokenize(me,we);if(/[\[\]{}\(\),;\:\.]/.test(ve))return ee=ve,null;if(/\d/.test(ve))return me.eatWhile(/[\w\.]/),"number";if(ve=="/"){if(me.eat("*"))return we.tokenize=ae,ae(me,we);if(me.eat("/"))return me.skipToEnd(),"comment"}if(X.test(ve))return me.eatWhile(X),"operator";me.eatWhile(/[\w\$_]/);var Se=me.current();return D.propertyIsEnumerable(Se)?(P.propertyIsEnumerable(Se)&&(ee="newstatement"),"keyword"):H.propertyIsEnumerable(Se)?(P.propertyIsEnumerable(Se)&&(ee="newstatement"),"builtin"):R.propertyIsEnumerable(Se)?"atom":"variable"}function le(me){return function(we,ve){for(var Ce=!1,Se,We=!1;(Se=we.next())!=null;){if(Se==me&&!Ce){We=!0;break}Ce=!Ce&&Se=="\\"}return(We||!(Ce||G))&&(ve.tokenize=null),"string"}}function ae(me,we){for(var ve=!1,Ce;Ce=me.next();){if(Ce=="/"&&ve){we.tokenize=null;break}ve=Ce=="*"}return"comment"}function ge(me,we,ve,Ce,Se){this.indented=me,this.column=we,this.type=ve,this.align=Ce,this.prev=Se}function fe(me,we,ve){var Ce=me.indented;return me.context&&me.context.type=="statement"&&(Ce=me.context.indented),me.context=new ge(Ce,we,ve,null,me.context)}function ye(me){var we=me.context.type;return(we==")"||we=="]"||we=="}")&&(me.indented=me.context.indented),me.context=me.context.prev}return{startState:function(me){return{tokenize:null,context:new ge((me||0)-x,0,"top",!1),indented:0,startOfLine:!0}},token:function(me,we){var ve=we.context;if(me.sol()&&(ve.align==null&&(ve.align=!1),we.indented=me.indentation(),we.startOfLine=!0),me.eatSpace())return null;ee=null;var Ce=(we.tokenize||Ae)(me,we);if(Ce=="comment"||Ce=="meta")return Ce;if(ve.align==null&&(ve.align=!0),(ee==";"||ee==":"||ee==",")&&ve.type=="statement")ye(we);else if(ee=="{")fe(we,me.column(),"}");else if(ee=="[")fe(we,me.column(),"]");else if(ee=="(")fe(we,me.column(),")");else if(ee=="}"){for(;ve.type=="statement";)ve=ye(we);for(ve.type=="}"&&(ve=ye(we));ve.type=="statement";)ve=ye(we)}else ee==ve.type?ye(we):((ve.type=="}"||ve.type=="top")&&ee!=";"||ve.type=="statement"&&ee=="newstatement")&&fe(we,me.column(),"statement");return we.startOfLine=!1,Ce},indent:function(me,we){if(me.tokenize==ae)return CodeMirror.Pass;if(me.tokenize!=Ae&&me.tokenize!=null)return 0;var ve=me.context,Ce=we&&we.charAt(0);ve.type=="statement"&&Ce=="}"&&(ve=ve.prev);var Se=Ce==ve.type;return ve.type=="statement"?ve.indented+(Ce=="{"?0:Q):S&&ve.type==")"&&!Se?ve.indented+Q:ve.align?ve.column+(Se?0:1):ve.indented+(Se?0:x)},electricChars:"{}"}});(function(){function g(D){for(var H={},P=D.split(" "),R=0;R<P.length;++R)H[P[R]]=!0;return H}var B="auto if break int case long char register continue return default short do sizeof double static else struct entry switch extern typedef float union for unsigned goto while enum void const signed volatile";function x(D,H){if(!H.startOfLine)return!1;for(;;)if(D.skipTo("\\")){if(D.next(),D.eol()){H.tokenize=x;break}}else{D.skipToEnd(),H.tokenize=null;break}return"meta"}function Q(D,H){for(var P;(P=D.next())!=null;)if(P=='"'&&!D.eat('"')){H.tokenize=null;break}return"string"}function S(D,H){for(var P=0;P<D.length;++P)CodeMirror.defineMIME(D[P],H)}S(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:g(B),blockKeywords:g("case do else for if switch while struct"),atoms:g("null"),hooks:{"#":x}}),S(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:g(B+" asm dynamic_cast namespace reinterpret_cast try bool explicit new static_cast typeid catch operator template typename class friend private this using const_cast inline public throw virtual delete mutable protected wchar_t"),blockKeywords:g("catch class do else finally for if struct switch try while"),atoms:g("true false null"),hooks:{"#":x}}),CodeMirror.defineMIME("text/x-java",{name:"clike",keywords:g("abstract assert boolean break byte case catch char class const continue default do double else enum extends final finally float for goto if implements import instanceof int interface long native new package private protected public return short static strictfp super switch synchronized this throw throws transient try void volatile while"),blockKeywords:g("catch class do else finally for if switch try while"),atoms:g("true false null"),hooks:{"@":function(D,H){return D.eatWhile(/[\w\$_]/),"meta"}}}),CodeMirror.defineMIME("text/x-csharp",{name:"clike",keywords:g("abstract as base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in interface internal is lock namespace new operator out override params private protected public readonly ref return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),blockKeywords:g("catch class do else finally for foreach if struct switch try while"),builtin:g("Boolean Byte Char DateTime DateTimeOffset Decimal Double Guid Int16 Int32 Int64 Object SByte Single String TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),atoms:g("true false null"),hooks:{"@":function(D,H){return D.eat('"')?(H.tokenize=Q,Q(D,H)):(D.eatWhile(/[\w\$_]/),"meta")}}}),CodeMirror.defineMIME("text/x-scala",{name:"clike",keywords:g("abstract case catch class def do else extends false final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try trye type val var while with yield _ : = => <- <: <% >: # @ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector :: #:: Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),blockKeywords:g("catch class do else finally for forSome if match switch try while"),atoms:g("true false null"),hooks:{"@":function(D,H){return D.eatWhile(/[\w\$_]/),"meta"}}})})();CodeMirror.defineMode("css",function(g){var B=g.indentUnit,x,Q=R(["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"]),S=R(["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"]),D=R(["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid-cell","grid-column","grid-column-align","grid-column-sizing","grid-column-span","grid-columns","grid-flow","grid-row","grid-row-align","grid-row-sizing","grid-row-span","grid-rows","grid-template","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-shadow","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","word-break","word-spacing","word-wrap","z-index"]),H=R(["black","silver","gray","white","maroon","red","purple","fuchsia","green","lime","olive","yellow","navy","blue","teal","aqua"]),P=R(["above","absolute","activeborder","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","auto","avoid","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break-all","break-word","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","compact","condensed","contain","content","content-box","context-menu","continuous","copy","cover","crop","cross","crosshair","currentcolor","cursive","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ew-resize","expanded","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-table","inset","inside","intrinsic","invert","italic","justify","kannada","katakana","katakana-iroha","khmer","landscape","lao","large","larger","left","level","lighter","line-through","linear","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","navy","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","overlay","overline","padding","padding-box","painted","paused","persian","plus-darker","plus-lighter","pointer","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radio","read-only","read-write","read-write-plaintext-only","relative","repeat","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","single","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","white","wider","window","windowframe","windowtext","x-large","x-small","xor","xx-large","xx-small","yellow"]);function R(ae){for(var ge={},fe=0;fe<ae.length;++fe)ge[ae[fe]]=!0;return ge}function Y(ae,ge){return x=ge,ae}function G(ae,ge){var fe=ae.next();if(fe=="@")return ae.eatWhile(/[\w\\\-]/),Y("def",ae.current());if(fe=="/"&&ae.eat("*"))return ge.tokenize=X,X(ae,ge);if(fe=="<"&&ae.eat("!"))return ge.tokenize=ee,ee(ae,ge);if(fe=="=")Y(null,"compare");else{if((fe=="~"||fe=="|")&&ae.eat("="))return Y(null,"compare");if(fe=='"'||fe=="'")return ge.tokenize=Ae(fe),ge.tokenize(ae,ge);if(fe=="#")return ae.eatWhile(/[\w\\\-]/),Y("atom","hash");if(fe=="!")return ae.match(/^\s*\w*/),Y("keyword","important");if(/\d/.test(fe))return ae.eatWhile(/[\w.%]/),Y("number","unit");if(fe==="-"){if(/\d/.test(ae.peek()))return ae.eatWhile(/[\w.%]/),Y("number","unit");if(ae.match(/^[^-]+-/))return Y("meta",x)}else return/[,+>*\/]/.test(fe)?Y(null,"select-op"):fe=="."&&ae.match(/^-?[_a-z][_a-z0-9-]*/i)?Y("qualifier",x):fe==":"?Y("operator",fe):/[;{}\[\]\(\)]/.test(fe)?Y(null,fe):fe=="u"&&ae.match("rl(")?(ae.backUp(1),ge.tokenize=le,Y("property","variable")):(ae.eatWhile(/[\w\\\-]/),Y("property","variable"))}}function X(ae,ge){for(var fe=!1,ye;(ye=ae.next())!=null;){if(fe&&ye=="/"){ge.tokenize=G;break}fe=ye=="*"}return Y("comment","comment")}function ee(ae,ge){for(var fe=0,ye;(ye=ae.next())!=null;){if(fe>=2&&ye==">"){ge.tokenize=G;break}fe=ye=="-"?fe+1:0}return Y("comment","comment")}function Ae(ae,ge){return function(fe,ye){for(var me=!1,we;(we=fe.next())!=null&&!(we==ae&&!me);)me=!me&&we=="\\";return me||(ge&&fe.backUp(1),ye.tokenize=G),Y("string","string")}}function le(ae,ge){return ae.next(),ae.match(/\s*[\"\']/,!1)?ge.tokenize=G:ge.tokenize=Ae(")",!0),Y(null,"(")}return{startState:function(ae){return{tokenize:G,baseIndent:ae||0,stack:[]}},token:function(ae,ge){if(ge.tokenize==G&&ae.eatSpace())return null;var fe=ge.tokenize(ae,ge),ye=ge.stack[ge.stack.length-1];return fe=="property"?ye=="propertyValue"?P[ae.current()]?fe="string-2":H[ae.current()]?fe="keyword":fe="variable-2":ye=="rule"?D[ae.current()]||(fe+=" error"):!ye||ye=="@media{"?fe="tag":ye=="@media"?Q[ae.current()]?fe="attribute":/^(only|not)$/i.test(ae.current())?fe="keyword":ae.current().toLowerCase()=="and"||S[ae.current()]?fe="error":fe="attribute error":ye=="@mediaType"?Q[ae.current()]?fe="attribute":ae.current().toLowerCase()=="and"?fe="operator":(/^(only|not)$/i.test(ae.current())||S[ae.current()],fe="error"):ye=="@mediaType("?D[ae.current()]||(Q[ae.current()]?fe="error":ae.current().toLowerCase()=="and"?fe="operator":/^(only|not)$/i.test(ae.current())?fe="error":fe+=" error"):fe="error":fe=="atom"?!ye||ye=="@media{"?fe="builtin":ye=="propertyValue"?/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(ae.current())||(fe+=" error"):fe="error":ye=="@media"&&x=="{"&&(fe="error"),x=="{"?ye=="@media"||ye=="@mediaType"?(ge.stack.pop(),ge.stack[ge.stack.length-1]="@media{"):ge.stack.push("rule"):x=="}"?(ge.stack.pop(),ye=="propertyValue"&&ge.stack.pop()):x=="@media"?ge.stack.push("@media"):ye=="@media"&&/\b(keyword|attribute)\b/.test(fe)?ge.stack.push("@mediaType"):ye=="@mediaType"&&ae.current()==","?ge.stack.pop():ye=="@mediaType"&&x=="("?ge.stack.push("@mediaType("):ye=="@mediaType("&&x==")"?ge.stack.pop():ye=="rule"&&x==":"?ge.stack.push("propertyValue"):ye=="propertyValue"&&x==";"&&ge.stack.pop(),fe},indent:function(ae,ge){var fe=ae.stack.length;return/^\}/.test(ge)&&(fe-=ae.stack[ae.stack.length-1]=="propertyValue"?2:1),ae.baseIndent+fe*B},electricChars:"}"}});CodeMirror.defineMIME("text/css","css");CodeMirror.multiplexingMode=function(g){var B=Array.prototype.slice.call(arguments,1),x=B.length;function Q(S,D,H){if(typeof D=="string")return S.indexOf(D,H);var P=D.exec(H?S.slice(H):S);return P?P.index+H:-1}return{startState:function(){return{outer:CodeMirror.startState(g),innerActive:null,inner:null}},copyState:function(S){return{outer:CodeMirror.copyState(g,S.outer),innerActive:S.innerActive,inner:S.innerActive&&CodeMirror.copyState(S.innerActive.mode,S.inner)}},token:function(S,D){if(D.innerActive){var ee=D.innerActive,P=S.string,G=Q(P,ee.close,S.pos);if(G==S.pos)return S.match(ee.close),D.innerActive=D.inner=null,ee.delimStyle;G>-1&&(S.string=P.slice(0,G));var Ae=ee.mode.token(S,D.inner);G>-1&&(S.string=P);var le=S.current(),G=le.indexOf(ee.close);return G>-1&&S.backUp(le.length-G),Ae}else{for(var H=1/0,P=S.string,R=0;R<x;++R){var Y=B[R],G=Q(P,Y.open,S.pos);if(G==S.pos)return S.match(Y.open),D.innerActive=Y,D.inner=CodeMirror.startState(Y.mode,g.indent?g.indent(D.outer,""):0),Y.delimStyle;G!=-1&&G<H&&(H=G)}H!=1/0&&(S.string=P.slice(0,H));var X=g.token(S,D.outer);return H!=1/0&&(S.string=P),X}},indent:function(S,D){var H=S.innerActive?S.innerActive.mode:g;return H.indent?H.indent(S.innerActive?S.inner:S.outer,D):CodeMirror.Pass},blankLine:function(S){var D=S.innerActive?S.innerActive.mode:g;if(D.blankLine&&D.blankLine(S.innerActive?S.inner:S.outer),S.innerActive)D.close===`
+`&&(S.innerActive=S.inner=null);else for(var H=0;H<x;++H){var P=B[H];P.open===`
+`&&(S.innerActive=P,S.inner=CodeMirror.startState(P.mode,D.indent?D.indent(S.outer,""):0))}},electricChars:g.electricChars,innerMode:function(S){return S.inner?{state:S.inner,mode:S.innerActive.mode}:{state:S.outer,mode:g}}}};(function(){CodeMirror.defaults.closeTagEnabled=!0,CodeMirror.defaults.closeTagIndent=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"],CodeMirror.defaults.closeTagVoid=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"];function g(H,P){var R=CodeMirror.innerMode(H.getMode(),P);if(R.mode.name=="xml")return R.state}CodeMirror.defineExtension("closeTag",function(H,P,R,Y){if(!H.getOption("closeTagEnabled"))throw CodeMirror.Pass;var G=H.getCursor(),X=H.getTokenAt(G),ee=g(H,X.state);if(ee){if(P==">"){var Ae=ee.type;if(X.className=="tag"&&Ae=="closeTag"||(H.replaceSelection(">"),G={line:G.line,ch:G.ch+1},H.setCursor(G),X=H.getTokenAt(H.getCursor()),ee=g(H,X.state),!ee))throw CodeMirror.Pass;var Ae=ee.type;if(X.className=="tag"&&Ae!="selfcloseTag"){var le=ee.tagName;le.length>0&&Q(H,Y,le)&&B(H,R,G,le);return}H.setSelection({line:G.line,ch:G.ch-1},G),H.replaceSelection("")}else if(P=="/"&&X.className=="tag"&&X.string=="<"){var ae=ee.context,le=ae?ae.tagName:"";if(le.length>0){D(H,G,le);return}}}throw CodeMirror.Pass});function B(H,P,R,Y){x(H,P,Y)?(H.replaceSelection(`
+
+</`+Y+">","end"),H.indentLine(R.line+1),H.indentLine(R.line+2),H.setCursor({line:R.line+1,ch:H.getLine(R.line+1).length})):(H.replaceSelection("</"+Y+">"),H.setCursor(R))}function x(H,P,R){return(typeof P>"u"||P==null||P==!0)&&(P=H.getOption("closeTagIndent")),P||(P=[]),S(P,R.toLowerCase())!=-1}function Q(H,P,R){return H.getOption("mode")=="xml"?!0:((typeof P>"u"||P==null)&&(P=H.getOption("closeTagVoid")),P||(P=[]),S(P,R.toLowerCase())==-1)}function S(H,P){if(H.indexOf)return H.indexOf(P);for(var R=0,Y=H.length;R<Y;++R)if(H[R]==P)return R;return-1}function D(H,P,R){H.replaceSelection("/"+R+">"),H.setCursor({line:P.line,ch:P.ch+R.length+2})}})();/*!
+ * html2canvas 1.4.1 <https://html2canvas.hertzen.com>
+ * Copyright (c) 2022 Niklas von Hertzen <https://hertzen.com>
+ * Released under MIT License
+ *//*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */var extendStatics=function(g,B){return extendStatics=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(x,Q){x.__proto__=Q}||function(x,Q){for(var S in Q)Object.prototype.hasOwnProperty.call(Q,S)&&(x[S]=Q[S])},extendStatics(g,B)};function __extends(g,B){if(typeof B!="function"&&B!==null)throw new TypeError("Class extends value "+String(B)+" is not a constructor or null");extendStatics(g,B);function x(){this.constructor=g}g.prototype=B===null?Object.create(B):(x.prototype=B.prototype,new x)}var __assign=function(){return __assign=Object.assign||function(B){for(var x,Q=1,S=arguments.length;Q<S;Q++){x=arguments[Q];for(var D in x)Object.prototype.hasOwnProperty.call(x,D)&&(B[D]=x[D])}return B},__assign.apply(this,arguments)};function __awaiter(g,B,x,Q){function S(D){return D instanceof x?D:new x(function(H){H(D)})}return new(x||(x=Promise))(function(D,H){function P(G){try{Y(Q.next(G))}catch(X){H(X)}}function R(G){try{Y(Q.throw(G))}catch(X){H(X)}}function Y(G){G.done?D(G.value):S(G.value).then(P,R)}Y((Q=Q.apply(g,B||[])).next())})}function __generator(g,B){var x={label:0,sent:function(){if(D[0]&1)throw D[1];return D[1]},trys:[],ops:[]},Q,S,D,H;return H={next:P(0),throw:P(1),return:P(2)},typeof Symbol=="function"&&(H[Symbol.iterator]=function(){return this}),H;function P(Y){return function(G){return R([Y,G])}}function R(Y){if(Q)throw new TypeError("Generator is already executing.");for(;x;)try{if(Q=1,S&&(D=Y[0]&2?S.return:Y[0]?S.throw||((D=S.return)&&D.call(S),0):S.next)&&!(D=D.call(S,Y[1])).done)return D;switch(S=0,D&&(Y=[Y[0]&2,D.value]),Y[0]){case 0:case 1:D=Y;break;case 4:return x.label++,{value:Y[1],done:!1};case 5:x.label++,S=Y[1],Y=[0];continue;case 7:Y=x.ops.pop(),x.trys.pop();continue;default:if(D=x.trys,!(D=D.length>0&&D[D.length-1])&&(Y[0]===6||Y[0]===2)){x=0;continue}if(Y[0]===3&&(!D||Y[1]>D[0]&&Y[1]<D[3])){x.label=Y[1];break}if(Y[0]===6&&x.label<D[1]){x.label=D[1],D=Y;break}if(D&&x.label<D[2]){x.label=D[2],x.ops.push(Y);break}D[2]&&x.ops.pop(),x.trys.pop();continue}Y=B.call(g,x)}catch(G){Y=[6,G],S=0}finally{Q=D=0}if(Y[0]&5)throw Y[1];return{value:Y[0]?Y[1]:void 0,done:!0}}}function __spreadArray(g,B,x){if(x||arguments.length===2)for(var Q=0,S=B.length,D;Q<S;Q++)(D||!(Q in B))&&(D||(D=Array.prototype.slice.call(B,0,Q)),D[Q]=B[Q]);return g.concat(D||B)}var Bounds=function(){function g(B,x,Q,S){this.left=B,this.top=x,this.width=Q,this.height=S}return g.prototype.add=function(B,x,Q,S){return new g(this.left+B,this.top+x,this.width+Q,this.height+S)},g.fromClientRect=function(B,x){return new g(x.left+B.windowBounds.left,x.top+B.windowBounds.top,x.width,x.height)},g.fromDOMRectList=function(B,x){var Q=Array.from(x).find(function(S){return S.width!==0});return Q?new g(Q.left+B.windowBounds.left,Q.top+B.windowBounds.top,Q.width,Q.height):g.EMPTY},g.EMPTY=new g(0,0,0,0),g}(),parseBounds=function(g,B){return Bounds.fromClientRect(g,B.getBoundingClientRect())},parseDocumentSize=function(g){var B=g.body,x=g.documentElement;if(!B||!x)throw new Error("Unable to get document size");var Q=Math.max(Math.max(B.scrollWidth,x.scrollWidth),Math.max(B.offsetWidth,x.offsetWidth),Math.max(B.clientWidth,x.clientWidth)),S=Math.max(Math.max(B.scrollHeight,x.scrollHeight),Math.max(B.offsetHeight,x.offsetHeight),Math.max(B.clientHeight,x.clientHeight));return new Bounds(0,0,Q,S)},toCodePoints$1=function(g){for(var B=[],x=0,Q=g.length;x<Q;){var S=g.charCodeAt(x++);if(S>=55296&&S<=56319&&x<Q){var D=g.charCodeAt(x++);(D&64512)===56320?B.push(((S&1023)<<10)+(D&1023)+65536):(B.push(S),x--)}else B.push(S)}return B},fromCodePoint$1=function(){for(var g=[],B=0;B<arguments.length;B++)g[B]=arguments[B];if(String.fromCodePoint)return String.fromCodePoint.apply(String,g);var x=g.length;if(!x)return"";for(var Q=[],S=-1,D="";++S<x;){var H=g[S];H<=65535?Q.push(H):(H-=65536,Q.push((H>>10)+55296,H%1024+56320)),(S+1===x||Q.length>16384)&&(D+=String.fromCharCode.apply(String,Q),Q.length=0)}return D},chars$2="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",lookup$2=typeof Uint8Array>"u"?[]:new Uint8Array(256);for(var i$2=0;i$2<chars$2.length;i$2++)lookup$2[chars$2.charCodeAt(i$2)]=i$2;var chars$1$1="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",lookup$1$1=typeof Uint8Array>"u"?[]:new Uint8Array(256);for(var i$1$1=0;i$1$1<chars$1$1.length;i$1$1++)lookup$1$1[chars$1$1.charCodeAt(i$1$1)]=i$1$1;var decode$1=function(g){var B=g.length*.75,x=g.length,Q,S=0,D,H,P,R;g[g.length-1]==="="&&(B--,g[g.length-2]==="="&&B--);var Y=typeof ArrayBuffer<"u"&&typeof Uint8Array<"u"&&typeof Uint8Array.prototype.slice<"u"?new ArrayBuffer(B):new Array(B),G=Array.isArray(Y)?Y:new Uint8Array(Y);for(Q=0;Q<x;Q+=4)D=lookup$1$1[g.charCodeAt(Q)],H=lookup$1$1[g.charCodeAt(Q+1)],P=lookup$1$1[g.charCodeAt(Q+2)],R=lookup$1$1[g.charCodeAt(Q+3)],G[S++]=D<<2|H>>4,G[S++]=(H&15)<<4|P>>2,G[S++]=(P&3)<<6|R&63;return Y},polyUint16Array$1=function(g){for(var B=g.length,x=[],Q=0;Q<B;Q+=2)x.push(g[Q+1]<<8|g[Q]);return x},polyUint32Array$1=function(g){for(var B=g.length,x=[],Q=0;Q<B;Q+=4)x.push(g[Q+3]<<24|g[Q+2]<<16|g[Q+1]<<8|g[Q]);return x},UTRIE2_SHIFT_2$1=5,UTRIE2_SHIFT_1$1=6+5,UTRIE2_INDEX_SHIFT$1=2,UTRIE2_SHIFT_1_2$1=UTRIE2_SHIFT_1$1-UTRIE2_SHIFT_2$1,UTRIE2_LSCP_INDEX_2_OFFSET$1=65536>>UTRIE2_SHIFT_2$1,UTRIE2_DATA_BLOCK_LENGTH$1=1<<UTRIE2_SHIFT_2$1,UTRIE2_DATA_MASK$1=UTRIE2_DATA_BLOCK_LENGTH$1-1,UTRIE2_LSCP_INDEX_2_LENGTH$1=1024>>UTRIE2_SHIFT_2$1,UTRIE2_INDEX_2_BMP_LENGTH$1=UTRIE2_LSCP_INDEX_2_OFFSET$1+UTRIE2_LSCP_INDEX_2_LENGTH$1,UTRIE2_UTF8_2B_INDEX_2_OFFSET$1=UTRIE2_INDEX_2_BMP_LENGTH$1,UTRIE2_UTF8_2B_INDEX_2_LENGTH$1=32,UTRIE2_INDEX_1_OFFSET$1=UTRIE2_UTF8_2B_INDEX_2_OFFSET$1+UTRIE2_UTF8_2B_INDEX_2_LENGTH$1,UTRIE2_OMITTED_BMP_INDEX_1_LENGTH$1=65536>>UTRIE2_SHIFT_1$1,UTRIE2_INDEX_2_BLOCK_LENGTH$1=1<<UTRIE2_SHIFT_1_2$1,UTRIE2_INDEX_2_MASK$1=UTRIE2_INDEX_2_BLOCK_LENGTH$1-1,slice16$1=function(g,B,x){return g.slice?g.slice(B,x):new Uint16Array(Array.prototype.slice.call(g,B,x))},slice32$1=function(g,B,x){return g.slice?g.slice(B,x):new Uint32Array(Array.prototype.slice.call(g,B,x))},createTrieFromBase64$1=function(g,B){var x=decode$1(g),Q=Array.isArray(x)?polyUint32Array$1(x):new Uint32Array(x),S=Array.isArray(x)?polyUint16Array$1(x):new Uint16Array(x),D=24,H=slice16$1(S,D/2,Q[4]/2),P=Q[5]===2?slice16$1(S,(D+Q[4])/2):slice32$1(Q,Math.ceil((D+Q[4])/4));return new Trie$1(Q[0],Q[1],Q[2],Q[3],H,P)},Trie$1=function(){function g(B,x,Q,S,D,H){this.initialValue=B,this.errorValue=x,this.highStart=Q,this.highValueIndex=S,this.index=D,this.data=H}return g.prototype.get=function(B){var x;if(B>=0){if(B<55296||B>56319&&B<=65535)return x=this.index[B>>UTRIE2_SHIFT_2$1],x=(x<<UTRIE2_INDEX_SHIFT$1)+(B&UTRIE2_DATA_MASK$1),this.data[x];if(B<=65535)return x=this.index[UTRIE2_LSCP_INDEX_2_OFFSET$1+(B-55296>>UTRIE2_SHIFT_2$1)],x=(x<<UTRIE2_INDEX_SHIFT$1)+(B&UTRIE2_DATA_MASK$1),this.data[x];if(B<this.highStart)return x=UTRIE2_INDEX_1_OFFSET$1-UTRIE2_OMITTED_BMP_INDEX_1_LENGTH$1+(B>>UTRIE2_SHIFT_1$1),x=this.index[x],x+=B>>UTRIE2_SHIFT_2$1&UTRIE2_INDEX_2_MASK$1,x=this.index[x],x=(x<<UTRIE2_INDEX_SHIFT$1)+(B&UTRIE2_DATA_MASK$1),this.data[x];if(B<=1114111)return this.data[this.highValueIndex]}return this.errorValue},g}(),chars$3="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",lookup$3=typeof Uint8Array>"u"?[]:new Uint8Array(256);for(var i$3=0;i$3<chars$3.length;i$3++)lookup$3[chars$3.charCodeAt(i$3)]=i$3;var base64$1="KwAAAAAAAAAACA4AUD0AADAgAAACAAAAAAAIABAAGABAAEgAUABYAGAAaABgAGgAYgBqAF8AZwBgAGgAcQB5AHUAfQCFAI0AlQCdAKIAqgCyALoAYABoAGAAaABgAGgAwgDKAGAAaADGAM4A0wDbAOEA6QDxAPkAAQEJAQ8BFwF1AH0AHAEkASwBNAE6AUIBQQFJAVEBWQFhAWgBcAF4ATAAgAGGAY4BlQGXAZ8BpwGvAbUBvQHFAc0B0wHbAeMB6wHxAfkBAQIJAvEBEQIZAiECKQIxAjgCQAJGAk4CVgJeAmQCbAJ0AnwCgQKJApECmQKgAqgCsAK4ArwCxAIwAMwC0wLbAjAA4wLrAvMC+AIAAwcDDwMwABcDHQMlAy0DNQN1AD0DQQNJA0kDSQNRA1EDVwNZA1kDdQB1AGEDdQBpA20DdQN1AHsDdQCBA4kDkQN1AHUAmQOhA3UAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AKYDrgN1AHUAtgO+A8YDzgPWAxcD3gPjA+sD8wN1AHUA+wMDBAkEdQANBBUEHQQlBCoEFwMyBDgEYABABBcDSARQBFgEYARoBDAAcAQzAXgEgASIBJAEdQCXBHUAnwSnBK4EtgS6BMIEyAR1AHUAdQB1AHUAdQCVANAEYABgAGAAYABgAGAAYABgANgEYADcBOQEYADsBPQE/AQEBQwFFAUcBSQFLAU0BWQEPAVEBUsFUwVbBWAAYgVgAGoFcgV6BYIFigWRBWAAmQWfBaYFYABgAGAAYABgAKoFYACxBbAFuQW6BcEFwQXHBcEFwQXPBdMF2wXjBeoF8gX6BQIGCgYSBhoGIgYqBjIGOgZgAD4GRgZMBmAAUwZaBmAAYABgAGAAYABgAGAAYABgAGAAYABgAGIGYABpBnAGYABgAGAAYABgAGAAYABgAGAAYAB4Bn8GhQZgAGAAYAB1AHcDFQSLBmAAYABgAJMGdQA9A3UAmwajBqsGqwaVALMGuwbDBjAAywbSBtIG1QbSBtIG0gbSBtIG0gbdBuMG6wbzBvsGAwcLBxMHAwcbByMHJwcsBywHMQcsB9IGOAdAB0gHTgfSBkgHVgfSBtIG0gbSBtIG0gbSBtIG0gbSBiwHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAdgAGAALAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAdbB2MHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsB2kH0gZwB64EdQB1AHUAdQB1AHUAdQB1AHUHfQdgAIUHjQd1AHUAlQedB2AAYAClB6sHYACzB7YHvgfGB3UAzgfWBzMB3gfmB1EB7gf1B/0HlQENAQUIDQh1ABUIHQglCBcDLQg1CD0IRQhNCEEDUwh1AHUAdQBbCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIaQhjCGQIZQhmCGcIaAhpCGMIZAhlCGYIZwhoCGkIYwhkCGUIZghnCGgIcAh3CHoIMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIgggwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAALAcsBywHLAcsBywHLAcsBywHLAcsB4oILAcsB44I0gaWCJ4Ipgh1AHUAqgiyCHUAdQB1AHUAdQB1AHUAdQB1AHUAtwh8AXUAvwh1AMUIyQjRCNkI4AjoCHUAdQB1AO4I9gj+CAYJDgkTCS0HGwkjCYIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiCCIIIggiAAIAAAAFAAYABgAGIAXwBgAHEAdQBFAJUAogCyAKAAYABgAEIA4ABGANMA4QDxAMEBDwE1AFwBLAE6AQEBUQF4QkhCmEKoQrhCgAHIQsAB0MLAAcABwAHAAeDC6ABoAHDCwMMAAcABwAHAAdDDGMMAAcAB6MM4wwjDWMNow3jDaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAEjDqABWw6bDqABpg6gAaABoAHcDvwOPA+gAaABfA/8DvwO/A78DvwO/A78DvwO/A78DvwO/A78DvwO/A78DvwO/A78DvwO/A78DvwO/A78DvwO/A78DpcPAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcAB9cPKwkyCToJMAB1AHUAdQBCCUoJTQl1AFUJXAljCWcJawkwADAAMAAwAHMJdQB2CX4JdQCECYoJjgmWCXUAngkwAGAAYABxAHUApgn3A64JtAl1ALkJdQDACTAAMAAwADAAdQB1AHUAdQB1AHUAdQB1AHUAowYNBMUIMAAwADAAMADICcsJ0wnZCRUE4QkwAOkJ8An4CTAAMAB1AAAKvwh1AAgKDwoXCh8KdQAwACcKLgp1ADYKqAmICT4KRgowADAAdQB1AE4KMAB1AFYKdQBeCnUAZQowADAAMAAwADAAMAAwADAAMAAVBHUAbQowADAAdQC5CXUKMAAwAHwBxAijBogEMgF9CoQKiASMCpQKmgqIBKIKqgquCogEDQG2Cr4KxgrLCjAAMADTCtsKCgHjCusK8Qr5CgELMAAwADAAMAB1AIsECQsRC3UANAEZCzAAMAAwADAAMAB1ACELKQswAHUANAExCzkLdQBBC0kLMABRC1kLMAAwADAAMAAwADAAdQBhCzAAMAAwAGAAYABpC3ELdwt/CzAAMACHC4sLkwubC58Lpwt1AK4Ltgt1APsDMAAwADAAMAAwADAAMAAwAL4LwwvLC9IL1wvdCzAAMADlC+kL8Qv5C/8LSQswADAAMAAwADAAMAAwADAAMAAHDDAAMAAwADAAMAAODBYMHgx1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1ACYMMAAwADAAdQB1AHUALgx1AHUAdQB1AHUAdQA2DDAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AD4MdQBGDHUAdQB1AHUAdQB1AEkMdQB1AHUAdQB1AFAMMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQBYDHUAdQB1AF8MMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUA+wMVBGcMMAAwAHwBbwx1AHcMfwyHDI8MMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAYABgAJcMMAAwADAAdQB1AJ8MlQClDDAAMACtDCwHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsB7UMLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHdQB1AHUAdQB1AHUAdQB1AHUAdQB1AHUAdQB1AA0EMAC9DDAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAsBywHLAcsBywHLAcsBywHLQcwAMEMyAwsBywHLAcsBywHLAcsBywHLAcsBywHzAwwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwAHUAdQB1ANQM2QzhDDAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMABgAGAAYABgAGAAYABgAOkMYADxDGAA+AwADQYNYABhCWAAYAAODTAAMAAwADAAFg1gAGAAHg37AzAAMAAwADAAYABgACYNYAAsDTQNPA1gAEMNPg1LDWAAYABgAGAAYABgAGAAYABgAGAAUg1aDYsGVglhDV0NcQBnDW0NdQ15DWAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAlQCBDZUAiA2PDZcNMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAnw2nDTAAMAAwADAAMAAwAHUArw23DTAAMAAwADAAMAAwADAAMAAwADAAMAB1AL8NMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAB1AHUAdQB1AHUAdQDHDTAAYABgAM8NMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAA1w11ANwNMAAwAD0B5A0wADAAMAAwADAAMADsDfQN/A0EDgwOFA4wABsOMAAwADAAMAAwADAAMAAwANIG0gbSBtIG0gbSBtIG0gYjDigOwQUuDsEFMw7SBjoO0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIGQg5KDlIOVg7SBtIGXg5lDm0OdQ7SBtIGfQ6EDooOjQ6UDtIGmg6hDtIG0gaoDqwO0ga0DrwO0gZgAGAAYADEDmAAYAAkBtIGzA5gANIOYADaDokO0gbSBt8O5w7SBu8O0gb1DvwO0gZgAGAAxA7SBtIG0gbSBtIGYABgAGAAYAAED2AAsAUMD9IG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIGFA8sBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAccD9IGLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHJA8sBywHLAcsBywHLAccDywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywPLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAc0D9IG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIGLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAccD9IG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIGFA8sBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHLAcsBywHPA/SBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gbSBtIG0gYUD0QPlQCVAJUAMAAwADAAMACVAJUAlQCVAJUAlQCVAEwPMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAA//8EAAQABAAEAAQABAAEAAQABAANAAMAAQABAAIABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQACgATABcAHgAbABoAHgAXABYAEgAeABsAGAAPABgAHABLAEsASwBLAEsASwBLAEsASwBLABgAGAAeAB4AHgATAB4AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQABYAGwASAB4AHgAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAWAA0AEQAeAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAAQABAAEAAQABAAFAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAJABYAGgAbABsAGwAeAB0AHQAeAE8AFwAeAA0AHgAeABoAGwBPAE8ADgBQAB0AHQAdAE8ATwAXAE8ATwBPABYAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAFAAUABQAFAAUABQAFAAUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAB4AHgAeAFAATwBAAE8ATwBPAEAATwBQAFAATwBQAB4AHgAeAB4AHgAeAB0AHQAdAB0AHgAdAB4ADgBQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgBQAB4AUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAJAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAkACQAJAAkACQAJAAkABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAeAB4AHgAeAFAAHgAeAB4AKwArAFAAUABQAFAAGABQACsAKwArACsAHgAeAFAAHgBQAFAAUAArAFAAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAEAAQABAAEAAQABAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAUAAeAB4AHgAeAB4AHgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAYAA0AKwArAB4AHgAbACsABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQADQAEAB4ABAAEAB4ABAAEABMABAArACsAKwArACsAKwArACsAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAKwArACsAKwBWAFYAVgBWAB4AHgArACsAKwArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AGgAaABoAGAAYAB4AHgAEAAQABAAEAAQABAAEAAQABAAEAAQAEwAEACsAEwATAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABABLAEsASwBLAEsASwBLAEsASwBLABoAGQAZAB4AUABQAAQAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQABMAUAAEAAQABAAEAAQABAAEAB4AHgAEAAQABAAEAAQABABQAFAABAAEAB4ABAAEAAQABABQAFAASwBLAEsASwBLAEsASwBLAEsASwBQAFAAUAAeAB4AUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwAeAFAABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQAUABQAB4AHgAYABMAUAArACsABAAbABsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAFAABAAEAAQABAAEAFAABAAEAAQAUAAEAAQABAAEAAQAKwArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAArACsAHgArAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAB4ABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAUAAEAAQABAAEAAQABAAEAFAAUABQAFAAUABQAFAAUABQAFAABAAEAA0ADQBLAEsASwBLAEsASwBLAEsASwBLAB4AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAArAFAAUABQAFAAUABQAFAAUAArACsAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAUAArACsAKwBQAFAAUABQACsAKwAEAFAABAAEAAQABAAEAAQABAArACsABAAEACsAKwAEAAQABABQACsAKwArACsAKwArACsAKwAEACsAKwArACsAUABQACsAUABQAFAABAAEACsAKwBLAEsASwBLAEsASwBLAEsASwBLAFAAUAAaABoAUABQAFAAUABQAEwAHgAbAFAAHgAEACsAKwAEAAQABAArAFAAUABQAFAAUABQACsAKwArACsAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAUABQACsAUABQACsAUABQACsAKwAEACsABAAEAAQABAAEACsAKwArACsABAAEACsAKwAEAAQABAArACsAKwAEACsAKwArACsAKwArACsAUABQAFAAUAArAFAAKwArACsAKwArACsAKwBLAEsASwBLAEsASwBLAEsASwBLAAQABABQAFAAUAAEAB4AKwArACsAKwArACsAKwArACsAKwAEAAQABAArAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAUABQACsAUABQAFAAUABQACsAKwAEAFAABAAEAAQABAAEAAQABAAEACsABAAEAAQAKwAEAAQABAArACsAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAABAAEACsAKwBLAEsASwBLAEsASwBLAEsASwBLAB4AGwArACsAKwArACsAKwArAFAABAAEAAQABAAEAAQAKwAEAAQABAArAFAAUABQAFAAUABQAFAAUAArACsAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAArACsABAAEACsAKwAEAAQABAArACsAKwArACsAKwArAAQABAAEACsAKwArACsAUABQACsAUABQAFAABAAEACsAKwBLAEsASwBLAEsASwBLAEsASwBLAB4AUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArAAQAUAArAFAAUABQAFAAUABQACsAKwArAFAAUABQACsAUABQAFAAUAArACsAKwBQAFAAKwBQACsAUABQACsAKwArAFAAUAArACsAKwBQAFAAUAArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArAAQABAAEAAQABAArACsAKwAEAAQABAArAAQABAAEAAQAKwArAFAAKwArACsAKwArACsABAArACsAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAUABQAFAAHgAeAB4AHgAeAB4AGwAeACsAKwArACsAKwAEAAQABAAEAAQAUABQAFAAUABQAFAAUABQACsAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAUAAEAAQABAAEAAQABAAEACsABAAEAAQAKwAEAAQABAAEACsAKwArACsAKwArACsABAAEACsAUABQAFAAKwArACsAKwArAFAAUAAEAAQAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAKwAOAFAAUABQAFAAUABQAFAAHgBQAAQABAAEAA4AUABQAFAAUABQAFAAUABQACsAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAKwArAAQAUAAEAAQABAAEAAQABAAEACsABAAEAAQAKwAEAAQABAAEACsAKwArACsAKwArACsABAAEACsAKwArACsAKwArACsAUAArAFAAUAAEAAQAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwBQAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwAEAAQABAAEAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAFAABAAEAAQABAAEAAQABAArAAQABAAEACsABAAEAAQABABQAB4AKwArACsAKwBQAFAAUAAEAFAAUABQAFAAUABQAFAAUABQAFAABAAEACsAKwBLAEsASwBLAEsASwBLAEsASwBLAFAAUABQAFAAUABQAFAAUABQABoAUABQAFAAUABQAFAAKwAEAAQABAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQACsAUAArACsAUABQAFAAUABQAFAAUAArACsAKwAEACsAKwArACsABAAEAAQABAAEAAQAKwAEACsABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArAAQABAAeACsAKwArACsAKwArACsAKwArACsAKwArAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAAqAFwAXAAqACoAKgAqACoAKgAqACsAKwArACsAGwBcAFwAXABcAFwAXABcACoAKgAqACoAKgAqACoAKgAeAEsASwBLAEsASwBLAEsASwBLAEsADQANACsAKwArACsAKwBcAFwAKwBcACsAXABcAFwAXABcACsAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcACsAXAArAFwAXABcAFwAXABcAFwAXABcAFwAKgBcAFwAKgAqACoAKgAqACoAKgAqACoAXAArACsAXABcAFwAXABcACsAXAArACoAKgAqACoAKgAqACsAKwBLAEsASwBLAEsASwBLAEsASwBLACsAKwBcAFwAXABcAFAADgAOAA4ADgAeAA4ADgAJAA4ADgANAAkAEwATABMAEwATAAkAHgATAB4AHgAeAAQABAAeAB4AHgAeAB4AHgBLAEsASwBLAEsASwBLAEsASwBLAFAAUABQAFAAUABQAFAAUABQAFAADQAEAB4ABAAeAAQAFgARABYAEQAEAAQAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQADQAEAAQABAAEAAQADQAEAAQAUABQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABAArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArAA0ADQAeAB4AHgAeAB4AHgAEAB4AHgAeAB4AHgAeACsAHgAeAA4ADgANAA4AHgAeAB4AHgAeAAkACQArACsAKwArACsAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgBcAEsASwBLAEsASwBLAEsASwBLAEsADQANAB4AHgAeAB4AXABcAFwAXABcAFwAKgAqACoAKgBcAFwAXABcACoAKgAqAFwAKgAqACoAXABcACoAKgAqACoAKgAqACoAXABcAFwAKgAqACoAKgBcAFwAXABcAFwAXABcAFwAXABcAFwAXABcACoAKgAqACoAKgAqACoAKgAqACoAKgAqAFwAKgBLAEsASwBLAEsASwBLAEsASwBLACoAKgAqACoAKgAqAFAAUABQAFAAUABQACsAUAArACsAKwArACsAUAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgBQAFAAUABQAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUAArACsAUABQAFAAUABQAFAAUAArAFAAKwBQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAKwBQACsAUABQAFAAUAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsABAAEAAQAHgANAB4AHgAeAB4AHgAeAB4AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwBQAFAAUABQAFAAUAArACsADQBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAANAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAWABEAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAA0ADQANAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAAQABAAEACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAANAA0AKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUAArAAQABAArACsAKwArACsAKwArACsAKwArACsAKwBcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqAA0ADQAVAFwADQAeAA0AGwBcACoAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwAeAB4AEwATAA0ADQAOAB4AEwATAB4ABAAEAAQACQArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArAFAAUABQAFAAUAAEAAQAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQAUAArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAArACsAKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsAHgArACsAKwATABMASwBLAEsASwBLAEsASwBLAEsASwBcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAArACsAXABcAFwAXABcACsAKwArACsAKwArACsAKwArACsAKwBcAFwAXABcAFwAXABcAFwAXABcAFwAXAArACsAKwArAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAXAArACsAKwAqACoAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAArACsAHgAeAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcACoAKgAqACoAKgAqACoAKgAqACoAKwAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKwArAAQASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArACsAKwBLAEsASwBLAEsASwBLAEsASwBLACsAKwArACsAKwArACoAKgAqACoAKgAqACoAXAAqACoAKgAqACoAKgArACsABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsABAAEAAQABAAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABABQAFAAUABQAFAAUABQACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwANAA0AHgANAA0ADQANAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAEAAQABAAEAAQABAAEAAQAHgAeAB4AHgAeAB4AHgAeAB4AKwArACsABAAEAAQAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABABQAFAASwBLAEsASwBLAEsASwBLAEsASwBQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwAeAB4AHgAeAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArAA0ADQANAA0ADQBLAEsASwBLAEsASwBLAEsASwBLACsAKwArAFAAUABQAEsASwBLAEsASwBLAEsASwBLAEsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAA0ADQBQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwBQAFAAUAAeAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArAAQABAAEAB4ABAAEAAQABAAEAAQABAAEAAQABAAEAAQABABQAFAAUABQAAQAUABQAFAAUABQAFAABABQAFAABAAEAAQAUAArACsAKwArACsABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsABAAEAAQABAAEAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArAFAAUABQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAKwBQACsAUAArAFAAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACsAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArAB4AHgAeAB4AHgAeAB4AHgBQAB4AHgAeAFAAUABQACsAHgAeAB4AHgAeAB4AHgAeAB4AHgBQAFAAUABQACsAKwAeAB4AHgAeAB4AHgArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArAFAAUABQACsAHgAeAB4AHgAeAB4AHgAOAB4AKwANAA0ADQANAA0ADQANAAkADQANAA0ACAAEAAsABAAEAA0ACQANAA0ADAAdAB0AHgAXABcAFgAXABcAFwAWABcAHQAdAB4AHgAUABQAFAANAAEAAQAEAAQABAAEAAQACQAaABoAGgAaABoAGgAaABoAHgAXABcAHQAVABUAHgAeAB4AHgAeAB4AGAAWABEAFQAVABUAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ADQAeAA0ADQANAA0AHgANAA0ADQAHAB4AHgAeAB4AKwAEAAQABAAEAAQABAAEAAQABAAEAFAAUAArACsATwBQAFAAUABQAFAAHgAeAB4AFgARAE8AUABPAE8ATwBPAFAAUABQAFAAUAAeAB4AHgAWABEAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArABsAGwAbABsAGwAbABsAGgAbABsAGwAbABsAGwAbABsAGwAbABsAGwAbABsAGgAbABsAGwAbABoAGwAbABoAGwAbABsAGwAbABsAGwAbABsAGwAbABsAGwAbABsAGwAbAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAHgAeAFAAGgAeAB0AHgBQAB4AGgAeAB4AHgAeAB4AHgAeAB4AHgBPAB4AUAAbAB4AHgBQAFAAUABQAFAAHgAeAB4AHQAdAB4AUAAeAFAAHgBQAB4AUABPAFAAUAAeAB4AHgAeAB4AHgAeAFAAUABQAFAAUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAFAAHgBQAFAAUABQAE8ATwBQAFAAUABQAFAATwBQAFAATwBQAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAFAAUABQAFAATwBPAE8ATwBPAE8ATwBPAE8ATwBQAFAAUABQAFAAUABQAFAAUAAeAB4AUABQAFAAUABPAB4AHgArACsAKwArAB0AHQAdAB0AHQAdAB0AHQAdAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHgAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB4AHQAdAB4AHgAeAB0AHQAeAB4AHQAeAB4AHgAdAB4AHQAbABsAHgAdAB4AHgAeAB4AHQAeAB4AHQAdAB0AHQAeAB4AHQAeAB0AHgAdAB0AHQAdAB0AHQAeAB0AHgAeAB4AHgAeAB0AHQAdAB0AHgAeAB4AHgAdAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB4AHgAeAB0AHgAeAB4AHgAeAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB0AHgAeAB0AHQAdAB0AHgAeAB0AHQAeAB4AHQAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHQAeAB4AHQAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAeAB4AHgAdAB4AHgAeAB4AHgAeAB4AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AFAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeABYAEQAWABEAHgAeAB4AHgAeAB4AHQAeAB4AHgAeAB4AHgAeACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAWABEAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAFAAHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHgAeAB4AHgAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAeAB4AHQAdAB0AHQAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHQAeAB0AHQAdAB0AHQAdAB0AHgAeAB4AHgAeAB4AHgAeAB0AHQAeAB4AHQAdAB4AHgAeAB4AHQAdAB4AHgAeAB4AHQAdAB0AHgAeAB0AHgAeAB0AHQAdAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB0AHQAdAB4AHgAeAB4AHgAeAB4AHgAeAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAlACUAJQAlAB4AHQAdAB4AHgAdAB4AHgAeAB4AHQAdAB4AHgAeAB4AJQAlAB0AHQAlAB4AJQAlACUAIAAlACUAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAlACUAJQAeAB4AHgAeAB0AHgAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB0AHgAdAB0AHQAeAB0AJQAdAB0AHgAdAB0AHgAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACUAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHQAdAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAlACUAJQAlACUAJQAlACUAJQAlACUAJQAdAB0AHQAdACUAHgAlACUAJQAdACUAJQAdAB0AHQAlACUAHQAdACUAHQAdACUAJQAlAB4AHQAeAB4AHgAeAB0AHQAlAB0AHQAdAB0AHQAdACUAJQAlACUAJQAdACUAJQAgACUAHQAdACUAJQAlACUAJQAlACUAJQAeAB4AHgAlACUAIAAgACAAIAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB0AHgAeAB4AFwAXABcAFwAXABcAHgATABMAJQAeAB4AHgAWABEAFgARABYAEQAWABEAFgARABYAEQAWABEATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeABYAEQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAWABEAFgARABYAEQAWABEAFgARAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AFgARABYAEQAWABEAFgARABYAEQAWABEAFgARABYAEQAWABEAFgARABYAEQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAWABEAFgARAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AFgARAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAdAB0AHQAdAB0AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AUABQAFAAUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAEAAQABAAeAB4AKwArACsAKwArABMADQANAA0AUAATAA0AUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAUAANACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAA0ADQANAA0ADQANAA0ADQAeAA0AFgANAB4AHgAXABcAHgAeABcAFwAWABEAFgARABYAEQAWABEADQANAA0ADQATAFAADQANAB4ADQANAB4AHgAeAB4AHgAMAAwADQANAA0AHgANAA0AFgANAA0ADQANAA0ADQANAA0AHgANAB4ADQANAB4AHgAeACsAKwArACsAKwArACsAKwArACsAKwArACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAKwArACsAKwArACsAKwArACsAKwArACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAlACUAJQAlACUAJQAlACUAJQAlACUAJQArACsAKwArAA0AEQARACUAJQBHAFcAVwAWABEAFgARABYAEQAWABEAFgARACUAJQAWABEAFgARABYAEQAWABEAFQAWABEAEQAlAFcAVwBXAFcAVwBXAFcAVwBXAAQABAAEAAQABAAEACUAVwBXAFcAVwA2ACUAJQBXAFcAVwBHAEcAJQAlACUAKwBRAFcAUQBXAFEAVwBRAFcAUQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFEAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBRAFcAUQBXAFEAVwBXAFcAVwBXAFcAUQBXAFcAVwBXAFcAVwBRAFEAKwArAAQABAAVABUARwBHAFcAFQBRAFcAUQBXAFEAVwBRAFcAUQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFEAVwBRAFcAUQBXAFcAVwBXAFcAVwBRAFcAVwBXAFcAVwBXAFEAUQBXAFcAVwBXABUAUQBHAEcAVwArACsAKwArACsAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAKwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAKwAlACUAVwBXAFcAVwAlACUAJQAlACUAJQAlACUAJQAlACsAKwArACsAKwArACsAKwArACsAKwArAFEAUQBRAFEAUQBRAFEAUQBRAFEAUQBRAFEAUQBRAFEAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQArAFcAVwBXAFcAVwBXAFcAVwBXAFcAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQBPAE8ATwBPAE8ATwBPAE8AJQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACUAJQAlAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAEcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAKwArACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAADQATAA0AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABLAEsASwBLAEsASwBLAEsASwBLAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAFAABAAEAAQABAAeAAQABAAEAAQABAAEAAQABAAEAAQAHgBQAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AUABQAAQABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAeAA0ADQANAA0ADQArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAFAAUABQAFAAUABQAFAAUABQAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AUAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAB4AHgAeAB4AHgAeAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAHgAeAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAeAB4AUABQAFAAUABQAFAAUABQAFAAUABQAAQAUABQAFAABABQAFAAUABQAAQAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAeAB4AHgAeAAQAKwArACsAUABQAFAAUABQAFAAHgAeABoAHgArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAADgAOABMAEwArACsAKwArACsAKwArACsABAAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwANAA0ASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArACsAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABABQAFAAUABQAFAAUAAeAB4AHgBQAA4AUABQAAQAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAA0ADQBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwArACsAKwArACsAKwArACsAKwArAB4AWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYAFgAWABYACsAKwArAAQAHgAeAB4AHgAeAB4ADQANAA0AHgAeAB4AHgArAFAASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArAB4AHgBcAFwAXABcAFwAKgBcAFwAXABcAFwAXABcAFwAXABcAEsASwBLAEsASwBLAEsASwBLAEsAXABcAFwAXABcACsAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwArAFAAUABQAAQAUABQAFAAUABQAFAAUABQAAQABAArACsASwBLAEsASwBLAEsASwBLAEsASwArACsAHgANAA0ADQBcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAKgAqACoAXAAqACoAKgBcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXAAqAFwAKgAqACoAXABcACoAKgBcAFwAXABcAFwAKgAqAFwAKgBcACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFwAXABcACoAKgBQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAA0ADQBQAFAAUAAEAAQAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUAArACsAUABQAFAAUABQAFAAKwArAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgAeACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQADQAEAAQAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAVABVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBUAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVAFUAVQBVACsAKwArACsAKwArACsAKwArACsAKwArAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAWQBZAFkAKwArACsAKwBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAWgBaAFoAKwArACsAKwAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYABgAGAAYAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACUAJQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAJQAlACUAJQAlACUAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAKwArACsAKwArAFYABABWAFYAVgBWAFYAVgBWAFYAVgBWAB4AVgBWAFYAVgBWAFYAVgBWAFYAVgBWAFYAVgArAFYAVgBWAFYAVgArAFYAKwBWAFYAKwBWAFYAKwBWAFYAVgBWAFYAVgBWAFYAVgBWAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAEQAWAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUAAaAB4AKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAGAARABEAGAAYABMAEwAWABEAFAArACsAKwArACsAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACUAJQAlACUAJQAWABEAFgARABYAEQAWABEAFgARABYAEQAlACUAFgARACUAJQAlACUAJQAlACUAEQAlABEAKwAVABUAEwATACUAFgARABYAEQAWABEAJQAlACUAJQAlACUAJQAlACsAJQAbABoAJQArACsAKwArAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAAcAKwATACUAJQAbABoAJQAlABYAEQAlACUAEQAlABEAJQBXAFcAVwBXAFcAVwBXAFcAVwBXABUAFQAlACUAJQATACUAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXABYAJQARACUAJQAlAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwAWACUAEQAlABYAEQARABYAEQARABUAVwBRAFEAUQBRAFEAUQBRAFEAUQBRAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAEcARwArACsAVwBXAFcAVwBXAFcAKwArAFcAVwBXAFcAVwBXACsAKwBXAFcAVwBXAFcAVwArACsAVwBXAFcAKwArACsAGgAbACUAJQAlABsAGwArAB4AHgAeAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwAEAAQABAAQAB0AKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsADQANAA0AKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArAB4AHgAeAB4AHgAeAB4AHgAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAFAAHgAeAB4AKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAAQAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAA0AUABQAFAAUAArACsAKwArAFAAUABQAFAAUABQAFAAUAANAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwAeACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAKwArAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUAArACsAKwBQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwANAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAB4AUABQAFAAUABQAFAAUAArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUAArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArAA0AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAUABQAFAAUABQAAQABAAEACsABAAEACsAKwArACsAKwAEAAQABAAEAFAAUABQAFAAKwBQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAAQABAAEACsAKwArACsABABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArAA0ADQANAA0ADQANAA0ADQAeACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAFAAUABQAFAAUABQAFAAUAAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAArACsAKwArAFAAUABQAFAAUAANAA0ADQANAA0ADQAUACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsADQANAA0ADQANAA0ADQBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArAB4AHgAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArAFAAUABQAFAAUABQAAQABAAEAAQAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUAArAAQABAANACsAKwBQAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABABQAFAAUABQAB4AHgAeAB4AHgArACsAKwArACsAKwAEAAQABAAEAAQABAAEAA0ADQAeAB4AHgAeAB4AKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAQABAAEAAQABAAEAAQABAAEAAQABAAeAB4AHgANAA0ADQANACsAKwArACsAKwArACsAKwArACsAKwAeACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwBLAEsASwBLAEsASwBLAEsASwBLACsAKwArACsAKwArAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEACsASwBLAEsASwBLAEsASwBLAEsASwANAA0ADQANAFAABAAEAFAAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAeAA4AUAArACsAKwArACsAKwArACsAKwAEAFAAUABQAFAADQANAB4ADQAEAAQABAAEAB4ABAAEAEsASwBLAEsASwBLAEsASwBLAEsAUAAOAFAADQANAA0AKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAANAA0AHgANAA0AHgAEACsAUABQAFAAUABQAFAAUAArAFAAKwBQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAA0AKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsABAAEAAQABAArAFAAUABQAFAAUABQAFAAUAArACsAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAUABQACsAUABQAFAAUABQACsABAAEAFAABAAEAAQABAAEAAQABAArACsABAAEACsAKwAEAAQABAArACsAUAArACsAKwArACsAKwAEACsAKwArACsAKwBQAFAAUABQAFAABAAEACsAKwAEAAQABAAEAAQABAAEACsAKwArAAQABAAEAAQABAArACsAKwArACsAKwArACsAKwArACsABAAEAAQABAAEAAQABABQAFAAUABQAA0ADQANAA0AHgBLAEsASwBLAEsASwBLAEsASwBLAA0ADQArAB4ABABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAEAAQABAAEAFAAUAAeAFAAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAArACsABAAEAAQABAAEAAQABAAEAAQADgANAA0AEwATAB4AHgAeAA0ADQANAA0ADQANAA0ADQANAA0ADQANAA0ADQANAFAAUABQAFAABAAEACsAKwAEAA0ADQAeAFAAKwArACsAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAFAAKwArACsAKwArACsAKwBLAEsASwBLAEsASwBLAEsASwBLACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAXABcAFwAKwArACoAKgAqACoAKgAqACoAKgAqACoAKgAqACoAKgAqACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwBcAFwADQANAA0AKgBQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAeACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwBQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAKwArAFAAKwArAFAAUABQAFAAUABQAFAAUAArAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQAKwAEAAQAKwArAAQABAAEAAQAUAAEAFAABAAEAA0ADQANACsAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAArACsABAAEAAQABAAEAAQABABQAA4AUAAEACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAABAAEAAQABAAEAAQABAAEAAQABABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAFAABAAEAAQABAAOAB4ADQANAA0ADQAOAB4ABAArACsAKwArACsAKwArACsAUAAEAAQABAAEAAQABAAEAAQABAAEAAQAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAA0ADQANAFAADgAOAA4ADQANACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAEAAQABAAEACsABAAEAAQABAAEAAQABAAEAFAADQANAA0ADQANACsAKwArACsAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwAOABMAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQACsAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAArACsAKwAEACsABAAEACsABAAEAAQABAAEAAQABABQAAQAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAUABQAFAAUABQAFAAKwBQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQAKwAEAAQAKwAEAAQABAAEAAQAUAArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAABAAEAAQABAAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAB4AHgAeAB4AHgAeAB4AHgAaABoAGgAaAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwArACsAKwArACsAKwArAA0AUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsADQANAA0ADQANACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAASABIAEgAQwBDAEMAUABQAFAAUABDAFAAUABQAEgAQwBIAEMAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAASABDAEMAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwAJAAkACQAJAAkACQAJABYAEQArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABIAEMAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwANAA0AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArAAQABAAEAAQABAANACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEAA0ADQANAB4AHgAeAB4AHgAeAFAAUABQAFAADQAeACsAKwArACsAKwArACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwArAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAANAA0AHgAeACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwAEAFAABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwArACsAKwArACsAKwAEAAQABAAEAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAARwBHABUARwAJACsAKwArACsAKwArACsAKwArACsAKwAEAAQAKwArACsAKwArACsAKwArACsAKwArACsAKwArAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACsAKwArACsAKwArACsAKwBXAFcAVwBXAFcAVwBXAFcAVwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUQBRAFEAKwArACsAKwArACsAKwArACsAKwArACsAKwBRAFEAUQBRACsAKwArACsAKwArACsAKwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUAArACsAHgAEAAQADQAEAAQABAAEACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwArACsAKwArAB4AHgAeAB4AHgAeAB4AKwArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAAQABAAEAAQABAAeAB4AHgAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAB4AHgAEAAQABAAEAAQABAAEAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAEAAQABAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4ABAAEAAQAHgArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwArACsAKwArACsAKwArACsAKwArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwArACsAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwBQAFAAKwArAFAAKwArAFAAUAArACsAUABQAFAAUAArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACsAUAArAFAAUABQAFAAUABQAFAAKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwBQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAHgAeAFAAUABQAFAAUAArAFAAKwArACsAUABQAFAAUABQAFAAUAArAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAHgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAFAAUABQAFAAUABQAFAAUABQAFAAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAB4AHgAeAB4AHgAeAB4AHgAeACsAKwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAEsASwBLAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAeAB4AHgAeAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAeAB4AHgAeAB4AHgAeAB4ABAAeAB4AHgAeAB4AHgAeAB4AHgAeAAQAHgAeAA0ADQANAA0AHgArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAEAAQABAAEAAQAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAAQABAAEAAQABAAEAAQAKwAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwArAAQABAAEAAQABAAEAAQAKwAEAAQAKwAEAAQABAAEAAQAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwAEAAQABAAEAAQABAAEAFAAUABQAFAAUABQAFAAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwBQAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArABsAUABQAFAAUABQACsAKwBQAFAAUABQAFAAUABQAFAAUAAEAAQABAAEAAQABAAEACsAKwArACsAKwArACsAKwArAB4AHgAeAB4ABAAEAAQABAAEAAQABABQACsAKwArACsASwBLAEsASwBLAEsASwBLAEsASwArACsAKwArABYAFgArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAGgBQAFAAUAAaAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAeAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQACsAKwBQAFAAUABQACsAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwBQAFAAKwBQACsAKwBQACsAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAKwBQACsAUAArACsAKwArACsAKwBQACsAKwArACsAUAArAFAAKwBQACsAUABQAFAAKwBQAFAAKwBQACsAKwBQACsAUAArAFAAKwBQACsAUAArAFAAUAArAFAAKwArAFAAUABQAFAAKwBQAFAAUABQAFAAUABQACsAUABQAFAAUAArAFAAUABQAFAAKwBQACsAUABQAFAAUABQAFAAUABQAFAAUAArAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAArACsAKwArACsAUABQAFAAKwBQAFAAUABQAFAAKwBQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwAeAB4AKwArACsAKwArACsAKwArACsAKwArACsAKwArAE8ATwBPAE8ATwBPAE8ATwBPAE8ATwBPAE8AJQAlACUAHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHgAeAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB4AHgAeACUAJQAlAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAdAB0AHQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQApACkAKQApACkAKQApACkAKQApACkAKQApACkAKQApACkAKQApACkAKQApACkAKQApACkAJQAlACUAJQAlACAAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAeAB4AJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlAB4AHgAlACUAJQAlACUAHgAlACUAJQAlACUAIAAgACAAJQAlACAAJQAlACAAIAAgACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACEAIQAhACEAIQAlACUAIAAgACUAJQAgACAAIAAgACAAIAAgACAAIAAgACAAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAJQAlACUAIAAlACUAJQAlACAAIAAgACUAIAAgACAAJQAlACUAJQAlACUAJQAgACUAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAHgAlAB4AJQAeACUAJQAlACUAJQAgACUAJQAlACUAHgAlAB4AHgAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAeACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACAAIAAlACUAJQAlACAAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACAAJQAlACUAJQAgACAAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAHgAeAB4AHgAeAB4AHgAeACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAeAB4AHgAeAB4AHgAlACUAJQAlACUAJQAlACAAIAAgACUAJQAlACAAIAAgACAAIAAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeABcAFwAXABUAFQAVAB4AHgAeAB4AJQAlACUAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACAAIAAgACUAJQAlACUAJQAlACUAJQAlACAAJQAlACUAJQAlACUAJQAlACUAJQAlACAAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAlACUAJQAlACUAJQAlACUAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeACUAJQAlACUAJQAlACUAJQAeAB4AHgAeAB4AHgAeAB4AHgAeACUAJQAlACUAJQAlAB4AHgAeAB4AHgAeAB4AHgAlACUAJQAlACUAJQAlACUAHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAgACUAJQAgACUAJQAlACUAJQAlACUAJQAgACAAIAAgACAAIAAgACAAJQAlACUAJQAlACUAIAAlACUAJQAlACUAJQAlACUAJQAgACAAIAAgACAAIAAgACAAIAAgACUAJQAgACAAIAAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAgACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACAAIAAlACAAIAAlACAAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAgACAAIAAlACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAJQAlAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AKwAeAB4AHgAeAB4AHgAeAB4AHgAeAB4AHgArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAEsASwBLAEsASwBLAEsASwBLAEsAKwArACsAKwArACsAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAKwArAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXACUAJQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwAlACUAJQAlACUAJQAlACUAJQAlACUAVwBXACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQBXAFcAVwBXAFcAVwBXAFcAVwBXAFcAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAJQAlACUAKwAEACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArACsAKwArAA==",LETTER_NUMBER_MODIFIER=50,BK=1,CR$1=2,LF$1=3,CM=4,NL=5,WJ=7,ZW=8,GL=9,SP=10,ZWJ$1=11,B2=12,BA=13,BB=14,HY=15,CB=16,CL=17,CP=18,EX=19,IN=20,NS=21,OP=22,QU=23,IS=24,NU=25,PO=26,PR=27,SY=28,AI=29,AL=30,CJ=31,EB=32,EM=33,H2=34,H3=35,HL=36,ID=37,JL=38,JV=39,JT=40,RI$1=41,SA=42,XX=43,ea_OP=[9001,65288],BREAK_MANDATORY="!",BREAK_NOT_ALLOWED$1="×",BREAK_ALLOWED$1="÷",UnicodeTrie$1=createTrieFromBase64$1(base64$1),ALPHABETICS=[AL,HL],HARD_LINE_BREAKS=[BK,CR$1,LF$1,NL],SPACE$1=[SP,ZW],PREFIX_POSTFIX=[PR,PO],LINE_BREAKS=HARD_LINE_BREAKS.concat(SPACE$1),KOREAN_SYLLABLE_BLOCK=[JL,JV,JT,H2,H3],HYPHEN=[HY,BA],codePointsToCharacterClasses=function(g,B){B===void 0&&(B="strict");var x=[],Q=[],S=[];return g.forEach(function(D,H){var P=UnicodeTrie$1.get(D);if(P>LETTER_NUMBER_MODIFIER?(S.push(!0),P-=LETTER_NUMBER_MODIFIER):S.push(!1),["normal","auto","loose"].indexOf(B)!==-1&&[8208,8211,12316,12448].indexOf(D)!==-1)return Q.push(H),x.push(CB);if(P===CM||P===ZWJ$1){if(H===0)return Q.push(H),x.push(AL);var R=x[H-1];return LINE_BREAKS.indexOf(R)===-1?(Q.push(Q[H-1]),x.push(R)):(Q.push(H),x.push(AL))}if(Q.push(H),P===CJ)return x.push(B==="strict"?NS:ID);if(P===SA||P===AI)return x.push(AL);if(P===XX)return D>=131072&&D<=196605||D>=196608&&D<=262141?x.push(ID):x.push(AL);x.push(P)}),[Q,x,S]},isAdjacentWithSpaceIgnored=function(g,B,x,Q){var S=Q[x];if(Array.isArray(g)?g.indexOf(S)!==-1:g===S)for(var D=x;D<=Q.length;){D++;var H=Q[D];if(H===B)return!0;if(H!==SP)break}if(S===SP)for(var D=x;D>0;){D--;var P=Q[D];if(Array.isArray(g)?g.indexOf(P)!==-1:g===P)for(var R=x;R<=Q.length;){R++;var H=Q[R];if(H===B)return!0;if(H!==SP)break}if(P!==SP)break}return!1},previousNonSpaceClassType=function(g,B){for(var x=g;x>=0;){var Q=B[x];if(Q===SP)x--;else return Q}return 0},_lineBreakAtIndex=function(g,B,x,Q,S){if(x[Q]===0)return BREAK_NOT_ALLOWED$1;var D=Q-1;if(Array.isArray(S)&&S[D]===!0)return BREAK_NOT_ALLOWED$1;var H=D-1,P=D+1,R=B[D],Y=H>=0?B[H]:0,G=B[P];if(R===CR$1&&G===LF$1)return BREAK_NOT_ALLOWED$1;if(HARD_LINE_BREAKS.indexOf(R)!==-1)return BREAK_MANDATORY;if(HARD_LINE_BREAKS.indexOf(G)!==-1||SPACE$1.indexOf(G)!==-1)return BREAK_NOT_ALLOWED$1;if(previousNonSpaceClassType(D,B)===ZW)return BREAK_ALLOWED$1;if(UnicodeTrie$1.get(g[D])===ZWJ$1||(R===EB||R===EM)&&UnicodeTrie$1.get(g[P])===ZWJ$1||R===WJ||G===WJ||R===GL||[SP,BA,HY].indexOf(R)===-1&&G===GL||[CL,CP,EX,IS,SY].indexOf(G)!==-1||previousNonSpaceClassType(D,B)===OP||isAdjacentWithSpaceIgnored(QU,OP,D,B)||isAdjacentWithSpaceIgnored([CL,CP],NS,D,B)||isAdjacentWithSpaceIgnored(B2,B2,D,B))return BREAK_NOT_ALLOWED$1;if(R===SP)return BREAK_ALLOWED$1;if(R===QU||G===QU)return BREAK_NOT_ALLOWED$1;if(G===CB||R===CB)return BREAK_ALLOWED$1;if([BA,HY,NS].indexOf(G)!==-1||R===BB||Y===HL&&HYPHEN.indexOf(R)!==-1||R===SY&&G===HL||G===IN||ALPHABETICS.indexOf(G)!==-1&&R===NU||ALPHABETICS.indexOf(R)!==-1&&G===NU||R===PR&&[ID,EB,EM].indexOf(G)!==-1||[ID,EB,EM].indexOf(R)!==-1&&G===PO||ALPHABETICS.indexOf(R)!==-1&&PREFIX_POSTFIX.indexOf(G)!==-1||PREFIX_POSTFIX.indexOf(R)!==-1&&ALPHABETICS.indexOf(G)!==-1||[PR,PO].indexOf(R)!==-1&&(G===NU||[OP,HY].indexOf(G)!==-1&&B[P+1]===NU)||[OP,HY].indexOf(R)!==-1&&G===NU||R===NU&&[NU,SY,IS].indexOf(G)!==-1)return BREAK_NOT_ALLOWED$1;if([NU,SY,IS,CL,CP].indexOf(G)!==-1)for(var X=D;X>=0;){var ee=B[X];if(ee===NU)return BREAK_NOT_ALLOWED$1;if([SY,IS].indexOf(ee)!==-1)X--;else break}if([PR,PO].indexOf(G)!==-1)for(var X=[CL,CP].indexOf(R)!==-1?H:D;X>=0;){var ee=B[X];if(ee===NU)return BREAK_NOT_ALLOWED$1;if([SY,IS].indexOf(ee)!==-1)X--;else break}if(JL===R&&[JL,JV,H2,H3].indexOf(G)!==-1||[JV,H2].indexOf(R)!==-1&&[JV,JT].indexOf(G)!==-1||[JT,H3].indexOf(R)!==-1&&G===JT||KOREAN_SYLLABLE_BLOCK.indexOf(R)!==-1&&[IN,PO].indexOf(G)!==-1||KOREAN_SYLLABLE_BLOCK.indexOf(G)!==-1&&R===PR||ALPHABETICS.indexOf(R)!==-1&&ALPHABETICS.indexOf(G)!==-1||R===IS&&ALPHABETICS.indexOf(G)!==-1||ALPHABETICS.concat(NU).indexOf(R)!==-1&&G===OP&&ea_OP.indexOf(g[P])===-1||ALPHABETICS.concat(NU).indexOf(G)!==-1&&R===CP)return BREAK_NOT_ALLOWED$1;if(R===RI$1&&G===RI$1){for(var Ae=x[D],le=1;Ae>0&&(Ae--,B[Ae]===RI$1);)le++;if(le%2!==0)return BREAK_NOT_ALLOWED$1}return R===EB&&G===EM?BREAK_NOT_ALLOWED$1:BREAK_ALLOWED$1},cssFormattedClasses=function(g,B){B||(B={lineBreak:"normal",wordBreak:"normal"});var x=codePointsToCharacterClasses(g,B.lineBreak),Q=x[0],S=x[1],D=x[2];(B.wordBreak==="break-all"||B.wordBreak==="break-word")&&(S=S.map(function(P){return[NU,AL,SA].indexOf(P)!==-1?ID:P}));var H=B.wordBreak==="keep-all"?D.map(function(P,R){return P&&g[R]>=19968&&g[R]<=40959}):void 0;return[Q,S,H]},Break=function(){function g(B,x,Q,S){this.codePoints=B,this.required=x===BREAK_MANDATORY,this.start=Q,this.end=S}return g.prototype.slice=function(){return fromCodePoint$1.apply(void 0,this.codePoints.slice(this.start,this.end))},g}(),LineBreaker=function(g,B){var x=toCodePoints$1(g),Q=cssFormattedClasses(x,B),S=Q[0],D=Q[1],H=Q[2],P=x.length,R=0,Y=0;return{next:function(){if(Y>=P)return{done:!0,value:null};for(var G=BREAK_NOT_ALLOWED$1;Y<P&&(G=_lineBreakAtIndex(x,D,S,++Y,H))===BREAK_NOT_ALLOWED$1;);if(G!==BREAK_NOT_ALLOWED$1||Y===P){var X=new Break(x,G,R,Y);return R=Y,{value:X,done:!1}}return{done:!0,value:null}}}},FLAG_UNRESTRICTED=1,FLAG_ID=2,FLAG_INTEGER=4,FLAG_NUMBER=8,LINE_FEED=10,SOLIDUS=47,REVERSE_SOLIDUS=92,CHARACTER_TABULATION=9,SPACE=32,QUOTATION_MARK=34,EQUALS_SIGN=61,NUMBER_SIGN=35,DOLLAR_SIGN=36,PERCENTAGE_SIGN=37,APOSTROPHE=39,LEFT_PARENTHESIS=40,RIGHT_PARENTHESIS=41,LOW_LINE=95,HYPHEN_MINUS=45,EXCLAMATION_MARK=33,LESS_THAN_SIGN=60,GREATER_THAN_SIGN=62,COMMERCIAL_AT=64,LEFT_SQUARE_BRACKET=91,RIGHT_SQUARE_BRACKET=93,CIRCUMFLEX_ACCENT=61,LEFT_CURLY_BRACKET=123,QUESTION_MARK=63,RIGHT_CURLY_BRACKET=125,VERTICAL_LINE=124,TILDE=126,CONTROL=128,REPLACEMENT_CHARACTER=65533,ASTERISK=42,PLUS_SIGN=43,COMMA=44,COLON=58,SEMICOLON=59,FULL_STOP=46,NULL=0,BACKSPACE=8,LINE_TABULATION=11,SHIFT_OUT=14,INFORMATION_SEPARATOR_ONE=31,DELETE=127,EOF=-1,ZERO=48,a$1=97,e$1=101,f$1=102,u$1=117,z=122,A=65,E=69,F=70,U=85,Z=90,isDigit=function(g){return g>=ZERO&&g<=57},isSurrogateCodePoint=function(g){return g>=55296&&g<=57343},isHex=function(g){return isDigit(g)||g>=A&&g<=F||g>=a$1&&g<=f$1},isLowerCaseLetter=function(g){return g>=a$1&&g<=z},isUpperCaseLetter=function(g){return g>=A&&g<=Z},isLetter=function(g){return isLowerCaseLetter(g)||isUpperCaseLetter(g)},isNonASCIICodePoint=function(g){return g>=CONTROL},isWhiteSpace=function(g){return g===LINE_FEED||g===CHARACTER_TABULATION||g===SPACE},isNameStartCodePoint=function(g){return isLetter(g)||isNonASCIICodePoint(g)||g===LOW_LINE},isNameCodePoint=function(g){return isNameStartCodePoint(g)||isDigit(g)||g===HYPHEN_MINUS},isNonPrintableCodePoint=function(g){return g>=NULL&&g<=BACKSPACE||g===LINE_TABULATION||g>=SHIFT_OUT&&g<=INFORMATION_SEPARATOR_ONE||g===DELETE},isValidEscape=function(g,B){return g!==REVERSE_SOLIDUS?!1:B!==LINE_FEED},isIdentifierStart=function(g,B,x){return g===HYPHEN_MINUS?isNameStartCodePoint(B)||isValidEscape(B,x):isNameStartCodePoint(g)?!0:!!(g===REVERSE_SOLIDUS&&isValidEscape(g,B))},isNumberStart=function(g,B,x){return g===PLUS_SIGN||g===HYPHEN_MINUS?isDigit(B)?!0:B===FULL_STOP&&isDigit(x):isDigit(g===FULL_STOP?B:g)},stringToNumber=function(g){var B=0,x=1;(g[B]===PLUS_SIGN||g[B]===HYPHEN_MINUS)&&(g[B]===HYPHEN_MINUS&&(x=-1),B++);for(var Q=[];isDigit(g[B]);)Q.push(g[B++]);var S=Q.length?parseInt(fromCodePoint$1.apply(void 0,Q),10):0;g[B]===FULL_STOP&&B++;for(var D=[];isDigit(g[B]);)D.push(g[B++]);var H=D.length,P=H?parseInt(fromCodePoint$1.apply(void 0,D),10):0;(g[B]===E||g[B]===e$1)&&B++;var R=1;(g[B]===PLUS_SIGN||g[B]===HYPHEN_MINUS)&&(g[B]===HYPHEN_MINUS&&(R=-1),B++);for(var Y=[];isDigit(g[B]);)Y.push(g[B++]);var G=Y.length?parseInt(fromCodePoint$1.apply(void 0,Y),10):0;return x*(S+P*Math.pow(10,-H))*Math.pow(10,R*G)},LEFT_PARENTHESIS_TOKEN={type:2},RIGHT_PARENTHESIS_TOKEN={type:3},COMMA_TOKEN={type:4},SUFFIX_MATCH_TOKEN={type:13},PREFIX_MATCH_TOKEN={type:8},COLUMN_TOKEN={type:21},DASH_MATCH_TOKEN={type:9},INCLUDE_MATCH_TOKEN={type:10},LEFT_CURLY_BRACKET_TOKEN={type:11},RIGHT_CURLY_BRACKET_TOKEN={type:12},SUBSTRING_MATCH_TOKEN={type:14},BAD_URL_TOKEN={type:23},BAD_STRING_TOKEN={type:1},CDO_TOKEN={type:25},CDC_TOKEN={type:24},COLON_TOKEN={type:26},SEMICOLON_TOKEN={type:27},LEFT_SQUARE_BRACKET_TOKEN={type:28},RIGHT_SQUARE_BRACKET_TOKEN={type:29},WHITESPACE_TOKEN={type:31},EOF_TOKEN={type:32},Tokenizer=function(){function g(){this._value=[]}return g.prototype.write=function(B){this._value=this._value.concat(toCodePoints$1(B))},g.prototype.read=function(){for(var B=[],x=this.consumeToken();x!==EOF_TOKEN;)B.push(x),x=this.consumeToken();return B},g.prototype.consumeToken=function(){var B=this.consumeCodePoint();switch(B){case QUOTATION_MARK:return this.consumeStringToken(QUOTATION_MARK);case NUMBER_SIGN:var x=this.peekCodePoint(0),Q=this.peekCodePoint(1),S=this.peekCodePoint(2);if(isNameCodePoint(x)||isValidEscape(Q,S)){var D=isIdentifierStart(x,Q,S)?FLAG_ID:FLAG_UNRESTRICTED,H=this.consumeName();return{type:5,value:H,flags:D}}break;case DOLLAR_SIGN:if(this.peekCodePoint(0)===EQUALS_SIGN)return this.consumeCodePoint(),SUFFIX_MATCH_TOKEN;break;case APOSTROPHE:return this.consumeStringToken(APOSTROPHE);case LEFT_PARENTHESIS:return LEFT_PARENTHESIS_TOKEN;case RIGHT_PARENTHESIS:return RIGHT_PARENTHESIS_TOKEN;case ASTERISK:if(this.peekCodePoint(0)===EQUALS_SIGN)return this.consumeCodePoint(),SUBSTRING_MATCH_TOKEN;break;case PLUS_SIGN:if(isNumberStart(B,this.peekCodePoint(0),this.peekCodePoint(1)))return this.reconsumeCodePoint(B),this.consumeNumericToken();break;case COMMA:return COMMA_TOKEN;case HYPHEN_MINUS:var P=B,R=this.peekCodePoint(0),Y=this.peekCodePoint(1);if(isNumberStart(P,R,Y))return this.reconsumeCodePoint(B),this.consumeNumericToken();if(isIdentifierStart(P,R,Y))return this.reconsumeCodePoint(B),this.consumeIdentLikeToken();if(R===HYPHEN_MINUS&&Y===GREATER_THAN_SIGN)return this.consumeCodePoint(),this.consumeCodePoint(),CDC_TOKEN;break;case FULL_STOP:if(isNumberStart(B,this.peekCodePoint(0),this.peekCodePoint(1)))return this.reconsumeCodePoint(B),this.consumeNumericToken();break;case SOLIDUS:if(this.peekCodePoint(0)===ASTERISK)for(this.consumeCodePoint();;){var G=this.consumeCodePoint();if(G===ASTERISK&&(G=this.consumeCodePoint(),G===SOLIDUS))return this.consumeToken();if(G===EOF)return this.consumeToken()}break;case COLON:return COLON_TOKEN;case SEMICOLON:return SEMICOLON_TOKEN;case LESS_THAN_SIGN:if(this.peekCodePoint(0)===EXCLAMATION_MARK&&this.peekCodePoint(1)===HYPHEN_MINUS&&this.peekCodePoint(2)===HYPHEN_MINUS)return this.consumeCodePoint(),this.consumeCodePoint(),CDO_TOKEN;break;case COMMERCIAL_AT:var X=this.peekCodePoint(0),ee=this.peekCodePoint(1),Ae=this.peekCodePoint(2);if(isIdentifierStart(X,ee,Ae)){var H=this.consumeName();return{type:7,value:H}}break;case LEFT_SQUARE_BRACKET:return LEFT_SQUARE_BRACKET_TOKEN;case REVERSE_SOLIDUS:if(isValidEscape(B,this.peekCodePoint(0)))return this.reconsumeCodePoint(B),this.consumeIdentLikeToken();break;case RIGHT_SQUARE_BRACKET:return RIGHT_SQUARE_BRACKET_TOKEN;case CIRCUMFLEX_ACCENT:if(this.peekCodePoint(0)===EQUALS_SIGN)return this.consumeCodePoint(),PREFIX_MATCH_TOKEN;break;case LEFT_CURLY_BRACKET:return LEFT_CURLY_BRACKET_TOKEN;case RIGHT_CURLY_BRACKET:return RIGHT_CURLY_BRACKET_TOKEN;case u$1:case U:var le=this.peekCodePoint(0),ae=this.peekCodePoint(1);return le===PLUS_SIGN&&(isHex(ae)||ae===QUESTION_MARK)&&(this.consumeCodePoint(),this.consumeUnicodeRangeToken()),this.reconsumeCodePoint(B),this.consumeIdentLikeToken();case VERTICAL_LINE:if(this.peekCodePoint(0)===EQUALS_SIGN)return this.consumeCodePoint(),DASH_MATCH_TOKEN;if(this.peekCodePoint(0)===VERTICAL_LINE)return this.consumeCodePoint(),COLUMN_TOKEN;break;case TILDE:if(this.peekCodePoint(0)===EQUALS_SIGN)return this.consumeCodePoint(),INCLUDE_MATCH_TOKEN;break;case EOF:return EOF_TOKEN}return isWhiteSpace(B)?(this.consumeWhiteSpace(),WHITESPACE_TOKEN):isDigit(B)?(this.reconsumeCodePoint(B),this.consumeNumericToken()):isNameStartCodePoint(B)?(this.reconsumeCodePoint(B),this.consumeIdentLikeToken()):{type:6,value:fromCodePoint$1(B)}},g.prototype.consumeCodePoint=function(){var B=this._value.shift();return typeof B>"u"?-1:B},g.prototype.reconsumeCodePoint=function(B){this._value.unshift(B)},g.prototype.peekCodePoint=function(B){return B>=this._value.length?-1:this._value[B]},g.prototype.consumeUnicodeRangeToken=function(){for(var B=[],x=this.consumeCodePoint();isHex(x)&&B.length<6;)B.push(x),x=this.consumeCodePoint();for(var Q=!1;x===QUESTION_MARK&&B.length<6;)B.push(x),x=this.consumeCodePoint(),Q=!0;if(Q){var S=parseInt(fromCodePoint$1.apply(void 0,B.map(function(R){return R===QUESTION_MARK?ZERO:R})),16),D=parseInt(fromCodePoint$1.apply(void 0,B.map(function(R){return R===QUESTION_MARK?F:R})),16);return{type:30,start:S,end:D}}var H=parseInt(fromCodePoint$1.apply(void 0,B),16);if(this.peekCodePoint(0)===HYPHEN_MINUS&&isHex(this.peekCodePoint(1))){this.consumeCodePoint(),x=this.consumeCodePoint();for(var P=[];isHex(x)&&P.length<6;)P.push(x),x=this.consumeCodePoint();var D=parseInt(fromCodePoint$1.apply(void 0,P),16);return{type:30,start:H,end:D}}else return{type:30,start:H,end:H}},g.prototype.consumeIdentLikeToken=function(){var B=this.consumeName();return B.toLowerCase()==="url"&&this.peekCodePoint(0)===LEFT_PARENTHESIS?(this.consumeCodePoint(),this.consumeUrlToken()):this.peekCodePoint(0)===LEFT_PARENTHESIS?(this.consumeCodePoint(),{type:19,value:B}):{type:20,value:B}},g.prototype.consumeUrlToken=function(){var B=[];if(this.consumeWhiteSpace(),this.peekCodePoint(0)===EOF)return{type:22,value:""};var x=this.peekCodePoint(0);if(x===APOSTROPHE||x===QUOTATION_MARK){var Q=this.consumeStringToken(this.consumeCodePoint());return Q.type===0&&(this.consumeWhiteSpace(),this.peekCodePoint(0)===EOF||this.peekCodePoint(0)===RIGHT_PARENTHESIS)?(this.consumeCodePoint(),{type:22,value:Q.value}):(this.consumeBadUrlRemnants(),BAD_URL_TOKEN)}for(;;){var S=this.consumeCodePoint();if(S===EOF||S===RIGHT_PARENTHESIS)return{type:22,value:fromCodePoint$1.apply(void 0,B)};if(isWhiteSpace(S))return this.consumeWhiteSpace(),this.peekCodePoint(0)===EOF||this.peekCodePoint(0)===RIGHT_PARENTHESIS?(this.consumeCodePoint(),{type:22,value:fromCodePoint$1.apply(void 0,B)}):(this.consumeBadUrlRemnants(),BAD_URL_TOKEN);if(S===QUOTATION_MARK||S===APOSTROPHE||S===LEFT_PARENTHESIS||isNonPrintableCodePoint(S))return this.consumeBadUrlRemnants(),BAD_URL_TOKEN;if(S===REVERSE_SOLIDUS)if(isValidEscape(S,this.peekCodePoint(0)))B.push(this.consumeEscapedCodePoint());else return this.consumeBadUrlRemnants(),BAD_URL_TOKEN;else B.push(S)}},g.prototype.consumeWhiteSpace=function(){for(;isWhiteSpace(this.peekCodePoint(0));)this.consumeCodePoint()},g.prototype.consumeBadUrlRemnants=function(){for(;;){var B=this.consumeCodePoint();if(B===RIGHT_PARENTHESIS||B===EOF)return;isValidEscape(B,this.peekCodePoint(0))&&this.consumeEscapedCodePoint()}},g.prototype.consumeStringSlice=function(B){for(var x=5e4,Q="";B>0;){var S=Math.min(x,B);Q+=fromCodePoint$1.apply(void 0,this._value.splice(0,S)),B-=S}return this._value.shift(),Q},g.prototype.consumeStringToken=function(B){var x="",Q=0;do{var S=this._value[Q];if(S===EOF||S===void 0||S===B)return x+=this.consumeStringSlice(Q),{type:0,value:x};if(S===LINE_FEED)return this._value.splice(0,Q),BAD_STRING_TOKEN;if(S===REVERSE_SOLIDUS){var D=this._value[Q+1];D!==EOF&&D!==void 0&&(D===LINE_FEED?(x+=this.consumeStringSlice(Q),Q=-1,this._value.shift()):isValidEscape(S,D)&&(x+=this.consumeStringSlice(Q),x+=fromCodePoint$1(this.consumeEscapedCodePoint()),Q=-1))}Q++}while(!0)},g.prototype.consumeNumber=function(){var B=[],x=FLAG_INTEGER,Q=this.peekCodePoint(0);for((Q===PLUS_SIGN||Q===HYPHEN_MINUS)&&B.push(this.consumeCodePoint());isDigit(this.peekCodePoint(0));)B.push(this.consumeCodePoint());Q=this.peekCodePoint(0);var S=this.peekCodePoint(1);if(Q===FULL_STOP&&isDigit(S))for(B.push(this.consumeCodePoint(),this.consumeCodePoint()),x=FLAG_NUMBER;isDigit(this.peekCodePoint(0));)B.push(this.consumeCodePoint());Q=this.peekCodePoint(0),S=this.peekCodePoint(1);var D=this.peekCodePoint(2);if((Q===E||Q===e$1)&&((S===PLUS_SIGN||S===HYPHEN_MINUS)&&isDigit(D)||isDigit(S)))for(B.push(this.consumeCodePoint(),this.consumeCodePoint()),x=FLAG_NUMBER;isDigit(this.peekCodePoint(0));)B.push(this.consumeCodePoint());return[stringToNumber(B),x]},g.prototype.consumeNumericToken=function(){var B=this.consumeNumber(),x=B[0],Q=B[1],S=this.peekCodePoint(0),D=this.peekCodePoint(1),H=this.peekCodePoint(2);if(isIdentifierStart(S,D,H)){var P=this.consumeName();return{type:15,number:x,flags:Q,unit:P}}return S===PERCENTAGE_SIGN?(this.consumeCodePoint(),{type:16,number:x,flags:Q}):{type:17,number:x,flags:Q}},g.prototype.consumeEscapedCodePoint=function(){var B=this.consumeCodePoint();if(isHex(B)){for(var x=fromCodePoint$1(B);isHex(this.peekCodePoint(0))&&x.length<6;)x+=fromCodePoint$1(this.consumeCodePoint());isWhiteSpace(this.peekCodePoint(0))&&this.consumeCodePoint();var Q=parseInt(x,16);return Q===0||isSurrogateCodePoint(Q)||Q>1114111?REPLACEMENT_CHARACTER:Q}return B===EOF?REPLACEMENT_CHARACTER:B},g.prototype.consumeName=function(){for(var B="";;){var x=this.consumeCodePoint();if(isNameCodePoint(x))B+=fromCodePoint$1(x);else if(isValidEscape(x,this.peekCodePoint(0)))B+=fromCodePoint$1(this.consumeEscapedCodePoint());else return this.reconsumeCodePoint(x),B}},g}(),Parser$1=function(){function g(B){this._tokens=B}return g.create=function(B){var x=new Tokenizer;return x.write(B),new g(x.read())},g.parseValue=function(B){return g.create(B).parseComponentValue()},g.parseValues=function(B){return g.create(B).parseComponentValues()},g.prototype.parseComponentValue=function(){for(var B=this.consumeToken();B.type===31;)B=this.consumeToken();if(B.type===32)throw new SyntaxError("Error parsing CSS component value, unexpected EOF");this.reconsumeToken(B);var x=this.consumeComponentValue();do B=this.consumeToken();while(B.type===31);if(B.type===32)return x;throw new SyntaxError("Error parsing CSS component value, multiple values found when expecting only one")},g.prototype.parseComponentValues=function(){for(var B=[];;){var x=this.consumeComponentValue();if(x.type===32)return B;B.push(x),B.push()}},g.prototype.consumeComponentValue=function(){var B=this.consumeToken();switch(B.type){case 11:case 28:case 2:return this.consumeSimpleBlock(B.type);case 19:return this.consumeFunction(B)}return B},g.prototype.consumeSimpleBlock=function(B){for(var x={type:B,values:[]},Q=this.consumeToken();;){if(Q.type===32||isEndingTokenFor(Q,B))return x;this.reconsumeToken(Q),x.values.push(this.consumeComponentValue()),Q=this.consumeToken()}},g.prototype.consumeFunction=function(B){for(var x={name:B.value,values:[],type:18};;){var Q=this.consumeToken();if(Q.type===32||Q.type===3)return x;this.reconsumeToken(Q),x.values.push(this.consumeComponentValue())}},g.prototype.consumeToken=function(){var B=this._tokens.shift();return typeof B>"u"?EOF_TOKEN:B},g.prototype.reconsumeToken=function(B){this._tokens.unshift(B)},g}(),isDimensionToken=function(g){return g.type===15},isNumberToken=function(g){return g.type===17},isIdentToken=function(g){return g.type===20},isStringToken=function(g){return g.type===0},isIdentWithValue=function(g,B){return isIdentToken(g)&&g.value===B},nonWhiteSpace=function(g){return g.type!==31},nonFunctionArgSeparator=function(g){return g.type!==31&&g.type!==4},parseFunctionArgs=function(g){var B=[],x=[];return g.forEach(function(Q){if(Q.type===4){if(x.length===0)throw new Error("Error parsing function args, zero tokens for arg");B.push(x),x=[];return}Q.type!==31&&x.push(Q)}),x.length&&B.push(x),B},isEndingTokenFor=function(g,B){return B===11&&g.type===12||B===28&&g.type===29?!0:B===2&&g.type===3},isLength=function(g){return g.type===17||g.type===15},isLengthPercentage=function(g){return g.type===16||isLength(g)},parseLengthPercentageTuple=function(g){return g.length>1?[g[0],g[1]]:[g[0]]},ZERO_LENGTH={type:17,number:0,flags:FLAG_INTEGER},FIFTY_PERCENT={type:16,number:50,flags:FLAG_INTEGER},HUNDRED_PERCENT={type:16,number:100,flags:FLAG_INTEGER},getAbsoluteValueForTuple=function(g,B,x){var Q=g[0],S=g[1];return[getAbsoluteValue(Q,B),getAbsoluteValue(typeof S<"u"?S:Q,x)]},getAbsoluteValue=function(g,B){if(g.type===16)return g.number/100*B;if(isDimensionToken(g))switch(g.unit){case"rem":case"em":return 16*g.number;case"px":default:return g.number}return g.number},DEG="deg",GRAD="grad",RAD="rad",TURN="turn",angle={name:"angle",parse:function(g,B){if(B.type===15)switch(B.unit){case DEG:return Math.PI*B.number/180;case GRAD:return Math.PI/200*B.number;case RAD:return B.number;case TURN:return Math.PI*2*B.number}throw new Error("Unsupported angle type")}},isAngle=function(g){return g.type===15&&(g.unit===DEG||g.unit===GRAD||g.unit===RAD||g.unit===TURN)},parseNamedSide=function(g){var B=g.filter(isIdentToken).map(function(x){return x.value}).join(" ");switch(B){case"to bottom right":case"to right bottom":case"left top":case"top left":return[ZERO_LENGTH,ZERO_LENGTH];case"to top":case"bottom":return deg(0);case"to bottom left":case"to left bottom":case"right top":case"top right":return[ZERO_LENGTH,HUNDRED_PERCENT];case"to right":case"left":return deg(90);case"to top left":case"to left top":case"right bottom":case"bottom right":return[HUNDRED_PERCENT,HUNDRED_PERCENT];case"to bottom":case"top":return deg(180);case"to top right":case"to right top":case"left bottom":case"bottom left":return[HUNDRED_PERCENT,ZERO_LENGTH];case"to left":case"right":return deg(270)}return 0},deg=function(g){return Math.PI*g/180},color$1={name:"color",parse:function(g,B){if(B.type===18){var x=SUPPORTED_COLOR_FUNCTIONS[B.name];if(typeof x>"u")throw new Error('Attempting to parse an unsupported color function "'+B.name+'"');return x(g,B.values)}if(B.type===5){if(B.value.length===3){var Q=B.value.substring(0,1),S=B.value.substring(1,2),D=B.value.substring(2,3);return pack(parseInt(Q+Q,16),parseInt(S+S,16),parseInt(D+D,16),1)}if(B.value.length===4){var Q=B.value.substring(0,1),S=B.value.substring(1,2),D=B.value.substring(2,3),H=B.value.substring(3,4);return pack(parseInt(Q+Q,16),parseInt(S+S,16),parseInt(D+D,16),parseInt(H+H,16)/255)}if(B.value.length===6){var Q=B.value.substring(0,2),S=B.value.substring(2,4),D=B.value.substring(4,6);return pack(parseInt(Q,16),parseInt(S,16),parseInt(D,16),1)}if(B.value.length===8){var Q=B.value.substring(0,2),S=B.value.substring(2,4),D=B.value.substring(4,6),H=B.value.substring(6,8);return pack(parseInt(Q,16),parseInt(S,16),parseInt(D,16),parseInt(H,16)/255)}}if(B.type===20){var P=COLORS[B.value.toUpperCase()];if(typeof P<"u")return P}return COLORS.TRANSPARENT}},isTransparent=function(g){return(255&g)===0},asString=function(g){var B=255&g,x=255&g>>8,Q=255&g>>16,S=255&g>>24;return B<255?"rgba("+S+","+Q+","+x+","+B/255+")":"rgb("+S+","+Q+","+x+")"},pack=function(g,B,x,Q){return(g<<24|B<<16|x<<8|Math.round(Q*255)<<0)>>>0},getTokenColorValue=function(g,B){if(g.type===17)return g.number;if(g.type===16){var x=B===3?1:255;return B===3?g.number/100*x:Math.round(g.number/100*x)}return 0},rgb=function(g,B){var x=B.filter(nonFunctionArgSeparator);if(x.length===3){var Q=x.map(getTokenColorValue),S=Q[0],D=Q[1],H=Q[2];return pack(S,D,H,1)}if(x.length===4){var P=x.map(getTokenColorValue),S=P[0],D=P[1],H=P[2],R=P[3];return pack(S,D,H,R)}return 0};function hue2rgb(g,B,x){return x<0&&(x+=1),x>=1&&(x-=1),x<1/6?(B-g)*x*6+g:x<1/2?B:x<2/3?(B-g)*6*(2/3-x)+g:g}var hsl=function(g,B){var x=B.filter(nonFunctionArgSeparator),Q=x[0],S=x[1],D=x[2],H=x[3],P=(Q.type===17?deg(Q.number):angle.parse(g,Q))/(Math.PI*2),R=isLengthPercentage(S)?S.number/100:0,Y=isLengthPercentage(D)?D.number/100:0,G=typeof H<"u"&&isLengthPercentage(H)?getAbsoluteValue(H,1):1;if(R===0)return pack(Y*255,Y*255,Y*255,1);var X=Y<=.5?Y*(R+1):Y+R-Y*R,ee=Y*2-X,Ae=hue2rgb(ee,X,P+1/3),le=hue2rgb(ee,X,P),ae=hue2rgb(ee,X,P-1/3);return pack(Ae*255,le*255,ae*255,G)},SUPPORTED_COLOR_FUNCTIONS={hsl,hsla:hsl,rgb,rgba:rgb},parseColor=function(g,B){return color$1.parse(g,Parser$1.create(B).parseComponentValue())},COLORS={ALICEBLUE:4042850303,ANTIQUEWHITE:4209760255,AQUA:16777215,AQUAMARINE:2147472639,AZURE:4043309055,BEIGE:4126530815,BISQUE:4293182719,BLACK:255,BLANCHEDALMOND:4293643775,BLUE:65535,BLUEVIOLET:2318131967,BROWN:2771004159,BURLYWOOD:3736635391,CADETBLUE:1604231423,CHARTREUSE:2147418367,CHOCOLATE:3530104575,CORAL:4286533887,CORNFLOWERBLUE:1687547391,CORNSILK:4294499583,CRIMSON:3692313855,CYAN:16777215,DARKBLUE:35839,DARKCYAN:9145343,DARKGOLDENROD:3095837695,DARKGRAY:2846468607,DARKGREEN:6553855,DARKGREY:2846468607,DARKKHAKI:3182914559,DARKMAGENTA:2332068863,DARKOLIVEGREEN:1433087999,DARKORANGE:4287365375,DARKORCHID:2570243327,DARKRED:2332033279,DARKSALMON:3918953215,DARKSEAGREEN:2411499519,DARKSLATEBLUE:1211993087,DARKSLATEGRAY:793726975,DARKSLATEGREY:793726975,DARKTURQUOISE:13554175,DARKVIOLET:2483082239,DEEPPINK:4279538687,DEEPSKYBLUE:12582911,DIMGRAY:1768516095,DIMGREY:1768516095,DODGERBLUE:512819199,FIREBRICK:2988581631,FLORALWHITE:4294635775,FORESTGREEN:579543807,FUCHSIA:4278255615,GAINSBORO:3705462015,GHOSTWHITE:4177068031,GOLD:4292280575,GOLDENROD:3668254975,GRAY:2155905279,GREEN:8388863,GREENYELLOW:2919182335,GREY:2155905279,HONEYDEW:4043305215,HOTPINK:4285117695,INDIANRED:3445382399,INDIGO:1258324735,IVORY:4294963455,KHAKI:4041641215,LAVENDER:3873897215,LAVENDERBLUSH:4293981695,LAWNGREEN:2096890111,LEMONCHIFFON:4294626815,LIGHTBLUE:2916673279,LIGHTCORAL:4034953471,LIGHTCYAN:3774873599,LIGHTGOLDENRODYELLOW:4210742015,LIGHTGRAY:3553874943,LIGHTGREEN:2431553791,LIGHTGREY:3553874943,LIGHTPINK:4290167295,LIGHTSALMON:4288707327,LIGHTSEAGREEN:548580095,LIGHTSKYBLUE:2278488831,LIGHTSLATEGRAY:2005441023,LIGHTSLATEGREY:2005441023,LIGHTSTEELBLUE:2965692159,LIGHTYELLOW:4294959359,LIME:16711935,LIMEGREEN:852308735,LINEN:4210091775,MAGENTA:4278255615,MAROON:2147483903,MEDIUMAQUAMARINE:1724754687,MEDIUMBLUE:52735,MEDIUMORCHID:3126187007,MEDIUMPURPLE:2473647103,MEDIUMSEAGREEN:1018393087,MEDIUMSLATEBLUE:2070474495,MEDIUMSPRINGGREEN:16423679,MEDIUMTURQUOISE:1221709055,MEDIUMVIOLETRED:3340076543,MIDNIGHTBLUE:421097727,MINTCREAM:4127193855,MISTYROSE:4293190143,MOCCASIN:4293178879,NAVAJOWHITE:4292783615,NAVY:33023,OLDLACE:4260751103,OLIVE:2155872511,OLIVEDRAB:1804477439,ORANGE:4289003775,ORANGERED:4282712319,ORCHID:3664828159,PALEGOLDENROD:4008225535,PALEGREEN:2566625535,PALETURQUOISE:2951671551,PALEVIOLETRED:3681588223,PAPAYAWHIP:4293907967,PEACHPUFF:4292524543,PERU:3448061951,PINK:4290825215,PLUM:3718307327,POWDERBLUE:2967529215,PURPLE:2147516671,REBECCAPURPLE:1714657791,RED:4278190335,ROSYBROWN:3163525119,ROYALBLUE:1097458175,SADDLEBROWN:2336560127,SALMON:4202722047,SANDYBROWN:4104413439,SEAGREEN:780883967,SEASHELL:4294307583,SIENNA:2689740287,SILVER:3233857791,SKYBLUE:2278484991,SLATEBLUE:1784335871,SLATEGRAY:1887473919,SLATEGREY:1887473919,SNOW:4294638335,SPRINGGREEN:16744447,STEELBLUE:1182971135,TAN:3535047935,TEAL:8421631,THISTLE:3636451583,TOMATO:4284696575,TRANSPARENT:0,TURQUOISE:1088475391,VIOLET:4001558271,WHEAT:4125012991,WHITE:4294967295,WHITESMOKE:4126537215,YELLOW:4294902015,YELLOWGREEN:2597139199},backgroundClip={name:"background-clip",initialValue:"border-box",prefix:!1,type:1,parse:function(g,B){return B.map(function(x){if(isIdentToken(x))switch(x.value){case"padding-box":return 1;case"content-box":return 2}return 0})}},backgroundColor={name:"background-color",initialValue:"transparent",prefix:!1,type:3,format:"color"},parseColorStop=function(g,B){var x=color$1.parse(g,B[0]),Q=B[1];return Q&&isLengthPercentage(Q)?{color:x,stop:Q}:{color:x,stop:null}},processColorStops=function(g,B){var x=g[0],Q=g[g.length-1];x.stop===null&&(x.stop=ZERO_LENGTH),Q.stop===null&&(Q.stop=HUNDRED_PERCENT);for(var S=[],D=0,H=0;H<g.length;H++){var P=g[H].stop;if(P!==null){var R=getAbsoluteValue(P,B);R>D?S.push(R):S.push(D),D=R}else S.push(null)}for(var Y=null,H=0;H<S.length;H++){var G=S[H];if(G===null)Y===null&&(Y=H);else if(Y!==null){for(var X=H-Y,ee=S[Y-1],Ae=(G-ee)/(X+1),le=1;le<=X;le++)S[Y+le-1]=Ae*le;Y=null}}return g.map(function(ae,ge){var fe=ae.color;return{color:fe,stop:Math.max(Math.min(1,S[ge]/B),0)}})},getAngleFromCorner=function(g,B,x){var Q=B/2,S=x/2,D=getAbsoluteValue(g[0],B)-Q,H=S-getAbsoluteValue(g[1],x);return(Math.atan2(H,D)+Math.PI*2)%(Math.PI*2)},calculateGradientDirection=function(g,B,x){var Q=typeof g=="number"?g:getAngleFromCorner(g,B,x),S=Math.abs(B*Math.sin(Q))+Math.abs(x*Math.cos(Q)),D=B/2,H=x/2,P=S/2,R=Math.sin(Q-Math.PI/2)*P,Y=Math.cos(Q-Math.PI/2)*P;return[S,D-Y,D+Y,H-R,H+R]},distance=function(g,B){return Math.sqrt(g*g+B*B)},findCorner=function(g,B,x,Q,S){var D=[[0,0],[0,B],[g,0],[g,B]];return D.reduce(function(H,P){var R=P[0],Y=P[1],G=distance(x-R,Q-Y);return(S?G<H.optimumDistance:G>H.optimumDistance)?{optimumCorner:P,optimumDistance:G}:H},{optimumDistance:S?1/0:-1/0,optimumCorner:null}).optimumCorner},calculateRadius=function(g,B,x,Q,S){var D=0,H=0;switch(g.size){case 0:g.shape===0?D=H=Math.min(Math.abs(B),Math.abs(B-Q),Math.abs(x),Math.abs(x-S)):g.shape===1&&(D=Math.min(Math.abs(B),Math.abs(B-Q)),H=Math.min(Math.abs(x),Math.abs(x-S)));break;case 2:if(g.shape===0)D=H=Math.min(distance(B,x),distance(B,x-S),distance(B-Q,x),distance(B-Q,x-S));else if(g.shape===1){var P=Math.min(Math.abs(x),Math.abs(x-S))/Math.min(Math.abs(B),Math.abs(B-Q)),R=findCorner(Q,S,B,x,!0),Y=R[0],G=R[1];D=distance(Y-B,(G-x)/P),H=P*D}break;case 1:g.shape===0?D=H=Math.max(Math.abs(B),Math.abs(B-Q),Math.abs(x),Math.abs(x-S)):g.shape===1&&(D=Math.max(Math.abs(B),Math.abs(B-Q)),H=Math.max(Math.abs(x),Math.abs(x-S)));break;case 3:if(g.shape===0)D=H=Math.max(distance(B,x),distance(B,x-S),distance(B-Q,x),distance(B-Q,x-S));else if(g.shape===1){var P=Math.max(Math.abs(x),Math.abs(x-S))/Math.max(Math.abs(B),Math.abs(B-Q)),X=findCorner(Q,S,B,x,!1),Y=X[0],G=X[1];D=distance(Y-B,(G-x)/P),H=P*D}break}return Array.isArray(g.size)&&(D=getAbsoluteValue(g.size[0],Q),H=g.size.length===2?getAbsoluteValue(g.size[1],S):D),[D,H]},linearGradient=function(g,B){var x=deg(180),Q=[];return parseFunctionArgs(B).forEach(function(S,D){if(D===0){var H=S[0];if(H.type===20&&H.value==="to"){x=parseNamedSide(S);return}else if(isAngle(H)){x=angle.parse(g,H);return}}var P=parseColorStop(g,S);Q.push(P)}),{angle:x,stops:Q,type:1}},prefixLinearGradient=function(g,B){var x=deg(180),Q=[];return parseFunctionArgs(B).forEach(function(S,D){if(D===0){var H=S[0];if(H.type===20&&["top","left","right","bottom"].indexOf(H.value)!==-1){x=parseNamedSide(S);return}else if(isAngle(H)){x=(angle.parse(g,H)+deg(270))%deg(360);return}}var P=parseColorStop(g,S);Q.push(P)}),{angle:x,stops:Q,type:1}},webkitGradient=function(g,B){var x=deg(180),Q=[],S=1,D=0,H=3,P=[];return parseFunctionArgs(B).forEach(function(R,Y){var G=R[0];if(Y===0){if(isIdentToken(G)&&G.value==="linear"){S=1;return}else if(isIdentToken(G)&&G.value==="radial"){S=2;return}}if(G.type===18){if(G.name==="from"){var X=color$1.parse(g,G.values[0]);Q.push({stop:ZERO_LENGTH,color:X})}else if(G.name==="to"){var X=color$1.parse(g,G.values[0]);Q.push({stop:HUNDRED_PERCENT,color:X})}else if(G.name==="color-stop"){var ee=G.values.filter(nonFunctionArgSeparator);if(ee.length===2){var X=color$1.parse(g,ee[1]),Ae=ee[0];isNumberToken(Ae)&&Q.push({stop:{type:16,number:Ae.number*100,flags:Ae.flags},color:X})}}}}),S===1?{angle:(x+deg(180))%deg(360),stops:Q,type:S}:{size:H,shape:D,stops:Q,position:P,type:S}},CLOSEST_SIDE="closest-side",FARTHEST_SIDE="farthest-side",CLOSEST_CORNER="closest-corner",FARTHEST_CORNER="farthest-corner",CIRCLE="circle",ELLIPSE="ellipse",COVER="cover",CONTAIN="contain",radialGradient=function(g,B){var x=0,Q=3,S=[],D=[];return parseFunctionArgs(B).forEach(function(H,P){var R=!0;if(P===0){var Y=!1;R=H.reduce(function(X,ee){if(Y)if(isIdentToken(ee))switch(ee.value){case"center":return D.push(FIFTY_PERCENT),X;case"top":case"left":return D.push(ZERO_LENGTH),X;case"right":case"bottom":return D.push(HUNDRED_PERCENT),X}else(isLengthPercentage(ee)||isLength(ee))&&D.push(ee);else if(isIdentToken(ee))switch(ee.value){case CIRCLE:return x=0,!1;case ELLIPSE:return x=1,!1;case"at":return Y=!0,!1;case CLOSEST_SIDE:return Q=0,!1;case COVER:case FARTHEST_SIDE:return Q=1,!1;case CONTAIN:case CLOSEST_CORNER:return Q=2,!1;case FARTHEST_CORNER:return Q=3,!1}else if(isLength(ee)||isLengthPercentage(ee))return Array.isArray(Q)||(Q=[]),Q.push(ee),!1;return X},R)}if(R){var G=parseColorStop(g,H);S.push(G)}}),{size:Q,shape:x,stops:S,position:D,type:2}},prefixRadialGradient=function(g,B){var x=0,Q=3,S=[],D=[];return parseFunctionArgs(B).forEach(function(H,P){var R=!0;if(P===0?R=H.reduce(function(G,X){if(isIdentToken(X))switch(X.value){case"center":return D.push(FIFTY_PERCENT),!1;case"top":case"left":return D.push(ZERO_LENGTH),!1;case"right":case"bottom":return D.push(HUNDRED_PERCENT),!1}else if(isLengthPercentage(X)||isLength(X))return D.push(X),!1;return G},R):P===1&&(R=H.reduce(function(G,X){if(isIdentToken(X))switch(X.value){case CIRCLE:return x=0,!1;case ELLIPSE:return x=1,!1;case CONTAIN:case CLOSEST_SIDE:return Q=0,!1;case FARTHEST_SIDE:return Q=1,!1;case CLOSEST_CORNER:return Q=2,!1;case COVER:case FARTHEST_CORNER:return Q=3,!1}else if(isLength(X)||isLengthPercentage(X))return Array.isArray(Q)||(Q=[]),Q.push(X),!1;return G},R)),R){var Y=parseColorStop(g,H);S.push(Y)}}),{size:Q,shape:x,stops:S,position:D,type:2}},isLinearGradient=function(g){return g.type===1},isRadialGradient=function(g){return g.type===2},image={name:"image",parse:function(g,B){if(B.type===22){var x={url:B.value,type:0};return g.cache.addImage(B.value),x}if(B.type===18){var Q=SUPPORTED_IMAGE_FUNCTIONS[B.name];if(typeof Q>"u")throw new Error('Attempting to parse an unsupported image function "'+B.name+'"');return Q(g,B.values)}throw new Error("Unsupported image type "+B.type)}};function isSupportedImage(g){return!(g.type===20&&g.value==="none")&&(g.type!==18||!!SUPPORTED_IMAGE_FUNCTIONS[g.name])}var SUPPORTED_IMAGE_FUNCTIONS={"linear-gradient":linearGradient,"-moz-linear-gradient":prefixLinearGradient,"-ms-linear-gradient":prefixLinearGradient,"-o-linear-gradient":prefixLinearGradient,"-webkit-linear-gradient":prefixLinearGradient,"radial-gradient":radialGradient,"-moz-radial-gradient":prefixRadialGradient,"-ms-radial-gradient":prefixRadialGradient,"-o-radial-gradient":prefixRadialGradient,"-webkit-radial-gradient":prefixRadialGradient,"-webkit-gradient":webkitGradient},backgroundImage={name:"background-image",initialValue:"none",type:1,prefix:!1,parse:function(g,B){if(B.length===0)return[];var x=B[0];return x.type===20&&x.value==="none"?[]:B.filter(function(Q){return nonFunctionArgSeparator(Q)&&isSupportedImage(Q)}).map(function(Q){return image.parse(g,Q)})}},backgroundOrigin={name:"background-origin",initialValue:"border-box",prefix:!1,type:1,parse:function(g,B){return B.map(function(x){if(isIdentToken(x))switch(x.value){case"padding-box":return 1;case"content-box":return 2}return 0})}},backgroundPosition={name:"background-position",initialValue:"0% 0%",type:1,prefix:!1,parse:function(g,B){return parseFunctionArgs(B).map(function(x){return x.filter(isLengthPercentage)}).map(parseLengthPercentageTuple)}},backgroundRepeat={name:"background-repeat",initialValue:"repeat",prefix:!1,type:1,parse:function(g,B){return parseFunctionArgs(B).map(function(x){return x.filter(isIdentToken).map(function(Q){return Q.value}).join(" ")}).map(parseBackgroundRepeat)}},parseBackgroundRepeat=function(g){switch(g){case"no-repeat":return 1;case"repeat-x":case"repeat no-repeat":return 2;case"repeat-y":case"no-repeat repeat":return 3;case"repeat":default:return 0}},BACKGROUND_SIZE;(function(g){g.AUTO="auto",g.CONTAIN="contain",g.COVER="cover"})(BACKGROUND_SIZE||(BACKGROUND_SIZE={}));var backgroundSize={name:"background-size",initialValue:"0",prefix:!1,type:1,parse:function(g,B){return parseFunctionArgs(B).map(function(x){return x.filter(isBackgroundSizeInfoToken)})}},isBackgroundSizeInfoToken=function(g){return isIdentToken(g)||isLengthPercentage(g)},borderColorForSide=function(g){return{name:"border-"+g+"-color",initialValue:"transparent",prefix:!1,type:3,format:"color"}},borderTopColor=borderColorForSide("top"),borderRightColor=borderColorForSide("right"),borderBottomColor=borderColorForSide("bottom"),borderLeftColor=borderColorForSide("left"),borderRadiusForSide=function(g){return{name:"border-radius-"+g,initialValue:"0 0",prefix:!1,type:1,parse:function(B,x){return parseLengthPercentageTuple(x.filter(isLengthPercentage))}}},borderTopLeftRadius=borderRadiusForSide("top-left"),borderTopRightRadius=borderRadiusForSide("top-right"),borderBottomRightRadius=borderRadiusForSide("bottom-right"),borderBottomLeftRadius=borderRadiusForSide("bottom-left"),borderStyleForSide=function(g){return{name:"border-"+g+"-style",initialValue:"solid",prefix:!1,type:2,parse:function(B,x){switch(x){case"none":return 0;case"dashed":return 2;case"dotted":return 3;case"double":return 4}return 1}}},borderTopStyle=borderStyleForSide("top"),borderRightStyle=borderStyleForSide("right"),borderBottomStyle=borderStyleForSide("bottom"),borderLeftStyle=borderStyleForSide("left"),borderWidthForSide=function(g){return{name:"border-"+g+"-width",initialValue:"0",type:0,prefix:!1,parse:function(B,x){return isDimensionToken(x)?x.number:0}}},borderTopWidth=borderWidthForSide("top"),borderRightWidth=borderWidthForSide("right"),borderBottomWidth=borderWidthForSide("bottom"),borderLeftWidth=borderWidthForSide("left"),color={name:"color",initialValue:"transparent",prefix:!1,type:3,format:"color"},direction={name:"direction",initialValue:"ltr",prefix:!1,type:2,parse:function(g,B){switch(B){case"rtl":return 1;case"ltr":default:return 0}}},display={name:"display",initialValue:"inline-block",prefix:!1,type:1,parse:function(g,B){return B.filter(isIdentToken).reduce(function(x,Q){return x|parseDisplayValue(Q.value)},0)}},parseDisplayValue=function(g){switch(g){case"block":case"-webkit-box":return 2;case"inline":return 4;case"run-in":return 8;case"flow":return 16;case"flow-root":return 32;case"table":return 64;case"flex":case"-webkit-flex":return 128;case"grid":case"-ms-grid":return 256;case"ruby":return 512;case"subgrid":return 1024;case"list-item":return 2048;case"table-row-group":return 4096;case"table-header-group":return 8192;case"table-footer-group":return 16384;case"table-row":return 32768;case"table-cell":return 65536;case"table-column-group":return 131072;case"table-column":return 262144;case"table-caption":return 524288;case"ruby-base":return 1048576;case"ruby-text":return 2097152;case"ruby-base-container":return 4194304;case"ruby-text-container":return 8388608;case"contents":return 16777216;case"inline-block":return 33554432;case"inline-list-item":return 67108864;case"inline-table":return 134217728;case"inline-flex":return 268435456;case"inline-grid":return 536870912}return 0},float={name:"float",initialValue:"none",prefix:!1,type:2,parse:function(g,B){switch(B){case"left":return 1;case"right":return 2;case"inline-start":return 3;case"inline-end":return 4}return 0}},letterSpacing={name:"letter-spacing",initialValue:"0",prefix:!1,type:0,parse:function(g,B){return B.type===20&&B.value==="normal"?0:B.type===17||B.type===15?B.number:0}},LINE_BREAK;(function(g){g.NORMAL="normal",g.STRICT="strict"})(LINE_BREAK||(LINE_BREAK={}));var lineBreak={name:"line-break",initialValue:"normal",prefix:!1,type:2,parse:function(g,B){switch(B){case"strict":return LINE_BREAK.STRICT;case"normal":default:return LINE_BREAK.NORMAL}}},lineHeight={name:"line-height",initialValue:"normal",prefix:!1,type:4},computeLineHeight=function(g,B){return isIdentToken(g)&&g.value==="normal"?1.2*B:g.type===17?B*g.number:isLengthPercentage(g)?getAbsoluteValue(g,B):B},listStyleImage={name:"list-style-image",initialValue:"none",type:0,prefix:!1,parse:function(g,B){return B.type===20&&B.value==="none"?null:image.parse(g,B)}},listStylePosition={name:"list-style-position",initialValue:"outside",prefix:!1,type:2,parse:function(g,B){switch(B){case"inside":return 0;case"outside":default:return 1}}},listStyleType={name:"list-style-type",initialValue:"none",prefix:!1,type:2,parse:function(g,B){switch(B){case"disc":return 0;case"circle":return 1;case"square":return 2;case"decimal":return 3;case"cjk-decimal":return 4;case"decimal-leading-zero":return 5;case"lower-roman":return 6;case"upper-roman":return 7;case"lower-greek":return 8;case"lower-alpha":return 9;case"upper-alpha":return 10;case"arabic-indic":return 11;case"armenian":return 12;case"bengali":return 13;case"cambodian":return 14;case"cjk-earthly-branch":return 15;case"cjk-heavenly-stem":return 16;case"cjk-ideographic":return 17;case"devanagari":return 18;case"ethiopic-numeric":return 19;case"georgian":return 20;case"gujarati":return 21;case"gurmukhi":return 22;case"hebrew":return 22;case"hiragana":return 23;case"hiragana-iroha":return 24;case"japanese-formal":return 25;case"japanese-informal":return 26;case"kannada":return 27;case"katakana":return 28;case"katakana-iroha":return 29;case"khmer":return 30;case"korean-hangul-formal":return 31;case"korean-hanja-formal":return 32;case"korean-hanja-informal":return 33;case"lao":return 34;case"lower-armenian":return 35;case"malayalam":return 36;case"mongolian":return 37;case"myanmar":return 38;case"oriya":return 39;case"persian":return 40;case"simp-chinese-formal":return 41;case"simp-chinese-informal":return 42;case"tamil":return 43;case"telugu":return 44;case"thai":return 45;case"tibetan":return 46;case"trad-chinese-formal":return 47;case"trad-chinese-informal":return 48;case"upper-armenian":return 49;case"disclosure-open":return 50;case"disclosure-closed":return 51;case"none":default:return-1}}},marginForSide=function(g){return{name:"margin-"+g,initialValue:"0",prefix:!1,type:4}},marginTop=marginForSide("top"),marginRight=marginForSide("right"),marginBottom=marginForSide("bottom"),marginLeft=marginForSide("left"),overflow={name:"overflow",initialValue:"visible",prefix:!1,type:1,parse:function(g,B){return B.filter(isIdentToken).map(function(x){switch(x.value){case"hidden":return 1;case"scroll":return 2;case"clip":return 3;case"auto":return 4;case"visible":default:return 0}})}},overflowWrap={name:"overflow-wrap",initialValue:"normal",prefix:!1,type:2,parse:function(g,B){switch(B){case"break-word":return"break-word";case"normal":default:return"normal"}}},paddingForSide=function(g){return{name:"padding-"+g,initialValue:"0",prefix:!1,type:3,format:"length-percentage"}},paddingTop=paddingForSide("top"),paddingRight=paddingForSide("right"),paddingBottom=paddingForSide("bottom"),paddingLeft=paddingForSide("left"),textAlign={name:"text-align",initialValue:"left",prefix:!1,type:2,parse:function(g,B){switch(B){case"right":return 2;case"center":case"justify":return 1;case"left":default:return 0}}},position={name:"position",initialValue:"static",prefix:!1,type:2,parse:function(g,B){switch(B){case"relative":return 1;case"absolute":return 2;case"fixed":return 3;case"sticky":return 4}return 0}},textShadow={name:"text-shadow",initialValue:"none",type:1,prefix:!1,parse:function(g,B){return B.length===1&&isIdentWithValue(B[0],"none")?[]:parseFunctionArgs(B).map(function(x){for(var Q={color:COLORS.TRANSPARENT,offsetX:ZERO_LENGTH,offsetY:ZERO_LENGTH,blur:ZERO_LENGTH},S=0,D=0;D<x.length;D++){var H=x[D];isLength(H)?(S===0?Q.offsetX=H:S===1?Q.offsetY=H:Q.blur=H,S++):Q.color=color$1.parse(g,H)}return Q})}},textTransform={name:"text-transform",initialValue:"none",prefix:!1,type:2,parse:function(g,B){switch(B){case"uppercase":return 2;case"lowercase":return 1;case"capitalize":return 3}return 0}},transform$1={name:"transform",initialValue:"none",prefix:!0,type:0,parse:function(g,B){if(B.type===20&&B.value==="none")return null;if(B.type===18){var x=SUPPORTED_TRANSFORM_FUNCTIONS[B.name];if(typeof x>"u")throw new Error('Attempting to parse an unsupported transform function "'+B.name+'"');return x(B.values)}return null}},matrix=function(g){var B=g.filter(function(x){return x.type===17}).map(function(x){return x.number});return B.length===6?B:null},matrix3d=function(g){var B=g.filter(function(R){return R.type===17}).map(function(R){return R.number}),x=B[0],Q=B[1];B[2],B[3];var S=B[4],D=B[5];B[6],B[7],B[8],B[9],B[10],B[11];var H=B[12],P=B[13];return B[14],B[15],B.length===16?[x,Q,S,D,H,P]:null},SUPPORTED_TRANSFORM_FUNCTIONS={matrix,matrix3d},DEFAULT_VALUE={type:16,number:50,flags:FLAG_INTEGER},DEFAULT=[DEFAULT_VALUE,DEFAULT_VALUE],transformOrigin={name:"transform-origin",initialValue:"50% 50%",prefix:!0,type:1,parse:function(g,B){var x=B.filter(isLengthPercentage);return x.length!==2?DEFAULT:[x[0],x[1]]}},visibility={name:"visible",initialValue:"none",prefix:!1,type:2,parse:function(g,B){switch(B){case"hidden":return 1;case"collapse":return 2;case"visible":default:return 0}}},WORD_BREAK;(function(g){g.NORMAL="normal",g.BREAK_ALL="break-all",g.KEEP_ALL="keep-all"})(WORD_BREAK||(WORD_BREAK={}));var wordBreak={name:"word-break",initialValue:"normal",prefix:!1,type:2,parse:function(g,B){switch(B){case"break-all":return WORD_BREAK.BREAK_ALL;case"keep-all":return WORD_BREAK.KEEP_ALL;case"normal":default:return WORD_BREAK.NORMAL}}},zIndex={name:"z-index",initialValue:"auto",prefix:!1,type:0,parse:function(g,B){if(B.type===20)return{auto:!0,order:0};if(isNumberToken(B))return{auto:!1,order:B.number};throw new Error("Invalid z-index number parsed")}},time={name:"time",parse:function(g,B){if(B.type===15)switch(B.unit.toLowerCase()){case"s":return 1e3*B.number;case"ms":return B.number}throw new Error("Unsupported time type")}},opacity={name:"opacity",initialValue:"1",type:0,prefix:!1,parse:function(g,B){return isNumberToken(B)?B.number:1}},textDecorationColor={name:"text-decoration-color",initialValue:"transparent",prefix:!1,type:3,format:"color"},textDecorationLine={name:"text-decoration-line",initialValue:"none",prefix:!1,type:1,parse:function(g,B){return B.filter(isIdentToken).map(function(x){switch(x.value){case"underline":return 1;case"overline":return 2;case"line-through":return 3;case"none":return 4}return 0}).filter(function(x){return x!==0})}},fontFamily={name:"font-family",initialValue:"",prefix:!1,type:1,parse:function(g,B){var x=[],Q=[];return B.forEach(function(S){switch(S.type){case 20:case 0:x.push(S.value);break;case 17:x.push(S.number.toString());break;case 4:Q.push(x.join(" ")),x.length=0;break}}),x.length&&Q.push(x.join(" ")),Q.map(function(S){return S.indexOf(" ")===-1?S:"'"+S+"'"})}},fontSize={name:"font-size",initialValue:"0",prefix:!1,type:3,format:"length"},fontWeight={name:"font-weight",initialValue:"normal",type:0,prefix:!1,parse:function(g,B){if(isNumberToken(B))return B.number;if(isIdentToken(B))switch(B.value){case"bold":return 700;case"normal":default:return 400}return 400}},fontVariant={name:"font-variant",initialValue:"none",type:1,prefix:!1,parse:function(g,B){return B.filter(isIdentToken).map(function(x){return x.value})}},fontStyle={name:"font-style",initialValue:"normal",prefix:!1,type:2,parse:function(g,B){switch(B){case"oblique":return"oblique";case"italic":return"italic";case"normal":default:return"normal"}}},contains=function(g,B){return(g&B)!==0},content={name:"content",initialValue:"none",type:1,prefix:!1,parse:function(g,B){if(B.length===0)return[];var x=B[0];return x.type===20&&x.value==="none"?[]:B}},counterIncrement={name:"counter-increment",initialValue:"none",prefix:!0,type:1,parse:function(g,B){if(B.length===0)return null;var x=B[0];if(x.type===20&&x.value==="none")return null;for(var Q=[],S=B.filter(nonWhiteSpace),D=0;D<S.length;D++){var H=S[D],P=S[D+1];if(H.type===20){var R=P&&isNumberToken(P)?P.number:1;Q.push({counter:H.value,increment:R})}}return Q}},counterReset={name:"counter-reset",initialValue:"none",prefix:!0,type:1,parse:function(g,B){if(B.length===0)return[];for(var x=[],Q=B.filter(nonWhiteSpace),S=0;S<Q.length;S++){var D=Q[S],H=Q[S+1];if(isIdentToken(D)&&D.value!=="none"){var P=H&&isNumberToken(H)?H.number:0;x.push({counter:D.value,reset:P})}}return x}},duration={name:"duration",initialValue:"0s",prefix:!1,type:1,parse:function(g,B){return B.filter(isDimensionToken).map(function(x){return time.parse(g,x)})}},quotes={name:"quotes",initialValue:"none",prefix:!0,type:1,parse:function(g,B){if(B.length===0)return null;var x=B[0];if(x.type===20&&x.value==="none")return null;var Q=[],S=B.filter(isStringToken);if(S.length%2!==0)return null;for(var D=0;D<S.length;D+=2){var H=S[D].value,P=S[D+1].value;Q.push({open:H,close:P})}return Q}},getQuote=function(g,B,x){if(!g)return"";var Q=g[Math.min(B,g.length-1)];return Q?x?Q.open:Q.close:""},boxShadow={name:"box-shadow",initialValue:"none",type:1,prefix:!1,parse:function(g,B){return B.length===1&&isIdentWithValue(B[0],"none")?[]:parseFunctionArgs(B).map(function(x){for(var Q={color:255,offsetX:ZERO_LENGTH,offsetY:ZERO_LENGTH,blur:ZERO_LENGTH,spread:ZERO_LENGTH,inset:!1},S=0,D=0;D<x.length;D++){var H=x[D];isIdentWithValue(H,"inset")?Q.inset=!0:isLength(H)?(S===0?Q.offsetX=H:S===1?Q.offsetY=H:S===2?Q.blur=H:Q.spread=H,S++):Q.color=color$1.parse(g,H)}return Q})}},paintOrder={name:"paint-order",initialValue:"normal",prefix:!1,type:1,parse:function(g,B){var x=[0,1,2],Q=[];return B.filter(isIdentToken).forEach(function(S){switch(S.value){case"stroke":Q.push(1);break;case"fill":Q.push(0);break;case"markers":Q.push(2);break}}),x.forEach(function(S){Q.indexOf(S)===-1&&Q.push(S)}),Q}},webkitTextStrokeColor={name:"-webkit-text-stroke-color",initialValue:"currentcolor",prefix:!1,type:3,format:"color"},webkitTextStrokeWidth={name:"-webkit-text-stroke-width",initialValue:"0",type:0,prefix:!1,parse:function(g,B){return isDimensionToken(B)?B.number:0}},CSSParsedDeclaration=function(){function g(B,x){var Q,S;this.animationDuration=parse(B,duration,x.animationDuration),this.backgroundClip=parse(B,backgroundClip,x.backgroundClip),this.backgroundColor=parse(B,backgroundColor,x.backgroundColor),this.backgroundImage=parse(B,backgroundImage,x.backgroundImage),this.backgroundOrigin=parse(B,backgroundOrigin,x.backgroundOrigin),this.backgroundPosition=parse(B,backgroundPosition,x.backgroundPosition),this.backgroundRepeat=parse(B,backgroundRepeat,x.backgroundRepeat),this.backgroundSize=parse(B,backgroundSize,x.backgroundSize),this.borderTopColor=parse(B,borderTopColor,x.borderTopColor),this.borderRightColor=parse(B,borderRightColor,x.borderRightColor),this.borderBottomColor=parse(B,borderBottomColor,x.borderBottomColor),this.borderLeftColor=parse(B,borderLeftColor,x.borderLeftColor),this.borderTopLeftRadius=parse(B,borderTopLeftRadius,x.borderTopLeftRadius),this.borderTopRightRadius=parse(B,borderTopRightRadius,x.borderTopRightRadius),this.borderBottomRightRadius=parse(B,borderBottomRightRadius,x.borderBottomRightRadius),this.borderBottomLeftRadius=parse(B,borderBottomLeftRadius,x.borderBottomLeftRadius),this.borderTopStyle=parse(B,borderTopStyle,x.borderTopStyle),this.borderRightStyle=parse(B,borderRightStyle,x.borderRightStyle),this.borderBottomStyle=parse(B,borderBottomStyle,x.borderBottomStyle),this.borderLeftStyle=parse(B,borderLeftStyle,x.borderLeftStyle),this.borderTopWidth=parse(B,borderTopWidth,x.borderTopWidth),this.borderRightWidth=parse(B,borderRightWidth,x.borderRightWidth),this.borderBottomWidth=parse(B,borderBottomWidth,x.borderBottomWidth),this.borderLeftWidth=parse(B,borderLeftWidth,x.borderLeftWidth),this.boxShadow=parse(B,boxShadow,x.boxShadow),this.color=parse(B,color,x.color),this.direction=parse(B,direction,x.direction),this.display=parse(B,display,x.display),this.float=parse(B,float,x.cssFloat),this.fontFamily=parse(B,fontFamily,x.fontFamily),this.fontSize=parse(B,fontSize,x.fontSize),this.fontStyle=parse(B,fontStyle,x.fontStyle),this.fontVariant=parse(B,fontVariant,x.fontVariant),this.fontWeight=parse(B,fontWeight,x.fontWeight),this.letterSpacing=parse(B,letterSpacing,x.letterSpacing),this.lineBreak=parse(B,lineBreak,x.lineBreak),this.lineHeight=parse(B,lineHeight,x.lineHeight),this.listStyleImage=parse(B,listStyleImage,x.listStyleImage),this.listStylePosition=parse(B,listStylePosition,x.listStylePosition),this.listStyleType=parse(B,listStyleType,x.listStyleType),this.marginTop=parse(B,marginTop,x.marginTop),this.marginRight=parse(B,marginRight,x.marginRight),this.marginBottom=parse(B,marginBottom,x.marginBottom),this.marginLeft=parse(B,marginLeft,x.marginLeft),this.opacity=parse(B,opacity,x.opacity);var D=parse(B,overflow,x.overflow);this.overflowX=D[0],this.overflowY=D[D.length>1?1:0],this.overflowWrap=parse(B,overflowWrap,x.overflowWrap),this.paddingTop=parse(B,paddingTop,x.paddingTop),this.paddingRight=parse(B,paddingRight,x.paddingRight),this.paddingBottom=parse(B,paddingBottom,x.paddingBottom),this.paddingLeft=parse(B,paddingLeft,x.paddingLeft),this.paintOrder=parse(B,paintOrder,x.paintOrder),this.position=parse(B,position,x.position),this.textAlign=parse(B,textAlign,x.textAlign),this.textDecorationColor=parse(B,textDecorationColor,(Q=x.textDecorationColor)!==null&&Q!==void 0?Q:x.color),this.textDecorationLine=parse(B,textDecorationLine,(S=x.textDecorationLine)!==null&&S!==void 0?S:x.textDecoration),this.textShadow=parse(B,textShadow,x.textShadow),this.textTransform=parse(B,textTransform,x.textTransform),this.transform=parse(B,transform$1,x.transform),this.transformOrigin=parse(B,transformOrigin,x.transformOrigin),this.visibility=parse(B,visibility,x.visibility),this.webkitTextStrokeColor=parse(B,webkitTextStrokeColor,x.webkitTextStrokeColor),this.webkitTextStrokeWidth=parse(B,webkitTextStrokeWidth,x.webkitTextStrokeWidth),this.wordBreak=parse(B,wordBreak,x.wordBreak),this.zIndex=parse(B,zIndex,x.zIndex)}return g.prototype.isVisible=function(){return this.display>0&&this.opacity>0&&this.visibility===0},g.prototype.isTransparent=function(){return isTransparent(this.backgroundColor)},g.prototype.isTransformed=function(){return this.transform!==null},g.prototype.isPositioned=function(){return this.position!==0},g.prototype.isPositionedWithZIndex=function(){return this.isPositioned()&&!this.zIndex.auto},g.prototype.isFloating=function(){return this.float!==0},g.prototype.isInlineLevel=function(){return contains(this.display,4)||contains(this.display,33554432)||contains(this.display,268435456)||contains(this.display,536870912)||contains(this.display,67108864)||contains(this.display,134217728)},g}(),CSSParsedPseudoDeclaration=function(){function g(B,x){this.content=parse(B,content,x.content),this.quotes=parse(B,quotes,x.quotes)}return g}(),CSSParsedCounterDeclaration=function(){function g(B,x){this.counterIncrement=parse(B,counterIncrement,x.counterIncrement),this.counterReset=parse(B,counterReset,x.counterReset)}return g}(),parse=function(g,B,x){var Q=new Tokenizer,S=x!==null&&typeof x<"u"?x.toString():B.initialValue;Q.write(S);var D=new Parser$1(Q.read());switch(B.type){case 2:var H=D.parseComponentValue();return B.parse(g,isIdentToken(H)?H.value:B.initialValue);case 0:return B.parse(g,D.parseComponentValue());case 1:return B.parse(g,D.parseComponentValues());case 4:return D.parseComponentValue();case 3:switch(B.format){case"angle":return angle.parse(g,D.parseComponentValue());case"color":return color$1.parse(g,D.parseComponentValue());case"image":return image.parse(g,D.parseComponentValue());case"length":var P=D.parseComponentValue();return isLength(P)?P:ZERO_LENGTH;case"length-percentage":var R=D.parseComponentValue();return isLengthPercentage(R)?R:ZERO_LENGTH;case"time":return time.parse(g,D.parseComponentValue())}break}},elementDebuggerAttribute="data-html2canvas-debug",getElementDebugType=function(g){var B=g.getAttribute(elementDebuggerAttribute);switch(B){case"all":return 1;case"clone":return 2;case"parse":return 3;case"render":return 4;default:return 0}},isDebugging=function(g,B){var x=getElementDebugType(g);return x===1||B===x},ElementContainer=function(){function g(B,x){if(this.context=B,this.textNodes=[],this.elements=[],this.flags=0,isDebugging(x,3))debugger;this.styles=new CSSParsedDeclaration(B,window.getComputedStyle(x,null)),isHTMLElementNode(x)&&(this.styles.animationDuration.some(function(Q){return Q>0})&&(x.style.animationDuration="0s"),this.styles.transform!==null&&(x.style.transform="none")),this.bounds=parseBounds(this.context,x),isDebugging(x,4)&&(this.flags|=16)}return g}(),base64$2="AAAAAAAAAAAAEA4AGBkAAFAaAAACAAAAAAAIABAAGAAwADgACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAAQABIAEQATAAIABAACAAQAAgAEAAIABAAVABcAAgAEAAIABAACAAQAGAAaABwAHgAgACIAI4AlgAIABAAmwCjAKgAsAC2AL4AvQDFAMoA0gBPAVYBWgEIAAgACACMANoAYgFkAWwBdAF8AX0BhQGNAZUBlgGeAaMBlQGWAasBswF8AbsBwwF0AcsBYwHTAQgA2wG/AOMBdAF8AekB8QF0AfkB+wHiAHQBfAEIAAMC5gQIAAsCEgIIAAgAFgIeAggAIgIpAggAMQI5AkACygEIAAgASAJQAlgCYAIIAAgACAAKBQoFCgUTBRMFGQUrBSsFCAAIAAgACAAIAAgACAAIAAgACABdAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACABoAmgCrwGvAQgAbgJ2AggAHgEIAAgACADnAXsCCAAIAAgAgwIIAAgACAAIAAgACACKAggAkQKZAggAPADJAAgAoQKkAqwCsgK6AsICCADJAggA0AIIAAgACAAIANYC3gIIAAgACAAIAAgACABAAOYCCAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAkASoB+QIEAAgACAA8AEMCCABCBQgACABJBVAFCAAIAAgACAAIAAgACAAIAAgACABTBVoFCAAIAFoFCABfBWUFCAAIAAgACAAIAAgAbQUIAAgACAAIAAgACABzBXsFfQWFBYoFigWKBZEFigWKBYoFmAWfBaYFrgWxBbkFCAAIAAgACAAIAAgACAAIAAgACAAIAMEFCAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAMgFCADQBQgACAAIAAgACAAIAAgACAAIAAgACAAIAO4CCAAIAAgAiQAIAAgACABAAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAD0AggACAD8AggACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIANYFCAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAMDvwAIAAgAJAIIAAgACAAIAAgACAAIAAgACwMTAwgACAB9BOsEGwMjAwgAKwMyAwsFYgE3A/MEPwMIAEUDTQNRAwgAWQOsAGEDCAAIAAgACAAIAAgACABpAzQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFOgU0BTUFNgU3BTgFOQU6BTQFNQU2BTcFOAU5BToFNAU1BTYFNwU4BTkFIQUoBSwFCAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACABtAwgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACABMAEwACAAIAAgACAAIABgACAAIAAgACAC/AAgACAAyAQgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACACAAIAAwAAgACAAIAAgACAAIAAgACAAIAAAARABIAAgACAAIABQASAAIAAgAIABwAEAAjgCIABsAqAC2AL0AigDQAtwC+IJIQqVAZUBWQqVAZUBlQGVAZUBlQGrC5UBlQGVAZUBlQGVAZUBlQGVAXsKlQGVAbAK6wsrDGUMpQzlDJUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAZUBlQGVAfAKAAuZA64AtwCJALoC6ADwAAgAuACgA/oEpgO6AqsD+AAIAAgAswMIAAgACAAIAIkAuwP5AfsBwwPLAwgACAAIAAgACADRA9kDCAAIAOED6QMIAAgACAAIAAgACADuA/YDCAAIAP4DyQAIAAgABgQIAAgAXQAOBAgACAAIAAgACAAIABMECAAIAAgACAAIAAgACAD8AAQBCAAIAAgAGgQiBCoECAExBAgAEAEIAAgACAAIAAgACAAIAAgACAAIAAgACAA4BAgACABABEYECAAIAAgATAQYAQgAVAQIAAgACAAIAAgACAAIAAgACAAIAFoECAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgAOQEIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAB+BAcACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAEABhgSMBAgACAAIAAgAlAQIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAwAEAAQABAADAAMAAwADAAQABAAEAAQABAAEAAQABHATAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgAdQMIAAgACAAIAAgACAAIAMkACAAIAAgAfQMIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACACFA4kDCAAIAAgACAAIAOcBCAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAIcDCAAIAAgACAAIAAgACAAIAAgACAAIAJEDCAAIAAgACADFAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACABgBAgAZgQIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgAbAQCBXIECAAIAHkECAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACABAAJwEQACjBKoEsgQIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAC6BMIECAAIAAgACAAIAAgACABmBAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgAxwQIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAGYECAAIAAgAzgQIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgAigWKBYoFigWKBYoFigWKBd0FXwUIAOIF6gXxBYoF3gT5BQAGCAaKBYoFigWKBYoFigWKBYoFigWKBYoFigXWBIoFigWKBYoFigWKBYoFigWKBYsFEAaKBYoFigWKBYoFigWKBRQGCACKBYoFigWKBQgACAAIANEECAAIABgGigUgBggAJgYIAC4GMwaKBYoF0wQ3Bj4GigWKBYoFigWKBYoFigWKBYoFigWKBYoFigUIAAgACAAIAAgACAAIAAgAigWKBYoFigWKBYoFigWKBYoFigWKBYoFigWKBYoFigWKBYoFigWKBYoFigWKBYoFigWKBYoFigWKBYoFigWLBf///////wQABAAEAAQABAAEAAQABAAEAAQAAwAEAAQAAgAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAQADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAAAUAAAAFAAUAAAAFAAUAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUABQAFAAUABQAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUAAQAAAAUABQAFAAUABQAFAAAAAAAFAAUAAAAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAUABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAFAAUAAQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABwAFAAUABQAFAAAABwAHAAcAAAAHAAcABwAFAAEAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAcABwAFAAUABQAFAAcABwAFAAUAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAQABAAAAAAAAAAAAAAAFAAUABQAFAAAABwAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAHAAcABwAHAAcAAAAHAAcAAAAAAAUABQAHAAUAAQAHAAEABwAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUABwABAAUABQAFAAUAAAAAAAAAAAAAAAEAAQABAAEAAQABAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABwAFAAUAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUAAQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABQANAAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABAAEAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAQABAAEAAQABAAEAAQABAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQABAAEAAQABAAEAAQABAAAAAAAAAAAAAAAAAAAAAAABQAHAAUABQAFAAAAAAAAAAcABQAFAAUABQAFAAQABAAEAAQABAAEAAQABAAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUAAAAFAAUABQAFAAUAAAAFAAUABQAAAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAAAAAAAAAAAAUABQAFAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAHAAUAAAAHAAcABwAFAAUABQAFAAUABQAFAAUABwAHAAcABwAFAAcABwAAAAUABQAFAAUABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAUABwAHAAUABQAFAAUAAAAAAAcABwAAAAAABwAHAAUAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAFAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABwAHAAcABQAFAAAAAAAAAAAABQAFAAAAAAAFAAUABQAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAFAAUABQAFAAUAAAAFAAUABwAAAAcABwAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAFAAUABwAFAAUABQAFAAAAAAAHAAcAAAAAAAcABwAFAAAAAAAAAAAAAAAAAAAABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAcABwAAAAAAAAAHAAcABwAAAAcABwAHAAUAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAABQAHAAcABwAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABwAHAAcABwAAAAUABQAFAAAABQAFAAUABQAAAAAAAAAAAAAAAAAAAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAcABQAHAAcABQAHAAcAAAAFAAcABwAAAAcABwAFAAUAAAAAAAAAAAAAAAAAAAAFAAUAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAcABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAAAAUABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAFAAcABwAFAAUABQAAAAUAAAAHAAcABwAHAAcABwAHAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAHAAUABQAFAAUABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABwAFAAUABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAUAAAAFAAAAAAAAAAAABwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABwAFAAUABQAFAAUAAAAFAAUAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUABQAFAAUABQAAAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABwAFAAUABQAFAAUABQAAAAUABQAHAAcABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAcABQAFAAAAAAAAAAAABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAcABQAFAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAHAAUABQAFAAUABQAFAAUABwAHAAcABwAHAAcABwAHAAUABwAHAAUABQAFAAUABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABwAHAAcABwAFAAUABwAHAAcAAAAAAAAAAAAHAAcABQAHAAcABwAHAAcABwAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAcABwAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABQAHAAUABQAFAAUABQAFAAUAAAAFAAAABQAAAAAABQAFAAUABQAFAAUABQAFAAcABwAHAAcABwAHAAUABQAFAAUABQAFAAUABQAFAAUAAAAAAAUABQAFAAUABQAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUABwAFAAcABwAHAAcABwAFAAcABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAUABQAFAAUABwAHAAUABQAHAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAcABQAFAAcABwAHAAUABwAFAAUABQAHAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAHAAcABwAHAAcABwAHAAUABQAFAAUABQAFAAUABQAHAAcABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUAAAAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAcABQAFAAUABQAFAAUABQAAAAAAAAAAAAUAAAAAAAAAAAAAAAAABQAAAAAABwAFAAUAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAAABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUAAAAFAAUABQAFAAUABQAFAAUABQAFAAAAAAAAAAAABQAAAAAAAAAFAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAHAAUABQAHAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABwAHAAcABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAUABQAFAAUABQAHAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAcABwAFAAUABQAFAAcABwAFAAUABwAHAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAFAAcABwAFAAUABwAHAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAFAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAFAAUABQAAAAAABQAFAAAAAAAAAAAAAAAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABQAFAAcABwAAAAAAAAAAAAAABwAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABwAFAAcABwAFAAcABwAAAAcABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAAAAAAAAAAAAAAAAAFAAUABQAAAAUABQAAAAAAAAAAAAAABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABQAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABwAFAAUABQAFAAUABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAHAAcABQAFAAUABQAFAAUABQAFAAUABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAcABwAFAAUABQAHAAcABQAHAAUABQAAAAAAAAAAAAAAAAAFAAAABwAHAAcABQAFAAUABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABwAHAAcABwAAAAAABwAHAAAAAAAHAAcABwAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAHAAAAAAAFAAUABQAFAAUABQAFAAAAAAAAAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAcABwAFAAUABQAFAAUABQAFAAUABwAHAAUABQAFAAcABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAHAAcABQAFAAUABQAFAAUABwAFAAcABwAFAAcABQAFAAcABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAHAAcABQAFAAUABQAAAAAABwAHAAcABwAFAAUABwAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABwAHAAUABQAFAAUABQAFAAUABQAHAAcABQAHAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABwAFAAcABwAFAAUABQAFAAUABQAHAAUAAAAAAAAAAAAAAAAAAAAAAAcABwAFAAUABQAFAAcABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAcABwAFAAUABQAFAAUABQAFAAUABQAHAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAcABwAFAAUABQAFAAAAAAAFAAUABwAHAAcABwAFAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUABwAHAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABQAFAAUABQAFAAUABQAAAAUABQAFAAUABQAFAAcABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUAAAAHAAUABQAFAAUABQAFAAUABwAFAAUABwAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUAAAAAAAAABQAAAAUABQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAcABwAHAAcAAAAFAAUAAAAHAAcABQAHAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAAAAAAAAAAAAAAAAAAABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAAAAUABQAFAAAAAAAFAAUABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAAAAAAAAAAABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUABQAFAAUABQAAAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUABQAAAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAFAAUABQAAAAAABQAFAAUABQAFAAUABQAAAAUABQAAAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAUABQAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAFAAUABQAFAAUABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAFAAUABQAFAAUADgAOAA4ADgAOAA4ADwAPAA8ADwAPAA8ADwAPAA8ADwAPAA8ADwAPAA8ADwAPAA8ADwAPAA8ADwAPAA8ADwAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAgACAAIAAAAAAAAAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAMAAwADAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkACQAJAAkAAAAAAAAAAAAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAKAAoACgAAAAAAAAAAAAsADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwACwAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAMAAwADAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAA4ADgAOAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4ADgAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAA4ADgAOAA4ADgAOAA4ADgAOAAAAAAAAAAAADgAOAA4AAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAA4ADgAAAA4ADgAOAA4ADgAOAAAADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4AAAAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4AAAAAAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAAAA4AAAAOAAAAAAAAAAAAAAAAAA4AAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAAAAAAA4AAAAOAAAAAAAAAAAADgAOAA4AAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAA4ADgAOAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4ADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4ADgAOAA4ADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAOAA4ADgAOAA4ADgAOAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAAAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4AAAAAAA4ADgAOAA4ADgAOAA4ADgAOAAAADgAOAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4AAAAAAAAAAAAAAAAADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAA4ADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAA4ADgAOAA4ADgAOAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAOAA4ADgAOAA4AAAAAAAAAAAAAAAAAAAAAAA4ADgAOAA4ADgAOAA4ADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4AAAAOAA4ADgAOAA4ADgAAAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4ADgAOAA4AAAAAAAAAAAA=",chars$1="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",lookup$1=typeof Uint8Array>"u"?[]:new Uint8Array(256);for(var i$1$2=0;i$1$2<chars$1.length;i$1$2++)lookup$1[chars$1.charCodeAt(i$1$2)]=i$1$2;var decode=function(g){var B=g.length*.75,x=g.length,Q,S=0,D,H,P,R;g[g.length-1]==="="&&(B--,g[g.length-2]==="="&&B--);var Y=typeof ArrayBuffer<"u"&&typeof Uint8Array<"u"&&typeof Uint8Array.prototype.slice<"u"?new ArrayBuffer(B):new Array(B),G=Array.isArray(Y)?Y:new Uint8Array(Y);for(Q=0;Q<x;Q+=4)D=lookup$1[g.charCodeAt(Q)],H=lookup$1[g.charCodeAt(Q+1)],P=lookup$1[g.charCodeAt(Q+2)],R=lookup$1[g.charCodeAt(Q+3)],G[S++]=D<<2|H>>4,G[S++]=(H&15)<<4|P>>2,G[S++]=(P&3)<<6|R&63;return Y},polyUint16Array=function(g){for(var B=g.length,x=[],Q=0;Q<B;Q+=2)x.push(g[Q+1]<<8|g[Q]);return x},polyUint32Array=function(g){for(var B=g.length,x=[],Q=0;Q<B;Q+=4)x.push(g[Q+3]<<24|g[Q+2]<<16|g[Q+1]<<8|g[Q]);return x},UTRIE2_SHIFT_2=5,UTRIE2_SHIFT_1=6+5,UTRIE2_INDEX_SHIFT=2,UTRIE2_SHIFT_1_2=UTRIE2_SHIFT_1-UTRIE2_SHIFT_2,UTRIE2_LSCP_INDEX_2_OFFSET=65536>>UTRIE2_SHIFT_2,UTRIE2_DATA_BLOCK_LENGTH=1<<UTRIE2_SHIFT_2,UTRIE2_DATA_MASK=UTRIE2_DATA_BLOCK_LENGTH-1,UTRIE2_LSCP_INDEX_2_LENGTH=1024>>UTRIE2_SHIFT_2,UTRIE2_INDEX_2_BMP_LENGTH=UTRIE2_LSCP_INDEX_2_OFFSET+UTRIE2_LSCP_INDEX_2_LENGTH,UTRIE2_UTF8_2B_INDEX_2_OFFSET=UTRIE2_INDEX_2_BMP_LENGTH,UTRIE2_UTF8_2B_INDEX_2_LENGTH=32,UTRIE2_INDEX_1_OFFSET=UTRIE2_UTF8_2B_INDEX_2_OFFSET+UTRIE2_UTF8_2B_INDEX_2_LENGTH,UTRIE2_OMITTED_BMP_INDEX_1_LENGTH=65536>>UTRIE2_SHIFT_1,UTRIE2_INDEX_2_BLOCK_LENGTH=1<<UTRIE2_SHIFT_1_2,UTRIE2_INDEX_2_MASK=UTRIE2_INDEX_2_BLOCK_LENGTH-1,slice16=function(g,B,x){return g.slice?g.slice(B,x):new Uint16Array(Array.prototype.slice.call(g,B,x))},slice32=function(g,B,x){return g.slice?g.slice(B,x):new Uint32Array(Array.prototype.slice.call(g,B,x))},createTrieFromBase64=function(g,B){var x=decode(g),Q=Array.isArray(x)?polyUint32Array(x):new Uint32Array(x),S=Array.isArray(x)?polyUint16Array(x):new Uint16Array(x),D=24,H=slice16(S,D/2,Q[4]/2),P=Q[5]===2?slice16(S,(D+Q[4])/2):slice32(Q,Math.ceil((D+Q[4])/4));return new Trie(Q[0],Q[1],Q[2],Q[3],H,P)},Trie=function(){function g(B,x,Q,S,D,H){this.initialValue=B,this.errorValue=x,this.highStart=Q,this.highValueIndex=S,this.index=D,this.data=H}return g.prototype.get=function(B){var x;if(B>=0){if(B<55296||B>56319&&B<=65535)return x=this.index[B>>UTRIE2_SHIFT_2],x=(x<<UTRIE2_INDEX_SHIFT)+(B&UTRIE2_DATA_MASK),this.data[x];if(B<=65535)return x=this.index[UTRIE2_LSCP_INDEX_2_OFFSET+(B-55296>>UTRIE2_SHIFT_2)],x=(x<<UTRIE2_INDEX_SHIFT)+(B&UTRIE2_DATA_MASK),this.data[x];if(B<this.highStart)return x=UTRIE2_INDEX_1_OFFSET-UTRIE2_OMITTED_BMP_INDEX_1_LENGTH+(B>>UTRIE2_SHIFT_1),x=this.index[x],x+=B>>UTRIE2_SHIFT_2&UTRIE2_INDEX_2_MASK,x=this.index[x],x=(x<<UTRIE2_INDEX_SHIFT)+(B&UTRIE2_DATA_MASK),this.data[x];if(B<=1114111)return this.data[this.highValueIndex]}return this.errorValue},g}(),chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",lookup=typeof Uint8Array>"u"?[]:new Uint8Array(256);for(var i$4=0;i$4<chars.length;i$4++)lookup[chars.charCodeAt(i$4)]=i$4;var Prepend=1,CR=2,LF=3,Control=4,Extend=5,SpacingMark=7,L$1=8,V=9,T$1=10,LV=11,LVT=12,ZWJ=13,Extended_Pictographic=14,RI=15,toCodePoints=function(g){for(var B=[],x=0,Q=g.length;x<Q;){var S=g.charCodeAt(x++);if(S>=55296&&S<=56319&&x<Q){var D=g.charCodeAt(x++);(D&64512)===56320?B.push(((S&1023)<<10)+(D&1023)+65536):(B.push(S),x--)}else B.push(S)}return B},fromCodePoint=function(){for(var g=[],B=0;B<arguments.length;B++)g[B]=arguments[B];if(String.fromCodePoint)return String.fromCodePoint.apply(String,g);var x=g.length;if(!x)return"";for(var Q=[],S=-1,D="";++S<x;){var H=g[S];H<=65535?Q.push(H):(H-=65536,Q.push((H>>10)+55296,H%1024+56320)),(S+1===x||Q.length>16384)&&(D+=String.fromCharCode.apply(String,Q),Q.length=0)}return D},UnicodeTrie=createTrieFromBase64(base64$2),BREAK_NOT_ALLOWED="×",BREAK_ALLOWED="÷",codePointToClass=function(g){return UnicodeTrie.get(g)},_graphemeBreakAtIndex=function(g,B,x){var Q=x-2,S=B[Q],D=B[x-1],H=B[x];if(D===CR&&H===LF)return BREAK_NOT_ALLOWED;if(D===CR||D===LF||D===Control||H===CR||H===LF||H===Control)return BREAK_ALLOWED;if(D===L$1&&[L$1,V,LV,LVT].indexOf(H)!==-1||(D===LV||D===V)&&(H===V||H===T$1)||(D===LVT||D===T$1)&&H===T$1||H===ZWJ||H===Extend||H===SpacingMark||D===Prepend)return BREAK_NOT_ALLOWED;if(D===ZWJ&&H===Extended_Pictographic){for(;S===Extend;)S=B[--Q];if(S===Extended_Pictographic)return BREAK_NOT_ALLOWED}if(D===RI&&H===RI){for(var P=0;S===RI;)P++,S=B[--Q];if(P%2===0)return BREAK_NOT_ALLOWED}return BREAK_ALLOWED},GraphemeBreaker=function(g){var B=toCodePoints(g),x=B.length,Q=0,S=0,D=B.map(codePointToClass);return{next:function(){if(Q>=x)return{done:!0,value:null};for(var H=BREAK_NOT_ALLOWED;Q<x&&(H=_graphemeBreakAtIndex(B,D,++Q))===BREAK_NOT_ALLOWED;);if(H!==BREAK_NOT_ALLOWED||Q===x){var P=fromCodePoint.apply(null,B.slice(S,Q));return S=Q,{value:P,done:!1}}return{done:!0,value:null}}}},splitGraphemes=function(g){for(var B=GraphemeBreaker(g),x=[],Q;!(Q=B.next()).done;)Q.value&&x.push(Q.value.slice());return x},testRangeBounds=function(g){var B=123;if(g.createRange){var x=g.createRange();if(x.getBoundingClientRect){var Q=g.createElement("boundtest");Q.style.height=B+"px",Q.style.display="block",g.body.appendChild(Q),x.selectNode(Q);var S=x.getBoundingClientRect(),D=Math.round(S.height);if(g.body.removeChild(Q),D===B)return!0}}return!1},testIOSLineBreak=function(g){var B=g.createElement("boundtest");B.style.width="50px",B.style.display="block",B.style.fontSize="12px",B.style.letterSpacing="0px",B.style.wordSpacing="0px",g.body.appendChild(B);var x=g.createRange();B.innerHTML=typeof"".repeat=="function"?"&#128104;".repeat(10):"";var Q=B.firstChild,S=toCodePoints$1(Q.data).map(function(R){return fromCodePoint$1(R)}),D=0,H={},P=S.every(function(R,Y){x.setStart(Q,D),x.setEnd(Q,D+R.length);var G=x.getBoundingClientRect();D+=R.length;var X=G.x>H.x||G.y>H.y;return H=G,Y===0?!0:X});return g.body.removeChild(B),P},testCORS=function(){return typeof new Image().crossOrigin<"u"},testResponseType=function(){return typeof new XMLHttpRequest().responseType=="string"},testSVG=function(g){var B=new Image,x=g.createElement("canvas"),Q=x.getContext("2d");if(!Q)return!1;B.src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>";try{Q.drawImage(B,0,0),x.toDataURL()}catch{return!1}return!0},isGreenPixel=function(g){return g[0]===0&&g[1]===255&&g[2]===0&&g[3]===255},testForeignObject=function(g){var B=g.createElement("canvas"),x=100;B.width=x,B.height=x;var Q=B.getContext("2d");if(!Q)return Promise.reject(!1);Q.fillStyle="rgb(0, 255, 0)",Q.fillRect(0,0,x,x);var S=new Image,D=B.toDataURL();S.src=D;var H=createForeignObjectSVG(x,x,0,0,S);return Q.fillStyle="red",Q.fillRect(0,0,x,x),loadSerializedSVG$1(H).then(function(P){Q.drawImage(P,0,0);var R=Q.getImageData(0,0,x,x).data;Q.fillStyle="red",Q.fillRect(0,0,x,x);var Y=g.createElement("div");return Y.style.backgroundImage="url("+D+")",Y.style.height=x+"px",isGreenPixel(R)?loadSerializedSVG$1(createForeignObjectSVG(x,x,0,0,Y)):Promise.reject(!1)}).then(function(P){return Q.drawImage(P,0,0),isGreenPixel(Q.getImageData(0,0,x,x).data)}).catch(function(){return!1})},createForeignObjectSVG=function(g,B,x,Q,S){var D="http://www.w3.org/2000/svg",H=document.createElementNS(D,"svg"),P=document.createElementNS(D,"foreignObject");return H.setAttributeNS(null,"width",g.toString()),H.setAttributeNS(null,"height",B.toString()),P.setAttributeNS(null,"width","100%"),P.setAttributeNS(null,"height","100%"),P.setAttributeNS(null,"x",x.toString()),P.setAttributeNS(null,"y",Q.toString()),P.setAttributeNS(null,"externalResourcesRequired","true"),H.appendChild(P),P.appendChild(S),H},loadSerializedSVG$1=function(g){return new Promise(function(B,x){var Q=new Image;Q.onload=function(){return B(Q)},Q.onerror=x,Q.src="data:image/svg+xml;charset=utf-8,"+encodeURIComponent(new XMLSerializer().serializeToString(g))})},FEATURES={get SUPPORT_RANGE_BOUNDS(){var g=testRangeBounds(document);return Object.defineProperty(FEATURES,"SUPPORT_RANGE_BOUNDS",{value:g}),g},get SUPPORT_WORD_BREAKING(){var g=FEATURES.SUPPORT_RANGE_BOUNDS&&testIOSLineBreak(document);return Object.defineProperty(FEATURES,"SUPPORT_WORD_BREAKING",{value:g}),g},get SUPPORT_SVG_DRAWING(){var g=testSVG(document);return Object.defineProperty(FEATURES,"SUPPORT_SVG_DRAWING",{value:g}),g},get SUPPORT_FOREIGNOBJECT_DRAWING(){var g=typeof Array.from=="function"&&typeof window.fetch=="function"?testForeignObject(document):Promise.resolve(!1);return Object.defineProperty(FEATURES,"SUPPORT_FOREIGNOBJECT_DRAWING",{value:g}),g},get SUPPORT_CORS_IMAGES(){var g=testCORS();return Object.defineProperty(FEATURES,"SUPPORT_CORS_IMAGES",{value:g}),g},get SUPPORT_RESPONSE_TYPE(){var g=testResponseType();return Object.defineProperty(FEATURES,"SUPPORT_RESPONSE_TYPE",{value:g}),g},get SUPPORT_CORS_XHR(){var g="withCredentials"in new XMLHttpRequest;return Object.defineProperty(FEATURES,"SUPPORT_CORS_XHR",{value:g}),g},get SUPPORT_NATIVE_TEXT_SEGMENTATION(){var g=!!(typeof Intl<"u"&&Intl.Segmenter);return Object.defineProperty(FEATURES,"SUPPORT_NATIVE_TEXT_SEGMENTATION",{value:g}),g}},TextBounds=function(){function g(B,x){this.text=B,this.bounds=x}return g}(),parseTextBounds=function(g,B,x,Q){var S=breakText(B,x),D=[],H=0;return S.forEach(function(P){if(x.textDecorationLine.length||P.trim().length>0)if(FEATURES.SUPPORT_RANGE_BOUNDS){var R=createRange(Q,H,P.length).getClientRects();if(R.length>1){var Y=segmentGraphemes(P),G=0;Y.forEach(function(ee){D.push(new TextBounds(ee,Bounds.fromDOMRectList(g,createRange(Q,G+H,ee.length).getClientRects()))),G+=ee.length})}else D.push(new TextBounds(P,Bounds.fromDOMRectList(g,R)))}else{var X=Q.splitText(P.length);D.push(new TextBounds(P,getWrapperBounds(g,Q))),Q=X}else FEATURES.SUPPORT_RANGE_BOUNDS||(Q=Q.splitText(P.length));H+=P.length}),D},getWrapperBounds=function(g,B){var x=B.ownerDocument;if(x){var Q=x.createElement("html2canvaswrapper");Q.appendChild(B.cloneNode(!0));var S=B.parentNode;if(S){S.replaceChild(Q,B);var D=parseBounds(g,Q);return Q.firstChild&&S.replaceChild(Q.firstChild,Q),D}}return Bounds.EMPTY},createRange=function(g,B,x){var Q=g.ownerDocument;if(!Q)throw new Error("Node has no owner document");var S=Q.createRange();return S.setStart(g,B),S.setEnd(g,B+x),S},segmentGraphemes=function(g){if(FEATURES.SUPPORT_NATIVE_TEXT_SEGMENTATION){var B=new Intl.Segmenter(void 0,{granularity:"grapheme"});return Array.from(B.segment(g)).map(function(x){return x.segment})}return splitGraphemes(g)},segmentWords=function(g,B){if(FEATURES.SUPPORT_NATIVE_TEXT_SEGMENTATION){var x=new Intl.Segmenter(void 0,{granularity:"word"});return Array.from(x.segment(g)).map(function(Q){return Q.segment})}return breakWords(g,B)},breakText=function(g,B){return B.letterSpacing!==0?segmentGraphemes(g):segmentWords(g,B)},wordSeparators=[32,160,4961,65792,65793,4153,4241],breakWords=function(g,B){for(var x=LineBreaker(g,{lineBreak:B.lineBreak,wordBreak:B.overflowWrap==="break-word"?"break-word":B.wordBreak}),Q=[],S,D=function(){if(S.value){var H=S.value.slice(),P=toCodePoints$1(H),R="";P.forEach(function(Y){wordSeparators.indexOf(Y)===-1?R+=fromCodePoint$1(Y):(R.length&&Q.push(R),Q.push(fromCodePoint$1(Y)),R="")}),R.length&&Q.push(R)}};!(S=x.next()).done;)D();return Q},TextContainer=function(){function g(B,x,Q){this.text=transform(x.data,Q.textTransform),this.textBounds=parseTextBounds(B,this.text,Q,x)}return g}(),transform=function(g,B){switch(B){case 1:return g.toLowerCase();case 3:return g.replace(CAPITALIZE,capitalize);case 2:return g.toUpperCase();default:return g}},CAPITALIZE=/(^|\s|:|-|\(|\))([a-z])/g,capitalize=function(g,B,x){return g.length>0?B+x.toUpperCase():g},ImageElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;return S.src=Q.currentSrc||Q.src,S.intrinsicWidth=Q.naturalWidth,S.intrinsicHeight=Q.naturalHeight,S.context.cache.addImage(S.src),S}return B}(ElementContainer),CanvasElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;return S.canvas=Q,S.intrinsicWidth=Q.width,S.intrinsicHeight=Q.height,S}return B}(ElementContainer),SVGElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this,D=new XMLSerializer,H=parseBounds(x,Q);return Q.setAttribute("width",H.width+"px"),Q.setAttribute("height",H.height+"px"),S.svg="data:image/svg+xml,"+encodeURIComponent(D.serializeToString(Q)),S.intrinsicWidth=Q.width.baseVal.value,S.intrinsicHeight=Q.height.baseVal.value,S.context.cache.addImage(S.svg),S}return B}(ElementContainer),LIElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;return S.value=Q.value,S}return B}(ElementContainer),OLElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;return S.start=Q.start,S.reversed=typeof Q.reversed=="boolean"&&Q.reversed===!0,S}return B}(ElementContainer),CHECKBOX_BORDER_RADIUS=[{type:15,flags:0,unit:"px",number:3}],RADIO_BORDER_RADIUS=[{type:16,flags:0,number:50}],reformatInputBounds=function(g){return g.width>g.height?new Bounds(g.left+(g.width-g.height)/2,g.top,g.height,g.height):g.width<g.height?new Bounds(g.left,g.top+(g.height-g.width)/2,g.width,g.width):g},getInputValue=function(g){var B=g.type===PASSWORD?new Array(g.value.length+1).join("•"):g.value;return B.length===0?g.placeholder||"":B},CHECKBOX="checkbox",RADIO="radio",PASSWORD="password",INPUT_COLOR=707406591,InputElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;switch(S.type=Q.type.toLowerCase(),S.checked=Q.checked,S.value=getInputValue(Q),(S.type===CHECKBOX||S.type===RADIO)&&(S.styles.backgroundColor=3739148031,S.styles.borderTopColor=S.styles.borderRightColor=S.styles.borderBottomColor=S.styles.borderLeftColor=2779096575,S.styles.borderTopWidth=S.styles.borderRightWidth=S.styles.borderBottomWidth=S.styles.borderLeftWidth=1,S.styles.borderTopStyle=S.styles.borderRightStyle=S.styles.borderBottomStyle=S.styles.borderLeftStyle=1,S.styles.backgroundClip=[0],S.styles.backgroundOrigin=[0],S.bounds=reformatInputBounds(S.bounds)),S.type){case CHECKBOX:S.styles.borderTopRightRadius=S.styles.borderTopLeftRadius=S.styles.borderBottomRightRadius=S.styles.borderBottomLeftRadius=CHECKBOX_BORDER_RADIUS;break;case RADIO:S.styles.borderTopRightRadius=S.styles.borderTopLeftRadius=S.styles.borderBottomRightRadius=S.styles.borderBottomLeftRadius=RADIO_BORDER_RADIUS;break}return S}return B}(ElementContainer),SelectElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this,D=Q.options[Q.selectedIndex||0];return S.value=D&&D.text||"",S}return B}(ElementContainer),TextareaElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;return S.value=Q.value,S}return B}(ElementContainer),IFrameElementContainer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;S.src=Q.src,S.width=parseInt(Q.width,10)||0,S.height=parseInt(Q.height,10)||0,S.backgroundColor=S.styles.backgroundColor;try{if(Q.contentWindow&&Q.contentWindow.document&&Q.contentWindow.document.documentElement){S.tree=parseTree(x,Q.contentWindow.document.documentElement);var D=Q.contentWindow.document.documentElement?parseColor(x,getComputedStyle(Q.contentWindow.document.documentElement).backgroundColor):COLORS.TRANSPARENT,H=Q.contentWindow.document.body?parseColor(x,getComputedStyle(Q.contentWindow.document.body).backgroundColor):COLORS.TRANSPARENT;S.backgroundColor=isTransparent(D)?isTransparent(H)?S.styles.backgroundColor:H:D}}catch{}return S}return B}(ElementContainer),LIST_OWNERS=["OL","UL","MENU"],parseNodeTree=function(g,B,x,Q){for(var S=B.firstChild,D=void 0;S;S=D)if(D=S.nextSibling,isTextNode(S)&&S.data.trim().length>0)x.textNodes.push(new TextContainer(g,S,x.styles));else if(isElementNode(S))if(isSlotElement(S)&&S.assignedNodes)S.assignedNodes().forEach(function(P){return parseNodeTree(g,P,x,Q)});else{var H=createContainer(g,S);H.styles.isVisible()&&(createsRealStackingContext(S,H,Q)?H.flags|=4:createsStackingContext(H.styles)&&(H.flags|=2),LIST_OWNERS.indexOf(S.tagName)!==-1&&(H.flags|=8),x.elements.push(H),S.slot,S.shadowRoot?parseNodeTree(g,S.shadowRoot,H,Q):!isTextareaElement(S)&&!isSVGElement(S)&&!isSelectElement(S)&&parseNodeTree(g,S,H,Q))}},createContainer=function(g,B){return isImageElement(B)?new ImageElementContainer(g,B):isCanvasElement(B)?new CanvasElementContainer(g,B):isSVGElement(B)?new SVGElementContainer(g,B):isLIElement(B)?new LIElementContainer(g,B):isOLElement(B)?new OLElementContainer(g,B):isInputElement(B)?new InputElementContainer(g,B):isSelectElement(B)?new SelectElementContainer(g,B):isTextareaElement(B)?new TextareaElementContainer(g,B):isIFrameElement(B)?new IFrameElementContainer(g,B):new ElementContainer(g,B)},parseTree=function(g,B){var x=createContainer(g,B);return x.flags|=4,parseNodeTree(g,B,x,x),x},createsRealStackingContext=function(g,B,x){return B.styles.isPositionedWithZIndex()||B.styles.opacity<1||B.styles.isTransformed()||isBodyElement(g)&&x.styles.isTransparent()},createsStackingContext=function(g){return g.isPositioned()||g.isFloating()},isTextNode=function(g){return g.nodeType===Node.TEXT_NODE},isElementNode=function(g){return g.nodeType===Node.ELEMENT_NODE},isHTMLElementNode=function(g){return isElementNode(g)&&typeof g.style<"u"&&!isSVGElementNode(g)},isSVGElementNode=function(g){return typeof g.className=="object"},isLIElement=function(g){return g.tagName==="LI"},isOLElement=function(g){return g.tagName==="OL"},isInputElement=function(g){return g.tagName==="INPUT"},isHTMLElement=function(g){return g.tagName==="HTML"},isSVGElement=function(g){return g.tagName==="svg"},isBodyElement=function(g){return g.tagName==="BODY"},isCanvasElement=function(g){return g.tagName==="CANVAS"},isVideoElement=function(g){return g.tagName==="VIDEO"},isImageElement=function(g){return g.tagName==="IMG"},isIFrameElement=function(g){return g.tagName==="IFRAME"},isStyleElement=function(g){return g.tagName==="STYLE"},isScriptElement=function(g){return g.tagName==="SCRIPT"},isTextareaElement=function(g){return g.tagName==="TEXTAREA"},isSelectElement=function(g){return g.tagName==="SELECT"},isSlotElement=function(g){return g.tagName==="SLOT"},isCustomElement=function(g){return g.tagName.indexOf("-")>0},CounterState=function(){function g(){this.counters={}}return g.prototype.getCounterValue=function(B){var x=this.counters[B];return x&&x.length?x[x.length-1]:1},g.prototype.getCounterValues=function(B){var x=this.counters[B];return x||[]},g.prototype.pop=function(B){var x=this;B.forEach(function(Q){return x.counters[Q].pop()})},g.prototype.parse=function(B){var x=this,Q=B.counterIncrement,S=B.counterReset,D=!0;Q!==null&&Q.forEach(function(P){var R=x.counters[P.counter];R&&P.increment!==0&&(D=!1,R.length||R.push(1),R[Math.max(0,R.length-1)]+=P.increment)});var H=[];return D&&S.forEach(function(P){var R=x.counters[P.counter];H.push(P.counter),R||(R=x.counters[P.counter]=[]),R.push(P.reset)}),H},g}(),ROMAN_UPPER={integers:[1e3,900,500,400,100,90,50,40,10,9,5,4,1],values:["M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"]},ARMENIAN={integers:[9e3,8e3,7e3,6e3,5e3,4e3,3e3,2e3,1e3,900,800,700,600,500,400,300,200,100,90,80,70,60,50,40,30,20,10,9,8,7,6,5,4,3,2,1],values:["Ք","Փ","Ւ","Ց","Ր","Տ","Վ","Ս","Ռ","Ջ","Պ","Չ","Ո","Շ","Ն","Յ","Մ","Ճ","Ղ","Ձ","Հ","Կ","Ծ","Խ","Լ","Ի","Ժ","Թ","Ը","Է","Զ","Ե","Դ","Գ","Բ","Ա"]},HEBREW={integers:[1e4,9e3,8e3,7e3,6e3,5e3,4e3,3e3,2e3,1e3,400,300,200,100,90,80,70,60,50,40,30,20,19,18,17,16,15,10,9,8,7,6,5,4,3,2,1],values:["י׳","ט׳","ח׳","ז׳","ו׳","ה׳","ד׳","ג׳","ב׳","א׳","ת","ש","ר","ק","צ","פ","ע","ס","נ","מ","ל","כ","יט","יח","יז","טז","טו","י","ט","ח","ז","ו","ה","ד","ג","ב","א"]},GEORGIAN={integers:[1e4,9e3,8e3,7e3,6e3,5e3,4e3,3e3,2e3,1e3,900,800,700,600,500,400,300,200,100,90,80,70,60,50,40,30,20,10,9,8,7,6,5,4,3,2,1],values:["ჵ","ჰ","ჯ","ჴ","ხ","ჭ","წ","ძ","ც","ჩ","შ","ყ","ღ","ქ","ფ","ჳ","ტ","ს","რ","ჟ","პ","ო","ჲ","ნ","მ","ლ","კ","ი","თ","ჱ","ზ","ვ","ე","დ","გ","ბ","ა"]},createAdditiveCounter=function(g,B,x,Q,S,D){return g<B||g>x?createCounterText(g,S,D.length>0):Q.integers.reduce(function(H,P,R){for(;g>=P;)g-=P,H+=Q.values[R];return H},"")+D},createCounterStyleWithSymbolResolver=function(g,B,x,Q){var S="";do x||g--,S=Q(g)+S,g/=B;while(g*B>=B);return S},createCounterStyleFromRange=function(g,B,x,Q,S){var D=x-B+1;return(g<0?"-":"")+(createCounterStyleWithSymbolResolver(Math.abs(g),D,Q,function(H){return fromCodePoint$1(Math.floor(H%D)+B)})+S)},createCounterStyleFromSymbols=function(g,B,x){x===void 0&&(x=". ");var Q=B.length;return createCounterStyleWithSymbolResolver(Math.abs(g),Q,!1,function(S){return B[Math.floor(S%Q)]})+x},CJK_ZEROS=1,CJK_TEN_COEFFICIENTS=2,CJK_TEN_HIGH_COEFFICIENTS=4,CJK_HUNDRED_COEFFICIENTS=8,createCJKCounter=function(g,B,x,Q,S,D){if(g<-9999||g>9999)return createCounterText(g,4,S.length>0);var H=Math.abs(g),P=S;if(H===0)return B[0]+P;for(var R=0;H>0&&R<=4;R++){var Y=H%10;Y===0&&contains(D,CJK_ZEROS)&&P!==""?P=B[Y]+P:Y>1||Y===1&&R===0||Y===1&&R===1&&contains(D,CJK_TEN_COEFFICIENTS)||Y===1&&R===1&&contains(D,CJK_TEN_HIGH_COEFFICIENTS)&&g>100||Y===1&&R>1&&contains(D,CJK_HUNDRED_COEFFICIENTS)?P=B[Y]+(R>0?x[R-1]:"")+P:Y===1&&R>0&&(P=x[R-1]+P),H=Math.floor(H/10)}return(g<0?Q:"")+P},CHINESE_INFORMAL_MULTIPLIERS="十百千萬",CHINESE_FORMAL_MULTIPLIERS="拾佰仟萬",JAPANESE_NEGATIVE="マイナス",KOREAN_NEGATIVE="마이너스",createCounterText=function(g,B,x){var Q=x?". ":"",S=x?"、":"",D=x?", ":"",H=x?" ":"";switch(B){case 0:return"•"+H;case 1:return"◦"+H;case 2:return"◾"+H;case 5:var P=createCounterStyleFromRange(g,48,57,!0,Q);return P.length<4?"0"+P:P;case 4:return createCounterStyleFromSymbols(g,"〇一二三四五六七八九",S);case 6:return createAdditiveCounter(g,1,3999,ROMAN_UPPER,3,Q).toLowerCase();case 7:return createAdditiveCounter(g,1,3999,ROMAN_UPPER,3,Q);case 8:return createCounterStyleFromRange(g,945,969,!1,Q);case 9:return createCounterStyleFromRange(g,97,122,!1,Q);case 10:return createCounterStyleFromRange(g,65,90,!1,Q);case 11:return createCounterStyleFromRange(g,1632,1641,!0,Q);case 12:case 49:return createAdditiveCounter(g,1,9999,ARMENIAN,3,Q);case 35:return createAdditiveCounter(g,1,9999,ARMENIAN,3,Q).toLowerCase();case 13:return createCounterStyleFromRange(g,2534,2543,!0,Q);case 14:case 30:return createCounterStyleFromRange(g,6112,6121,!0,Q);case 15:return createCounterStyleFromSymbols(g,"子丑寅卯辰巳午未申酉戌亥",S);case 16:return createCounterStyleFromSymbols(g,"甲乙丙丁戊己庚辛壬癸",S);case 17:case 48:return createCJKCounter(g,"零一二三四五六七八九",CHINESE_INFORMAL_MULTIPLIERS,"負",S,CJK_TEN_COEFFICIENTS|CJK_TEN_HIGH_COEFFICIENTS|CJK_HUNDRED_COEFFICIENTS);case 47:return createCJKCounter(g,"零壹貳參肆伍陸柒捌玖",CHINESE_FORMAL_MULTIPLIERS,"負",S,CJK_ZEROS|CJK_TEN_COEFFICIENTS|CJK_TEN_HIGH_COEFFICIENTS|CJK_HUNDRED_COEFFICIENTS);case 42:return createCJKCounter(g,"零一二三四五六七八九",CHINESE_INFORMAL_MULTIPLIERS,"负",S,CJK_TEN_COEFFICIENTS|CJK_TEN_HIGH_COEFFICIENTS|CJK_HUNDRED_COEFFICIENTS);case 41:return createCJKCounter(g,"零壹贰叁肆伍陆柒捌玖",CHINESE_FORMAL_MULTIPLIERS,"负",S,CJK_ZEROS|CJK_TEN_COEFFICIENTS|CJK_TEN_HIGH_COEFFICIENTS|CJK_HUNDRED_COEFFICIENTS);case 26:return createCJKCounter(g,"〇一二三四五六七八九","十百千万",JAPANESE_NEGATIVE,S,0);case 25:return createCJKCounter(g,"零壱弐参四伍六七八九","拾百千万",JAPANESE_NEGATIVE,S,CJK_ZEROS|CJK_TEN_COEFFICIENTS|CJK_TEN_HIGH_COEFFICIENTS);case 31:return createCJKCounter(g,"영일이삼사오육칠팔구","십백천만",KOREAN_NEGATIVE,D,CJK_ZEROS|CJK_TEN_COEFFICIENTS|CJK_TEN_HIGH_COEFFICIENTS);case 33:return createCJKCounter(g,"零一二三四五六七八九","十百千萬",KOREAN_NEGATIVE,D,0);case 32:return createCJKCounter(g,"零壹貳參四五六七八九","拾百千",KOREAN_NEGATIVE,D,CJK_ZEROS|CJK_TEN_COEFFICIENTS|CJK_TEN_HIGH_COEFFICIENTS);case 18:return createCounterStyleFromRange(g,2406,2415,!0,Q);case 20:return createAdditiveCounter(g,1,19999,GEORGIAN,3,Q);case 21:return createCounterStyleFromRange(g,2790,2799,!0,Q);case 22:return createCounterStyleFromRange(g,2662,2671,!0,Q);case 22:return createAdditiveCounter(g,1,10999,HEBREW,3,Q);case 23:return createCounterStyleFromSymbols(g,"あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわゐゑをん");case 24:return createCounterStyleFromSymbols(g,"いろはにほへとちりぬるをわかよたれそつねならむうゐのおくやまけふこえてあさきゆめみしゑひもせす");case 27:return createCounterStyleFromRange(g,3302,3311,!0,Q);case 28:return createCounterStyleFromSymbols(g,"アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヰヱヲン",S);case 29:return createCounterStyleFromSymbols(g,"イロハニホヘトチリヌルヲワカヨタレソツネナラムウヰノオクヤマケフコエテアサキユメミシヱヒモセス",S);case 34:return createCounterStyleFromRange(g,3792,3801,!0,Q);case 37:return createCounterStyleFromRange(g,6160,6169,!0,Q);case 38:return createCounterStyleFromRange(g,4160,4169,!0,Q);case 39:return createCounterStyleFromRange(g,2918,2927,!0,Q);case 40:return createCounterStyleFromRange(g,1776,1785,!0,Q);case 43:return createCounterStyleFromRange(g,3046,3055,!0,Q);case 44:return createCounterStyleFromRange(g,3174,3183,!0,Q);case 45:return createCounterStyleFromRange(g,3664,3673,!0,Q);case 46:return createCounterStyleFromRange(g,3872,3881,!0,Q);case 3:default:return createCounterStyleFromRange(g,48,57,!0,Q)}},IGNORE_ATTRIBUTE="data-html2canvas-ignore",DocumentCloner=function(){function g(B,x,Q){if(this.context=B,this.options=Q,this.scrolledElements=[],this.referenceElement=x,this.counters=new CounterState,this.quoteDepth=0,!x.ownerDocument)throw new Error("Cloned element does not have an owner document");this.documentElement=this.cloneNode(x.ownerDocument.documentElement,!1)}return g.prototype.toIFrame=function(B,x){var Q=this,S=createIFrameContainer(B,x);if(!S.contentWindow)return Promise.reject("Unable to find iframe window");var D=B.defaultView.pageXOffset,H=B.defaultView.pageYOffset,P=S.contentWindow,R=P.document,Y=iframeLoader(S).then(function(){return __awaiter(Q,void 0,void 0,function(){var G,X;return __generator(this,function(ee){switch(ee.label){case 0:return this.scrolledElements.forEach(restoreNodeScroll),P&&(P.scrollTo(x.left,x.top),/(iPad|iPhone|iPod)/g.test(navigator.userAgent)&&(P.scrollY!==x.top||P.scrollX!==x.left)&&(this.context.logger.warn("Unable to restore scroll position for cloned document"),this.context.windowBounds=this.context.windowBounds.add(P.scrollX-x.left,P.scrollY-x.top,0,0))),G=this.options.onclone,X=this.clonedReferenceElement,typeof X>"u"?[2,Promise.reject("Error finding the "+this.referenceElement.nodeName+" in the cloned document")]:R.fonts&&R.fonts.ready?[4,R.fonts.ready]:[3,2];case 1:ee.sent(),ee.label=2;case 2:return/(AppleWebKit)/g.test(navigator.userAgent)?[4,imagesReady(R)]:[3,4];case 3:ee.sent(),ee.label=4;case 4:return typeof G=="function"?[2,Promise.resolve().then(function(){return G(R,X)}).then(function(){return S})]:[2,S]}})})});return R.open(),R.write(serializeDoctype(document.doctype)+"<html></html>"),restoreOwnerScroll(this.referenceElement.ownerDocument,D,H),R.replaceChild(R.adoptNode(this.documentElement),R.documentElement),R.close(),Y},g.prototype.createElementClone=function(B){if(isDebugging(B,2))debugger;if(isCanvasElement(B))return this.createCanvasClone(B);if(isVideoElement(B))return this.createVideoClone(B);if(isStyleElement(B))return this.createStyleClone(B);var x=B.cloneNode(!1);return isImageElement(x)&&(isImageElement(B)&&B.currentSrc&&B.currentSrc!==B.src&&(x.src=B.currentSrc,x.srcset=""),x.loading==="lazy"&&(x.loading="eager")),isCustomElement(x)?this.createCustomElementClone(x):x},g.prototype.createCustomElementClone=function(B){var x=document.createElement("html2canvascustomelement");return copyCSSStyles(B.style,x),x},g.prototype.createStyleClone=function(B){try{var x=B.sheet;if(x&&x.cssRules){var Q=[].slice.call(x.cssRules,0).reduce(function(D,H){return H&&typeof H.cssText=="string"?D+H.cssText:D},""),S=B.cloneNode(!1);return S.textContent=Q,S}}catch(D){if(this.context.logger.error("Unable to access cssRules property",D),D.name!=="SecurityError")throw D}return B.cloneNode(!1)},g.prototype.createCanvasClone=function(B){var x;if(this.options.inlineImages&&B.ownerDocument){var Q=B.ownerDocument.createElement("img");try{return Q.src=B.toDataURL(),Q}catch{this.context.logger.info("Unable to inline canvas contents, canvas is tainted",B)}}var S=B.cloneNode(!1);try{S.width=B.width,S.height=B.height;var D=B.getContext("2d"),H=S.getContext("2d");if(H)if(!this.options.allowTaint&&D)H.putImageData(D.getImageData(0,0,B.width,B.height),0,0);else{var P=(x=B.getContext("webgl2"))!==null&&x!==void 0?x:B.getContext("webgl");if(P){var R=P.getContextAttributes();(R==null?void 0:R.preserveDrawingBuffer)===!1&&this.context.logger.warn("Unable to clone WebGL context as it has preserveDrawingBuffer=false",B)}H.drawImage(B,0,0)}return S}catch{this.context.logger.info("Unable to clone canvas as it is tainted",B)}return S},g.prototype.createVideoClone=function(B){var x=B.ownerDocument.createElement("canvas");x.width=B.offsetWidth,x.height=B.offsetHeight;var Q=x.getContext("2d");try{return Q&&(Q.drawImage(B,0,0,x.width,x.height),this.options.allowTaint||Q.getImageData(0,0,x.width,x.height)),x}catch{this.context.logger.info("Unable to clone video as it is tainted",B)}var S=B.ownerDocument.createElement("canvas");return S.width=B.offsetWidth,S.height=B.offsetHeight,S},g.prototype.appendChildNode=function(B,x,Q){(!isElementNode(x)||!isScriptElement(x)&&!x.hasAttribute(IGNORE_ATTRIBUTE)&&(typeof this.options.ignoreElements!="function"||!this.options.ignoreElements(x)))&&(!this.options.copyStyles||!isElementNode(x)||!isStyleElement(x))&&B.appendChild(this.cloneNode(x,Q))},g.prototype.cloneChildNodes=function(B,x,Q){for(var S=this,D=B.shadowRoot?B.shadowRoot.firstChild:B.firstChild;D;D=D.nextSibling)if(isElementNode(D)&&isSlotElement(D)&&typeof D.assignedNodes=="function"){var H=D.assignedNodes();H.length&&H.forEach(function(P){return S.appendChildNode(x,P,Q)})}else this.appendChildNode(x,D,Q)},g.prototype.cloneNode=function(B,x){if(isTextNode(B))return document.createTextNode(B.data);if(!B.ownerDocument)return B.cloneNode(!1);var Q=B.ownerDocument.defaultView;if(Q&&isElementNode(B)&&(isHTMLElementNode(B)||isSVGElementNode(B))){var S=this.createElementClone(B);S.style.transitionProperty="none";var D=Q.getComputedStyle(B),H=Q.getComputedStyle(B,":before"),P=Q.getComputedStyle(B,":after");this.referenceElement===B&&isHTMLElementNode(S)&&(this.clonedReferenceElement=S),isBodyElement(S)&&createPseudoHideStyles(S);var R=this.counters.parse(new CSSParsedCounterDeclaration(this.context,D)),Y=this.resolvePseudoContent(B,S,H,PseudoElementType.BEFORE);isCustomElement(B)&&(x=!0),isVideoElement(B)||this.cloneChildNodes(B,S,x),Y&&S.insertBefore(Y,S.firstChild);var G=this.resolvePseudoContent(B,S,P,PseudoElementType.AFTER);return G&&S.appendChild(G),this.counters.pop(R),(D&&(this.options.copyStyles||isSVGElementNode(B))&&!isIFrameElement(B)||x)&&copyCSSStyles(D,S),(B.scrollTop!==0||B.scrollLeft!==0)&&this.scrolledElements.push([S,B.scrollLeft,B.scrollTop]),(isTextareaElement(B)||isSelectElement(B))&&(isTextareaElement(S)||isSelectElement(S))&&(S.value=B.value),S}return B.cloneNode(!1)},g.prototype.resolvePseudoContent=function(B,x,Q,S){var D=this;if(Q){var H=Q.content,P=x.ownerDocument;if(!(!P||!H||H==="none"||H==="-moz-alt-content"||Q.display==="none")){this.counters.parse(new CSSParsedCounterDeclaration(this.context,Q));var R=new CSSParsedPseudoDeclaration(this.context,Q),Y=P.createElement("html2canvaspseudoelement");copyCSSStyles(Q,Y),R.content.forEach(function(X){if(X.type===0)Y.appendChild(P.createTextNode(X.value));else if(X.type===22){var ee=P.createElement("img");ee.src=X.value,ee.style.opacity="1",Y.appendChild(ee)}else if(X.type===18){if(X.name==="attr"){var Ae=X.values.filter(isIdentToken);Ae.length&&Y.appendChild(P.createTextNode(B.getAttribute(Ae[0].value)||""))}else if(X.name==="counter"){var le=X.values.filter(nonFunctionArgSeparator),ae=le[0],ge=le[1];if(ae&&isIdentToken(ae)){var fe=D.counters.getCounterValue(ae.value),ye=ge&&isIdentToken(ge)?listStyleType.parse(D.context,ge.value):3;Y.appendChild(P.createTextNode(createCounterText(fe,ye,!1)))}}else if(X.name==="counters"){var me=X.values.filter(nonFunctionArgSeparator),ae=me[0],we=me[1],ge=me[2];if(ae&&isIdentToken(ae)){var ve=D.counters.getCounterValues(ae.value),Ce=ge&&isIdentToken(ge)?listStyleType.parse(D.context,ge.value):3,Se=we&&we.type===0?we.value:"",We=ve.map(function(ke){return createCounterText(ke,Ce,!1)}).join(Se);Y.appendChild(P.createTextNode(We))}}}else if(X.type===20)switch(X.value){case"open-quote":Y.appendChild(P.createTextNode(getQuote(R.quotes,D.quoteDepth++,!0)));break;case"close-quote":Y.appendChild(P.createTextNode(getQuote(R.quotes,--D.quoteDepth,!1)));break;default:Y.appendChild(P.createTextNode(X.value))}}),Y.className=PSEUDO_HIDE_ELEMENT_CLASS_BEFORE+" "+PSEUDO_HIDE_ELEMENT_CLASS_AFTER;var G=S===PseudoElementType.BEFORE?" "+PSEUDO_HIDE_ELEMENT_CLASS_BEFORE:" "+PSEUDO_HIDE_ELEMENT_CLASS_AFTER;return isSVGElementNode(x)?x.className.baseValue+=G:x.className+=G,Y}}},g.destroy=function(B){return B.parentNode?(B.parentNode.removeChild(B),!0):!1},g}(),PseudoElementType;(function(g){g[g.BEFORE=0]="BEFORE",g[g.AFTER=1]="AFTER"})(PseudoElementType||(PseudoElementType={}));var createIFrameContainer=function(g,B){var x=g.createElement("iframe");return x.className="html2canvas-container",x.style.visibility="hidden",x.style.position="fixed",x.style.left="-10000px",x.style.top="0px",x.style.border="0",x.width=B.width.toString(),x.height=B.height.toString(),x.scrolling="no",x.setAttribute(IGNORE_ATTRIBUTE,"true"),g.body.appendChild(x),x},imageReady=function(g){return new Promise(function(B){if(g.complete){B();return}if(!g.src){B();return}g.onload=B,g.onerror=B})},imagesReady=function(g){return Promise.all([].slice.call(g.images,0).map(imageReady))},iframeLoader=function(g){return new Promise(function(B,x){var Q=g.contentWindow;if(!Q)return x("No window assigned for iframe");var S=Q.document;Q.onload=g.onload=function(){Q.onload=g.onload=null;var D=setInterval(function(){S.body.childNodes.length>0&&S.readyState==="complete"&&(clearInterval(D),B(g))},50)}})},ignoredStyleProperties=["all","d","content"],copyCSSStyles=function(g,B){for(var x=g.length-1;x>=0;x--){var Q=g.item(x);ignoredStyleProperties.indexOf(Q)===-1&&B.style.setProperty(Q,g.getPropertyValue(Q))}return B},serializeDoctype=function(g){var B="";return g&&(B+="<!DOCTYPE ",g.name&&(B+=g.name),g.internalSubset&&(B+=g.internalSubset),g.publicId&&(B+='"'+g.publicId+'"'),g.systemId&&(B+='"'+g.systemId+'"'),B+=">"),B},restoreOwnerScroll=function(g,B,x){g&&g.defaultView&&(B!==g.defaultView.pageXOffset||x!==g.defaultView.pageYOffset)&&g.defaultView.scrollTo(B,x)},restoreNodeScroll=function(g){var B=g[0],x=g[1],Q=g[2];B.scrollLeft=x,B.scrollTop=Q},PSEUDO_BEFORE=":before",PSEUDO_AFTER=":after",PSEUDO_HIDE_ELEMENT_CLASS_BEFORE="___html2canvas___pseudoelement_before",PSEUDO_HIDE_ELEMENT_CLASS_AFTER="___html2canvas___pseudoelement_after",PSEUDO_HIDE_ELEMENT_STYLE=`{
+    content: "" !important;
+    display: none !important;
+}`,createPseudoHideStyles=function(g){createStyles(g,"."+PSEUDO_HIDE_ELEMENT_CLASS_BEFORE+PSEUDO_BEFORE+PSEUDO_HIDE_ELEMENT_STYLE+`
+         .`+PSEUDO_HIDE_ELEMENT_CLASS_AFTER+PSEUDO_AFTER+PSEUDO_HIDE_ELEMENT_STYLE)},createStyles=function(g,B){var x=g.ownerDocument;if(x){var Q=x.createElement("style");Q.textContent=B,g.appendChild(Q)}},CacheStorage=function(){function g(){}return g.getOrigin=function(B){var x=g._link;return x?(x.href=B,x.href=x.href,x.protocol+x.hostname+x.port):"about:blank"},g.isSameOrigin=function(B){return g.getOrigin(B)===g._origin},g.setContext=function(B){g._link=B.document.createElement("a"),g._origin=g.getOrigin(B.location.href)},g._origin="about:blank",g}(),Cache=function(){function g(B,x){this.context=B,this._options=x,this._cache={}}return g.prototype.addImage=function(B){var x=Promise.resolve();return this.has(B)||(isBlobImage(B)||isRenderable(B))&&(this._cache[B]=this.loadImage(B)).catch(function(){}),x},g.prototype.match=function(B){return this._cache[B]},g.prototype.loadImage=function(B){return __awaiter(this,void 0,void 0,function(){var x,Q,S,D,H=this;return __generator(this,function(P){switch(P.label){case 0:return x=CacheStorage.isSameOrigin(B),Q=!isInlineImage(B)&&this._options.useCORS===!0&&FEATURES.SUPPORT_CORS_IMAGES&&!x,S=!isInlineImage(B)&&!x&&!isBlobImage(B)&&typeof this._options.proxy=="string"&&FEATURES.SUPPORT_CORS_XHR&&!Q,!x&&this._options.allowTaint===!1&&!isInlineImage(B)&&!isBlobImage(B)&&!S&&!Q?[2]:(D=B,S?[4,this.proxy(D)]:[3,2]);case 1:D=P.sent(),P.label=2;case 2:return this.context.logger.debug("Added image "+B.substring(0,256)),[4,new Promise(function(R,Y){var G=new Image;G.onload=function(){return R(G)},G.onerror=Y,(isInlineBase64Image(D)||Q)&&(G.crossOrigin="anonymous"),G.src=D,G.complete===!0&&setTimeout(function(){return R(G)},500),H._options.imageTimeout>0&&setTimeout(function(){return Y("Timed out ("+H._options.imageTimeout+"ms) loading image")},H._options.imageTimeout)})];case 3:return[2,P.sent()]}})})},g.prototype.has=function(B){return typeof this._cache[B]<"u"},g.prototype.keys=function(){return Promise.resolve(Object.keys(this._cache))},g.prototype.proxy=function(B){var x=this,Q=this._options.proxy;if(!Q)throw new Error("No proxy defined");var S=B.substring(0,256);return new Promise(function(D,H){var P=FEATURES.SUPPORT_RESPONSE_TYPE?"blob":"text",R=new XMLHttpRequest;R.onload=function(){if(R.status===200)if(P==="text")D(R.response);else{var X=new FileReader;X.addEventListener("load",function(){return D(X.result)},!1),X.addEventListener("error",function(ee){return H(ee)},!1),X.readAsDataURL(R.response)}else H("Failed to proxy resource "+S+" with status code "+R.status)},R.onerror=H;var Y=Q.indexOf("?")>-1?"&":"?";if(R.open("GET",""+Q+Y+"url="+encodeURIComponent(B)+"&responseType="+P),P!=="text"&&R instanceof XMLHttpRequest&&(R.responseType=P),x._options.imageTimeout){var G=x._options.imageTimeout;R.timeout=G,R.ontimeout=function(){return H("Timed out ("+G+"ms) proxying "+S)}}R.send()})},g}(),INLINE_SVG=/^data:image\/svg\+xml/i,INLINE_BASE64=/^data:image\/.*;base64,/i,INLINE_IMG=/^data:image\/.*/i,isRenderable=function(g){return FEATURES.SUPPORT_SVG_DRAWING||!isSVG(g)},isInlineImage=function(g){return INLINE_IMG.test(g)},isInlineBase64Image=function(g){return INLINE_BASE64.test(g)},isBlobImage=function(g){return g.substr(0,4)==="blob"},isSVG=function(g){return g.substr(-3).toLowerCase()==="svg"||INLINE_SVG.test(g)},Vector=function(){function g(B,x){this.type=0,this.x=B,this.y=x}return g.prototype.add=function(B,x){return new g(this.x+B,this.y+x)},g}(),lerp=function(g,B,x){return new Vector(g.x+(B.x-g.x)*x,g.y+(B.y-g.y)*x)},BezierCurve=function(){function g(B,x,Q,S){this.type=1,this.start=B,this.startControl=x,this.endControl=Q,this.end=S}return g.prototype.subdivide=function(B,x){var Q=lerp(this.start,this.startControl,B),S=lerp(this.startControl,this.endControl,B),D=lerp(this.endControl,this.end,B),H=lerp(Q,S,B),P=lerp(S,D,B),R=lerp(H,P,B);return x?new g(this.start,Q,H,R):new g(R,P,D,this.end)},g.prototype.add=function(B,x){return new g(this.start.add(B,x),this.startControl.add(B,x),this.endControl.add(B,x),this.end.add(B,x))},g.prototype.reverse=function(){return new g(this.end,this.endControl,this.startControl,this.start)},g}(),isBezierCurve=function(g){return g.type===1},BoundCurves=function(){function g(B){var x=B.styles,Q=B.bounds,S=getAbsoluteValueForTuple(x.borderTopLeftRadius,Q.width,Q.height),D=S[0],H=S[1],P=getAbsoluteValueForTuple(x.borderTopRightRadius,Q.width,Q.height),R=P[0],Y=P[1],G=getAbsoluteValueForTuple(x.borderBottomRightRadius,Q.width,Q.height),X=G[0],ee=G[1],Ae=getAbsoluteValueForTuple(x.borderBottomLeftRadius,Q.width,Q.height),le=Ae[0],ae=Ae[1],ge=[];ge.push((D+R)/Q.width),ge.push((le+X)/Q.width),ge.push((H+ae)/Q.height),ge.push((Y+ee)/Q.height);var fe=Math.max.apply(Math,ge);fe>1&&(D/=fe,H/=fe,R/=fe,Y/=fe,X/=fe,ee/=fe,le/=fe,ae/=fe);var ye=Q.width-R,me=Q.height-ee,we=Q.width-X,ve=Q.height-ae,Ce=x.borderTopWidth,Se=x.borderRightWidth,We=x.borderBottomWidth,Ke=x.borderLeftWidth,Ue=getAbsoluteValue(x.paddingTop,B.bounds.width),ke=getAbsoluteValue(x.paddingRight,B.bounds.width),Me=getAbsoluteValue(x.paddingBottom,B.bounds.width),ze=getAbsoluteValue(x.paddingLeft,B.bounds.width);this.topLeftBorderDoubleOuterBox=D>0||H>0?getCurvePoints(Q.left+Ke/3,Q.top+Ce/3,D-Ke/3,H-Ce/3,CORNER.TOP_LEFT):new Vector(Q.left+Ke/3,Q.top+Ce/3),this.topRightBorderDoubleOuterBox=D>0||H>0?getCurvePoints(Q.left+ye,Q.top+Ce/3,R-Se/3,Y-Ce/3,CORNER.TOP_RIGHT):new Vector(Q.left+Q.width-Se/3,Q.top+Ce/3),this.bottomRightBorderDoubleOuterBox=X>0||ee>0?getCurvePoints(Q.left+we,Q.top+me,X-Se/3,ee-We/3,CORNER.BOTTOM_RIGHT):new Vector(Q.left+Q.width-Se/3,Q.top+Q.height-We/3),this.bottomLeftBorderDoubleOuterBox=le>0||ae>0?getCurvePoints(Q.left+Ke/3,Q.top+ve,le-Ke/3,ae-We/3,CORNER.BOTTOM_LEFT):new Vector(Q.left+Ke/3,Q.top+Q.height-We/3),this.topLeftBorderDoubleInnerBox=D>0||H>0?getCurvePoints(Q.left+Ke*2/3,Q.top+Ce*2/3,D-Ke*2/3,H-Ce*2/3,CORNER.TOP_LEFT):new Vector(Q.left+Ke*2/3,Q.top+Ce*2/3),this.topRightBorderDoubleInnerBox=D>0||H>0?getCurvePoints(Q.left+ye,Q.top+Ce*2/3,R-Se*2/3,Y-Ce*2/3,CORNER.TOP_RIGHT):new Vector(Q.left+Q.width-Se*2/3,Q.top+Ce*2/3),this.bottomRightBorderDoubleInnerBox=X>0||ee>0?getCurvePoints(Q.left+we,Q.top+me,X-Se*2/3,ee-We*2/3,CORNER.BOTTOM_RIGHT):new Vector(Q.left+Q.width-Se*2/3,Q.top+Q.height-We*2/3),this.bottomLeftBorderDoubleInnerBox=le>0||ae>0?getCurvePoints(Q.left+Ke*2/3,Q.top+ve,le-Ke*2/3,ae-We*2/3,CORNER.BOTTOM_LEFT):new Vector(Q.left+Ke*2/3,Q.top+Q.height-We*2/3),this.topLeftBorderStroke=D>0||H>0?getCurvePoints(Q.left+Ke/2,Q.top+Ce/2,D-Ke/2,H-Ce/2,CORNER.TOP_LEFT):new Vector(Q.left+Ke/2,Q.top+Ce/2),this.topRightBorderStroke=D>0||H>0?getCurvePoints(Q.left+ye,Q.top+Ce/2,R-Se/2,Y-Ce/2,CORNER.TOP_RIGHT):new Vector(Q.left+Q.width-Se/2,Q.top+Ce/2),this.bottomRightBorderStroke=X>0||ee>0?getCurvePoints(Q.left+we,Q.top+me,X-Se/2,ee-We/2,CORNER.BOTTOM_RIGHT):new Vector(Q.left+Q.width-Se/2,Q.top+Q.height-We/2),this.bottomLeftBorderStroke=le>0||ae>0?getCurvePoints(Q.left+Ke/2,Q.top+ve,le-Ke/2,ae-We/2,CORNER.BOTTOM_LEFT):new Vector(Q.left+Ke/2,Q.top+Q.height-We/2),this.topLeftBorderBox=D>0||H>0?getCurvePoints(Q.left,Q.top,D,H,CORNER.TOP_LEFT):new Vector(Q.left,Q.top),this.topRightBorderBox=R>0||Y>0?getCurvePoints(Q.left+ye,Q.top,R,Y,CORNER.TOP_RIGHT):new Vector(Q.left+Q.width,Q.top),this.bottomRightBorderBox=X>0||ee>0?getCurvePoints(Q.left+we,Q.top+me,X,ee,CORNER.BOTTOM_RIGHT):new Vector(Q.left+Q.width,Q.top+Q.height),this.bottomLeftBorderBox=le>0||ae>0?getCurvePoints(Q.left,Q.top+ve,le,ae,CORNER.BOTTOM_LEFT):new Vector(Q.left,Q.top+Q.height),this.topLeftPaddingBox=D>0||H>0?getCurvePoints(Q.left+Ke,Q.top+Ce,Math.max(0,D-Ke),Math.max(0,H-Ce),CORNER.TOP_LEFT):new Vector(Q.left+Ke,Q.top+Ce),this.topRightPaddingBox=R>0||Y>0?getCurvePoints(Q.left+Math.min(ye,Q.width-Se),Q.top+Ce,ye>Q.width+Se?0:Math.max(0,R-Se),Math.max(0,Y-Ce),CORNER.TOP_RIGHT):new Vector(Q.left+Q.width-Se,Q.top+Ce),this.bottomRightPaddingBox=X>0||ee>0?getCurvePoints(Q.left+Math.min(we,Q.width-Ke),Q.top+Math.min(me,Q.height-We),Math.max(0,X-Se),Math.max(0,ee-We),CORNER.BOTTOM_RIGHT):new Vector(Q.left+Q.width-Se,Q.top+Q.height-We),this.bottomLeftPaddingBox=le>0||ae>0?getCurvePoints(Q.left+Ke,Q.top+Math.min(ve,Q.height-We),Math.max(0,le-Ke),Math.max(0,ae-We),CORNER.BOTTOM_LEFT):new Vector(Q.left+Ke,Q.top+Q.height-We),this.topLeftContentBox=D>0||H>0?getCurvePoints(Q.left+Ke+ze,Q.top+Ce+Ue,Math.max(0,D-(Ke+ze)),Math.max(0,H-(Ce+Ue)),CORNER.TOP_LEFT):new Vector(Q.left+Ke+ze,Q.top+Ce+Ue),this.topRightContentBox=R>0||Y>0?getCurvePoints(Q.left+Math.min(ye,Q.width+Ke+ze),Q.top+Ce+Ue,ye>Q.width+Ke+ze?0:R-Ke+ze,Y-(Ce+Ue),CORNER.TOP_RIGHT):new Vector(Q.left+Q.width-(Se+ke),Q.top+Ce+Ue),this.bottomRightContentBox=X>0||ee>0?getCurvePoints(Q.left+Math.min(we,Q.width-(Ke+ze)),Q.top+Math.min(me,Q.height+Ce+Ue),Math.max(0,X-(Se+ke)),ee-(We+Me),CORNER.BOTTOM_RIGHT):new Vector(Q.left+Q.width-(Se+ke),Q.top+Q.height-(We+Me)),this.bottomLeftContentBox=le>0||ae>0?getCurvePoints(Q.left+Ke+ze,Q.top+ve,Math.max(0,le-(Ke+ze)),ae-(We+Me),CORNER.BOTTOM_LEFT):new Vector(Q.left+Ke+ze,Q.top+Q.height-(We+Me))}return g}(),CORNER;(function(g){g[g.TOP_LEFT=0]="TOP_LEFT",g[g.TOP_RIGHT=1]="TOP_RIGHT",g[g.BOTTOM_RIGHT=2]="BOTTOM_RIGHT",g[g.BOTTOM_LEFT=3]="BOTTOM_LEFT"})(CORNER||(CORNER={}));var getCurvePoints=function(g,B,x,Q,S){var D=4*((Math.sqrt(2)-1)/3),H=x*D,P=Q*D,R=g+x,Y=B+Q;switch(S){case CORNER.TOP_LEFT:return new BezierCurve(new Vector(g,Y),new Vector(g,Y-P),new Vector(R-H,B),new Vector(R,B));case CORNER.TOP_RIGHT:return new BezierCurve(new Vector(g,B),new Vector(g+H,B),new Vector(R,Y-P),new Vector(R,Y));case CORNER.BOTTOM_RIGHT:return new BezierCurve(new Vector(R,B),new Vector(R,B+P),new Vector(g+H,Y),new Vector(g,Y));case CORNER.BOTTOM_LEFT:default:return new BezierCurve(new Vector(R,Y),new Vector(R-H,Y),new Vector(g,B+P),new Vector(g,B))}},calculateBorderBoxPath=function(g){return[g.topLeftBorderBox,g.topRightBorderBox,g.bottomRightBorderBox,g.bottomLeftBorderBox]},calculateContentBoxPath=function(g){return[g.topLeftContentBox,g.topRightContentBox,g.bottomRightContentBox,g.bottomLeftContentBox]},calculatePaddingBoxPath=function(g){return[g.topLeftPaddingBox,g.topRightPaddingBox,g.bottomRightPaddingBox,g.bottomLeftPaddingBox]},TransformEffect=function(){function g(B,x,Q){this.offsetX=B,this.offsetY=x,this.matrix=Q,this.type=0,this.target=6}return g}(),ClipEffect=function(){function g(B,x){this.path=B,this.target=x,this.type=1}return g}(),OpacityEffect=function(){function g(B){this.opacity=B,this.type=2,this.target=6}return g}(),isTransformEffect=function(g){return g.type===0},isClipEffect=function(g){return g.type===1},isOpacityEffect=function(g){return g.type===2},equalPath=function(g,B){return g.length===B.length?g.some(function(x,Q){return x===B[Q]}):!1},transformPath=function(g,B,x,Q,S){return g.map(function(D,H){switch(H){case 0:return D.add(B,x);case 1:return D.add(B+Q,x);case 2:return D.add(B+Q,x+S);case 3:return D.add(B,x+S)}return D})},StackingContext=function(){function g(B){this.element=B,this.inlineLevel=[],this.nonInlineLevel=[],this.negativeZIndex=[],this.zeroOrAutoZIndexOrTransformedOrOpacity=[],this.positiveZIndex=[],this.nonPositionedFloats=[],this.nonPositionedInlineLevel=[]}return g}(),ElementPaint=function(){function g(B,x){if(this.container=B,this.parent=x,this.effects=[],this.curves=new BoundCurves(this.container),this.container.styles.opacity<1&&this.effects.push(new OpacityEffect(this.container.styles.opacity)),this.container.styles.transform!==null){var Q=this.container.bounds.left+this.container.styles.transformOrigin[0].number,S=this.container.bounds.top+this.container.styles.transformOrigin[1].number,D=this.container.styles.transform;this.effects.push(new TransformEffect(Q,S,D))}if(this.container.styles.overflowX!==0){var H=calculateBorderBoxPath(this.curves),P=calculatePaddingBoxPath(this.curves);equalPath(H,P)?this.effects.push(new ClipEffect(H,6)):(this.effects.push(new ClipEffect(H,2)),this.effects.push(new ClipEffect(P,4)))}}return g.prototype.getEffects=function(B){for(var x=[2,3].indexOf(this.container.styles.position)===-1,Q=this.parent,S=this.effects.slice(0);Q;){var D=Q.effects.filter(function(R){return!isClipEffect(R)});if(x||Q.container.styles.position!==0||!Q.parent){if(S.unshift.apply(S,D),x=[2,3].indexOf(Q.container.styles.position)===-1,Q.container.styles.overflowX!==0){var H=calculateBorderBoxPath(Q.curves),P=calculatePaddingBoxPath(Q.curves);equalPath(H,P)||S.unshift(new ClipEffect(P,6))}}else S.unshift.apply(S,D);Q=Q.parent}return S.filter(function(R){return contains(R.target,B)})},g}(),parseStackTree=function(g,B,x,Q){g.container.elements.forEach(function(S){var D=contains(S.flags,4),H=contains(S.flags,2),P=new ElementPaint(S,g);contains(S.styles.display,2048)&&Q.push(P);var R=contains(S.flags,8)?[]:Q;if(D||H){var Y=D||S.styles.isPositioned()?x:B,G=new StackingContext(P);if(S.styles.isPositioned()||S.styles.opacity<1||S.styles.isTransformed()){var X=S.styles.zIndex.order;if(X<0){var ee=0;Y.negativeZIndex.some(function(le,ae){return X>le.element.container.styles.zIndex.order?(ee=ae,!1):ee>0}),Y.negativeZIndex.splice(ee,0,G)}else if(X>0){var Ae=0;Y.positiveZIndex.some(function(le,ae){return X>=le.element.container.styles.zIndex.order?(Ae=ae+1,!1):Ae>0}),Y.positiveZIndex.splice(Ae,0,G)}else Y.zeroOrAutoZIndexOrTransformedOrOpacity.push(G)}else S.styles.isFloating()?Y.nonPositionedFloats.push(G):Y.nonPositionedInlineLevel.push(G);parseStackTree(P,G,D?G:x,R)}else S.styles.isInlineLevel()?B.inlineLevel.push(P):B.nonInlineLevel.push(P),parseStackTree(P,B,x,R);contains(S.flags,8)&&processListItems(S,R)})},processListItems=function(g,B){for(var x=g instanceof OLElementContainer?g.start:1,Q=g instanceof OLElementContainer?g.reversed:!1,S=0;S<B.length;S++){var D=B[S];D.container instanceof LIElementContainer&&typeof D.container.value=="number"&&D.container.value!==0&&(x=D.container.value),D.listValue=createCounterText(x,D.container.styles.listStyleType,!0),x+=Q?-1:1}},parseStackingContexts=function(g){var B=new ElementPaint(g,null),x=new StackingContext(B),Q=[];return parseStackTree(B,x,x,Q),processListItems(B.container,Q),x},parsePathForBorder=function(g,B){switch(B){case 0:return createPathFromCurves(g.topLeftBorderBox,g.topLeftPaddingBox,g.topRightBorderBox,g.topRightPaddingBox);case 1:return createPathFromCurves(g.topRightBorderBox,g.topRightPaddingBox,g.bottomRightBorderBox,g.bottomRightPaddingBox);case 2:return createPathFromCurves(g.bottomRightBorderBox,g.bottomRightPaddingBox,g.bottomLeftBorderBox,g.bottomLeftPaddingBox);case 3:default:return createPathFromCurves(g.bottomLeftBorderBox,g.bottomLeftPaddingBox,g.topLeftBorderBox,g.topLeftPaddingBox)}},parsePathForBorderDoubleOuter=function(g,B){switch(B){case 0:return createPathFromCurves(g.topLeftBorderBox,g.topLeftBorderDoubleOuterBox,g.topRightBorderBox,g.topRightBorderDoubleOuterBox);case 1:return createPathFromCurves(g.topRightBorderBox,g.topRightBorderDoubleOuterBox,g.bottomRightBorderBox,g.bottomRightBorderDoubleOuterBox);case 2:return createPathFromCurves(g.bottomRightBorderBox,g.bottomRightBorderDoubleOuterBox,g.bottomLeftBorderBox,g.bottomLeftBorderDoubleOuterBox);case 3:default:return createPathFromCurves(g.bottomLeftBorderBox,g.bottomLeftBorderDoubleOuterBox,g.topLeftBorderBox,g.topLeftBorderDoubleOuterBox)}},parsePathForBorderDoubleInner=function(g,B){switch(B){case 0:return createPathFromCurves(g.topLeftBorderDoubleInnerBox,g.topLeftPaddingBox,g.topRightBorderDoubleInnerBox,g.topRightPaddingBox);case 1:return createPathFromCurves(g.topRightBorderDoubleInnerBox,g.topRightPaddingBox,g.bottomRightBorderDoubleInnerBox,g.bottomRightPaddingBox);case 2:return createPathFromCurves(g.bottomRightBorderDoubleInnerBox,g.bottomRightPaddingBox,g.bottomLeftBorderDoubleInnerBox,g.bottomLeftPaddingBox);case 3:default:return createPathFromCurves(g.bottomLeftBorderDoubleInnerBox,g.bottomLeftPaddingBox,g.topLeftBorderDoubleInnerBox,g.topLeftPaddingBox)}},parsePathForBorderStroke=function(g,B){switch(B){case 0:return createStrokePathFromCurves(g.topLeftBorderStroke,g.topRightBorderStroke);case 1:return createStrokePathFromCurves(g.topRightBorderStroke,g.bottomRightBorderStroke);case 2:return createStrokePathFromCurves(g.bottomRightBorderStroke,g.bottomLeftBorderStroke);case 3:default:return createStrokePathFromCurves(g.bottomLeftBorderStroke,g.topLeftBorderStroke)}},createStrokePathFromCurves=function(g,B){var x=[];return isBezierCurve(g)?x.push(g.subdivide(.5,!1)):x.push(g),isBezierCurve(B)?x.push(B.subdivide(.5,!0)):x.push(B),x},createPathFromCurves=function(g,B,x,Q){var S=[];return isBezierCurve(g)?S.push(g.subdivide(.5,!1)):S.push(g),isBezierCurve(x)?S.push(x.subdivide(.5,!0)):S.push(x),isBezierCurve(Q)?S.push(Q.subdivide(.5,!0).reverse()):S.push(Q),isBezierCurve(B)?S.push(B.subdivide(.5,!1).reverse()):S.push(B),S},paddingBox=function(g){var B=g.bounds,x=g.styles;return B.add(x.borderLeftWidth,x.borderTopWidth,-(x.borderRightWidth+x.borderLeftWidth),-(x.borderTopWidth+x.borderBottomWidth))},contentBox=function(g){var B=g.styles,x=g.bounds,Q=getAbsoluteValue(B.paddingLeft,x.width),S=getAbsoluteValue(B.paddingRight,x.width),D=getAbsoluteValue(B.paddingTop,x.width),H=getAbsoluteValue(B.paddingBottom,x.width);return x.add(Q+B.borderLeftWidth,D+B.borderTopWidth,-(B.borderRightWidth+B.borderLeftWidth+Q+S),-(B.borderTopWidth+B.borderBottomWidth+D+H))},calculateBackgroundPositioningArea=function(g,B){return g===0?B.bounds:g===2?contentBox(B):paddingBox(B)},calculateBackgroundPaintingArea=function(g,B){return g===0?B.bounds:g===2?contentBox(B):paddingBox(B)},calculateBackgroundRendering=function(g,B,x){var Q=calculateBackgroundPositioningArea(getBackgroundValueForIndex(g.styles.backgroundOrigin,B),g),S=calculateBackgroundPaintingArea(getBackgroundValueForIndex(g.styles.backgroundClip,B),g),D=calculateBackgroundSize(getBackgroundValueForIndex(g.styles.backgroundSize,B),x,Q),H=D[0],P=D[1],R=getAbsoluteValueForTuple(getBackgroundValueForIndex(g.styles.backgroundPosition,B),Q.width-H,Q.height-P),Y=calculateBackgroundRepeatPath(getBackgroundValueForIndex(g.styles.backgroundRepeat,B),R,D,Q,S),G=Math.round(Q.left+R[0]),X=Math.round(Q.top+R[1]);return[Y,G,X,H,P]},isAuto=function(g){return isIdentToken(g)&&g.value===BACKGROUND_SIZE.AUTO},hasIntrinsicValue=function(g){return typeof g=="number"},calculateBackgroundSize=function(g,B,x){var Q=B[0],S=B[1],D=B[2],H=g[0],P=g[1];if(!H)return[0,0];if(isLengthPercentage(H)&&P&&isLengthPercentage(P))return[getAbsoluteValue(H,x.width),getAbsoluteValue(P,x.height)];var R=hasIntrinsicValue(D);if(isIdentToken(H)&&(H.value===BACKGROUND_SIZE.CONTAIN||H.value===BACKGROUND_SIZE.COVER)){if(hasIntrinsicValue(D)){var Y=x.width/x.height;return Y<D!=(H.value===BACKGROUND_SIZE.COVER)?[x.width,x.width/D]:[x.height*D,x.height]}return[x.width,x.height]}var G=hasIntrinsicValue(Q),X=hasIntrinsicValue(S),ee=G||X;if(isAuto(H)&&(!P||isAuto(P))){if(G&&X)return[Q,S];if(!R&&!ee)return[x.width,x.height];if(ee&&R){var Ae=G?Q:S*D,le=X?S:Q/D;return[Ae,le]}var ae=G?Q:x.width,ge=X?S:x.height;return[ae,ge]}if(R){var fe=0,ye=0;return isLengthPercentage(H)?fe=getAbsoluteValue(H,x.width):isLengthPercentage(P)&&(ye=getAbsoluteValue(P,x.height)),isAuto(H)?fe=ye*D:(!P||isAuto(P))&&(ye=fe/D),[fe,ye]}var me=null,we=null;if(isLengthPercentage(H)?me=getAbsoluteValue(H,x.width):P&&isLengthPercentage(P)&&(we=getAbsoluteValue(P,x.height)),me!==null&&(!P||isAuto(P))&&(we=G&&X?me/Q*S:x.height),we!==null&&isAuto(H)&&(me=G&&X?we/S*Q:x.width),me!==null&&we!==null)return[me,we];throw new Error("Unable to calculate background-size for element")},getBackgroundValueForIndex=function(g,B){var x=g[B];return typeof x>"u"?g[0]:x},calculateBackgroundRepeatPath=function(g,B,x,Q,S){var D=B[0],H=B[1],P=x[0],R=x[1];switch(g){case 2:return[new Vector(Math.round(Q.left),Math.round(Q.top+H)),new Vector(Math.round(Q.left+Q.width),Math.round(Q.top+H)),new Vector(Math.round(Q.left+Q.width),Math.round(R+Q.top+H)),new Vector(Math.round(Q.left),Math.round(R+Q.top+H))];case 3:return[new Vector(Math.round(Q.left+D),Math.round(Q.top)),new Vector(Math.round(Q.left+D+P),Math.round(Q.top)),new Vector(Math.round(Q.left+D+P),Math.round(Q.height+Q.top)),new Vector(Math.round(Q.left+D),Math.round(Q.height+Q.top))];case 1:return[new Vector(Math.round(Q.left+D),Math.round(Q.top+H)),new Vector(Math.round(Q.left+D+P),Math.round(Q.top+H)),new Vector(Math.round(Q.left+D+P),Math.round(Q.top+H+R)),new Vector(Math.round(Q.left+D),Math.round(Q.top+H+R))];default:return[new Vector(Math.round(S.left),Math.round(S.top)),new Vector(Math.round(S.left+S.width),Math.round(S.top)),new Vector(Math.round(S.left+S.width),Math.round(S.height+S.top)),new Vector(Math.round(S.left),Math.round(S.height+S.top))]}},SMALL_IMAGE="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",SAMPLE_TEXT="Hidden Text",FontMetrics=function(){function g(B){this._data={},this._document=B}return g.prototype.parseMetrics=function(B,x){var Q=this._document.createElement("div"),S=this._document.createElement("img"),D=this._document.createElement("span"),H=this._document.body;Q.style.visibility="hidden",Q.style.fontFamily=B,Q.style.fontSize=x,Q.style.margin="0",Q.style.padding="0",Q.style.whiteSpace="nowrap",H.appendChild(Q),S.src=SMALL_IMAGE,S.width=1,S.height=1,S.style.margin="0",S.style.padding="0",S.style.verticalAlign="baseline",D.style.fontFamily=B,D.style.fontSize=x,D.style.margin="0",D.style.padding="0",D.appendChild(this._document.createTextNode(SAMPLE_TEXT)),Q.appendChild(D),Q.appendChild(S);var P=S.offsetTop-D.offsetTop+2;Q.removeChild(D),Q.appendChild(this._document.createTextNode(SAMPLE_TEXT)),Q.style.lineHeight="normal",S.style.verticalAlign="super";var R=S.offsetTop-Q.offsetTop+2;return H.removeChild(Q),{baseline:P,middle:R}},g.prototype.getMetrics=function(B,x){var Q=B+" "+x;return typeof this._data[Q]>"u"&&(this._data[Q]=this.parseMetrics(B,x)),this._data[Q]},g}(),Renderer=function(){function g(B,x){this.context=B,this.options=x}return g}(),MASK_OFFSET=1e4,CanvasRenderer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;return S._activeEffects=[],S.canvas=Q.canvas?Q.canvas:document.createElement("canvas"),S.ctx=S.canvas.getContext("2d"),Q.canvas||(S.canvas.width=Math.floor(Q.width*Q.scale),S.canvas.height=Math.floor(Q.height*Q.scale),S.canvas.style.width=Q.width+"px",S.canvas.style.height=Q.height+"px"),S.fontMetrics=new FontMetrics(document),S.ctx.scale(S.options.scale,S.options.scale),S.ctx.translate(-Q.x,-Q.y),S.ctx.textBaseline="bottom",S._activeEffects=[],S.context.logger.debug("Canvas renderer initialized ("+Q.width+"x"+Q.height+") with scale "+Q.scale),S}return B.prototype.applyEffects=function(x){for(var Q=this;this._activeEffects.length;)this.popEffect();x.forEach(function(S){return Q.applyEffect(S)})},B.prototype.applyEffect=function(x){this.ctx.save(),isOpacityEffect(x)&&(this.ctx.globalAlpha=x.opacity),isTransformEffect(x)&&(this.ctx.translate(x.offsetX,x.offsetY),this.ctx.transform(x.matrix[0],x.matrix[1],x.matrix[2],x.matrix[3],x.matrix[4],x.matrix[5]),this.ctx.translate(-x.offsetX,-x.offsetY)),isClipEffect(x)&&(this.path(x.path),this.ctx.clip()),this._activeEffects.push(x)},B.prototype.popEffect=function(){this._activeEffects.pop(),this.ctx.restore()},B.prototype.renderStack=function(x){return __awaiter(this,void 0,void 0,function(){var Q;return __generator(this,function(S){switch(S.label){case 0:return Q=x.element.container.styles,Q.isVisible()?[4,this.renderStackContent(x)]:[3,2];case 1:S.sent(),S.label=2;case 2:return[2]}})})},B.prototype.renderNode=function(x){return __awaiter(this,void 0,void 0,function(){return __generator(this,function(Q){switch(Q.label){case 0:if(contains(x.container.flags,16))debugger;return x.container.styles.isVisible()?[4,this.renderNodeBackgroundAndBorders(x)]:[3,3];case 1:return Q.sent(),[4,this.renderNodeContent(x)];case 2:Q.sent(),Q.label=3;case 3:return[2]}})})},B.prototype.renderTextWithLetterSpacing=function(x,Q,S){var D=this;if(Q===0)this.ctx.fillText(x.text,x.bounds.left,x.bounds.top+S);else{var H=segmentGraphemes(x.text);H.reduce(function(P,R){return D.ctx.fillText(R,P,x.bounds.top+S),P+D.ctx.measureText(R).width},x.bounds.left)}},B.prototype.createFontStyle=function(x){var Q=x.fontVariant.filter(function(H){return H==="normal"||H==="small-caps"}).join(""),S=fixIOSSystemFonts(x.fontFamily).join(", "),D=isDimensionToken(x.fontSize)?""+x.fontSize.number+x.fontSize.unit:x.fontSize.number+"px";return[[x.fontStyle,Q,x.fontWeight,D,S].join(" "),S,D]},B.prototype.renderTextNode=function(x,Q){return __awaiter(this,void 0,void 0,function(){var S,D,H,P,R,Y,G,X,ee=this;return __generator(this,function(Ae){return S=this.createFontStyle(Q),D=S[0],H=S[1],P=S[2],this.ctx.font=D,this.ctx.direction=Q.direction===1?"rtl":"ltr",this.ctx.textAlign="left",this.ctx.textBaseline="alphabetic",R=this.fontMetrics.getMetrics(H,P),Y=R.baseline,G=R.middle,X=Q.paintOrder,x.textBounds.forEach(function(le){X.forEach(function(ae){switch(ae){case 0:ee.ctx.fillStyle=asString(Q.color),ee.renderTextWithLetterSpacing(le,Q.letterSpacing,Y);var ge=Q.textShadow;ge.length&&le.text.trim().length&&(ge.slice(0).reverse().forEach(function(fe){ee.ctx.shadowColor=asString(fe.color),ee.ctx.shadowOffsetX=fe.offsetX.number*ee.options.scale,ee.ctx.shadowOffsetY=fe.offsetY.number*ee.options.scale,ee.ctx.shadowBlur=fe.blur.number,ee.renderTextWithLetterSpacing(le,Q.letterSpacing,Y)}),ee.ctx.shadowColor="",ee.ctx.shadowOffsetX=0,ee.ctx.shadowOffsetY=0,ee.ctx.shadowBlur=0),Q.textDecorationLine.length&&(ee.ctx.fillStyle=asString(Q.textDecorationColor||Q.color),Q.textDecorationLine.forEach(function(fe){switch(fe){case 1:ee.ctx.fillRect(le.bounds.left,Math.round(le.bounds.top+Y),le.bounds.width,1);break;case 2:ee.ctx.fillRect(le.bounds.left,Math.round(le.bounds.top),le.bounds.width,1);break;case 3:ee.ctx.fillRect(le.bounds.left,Math.ceil(le.bounds.top+G),le.bounds.width,1);break}}));break;case 1:Q.webkitTextStrokeWidth&&le.text.trim().length&&(ee.ctx.strokeStyle=asString(Q.webkitTextStrokeColor),ee.ctx.lineWidth=Q.webkitTextStrokeWidth,ee.ctx.lineJoin=window.chrome?"miter":"round",ee.ctx.strokeText(le.text,le.bounds.left,le.bounds.top+Y)),ee.ctx.strokeStyle="",ee.ctx.lineWidth=0,ee.ctx.lineJoin="miter";break}})}),[2]})})},B.prototype.renderReplacedElement=function(x,Q,S){if(S&&x.intrinsicWidth>0&&x.intrinsicHeight>0){var D=contentBox(x),H=calculatePaddingBoxPath(Q);this.path(H),this.ctx.save(),this.ctx.clip(),this.ctx.drawImage(S,0,0,x.intrinsicWidth,x.intrinsicHeight,D.left,D.top,D.width,D.height),this.ctx.restore()}},B.prototype.renderNodeContent=function(x){return __awaiter(this,void 0,void 0,function(){var Q,S,D,H,P,R,ye,ye,Y,G,X,ee,we,Ae,le,ve,ae,ge,fe,ye,me,we,ve;return __generator(this,function(Ce){switch(Ce.label){case 0:this.applyEffects(x.getEffects(4)),Q=x.container,S=x.curves,D=Q.styles,H=0,P=Q.textNodes,Ce.label=1;case 1:return H<P.length?(R=P[H],[4,this.renderTextNode(R,D)]):[3,4];case 2:Ce.sent(),Ce.label=3;case 3:return H++,[3,1];case 4:if(!(Q instanceof ImageElementContainer))return[3,8];Ce.label=5;case 5:return Ce.trys.push([5,7,,8]),[4,this.context.cache.match(Q.src)];case 6:return ye=Ce.sent(),this.renderReplacedElement(Q,S,ye),[3,8];case 7:return Ce.sent(),this.context.logger.error("Error loading image "+Q.src),[3,8];case 8:if(Q instanceof CanvasElementContainer&&this.renderReplacedElement(Q,S,Q.canvas),!(Q instanceof SVGElementContainer))return[3,12];Ce.label=9;case 9:return Ce.trys.push([9,11,,12]),[4,this.context.cache.match(Q.svg)];case 10:return ye=Ce.sent(),this.renderReplacedElement(Q,S,ye),[3,12];case 11:return Ce.sent(),this.context.logger.error("Error loading svg "+Q.svg.substring(0,255)),[3,12];case 12:return Q instanceof IFrameElementContainer&&Q.tree?(Y=new B(this.context,{scale:this.options.scale,backgroundColor:Q.backgroundColor,x:0,y:0,width:Q.width,height:Q.height}),[4,Y.render(Q.tree)]):[3,14];case 13:G=Ce.sent(),Q.width&&Q.height&&this.ctx.drawImage(G,0,0,Q.width,Q.height,Q.bounds.left,Q.bounds.top,Q.bounds.width,Q.bounds.height),Ce.label=14;case 14:if(Q instanceof InputElementContainer&&(X=Math.min(Q.bounds.width,Q.bounds.height),Q.type===CHECKBOX?Q.checked&&(this.ctx.save(),this.path([new Vector(Q.bounds.left+X*.39363,Q.bounds.top+X*.79),new Vector(Q.bounds.left+X*.16,Q.bounds.top+X*.5549),new Vector(Q.bounds.left+X*.27347,Q.bounds.top+X*.44071),new Vector(Q.bounds.left+X*.39694,Q.bounds.top+X*.5649),new Vector(Q.bounds.left+X*.72983,Q.bounds.top+X*.23),new Vector(Q.bounds.left+X*.84,Q.bounds.top+X*.34085),new Vector(Q.bounds.left+X*.39363,Q.bounds.top+X*.79)]),this.ctx.fillStyle=asString(INPUT_COLOR),this.ctx.fill(),this.ctx.restore()):Q.type===RADIO&&Q.checked&&(this.ctx.save(),this.ctx.beginPath(),this.ctx.arc(Q.bounds.left+X/2,Q.bounds.top+X/2,X/4,0,Math.PI*2,!0),this.ctx.fillStyle=asString(INPUT_COLOR),this.ctx.fill(),this.ctx.restore())),isTextInputElement(Q)&&Q.value.length){switch(ee=this.createFontStyle(D),we=ee[0],Ae=ee[1],le=this.fontMetrics.getMetrics(we,Ae).baseline,this.ctx.font=we,this.ctx.fillStyle=asString(D.color),this.ctx.textBaseline="alphabetic",this.ctx.textAlign=canvasTextAlign(Q.styles.textAlign),ve=contentBox(Q),ae=0,Q.styles.textAlign){case 1:ae+=ve.width/2;break;case 2:ae+=ve.width;break}ge=ve.add(ae,0,0,-ve.height/2+1),this.ctx.save(),this.path([new Vector(ve.left,ve.top),new Vector(ve.left+ve.width,ve.top),new Vector(ve.left+ve.width,ve.top+ve.height),new Vector(ve.left,ve.top+ve.height)]),this.ctx.clip(),this.renderTextWithLetterSpacing(new TextBounds(Q.value,ge),D.letterSpacing,le),this.ctx.restore(),this.ctx.textBaseline="alphabetic",this.ctx.textAlign="left"}if(!contains(Q.styles.display,2048))return[3,20];if(Q.styles.listStyleImage===null)return[3,19];if(fe=Q.styles.listStyleImage,fe.type!==0)return[3,18];ye=void 0,me=fe.url,Ce.label=15;case 15:return Ce.trys.push([15,17,,18]),[4,this.context.cache.match(me)];case 16:return ye=Ce.sent(),this.ctx.drawImage(ye,Q.bounds.left-(ye.width+10),Q.bounds.top),[3,18];case 17:return Ce.sent(),this.context.logger.error("Error loading list-style-image "+me),[3,18];case 18:return[3,20];case 19:x.listValue&&Q.styles.listStyleType!==-1&&(we=this.createFontStyle(D)[0],this.ctx.font=we,this.ctx.fillStyle=asString(D.color),this.ctx.textBaseline="middle",this.ctx.textAlign="right",ve=new Bounds(Q.bounds.left,Q.bounds.top+getAbsoluteValue(Q.styles.paddingTop,Q.bounds.width),Q.bounds.width,computeLineHeight(D.lineHeight,D.fontSize.number)/2+1),this.renderTextWithLetterSpacing(new TextBounds(x.listValue,ve),D.letterSpacing,computeLineHeight(D.lineHeight,D.fontSize.number)/2+2),this.ctx.textBaseline="bottom",this.ctx.textAlign="left"),Ce.label=20;case 20:return[2]}})})},B.prototype.renderStackContent=function(x){return __awaiter(this,void 0,void 0,function(){var Q,S,fe,D,H,fe,P,R,fe,Y,G,fe,X,ee,fe,Ae,le,fe,ae,ge,fe;return __generator(this,function(ye){switch(ye.label){case 0:if(contains(x.element.container.flags,16))debugger;return[4,this.renderNodeBackgroundAndBorders(x.element)];case 1:ye.sent(),Q=0,S=x.negativeZIndex,ye.label=2;case 2:return Q<S.length?(fe=S[Q],[4,this.renderStack(fe)]):[3,5];case 3:ye.sent(),ye.label=4;case 4:return Q++,[3,2];case 5:return[4,this.renderNodeContent(x.element)];case 6:ye.sent(),D=0,H=x.nonInlineLevel,ye.label=7;case 7:return D<H.length?(fe=H[D],[4,this.renderNode(fe)]):[3,10];case 8:ye.sent(),ye.label=9;case 9:return D++,[3,7];case 10:P=0,R=x.nonPositionedFloats,ye.label=11;case 11:return P<R.length?(fe=R[P],[4,this.renderStack(fe)]):[3,14];case 12:ye.sent(),ye.label=13;case 13:return P++,[3,11];case 14:Y=0,G=x.nonPositionedInlineLevel,ye.label=15;case 15:return Y<G.length?(fe=G[Y],[4,this.renderStack(fe)]):[3,18];case 16:ye.sent(),ye.label=17;case 17:return Y++,[3,15];case 18:X=0,ee=x.inlineLevel,ye.label=19;case 19:return X<ee.length?(fe=ee[X],[4,this.renderNode(fe)]):[3,22];case 20:ye.sent(),ye.label=21;case 21:return X++,[3,19];case 22:Ae=0,le=x.zeroOrAutoZIndexOrTransformedOrOpacity,ye.label=23;case 23:return Ae<le.length?(fe=le[Ae],[4,this.renderStack(fe)]):[3,26];case 24:ye.sent(),ye.label=25;case 25:return Ae++,[3,23];case 26:ae=0,ge=x.positiveZIndex,ye.label=27;case 27:return ae<ge.length?(fe=ge[ae],[4,this.renderStack(fe)]):[3,30];case 28:ye.sent(),ye.label=29;case 29:return ae++,[3,27];case 30:return[2]}})})},B.prototype.mask=function(x){this.ctx.beginPath(),this.ctx.moveTo(0,0),this.ctx.lineTo(this.canvas.width,0),this.ctx.lineTo(this.canvas.width,this.canvas.height),this.ctx.lineTo(0,this.canvas.height),this.ctx.lineTo(0,0),this.formatPath(x.slice(0).reverse()),this.ctx.closePath()},B.prototype.path=function(x){this.ctx.beginPath(),this.formatPath(x),this.ctx.closePath()},B.prototype.formatPath=function(x){var Q=this;x.forEach(function(S,D){var H=isBezierCurve(S)?S.start:S;D===0?Q.ctx.moveTo(H.x,H.y):Q.ctx.lineTo(H.x,H.y),isBezierCurve(S)&&Q.ctx.bezierCurveTo(S.startControl.x,S.startControl.y,S.endControl.x,S.endControl.y,S.end.x,S.end.y)})},B.prototype.renderRepeat=function(x,Q,S,D){this.path(x),this.ctx.fillStyle=Q,this.ctx.translate(S,D),this.ctx.fill(),this.ctx.translate(-S,-D)},B.prototype.resizeImage=function(x,Q,S){var D;if(x.width===Q&&x.height===S)return x;var H=(D=this.canvas.ownerDocument)!==null&&D!==void 0?D:document,P=H.createElement("canvas");P.width=Math.max(1,Q),P.height=Math.max(1,S);var R=P.getContext("2d");return R.drawImage(x,0,0,x.width,x.height,0,0,Q,S),P},B.prototype.renderBackgroundImage=function(x){return __awaiter(this,void 0,void 0,function(){var Q,S,D,H,P,R;return __generator(this,function(Y){switch(Y.label){case 0:Q=x.styles.backgroundImage.length-1,S=function(G){var X,ee,Ae,Ue,at,ht,ze,Je,We,le,Ue,at,ht,ze,Je,ae,ge,fe,ye,me,we,ve,Ce,Se,We,Ke,Ue,ke,Me,ze,Je,ft,at,ht,vt,tt,d,w,C,b,I,k;return __generator(this,function(M){switch(M.label){case 0:if(G.type!==0)return[3,5];X=void 0,ee=G.url,M.label=1;case 1:return M.trys.push([1,3,,4]),[4,D.context.cache.match(ee)];case 2:return X=M.sent(),[3,4];case 3:return M.sent(),D.context.logger.error("Error loading background-image "+ee),[3,4];case 4:return X&&(Ae=calculateBackgroundRendering(x,Q,[X.width,X.height,X.width/X.height]),Ue=Ae[0],at=Ae[1],ht=Ae[2],ze=Ae[3],Je=Ae[4],We=D.ctx.createPattern(D.resizeImage(X,ze,Je),"repeat"),D.renderRepeat(Ue,We,at,ht)),[3,6];case 5:isLinearGradient(G)?(le=calculateBackgroundRendering(x,Q,[null,null,null]),Ue=le[0],at=le[1],ht=le[2],ze=le[3],Je=le[4],ae=calculateGradientDirection(G.angle,ze,Je),ge=ae[0],fe=ae[1],ye=ae[2],me=ae[3],we=ae[4],ve=document.createElement("canvas"),ve.width=ze,ve.height=Je,Ce=ve.getContext("2d"),Se=Ce.createLinearGradient(fe,me,ye,we),processColorStops(G.stops,ge).forEach(function(K){return Se.addColorStop(K.stop,asString(K.color))}),Ce.fillStyle=Se,Ce.fillRect(0,0,ze,Je),ze>0&&Je>0&&(We=D.ctx.createPattern(ve,"repeat"),D.renderRepeat(Ue,We,at,ht))):isRadialGradient(G)&&(Ke=calculateBackgroundRendering(x,Q,[null,null,null]),Ue=Ke[0],ke=Ke[1],Me=Ke[2],ze=Ke[3],Je=Ke[4],ft=G.position.length===0?[FIFTY_PERCENT]:G.position,at=getAbsoluteValue(ft[0],ze),ht=getAbsoluteValue(ft[ft.length-1],Je),vt=calculateRadius(G,at,ht,ze,Je),tt=vt[0],d=vt[1],tt>0&&d>0&&(w=D.ctx.createRadialGradient(ke+at,Me+ht,0,ke+at,Me+ht,tt),processColorStops(G.stops,tt*2).forEach(function(K){return w.addColorStop(K.stop,asString(K.color))}),D.path(Ue),D.ctx.fillStyle=w,tt!==d?(C=x.bounds.left+.5*x.bounds.width,b=x.bounds.top+.5*x.bounds.height,I=d/tt,k=1/I,D.ctx.save(),D.ctx.translate(C,b),D.ctx.transform(1,0,0,I,0,0),D.ctx.translate(-C,-b),D.ctx.fillRect(ke,k*(Me-b)+b,ze,Je*k),D.ctx.restore()):D.ctx.fill())),M.label=6;case 6:return Q--,[2]}})},D=this,H=0,P=x.styles.backgroundImage.slice(0).reverse(),Y.label=1;case 1:return H<P.length?(R=P[H],[5,S(R)]):[3,4];case 2:Y.sent(),Y.label=3;case 3:return H++,[3,1];case 4:return[2]}})})},B.prototype.renderSolidBorder=function(x,Q,S){return __awaiter(this,void 0,void 0,function(){return __generator(this,function(D){return this.path(parsePathForBorder(S,Q)),this.ctx.fillStyle=asString(x),this.ctx.fill(),[2]})})},B.prototype.renderDoubleBorder=function(x,Q,S,D){return __awaiter(this,void 0,void 0,function(){var H,P;return __generator(this,function(R){switch(R.label){case 0:return Q<3?[4,this.renderSolidBorder(x,S,D)]:[3,2];case 1:return R.sent(),[2];case 2:return H=parsePathForBorderDoubleOuter(D,S),this.path(H),this.ctx.fillStyle=asString(x),this.ctx.fill(),P=parsePathForBorderDoubleInner(D,S),this.path(P),this.ctx.fill(),[2]}})})},B.prototype.renderNodeBackgroundAndBorders=function(x){return __awaiter(this,void 0,void 0,function(){var Q,S,D,H,P,R,Y,G,X=this;return __generator(this,function(ee){switch(ee.label){case 0:return this.applyEffects(x.getEffects(2)),Q=x.container.styles,S=!isTransparent(Q.backgroundColor)||Q.backgroundImage.length,D=[{style:Q.borderTopStyle,color:Q.borderTopColor,width:Q.borderTopWidth},{style:Q.borderRightStyle,color:Q.borderRightColor,width:Q.borderRightWidth},{style:Q.borderBottomStyle,color:Q.borderBottomColor,width:Q.borderBottomWidth},{style:Q.borderLeftStyle,color:Q.borderLeftColor,width:Q.borderLeftWidth}],H=calculateBackgroundCurvedPaintingArea(getBackgroundValueForIndex(Q.backgroundClip,0),x.curves),S||Q.boxShadow.length?(this.ctx.save(),this.path(H),this.ctx.clip(),isTransparent(Q.backgroundColor)||(this.ctx.fillStyle=asString(Q.backgroundColor),this.ctx.fill()),[4,this.renderBackgroundImage(x.container)]):[3,2];case 1:ee.sent(),this.ctx.restore(),Q.boxShadow.slice(0).reverse().forEach(function(Ae){X.ctx.save();var le=calculateBorderBoxPath(x.curves),ae=Ae.inset?0:MASK_OFFSET,ge=transformPath(le,-ae+(Ae.inset?1:-1)*Ae.spread.number,(Ae.inset?1:-1)*Ae.spread.number,Ae.spread.number*(Ae.inset?-2:2),Ae.spread.number*(Ae.inset?-2:2));Ae.inset?(X.path(le),X.ctx.clip(),X.mask(ge)):(X.mask(le),X.ctx.clip(),X.path(ge)),X.ctx.shadowOffsetX=Ae.offsetX.number+ae,X.ctx.shadowOffsetY=Ae.offsetY.number,X.ctx.shadowColor=asString(Ae.color),X.ctx.shadowBlur=Ae.blur.number,X.ctx.fillStyle=Ae.inset?asString(Ae.color):"rgba(0,0,0,1)",X.ctx.fill(),X.ctx.restore()}),ee.label=2;case 2:P=0,R=0,Y=D,ee.label=3;case 3:return R<Y.length?(G=Y[R],G.style!==0&&!isTransparent(G.color)&&G.width>0?G.style!==2?[3,5]:[4,this.renderDashedDottedBorder(G.color,G.width,P,x.curves,2)]:[3,11]):[3,13];case 4:return ee.sent(),[3,11];case 5:return G.style!==3?[3,7]:[4,this.renderDashedDottedBorder(G.color,G.width,P,x.curves,3)];case 6:return ee.sent(),[3,11];case 7:return G.style!==4?[3,9]:[4,this.renderDoubleBorder(G.color,G.width,P,x.curves)];case 8:return ee.sent(),[3,11];case 9:return[4,this.renderSolidBorder(G.color,P,x.curves)];case 10:ee.sent(),ee.label=11;case 11:P++,ee.label=12;case 12:return R++,[3,3];case 13:return[2]}})})},B.prototype.renderDashedDottedBorder=function(x,Q,S,D,H){return __awaiter(this,void 0,void 0,function(){var P,R,Y,G,X,ee,Ae,le,ae,ge,fe,ye,me,we,ve,Ce,ve,Ce;return __generator(this,function(Se){return this.ctx.save(),P=parsePathForBorderStroke(D,S),R=parsePathForBorder(D,S),H===2&&(this.path(R),this.ctx.clip()),isBezierCurve(R[0])?(Y=R[0].start.x,G=R[0].start.y):(Y=R[0].x,G=R[0].y),isBezierCurve(R[1])?(X=R[1].end.x,ee=R[1].end.y):(X=R[1].x,ee=R[1].y),S===0||S===2?Ae=Math.abs(Y-X):Ae=Math.abs(G-ee),this.ctx.beginPath(),H===3?this.formatPath(P):this.formatPath(R.slice(0,2)),le=Q<3?Q*3:Q*2,ae=Q<3?Q*2:Q,H===3&&(le=Q,ae=Q),ge=!0,Ae<=le*2?ge=!1:Ae<=le*2+ae?(fe=Ae/(2*le+ae),le*=fe,ae*=fe):(ye=Math.floor((Ae+ae)/(le+ae)),me=(Ae-ye*le)/(ye-1),we=(Ae-(ye+1)*le)/ye,ae=we<=0||Math.abs(ae-me)<Math.abs(ae-we)?me:we),ge&&(H===3?this.ctx.setLineDash([0,le+ae]):this.ctx.setLineDash([le,ae])),H===3?(this.ctx.lineCap="round",this.ctx.lineWidth=Q):this.ctx.lineWidth=Q*2+1.1,this.ctx.strokeStyle=asString(x),this.ctx.stroke(),this.ctx.setLineDash([]),H===2&&(isBezierCurve(R[0])&&(ve=R[3],Ce=R[0],this.ctx.beginPath(),this.formatPath([new Vector(ve.end.x,ve.end.y),new Vector(Ce.start.x,Ce.start.y)]),this.ctx.stroke()),isBezierCurve(R[1])&&(ve=R[1],Ce=R[2],this.ctx.beginPath(),this.formatPath([new Vector(ve.end.x,ve.end.y),new Vector(Ce.start.x,Ce.start.y)]),this.ctx.stroke())),this.ctx.restore(),[2]})})},B.prototype.render=function(x){return __awaiter(this,void 0,void 0,function(){var Q;return __generator(this,function(S){switch(S.label){case 0:return this.options.backgroundColor&&(this.ctx.fillStyle=asString(this.options.backgroundColor),this.ctx.fillRect(this.options.x,this.options.y,this.options.width,this.options.height)),Q=parseStackingContexts(x),[4,this.renderStack(Q)];case 1:return S.sent(),this.applyEffects([]),[2,this.canvas]}})})},B}(Renderer),isTextInputElement=function(g){return g instanceof TextareaElementContainer||g instanceof SelectElementContainer?!0:g instanceof InputElementContainer&&g.type!==RADIO&&g.type!==CHECKBOX},calculateBackgroundCurvedPaintingArea=function(g,B){switch(g){case 0:return calculateBorderBoxPath(B);case 2:return calculateContentBoxPath(B);case 1:default:return calculatePaddingBoxPath(B)}},canvasTextAlign=function(g){switch(g){case 1:return"center";case 2:return"right";case 0:default:return"left"}},iOSBrokenFonts=["-apple-system","system-ui"],fixIOSSystemFonts=function(g){return/iPhone OS 15_(0|1)/.test(window.navigator.userAgent)?g.filter(function(B){return iOSBrokenFonts.indexOf(B)===-1}):g},ForeignObjectRenderer=function(g){__extends(B,g);function B(x,Q){var S=g.call(this,x,Q)||this;return S.canvas=Q.canvas?Q.canvas:document.createElement("canvas"),S.ctx=S.canvas.getContext("2d"),S.options=Q,S.canvas.width=Math.floor(Q.width*Q.scale),S.canvas.height=Math.floor(Q.height*Q.scale),S.canvas.style.width=Q.width+"px",S.canvas.style.height=Q.height+"px",S.ctx.scale(S.options.scale,S.options.scale),S.ctx.translate(-Q.x,-Q.y),S.context.logger.debug("EXPERIMENTAL ForeignObject renderer initialized ("+Q.width+"x"+Q.height+" at "+Q.x+","+Q.y+") with scale "+Q.scale),S}return B.prototype.render=function(x){return __awaiter(this,void 0,void 0,function(){var Q,S;return __generator(this,function(D){switch(D.label){case 0:return Q=createForeignObjectSVG(this.options.width*this.options.scale,this.options.height*this.options.scale,this.options.scale,this.options.scale,x),[4,loadSerializedSVG(Q)];case 1:return S=D.sent(),this.options.backgroundColor&&(this.ctx.fillStyle=asString(this.options.backgroundColor),this.ctx.fillRect(0,0,this.options.width*this.options.scale,this.options.height*this.options.scale)),this.ctx.drawImage(S,-this.options.x*this.options.scale,-this.options.y*this.options.scale),[2,this.canvas]}})})},B}(Renderer),loadSerializedSVG=function(g){return new Promise(function(B,x){var Q=new Image;Q.onload=function(){B(Q)},Q.onerror=x,Q.src="data:image/svg+xml;charset=utf-8,"+encodeURIComponent(new XMLSerializer().serializeToString(g))})},Logger=function(){function g(B){var x=B.id,Q=B.enabled;this.id=x,this.enabled=Q,this.start=Date.now()}return g.prototype.debug=function(){for(var B=[],x=0;x<arguments.length;x++)B[x]=arguments[x];this.enabled&&(typeof window<"u"&&window.console&&typeof console.debug=="function"?console.debug.apply(console,__spreadArray([this.id,this.getTime()+"ms"],B)):this.info.apply(this,B))},g.prototype.getTime=function(){return Date.now()-this.start},g.prototype.info=function(){for(var B=[],x=0;x<arguments.length;x++)B[x]=arguments[x];this.enabled&&typeof window<"u"&&window.console&&typeof console.info=="function"&&console.info.apply(console,__spreadArray([this.id,this.getTime()+"ms"],B))},g.prototype.warn=function(){for(var B=[],x=0;x<arguments.length;x++)B[x]=arguments[x];this.enabled&&(typeof window<"u"&&window.console&&typeof console.warn=="function"?console.warn.apply(console,__spreadArray([this.id,this.getTime()+"ms"],B)):this.info.apply(this,B))},g.prototype.error=function(){for(var B=[],x=0;x<arguments.length;x++)B[x]=arguments[x];this.enabled&&(typeof window<"u"&&window.console&&typeof console.error=="function"?console.error.apply(console,__spreadArray([this.id,this.getTime()+"ms"],B)):this.info.apply(this,B))},g.instances={},g}(),Context=function(){function g(B,x){var Q;this.windowBounds=x,this.instanceName="#"+g.instanceCount++,this.logger=new Logger({id:this.instanceName,enabled:B.logging}),this.cache=(Q=B.cache)!==null&&Q!==void 0?Q:new Cache(this,B)}return g.instanceCount=1,g}(),html2canvas=function(g,B){return B===void 0&&(B={}),renderElement(g,B)};typeof window<"u"&&CacheStorage.setContext(window);var renderElement=function(g,B){return __awaiter(void 0,void 0,void 0,function(){var x,Q,S,D,H,P,R,Y,G,X,ee,Ae,le,ae,ge,fe,ye,me,we,ve,Se,Ce,Se,We,Ke,Ue,ke,Me,ze,Je,ft,at,ht,vt,tt,d,w,C,b,I;return __generator(this,function(k){switch(k.label){case 0:if(!g||typeof g!="object")return[2,Promise.reject("Invalid element provided as first argument")];if(x=g.ownerDocument,!x)throw new Error("Element is not attached to a Document");if(Q=x.defaultView,!Q)throw new Error("Document is not attached to a Window");return S={allowTaint:(We=B.allowTaint)!==null&&We!==void 0?We:!1,imageTimeout:(Ke=B.imageTimeout)!==null&&Ke!==void 0?Ke:15e3,proxy:B.proxy,useCORS:(Ue=B.useCORS)!==null&&Ue!==void 0?Ue:!1},D=__assign({logging:(ke=B.logging)!==null&&ke!==void 0?ke:!0,cache:B.cache},S),H={windowWidth:(Me=B.windowWidth)!==null&&Me!==void 0?Me:Q.innerWidth,windowHeight:(ze=B.windowHeight)!==null&&ze!==void 0?ze:Q.innerHeight,scrollX:(Je=B.scrollX)!==null&&Je!==void 0?Je:Q.pageXOffset,scrollY:(ft=B.scrollY)!==null&&ft!==void 0?ft:Q.pageYOffset},P=new Bounds(H.scrollX,H.scrollY,H.windowWidth,H.windowHeight),R=new Context(D,P),Y=(at=B.foreignObjectRendering)!==null&&at!==void 0?at:!1,G={allowTaint:(ht=B.allowTaint)!==null&&ht!==void 0?ht:!1,onclone:B.onclone,ignoreElements:B.ignoreElements,inlineImages:Y,copyStyles:Y},R.logger.debug("Starting document clone with size "+P.width+"x"+P.height+" scrolled to "+-P.left+","+-P.top),X=new DocumentCloner(R,g,G),ee=X.clonedReferenceElement,ee?[4,X.toIFrame(x,P)]:[2,Promise.reject("Unable to find element in cloned iframe")];case 1:return Ae=k.sent(),le=isBodyElement(ee)||isHTMLElement(ee)?parseDocumentSize(ee.ownerDocument):parseBounds(R,ee),ae=le.width,ge=le.height,fe=le.left,ye=le.top,me=parseBackgroundColor(R,ee,B.backgroundColor),we={canvas:B.canvas,backgroundColor:me,scale:(tt=(vt=B.scale)!==null&&vt!==void 0?vt:Q.devicePixelRatio)!==null&&tt!==void 0?tt:1,x:((d=B.x)!==null&&d!==void 0?d:0)+fe,y:((w=B.y)!==null&&w!==void 0?w:0)+ye,width:(C=B.width)!==null&&C!==void 0?C:Math.ceil(ae),height:(b=B.height)!==null&&b!==void 0?b:Math.ceil(ge)},Y?(R.logger.debug("Document cloned, using foreign object rendering"),Se=new ForeignObjectRenderer(R,we),[4,Se.render(ee)]):[3,3];case 2:return ve=k.sent(),[3,5];case 3:return R.logger.debug("Document cloned, element located at "+fe+","+ye+" with size "+ae+"x"+ge+" using computed rendering"),R.logger.debug("Starting DOM parsing"),Ce=parseTree(R,ee),me===Ce.styles.backgroundColor&&(Ce.styles.backgroundColor=COLORS.TRANSPARENT),R.logger.debug("Starting renderer for element at "+we.x+","+we.y+" with size "+we.width+"x"+we.height),Se=new CanvasRenderer(R,we),[4,Se.render(Ce)];case 4:ve=k.sent(),k.label=5;case 5:return(!((I=B.removeContainer)!==null&&I!==void 0)||I)&&(DocumentCloner.destroy(Ae)||R.logger.error("Cannot detach cloned iframe as it is not in the DOM anymore")),R.logger.debug("Finished rendering"),[2,ve]}})})},parseBackgroundColor=function(g,B,x){var Q=B.ownerDocument,S=Q.documentElement?parseColor(g,getComputedStyle(Q.documentElement).backgroundColor):COLORS.TRANSPARENT,D=Q.body?parseColor(g,getComputedStyle(Q.body).backgroundColor):COLORS.TRANSPARENT,H=typeof x=="string"?parseColor(g,x):x===null?COLORS.TRANSPARENT:4294967295;return B===Q.documentElement?isTransparent(S)?isTransparent(D)?H:D:S:H};const codemirror="",locationfilter="",all$2="",all$1="",bulma="",_default="",compact="";var raf$1={exports:{}},performanceNow={exports:{}};(function(){var g,B,x,Q,S,D;typeof performance<"u"&&performance!==null&&performance.now?performanceNow.exports=function(){return performance.now()}:typeof process<"u"&&process!==null&&process.hrtime?(performanceNow.exports=function(){return(g()-S)/1e6},B=process.hrtime,g=function(){var H;return H=B(),H[0]*1e9+H[1]},Q=g(),D=process.uptime()*1e9,S=Q-D):Date.now?(performanceNow.exports=function(){return Date.now()-x},x=Date.now()):(performanceNow.exports=function(){return new Date().getTime()-x},x=new Date().getTime())}).call(commonjsGlobal);var performanceNowExports=performanceNow.exports,now=performanceNowExports,root$1=typeof window>"u"?commonjsGlobal:window,vendors=["moz","webkit"],suffix="AnimationFrame",raf=root$1["request"+suffix],caf=root$1["cancel"+suffix]||root$1["cancelRequest"+suffix];for(var i$1=0;!raf&&i$1<vendors.length;i$1++)raf=root$1[vendors[i$1]+"Request"+suffix],caf=root$1[vendors[i$1]+"Cancel"+suffix]||root$1[vendors[i$1]+"CancelRequest"+suffix];if(!raf||!caf){var last=0,id=0,queue=[],frameDuration=1e3/60;raf=function(g){if(queue.length===0){var B=now(),x=Math.max(0,frameDuration-(B-last));last=x+B,setTimeout(function(){var Q=queue.slice(0);queue.length=0;for(var S=0;S<Q.length;S++)if(!Q[S].cancelled)try{Q[S].callback(last)}catch(D){setTimeout(function(){throw D},0)}},Math.round(x))}return queue.push({handle:++id,callback:g,cancelled:!1}),id},caf=function(g){for(var B=0;B<queue.length;B++)queue[B].handle===g&&(queue[B].cancelled=!0)}}raf$1.exports=function(g){return raf.call(root$1,g)};raf$1.exports.cancel=function(){caf.apply(root$1,arguments)};raf$1.exports.polyfill=function(g){g||(g=root$1),g.requestAnimationFrame=raf,g.cancelAnimationFrame=caf};var rafExports=raf$1.exports;const requestAnimationFrame=getDefaultExportFromCjs(rafExports);var rgbcolor=function(g){this.ok=!1,this.alpha=1,g.charAt(0)=="#"&&(g=g.substr(1,6)),g=g.replace(/ /g,""),g=g.toLowerCase();var B={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",rebeccapurple:"663399",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"};g=B[g]||g;for(var x=[{re:/^rgba\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),\s*((?:\d?\.)?\d)\)$/,example:["rgba(123, 234, 45, 0.8)","rgba(255,234,245,1.0)"],process:function(R){return[parseInt(R[1]),parseInt(R[2]),parseInt(R[3]),parseFloat(R[4])]}},{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(R){return[parseInt(R[1]),parseInt(R[2]),parseInt(R[3])]}},{re:/^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/,example:["#00ff00","336699"],process:function(R){return[parseInt(R[1],16),parseInt(R[2],16),parseInt(R[3],16)]}},{re:/^([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,example:["#fb0","f0f"],process:function(R){return[parseInt(R[1]+R[1],16),parseInt(R[2]+R[2],16),parseInt(R[3]+R[3],16)]}}],Q=0;Q<x.length;Q++){var S=x[Q].re,D=x[Q].process,H=S.exec(g);if(H){var P=D(H);this.r=P[0],this.g=P[1],this.b=P[2],P.length>3&&(this.alpha=P[3]),this.ok=!0}}this.r=this.r<0||isNaN(this.r)?0:this.r>255?255:this.r,this.g=this.g<0||isNaN(this.g)?0:this.g>255?255:this.g,this.b=this.b<0||isNaN(this.b)?0:this.b>255?255:this.b,this.alpha=this.alpha<0?0:this.alpha>1||isNaN(this.alpha)?1:this.alpha,this.toRGB=function(){return"rgb("+this.r+", "+this.g+", "+this.b+")"},this.toRGBA=function(){return"rgba("+this.r+", "+this.g+", "+this.b+", "+this.alpha+")"},this.toHex=function(){var R=this.r.toString(16),Y=this.g.toString(16),G=this.b.toString(16);return R.length==1&&(R="0"+R),Y.length==1&&(Y="0"+Y),G.length==1&&(G="0"+G),"#"+R+Y+G},this.getHelpXML=function(){for(var R=new Array,Y=0;Y<x.length;Y++)for(var G=x[Y].example,X=0;X<G.length;X++)R[R.length]=G[X];for(var ee in B)R[R.length]=ee;var Ae=document.createElement("ul");Ae.setAttribute("id","rgbcolor-examples");for(var Y=0;Y<R.length;Y++)try{var le=document.createElement("li"),ae=new RGBColor(R[Y]),ge=document.createElement("div");ge.style.cssText="margin: 3px; border: 1px solid black; background:"+ae.toHex()+"; color:"+ae.toHex(),ge.appendChild(document.createTextNode("test"));var fe=document.createTextNode(" "+R[Y]+" -> "+ae.toRGB()+" -> "+ae.toHex());le.appendChild(ge),le.appendChild(fe),Ae.appendChild(le)}catch{}return Ae}};const RGBColor$1=getDefaultExportFromCjs(rgbcolor);/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */var t=function(g,B){return(t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(x,Q){x.__proto__=Q}||function(x,Q){for(var S in Q)Object.prototype.hasOwnProperty.call(Q,S)&&(x[S]=Q[S])})(g,B)};function r(g,B){if(typeof B!="function"&&B!==null)throw new TypeError("Class extends value "+String(B)+" is not a constructor or null");function x(){this.constructor=g}t(g,B),g.prototype=B===null?Object.create(B):(x.prototype=B.prototype,new x)}function e(g){var B="";Array.isArray(g)||(g=[g]);for(var x=0;x<g.length;x++){var Q=g[x];if(Q.type===_.CLOSE_PATH)B+="z";else if(Q.type===_.HORIZ_LINE_TO)B+=(Q.relative?"h":"H")+Q.x;else if(Q.type===_.VERT_LINE_TO)B+=(Q.relative?"v":"V")+Q.y;else if(Q.type===_.MOVE_TO)B+=(Q.relative?"m":"M")+Q.x+" "+Q.y;else if(Q.type===_.LINE_TO)B+=(Q.relative?"l":"L")+Q.x+" "+Q.y;else if(Q.type===_.CURVE_TO)B+=(Q.relative?"c":"C")+Q.x1+" "+Q.y1+" "+Q.x2+" "+Q.y2+" "+Q.x+" "+Q.y;else if(Q.type===_.SMOOTH_CURVE_TO)B+=(Q.relative?"s":"S")+Q.x2+" "+Q.y2+" "+Q.x+" "+Q.y;else if(Q.type===_.QUAD_TO)B+=(Q.relative?"q":"Q")+Q.x1+" "+Q.y1+" "+Q.x+" "+Q.y;else if(Q.type===_.SMOOTH_QUAD_TO)B+=(Q.relative?"t":"T")+Q.x+" "+Q.y;else{if(Q.type!==_.ARC)throw new Error('Unexpected command type "'+Q.type+'" at index '+x+".");B+=(Q.relative?"a":"A")+Q.rX+" "+Q.rY+" "+Q.xRot+" "+ +Q.lArcFlag+" "+ +Q.sweepFlag+" "+Q.x+" "+Q.y}}return B}function i(g,B){var x=g[0],Q=g[1];return[x*Math.cos(B)-Q*Math.sin(B),x*Math.sin(B)+Q*Math.cos(B)]}function a(){for(var g=[],B=0;B<arguments.length;B++)g[B]=arguments[B];for(var x=0;x<g.length;x++)if(typeof g[x]!="number")throw new Error("assertNumbers arguments["+x+"] is not a number. "+typeof g[x]+" == typeof "+g[x]);return!0}var n=Math.PI;function o(g,B,x){g.lArcFlag=g.lArcFlag===0?0:1,g.sweepFlag=g.sweepFlag===0?0:1;var Q=g.rX,S=g.rY,D=g.x,H=g.y;Q=Math.abs(g.rX),S=Math.abs(g.rY);var P=i([(B-D)/2,(x-H)/2],-g.xRot/180*n),R=P[0],Y=P[1],G=Math.pow(R,2)/Math.pow(Q,2)+Math.pow(Y,2)/Math.pow(S,2);1<G&&(Q*=Math.sqrt(G),S*=Math.sqrt(G)),g.rX=Q,g.rY=S;var X=Math.pow(Q,2)*Math.pow(Y,2)+Math.pow(S,2)*Math.pow(R,2),ee=(g.lArcFlag!==g.sweepFlag?1:-1)*Math.sqrt(Math.max(0,(Math.pow(Q,2)*Math.pow(S,2)-X)/X)),Ae=Q*Y/S*ee,le=-S*R/Q*ee,ae=i([Ae,le],g.xRot/180*n);g.cX=ae[0]+(B+D)/2,g.cY=ae[1]+(x+H)/2,g.phi1=Math.atan2((Y-le)/S,(R-Ae)/Q),g.phi2=Math.atan2((-Y-le)/S,(-R-Ae)/Q),g.sweepFlag===0&&g.phi2>g.phi1&&(g.phi2-=2*n),g.sweepFlag===1&&g.phi2<g.phi1&&(g.phi2+=2*n),g.phi1*=180/n,g.phi2*=180/n}function s(g,B,x){a(g,B,x);var Q=g*g+B*B-x*x;if(0>Q)return[];if(Q===0)return[[g*x/(g*g+B*B),B*x/(g*g+B*B)]];var S=Math.sqrt(Q);return[[(g*x+B*S)/(g*g+B*B),(B*x-g*S)/(g*g+B*B)],[(g*x-B*S)/(g*g+B*B),(B*x+g*S)/(g*g+B*B)]]}var u,h=Math.PI/180;function c$1(g,B,x){return(1-x)*g+x*B}function y(g,B,x,Q){return g+Math.cos(Q/180*n)*B+Math.sin(Q/180*n)*x}function p(g,B,x,Q){var S=1e-6,D=B-g,H=x-B,P=3*D+3*(Q-x)-6*H,R=6*(H-D),Y=3*D;return Math.abs(P)<S?[-Y/R]:function(G,X,ee){ee===void 0&&(ee=1e-6);var Ae=G*G/4-X;if(Ae<-ee)return[];if(Ae<=ee)return[-G/2];var le=Math.sqrt(Ae);return[-G/2-le,-G/2+le]}(R/P,Y/P,S)}function m$1(g,B,x,Q,S){var D=1-S;return g*(D*D*D)+B*(3*D*D*S)+x*(3*D*S*S)+Q*(S*S*S)}(function(g){function B(){return S(function(P,R,Y){return P.relative&&(P.x1!==void 0&&(P.x1+=R),P.y1!==void 0&&(P.y1+=Y),P.x2!==void 0&&(P.x2+=R),P.y2!==void 0&&(P.y2+=Y),P.x!==void 0&&(P.x+=R),P.y!==void 0&&(P.y+=Y),P.relative=!1),P})}function x(){var P=NaN,R=NaN,Y=NaN,G=NaN;return S(function(X,ee,Ae){return X.type&_.SMOOTH_CURVE_TO&&(X.type=_.CURVE_TO,P=isNaN(P)?ee:P,R=isNaN(R)?Ae:R,X.x1=X.relative?ee-P:2*ee-P,X.y1=X.relative?Ae-R:2*Ae-R),X.type&_.CURVE_TO?(P=X.relative?ee+X.x2:X.x2,R=X.relative?Ae+X.y2:X.y2):(P=NaN,R=NaN),X.type&_.SMOOTH_QUAD_TO&&(X.type=_.QUAD_TO,Y=isNaN(Y)?ee:Y,G=isNaN(G)?Ae:G,X.x1=X.relative?ee-Y:2*ee-Y,X.y1=X.relative?Ae-G:2*Ae-G),X.type&_.QUAD_TO?(Y=X.relative?ee+X.x1:X.x1,G=X.relative?Ae+X.y1:X.y1):(Y=NaN,G=NaN),X})}function Q(){var P=NaN,R=NaN;return S(function(Y,G,X){if(Y.type&_.SMOOTH_QUAD_TO&&(Y.type=_.QUAD_TO,P=isNaN(P)?G:P,R=isNaN(R)?X:R,Y.x1=Y.relative?G-P:2*G-P,Y.y1=Y.relative?X-R:2*X-R),Y.type&_.QUAD_TO){P=Y.relative?G+Y.x1:Y.x1,R=Y.relative?X+Y.y1:Y.y1;var ee=Y.x1,Ae=Y.y1;Y.type=_.CURVE_TO,Y.x1=((Y.relative?0:G)+2*ee)/3,Y.y1=((Y.relative?0:X)+2*Ae)/3,Y.x2=(Y.x+2*ee)/3,Y.y2=(Y.y+2*Ae)/3}else P=NaN,R=NaN;return Y})}function S(P){var R=0,Y=0,G=NaN,X=NaN;return function(ee){if(isNaN(G)&&!(ee.type&_.MOVE_TO))throw new Error("path must start with moveto");var Ae=P(ee,R,Y,G,X);return ee.type&_.CLOSE_PATH&&(R=G,Y=X),ee.x!==void 0&&(R=ee.relative?R+ee.x:ee.x),ee.y!==void 0&&(Y=ee.relative?Y+ee.y:ee.y),ee.type&_.MOVE_TO&&(G=R,X=Y),Ae}}function D(P,R,Y,G,X,ee){return a(P,R,Y,G,X,ee),S(function(Ae,le,ae,ge){var fe=Ae.x1,ye=Ae.x2,me=Ae.relative&&!isNaN(ge),we=Ae.x!==void 0?Ae.x:me?0:le,ve=Ae.y!==void 0?Ae.y:me?0:ae;function Ce(C){return C*C}Ae.type&_.HORIZ_LINE_TO&&R!==0&&(Ae.type=_.LINE_TO,Ae.y=Ae.relative?0:ae),Ae.type&_.VERT_LINE_TO&&Y!==0&&(Ae.type=_.LINE_TO,Ae.x=Ae.relative?0:le),Ae.x!==void 0&&(Ae.x=Ae.x*P+ve*Y+(me?0:X)),Ae.y!==void 0&&(Ae.y=we*R+Ae.y*G+(me?0:ee)),Ae.x1!==void 0&&(Ae.x1=Ae.x1*P+Ae.y1*Y+(me?0:X)),Ae.y1!==void 0&&(Ae.y1=fe*R+Ae.y1*G+(me?0:ee)),Ae.x2!==void 0&&(Ae.x2=Ae.x2*P+Ae.y2*Y+(me?0:X)),Ae.y2!==void 0&&(Ae.y2=ye*R+Ae.y2*G+(me?0:ee));var Se=P*G-R*Y;if(Ae.xRot!==void 0&&(P!==1||R!==0||Y!==0||G!==1))if(Se===0)delete Ae.rX,delete Ae.rY,delete Ae.xRot,delete Ae.lArcFlag,delete Ae.sweepFlag,Ae.type=_.LINE_TO;else{var We=Ae.xRot*Math.PI/180,Ke=Math.sin(We),Ue=Math.cos(We),ke=1/Ce(Ae.rX),Me=1/Ce(Ae.rY),ze=Ce(Ue)*ke+Ce(Ke)*Me,Je=2*Ke*Ue*(ke-Me),ft=Ce(Ke)*ke+Ce(Ue)*Me,at=ze*G*G-Je*R*G+ft*R*R,ht=Je*(P*G+R*Y)-2*(ze*Y*G+ft*P*R),vt=ze*Y*Y-Je*P*Y+ft*P*P,tt=(Math.atan2(ht,at-vt)+Math.PI)%Math.PI/2,d=Math.sin(tt),w=Math.cos(tt);Ae.rX=Math.abs(Se)/Math.sqrt(at*Ce(w)+ht*d*w+vt*Ce(d)),Ae.rY=Math.abs(Se)/Math.sqrt(at*Ce(d)-ht*d*w+vt*Ce(w)),Ae.xRot=180*tt/Math.PI}return Ae.sweepFlag!==void 0&&0>Se&&(Ae.sweepFlag=+!Ae.sweepFlag),Ae})}function H(){return function(P){var R={};for(var Y in P)R[Y]=P[Y];return R}}g.ROUND=function(P){function R(Y){return Math.round(Y*P)/P}return P===void 0&&(P=1e13),a(P),function(Y){return Y.x1!==void 0&&(Y.x1=R(Y.x1)),Y.y1!==void 0&&(Y.y1=R(Y.y1)),Y.x2!==void 0&&(Y.x2=R(Y.x2)),Y.y2!==void 0&&(Y.y2=R(Y.y2)),Y.x!==void 0&&(Y.x=R(Y.x)),Y.y!==void 0&&(Y.y=R(Y.y)),Y.rX!==void 0&&(Y.rX=R(Y.rX)),Y.rY!==void 0&&(Y.rY=R(Y.rY)),Y}},g.TO_ABS=B,g.TO_REL=function(){return S(function(P,R,Y){return P.relative||(P.x1!==void 0&&(P.x1-=R),P.y1!==void 0&&(P.y1-=Y),P.x2!==void 0&&(P.x2-=R),P.y2!==void 0&&(P.y2-=Y),P.x!==void 0&&(P.x-=R),P.y!==void 0&&(P.y-=Y),P.relative=!0),P})},g.NORMALIZE_HVZ=function(P,R,Y){return P===void 0&&(P=!0),R===void 0&&(R=!0),Y===void 0&&(Y=!0),S(function(G,X,ee,Ae,le){if(isNaN(Ae)&&!(G.type&_.MOVE_TO))throw new Error("path must start with moveto");return R&&G.type&_.HORIZ_LINE_TO&&(G.type=_.LINE_TO,G.y=G.relative?0:ee),Y&&G.type&_.VERT_LINE_TO&&(G.type=_.LINE_TO,G.x=G.relative?0:X),P&&G.type&_.CLOSE_PATH&&(G.type=_.LINE_TO,G.x=G.relative?Ae-X:Ae,G.y=G.relative?le-ee:le),G.type&_.ARC&&(G.rX===0||G.rY===0)&&(G.type=_.LINE_TO,delete G.rX,delete G.rY,delete G.xRot,delete G.lArcFlag,delete G.sweepFlag),G})},g.NORMALIZE_ST=x,g.QT_TO_C=Q,g.INFO=S,g.SANITIZE=function(P){P===void 0&&(P=0),a(P);var R=NaN,Y=NaN,G=NaN,X=NaN;return S(function(ee,Ae,le,ae,ge){var fe=Math.abs,ye=!1,me=0,we=0;if(ee.type&_.SMOOTH_CURVE_TO&&(me=isNaN(R)?0:Ae-R,we=isNaN(Y)?0:le-Y),ee.type&(_.CURVE_TO|_.SMOOTH_CURVE_TO)?(R=ee.relative?Ae+ee.x2:ee.x2,Y=ee.relative?le+ee.y2:ee.y2):(R=NaN,Y=NaN),ee.type&_.SMOOTH_QUAD_TO?(G=isNaN(G)?Ae:2*Ae-G,X=isNaN(X)?le:2*le-X):ee.type&_.QUAD_TO?(G=ee.relative?Ae+ee.x1:ee.x1,X=ee.relative?le+ee.y1:ee.y2):(G=NaN,X=NaN),ee.type&_.LINE_COMMANDS||ee.type&_.ARC&&(ee.rX===0||ee.rY===0||!ee.lArcFlag)||ee.type&_.CURVE_TO||ee.type&_.SMOOTH_CURVE_TO||ee.type&_.QUAD_TO||ee.type&_.SMOOTH_QUAD_TO){var ve=ee.x===void 0?0:ee.relative?ee.x:ee.x-Ae,Ce=ee.y===void 0?0:ee.relative?ee.y:ee.y-le;me=isNaN(G)?ee.x1===void 0?me:ee.relative?ee.x:ee.x1-Ae:G-Ae,we=isNaN(X)?ee.y1===void 0?we:ee.relative?ee.y:ee.y1-le:X-le;var Se=ee.x2===void 0?0:ee.relative?ee.x:ee.x2-Ae,We=ee.y2===void 0?0:ee.relative?ee.y:ee.y2-le;fe(ve)<=P&&fe(Ce)<=P&&fe(me)<=P&&fe(we)<=P&&fe(Se)<=P&&fe(We)<=P&&(ye=!0)}return ee.type&_.CLOSE_PATH&&fe(Ae-ae)<=P&&fe(le-ge)<=P&&(ye=!0),ye?[]:ee})},g.MATRIX=D,g.ROTATE=function(P,R,Y){R===void 0&&(R=0),Y===void 0&&(Y=0),a(P,R,Y);var G=Math.sin(P),X=Math.cos(P);return D(X,G,-G,X,R-R*X+Y*G,Y-R*G-Y*X)},g.TRANSLATE=function(P,R){return R===void 0&&(R=0),a(P,R),D(1,0,0,1,P,R)},g.SCALE=function(P,R){return R===void 0&&(R=P),a(P,R),D(P,0,0,R,0,0)},g.SKEW_X=function(P){return a(P),D(1,0,Math.atan(P),1,0,0)},g.SKEW_Y=function(P){return a(P),D(1,Math.atan(P),0,1,0,0)},g.X_AXIS_SYMMETRY=function(P){return P===void 0&&(P=0),a(P),D(-1,0,0,1,P,0)},g.Y_AXIS_SYMMETRY=function(P){return P===void 0&&(P=0),a(P),D(1,0,0,-1,0,P)},g.A_TO_C=function(){return S(function(P,R,Y){return _.ARC===P.type?function(G,X,ee){var Ae,le,ae,ge;G.cX||o(G,X,ee);for(var fe=Math.min(G.phi1,G.phi2),ye=Math.max(G.phi1,G.phi2)-fe,me=Math.ceil(ye/90),we=new Array(me),ve=X,Ce=ee,Se=0;Se<me;Se++){var We=c$1(G.phi1,G.phi2,Se/me),Ke=c$1(G.phi1,G.phi2,(Se+1)/me),Ue=Ke-We,ke=4/3*Math.tan(Ue*h/4),Me=[Math.cos(We*h)-ke*Math.sin(We*h),Math.sin(We*h)+ke*Math.cos(We*h)],ze=Me[0],Je=Me[1],ft=[Math.cos(Ke*h),Math.sin(Ke*h)],at=ft[0],ht=ft[1],vt=[at+ke*Math.sin(Ke*h),ht-ke*Math.cos(Ke*h)],tt=vt[0],d=vt[1];we[Se]={relative:G.relative,type:_.CURVE_TO};var w=function(C,b){var I=i([C*G.rX,b*G.rY],G.xRot),k=I[0],M=I[1];return[G.cX+k,G.cY+M]};Ae=w(ze,Je),we[Se].x1=Ae[0],we[Se].y1=Ae[1],le=w(tt,d),we[Se].x2=le[0],we[Se].y2=le[1],ae=w(at,ht),we[Se].x=ae[0],we[Se].y=ae[1],G.relative&&(we[Se].x1-=ve,we[Se].y1-=Ce,we[Se].x2-=ve,we[Se].y2-=Ce,we[Se].x-=ve,we[Se].y-=Ce),ve=(ge=[we[Se].x,we[Se].y])[0],Ce=ge[1]}return we}(P,P.relative?0:R,P.relative?0:Y):P})},g.ANNOTATE_ARCS=function(){return S(function(P,R,Y){return P.relative&&(R=0,Y=0),_.ARC===P.type&&o(P,R,Y),P})},g.CLONE=H,g.CALCULATE_BOUNDS=function(){var P=function(ee){var Ae={};for(var le in ee)Ae[le]=ee[le];return Ae},R=B(),Y=Q(),G=x(),X=S(function(ee,Ae,le){var ae=G(Y(R(P(ee))));function ge(d){d>X.maxX&&(X.maxX=d),d<X.minX&&(X.minX=d)}function fe(d){d>X.maxY&&(X.maxY=d),d<X.minY&&(X.minY=d)}if(ae.type&_.DRAWING_COMMANDS&&(ge(Ae),fe(le)),ae.type&_.HORIZ_LINE_TO&&ge(ae.x),ae.type&_.VERT_LINE_TO&&fe(ae.y),ae.type&_.LINE_TO&&(ge(ae.x),fe(ae.y)),ae.type&_.CURVE_TO){ge(ae.x),fe(ae.y);for(var ye=0,me=p(Ae,ae.x1,ae.x2,ae.x);ye<me.length;ye++)0<(tt=me[ye])&&1>tt&&ge(m$1(Ae,ae.x1,ae.x2,ae.x,tt));for(var we=0,ve=p(le,ae.y1,ae.y2,ae.y);we<ve.length;we++)0<(tt=ve[we])&&1>tt&&fe(m$1(le,ae.y1,ae.y2,ae.y,tt))}if(ae.type&_.ARC){ge(ae.x),fe(ae.y),o(ae,Ae,le);for(var Ce=ae.xRot/180*Math.PI,Se=Math.cos(Ce)*ae.rX,We=Math.sin(Ce)*ae.rX,Ke=-Math.sin(Ce)*ae.rY,Ue=Math.cos(Ce)*ae.rY,ke=ae.phi1<ae.phi2?[ae.phi1,ae.phi2]:-180>ae.phi2?[ae.phi2+360,ae.phi1+360]:[ae.phi2,ae.phi1],Me=ke[0],ze=ke[1],Je=function(d){var w=d[0],C=d[1],b=180*Math.atan2(C,w)/Math.PI;return b<Me?b+360:b},ft=0,at=s(Ke,-Se,0).map(Je);ft<at.length;ft++)(tt=at[ft])>Me&&tt<ze&&ge(y(ae.cX,Se,Ke,tt));for(var ht=0,vt=s(Ue,-We,0).map(Je);ht<vt.length;ht++){var tt;(tt=vt[ht])>Me&&tt<ze&&fe(y(ae.cY,We,Ue,tt))}}return ee});return X.minX=1/0,X.maxX=-1/0,X.minY=1/0,X.maxY=-1/0,X}})(u||(u={}));var O,l=function(){function g(){}return g.prototype.round=function(B){return this.transform(u.ROUND(B))},g.prototype.toAbs=function(){return this.transform(u.TO_ABS())},g.prototype.toRel=function(){return this.transform(u.TO_REL())},g.prototype.normalizeHVZ=function(B,x,Q){return this.transform(u.NORMALIZE_HVZ(B,x,Q))},g.prototype.normalizeST=function(){return this.transform(u.NORMALIZE_ST())},g.prototype.qtToC=function(){return this.transform(u.QT_TO_C())},g.prototype.aToC=function(){return this.transform(u.A_TO_C())},g.prototype.sanitize=function(B){return this.transform(u.SANITIZE(B))},g.prototype.translate=function(B,x){return this.transform(u.TRANSLATE(B,x))},g.prototype.scale=function(B,x){return this.transform(u.SCALE(B,x))},g.prototype.rotate=function(B,x,Q){return this.transform(u.ROTATE(B,x,Q))},g.prototype.matrix=function(B,x,Q,S,D,H){return this.transform(u.MATRIX(B,x,Q,S,D,H))},g.prototype.skewX=function(B){return this.transform(u.SKEW_X(B))},g.prototype.skewY=function(B){return this.transform(u.SKEW_Y(B))},g.prototype.xSymmetry=function(B){return this.transform(u.X_AXIS_SYMMETRY(B))},g.prototype.ySymmetry=function(B){return this.transform(u.Y_AXIS_SYMMETRY(B))},g.prototype.annotateArcs=function(){return this.transform(u.ANNOTATE_ARCS())},g}(),T=function(g){return g===" "||g==="	"||g==="\r"||g===`
+`},v=function(g){return"0".charCodeAt(0)<=g.charCodeAt(0)&&g.charCodeAt(0)<="9".charCodeAt(0)},f=function(g){function B(){var x=g.call(this)||this;return x.curNumber="",x.curCommandType=-1,x.curCommandRelative=!1,x.canParseCommandOrComma=!0,x.curNumberHasExp=!1,x.curNumberHasExpDigits=!1,x.curNumberHasDecimal=!1,x.curArgs=[],x}return r(B,g),B.prototype.finish=function(x){if(x===void 0&&(x=[]),this.parse(" ",x),this.curArgs.length!==0||!this.canParseCommandOrComma)throw new SyntaxError("Unterminated command at the path end.");return x},B.prototype.parse=function(x,Q){var S=this;Q===void 0&&(Q=[]);for(var D=function(X){Q.push(X),S.curArgs.length=0,S.canParseCommandOrComma=!0},H=0;H<x.length;H++){var P=x[H],R=!(this.curCommandType!==_.ARC||this.curArgs.length!==3&&this.curArgs.length!==4||this.curNumber.length!==1||this.curNumber!=="0"&&this.curNumber!=="1"),Y=v(P)&&(this.curNumber==="0"&&P==="0"||R);if(!v(P)||Y)if(P!=="e"&&P!=="E")if(P!=="-"&&P!=="+"||!this.curNumberHasExp||this.curNumberHasExpDigits)if(P!=="."||this.curNumberHasExp||this.curNumberHasDecimal||R){if(this.curNumber&&this.curCommandType!==-1){var G=Number(this.curNumber);if(isNaN(G))throw new SyntaxError("Invalid number ending at "+H);if(this.curCommandType===_.ARC){if(this.curArgs.length===0||this.curArgs.length===1){if(0>G)throw new SyntaxError('Expected positive number, got "'+G+'" at index "'+H+'"')}else if((this.curArgs.length===3||this.curArgs.length===4)&&this.curNumber!=="0"&&this.curNumber!=="1")throw new SyntaxError('Expected a flag, got "'+this.curNumber+'" at index "'+H+'"')}this.curArgs.push(G),this.curArgs.length===N[this.curCommandType]&&(_.HORIZ_LINE_TO===this.curCommandType?D({type:_.HORIZ_LINE_TO,relative:this.curCommandRelative,x:G}):_.VERT_LINE_TO===this.curCommandType?D({type:_.VERT_LINE_TO,relative:this.curCommandRelative,y:G}):this.curCommandType===_.MOVE_TO||this.curCommandType===_.LINE_TO||this.curCommandType===_.SMOOTH_QUAD_TO?(D({type:this.curCommandType,relative:this.curCommandRelative,x:this.curArgs[0],y:this.curArgs[1]}),_.MOVE_TO===this.curCommandType&&(this.curCommandType=_.LINE_TO)):this.curCommandType===_.CURVE_TO?D({type:_.CURVE_TO,relative:this.curCommandRelative,x1:this.curArgs[0],y1:this.curArgs[1],x2:this.curArgs[2],y2:this.curArgs[3],x:this.curArgs[4],y:this.curArgs[5]}):this.curCommandType===_.SMOOTH_CURVE_TO?D({type:_.SMOOTH_CURVE_TO,relative:this.curCommandRelative,x2:this.curArgs[0],y2:this.curArgs[1],x:this.curArgs[2],y:this.curArgs[3]}):this.curCommandType===_.QUAD_TO?D({type:_.QUAD_TO,relative:this.curCommandRelative,x1:this.curArgs[0],y1:this.curArgs[1],x:this.curArgs[2],y:this.curArgs[3]}):this.curCommandType===_.ARC&&D({type:_.ARC,relative:this.curCommandRelative,rX:this.curArgs[0],rY:this.curArgs[1],xRot:this.curArgs[2],lArcFlag:this.curArgs[3],sweepFlag:this.curArgs[4],x:this.curArgs[5],y:this.curArgs[6]})),this.curNumber="",this.curNumberHasExpDigits=!1,this.curNumberHasExp=!1,this.curNumberHasDecimal=!1,this.canParseCommandOrComma=!0}if(!T(P))if(P===","&&this.canParseCommandOrComma)this.canParseCommandOrComma=!1;else if(P!=="+"&&P!=="-"&&P!==".")if(Y)this.curNumber=P,this.curNumberHasDecimal=!1;else{if(this.curArgs.length!==0)throw new SyntaxError("Unterminated command at index "+H+".");if(!this.canParseCommandOrComma)throw new SyntaxError('Unexpected character "'+P+'" at index '+H+". Command cannot follow comma");if(this.canParseCommandOrComma=!1,P!=="z"&&P!=="Z")if(P==="h"||P==="H")this.curCommandType=_.HORIZ_LINE_TO,this.curCommandRelative=P==="h";else if(P==="v"||P==="V")this.curCommandType=_.VERT_LINE_TO,this.curCommandRelative=P==="v";else if(P==="m"||P==="M")this.curCommandType=_.MOVE_TO,this.curCommandRelative=P==="m";else if(P==="l"||P==="L")this.curCommandType=_.LINE_TO,this.curCommandRelative=P==="l";else if(P==="c"||P==="C")this.curCommandType=_.CURVE_TO,this.curCommandRelative=P==="c";else if(P==="s"||P==="S")this.curCommandType=_.SMOOTH_CURVE_TO,this.curCommandRelative=P==="s";else if(P==="q"||P==="Q")this.curCommandType=_.QUAD_TO,this.curCommandRelative=P==="q";else if(P==="t"||P==="T")this.curCommandType=_.SMOOTH_QUAD_TO,this.curCommandRelative=P==="t";else{if(P!=="a"&&P!=="A")throw new SyntaxError('Unexpected character "'+P+'" at index '+H+".");this.curCommandType=_.ARC,this.curCommandRelative=P==="a"}else Q.push({type:_.CLOSE_PATH}),this.canParseCommandOrComma=!0,this.curCommandType=-1}else this.curNumber=P,this.curNumberHasDecimal=P==="."}else this.curNumber+=P,this.curNumberHasDecimal=!0;else this.curNumber+=P;else this.curNumber+=P,this.curNumberHasExp=!0;else this.curNumber+=P,this.curNumberHasExpDigits=this.curNumberHasExp}return Q},B.prototype.transform=function(x){return Object.create(this,{parse:{value:function(Q,S){S===void 0&&(S=[]);for(var D=0,H=Object.getPrototypeOf(this).parse.call(this,Q);D<H.length;D++){var P=H[D],R=x(P);Array.isArray(R)?S.push.apply(S,R):S.push(R)}return S}}})},B}(l),_=function(g){function B(x){var Q=g.call(this)||this;return Q.commands=typeof x=="string"?B.parse(x):x,Q}return r(B,g),B.prototype.encode=function(){return B.encode(this.commands)},B.prototype.getBounds=function(){var x=u.CALCULATE_BOUNDS();return this.transform(x),x},B.prototype.transform=function(x){for(var Q=[],S=0,D=this.commands;S<D.length;S++){var H=x(D[S]);Array.isArray(H)?Q.push.apply(Q,H):Q.push(H)}return this.commands=Q,this},B.encode=function(x){return e(x)},B.parse=function(x){var Q=new f,S=[];return Q.parse(x,S),Q.finish(S),S},B.CLOSE_PATH=1,B.MOVE_TO=2,B.HORIZ_LINE_TO=4,B.VERT_LINE_TO=8,B.LINE_TO=16,B.CURVE_TO=32,B.SMOOTH_CURVE_TO=64,B.QUAD_TO=128,B.SMOOTH_QUAD_TO=256,B.ARC=512,B.LINE_COMMANDS=B.LINE_TO|B.HORIZ_LINE_TO|B.VERT_LINE_TO,B.DRAWING_COMMANDS=B.HORIZ_LINE_TO|B.VERT_LINE_TO|B.LINE_TO|B.CURVE_TO|B.SMOOTH_CURVE_TO|B.QUAD_TO|B.SMOOTH_QUAD_TO|B.ARC,B}(l),N=((O={})[_.MOVE_TO]=2,O[_.LINE_TO]=2,O[_.HORIZ_LINE_TO]=1,O[_.VERT_LINE_TO]=1,O[_.CLOSE_PATH]=0,O[_.QUAD_TO]=4,O[_.SMOOTH_QUAD_TO]=2,O[_.CURVE_TO]=6,O[_.SMOOTH_CURVE_TO]=4,O[_.ARC]=7,O);function _typeof(g){"@babel/helpers - typeof";return typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?_typeof=function(B){return typeof B}:_typeof=function(B){return B&&typeof Symbol=="function"&&B.constructor===Symbol&&B!==Symbol.prototype?"symbol":typeof B},_typeof(g)}function _classCallCheck(g,B){if(!(g instanceof B))throw new TypeError("Cannot call a class as a function")}var mulTable=[512,512,456,512,328,456,335,512,405,328,271,456,388,335,292,512,454,405,364,328,298,271,496,456,420,388,360,335,312,292,273,512,482,454,428,405,383,364,345,328,312,298,284,271,259,496,475,456,437,420,404,388,374,360,347,335,323,312,302,292,282,273,265,512,497,482,468,454,441,428,417,405,394,383,373,364,354,345,337,328,320,312,305,298,291,284,278,271,265,259,507,496,485,475,465,456,446,437,428,420,412,404,396,388,381,374,367,360,354,347,341,335,329,323,318,312,307,302,297,292,287,282,278,273,269,265,261,512,505,497,489,482,475,468,461,454,447,441,435,428,422,417,411,405,399,394,389,383,378,373,368,364,359,354,350,345,341,337,332,328,324,320,316,312,309,305,301,298,294,291,287,284,281,278,274,271,268,265,262,259,257,507,501,496,491,485,480,475,470,465,460,456,451,446,442,437,433,428,424,420,416,412,408,404,400,396,392,388,385,381,377,374,370,367,363,360,357,354,350,347,344,341,338,335,332,329,326,323,320,318,315,312,310,307,304,302,299,297,294,292,289,287,285,282,280,278,275,273,271,269,267,265,263,261,259],shgTable=[9,11,12,13,13,14,14,15,15,15,15,16,16,16,16,17,17,17,17,17,17,17,18,18,18,18,18,18,18,18,18,19,19,19,19,19,19,19,19,19,19,19,19,19,19,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24];function getImageDataFromCanvas(g,B,x,Q,S){if(typeof g=="string"&&(g=document.getElementById(g)),!g||_typeof(g)!=="object"||!("getContext"in g))throw new TypeError("Expecting canvas with `getContext` method in processCanvasRGB(A) calls!");var D=g.getContext("2d");try{return D.getImageData(B,x,Q,S)}catch(H){throw new Error("unable to access image data: "+H)}}function processCanvasRGBA(g,B,x,Q,S,D){if(!(isNaN(D)||D<1)){D|=0;var H=getImageDataFromCanvas(g,B,x,Q,S);H=processImageDataRGBA(H,B,x,Q,S,D),g.getContext("2d").putImageData(H,B,x)}}function processImageDataRGBA(g,B,x,Q,S,D){for(var H=g.data,P=2*D+1,R=Q-1,Y=S-1,G=D+1,X=G*(G+1)/2,ee=new BlurStack,Ae=ee,le,ae=1;ae<P;ae++)Ae=Ae.next=new BlurStack,ae===G&&(le=Ae);Ae.next=ee;for(var ge=null,fe=null,ye=0,me=0,we=mulTable[D],ve=shgTable[D],Ce=0;Ce<S;Ce++){Ae=ee;for(var Se=H[me],We=H[me+1],Ke=H[me+2],Ue=H[me+3],ke=0;ke<G;ke++)Ae.r=Se,Ae.g=We,Ae.b=Ke,Ae.a=Ue,Ae=Ae.next;for(var Me=0,ze=0,Je=0,ft=0,at=G*Se,ht=G*We,vt=G*Ke,tt=G*Ue,d=X*Se,w=X*We,C=X*Ke,b=X*Ue,I=1;I<G;I++){var k=me+((R<I?R:I)<<2),M=H[k],K=H[k+1],W=H[k+2],q=H[k+3],te=G-I;d+=(Ae.r=M)*te,w+=(Ae.g=K)*te,C+=(Ae.b=W)*te,b+=(Ae.a=q)*te,Me+=M,ze+=K,Je+=W,ft+=q,Ae=Ae.next}ge=ee,fe=le;for(var he=0;he<Q;he++){var ne=b*we>>ve;if(H[me+3]=ne,ne!==0){var ie=255/ne;H[me]=(d*we>>ve)*ie,H[me+1]=(w*we>>ve)*ie,H[me+2]=(C*we>>ve)*ie}else H[me]=H[me+1]=H[me+2]=0;d-=at,w-=ht,C-=vt,b-=tt,at-=ge.r,ht-=ge.g,vt-=ge.b,tt-=ge.a;var re=he+D+1;re=ye+(re<R?re:R)<<2,Me+=ge.r=H[re],ze+=ge.g=H[re+1],Je+=ge.b=H[re+2],ft+=ge.a=H[re+3],d+=Me,w+=ze,C+=Je,b+=ft,ge=ge.next;var ce=fe,Be=ce.r,Fe=ce.g,Te=ce.b,Ne=ce.a;at+=Be,ht+=Fe,vt+=Te,tt+=Ne,Me-=Be,ze-=Fe,Je-=Te,ft-=Ne,fe=fe.next,me+=4}ye+=Q}for(var Oe=0;Oe<Q;Oe++){me=Oe<<2;var De=H[me],et=H[me+1],Ye=H[me+2],qe=H[me+3],Xe=G*De,rt=G*et,$e=G*Ye,pt=G*qe,gt=X*De,Qt=X*et,xt=X*Ye,qt=X*qe;Ae=ee;for(var _t=0;_t<G;_t++)Ae.r=De,Ae.g=et,Ae.b=Ye,Ae.a=qe,Ae=Ae.next;for(var Ge=Q,Kt=0,At=0,Ct=0,bt=0,kt=1;kt<=D;kt++){me=Ge+Oe<<2;var zt=G-kt;gt+=(Ae.r=De=H[me])*zt,Qt+=(Ae.g=et=H[me+1])*zt,xt+=(Ae.b=Ye=H[me+2])*zt,qt+=(Ae.a=qe=H[me+3])*zt,bt+=De,Kt+=et,At+=Ye,Ct+=qe,Ae=Ae.next,kt<Y&&(Ge+=Q)}me=Oe,ge=ee,fe=le;for(var St=0;St<S;St++){var wt=me<<2;H[wt+3]=qe=qt*we>>ve,qe>0?(qe=255/qe,H[wt]=(gt*we>>ve)*qe,H[wt+1]=(Qt*we>>ve)*qe,H[wt+2]=(xt*we>>ve)*qe):H[wt]=H[wt+1]=H[wt+2]=0,gt-=Xe,Qt-=rt,xt-=$e,qt-=pt,Xe-=ge.r,rt-=ge.g,$e-=ge.b,pt-=ge.a,wt=Oe+((wt=St+G)<Y?wt:Y)*Q<<2,gt+=bt+=ge.r=H[wt],Qt+=Kt+=ge.g=H[wt+1],xt+=At+=ge.b=H[wt+2],qt+=Ct+=ge.a=H[wt+3],ge=ge.next,Xe+=De=fe.r,rt+=et=fe.g,$e+=Ye=fe.b,pt+=qe=fe.a,bt-=De,Kt-=et,At-=Ye,Ct-=qe,fe=fe.next,me+=Q}}return g}var BlurStack=function g(){_classCallCheck(this,g),this.r=0,this.g=0,this.b=0,this.a=0,this.next=null};function compressSpaces(g){return g.replace(/(?!\u3000)\s+/gm," ")}function trimLeft(g){return g.replace(/^[\n \t]+/,"")}function trimRight(g){return g.replace(/[\n \t]+$/,"")}function toNumbers(g){const B=g.match(/-?(\d+(?:\.\d*(?:[eE][+-]?\d+)?)?|\.\d+)(?=\D|$)/gm);return B?B.map(parseFloat):[]}function toMatrixValue(g){const B=toNumbers(g);return[B[0]||0,B[1]||0,B[2]||0,B[3]||0,B[4]||0,B[5]||0]}const allUppercase=/^[A-Z-]+$/;function normalizeAttributeName(g){return allUppercase.test(g)?g.toLowerCase():g}function parseExternalUrl(g){const B=/url\(('([^']+)'|"([^"]+)"|([^'")]+))\)/.exec(g);return B&&(B[2]||B[3]||B[4])||""}function normalizeColor(g){if(!g.startsWith("rgb"))return g;let B=3;return g.replace(/\d+(\.\d+)?/g,(Q,S)=>B--&&S?String(Math.round(parseFloat(Q))):Q)}const attributeRegex=/(\[[^\]]+\])/g,idRegex=/(#[^\s+>~.[:]+)/g,classRegex=/(\.[^\s+>~.[:]+)/g,pseudoElementRegex=/(::[^\s+>~.[:]+|:first-line|:first-letter|:before|:after)/gi,pseudoClassWithBracketsRegex=/(:[\w-]+\([^)]*\))/gi,pseudoClassRegex=/(:[^\s+>~.[:]+)/g,elementRegex=/([^\s+>~.[:]+)/g;function findSelectorMatch(g,B){const x=B.exec(g);return x?[g.replace(B," "),x.length]:[g,0]}function getSelectorSpecificity(g){const B=[0,0,0];let x=g.replace(/:not\(([^)]*)\)/g,"     $1 ").replace(/{[\s\S]*/gm," "),Q=0;return[x,Q]=findSelectorMatch(x,attributeRegex),B[1]+=Q,[x,Q]=findSelectorMatch(x,idRegex),B[0]+=Q,[x,Q]=findSelectorMatch(x,classRegex),B[1]+=Q,[x,Q]=findSelectorMatch(x,pseudoElementRegex),B[2]+=Q,[x,Q]=findSelectorMatch(x,pseudoClassWithBracketsRegex),B[1]+=Q,[x,Q]=findSelectorMatch(x,pseudoClassRegex),B[1]+=Q,x=x.replace(/[*\s+>~]/g," ").replace(/[#.]/g," "),[x,Q]=findSelectorMatch(x,elementRegex),B[2]+=Q,B.join("")}const PSEUDO_ZERO=1e-8;function vectorMagnitude(g){return Math.sqrt(Math.pow(g[0],2)+Math.pow(g[1],2))}function vectorsRatio(g,B){return(g[0]*B[0]+g[1]*B[1])/(vectorMagnitude(g)*vectorMagnitude(B))}function vectorsAngle(g,B){return(g[0]*B[1]<g[1]*B[0]?-1:1)*Math.acos(vectorsRatio(g,B))}function CB1(g){return g*g*g}function CB2(g){return 3*g*g*(1-g)}function CB3(g){return 3*g*(1-g)*(1-g)}function CB4(g){return(1-g)*(1-g)*(1-g)}function QB1(g){return g*g}function QB2(g){return 2*g*(1-g)}function QB3(g){return(1-g)*(1-g)}class Property{static empty(B){return new Property(B,"EMPTY","")}split(){let B=arguments.length>0&&arguments[0]!==void 0?arguments[0]:" ";const{document:x,name:Q}=this;return compressSpaces(this.getString()).trim().split(B).map(S=>new Property(x,Q,S))}hasValue(B){const x=this.value;return x!==null&&x!==""&&(B||x!==0)&&typeof x<"u"}isString(B){const{value:x}=this,Q=typeof x=="string";return!Q||!B?Q:B.test(x)}isUrlDefinition(){return this.isString(/^url\(/)}isPixels(){if(!this.hasValue())return!1;const B=this.getString();switch(!0){case B.endsWith("px"):case/^[0-9]+$/.test(B):return!0;default:return!1}}setValue(B){return this.value=B,this}getValue(B){return typeof B>"u"||this.hasValue()?this.value:B}getNumber(B){if(!this.hasValue())return typeof B>"u"?0:parseFloat(B);const{value:x}=this;let Q=parseFloat(x);return this.isString(/%$/)&&(Q/=100),Q}getString(B){return typeof B>"u"||this.hasValue()?typeof this.value>"u"?"":String(this.value):String(B)}getColor(B){let x=this.getString(B);return this.isNormalizedColor||(this.isNormalizedColor=!0,x=normalizeColor(x),this.value=x),x}getDpi(){return 96}getRem(){return this.document.rootEmSize}getEm(){return this.document.emSize}getUnits(){return this.getString().replace(/[0-9.-]/g,"")}getPixels(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1;if(!this.hasValue())return 0;const[Q,S]=typeof B=="boolean"?[void 0,B]:[B],{viewPort:D}=this.document.screen;switch(!0){case this.isString(/vmin$/):return this.getNumber()/100*Math.min(D.computeSize("x"),D.computeSize("y"));case this.isString(/vmax$/):return this.getNumber()/100*Math.max(D.computeSize("x"),D.computeSize("y"));case this.isString(/vw$/):return this.getNumber()/100*D.computeSize("x");case this.isString(/vh$/):return this.getNumber()/100*D.computeSize("y");case this.isString(/rem$/):return this.getNumber()*this.getRem();case this.isString(/em$/):return this.getNumber()*this.getEm();case this.isString(/ex$/):return this.getNumber()*this.getEm()/2;case this.isString(/px$/):return this.getNumber();case this.isString(/pt$/):return this.getNumber()*this.getDpi()*(1/72);case this.isString(/pc$/):return this.getNumber()*15;case this.isString(/cm$/):return this.getNumber()*this.getDpi()/2.54;case this.isString(/mm$/):return this.getNumber()*this.getDpi()/25.4;case this.isString(/in$/):return this.getNumber()*this.getDpi();case(this.isString(/%$/)&&S):return this.getNumber()*this.getEm();case this.isString(/%$/):return this.getNumber()*D.computeSize(Q);default:{const H=this.getNumber();return x&&H<1?H*D.computeSize(Q):H}}}getMilliseconds(){return this.hasValue()?this.isString(/ms$/)?this.getNumber():this.getNumber()*1e3:0}getRadians(){if(!this.hasValue())return 0;switch(!0){case this.isString(/deg$/):return this.getNumber()*(Math.PI/180);case this.isString(/grad$/):return this.getNumber()*(Math.PI/200);case this.isString(/rad$/):return this.getNumber();default:return this.getNumber()*(Math.PI/180)}}getDefinition(){const B=this.getString(),x=/#([^)'"]+)/.exec(B),Q=(x==null?void 0:x[1])||B;return this.document.definitions[Q]}getFillStyleDefinition(B,x){let Q=this.getDefinition();if(!Q)return null;if(typeof Q.createGradient=="function"&&"getBoundingBox"in B)return Q.createGradient(this.document.ctx,B,x);if(typeof Q.createPattern=="function"){if(Q.getHrefAttribute().hasValue()){const S=Q.getAttribute("patternTransform");Q=Q.getHrefAttribute().getDefinition(),Q&&S.hasValue()&&Q.getAttribute("patternTransform",!0).setValue(S.value)}if(Q)return Q.createPattern(this.document.ctx,B,x)}return null}getTextBaseline(){if(!this.hasValue())return null;const B=this.getString();return Property.textBaselineMapping[B]||null}addOpacity(B){let x=this.getColor();const Q=x.length;let S=0;for(let D=0;D<Q&&(x[D]===","&&S++,S!==3);D++);if(B.hasValue()&&this.isString()&&S!==3){const D=new RGBColor$1(x);D.ok&&(D.alpha=B.getNumber(),x=D.toRGBA())}return new Property(this.document,this.name,x)}constructor(B,x,Q){this.document=B,this.name=x,this.value=Q,this.isNormalizedColor=!1}}Property.textBaselineMapping={baseline:"alphabetic","before-edge":"top","text-before-edge":"top",middle:"middle",central:"middle","after-edge":"bottom","text-after-edge":"bottom",ideographic:"ideographic",alphabetic:"alphabetic",hanging:"hanging",mathematical:"alphabetic"};class ViewPort{clear(){this.viewPorts=[]}setCurrent(B,x){this.viewPorts.push({width:B,height:x})}removeCurrent(){this.viewPorts.pop()}getRoot(){const[B]=this.viewPorts;return B||getDefault()}getCurrent(){const{viewPorts:B}=this,x=B[B.length-1];return x||getDefault()}get width(){return this.getCurrent().width}get height(){return this.getCurrent().height}computeSize(B){return typeof B=="number"?B:B==="x"?this.width:B==="y"?this.height:Math.sqrt(Math.pow(this.width,2)+Math.pow(this.height,2))/Math.sqrt(2)}constructor(){this.viewPorts=[]}}ViewPort.DEFAULT_VIEWPORT_WIDTH=800;ViewPort.DEFAULT_VIEWPORT_HEIGHT=600;function getDefault(){return{width:ViewPort.DEFAULT_VIEWPORT_WIDTH,height:ViewPort.DEFAULT_VIEWPORT_HEIGHT}}class Point{static parse(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0;const[Q=x,S=x]=toNumbers(B);return new Point(Q,S)}static parseScale(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:1;const[Q=x,S=Q]=toNumbers(B);return new Point(Q,S)}static parsePath(B){const x=toNumbers(B),Q=x.length,S=[];for(let D=0;D<Q;D+=2)S.push(new Point(x[D],x[D+1]));return S}angleTo(B){return Math.atan2(B.y-this.y,B.x-this.x)}applyTransform(B){const{x,y:Q}=this,S=x*B[0]+Q*B[2]+B[4],D=x*B[1]+Q*B[3]+B[5];this.x=S,this.y=D}constructor(B,x){this.x=B,this.y=x}}class Mouse{isWorking(){return this.working}start(){if(this.working)return;const{screen:B,onClick:x,onMouseMove:Q}=this,S=B.ctx.canvas;S.onclick=x,S.onmousemove=Q,this.working=!0}stop(){if(!this.working)return;const B=this.screen.ctx.canvas;this.working=!1,B.onclick=null,B.onmousemove=null}hasEvents(){return this.working&&this.events.length>0}runEvents(){if(!this.working)return;const{screen:B,events:x,eventElements:Q}=this,{style:S}=B.ctx.canvas;let D;S&&(S.cursor=""),x.forEach((H,P)=>{let{run:R}=H;for(D=Q[P];D;)R(D),D=D.parent}),this.events=[],this.eventElements=[]}checkPath(B,x){if(!this.working||!x)return;const{events:Q,eventElements:S}=this;Q.forEach((D,H)=>{let{x:P,y:R}=D;!S[H]&&x.isPointInPath&&x.isPointInPath(P,R)&&(S[H]=B)})}checkBoundingBox(B,x){if(!this.working||!x)return;const{events:Q,eventElements:S}=this;Q.forEach((D,H)=>{let{x:P,y:R}=D;!S[H]&&x.isPointInBox(P,R)&&(S[H]=B)})}mapXY(B,x){const{window:Q,ctx:S}=this.screen,D=new Point(B,x);let H=S.canvas;for(;H;)D.x-=H.offsetLeft,D.y-=H.offsetTop,H=H.offsetParent;return Q!=null&&Q.scrollX&&(D.x+=Q.scrollX),Q!=null&&Q.scrollY&&(D.y+=Q.scrollY),D}onClick(B){const{x,y:Q}=this.mapXY(B.clientX,B.clientY);this.events.push({type:"onclick",x,y:Q,run(S){S.onClick&&S.onClick()}})}onMouseMove(B){const{x,y:Q}=this.mapXY(B.clientX,B.clientY);this.events.push({type:"onmousemove",x,y:Q,run(S){S.onMouseMove&&S.onMouseMove()}})}constructor(B){this.screen=B,this.working=!1,this.events=[],this.eventElements=[],this.onClick=this.onClick.bind(this),this.onMouseMove=this.onMouseMove.bind(this)}}const defaultWindow=typeof window<"u"?window:null,defaultFetch$1=typeof fetch<"u"?fetch.bind(void 0):void 0;class Screen{wait(B){this.waits.push(B)}ready(){return this.readyPromise?this.readyPromise:Promise.resolve()}isReady(){if(this.isReadyLock)return!0;const B=this.waits.every(x=>x());return B&&(this.waits=[],this.resolveReady&&this.resolveReady()),this.isReadyLock=B,B}setDefaults(B){B.strokeStyle="rgba(0,0,0,0)",B.lineCap="butt",B.lineJoin="miter",B.miterLimit=4}setViewBox(B){let{document:x,ctx:Q,aspectRatio:S,width:D,desiredWidth:H,height:P,desiredHeight:R,minX:Y=0,minY:G=0,refX:X,refY:ee,clip:Ae=!1,clipX:le=0,clipY:ae=0}=B;const ge=compressSpaces(S).replace(/^defer\s/,""),[fe,ye]=ge.split(" "),me=fe||"xMidYMid",we=ye||"meet",ve=D/H,Ce=P/R,Se=Math.min(ve,Ce),We=Math.max(ve,Ce);let Ke=H,Ue=R;we==="meet"&&(Ke*=Se,Ue*=Se),we==="slice"&&(Ke*=We,Ue*=We);const ke=new Property(x,"refX",X),Me=new Property(x,"refY",ee),ze=ke.hasValue()&&Me.hasValue();if(ze&&Q.translate(-Se*ke.getPixels("x"),-Se*Me.getPixels("y")),Ae){const Je=Se*le,ft=Se*ae;Q.beginPath(),Q.moveTo(Je,ft),Q.lineTo(D,ft),Q.lineTo(D,P),Q.lineTo(Je,P),Q.closePath(),Q.clip()}if(!ze){const Je=we==="meet"&&Se===Ce,ft=we==="slice"&&We===Ce,at=we==="meet"&&Se===ve,ht=we==="slice"&&We===ve;me.startsWith("xMid")&&(Je||ft)&&Q.translate(D/2-Ke/2,0),me.endsWith("YMid")&&(at||ht)&&Q.translate(0,P/2-Ue/2),me.startsWith("xMax")&&(Je||ft)&&Q.translate(D-Ke,0),me.endsWith("YMax")&&(at||ht)&&Q.translate(0,P-Ue)}switch(!0){case me==="none":Q.scale(ve,Ce);break;case we==="meet":Q.scale(Se,Se);break;case we==="slice":Q.scale(We,We);break}Q.translate(-Y,-G)}start(B){let{enableRedraw:x=!1,ignoreMouse:Q=!1,ignoreAnimation:S=!1,ignoreDimensions:D=!1,ignoreClear:H=!1,forceRedraw:P,scaleWidth:R,scaleHeight:Y,offsetX:G,offsetY:X}=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{};const{mouse:ee}=this,Ae=1e3/Screen.FRAMERATE;if(this.isReadyLock=!1,this.frameDuration=Ae,this.readyPromise=new Promise(ye=>{this.resolveReady=ye}),this.isReady()&&this.render(B,D,H,R,Y,G,X),!x)return;let le=Date.now(),ae=le,ge=0;const fe=()=>{le=Date.now(),ge=le-ae,ge>=Ae&&(ae=le-ge%Ae,this.shouldUpdate(S,P)&&(this.render(B,D,H,R,Y,G,X),ee.runEvents())),this.intervalId=requestAnimationFrame(fe)};Q||ee.start(),this.intervalId=requestAnimationFrame(fe)}stop(){this.intervalId&&(requestAnimationFrame.cancel(this.intervalId),this.intervalId=null),this.mouse.stop()}shouldUpdate(B,x){if(!B){const{frameDuration:Q}=this;if(this.animations.reduce((D,H)=>H.update(Q)||D,!1))return!0}return!!(typeof x=="function"&&x()||!this.isReadyLock&&this.isReady()||this.mouse.hasEvents())}render(B,x,Q,S,D,H,P){const{viewPort:R,ctx:Y,isFirstRender:G}=this,X=Y.canvas;R.clear(),X.width&&X.height&&R.setCurrent(X.width,X.height);const ee=B.getStyle("width"),Ae=B.getStyle("height");!x&&(G||typeof S!="number"&&typeof D!="number")&&(ee.hasValue()&&(X.width=ee.getPixels("x"),X.style&&(X.style.width="".concat(X.width,"px"))),Ae.hasValue()&&(X.height=Ae.getPixels("y"),X.style&&(X.style.height="".concat(X.height,"px"))));let le=X.clientWidth||X.width,ae=X.clientHeight||X.height;if(x&&ee.hasValue()&&Ae.hasValue()&&(le=ee.getPixels("x"),ae=Ae.getPixels("y")),R.setCurrent(le,ae),typeof H=="number"&&B.getAttribute("x",!0).setValue(H),typeof P=="number"&&B.getAttribute("y",!0).setValue(P),typeof S=="number"||typeof D=="number"){const ge=toNumbers(B.getAttribute("viewBox").getString());let fe=0,ye=0;if(typeof S=="number"){const we=B.getStyle("width");we.hasValue()?fe=we.getPixels("x")/S:ge[2]&&!isNaN(ge[2])&&(fe=ge[2]/S)}if(typeof D=="number"){const we=B.getStyle("height");we.hasValue()?ye=we.getPixels("y")/D:ge[3]&&!isNaN(ge[3])&&(ye=ge[3]/D)}fe||(fe=ye),ye||(ye=fe),B.getAttribute("width",!0).setValue(S),B.getAttribute("height",!0).setValue(D);const me=B.getStyle("transform",!0,!0);me.setValue("".concat(me.getString()," scale(").concat(1/fe,", ").concat(1/ye,")"))}Q||Y.clearRect(0,0,le,ae),B.render(Y),G&&(this.isFirstRender=!1)}constructor(B,{fetch:x=defaultFetch$1,window:Q=defaultWindow}={}){if(this.ctx=B,this.viewPort=new ViewPort,this.mouse=new Mouse(this),this.animations=[],this.waits=[],this.frameDuration=0,this.isReadyLock=!1,this.isFirstRender=!0,this.intervalId=null,this.window=Q,!x)throw new Error("Can't find 'fetch' in 'globalThis', please provide it via options");this.fetch=x}}Screen.defaultWindow=defaultWindow;Screen.defaultFetch=defaultFetch$1;Screen.FRAMERATE=30;Screen.MAX_VIRTUAL_PIXELS=3e4;const{defaultFetch}=Screen,DefaultDOMParser=typeof DOMParser<"u"?DOMParser:void 0;class Parser{async parse(B){return B.startsWith("<")?this.parseFromString(B):this.load(B)}parseFromString(B){const x=new this.DOMParser;try{return this.checkDocument(x.parseFromString(B,"image/svg+xml"))}catch{return this.checkDocument(x.parseFromString(B,"text/xml"))}}checkDocument(B){const x=B.getElementsByTagName("parsererror")[0];if(x)throw new Error(x.textContent||"Unknown parse error");return B}async load(B){const Q=await(await this.fetch(B)).text();return this.parseFromString(Q)}constructor({fetch:B=defaultFetch,DOMParser:x=DefaultDOMParser}={}){if(!B)throw new Error("Can't find 'fetch' in 'globalThis', please provide it via options");if(!x)throw new Error("Can't find 'DOMParser' in 'globalThis', please provide it via options");this.fetch=B,this.DOMParser=x}}class Translate{apply(B){const{x,y:Q}=this.point;B.translate(x||0,Q||0)}unapply(B){const{x,y:Q}=this.point;B.translate(-1*x||0,-1*Q||0)}applyToPoint(B){const{x,y:Q}=this.point;B.applyTransform([1,0,0,1,x||0,Q||0])}constructor(B,x){this.type="translate",this.point=Point.parse(x)}}class Rotate{apply(B){const{cx:x,cy:Q,originX:S,originY:D,angle:H}=this,P=x+S.getPixels("x"),R=Q+D.getPixels("y");B.translate(P,R),B.rotate(H.getRadians()),B.translate(-P,-R)}unapply(B){const{cx:x,cy:Q,originX:S,originY:D,angle:H}=this,P=x+S.getPixels("x"),R=Q+D.getPixels("y");B.translate(P,R),B.rotate(-1*H.getRadians()),B.translate(-P,-R)}applyToPoint(B){const{cx:x,cy:Q,angle:S}=this,D=S.getRadians();B.applyTransform([1,0,0,1,x||0,Q||0]),B.applyTransform([Math.cos(D),Math.sin(D),-Math.sin(D),Math.cos(D),0,0]),B.applyTransform([1,0,0,1,-x||0,-Q||0])}constructor(B,x,Q){this.type="rotate";const S=toNumbers(x);this.angle=new Property(B,"angle",S[0]),this.originX=Q[0],this.originY=Q[1],this.cx=S[1]||0,this.cy=S[2]||0}}class Scale{apply(B){const{scale:{x,y:Q},originX:S,originY:D}=this,H=S.getPixels("x"),P=D.getPixels("y");B.translate(H,P),B.scale(x,Q||x),B.translate(-H,-P)}unapply(B){const{scale:{x,y:Q},originX:S,originY:D}=this,H=S.getPixels("x"),P=D.getPixels("y");B.translate(H,P),B.scale(1/x,1/Q||x),B.translate(-H,-P)}applyToPoint(B){const{x,y:Q}=this.scale;B.applyTransform([x||0,0,0,Q||0,0,0])}constructor(B,x,Q){this.type="scale";const S=Point.parseScale(x);(S.x===0||S.y===0)&&(S.x=PSEUDO_ZERO,S.y=PSEUDO_ZERO),this.scale=S,this.originX=Q[0],this.originY=Q[1]}}class Matrix{apply(B){const{originX:x,originY:Q,matrix:S}=this,D=x.getPixels("x"),H=Q.getPixels("y");B.translate(D,H),B.transform(S[0],S[1],S[2],S[3],S[4],S[5]),B.translate(-D,-H)}unapply(B){const{originX:x,originY:Q,matrix:S}=this,D=S[0],H=S[2],P=S[4],R=S[1],Y=S[3],G=S[5],X=0,ee=0,Ae=1,le=1/(D*(Y*Ae-G*ee)-H*(R*Ae-G*X)+P*(R*ee-Y*X)),ae=x.getPixels("x"),ge=Q.getPixels("y");B.translate(ae,ge),B.transform(le*(Y*Ae-G*ee),le*(G*X-R*Ae),le*(P*ee-H*Ae),le*(D*Ae-P*X),le*(H*G-P*Y),le*(P*R-D*G)),B.translate(-ae,-ge)}applyToPoint(B){B.applyTransform(this.matrix)}constructor(B,x,Q){this.type="matrix",this.matrix=toMatrixValue(x),this.originX=Q[0],this.originY=Q[1]}}class Skew extends Matrix{constructor(B,x,Q){super(B,x,Q),this.type="skew",this.angle=new Property(B,"angle",x)}}class SkewX extends Skew{constructor(B,x,Q){super(B,x,Q),this.type="skewX",this.matrix=[1,0,Math.tan(this.angle.getRadians()),1,0,0]}}class SkewY extends Skew{constructor(B,x,Q){super(B,x,Q),this.type="skewY",this.matrix=[1,Math.tan(this.angle.getRadians()),0,1,0,0]}}function parseTransforms(g){return compressSpaces(g).trim().replace(/\)([a-zA-Z])/g,") $1").replace(/\)(\s?,\s?)/g,") ").split(/\s(?=[a-z])/)}function parseTransform(g){const[B="",x=""]=g.split("(");return[B.trim(),x.trim().replace(")","")]}class Transform{static fromElement(B,x){const Q=x.getStyle("transform",!1,!0);if(Q.hasValue()){const[S,D=S]=x.getStyle("transform-origin",!1,!0).split();if(S&&D){const H=[S,D];return new Transform(B,Q.getString(),H)}}return null}apply(B){this.transforms.forEach(x=>x.apply(B))}unapply(B){this.transforms.forEach(x=>x.unapply(B))}applyToPoint(B){this.transforms.forEach(x=>x.applyToPoint(B))}constructor(B,x,Q){this.document=B,this.transforms=[],parseTransforms(x).forEach(D=>{if(D==="none")return;const[H,P]=parseTransform(D),R=Transform.transformTypes[H];R&&this.transforms.push(new R(this.document,P,Q))})}}Transform.transformTypes={translate:Translate,rotate:Rotate,scale:Scale,matrix:Matrix,skewX:SkewX,skewY:SkewY};class Element{getAttribute(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1;const Q=this.attributes[B];if(!Q&&x){const S=new Property(this.document,B,"");return this.attributes[B]=S,S}return Q||Property.empty(this.document)}getHrefAttribute(){let B;for(const x in this.attributes)if(x==="href"||x.endsWith(":href")){B=this.attributes[x];break}return B||Property.empty(this.document)}getStyle(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1,Q=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!1;const S=this.styles[B];if(S)return S;const D=this.getAttribute(B);if(D.hasValue())return this.styles[B]=D,D;if(!Q){const{parent:H}=this;if(H){const P=H.getStyle(B);if(P.hasValue())return P}}if(x){const H=new Property(this.document,B,"");return this.styles[B]=H,H}return Property.empty(this.document)}render(B){if(!(this.getStyle("display").getString()==="none"||this.getStyle("visibility").getString()==="hidden")){if(B.save(),this.getStyle("mask").hasValue()){const x=this.getStyle("mask").getDefinition();x&&(this.applyEffects(B),x.apply(B,this))}else if(this.getStyle("filter").getValue("none")!=="none"){const x=this.getStyle("filter").getDefinition();x&&(this.applyEffects(B),x.apply(B,this))}else this.setContext(B),this.renderChildren(B),this.clearContext(B);B.restore()}}setContext(B){}applyEffects(B){const x=Transform.fromElement(this.document,this);x&&x.apply(B);const Q=this.getStyle("clip-path",!1,!0);if(Q.hasValue()){const S=Q.getDefinition();S&&S.apply(B)}}clearContext(B){}renderChildren(B){this.children.forEach(x=>{x.render(B)})}addChild(B){const x=B instanceof Element?B:this.document.createElement(B);x.parent=this,Element.ignoreChildTypes.includes(x.type)||this.children.push(x)}matchesSelector(B){var x;const{node:Q}=this;if(typeof Q.matches=="function")return Q.matches(B);const S=(x=Q.getAttribute)===null||x===void 0?void 0:x.call(Q,"class");return!S||S===""?!1:S.split(" ").some(D=>".".concat(D)===B)}addStylesFromStyleDefinition(){const{styles:B,stylesSpecificity:x}=this.document;let Q;for(const S in B)if(!S.startsWith("@")&&this.matchesSelector(S)){const D=B[S],H=x[S];if(D)for(const P in D){let R=this.stylesSpecificity[P];typeof R>"u"&&(R="000"),H&&H>=R&&(Q=D[P],Q&&(this.styles[P]=Q),this.stylesSpecificity[P]=H)}}}removeStyles(B,x){return x.reduce((S,D)=>{const H=B.getStyle(D);if(!H.hasValue())return S;const P=H.getString();return H.setValue(""),[...S,[D,P]]},[])}restoreStyles(B,x){x.forEach(Q=>{let[S,D]=Q;B.getStyle(S,!0).setValue(D)})}isFirstChild(){var B;return((B=this.parent)===null||B===void 0?void 0:B.children.indexOf(this))===0}constructor(B,x,Q=!1){if(this.document=B,this.node=x,this.captureTextNodes=Q,this.type="",this.attributes={},this.styles={},this.stylesSpecificity={},this.animationFrozen=!1,this.animationFrozenValue="",this.parent=null,this.children=[],!x||x.nodeType!==1)return;Array.from(x.attributes).forEach(H=>{const P=normalizeAttributeName(H.nodeName);this.attributes[P]=new Property(B,P,H.value)}),this.addStylesFromStyleDefinition(),this.getAttribute("style").hasValue()&&this.getAttribute("style").getString().split(";").map(P=>P.trim()).forEach(P=>{if(!P)return;const[R,Y]=P.split(":").map(G=>G.trim());R&&(this.styles[R]=new Property(B,R,Y))});const{definitions:S}=B,D=this.getAttribute("id");D.hasValue()&&(S[D.getString()]||(S[D.getString()]=this)),Array.from(x.childNodes).forEach(H=>{if(H.nodeType===1)this.addChild(H);else if(Q&&(H.nodeType===3||H.nodeType===4)){const P=B.createTextNode(H);P.getText().length>0&&this.addChild(P)}})}}Element.ignoreChildTypes=["title"];class UnknownElement extends Element{constructor(B,x,Q){super(B,x,Q)}}function wrapFontFamily(g){const B=g.trim();return/^('|")/.test(B)?B:'"'.concat(B,'"')}function prepareFontFamily(g){return typeof process>"u"?g:g.trim().split(",").map(wrapFontFamily).join(",")}function prepareFontStyle(g){if(!g)return"";const B=g.trim().toLowerCase();switch(B){case"normal":case"italic":case"oblique":case"inherit":case"initial":case"unset":return B;default:return/^oblique\s+(-|)\d+deg$/.test(B)?B:""}}function prepareFontWeight(g){if(!g)return"";const B=g.trim().toLowerCase();switch(B){case"normal":case"bold":case"lighter":case"bolder":case"inherit":case"initial":case"unset":return B;default:return/^[\d.]+$/.test(B)?B:""}}class Font{static parse(){let B=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"",x=arguments.length>1?arguments[1]:void 0,Q="",S="",D="",H="",P="";const R=compressSpaces(B).trim().split(" "),Y={fontSize:!1,fontStyle:!1,fontWeight:!1,fontVariant:!1};return R.forEach(G=>{switch(!0){case(!Y.fontStyle&&Font.styles.includes(G)):G!=="inherit"&&(Q=G),Y.fontStyle=!0;break;case(!Y.fontVariant&&Font.variants.includes(G)):G!=="inherit"&&(S=G),Y.fontStyle=!0,Y.fontVariant=!0;break;case(!Y.fontWeight&&Font.weights.includes(G)):G!=="inherit"&&(D=G),Y.fontStyle=!0,Y.fontVariant=!0,Y.fontWeight=!0;break;case!Y.fontSize:G!=="inherit"&&(H=G.split("/")[0]||""),Y.fontStyle=!0,Y.fontVariant=!0,Y.fontWeight=!0,Y.fontSize=!0;break;default:G!=="inherit"&&(P+=G)}}),new Font(Q,S,D,H,P,x)}toString(){return[prepareFontStyle(this.fontStyle),this.fontVariant,prepareFontWeight(this.fontWeight),this.fontSize,prepareFontFamily(this.fontFamily)].join(" ").trim()}constructor(B,x,Q,S,D,H){const P=H?typeof H=="string"?Font.parse(H):H:{};this.fontFamily=D||P.fontFamily,this.fontSize=S||P.fontSize,this.fontStyle=B||P.fontStyle,this.fontWeight=Q||P.fontWeight,this.fontVariant=x||P.fontVariant}}Font.styles="normal|italic|oblique|inherit";Font.variants="normal|small-caps|inherit";Font.weights="normal|bold|bolder|lighter|100|200|300|400|500|600|700|800|900|inherit";class BoundingBox{get x(){return this.x1}get y(){return this.y1}get width(){return this.x2-this.x1}get height(){return this.y2-this.y1}addPoint(B,x){typeof B<"u"&&((isNaN(this.x1)||isNaN(this.x2))&&(this.x1=B,this.x2=B),B<this.x1&&(this.x1=B),B>this.x2&&(this.x2=B)),typeof x<"u"&&((isNaN(this.y1)||isNaN(this.y2))&&(this.y1=x,this.y2=x),x<this.y1&&(this.y1=x),x>this.y2&&(this.y2=x))}addX(B){this.addPoint(B,0)}addY(B){this.addPoint(0,B)}addBoundingBox(B){if(!B)return;const{x1:x,y1:Q,x2:S,y2:D}=B;this.addPoint(x,Q),this.addPoint(S,D)}sumCubic(B,x,Q,S,D){return Math.pow(1-B,3)*x+3*Math.pow(1-B,2)*B*Q+3*(1-B)*Math.pow(B,2)*S+Math.pow(B,3)*D}bezierCurveAdd(B,x,Q,S,D){const H=6*x-12*Q+6*S,P=-3*x+9*Q-9*S+3*D,R=3*Q-3*x;if(P===0){if(H===0)return;const ee=-R/H;0<ee&&ee<1&&(B?this.addX(this.sumCubic(ee,x,Q,S,D)):this.addY(this.sumCubic(ee,x,Q,S,D)));return}const Y=Math.pow(H,2)-4*R*P;if(Y<0)return;const G=(-H+Math.sqrt(Y))/(2*P);0<G&&G<1&&(B?this.addX(this.sumCubic(G,x,Q,S,D)):this.addY(this.sumCubic(G,x,Q,S,D)));const X=(-H-Math.sqrt(Y))/(2*P);0<X&&X<1&&(B?this.addX(this.sumCubic(X,x,Q,S,D)):this.addY(this.sumCubic(X,x,Q,S,D)))}addBezierCurve(B,x,Q,S,D,H,P,R){this.addPoint(B,x),this.addPoint(P,R),this.bezierCurveAdd(!0,B,Q,D,P),this.bezierCurveAdd(!1,x,S,H,R)}addQuadraticCurve(B,x,Q,S,D,H){const P=B+.6666666666666666*(Q-B),R=x+2/3*(S-x),Y=P+1/3*(D-B),G=R+1/3*(H-x);this.addBezierCurve(B,x,P,Y,R,G,D,H)}isPointInBox(B,x){const{x1:Q,y1:S,x2:D,y2:H}=this;return Q<=B&&B<=D&&S<=x&&x<=H}constructor(B=Number.NaN,x=Number.NaN,Q=Number.NaN,S=Number.NaN){this.x1=B,this.y1=x,this.x2=Q,this.y2=S,this.addPoint(B,x),this.addPoint(Q,S)}}class RenderedElement extends Element{calculateOpacity(){let B=1,x=this;for(;x;){const Q=x.getStyle("opacity",!1,!0);Q.hasValue(!0)&&(B*=Q.getNumber()),x=x.parent}return B}setContext(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1;if(!x){const Q=this.getStyle("fill"),S=this.getStyle("fill-opacity"),D=this.getStyle("stroke"),H=this.getStyle("stroke-opacity");if(Q.isUrlDefinition()){const Ae=Q.getFillStyleDefinition(this,S);Ae&&(B.fillStyle=Ae)}else if(Q.hasValue()){Q.getString()==="currentColor"&&Q.setValue(this.getStyle("color").getColor());const Ae=Q.getColor();Ae!=="inherit"&&(B.fillStyle=Ae==="none"?"rgba(0,0,0,0)":Ae)}if(S.hasValue()){const Ae=new Property(this.document,"fill",B.fillStyle).addOpacity(S).getColor();B.fillStyle=Ae}if(D.isUrlDefinition()){const Ae=D.getFillStyleDefinition(this,H);Ae&&(B.strokeStyle=Ae)}else if(D.hasValue()){D.getString()==="currentColor"&&D.setValue(this.getStyle("color").getColor());const Ae=D.getString();Ae!=="inherit"&&(B.strokeStyle=Ae==="none"?"rgba(0,0,0,0)":Ae)}if(H.hasValue()){const Ae=new Property(this.document,"stroke",B.strokeStyle).addOpacity(H).getString();B.strokeStyle=Ae}const P=this.getStyle("stroke-width");if(P.hasValue()){const Ae=P.getPixels();B.lineWidth=Ae||PSEUDO_ZERO}const R=this.getStyle("stroke-linecap"),Y=this.getStyle("stroke-linejoin"),G=this.getStyle("stroke-miterlimit"),X=this.getStyle("stroke-dasharray"),ee=this.getStyle("stroke-dashoffset");if(R.hasValue()&&(B.lineCap=R.getString()),Y.hasValue()&&(B.lineJoin=Y.getString()),G.hasValue()&&(B.miterLimit=G.getNumber()),X.hasValue()&&X.getString()!=="none"){const Ae=toNumbers(X.getString());typeof B.setLineDash<"u"?B.setLineDash(Ae):typeof B.webkitLineDash<"u"?B.webkitLineDash=Ae:typeof B.mozDash<"u"&&!(Ae.length===1&&Ae[0]===0)&&(B.mozDash=Ae);const le=ee.getPixels();typeof B.lineDashOffset<"u"?B.lineDashOffset=le:typeof B.webkitLineDashOffset<"u"?B.webkitLineDashOffset=le:typeof B.mozDashOffset<"u"&&(B.mozDashOffset=le)}}if(this.modifiedEmSizeStack=!1,typeof B.font<"u"){const Q=this.getStyle("font"),S=this.getStyle("font-style"),D=this.getStyle("font-variant"),H=this.getStyle("font-weight"),P=this.getStyle("font-size"),R=this.getStyle("font-family"),Y=new Font(S.getString(),D.getString(),H.getString(),P.hasValue()?"".concat(P.getPixels(!0),"px"):"",R.getString(),Font.parse(Q.getString(),B.font));S.setValue(Y.fontStyle),D.setValue(Y.fontVariant),H.setValue(Y.fontWeight),P.setValue(Y.fontSize),R.setValue(Y.fontFamily),B.font=Y.toString(),P.isPixels()&&(this.document.emSize=P.getPixels(),this.modifiedEmSizeStack=!0)}x||(this.applyEffects(B),B.globalAlpha=this.calculateOpacity())}clearContext(B){super.clearContext(B),this.modifiedEmSizeStack&&this.document.popEmSize()}constructor(...B){super(...B),this.modifiedEmSizeStack=!1}}class TextElement extends RenderedElement{setContext(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1;super.setContext(B,x);const Q=this.getStyle("dominant-baseline").getTextBaseline()||this.getStyle("alignment-baseline").getTextBaseline();Q&&(B.textBaseline=Q)}initializeCoordinates(){this.x=0,this.y=0,this.leafTexts=[],this.textChunkStart=0,this.minX=Number.POSITIVE_INFINITY,this.maxX=Number.NEGATIVE_INFINITY}getBoundingBox(B){if(this.type!=="text")return this.getTElementBoundingBox(B);this.initializeCoordinates(),this.adjustChildCoordinatesRecursive(B);let x=null;return this.children.forEach((Q,S)=>{const D=this.getChildBoundingBox(B,this,this,S);x?x.addBoundingBox(D):x=D}),x}getFontSize(){const{document:B,parent:x}=this,Q=Font.parse(B.ctx.font).fontSize;return x.getStyle("font-size").getNumber(Q)}getTElementBoundingBox(B){const x=this.getFontSize();return new BoundingBox(this.x,this.y-x,this.x+this.measureText(B),this.y)}getGlyph(B,x,Q){const S=x[Q];let D;if(B.isArabic){var H;const P=x.length,R=x[Q-1],Y=x[Q+1];let G="isolated";(Q===0||R===" ")&&Q<P-1&&Y!==" "&&(G="terminal"),Q>0&&R!==" "&&Q<P-1&&Y!==" "&&(G="medial"),Q>0&&R!==" "&&(Q===P-1||Y===" ")&&(G="initial"),D=((H=B.arabicGlyphs[S])===null||H===void 0?void 0:H[G])||B.glyphs[S]}else D=B.glyphs[S];return D||(D=B.missingGlyph),D}getText(){return""}getTextFromNode(B){const x=B||this.node,Q=Array.from(x.parentNode.childNodes),S=Q.indexOf(x),D=Q.length-1;let H=compressSpaces(x.textContent||"");return S===0&&(H=trimLeft(H)),S===D&&(H=trimRight(H)),H}renderChildren(B){if(this.type!=="text"){this.renderTElementChildren(B);return}this.initializeCoordinates(),this.adjustChildCoordinatesRecursive(B),this.children.forEach((Q,S)=>{this.renderChild(B,this,this,S)});const{mouse:x}=this.document.screen;x.isWorking()&&x.checkBoundingBox(this,this.getBoundingBox(B))}renderTElementChildren(B){const{document:x,parent:Q}=this,S=this.getText(),D=Q.getStyle("font-family").getDefinition();if(D){const{unitsPerEm:R}=D.fontFace,Y=Font.parse(x.ctx.font),G=Q.getStyle("font-size").getNumber(Y.fontSize),X=Q.getStyle("font-style").getString(Y.fontStyle),ee=G/R,Ae=D.isRTL?S.split("").reverse().join(""):S,le=toNumbers(Q.getAttribute("dx").getString()),ae=Ae.length;for(let ge=0;ge<ae;ge++){const fe=this.getGlyph(D,Ae,ge);B.translate(this.x,this.y),B.scale(ee,-ee);const ye=B.lineWidth;B.lineWidth=B.lineWidth*R/G,X==="italic"&&B.transform(1,0,.4,1,0,0),fe.render(B),X==="italic"&&B.transform(1,0,-.4,1,0,0),B.lineWidth=ye,B.scale(1/ee,-1/ee),B.translate(-this.x,-this.y),this.x+=G*(fe.horizAdvX||D.horizAdvX)/R,typeof le[ge]<"u"&&!isNaN(le[ge])&&(this.x+=le[ge])}return}const{x:H,y:P}=this;B.fillStyle&&B.fillText(S,H,P),B.strokeStyle&&B.strokeText(S,H,P)}applyAnchoring(){if(this.textChunkStart>=this.leafTexts.length)return;const B=this.leafTexts[this.textChunkStart],x=B.getStyle("text-anchor").getString("start"),Q=!1;let S=0;x==="start"&&!Q||x==="end"&&Q?S=B.x-this.minX:x==="end"&&!Q||x==="start"&&Q?S=B.x-this.maxX:S=B.x-(this.minX+this.maxX)/2;for(let D=this.textChunkStart;D<this.leafTexts.length;D++)this.leafTexts[D].x+=S;this.minX=Number.POSITIVE_INFINITY,this.maxX=Number.NEGATIVE_INFINITY,this.textChunkStart=this.leafTexts.length}adjustChildCoordinatesRecursive(B){this.children.forEach((x,Q)=>{this.adjustChildCoordinatesRecursiveCore(B,this,this,Q)}),this.applyAnchoring()}adjustChildCoordinatesRecursiveCore(B,x,Q,S){const D=Q.children[S];D.children.length>0?D.children.forEach((H,P)=>{x.adjustChildCoordinatesRecursiveCore(B,x,D,P)}):this.adjustChildCoordinates(B,x,Q,S)}adjustChildCoordinates(B,x,Q,S){const D=Q.children[S];if(typeof D.measureText!="function")return D;B.save(),D.setContext(B,!0);const H=D.getAttribute("x"),P=D.getAttribute("y"),R=D.getAttribute("dx"),Y=D.getAttribute("dy"),G=D.getStyle("font-family").getDefinition(),X=!!(G!=null&&G.isRTL);S===0&&(H.hasValue()||H.setValue(D.getInheritedAttribute("x")),P.hasValue()||P.setValue(D.getInheritedAttribute("y")),R.hasValue()||R.setValue(D.getInheritedAttribute("dx")),Y.hasValue()||Y.setValue(D.getInheritedAttribute("dy")));const ee=D.measureText(B);return X&&(x.x-=ee),H.hasValue()?(x.applyAnchoring(),D.x=H.getPixels("x"),R.hasValue()&&(D.x+=R.getPixels("x"))):(R.hasValue()&&(x.x+=R.getPixels("x")),D.x=x.x),x.x=D.x,X||(x.x+=ee),P.hasValue()?(D.y=P.getPixels("y"),Y.hasValue()&&(D.y+=Y.getPixels("y"))):(Y.hasValue()&&(x.y+=Y.getPixels("y")),D.y=x.y),x.y=D.y,x.leafTexts.push(D),x.minX=Math.min(x.minX,D.x,D.x+ee),x.maxX=Math.max(x.maxX,D.x,D.x+ee),D.clearContext(B),B.restore(),D}getChildBoundingBox(B,x,Q,S){const D=Q.children[S];if(typeof D.getBoundingBox!="function")return null;const H=D.getBoundingBox(B);return H&&D.children.forEach((P,R)=>{const Y=x.getChildBoundingBox(B,x,D,R);H.addBoundingBox(Y)}),H}renderChild(B,x,Q,S){const D=Q.children[S];D.render(B),D.children.forEach((H,P)=>{x.renderChild(B,x,D,P)})}measureText(B){const{measureCache:x}=this;if(~x)return x;const Q=this.getText(),S=this.measureTargetText(B,Q);return this.measureCache=S,S}measureTargetText(B,x){if(!x.length)return 0;const{parent:Q}=this,S=Q.getStyle("font-family").getDefinition();if(S){const H=this.getFontSize(),P=S.isRTL?x.split("").reverse().join(""):x,R=toNumbers(Q.getAttribute("dx").getString()),Y=P.length;let G=0;for(let X=0;X<Y;X++){const ee=this.getGlyph(S,P,X);G+=(ee.horizAdvX||S.horizAdvX)*H/S.fontFace.unitsPerEm,typeof R[X]<"u"&&!isNaN(R[X])&&(G+=R[X])}return G}if(!B.measureText)return x.length*10;B.save(),this.setContext(B,!0);const{width:D}=B.measureText(x);return this.clearContext(B),B.restore(),D}getInheritedAttribute(B){let x=this;for(;x instanceof TextElement&&x.isFirstChild()&&x.parent;){const Q=x.parent.getAttribute(B);if(Q.hasValue(!0))return Q.getString("0");x=x.parent}return null}constructor(B,x,Q){super(B,x,new.target===TextElement?!0:Q),this.type="text",this.x=0,this.y=0,this.leafTexts=[],this.textChunkStart=0,this.minX=Number.POSITIVE_INFINITY,this.maxX=Number.NEGATIVE_INFINITY,this.measureCache=-1}}class TSpanElement extends TextElement{getText(){return this.text}constructor(B,x,Q){super(B,x,new.target===TSpanElement?!0:Q),this.type="tspan",this.text=this.children.length>0?"":this.getTextFromNode()}}class TextNode extends TSpanElement{constructor(...B){super(...B),this.type="textNode"}}class PathParser extends _{reset(){this.i=-1,this.command=null,this.previousCommand=null,this.start=new Point(0,0),this.control=new Point(0,0),this.current=new Point(0,0),this.points=[],this.angles=[]}isEnd(){const{i:B,commands:x}=this;return B>=x.length-1}next(){const B=this.commands[++this.i];return this.previousCommand=this.command,this.command=B,B}getPoint(){let B=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"x",x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:"y";const Q=new Point(this.command[B],this.command[x]);return this.makeAbsolute(Q)}getAsControlPoint(B,x){const Q=this.getPoint(B,x);return this.control=Q,Q}getAsCurrentPoint(B,x){const Q=this.getPoint(B,x);return this.current=Q,Q}getReflectedControlPoint(){const B=this.previousCommand.type;if(B!==_.CURVE_TO&&B!==_.SMOOTH_CURVE_TO&&B!==_.QUAD_TO&&B!==_.SMOOTH_QUAD_TO)return this.current;const{current:{x,y:Q},control:{x:S,y:D}}=this;return new Point(2*x-S,2*Q-D)}makeAbsolute(B){if(this.command.relative){const{x,y:Q}=this.current;B.x+=x,B.y+=Q}return B}addMarker(B,x,Q){const{points:S,angles:D}=this;Q&&D.length>0&&!D[D.length-1]&&(D[D.length-1]=S[S.length-1].angleTo(Q)),this.addMarkerAngle(B,x?x.angleTo(B):null)}addMarkerAngle(B,x){this.points.push(B),this.angles.push(x)}getMarkerPoints(){return this.points}getMarkerAngles(){const{angles:B}=this,x=B.length;for(let Q=0;Q<x;Q++)if(!B[Q]){for(let S=Q+1;S<x;S++)if(B[S]){B[Q]=B[S];break}}return B}constructor(B){super(B.replace(/([+\-.])\s+/gm,"$1").replace(/[^MmZzLlHhVvCcSsQqTtAae\d\s.,+-].*/g,"")),this.control=new Point(0,0),this.start=new Point(0,0),this.current=new Point(0,0),this.command=null,this.commands=this.commands,this.i=-1,this.previousCommand=null,this.points=[],this.angles=[]}}class PathElement extends RenderedElement{path(B){const{pathParser:x}=this,Q=new BoundingBox;for(x.reset(),B&&B.beginPath();!x.isEnd();)switch(x.next().type){case PathParser.MOVE_TO:this.pathM(B,Q);break;case PathParser.LINE_TO:this.pathL(B,Q);break;case PathParser.HORIZ_LINE_TO:this.pathH(B,Q);break;case PathParser.VERT_LINE_TO:this.pathV(B,Q);break;case PathParser.CURVE_TO:this.pathC(B,Q);break;case PathParser.SMOOTH_CURVE_TO:this.pathS(B,Q);break;case PathParser.QUAD_TO:this.pathQ(B,Q);break;case PathParser.SMOOTH_QUAD_TO:this.pathT(B,Q);break;case PathParser.ARC:this.pathA(B,Q);break;case PathParser.CLOSE_PATH:this.pathZ(B,Q);break}return Q}getBoundingBox(B){return this.path()}getMarkers(){const{pathParser:B}=this,x=B.getMarkerPoints(),Q=B.getMarkerAngles();return x.map((D,H)=>[D,Q[H]])}renderChildren(B){this.path(B),this.document.screen.mouse.checkPath(this,B);const x=this.getStyle("fill-rule");B.fillStyle!==""&&(x.getString("inherit")!=="inherit"?B.fill(x.getString()):B.fill()),B.strokeStyle!==""&&(this.getAttribute("vector-effect").getString()==="non-scaling-stroke"?(B.save(),B.setTransform(1,0,0,1,0,0),B.stroke(),B.restore()):B.stroke());const Q=this.getMarkers();if(Q){const S=Q.length-1,D=this.getStyle("marker-start"),H=this.getStyle("marker-mid"),P=this.getStyle("marker-end");if(D.isUrlDefinition()){const R=D.getDefinition(),[Y,G]=Q[0];R.render(B,Y,G)}if(H.isUrlDefinition()){const R=H.getDefinition();for(let Y=1;Y<S;Y++){const[G,X]=Q[Y];R.render(B,G,X)}}if(P.isUrlDefinition()){const R=P.getDefinition(),[Y,G]=Q[S];R.render(B,Y,G)}}}static pathM(B){const x=B.getAsCurrentPoint();return B.start=B.current,{point:x}}pathM(B,x){const{pathParser:Q}=this,{point:S}=PathElement.pathM(Q),{x:D,y:H}=S;Q.addMarker(S),x.addPoint(D,H),B&&B.moveTo(D,H)}static pathL(B){const{current:x}=B,Q=B.getAsCurrentPoint();return{current:x,point:Q}}pathL(B,x){const{pathParser:Q}=this,{current:S,point:D}=PathElement.pathL(Q),{x:H,y:P}=D;Q.addMarker(D,S),x.addPoint(H,P),B&&B.lineTo(H,P)}static pathH(B){const{current:x,command:Q}=B,S=new Point((Q.relative?x.x:0)+Q.x,x.y);return B.current=S,{current:x,point:S}}pathH(B,x){const{pathParser:Q}=this,{current:S,point:D}=PathElement.pathH(Q),{x:H,y:P}=D;Q.addMarker(D,S),x.addPoint(H,P),B&&B.lineTo(H,P)}static pathV(B){const{current:x,command:Q}=B,S=new Point(x.x,(Q.relative?x.y:0)+Q.y);return B.current=S,{current:x,point:S}}pathV(B,x){const{pathParser:Q}=this,{current:S,point:D}=PathElement.pathV(Q),{x:H,y:P}=D;Q.addMarker(D,S),x.addPoint(H,P),B&&B.lineTo(H,P)}static pathC(B){const{current:x}=B,Q=B.getPoint("x1","y1"),S=B.getAsControlPoint("x2","y2"),D=B.getAsCurrentPoint();return{current:x,point:Q,controlPoint:S,currentPoint:D}}pathC(B,x){const{pathParser:Q}=this,{current:S,point:D,controlPoint:H,currentPoint:P}=PathElement.pathC(Q);Q.addMarker(P,H,D),x.addBezierCurve(S.x,S.y,D.x,D.y,H.x,H.y,P.x,P.y),B&&B.bezierCurveTo(D.x,D.y,H.x,H.y,P.x,P.y)}static pathS(B){const{current:x}=B,Q=B.getReflectedControlPoint(),S=B.getAsControlPoint("x2","y2"),D=B.getAsCurrentPoint();return{current:x,point:Q,controlPoint:S,currentPoint:D}}pathS(B,x){const{pathParser:Q}=this,{current:S,point:D,controlPoint:H,currentPoint:P}=PathElement.pathS(Q);Q.addMarker(P,H,D),x.addBezierCurve(S.x,S.y,D.x,D.y,H.x,H.y,P.x,P.y),B&&B.bezierCurveTo(D.x,D.y,H.x,H.y,P.x,P.y)}static pathQ(B){const{current:x}=B,Q=B.getAsControlPoint("x1","y1"),S=B.getAsCurrentPoint();return{current:x,controlPoint:Q,currentPoint:S}}pathQ(B,x){const{pathParser:Q}=this,{current:S,controlPoint:D,currentPoint:H}=PathElement.pathQ(Q);Q.addMarker(H,D,D),x.addQuadraticCurve(S.x,S.y,D.x,D.y,H.x,H.y),B&&B.quadraticCurveTo(D.x,D.y,H.x,H.y)}static pathT(B){const{current:x}=B,Q=B.getReflectedControlPoint();B.control=Q;const S=B.getAsCurrentPoint();return{current:x,controlPoint:Q,currentPoint:S}}pathT(B,x){const{pathParser:Q}=this,{current:S,controlPoint:D,currentPoint:H}=PathElement.pathT(Q);Q.addMarker(H,D,D),x.addQuadraticCurve(S.x,S.y,D.x,D.y,H.x,H.y),B&&B.quadraticCurveTo(D.x,D.y,H.x,H.y)}static pathA(B){const{current:x,command:Q}=B;let{rX:S,rY:D,xRot:H,lArcFlag:P,sweepFlag:R}=Q;const Y=H*(Math.PI/180),G=B.getAsCurrentPoint(),X=new Point(Math.cos(Y)*(x.x-G.x)/2+Math.sin(Y)*(x.y-G.y)/2,-Math.sin(Y)*(x.x-G.x)/2+Math.cos(Y)*(x.y-G.y)/2),ee=Math.pow(X.x,2)/Math.pow(S,2)+Math.pow(X.y,2)/Math.pow(D,2);ee>1&&(S*=Math.sqrt(ee),D*=Math.sqrt(ee));let Ae=(P===R?-1:1)*Math.sqrt((Math.pow(S,2)*Math.pow(D,2)-Math.pow(S,2)*Math.pow(X.y,2)-Math.pow(D,2)*Math.pow(X.x,2))/(Math.pow(S,2)*Math.pow(X.y,2)+Math.pow(D,2)*Math.pow(X.x,2)));isNaN(Ae)&&(Ae=0);const le=new Point(Ae*S*X.y/D,Ae*-D*X.x/S),ae=new Point((x.x+G.x)/2+Math.cos(Y)*le.x-Math.sin(Y)*le.y,(x.y+G.y)/2+Math.sin(Y)*le.x+Math.cos(Y)*le.y),ge=vectorsAngle([1,0],[(X.x-le.x)/S,(X.y-le.y)/D]),fe=[(X.x-le.x)/S,(X.y-le.y)/D],ye=[(-X.x-le.x)/S,(-X.y-le.y)/D];let me=vectorsAngle(fe,ye);return vectorsRatio(fe,ye)<=-1&&(me=Math.PI),vectorsRatio(fe,ye)>=1&&(me=0),{currentPoint:G,rX:S,rY:D,sweepFlag:R,xAxisRotation:Y,centp:ae,a1:ge,ad:me}}pathA(B,x){const{pathParser:Q}=this,{currentPoint:S,rX:D,rY:H,sweepFlag:P,xAxisRotation:R,centp:Y,a1:G,ad:X}=PathElement.pathA(Q),ee=1-P?1:-1,Ae=G+ee*(X/2),le=new Point(Y.x+D*Math.cos(Ae),Y.y+H*Math.sin(Ae));if(Q.addMarkerAngle(le,Ae-ee*Math.PI/2),Q.addMarkerAngle(S,Ae-ee*Math.PI),x.addPoint(S.x,S.y),B&&!isNaN(G)&&!isNaN(X)){const ae=D>H?D:H,ge=D>H?1:D/H,fe=D>H?H/D:1;B.translate(Y.x,Y.y),B.rotate(R),B.scale(ge,fe),B.arc(0,0,ae,G,G+X,!!(1-P)),B.scale(1/ge,1/fe),B.rotate(-R),B.translate(-Y.x,-Y.y)}}static pathZ(B){B.current=B.start}pathZ(B,x){PathElement.pathZ(this.pathParser),B&&x.x1!==x.x2&&x.y1!==x.y2&&B.closePath()}constructor(B,x,Q){super(B,x,Q),this.type="path",this.pathParser=new PathParser(this.getAttribute("d").getString())}}class SVGElement extends RenderedElement{setContext(B){var x;const{document:Q}=this,{screen:S,window:D}=Q,H=B.canvas;if(S.setDefaults(B),"style"in H&&typeof B.font<"u"&&D&&typeof D.getComputedStyle<"u"){B.font=D.getComputedStyle(H).getPropertyValue("font");const ye=new Property(Q,"fontSize",Font.parse(B.font).fontSize);ye.hasValue()&&(Q.rootEmSize=ye.getPixels("y"),Q.emSize=Q.rootEmSize)}this.getAttribute("x").hasValue()||this.getAttribute("x",!0).setValue(0),this.getAttribute("y").hasValue()||this.getAttribute("y",!0).setValue(0);let{width:P,height:R}=S.viewPort;this.getStyle("width").hasValue()||this.getStyle("width",!0).setValue("100%"),this.getStyle("height").hasValue()||this.getStyle("height",!0).setValue("100%"),this.getStyle("color").hasValue()||this.getStyle("color",!0).setValue("black");const Y=this.getAttribute("refX"),G=this.getAttribute("refY"),X=this.getAttribute("viewBox"),ee=X.hasValue()?toNumbers(X.getString()):null,Ae=!this.root&&this.getStyle("overflow").getValue("hidden")!=="visible";let le=0,ae=0,ge=0,fe=0;ee&&(le=ee[0],ae=ee[1]),this.root||(P=this.getStyle("width").getPixels("x"),R=this.getStyle("height").getPixels("y"),this.type==="marker"&&(ge=le,fe=ae,le=0,ae=0)),S.viewPort.setCurrent(P,R),this.node&&(!this.parent||((x=this.node.parentNode)===null||x===void 0?void 0:x.nodeName)==="foreignObject")&&this.getStyle("transform",!1,!0).hasValue()&&!this.getStyle("transform-origin",!1,!0).hasValue()&&this.getStyle("transform-origin",!0,!0).setValue("50% 50%"),super.setContext(B),B.translate(this.getAttribute("x").getPixels("x"),this.getAttribute("y").getPixels("y")),ee&&(P=ee[2],R=ee[3]),Q.setViewBox({ctx:B,aspectRatio:this.getAttribute("preserveAspectRatio").getString(),width:S.viewPort.width,desiredWidth:P,height:S.viewPort.height,desiredHeight:R,minX:le,minY:ae,refX:Y.getValue(),refY:G.getValue(),clip:Ae,clipX:ge,clipY:fe}),ee&&(S.viewPort.removeCurrent(),S.viewPort.setCurrent(P,R))}clearContext(B){super.clearContext(B),this.document.screen.viewPort.removeCurrent()}resize(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:B,Q=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!1;const S=this.getAttribute("width",!0),D=this.getAttribute("height",!0),H=this.getAttribute("viewBox"),P=this.getAttribute("style"),R=S.getNumber(0),Y=D.getNumber(0);if(Q)if(typeof Q=="string")this.getAttribute("preserveAspectRatio",!0).setValue(Q);else{const G=this.getAttribute("preserveAspectRatio");G.hasValue()&&G.setValue(G.getString().replace(/^\s*(\S.*\S)\s*$/,"$1"))}if(S.setValue(B),D.setValue(x),H.hasValue()||H.setValue("0 0 ".concat(R||B," ").concat(Y||x)),P.hasValue()){const G=this.getStyle("width"),X=this.getStyle("height");G.hasValue()&&G.setValue("".concat(B,"px")),X.hasValue()&&X.setValue("".concat(x,"px"))}}constructor(...B){super(...B),this.type="svg",this.root=!1}}class RectElement extends PathElement{path(B){const x=this.getAttribute("x").getPixels("x"),Q=this.getAttribute("y").getPixels("y"),S=this.getStyle("width",!1,!0).getPixels("x"),D=this.getStyle("height",!1,!0).getPixels("y"),H=this.getAttribute("rx"),P=this.getAttribute("ry");let R=H.getPixels("x"),Y=P.getPixels("y");if(H.hasValue()&&!P.hasValue()&&(Y=R),P.hasValue()&&!H.hasValue()&&(R=Y),R=Math.min(R,S/2),Y=Math.min(Y,D/2),B){const G=4*((Math.sqrt(2)-1)/3);B.beginPath(),D>0&&S>0&&(B.moveTo(x+R,Q),B.lineTo(x+S-R,Q),B.bezierCurveTo(x+S-R+G*R,Q,x+S,Q+Y-G*Y,x+S,Q+Y),B.lineTo(x+S,Q+D-Y),B.bezierCurveTo(x+S,Q+D-Y+G*Y,x+S-R+G*R,Q+D,x+S-R,Q+D),B.lineTo(x+R,Q+D),B.bezierCurveTo(x+R-G*R,Q+D,x,Q+D-Y+G*Y,x,Q+D-Y),B.lineTo(x,Q+Y),B.bezierCurveTo(x,Q+Y-G*Y,x+R-G*R,Q,x+R,Q),B.closePath())}return new BoundingBox(x,Q,x+S,Q+D)}getMarkers(){return null}constructor(...B){super(...B),this.type="rect"}}class CircleElement extends PathElement{path(B){const x=this.getAttribute("cx").getPixels("x"),Q=this.getAttribute("cy").getPixels("y"),S=this.getAttribute("r").getPixels();return B&&S>0&&(B.beginPath(),B.arc(x,Q,S,0,Math.PI*2,!1),B.closePath()),new BoundingBox(x-S,Q-S,x+S,Q+S)}getMarkers(){return null}constructor(...B){super(...B),this.type="circle"}}class EllipseElement extends PathElement{path(B){const x=4*((Math.sqrt(2)-1)/3),Q=this.getAttribute("rx").getPixels("x"),S=this.getAttribute("ry").getPixels("y"),D=this.getAttribute("cx").getPixels("x"),H=this.getAttribute("cy").getPixels("y");return B&&Q>0&&S>0&&(B.beginPath(),B.moveTo(D+Q,H),B.bezierCurveTo(D+Q,H+x*S,D+x*Q,H+S,D,H+S),B.bezierCurveTo(D-x*Q,H+S,D-Q,H+x*S,D-Q,H),B.bezierCurveTo(D-Q,H-x*S,D-x*Q,H-S,D,H-S),B.bezierCurveTo(D+x*Q,H-S,D+Q,H-x*S,D+Q,H),B.closePath()),new BoundingBox(D-Q,H-S,D+Q,H+S)}getMarkers(){return null}constructor(...B){super(...B),this.type="ellipse"}}class LineElement extends PathElement{getPoints(){return[new Point(this.getAttribute("x1").getPixels("x"),this.getAttribute("y1").getPixels("y")),new Point(this.getAttribute("x2").getPixels("x"),this.getAttribute("y2").getPixels("y"))]}path(B){const[{x,y:Q},{x:S,y:D}]=this.getPoints();return B&&(B.beginPath(),B.moveTo(x,Q),B.lineTo(S,D)),new BoundingBox(x,Q,S,D)}getMarkers(){const[B,x]=this.getPoints(),Q=B.angleTo(x);return[[B,Q],[x,Q]]}constructor(...B){super(...B),this.type="line"}}class PolylineElement extends PathElement{path(B){const{points:x}=this,[{x:Q,y:S}]=x,D=new BoundingBox(Q,S);return B&&(B.beginPath(),B.moveTo(Q,S)),x.forEach(H=>{let{x:P,y:R}=H;D.addPoint(P,R),B&&B.lineTo(P,R)}),D}getMarkers(){const{points:B}=this,x=B.length-1,Q=[];return B.forEach((S,D)=>{D!==x&&Q.push([S,S.angleTo(B[D+1])])}),Q.length>0&&Q.push([B[B.length-1],Q[Q.length-1][1]]),Q}constructor(B,x,Q){super(B,x,Q),this.type="polyline",this.points=[],this.points=Point.parsePath(this.getAttribute("points").getString())}}class PolygonElement extends PolylineElement{path(B){const x=super.path(B),[{x:Q,y:S}]=this.points;return B&&(B.lineTo(Q,S),B.closePath()),x}constructor(...B){super(...B),this.type="polygon"}}class PatternElement extends Element{createPattern(B,x,Q){const S=this.getStyle("width").getPixels("x",!0),D=this.getStyle("height").getPixels("y",!0),H=new SVGElement(this.document,null);H.attributes.viewBox=new Property(this.document,"viewBox",this.getAttribute("viewBox").getValue()),H.attributes.width=new Property(this.document,"width","".concat(S,"px")),H.attributes.height=new Property(this.document,"height","".concat(D,"px")),H.attributes.transform=new Property(this.document,"transform",this.getAttribute("patternTransform").getValue()),H.children=this.children;const P=this.document.createCanvas(S,D),R=P.getContext("2d"),Y=this.getAttribute("x"),G=this.getAttribute("y");Y.hasValue()&&G.hasValue()&&R.translate(Y.getPixels("x",!0),G.getPixels("y",!0)),Q.hasValue()?this.styles["fill-opacity"]=Q:Reflect.deleteProperty(this.styles,"fill-opacity");for(let ee=-1;ee<=1;ee++)for(let Ae=-1;Ae<=1;Ae++)R.save(),H.attributes.x=new Property(this.document,"x",ee*P.width),H.attributes.y=new Property(this.document,"y",Ae*P.height),H.render(R),R.restore();return B.createPattern(P,"repeat")}constructor(...B){super(...B),this.type="pattern"}}class MarkerElement extends Element{render(B,x,Q){if(!x)return;const{x:S,y:D}=x,H=this.getAttribute("orient").getString("auto"),P=this.getAttribute("markerUnits").getString("strokeWidth");B.translate(S,D),H==="auto"&&B.rotate(Q),P==="strokeWidth"&&B.scale(B.lineWidth,B.lineWidth),B.save();const R=new SVGElement(this.document);R.type=this.type,R.attributes.viewBox=new Property(this.document,"viewBox",this.getAttribute("viewBox").getValue()),R.attributes.refX=new Property(this.document,"refX",this.getAttribute("refX").getValue()),R.attributes.refY=new Property(this.document,"refY",this.getAttribute("refY").getValue()),R.attributes.width=new Property(this.document,"width",this.getAttribute("markerWidth").getValue()),R.attributes.height=new Property(this.document,"height",this.getAttribute("markerHeight").getValue()),R.attributes.overflow=new Property(this.document,"overflow",this.getAttribute("overflow").getValue()),R.attributes.fill=new Property(this.document,"fill",this.getAttribute("fill").getColor("black")),R.attributes.stroke=new Property(this.document,"stroke",this.getAttribute("stroke").getValue("none")),R.children=this.children,R.render(B),B.restore(),P==="strokeWidth"&&B.scale(1/B.lineWidth,1/B.lineWidth),H==="auto"&&B.rotate(-Q),B.translate(-S,-D)}constructor(...B){super(...B),this.type="marker"}}class DefsElement extends Element{render(){}constructor(...B){super(...B),this.type="defs"}}class GElement extends RenderedElement{getBoundingBox(B){const x=new BoundingBox;return this.children.forEach(Q=>{x.addBoundingBox(Q.getBoundingBox(B))}),x}constructor(...B){super(...B),this.type="g"}}class GradientElement extends Element{getGradientUnits(){return this.getAttribute("gradientUnits").getString("objectBoundingBox")}createGradient(B,x,Q){let S=this;this.getHrefAttribute().hasValue()&&(S=this.getHrefAttribute().getDefinition(),this.inheritStopContainer(S));const{stops:D}=S,H=this.getGradient(B,x);if(!H)return this.addParentOpacity(Q,D[D.length-1].color);if(D.forEach(P=>{H.addColorStop(P.offset,this.addParentOpacity(Q,P.color))}),this.getAttribute("gradientTransform").hasValue()){const{document:P}=this,{MAX_VIRTUAL_PIXELS:R}=Screen,{viewPort:Y}=P.screen,G=Y.getRoot(),X=new RectElement(P);X.attributes.x=new Property(P,"x",-R/3),X.attributes.y=new Property(P,"y",-R/3),X.attributes.width=new Property(P,"width",R),X.attributes.height=new Property(P,"height",R);const ee=new GElement(P);ee.attributes.transform=new Property(P,"transform",this.getAttribute("gradientTransform").getValue()),ee.children=[X];const Ae=new SVGElement(P);Ae.attributes.x=new Property(P,"x",0),Ae.attributes.y=new Property(P,"y",0),Ae.attributes.width=new Property(P,"width",G.width),Ae.attributes.height=new Property(P,"height",G.height),Ae.children=[ee];const le=P.createCanvas(G.width,G.height),ae=le.getContext("2d");return ae.fillStyle=H,Ae.render(ae),ae.createPattern(le,"no-repeat")}return H}inheritStopContainer(B){this.attributesToInherit.forEach(x=>{!this.getAttribute(x).hasValue()&&B.getAttribute(x).hasValue()&&this.getAttribute(x,!0).setValue(B.getAttribute(x).getValue())})}addParentOpacity(B,x){return B.hasValue()?new Property(this.document,"color",x).addOpacity(B).getColor():x}constructor(B,x,Q){super(B,x,Q),this.attributesToInherit=["gradientUnits"],this.stops=[];const{stops:S,children:D}=this;D.forEach(H=>{H.type==="stop"&&S.push(H)})}}class LinearGradientElement extends GradientElement{getGradient(B,x){const Q=this.getGradientUnits()==="objectBoundingBox",S=Q?x.getBoundingBox(B):null;if(Q&&!S)return null;!this.getAttribute("x1").hasValue()&&!this.getAttribute("y1").hasValue()&&!this.getAttribute("x2").hasValue()&&!this.getAttribute("y2").hasValue()&&(this.getAttribute("x1",!0).setValue(0),this.getAttribute("y1",!0).setValue(0),this.getAttribute("x2",!0).setValue(1),this.getAttribute("y2",!0).setValue(0));const D=Q?S.x+S.width*this.getAttribute("x1").getNumber():this.getAttribute("x1").getPixels("x"),H=Q?S.y+S.height*this.getAttribute("y1").getNumber():this.getAttribute("y1").getPixels("y"),P=Q?S.x+S.width*this.getAttribute("x2").getNumber():this.getAttribute("x2").getPixels("x"),R=Q?S.y+S.height*this.getAttribute("y2").getNumber():this.getAttribute("y2").getPixels("y");return D===P&&H===R?null:B.createLinearGradient(D,H,P,R)}constructor(B,x,Q){super(B,x,Q),this.type="linearGradient",this.attributesToInherit.push("x1","y1","x2","y2")}}class RadialGradientElement extends GradientElement{getGradient(B,x){const Q=this.getGradientUnits()==="objectBoundingBox",S=x.getBoundingBox(B);if(Q&&!S)return null;this.getAttribute("cx").hasValue()||this.getAttribute("cx",!0).setValue("50%"),this.getAttribute("cy").hasValue()||this.getAttribute("cy",!0).setValue("50%"),this.getAttribute("r").hasValue()||this.getAttribute("r",!0).setValue("50%");const D=Q?S.x+S.width*this.getAttribute("cx").getNumber():this.getAttribute("cx").getPixels("x"),H=Q?S.y+S.height*this.getAttribute("cy").getNumber():this.getAttribute("cy").getPixels("y");let P=D,R=H;this.getAttribute("fx").hasValue()&&(P=Q?S.x+S.width*this.getAttribute("fx").getNumber():this.getAttribute("fx").getPixels("x")),this.getAttribute("fy").hasValue()&&(R=Q?S.y+S.height*this.getAttribute("fy").getNumber():this.getAttribute("fy").getPixels("y"));const Y=Q?(S.width+S.height)/2*this.getAttribute("r").getNumber():this.getAttribute("r").getPixels(),G=this.getAttribute("fr").getPixels();return B.createRadialGradient(P,R,G,D,H,Y)}constructor(B,x,Q){super(B,x,Q),this.type="radialGradient",this.attributesToInherit.push("cx","cy","r","fx","fy","fr")}}class StopElement extends Element{constructor(B,x,Q){super(B,x,Q),this.type="stop";const S=Math.max(0,Math.min(1,this.getAttribute("offset").getNumber())),D=this.getStyle("stop-opacity");let H=this.getStyle("stop-color",!0);H.getString()===""&&H.setValue("#000"),D.hasValue()&&(H=H.addOpacity(D)),this.offset=S,this.color=H.getColor()}}class AnimateElement extends Element{getProperty(){const B=this.getAttribute("attributeType").getString(),x=this.getAttribute("attributeName").getString();return B==="CSS"?this.parent.getStyle(x,!0):this.parent.getAttribute(x,!0)}calcValue(){const{initialUnits:B}=this,{progress:x,from:Q,to:S}=this.getProgress();let D=Q.getNumber()+(S.getNumber()-Q.getNumber())*x;return B==="%"&&(D*=100),"".concat(D).concat(B)}update(B){const{parent:x}=this,Q=this.getProperty();if(this.initialValue||(this.initialValue=Q.getString(),this.initialUnits=Q.getUnits()),this.duration>this.maxDuration){const D=this.getAttribute("fill").getString("remove");if(this.getAttribute("repeatCount").getString()==="indefinite"||this.getAttribute("repeatDur").getString()==="indefinite")this.duration=0;else if(D==="freeze"&&!this.frozen)this.frozen=!0,x&&Q&&(x.animationFrozen=!0,x.animationFrozenValue=Q.getString());else if(D==="remove"&&!this.removed)return this.removed=!0,x&&Q&&Q.setValue(x.animationFrozen?x.animationFrozenValue:this.initialValue),!0;return!1}this.duration+=B;let S=!1;if(this.begin<this.duration){let D=this.calcValue();const H=this.getAttribute("type");if(H.hasValue()){const P=H.getString();D="".concat(P,"(").concat(D,")")}Q.setValue(D),S=!0}return S}getProgress(){const{document:B,values:x}=this;let Q=(this.duration-this.begin)/(this.maxDuration-this.begin),S,D;if(x.hasValue()){const H=Q*(x.getValue().length-1),P=Math.floor(H),R=Math.ceil(H);let Y;Y=x.getValue()[P],S=new Property(B,"from",Y?parseFloat(Y):0),Y=x.getValue()[R],D=new Property(B,"to",Y?parseFloat(Y):0),Q=(H-P)/(R-P)}else S=this.from,D=this.to;return{progress:Q,from:S,to:D}}constructor(B,x,Q){super(B,x,Q),this.type="animate",this.duration=0,this.initialUnits="",this.removed=!1,this.frozen=!1,B.screen.animations.push(this),this.begin=this.getAttribute("begin").getMilliseconds(),this.maxDuration=this.begin+this.getAttribute("dur").getMilliseconds(),this.from=this.getAttribute("from"),this.to=this.getAttribute("to"),this.values=new Property(B,"values",null);const S=this.getAttribute("values");S.hasValue()&&this.values.setValue(S.getString().split(";"))}}class AnimateColorElement extends AnimateElement{calcValue(){const{progress:B,from:x,to:Q}=this.getProgress(),S=new RGBColor$1(x.getColor()),D=new RGBColor$1(Q.getColor());if(S.ok&&D.ok){const H=S.r+(D.r-S.r)*B,P=S.g+(D.g-S.g)*B,R=S.b+(D.b-S.b)*B;return"rgb(".concat(Math.floor(H),", ").concat(Math.floor(P),", ").concat(Math.floor(R),")")}return this.getAttribute("from").getColor()}constructor(...B){super(...B),this.type="animateColor"}}class AnimateTransformElement extends AnimateElement{calcValue(){const{progress:B,from:x,to:Q}=this.getProgress(),S=toNumbers(x.getString()),D=toNumbers(Q.getString());return S.map((P,R)=>{const Y=D[R];return P+(Y-P)*B}).join(" ")}constructor(...B){super(...B),this.type="animateTransform"}}class FontFaceElement extends Element{constructor(B,x,Q){super(B,x,Q),this.type="font-face",this.ascent=this.getAttribute("ascent").getNumber(),this.descent=this.getAttribute("descent").getNumber(),this.unitsPerEm=this.getAttribute("units-per-em").getNumber()}}class GlyphElement extends PathElement{constructor(B,x,Q){super(B,x,Q),this.type="glyph",this.horizAdvX=this.getAttribute("horiz-adv-x").getNumber(),this.unicode=this.getAttribute("unicode").getString(),this.arabicForm=this.getAttribute("arabic-form").getString()}}class MissingGlyphElement extends GlyphElement{constructor(...B){super(...B),this.type="missing-glyph",this.horizAdvX=0}}class FontElement extends Element{render(){}constructor(B,x,Q){super(B,x,Q),this.type="font",this.isArabic=!1,this.glyphs={},this.arabicGlyphs={},this.isRTL=!1,this.horizAdvX=this.getAttribute("horiz-adv-x").getNumber();const{definitions:S}=B,{children:D}=this;for(const H of D)if(H instanceof FontFaceElement){this.fontFace=H;const P=H.getStyle("font-family");P.hasValue()&&(S[P.getString()]=this)}else if(H instanceof MissingGlyphElement)this.missingGlyph=H;else if(H instanceof GlyphElement)if(H.arabicForm){this.isRTL=!0,this.isArabic=!0;const P=this.arabicGlyphs[H.unicode];typeof P>"u"?this.arabicGlyphs[H.unicode]={[H.arabicForm]:H}:P[H.arabicForm]=H}else this.glyphs[H.unicode]=H}}class TRefElement extends TextElement{getText(){const B=this.getHrefAttribute().getDefinition();if(B){const x=B.children[0];if(x)return x.getText()}return""}constructor(...B){super(...B),this.type="tref"}}class AElement extends TextElement{getText(){return this.text}renderChildren(B){if(this.hasText){super.renderChildren(B);const{document:x,x:Q,y:S}=this,{mouse:D}=x.screen,H=new Property(x,"fontSize",Font.parse(x.ctx.font).fontSize);D.isWorking()&&D.checkBoundingBox(this,new BoundingBox(Q,S-H.getPixels("y"),Q+this.measureText(B),S))}else if(this.children.length>0){const x=new GElement(this.document);x.children=this.children,x.parent=this,x.render(B)}}onClick(){const{window:B}=this.document;B&&B.open(this.getHrefAttribute().getString())}onMouseMove(){const B=this.document.ctx;B.canvas.style.cursor="pointer"}constructor(B,x,Q){super(B,x,Q),this.type="a";const{childNodes:S}=x,D=S[0],H=S.length>0&&Array.from(S).every(P=>P.nodeType===3);this.hasText=H,this.text=H?this.getTextFromNode(D):""}}class TextPathElement extends TextElement{getText(){return this.text}path(B){const{dataArray:x}=this;B&&B.beginPath(),x.forEach(Q=>{let{type:S,points:D}=Q;switch(S){case PathParser.LINE_TO:B&&B.lineTo(D[0],D[1]);break;case PathParser.MOVE_TO:B&&B.moveTo(D[0],D[1]);break;case PathParser.CURVE_TO:B&&B.bezierCurveTo(D[0],D[1],D[2],D[3],D[4],D[5]);break;case PathParser.QUAD_TO:B&&B.quadraticCurveTo(D[0],D[1],D[2],D[3]);break;case PathParser.ARC:{const[H,P,R,Y,G,X,ee,Ae]=D,le=R>Y?R:Y,ae=R>Y?1:R/Y,ge=R>Y?Y/R:1;B&&(B.translate(H,P),B.rotate(ee),B.scale(ae,ge),B.arc(0,0,le,G,G+X,!!(1-Ae)),B.scale(1/ae,1/ge),B.rotate(-ee),B.translate(-H,-P));break}case PathParser.CLOSE_PATH:B&&B.closePath();break}})}renderChildren(B){this.setTextData(B),B.save();const x=this.parent.getStyle("text-decoration").getString(),Q=this.getFontSize(),{glyphInfo:S}=this,D=B.fillStyle;x==="underline"&&B.beginPath(),S.forEach((H,P)=>{const{p0:R,p1:Y,rotation:G,text:X}=H;B.save(),B.translate(R.x,R.y),B.rotate(G),B.fillStyle&&B.fillText(X,0,0),B.strokeStyle&&B.strokeText(X,0,0),B.restore(),x==="underline"&&(P===0&&B.moveTo(R.x,R.y+Q/8),B.lineTo(Y.x,Y.y+Q/5))}),x==="underline"&&(B.lineWidth=Q/20,B.strokeStyle=D,B.stroke(),B.closePath()),B.restore()}getLetterSpacingAt(){let B=arguments.length>0&&arguments[0]!==void 0?arguments[0]:0;return this.letterSpacingCache[B]||0}findSegmentToFitChar(B,x,Q,S,D,H,P,R,Y){let G=H,X=this.measureText(B,R);R===" "&&x==="justify"&&Q<S&&(X+=(S-Q)/D),Y>-1&&(G+=this.getLetterSpacingAt(Y));const ee=this.textHeight/20,Ae=this.getEquidistantPointOnPath(G,ee,0),le=this.getEquidistantPointOnPath(G+X,ee,0),ae={p0:Ae,p1:le},ge=Ae&&le?Math.atan2(le.y-Ae.y,le.x-Ae.x):0;if(P){const fe=Math.cos(Math.PI/2+ge)*P,ye=Math.cos(-ge)*P;ae.p0={...Ae,x:Ae.x+fe,y:Ae.y+ye},ae.p1={...le,x:le.x+fe,y:le.y+ye}}return G+=X,{offset:G,segment:ae,rotation:ge}}measureText(B,x){const{measuresCache:Q}=this,S=x||this.getText();if(Q.has(S))return Q.get(S);const D=this.measureTargetText(B,S);return Q.set(S,D),D}setTextData(B){if(this.glyphInfo)return;const x=this.getText(),Q=x.split(""),S=x.split(" ").length-1,D=this.parent.getAttribute("dx").split().map(me=>me.getPixels("x")),H=this.parent.getAttribute("dy").getPixels("y"),P=this.parent.getStyle("text-anchor").getString("start"),R=this.getStyle("letter-spacing"),Y=this.parent.getStyle("letter-spacing");let G=0;!R.hasValue()||R.getValue()==="inherit"?G=Y.getPixels():R.hasValue()&&R.getValue()!=="initial"&&R.getValue()!=="unset"&&(G=R.getPixels());const X=[],ee=x.length;this.letterSpacingCache=X;for(let me=0;me<ee;me++)X.push(typeof D[me]<"u"?D[me]:G);const Ae=X.reduce((me,we,ve)=>ve===0?0:me+we||0,0),le=this.measureText(B),ae=Math.max(le+Ae,0);this.textWidth=le,this.textHeight=this.getFontSize(),this.glyphInfo=[];const ge=this.getPathLength(),fe=this.getStyle("startOffset").getNumber(0)*ge;let ye=0;(P==="middle"||P==="center")&&(ye=-ae/2),(P==="end"||P==="right")&&(ye=-ae),ye+=fe,Q.forEach((me,we)=>{const{offset:ve,segment:Ce,rotation:Se}=this.findSegmentToFitChar(B,P,ae,ge,S,ye,H,me,we);ye=ve,!(!Ce.p0||!Ce.p1)&&this.glyphInfo.push({text:Q[we],p0:Ce.p0,p1:Ce.p1,rotation:Se})})}parsePathData(B){if(this.pathLength=-1,!B)return[];const x=[],{pathParser:Q}=B;for(Q.reset();!Q.isEnd();){const{current:S}=Q,D=S?S.x:0,H=S?S.y:0,P=Q.next();let R=P.type,Y=[];switch(P.type){case PathParser.MOVE_TO:this.pathM(Q,Y);break;case PathParser.LINE_TO:R=this.pathL(Q,Y);break;case PathParser.HORIZ_LINE_TO:R=this.pathH(Q,Y);break;case PathParser.VERT_LINE_TO:R=this.pathV(Q,Y);break;case PathParser.CURVE_TO:this.pathC(Q,Y);break;case PathParser.SMOOTH_CURVE_TO:R=this.pathS(Q,Y);break;case PathParser.QUAD_TO:this.pathQ(Q,Y);break;case PathParser.SMOOTH_QUAD_TO:R=this.pathT(Q,Y);break;case PathParser.ARC:Y=this.pathA(Q);break;case PathParser.CLOSE_PATH:PathElement.pathZ(Q);break}P.type!==PathParser.CLOSE_PATH?x.push({type:R,points:Y,start:{x:D,y:H},pathLength:this.calcLength(D,H,R,Y)}):x.push({type:PathParser.CLOSE_PATH,points:[],pathLength:0})}return x}pathM(B,x){const{x:Q,y:S}=PathElement.pathM(B).point;x.push(Q,S)}pathL(B,x){const{x:Q,y:S}=PathElement.pathL(B).point;return x.push(Q,S),PathParser.LINE_TO}pathH(B,x){const{x:Q,y:S}=PathElement.pathH(B).point;return x.push(Q,S),PathParser.LINE_TO}pathV(B,x){const{x:Q,y:S}=PathElement.pathV(B).point;return x.push(Q,S),PathParser.LINE_TO}pathC(B,x){const{point:Q,controlPoint:S,currentPoint:D}=PathElement.pathC(B);x.push(Q.x,Q.y,S.x,S.y,D.x,D.y)}pathS(B,x){const{point:Q,controlPoint:S,currentPoint:D}=PathElement.pathS(B);return x.push(Q.x,Q.y,S.x,S.y,D.x,D.y),PathParser.CURVE_TO}pathQ(B,x){const{controlPoint:Q,currentPoint:S}=PathElement.pathQ(B);x.push(Q.x,Q.y,S.x,S.y)}pathT(B,x){const{controlPoint:Q,currentPoint:S}=PathElement.pathT(B);return x.push(Q.x,Q.y,S.x,S.y),PathParser.QUAD_TO}pathA(B){let{rX:x,rY:Q,sweepFlag:S,xAxisRotation:D,centp:H,a1:P,ad:R}=PathElement.pathA(B);return S===0&&R>0&&(R-=2*Math.PI),S===1&&R<0&&(R+=2*Math.PI),[H.x,H.y,x,Q,P,R,D,S]}calcLength(B,x,Q,S){let D=0,H=null,P=null,R=0;switch(Q){case PathParser.LINE_TO:return this.getLineLength(B,x,S[0],S[1]);case PathParser.CURVE_TO:for(D=0,H=this.getPointOnCubicBezier(0,B,x,S[0],S[1],S[2],S[3],S[4],S[5]),R=.01;R<=1;R+=.01)P=this.getPointOnCubicBezier(R,B,x,S[0],S[1],S[2],S[3],S[4],S[5]),D+=this.getLineLength(H.x,H.y,P.x,P.y),H=P;return D;case PathParser.QUAD_TO:for(D=0,H=this.getPointOnQuadraticBezier(0,B,x,S[0],S[1],S[2],S[3]),R=.01;R<=1;R+=.01)P=this.getPointOnQuadraticBezier(R,B,x,S[0],S[1],S[2],S[3]),D+=this.getLineLength(H.x,H.y,P.x,P.y),H=P;return D;case PathParser.ARC:{D=0;const Y=S[4],G=S[5],X=S[4]+G;let ee=Math.PI/180;if(Math.abs(Y-X)<ee&&(ee=Math.abs(Y-X)),H=this.getPointOnEllipticalArc(S[0],S[1],S[2],S[3],Y,0),G<0)for(R=Y-ee;R>X;R-=ee)P=this.getPointOnEllipticalArc(S[0],S[1],S[2],S[3],R,0),D+=this.getLineLength(H.x,H.y,P.x,P.y),H=P;else for(R=Y+ee;R<X;R+=ee)P=this.getPointOnEllipticalArc(S[0],S[1],S[2],S[3],R,0),D+=this.getLineLength(H.x,H.y,P.x,P.y),H=P;return P=this.getPointOnEllipticalArc(S[0],S[1],S[2],S[3],X,0),D+=this.getLineLength(H.x,H.y,P.x,P.y),D}}return 0}getPointOnLine(B,x,Q,S,D){let H=arguments.length>5&&arguments[5]!==void 0?arguments[5]:x,P=arguments.length>6&&arguments[6]!==void 0?arguments[6]:Q;const R=(D-Q)/(S-x+PSEUDO_ZERO);let Y=Math.sqrt(B*B/(1+R*R));S<x&&(Y*=-1);let G=R*Y,X=null;if(S===x)X={x:H,y:P+G};else if((P-Q)/(H-x+PSEUDO_ZERO)===R)X={x:H+Y,y:P+G};else{let ee=0,Ae=0;const le=this.getLineLength(x,Q,S,D);if(le<PSEUDO_ZERO)return null;let ae=(H-x)*(S-x)+(P-Q)*(D-Q);ae/=le*le,ee=x+ae*(S-x),Ae=Q+ae*(D-Q);const ge=this.getLineLength(H,P,ee,Ae),fe=Math.sqrt(B*B-ge*ge);Y=Math.sqrt(fe*fe/(1+R*R)),S<x&&(Y*=-1),G=R*Y,X={x:ee+Y,y:Ae+G}}return X}getPointOnPath(B){const x=this.getPathLength();let Q=0,S=null;if(B<-5e-5||B-5e-5>x)return null;const{dataArray:D}=this;for(const H of D){if(H&&(H.pathLength<5e-5||Q+H.pathLength+5e-5<B)){Q+=H.pathLength;continue}const P=B-Q;let R=0;switch(H.type){case PathParser.LINE_TO:S=this.getPointOnLine(P,H.start.x,H.start.y,H.points[0],H.points[1],H.start.x,H.start.y);break;case PathParser.ARC:{const Y=H.points[4],G=H.points[5],X=H.points[4]+G;if(R=Y+P/H.pathLength*G,G<0&&R<X||G>=0&&R>X)break;S=this.getPointOnEllipticalArc(H.points[0],H.points[1],H.points[2],H.points[3],R,H.points[6]);break}case PathParser.CURVE_TO:R=P/H.pathLength,R>1&&(R=1),S=this.getPointOnCubicBezier(R,H.start.x,H.start.y,H.points[0],H.points[1],H.points[2],H.points[3],H.points[4],H.points[5]);break;case PathParser.QUAD_TO:R=P/H.pathLength,R>1&&(R=1),S=this.getPointOnQuadraticBezier(R,H.start.x,H.start.y,H.points[0],H.points[1],H.points[2],H.points[3]);break}if(S)return S;break}return null}getLineLength(B,x,Q,S){return Math.sqrt((Q-B)*(Q-B)+(S-x)*(S-x))}getPathLength(){return this.pathLength===-1&&(this.pathLength=this.dataArray.reduce((B,x)=>x.pathLength>0?B+x.pathLength:B,0)),this.pathLength}getPointOnCubicBezier(B,x,Q,S,D,H,P,R,Y){const G=R*CB1(B)+H*CB2(B)+S*CB3(B)+x*CB4(B),X=Y*CB1(B)+P*CB2(B)+D*CB3(B)+Q*CB4(B);return{x:G,y:X}}getPointOnQuadraticBezier(B,x,Q,S,D,H,P){const R=H*QB1(B)+S*QB2(B)+x*QB3(B),Y=P*QB1(B)+D*QB2(B)+Q*QB3(B);return{x:R,y:Y}}getPointOnEllipticalArc(B,x,Q,S,D,H){const P=Math.cos(H),R=Math.sin(H),Y={x:Q*Math.cos(D),y:S*Math.sin(D)};return{x:B+(Y.x*P-Y.y*R),y:x+(Y.x*R+Y.y*P)}}buildEquidistantCache(B,x){const Q=this.getPathLength(),S=x||.25,D=B||Q/100;if(!this.equidistantCache||this.equidistantCache.step!==D||this.equidistantCache.precision!==S){this.equidistantCache={step:D,precision:S,points:[]};let H=0;for(let P=0;P<=Q;P+=S){const R=this.getPointOnPath(P),Y=this.getPointOnPath(P+S);!R||!Y||(H+=this.getLineLength(R.x,R.y,Y.x,Y.y),H>=D&&(this.equidistantCache.points.push({x:R.x,y:R.y,distance:P}),H-=D))}}}getEquidistantPointOnPath(B,x,Q){if(this.buildEquidistantCache(x,Q),B<0||B-this.getPathLength()>5e-5)return null;const S=Math.round(B/this.getPathLength()*(this.equidistantCache.points.length-1));return this.equidistantCache.points[S]||null}constructor(B,x,Q){super(B,x,Q),this.type="textPath",this.textWidth=0,this.textHeight=0,this.pathLength=-1,this.glyphInfo=null,this.letterSpacingCache=[],this.measuresCache=new Map([["",0]]);const S=this.getHrefAttribute().getDefinition();this.text=this.getTextFromNode(),this.dataArray=this.parsePathData(S)}}const dataUriRegex=/^\s*data:(([^/,;]+\/[^/,;]+)(?:;([^,;=]+=[^,;=]+))?)?(?:;(base64))?,(.*)$/i;class ImageElement extends RenderedElement{async loadImage(B){try{const x=await this.document.createImage(B);this.image=x}catch(x){console.error('Error while loading image "'.concat(B,'":'),x)}this.loaded=!0}async loadSvg(B){const x=dataUriRegex.exec(B);if(x){const Q=x[5];Q&&(x[4]==="base64"?this.image=atob(Q):this.image=decodeURIComponent(Q))}else try{const S=await(await this.document.fetch(B)).text();this.image=S}catch(Q){console.error('Error while loading image "'.concat(B,'":'),Q)}this.loaded=!0}renderChildren(B){const{document:x,image:Q,loaded:S}=this,D=this.getAttribute("x").getPixels("x"),H=this.getAttribute("y").getPixels("y"),P=this.getStyle("width").getPixels("x"),R=this.getStyle("height").getPixels("y");if(!(!S||!Q||!P||!R)){if(B.save(),B.translate(D,H),typeof Q=="string"){const Y=x.canvg.forkString(B,Q,{ignoreMouse:!0,ignoreAnimation:!0,ignoreDimensions:!0,ignoreClear:!0,offsetX:0,offsetY:0,scaleWidth:P,scaleHeight:R}),{documentElement:G}=Y.document;G&&(G.parent=this),Y.render()}else x.setViewBox({ctx:B,aspectRatio:this.getAttribute("preserveAspectRatio").getString(),width:P,desiredWidth:Q.width,height:R,desiredHeight:Q.height}),this.loaded&&(!("complete"in Q)||Q.complete)&&B.drawImage(Q,0,0);B.restore()}}getBoundingBox(){const B=this.getAttribute("x").getPixels("x"),x=this.getAttribute("y").getPixels("y"),Q=this.getStyle("width").getPixels("x"),S=this.getStyle("height").getPixels("y");return new BoundingBox(B,x,B+Q,x+S)}constructor(B,x,Q){super(B,x,Q),this.type="image",this.loaded=!1;const S=this.getHrefAttribute().getString();if(!S)return;const D=S.endsWith(".svg")||/^\s*data:image\/svg\+xml/i.test(S);B.images.push(this),D?this.loadSvg(S):this.loadImage(S)}}class SymbolElement extends RenderedElement{render(B){}constructor(...B){super(...B),this.type="symbol"}}class SVGFontLoader{async load(B,x){try{const{document:Q}=this,D=(await Q.canvg.parser.load(x)).getElementsByTagName("font");Array.from(D).forEach(H=>{const P=Q.createElement(H);Q.definitions[B]=P})}catch(Q){console.error('Error while loading font "'.concat(x,'":'),Q)}this.loaded=!0}constructor(B){this.document=B,this.loaded=!1,B.fonts.push(this)}}class StyleElement extends Element{constructor(B,x,Q){super(B,x,Q),this.type="style",compressSpaces(Array.from(x.childNodes).map(H=>H.textContent).join("").replace(/(\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm,"").replace(/@import.*;/g,"")).split("}").forEach(H=>{const P=H.trim();if(!P)return;const R=P.split("{"),Y=R[0].split(","),G=R[1].split(";");Y.forEach(X=>{const ee=X.trim();if(!ee)return;const Ae=B.styles[ee]||{};if(G.forEach(le=>{const ae=le.indexOf(":"),ge=le.substr(0,ae).trim(),fe=le.substr(ae+1,le.length-ae).trim();ge&&fe&&(Ae[ge]=new Property(B,ge,fe))}),B.styles[ee]=Ae,B.stylesSpecificity[ee]=getSelectorSpecificity(ee),ee==="@font-face"){const le=Ae["font-family"].getString().replace(/"|'/g,"");Ae.src.getString().split(",").forEach(ge=>{if(ge.indexOf('format("svg")')>0){const fe=parseExternalUrl(ge);fe&&new SVGFontLoader(B).load(le,fe)}})}})})}}StyleElement.parseExternalUrl=parseExternalUrl;class UseElement extends RenderedElement{setContext(B){super.setContext(B);const x=this.getAttribute("x"),Q=this.getAttribute("y");x.hasValue()&&B.translate(x.getPixels("x"),0),Q.hasValue()&&B.translate(0,Q.getPixels("y"))}path(B){const{element:x}=this;x&&x.path(B)}renderChildren(B){const{document:x,element:Q}=this;if(Q){let S=Q;if(Q.type==="symbol"&&(S=new SVGElement(x),S.attributes.viewBox=new Property(x,"viewBox",Q.getAttribute("viewBox").getString()),S.attributes.preserveAspectRatio=new Property(x,"preserveAspectRatio",Q.getAttribute("preserveAspectRatio").getString()),S.attributes.overflow=new Property(x,"overflow",Q.getAttribute("overflow").getString()),S.children=Q.children,Q.styles.opacity=new Property(x,"opacity",this.calculateOpacity())),S.type==="svg"){const H=this.getStyle("width",!1,!0),P=this.getStyle("height",!1,!0);H.hasValue()&&(S.attributes.width=new Property(x,"width",H.getString())),P.hasValue()&&(S.attributes.height=new Property(x,"height",P.getString()))}const D=S.parent;S.parent=this,S.render(B),S.parent=D}}getBoundingBox(B){const{element:x}=this;return x?x.getBoundingBox(B):null}elementTransform(){const{document:B,element:x}=this;return x?Transform.fromElement(B,x):null}get element(){return this.cachedElement||(this.cachedElement=this.getHrefAttribute().getDefinition()),this.cachedElement}constructor(...B){super(...B),this.type="use"}}function imGet(g,B,x,Q,S,D){return g[x*Q*4+B*4+D]}function imSet(g,B,x,Q,S,D,H){g[x*Q*4+B*4+D]=H}function m(g,B,x){return g[B]*x}function c(g,B,x,Q){return B+Math.cos(g)*x+Math.sin(g)*Q}class FeColorMatrixElement extends Element{apply(B,x,Q,S,D){const{includeOpacity:H,matrix:P}=this,R=B.getImageData(0,0,S,D);for(let Y=0;Y<D;Y++)for(let G=0;G<S;G++){const X=imGet(R.data,G,Y,S,D,0),ee=imGet(R.data,G,Y,S,D,1),Ae=imGet(R.data,G,Y,S,D,2),le=imGet(R.data,G,Y,S,D,3);let ae=m(P,0,X)+m(P,1,ee)+m(P,2,Ae)+m(P,3,le)+m(P,4,1),ge=m(P,5,X)+m(P,6,ee)+m(P,7,Ae)+m(P,8,le)+m(P,9,1),fe=m(P,10,X)+m(P,11,ee)+m(P,12,Ae)+m(P,13,le)+m(P,14,1),ye=m(P,15,X)+m(P,16,ee)+m(P,17,Ae)+m(P,18,le)+m(P,19,1);H&&(ae=0,ge=0,fe=0,ye*=le/255),imSet(R.data,G,Y,S,D,0,ae),imSet(R.data,G,Y,S,D,1,ge),imSet(R.data,G,Y,S,D,2,fe),imSet(R.data,G,Y,S,D,3,ye)}B.clearRect(0,0,S,D),B.putImageData(R,0,0)}constructor(B,x,Q){super(B,x,Q),this.type="feColorMatrix";let S=toNumbers(this.getAttribute("values").getString());switch(this.getAttribute("type").getString("matrix")){case"saturate":{const D=S[0];S=[.213+.787*D,.715-.715*D,.072-.072*D,0,0,.213-.213*D,.715+.285*D,.072-.072*D,0,0,.213-.213*D,.715-.715*D,.072+.928*D,0,0,0,0,0,1,0,0,0,0,0,1];break}case"hueRotate":{const D=S[0]*Math.PI/180;S=[c(D,.213,.787,-.213),c(D,.715,-.715,-.715),c(D,.072,-.072,.928),0,0,c(D,.213,-.213,.143),c(D,.715,.285,.14),c(D,.072,-.072,-.283),0,0,c(D,.213,-.213,-.787),c(D,.715,-.715,.715),c(D,.072,.928,.072),0,0,0,0,0,1,0,0,0,0,0,1];break}case"luminanceToAlpha":S=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.2125,.7154,.0721,0,0,0,0,0,0,1];break}this.matrix=S,this.includeOpacity=this.getAttribute("includeOpacity").hasValue()}}class MaskElement extends Element{apply(B,x){const{document:Q}=this;let S=this.getAttribute("x").getPixels("x"),D=this.getAttribute("y").getPixels("y"),H=this.getStyle("width").getPixels("x"),P=this.getStyle("height").getPixels("y");if(!H&&!P){const Ae=new BoundingBox;this.children.forEach(le=>{Ae.addBoundingBox(le.getBoundingBox(B))}),S=Math.floor(Ae.x1),D=Math.floor(Ae.y1),H=Math.floor(Ae.width),P=Math.floor(Ae.height)}const R=this.removeStyles(x,MaskElement.ignoreStyles),Y=Q.createCanvas(S+H,D+P),G=Y.getContext("2d");Q.screen.setDefaults(G),this.renderChildren(G),new FeColorMatrixElement(Q,{nodeType:1,childNodes:[],attributes:[{nodeName:"type",value:"luminanceToAlpha"},{nodeName:"includeOpacity",value:"true"}]}).apply(G,0,0,S+H,D+P);const X=Q.createCanvas(S+H,D+P),ee=X.getContext("2d");Q.screen.setDefaults(ee),x.render(ee),ee.globalCompositeOperation="destination-in",ee.fillStyle=G.createPattern(Y,"no-repeat"),ee.fillRect(0,0,S+H,D+P),B.fillStyle=ee.createPattern(X,"no-repeat"),B.fillRect(0,0,S+H,D+P),this.restoreStyles(x,R)}render(B){}constructor(...B){super(...B),this.type="mask"}}MaskElement.ignoreStyles=["mask","transform","clip-path"];const noop=()=>{};class ClipPathElement extends Element{apply(B){const{document:x}=this,Q=Reflect.getPrototypeOf(B),{beginPath:S,closePath:D}=B;Q&&(Q.beginPath=noop,Q.closePath=noop),Reflect.apply(S,B,[]),this.children.forEach(H=>{if(!("path"in H))return;let P="elementTransform"in H?H.elementTransform():null;P||(P=Transform.fromElement(x,H)),P&&P.apply(B),H.path(B),Q&&(Q.closePath=D),P&&P.unapply(B)}),Reflect.apply(D,B,[]),B.clip(),Q&&(Q.beginPath=S,Q.closePath=D)}render(B){}constructor(...B){super(...B),this.type="clipPath"}}class FilterElement extends Element{apply(B,x){const{document:Q,children:S}=this,D="getBoundingBox"in x?x.getBoundingBox(B):null;if(!D)return;let H=0,P=0;S.forEach(fe=>{const ye=fe.extraFilterDistance||0;H=Math.max(H,ye),P=Math.max(P,ye)});const R=Math.floor(D.width),Y=Math.floor(D.height),G=R+2*H,X=Y+2*P;if(G<1||X<1)return;const ee=Math.floor(D.x),Ae=Math.floor(D.y),le=this.removeStyles(x,FilterElement.ignoreStyles),ae=Q.createCanvas(G,X),ge=ae.getContext("2d");Q.screen.setDefaults(ge),ge.translate(-ee+H,-Ae+P),x.render(ge),S.forEach(fe=>{typeof fe.apply=="function"&&fe.apply(ge,0,0,G,X)}),B.drawImage(ae,0,0,G,X,ee-H,Ae-P,G,X),this.restoreStyles(x,le)}render(B){}constructor(...B){super(...B),this.type="filter"}}FilterElement.ignoreStyles=["filter","transform","clip-path"];class FeDropShadowElement extends Element{apply(B,x,Q,S,D){}constructor(B,x,Q){super(B,x,Q),this.type="feDropShadow",this.addStylesFromStyleDefinition()}}class FeMorphologyElement extends Element{apply(B,x,Q,S,D){}constructor(...B){super(...B),this.type="feMorphology"}}class FeCompositeElement extends Element{apply(B,x,Q,S,D){}constructor(...B){super(...B),this.type="feComposite"}}class FeGaussianBlurElement extends Element{apply(B,x,Q,S,D){const{document:H,blurRadius:P}=this,R=H.window?H.window.document.body:null,Y=B.canvas;Y.id=H.getUniqueId(),R&&(Y.style.display="none",R.appendChild(Y)),processCanvasRGBA(Y,x,Q,S,D,P),R&&R.removeChild(Y)}constructor(B,x,Q){super(B,x,Q),this.type="feGaussianBlur",this.blurRadius=Math.floor(this.getAttribute("stdDeviation").getNumber()),this.extraFilterDistance=this.blurRadius}}class TitleElement extends Element{constructor(...B){super(...B),this.type="title"}}class DescElement extends Element{constructor(...B){super(...B),this.type="desc"}}const elements={svg:SVGElement,rect:RectElement,circle:CircleElement,ellipse:EllipseElement,line:LineElement,polyline:PolylineElement,polygon:PolygonElement,path:PathElement,pattern:PatternElement,marker:MarkerElement,defs:DefsElement,linearGradient:LinearGradientElement,radialGradient:RadialGradientElement,stop:StopElement,animate:AnimateElement,animateColor:AnimateColorElement,animateTransform:AnimateTransformElement,font:FontElement,"font-face":FontFaceElement,"missing-glyph":MissingGlyphElement,glyph:GlyphElement,text:TextElement,tspan:TSpanElement,tref:TRefElement,a:AElement,textPath:TextPathElement,image:ImageElement,g:GElement,symbol:SymbolElement,style:StyleElement,use:UseElement,mask:MaskElement,clipPath:ClipPathElement,filter:FilterElement,feDropShadow:FeDropShadowElement,feMorphology:FeMorphologyElement,feComposite:FeCompositeElement,feColorMatrix:FeColorMatrixElement,feGaussianBlur:FeGaussianBlurElement,title:TitleElement,desc:DescElement};function createCanvas(g,B){const x=document.createElement("canvas");return x.width=g,x.height=B,x}async function createImage(g){let B=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!1;const x=document.createElement("img");return B&&(x.crossOrigin="Anonymous"),new Promise((Q,S)=>{x.onload=()=>{Q(x)},x.onerror=(D,H,P,R,Y)=>{S(Y)},x.src=g})}const DEFAULT_EM_SIZE=12;class Document{bindCreateImage(B,x){return typeof x=="boolean"?(Q,S)=>B(Q,typeof S=="boolean"?S:x):B}get window(){return this.screen.window}get fetch(){return this.screen.fetch}get ctx(){return this.screen.ctx}get emSize(){const{emSizeStack:B}=this;return B[B.length-1]||DEFAULT_EM_SIZE}set emSize(B){const{emSizeStack:x}=this;x.push(B)}popEmSize(){const{emSizeStack:B}=this;B.pop()}getUniqueId(){return"canvg".concat(++this.uniqueId)}isImagesLoaded(){return this.images.every(B=>B.loaded)}isFontsLoaded(){return this.fonts.every(B=>B.loaded)}createDocumentElement(B){const x=this.createElement(B.documentElement);return x.root=!0,x.addStylesFromStyleDefinition(),this.documentElement=x,x}createElement(B){const x=B.nodeName.replace(/^[^:]+:/,""),Q=Document.elementTypes[x];return Q?new Q(this,B):new UnknownElement(this,B)}createTextNode(B){return new TextNode(this,B)}setViewBox(B){this.screen.setViewBox({document:this,...B})}constructor(B,{rootEmSize:x=DEFAULT_EM_SIZE,emSize:Q=DEFAULT_EM_SIZE,createCanvas:S=Document.createCanvas,createImage:D=Document.createImage,anonymousCrossOrigin:H}={}){this.canvg=B,this.definitions={},this.styles={},this.stylesSpecificity={},this.images=[],this.fonts=[],this.emSizeStack=[],this.uniqueId=0,this.screen=B.screen,this.rootEmSize=x,this.emSize=Q,this.createCanvas=S,this.createImage=this.bindCreateImage(D,H),this.screen.wait(()=>this.isImagesLoaded()),this.screen.wait(()=>this.isFontsLoaded())}}Document.createCanvas=createCanvas;Document.createImage=createImage;Document.elementTypes=elements;class Canvg{static async from(B,x){let Q=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const D=await new Parser(Q).parse(x);return new Canvg(B,D,Q)}static fromString(B,x){let Q=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const D=new Parser(Q).parseFromString(x);return new Canvg(B,D,Q)}fork(B,x){let Q=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};return Canvg.from(B,x,{...this.options,...Q})}forkString(B,x){let Q=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};return Canvg.fromString(B,x,{...this.options,...Q})}ready(){return this.screen.ready()}isReady(){return this.screen.isReady()}async render(){let B=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};this.start({enableRedraw:!0,ignoreAnimation:!0,ignoreMouse:!0,...B}),await this.ready(),this.stop()}start(){let B=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};const{documentElement:x,screen:Q,options:S}=this;Q.start(x,{enableRedraw:!0,...S,...B})}stop(){this.screen.stop()}resize(B){let x=arguments.length>1&&arguments[1]!==void 0?arguments[1]:B,Q=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!1;this.documentElement.resize(B,x,Q)}constructor(B,x,Q={}){this.parser=new Parser(Q),this.screen=new Screen(B,Q),this.options=Q;const S=new Document(this,Q),D=S.createDocumentElement(x);this.document=S,this.documentElement=D}}var strxml$1={};strxml$1.attr=attr;strxml$1.tagClose=tagClose;strxml$1.tag=tag$1;strxml$1.encode=encode$1;function attr(g){return g&&g.length?" "+g.map(function(B){return B[0]+'="'+B[1]+'"'}).join(" "):""}function tagClose(g,B){return"<"+g+attr(B)+"/>"}function tag$1(g,B,x){return"<"+g+attr(x)+">"+B+"</"+g+">"}function encode$1(g){return(g===null?"":g.toString()).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")}var strxml=strxml$1,tag=strxml.tag,encode=strxml.encode,tokml=function(B,x){return x=x||{documentName:void 0,documentDescription:void 0,name:"name",description:"description",simplestyle:!1,timestamp:"timestamp"},'<?xml version="1.0" encoding="UTF-8"?>'+tag("kml",tag("Document",documentName(x)+documentDescription(x)+root(B,x)),[["xmlns","http://www.opengis.net/kml/2.2"]])};function feature(g,B){return function(x){if(!x.properties||!geometry.valid(x.geometry))return"";var Q=geometry.any(x.geometry);if(!Q)return"";var S="",D="";if(g.simplestyle){var H=hashStyle(x.properties);H&&(geometry.isPoint(x.geometry)&&hasMarkerStyle(x.properties)?(B.indexOf(H)===-1&&(S=markerStyle(x.properties,H),B.push(H)),D=tag("styleUrl","#"+H)):(geometry.isPolygon(x.geometry)||geometry.isLine(x.geometry))&&hasPolygonAndLineStyle(x.properties)&&(B.indexOf(H)===-1&&(S=polygonAndLineStyle(x.properties,H),B.push(H)),D=tag("styleUrl","#"+H)))}return S+tag("Placemark",name(x.properties,g)+description(x.properties,g)+extendeddata(x.properties)+timestamp(x.properties,g)+Q+D)}}function root(g,B){if(!g.type)return"";var x=[];switch(g.type){case"FeatureCollection":return g.features?g.features.map(feature(B,x)).join(""):"";case"Feature":return feature(B,x)(g);default:return feature(B,x)({type:"Feature",geometry:g,properties:{}})}}function documentName(g){return g.documentName!==void 0?tag("name",g.documentName):""}function documentDescription(g){return g.documentDescription!==void 0?tag("description",g.documentDescription):""}function name(g,B){return g[B.name]?tag("name",encode(g[B.name])):""}function description(g,B){return g[B.description]?tag("description",encode(g[B.description])):""}function timestamp(g,B){return g[B.timestamp]?tag("TimeStamp",tag("when",encode(g[B.timestamp]))):""}var geometry={Point:function(g){return tag("Point",tag("coordinates",g.coordinates.join(",")))},LineString:function(g){return tag("LineString",tag("coordinates",linearring(g.coordinates)))},Polygon:function(g){if(!g.coordinates.length)return"";var B=g.coordinates[0],x=g.coordinates.slice(1),Q=tag("outerBoundaryIs",tag("LinearRing",tag("coordinates",linearring(B)))),S=x.map(function(D){return tag("innerBoundaryIs",tag("LinearRing",tag("coordinates",linearring(D))))}).join("");return tag("Polygon",Q+S)},MultiPoint:function(g){return g.coordinates.length?tag("MultiGeometry",g.coordinates.map(function(B){return geometry.Point({coordinates:B})}).join("")):""},MultiPolygon:function(g){return g.coordinates.length?tag("MultiGeometry",g.coordinates.map(function(B){return geometry.Polygon({coordinates:B})}).join("")):""},MultiLineString:function(g){return g.coordinates.length?tag("MultiGeometry",g.coordinates.map(function(B){return geometry.LineString({coordinates:B})}).join("")):""},GeometryCollection:function(g){return tag("MultiGeometry",g.geometries.map(geometry.any).join(""))},valid:function(g){return g&&g.type&&(g.coordinates||g.type==="GeometryCollection"&&g.geometries&&g.geometries.every(geometry.valid))},any:function(g){return geometry[g.type]?geometry[g.type](g):""},isPoint:function(g){return g.type==="Point"||g.type==="MultiPoint"},isPolygon:function(g){return g.type==="Polygon"||g.type==="MultiPolygon"},isLine:function(g){return g.type==="LineString"||g.type==="MultiLineString"}};function linearring(g){return g.map(function(B){return B.join(",")}).join(" ")}function extendeddata(g){return tag("ExtendedData",pairs(g).map(data).join(""))}function data(g){return tag("Data",tag("value",encode(g[1])),[["name",encode(g[0])]])}function hasMarkerStyle(g){return!!(g["marker-size"]||g["marker-symbol"]||g["marker-color"])}function markerStyle(g,B){return tag("Style",tag("IconStyle",tag("Icon",tag("href",iconUrl(g))))+iconSize(),[["id",B]])}function iconUrl(g){var B=g["marker-size"]||"medium",x=g["marker-symbol"]?"-"+g["marker-symbol"]:"",Q=(g["marker-color"]||"7e7e7e").replace("#","");return"https://api.tiles.mapbox.com/v3/marker/pin-"+B.charAt(0)+x+"+"+Q+".png"}function iconSize(g){return tag("hotSpot","",[["xunits","fraction"],["yunits","fraction"],["x",.5],["y",.5]])}function hasPolygonAndLineStyle(g){for(var B in g)if({stroke:!0,"stroke-opacity":!0,"stroke-width":!0,fill:!0,"fill-opacity":!0}[B])return!0}function polygonAndLineStyle(g,B){var x=tag("LineStyle",[tag("color",hexToKmlColor(g.stroke,g["stroke-opacity"])||"ff555555")+tag("width",g["stroke-width"]===void 0?2:g["stroke-width"])]),Q="";return(g.fill||g["fill-opacity"])&&(Q=tag("PolyStyle",[tag("color",hexToKmlColor(g.fill,g["fill-opacity"])||"88555555")])),tag("Style",x+Q,[["id",B]])}function hashStyle(g){var B="";return g["marker-symbol"]&&(B=B+"ms"+g["marker-symbol"]),g["marker-color"]&&(B=B+"mc"+g["marker-color"].replace("#","")),g["marker-size"]&&(B=B+"ms"+g["marker-size"]),g.stroke&&(B=B+"s"+g.stroke.replace("#","")),g["stroke-width"]&&(B=B+"sw"+g["stroke-width"].toString().replace(".","")),g["stroke-opacity"]&&(B=B+"mo"+g["stroke-opacity"].toString().replace(".","")),g.fill&&(B=B+"f"+g.fill.replace("#","")),g["fill-opacity"]&&(B=B+"fo"+g["fill-opacity"].toString().replace(".","")),B}function hexToKmlColor(g,B){if(typeof g!="string")return"";if(g=g.replace("#","").toLowerCase(),g.length===3)g=g[0]+g[0]+g[1]+g[1]+g[2]+g[2];else if(g.length!==6)return"";var x=g[0]+g[1],Q=g[2]+g[3],S=g[4]+g[5],D="ff";return typeof B=="number"&&B>=0&&B<=1&&(D=(B*255).toString(16),D.indexOf(".")>-1&&(D=D.substr(0,D.indexOf("."))),D.length<2&&(D="0"+D)),D+S+Q+x}function pairs(g){var B=[];for(var x in g)B.push([x,g[x]]);return B}const tokml$1=getDefaultExportFromCjs(tokml);var jxon={exports:{}};const __viteBrowserExternal={},__viteBrowserExternal$1=Object.freeze(Object.defineProperty({__proto__:null,default:__viteBrowserExternal},Symbol.toStringTag,{value:"Module"})),require$$0=getAugmentedNamespace(__viteBrowserExternal$1);(function(g,B){(function(x,Q){typeof window=="object"&&window.DOMImplementation&&window.XMLSerializer&&window.DOMParser?g.exports=Q(window):g.exports=Q(require$$0,!0)})(commonjsGlobal,function(x,Q){var S={valueKey:"_",attrKey:"$",attrPrefix:"$",lowerCaseTags:!1,trueIsEmpty:!1,autoDate:!1,ignorePrefixedNodes:!1,parseValues:!1},D=[],H=/^\s*$/,P=/^(?:true|false)$/i,R;return new function(){this.config=function(le){for(var ae in le)S[ae]=le[ae];S.parserErrorHandler&&(R=new x.DOMParser({errorHandler:S.parserErrorHandler,locator:{}}))};function Y(le){return S.parseValues?H.test(le)?null:P.test(le)?le.toLowerCase()==="true":isFinite(le)?parseFloat(le):S.autoDate&&isFinite(Date.parse(le))?new Date(le):le:le}function G(){}G.prototype.toString=function(){return"null"},G.prototype.valueOf=function(){return null};function X(le){return le===null?new G:le instanceof Object?le:new le.constructor(le)}function ee(le,ae,ge,fe){var ye=4,me=3,we=1,ve=D.length,Ce=le.hasChildNodes(),Se=le.nodeType===le.ELEMENT_NODE&&le.hasAttributes(),We=!!(ae&2),Ke=0,Ue="",ke=We?{}:S.trueIsEmpty?!0:"",Me,ze;if(Ce)for(var Je,ft=0;ft<le.childNodes.length;ft++)Je=le.childNodes.item(ft),Je.nodeType===ye?Ue+=Je.nodeValue:Je.nodeType===me?Ue+=Je.nodeValue.trim():Je.nodeType===we&&!(S.ignorePrefixedNodes&&Je.prefix)&&D.push(Je);var at=D.length,ht=Y(Ue);!We&&(Ce||Se)&&(ke=ae===0?X(ht):{});for(var vt=ve;vt<at;vt++)Me=D[vt].nodeName,S.lowerCaseTags&&(Me=Me.toLowerCase()),ze=ee(D[vt],ae,ge,fe),ke.hasOwnProperty(Me)?(ke[Me].constructor!==Array&&(ke[Me]=[ke[Me]]),ke[Me].push(ze)):(ke[Me]=ze,Ke++);if(Se){for(var tt=le.attributes.length,d=fe?"":S.attrPrefix,w=fe?{}:ke,C,b,I=0;I<tt;Ke++,I++)C=le.attributes.item(I),b=C.name,S.lowerCaseTags&&(b=b.toLowerCase()),w[d+b]=Y(C.value.trim());fe&&(ge&&Object.freeze(w),ke[S.attrKey]=w,Ke-=tt-1)}return ae===3||(ae===2||ae===1&&Ke>0)&&Ue?ke[S.valueKey]=ht:!We&&Ke===0&&Ue&&(ke=ht),ge&&(We||Ke>0)&&Object.freeze(ke),D.length=ve,ke}function Ae(le,ae,ge){var fe,ye,me;if(ge.constructor===String||ge.constructor===Number||ge.constructor===Boolean){if(ae.appendChild(le.createTextNode(ge.toString())),ge===ge.valueOf())return}else ge.constructor===Date&&ae.appendChild(le.createTextNode(ge.toISOString()));for(var we in ge)if(fe=ge[we],fe!==void 0&&(fe===null&&(fe={}),!(isFinite(we)||fe instanceof Function)))if(we===S.valueKey)fe!==null&&fe!==!0&&ae.appendChild(le.createTextNode(fe.constructor===Date?fe.toISOString():String(fe)));else if(we===S.attrKey)for(var ve in fe)ae.setAttribute(ve,fe[ve]);else if(we===S.attrPrefix+"xmlns")Q&&ae.setAttribute(we.slice(1),fe);else if(we.charAt(0)===S.attrPrefix)ae.setAttribute(we.slice(1),fe);else if(fe.constructor===Array)for(var Ce in fe)fe.hasOwnProperty(Ce)&&(me=fe[Ce]&&fe[Ce][S.attrPrefix+"xmlns"]||ae.namespaceURI,me?ye=le.createElementNS(me,we):ye=le.createElement(we),Ae(le,ye,fe[Ce]||{}),ae.appendChild(ye));else me=(fe||{})[S.attrPrefix+"xmlns"]||ae.namespaceURI,me?ye=le.createElementNS(me,we):ye=le.createElement(we),fe instanceof Object?Ae(le,ye,fe):fe!==null&&(fe!==!0||!S.trueIsEmpty)&&ye.appendChild(le.createTextNode(fe.toString())),ae.appendChild(ye)}this.xmlToJs=this.build=function(le,ae,ge,fe){var ye=arguments.length>1&&typeof ae=="number"?ae&3:1;return ee(le,ye,ge||!1,arguments.length>3?fe:ye===3)},this.jsToXml=this.unbuild=function(le,ae,ge,fe){var ye=x.document&&x.document.implementation||new x.DOMImplementation,me=ye.createDocument(ae||null,ge||"",fe||null);return Ae(me,me.documentElement||me,le),me},this.stringToXml=function(le){return R||(R=new x.DOMParser),R.parseFromString(le,"application/xml")},this.xmlToString=function(le){return typeof le.xml<"u"?le.xml:new x.XMLSerializer().serializeToString(le)},this.stringToJs=function(le){var ae=this.stringToXml(le);return this.xmlToJs(ae)},this.jsToString=this.stringify=function(le,ae,ge,fe){return this.xmlToString(this.jsToXml(le,ae,ge,fe))},this.each=function(le,ae,ge){le instanceof Array?le.forEach(ae,ge):[le].forEach(ae,ge)}}})})(jxon);var jxonExports=jxon.exports;const JXON=jxonExports;JXON.config({attrPrefix:"@"});function togpx(g,B){if(B=function(R,Y){for(const G in R)Y.hasOwnProperty(G)&&(R[G]=Y[G]);return R}({creator:"togpx",metadata:void 0,featureTitle:x,featureDescription:Q,featureLink:void 0,featureCoordTimes:S},B||{}),typeof B.featureCoordTimes=="string"){const R=B.featureCoordTimes;B.featureCoordTimes=function(Y){return Y.properties[R]}}function x(R){if(!R)return"";if(typeof R.tags=="object"){const Y=x(R.tags);if(Y!=="")return Y}return R.name?R.name:R.ref?R.ref:R.id?R.id:""}function Q(R){if(!R)return"";if(typeof R.tags=="object")return Q(R.tags);let Y="";for(const G in R)typeof R[G]!="object"&&(Y+=G+"="+R[G]+`
+`);return Y.substring(0,Y.length-1)}function S(R){return R.properties&&(R.properties.times||R.properties.coordTimes)||null}function D(R,Y){B.featureLink&&(R.link={"@href":B.featureLink(Y.properties)})}const H={gpx:{"@xmlns":"http://www.topografix.com/GPX/1/1","@xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance","@xsi:schemaLocation":"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd","@version":"1.1",metadata:null,wpt:[],trk:[]}};B.creator&&(H.gpx["@creator"]=B.creator),B.metadata?H.gpx.metadata=B.metadata:delete B.metadata;let P;return g.type==="FeatureCollection"?P=g.features:g.type==="Feature"?P=[g]:P=[{type:"Feature",properties:{},geometry:g}],P.forEach(function R(Y){let G,X,ee;switch(Y.geometry.type){case"Point":case"MultiPoint":G=Y.geometry.coordinates,Y.geometry.type=="Point"&&(G=[G]),G.forEach(function(Ae){let le={"@lat":Ae[1],"@lon":Ae[0],name:B.featureTitle(Y.properties),desc:B.featureDescription(Y.properties)};Ae[2]!==void 0&&(le.ele=Ae[2]),D(le,Y),H.gpx.wpt.push(le)});break;case"LineString":case"MultiLineString":G=Y.geometry.coordinates,X=B.featureCoordTimes(Y),Y.geometry.type=="LineString"&&(G=[G]),ee={name:B.featureTitle(Y.properties),desc:B.featureDescription(Y.properties)},D(ee,Y),ee.trkseg=[],G.forEach(function(Ae){const le={trkpt:[]};Ae.forEach(function(ae,ge){const fe={"@lat":ae[1],"@lon":ae[0]};ae[2]!==void 0&&(fe.ele=ae[2]),X&&X[ge]&&(fe.time=X[ge]),le.trkpt.push(fe)}),ee.trkseg.push(le)}),H.gpx.trk.push(ee);break;case"Polygon":case"MultiPolygon":ee={name:B.featureTitle(Y.properties),desc:B.featureDescription(Y.properties)},D(ee,Y),ee.trkseg=[],G=Y.geometry.coordinates,X=B.featureCoordTimes(Y),Y.geometry.type=="Polygon"&&(G=[G]),G.forEach(function(Ae){Ae.forEach(function(le){const ae={trkpt:[]};let ge=0;le.forEach(function(fe){const ye={"@lat":fe[1],"@lon":fe[0]};fe[2]!==void 0&&(ye.ele=fe[2]),X&&X[ge]&&(ye.time=X[ge]),ge++,ae.trkpt.push(ye)}),ee.trkseg.push(ae)})}),H.gpx.trk.push(ee);break;case"GeometryCollection":Y.geometry.geometries.forEach(function(Ae){const le={properties:Y.properties,geometry:Ae};R(le)});break;default:console.log("warning: unsupported geometry type: "+Y.geometry.type)}}),JXON.stringify(H)}var togpx_1=togpx;const togpx$1=getDefaultExportFromCjs(togpx_1);function autorepair(g,B){const x={},Q={};return function(){let D,H;if(B=="xml"){D=g.match(/<!--[\s\S]*?-->/g)||[];for(const P of D)H=`<!--${Base64.encode(Math.random().toString())}-->`,g=g.replace(P,H),Q[H]=P}else{D=g.match(/\/\*[\s\S]*?\*\//g)||[];for(const P of D)H=`/*${Base64.encode(Math.random().toString())}*/`,g=g.replace(P,H),Q[H]=P;D=g.match(/\/\/[^\n]*/g)||[];for(const P of D)H=`/*${Base64.encode(Math.random().toString())}*/`,g=g.replace(P,H),Q[H]=P}}(),x.getQuery=()=>{for(const S in Q)g=g.replace(S,Q[S]);return g},x.recurse=()=>{if(B=="xml"){const S=g.match(/(\n?[^\S\n]*<print[\s\S]*?(\/>|<\/print>))/g)||[];for(let D=0;D<S.length;D++){const H=S[D].match(/^\n?(\s*)/)[1],P=$("print",$.parseXML(S[D])).attr("from");let R,Y,G;P?(R=` into="${P}"`,Y=` set="${P}"`,G=` from="${P}"`):(R="",Y="",G=""),g=g.replace(S[D],`
+${H}<!-- added by auto repair -->
+${H}<union${R}>
+${H}  <item${Y}/>
+${H}  <recurse${G} type="down"/>
+${H}</union>
+${H}<!-- end of auto repair --><autorepair>${D}</autorepair>`)}for(let D=0;D<S.length;D++)g=g.replace(`<autorepair>${D}</autorepair>`,S[D])}else{const S=g.match(/(\n?[^\S\n]*(\.[^.;]+)?out[^:;"\]]*;)/g)||[];for(let D=0;D<S.length;D++){const H=S[D].match(/^\n?(\s*)/)[0],P=S[D].match(/\.([^;.]+?)\s+out/);let R;P?R=`(.${P[1]};.${P[1]} >;)->.${P[1]};`:R="(._;>;);",g=g.replace(S[D],`${H}/*added by auto repair*/${H}${R}${H}/*end of auto repair*/<autorepair>${D}</autorepair>`)}for(let D=0;D<S.length;D++)g=g.replace(`<autorepair>${D}</autorepair>`,S[D])}return!0},x.editors=()=>{if(B=="xml"){const S=g.match(/<osm-script([^>]*)>/);if(S){const H=$("osm-script",$.parseXML(`${S[0]}</osm-script>`)).attr("output");if(H&&H!="xml"){const P=S[0].replace(H,"xml");g=g.replace(S[0],`${P}<!-- fixed by auto repair -->`)}}const D=g.match(/(<print[\s\S]*?(\/>|<\/print>))/g)||[];for(const H of D){const P=$("print",$.parseXML(H)),R=P.attr("mode"),Y=P.attr("geometry");let G="",X,ee=!1;if(R!=="meta"&&(P.attr("mode","meta"),ee=!0),Y&&Y!=="skeleton"){P.attr("geometry",null);const Ae=P.attr("from");Ae?G=`<union into="${Ae}"><item set="${Ae}"/><recurse from="${Ae}" type="down"/></union>`:G='<union><item/><recurse type="down"/></union>',ee=!0}ee&&(X=G+new XMLSerializer().serializeToString(P[0]),X+="<!-- fixed by auto repair -->",g=g.replace(H,X))}}else{const S=g.match(/\[\s*out\s*:\s*([^\]\s]+)\s*\]\s*;?/);S&&S[1]!="xml"&&(g=g.replace(/(\[\s*out\s*:\s*)([^\]\s]+)(\s*\]\s*;?)/,"$1xml$3/*fixed by auto repair*/"));const D=g.match(/(\.([^;.]+?)\s+)?(out[^:;"\]]*;)/g)||[];for(const H of D){let[P,,R,Y]=H.match(/(\.([^;.]+?)\s+)?(out[^:;"\]]*;)/),G=P,X;(Y.match(/\s(body|skel|ids|tags|count)/)||!Y.match(/\s(meta)/))&&(X=Y.replace(/\s(body|skel|ids|tags|count|meta)/g,"").replace(/^out/,"out meta"),G=G.replace(Y,X),Y=X),Y.match(/\s(center|bb|geom)/)&&(X=Y.replace(/\s(center|bb|geom)/g,""),G=G.replace(Y,X),Y=X,R?G=`(.${R};.${R} >;)->.${R}; ${G}`:G=`(._;>;); ${G}`),G!=P&&(g=g.replace(P,`${G}/*fixed by auto repair*/`))}}return!0},x}autorepair.detect={};autorepair.detect.editors=(g,B)=>{g=g.replace(/{{.*?}}/g,"");const x={};if(B=="xml")try{const Q=$.parseXML(`<x>${g}</x>`),S=$("osm-script",Q).attr("output");S!==void 0&&S!=="xml"&&(x.output=!0),$("print",Q).each((D,H)=>{$(H).attr("mode")!=="meta"&&(x.meta=!0)}),$("print",Q).each((D,H)=>{$(H).attr("geometry").match(/(center|bounds|full)/)&&(x.geometry=!0)})}catch{}else{g=g.replace(/\/\*[\s\S]*?\*\//g,""),g=g.replace(/\/\/[^\n]*/g,"");const Q=g.match(/\[\s*out\s*:\s*([^\]\s]+)\s*\]/);Q&&Q[1]!="xml"&&(x.output=!0);const S=g.match(/out([^:;]*);/g);$(S).each((D,H)=>{(H.match(/\s(body|skel|ids|tags)/)||!H.match(/meta/))&&(x.meta=!0)}),$(S).each((D,H)=>{H.match(/\s(center|bb|geom)/)&&(x.geometry=!0)})}return $.isEmptyObject(x)};var assign=make_assign(),create$1=make_create(),trim$1=make_trim(),Global$5=typeof window<"u"?window:commonjsGlobal,util$6={assign,create:create$1,trim:trim$1,bind:bind$1,slice:slice$1,each:each$7,map,pluck:pluck$1,isList:isList$1,isFunction:isFunction$1,isObject:isObject$1,Global:Global$5};function make_assign(){return Object.assign?Object.assign:function(B,x,Q,S){for(var D=1;D<arguments.length;D++)each$7(Object(arguments[D]),function(H,P){B[P]=H});return B}}function make_create(){if(Object.create)return function(B,x,Q,S){var D=slice$1(arguments,1);return assign.apply(this,[Object.create(B)].concat(D))};{let g=function(){};return function(x,Q,S,D){var H=slice$1(arguments,1);return g.prototype=x,assign.apply(this,[new g].concat(H))}}}function make_trim(){return String.prototype.trim?function(B){return String.prototype.trim.call(B)}:function(B){return B.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}}function bind$1(g,B){return function(){return B.apply(g,Array.prototype.slice.call(arguments,0))}}function slice$1(g,B){return Array.prototype.slice.call(g,B||0)}function each$7(g,B){pluck$1(g,function(x,Q){return B(x,Q),!1})}function map(g,B){var x=isList$1(g)?[]:{};return pluck$1(g,function(Q,S){return x[S]=B(Q,S),!1}),x}function pluck$1(g,B){if(isList$1(g)){for(var x=0;x<g.length;x++)if(B(g[x],x))return g[x]}else for(var Q in g)if(g.hasOwnProperty(Q)&&B(g[Q],Q))return g[Q]}function isList$1(g){return g!=null&&typeof g!="function"&&typeof g.length=="number"}function isFunction$1(g){return g&&{}.toString.call(g)==="[object Function]"}function isObject$1(g){return g&&{}.toString.call(g)==="[object Object]"}var util$5=util$6,slice=util$5.slice,pluck=util$5.pluck,each$6=util$5.each,bind=util$5.bind,create=util$5.create,isList=util$5.isList,isFunction=util$5.isFunction,isObject=util$5.isObject,storeEngine={createStore},storeAPI={version:"2.0.12",enabled:!1,get:function(g,B){var x=this.storage.read(this._namespacePrefix+g);return this._deserialize(x,B)},set:function(g,B){return B===void 0?this.remove(g):(this.storage.write(this._namespacePrefix+g,this._serialize(B)),B)},remove:function(g){this.storage.remove(this._namespacePrefix+g)},each:function(g){var B=this;this.storage.each(function(x,Q){g.call(B,B._deserialize(x),(Q||"").replace(B._namespaceRegexp,""))})},clearAll:function(){this.storage.clearAll()},hasNamespace:function(g){return this._namespacePrefix=="__storejs_"+g+"_"},createStore:function(){return createStore.apply(this,arguments)},addPlugin:function(g){this._addPlugin(g)},namespace:function(g){return createStore(this.storage,this.plugins,g)}};function _warn(){var g=typeof console>"u"?null:console;if(g){var B=g.warn?g.warn:g.log;B.apply(g,arguments)}}function createStore(g,B,x){x||(x=""),g&&!isList(g)&&(g=[g]),B&&!isList(B)&&(B=[B]);var Q=x?"__storejs_"+x+"_":"",S=x?new RegExp("^"+Q):null,D=/^[a-zA-Z0-9_\-]*$/;if(!D.test(x))throw new Error("store.js namespaces can only have alphanumerics + underscores and dashes");var H={_namespacePrefix:Q,_namespaceRegexp:S,_testStorage:function(R){try{var Y="__storejs__test__";R.write(Y,Y);var G=R.read(Y)===Y;return R.remove(Y),G}catch{return!1}},_assignPluginFnProp:function(R,Y){var G=this[Y];this[Y]=function(){var ee=slice(arguments,0),Ae=this;function le(){if(G)return each$6(arguments,function(ge,fe){ee[fe]=ge}),G.apply(Ae,ee)}var ae=[le].concat(ee);return R.apply(Ae,ae)}},_serialize:function(R){return JSON.stringify(R)},_deserialize:function(R,Y){if(!R)return Y;var G="";try{G=JSON.parse(R)}catch{G=R}return G!==void 0?G:Y},_addStorage:function(R){this.enabled||this._testStorage(R)&&(this.storage=R,this.enabled=!0)},_addPlugin:function(R){var Y=this;if(isList(R)){each$6(R,function(ee){Y._addPlugin(ee)});return}var G=pluck(this.plugins,function(ee){return R===ee});if(!G){if(this.plugins.push(R),!isFunction(R))throw new Error("Plugins must be function values that return objects");var X=R.call(this);if(!isObject(X))throw new Error("Plugins must return an object of function properties");each$6(X,function(ee,Ae){if(!isFunction(ee))throw new Error("Bad plugin property: "+Ae+" from plugin "+R.name+". Plugins should only return functions.");Y._assignPluginFnProp(ee,Ae)})}},addStorage:function(R){_warn("store.addStorage(storage) is deprecated. Use createStore([storages])"),this._addStorage(R)}},P=create(H,storeAPI,{plugins:[]});return P.raw={},each$6(P,function(R,Y){isFunction(R)&&(P.raw[Y]=bind(P,R))}),each$6(g,function(R){P._addStorage(R)}),each$6(B,function(R){P._addPlugin(R)}),P}var util$4=util$6,Global$4=util$4.Global,localStorage_1={name:"localStorage",read:read$5,write:write$5,each:each$5,remove:remove$5,clearAll:clearAll$5};function localStorage$1(){return Global$4.localStorage}function read$5(g){return localStorage$1().getItem(g)}function write$5(g,B){return localStorage$1().setItem(g,B)}function each$5(g){for(var B=localStorage$1().length-1;B>=0;B--){var x=localStorage$1().key(B);g(read$5(x),x)}}function remove$5(g){return localStorage$1().removeItem(g)}function clearAll$5(){return localStorage$1().clear()}var util$3=util$6,Global$3=util$3.Global,oldFFGlobalStorage={name:"oldFF-globalStorage",read:read$4,write:write$4,each:each$4,remove:remove$4,clearAll:clearAll$4},globalStorage=Global$3.globalStorage;function read$4(g){return globalStorage[g]}function write$4(g,B){globalStorage[g]=B}function each$4(g){for(var B=globalStorage.length-1;B>=0;B--){var x=globalStorage.key(B);g(globalStorage[x],x)}}function remove$4(g){return globalStorage.removeItem(g)}function clearAll$4(){each$4(function(g,B){delete globalStorage[g]})}var util$2=util$6,Global$2=util$2.Global,oldIEUserDataStorage={name:"oldIE-userDataStorage",write:write$3,read:read$3,each:each$3,remove:remove$3,clearAll:clearAll$3},storageName="storejs",doc$1=Global$2.document,_withStorageEl=_makeIEStorageElFunction(),disable=(Global$2.navigator?Global$2.navigator.userAgent:"").match(/ (MSIE 8|MSIE 9|MSIE 10)\./);function write$3(g,B){if(!disable){var x=fixKey(g);_withStorageEl(function(Q){Q.setAttribute(x,B),Q.save(storageName)})}}function read$3(g){if(!disable){var B=fixKey(g),x=null;return _withStorageEl(function(Q){x=Q.getAttribute(B)}),x}}function each$3(g){_withStorageEl(function(B){for(var x=B.XMLDocument.documentElement.attributes,Q=x.length-1;Q>=0;Q--){var S=x[Q];g(B.getAttribute(S.name),S.name)}})}function remove$3(g){var B=fixKey(g);_withStorageEl(function(x){x.removeAttribute(B),x.save(storageName)})}function clearAll$3(){_withStorageEl(function(g){var B=g.XMLDocument.documentElement.attributes;g.load(storageName);for(var x=B.length-1;x>=0;x--)g.removeAttribute(B[x].name);g.save(storageName)})}var forbiddenCharsRegex=new RegExp("[!\"#$%&'()*+,/\\\\:;<=>?@[\\]^`{|}~]","g");function fixKey(g){return g.replace(/^\d/,"___$&").replace(forbiddenCharsRegex,"___")}function _makeIEStorageElFunction(){if(!doc$1||!doc$1.documentElement||!doc$1.documentElement.addBehavior)return null;var g="script",B,x,Q;try{x=new ActiveXObject("htmlfile"),x.open(),x.write("<"+g+">document.w=window</"+g+'><iframe src="/favicon.ico"></iframe>'),x.close(),B=x.w.frames[0].document,Q=B.createElement("div")}catch{Q=doc$1.createElement("div"),B=doc$1.body}return function(S){var D=[].slice.call(arguments,0);D.unshift(Q),B.appendChild(Q),Q.addBehavior("#default#userData"),Q.load(storageName),S.apply(this,D),B.removeChild(Q)}}var util$1=util$6,Global$1=util$1.Global,trim=util$1.trim,cookieStorage={name:"cookieStorage",read:read$2,write:write$2,each:each$2,remove:remove$2,clearAll:clearAll$2},doc=Global$1.document;function read$2(g){if(!g||!_has(g))return null;var B="(?:^|.*;\\s*)"+escape(g).replace(/[\-\.\+\*]/g,"\\$&")+"\\s*\\=\\s*((?:[^;](?!;))*[^;]?).*";return unescape(doc.cookie.replace(new RegExp(B),"$1"))}function each$2(g){for(var B=doc.cookie.split(/; ?/g),x=B.length-1;x>=0;x--)if(trim(B[x])){var Q=B[x].split("="),S=unescape(Q[0]),D=unescape(Q[1]);g(D,S)}}function write$2(g,B){g&&(doc.cookie=escape(g)+"="+escape(B)+"; expires=Tue, 19 Jan 2038 03:14:07 GMT; path=/")}function remove$2(g){!g||!_has(g)||(doc.cookie=escape(g)+"=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/")}function clearAll$2(){each$2(function(g,B){remove$2(B)})}function _has(g){return new RegExp("(?:^|;\\s*)"+escape(g).replace(/[\-\.\+\*]/g,"\\$&")+"\\s*\\=").test(doc.cookie)}var util=util$6,Global=util.Global,sessionStorage_1={name:"sessionStorage",read:read$1,write:write$1,each:each$1,remove:remove$1,clearAll:clearAll$1};function sessionStorage(){return Global.sessionStorage}function read$1(g){return sessionStorage().getItem(g)}function write$1(g,B){return sessionStorage().setItem(g,B)}function each$1(g){for(var B=sessionStorage().length-1;B>=0;B--){var x=sessionStorage().key(B);g(read$1(x),x)}}function remove$1(g){return sessionStorage().removeItem(g)}function clearAll$1(){return sessionStorage().clear()}var memoryStorage_1={name:"memoryStorage",read,write,each,remove,clearAll},memoryStorage={};function read(g){return memoryStorage[g]}function write(g,B){memoryStorage[g]=B}function each(g){for(var B in memoryStorage)memoryStorage.hasOwnProperty(B)&&g(memoryStorage[B],B)}function remove(g){delete memoryStorage[g]}function clearAll(g){memoryStorage={}}var all=[localStorage_1,oldFFGlobalStorage,oldIEUserDataStorage,cookieStorage,sessionStorage_1,memoryStorage_1],json2$1={},hasRequiredJson2;function requireJson2(){return hasRequiredJson2||(hasRequiredJson2=1,typeof JSON!="object"&&(JSON={}),function(){var rx_one=/^[\],:{}\s]*$/,rx_two=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,rx_three=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,rx_four=/(?:^|:|,)(?:\s*\[)+/g,rx_escapable=/[\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,rx_dangerous=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;function f(g){return g<10?"0"+g:g}function this_value(){return this.valueOf()}typeof Date.prototype.toJSON!="function"&&(Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},Boolean.prototype.toJSON=this_value,Number.prototype.toJSON=this_value,String.prototype.toJSON=this_value);var gap,indent,meta,rep;function quote(g){return rx_escapable.lastIndex=0,rx_escapable.test(g)?'"'+g.replace(rx_escapable,function(B){var x=meta[B];return typeof x=="string"?x:"\\u"+("0000"+B.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+g+'"'}function str(g,B){var x,Q,S,D,H=gap,P,R=B[g];switch(R&&typeof R=="object"&&typeof R.toJSON=="function"&&(R=R.toJSON(g)),typeof rep=="function"&&(R=rep.call(B,g,R)),typeof R){case"string":return quote(R);case"number":return isFinite(R)?String(R):"null";case"boolean":case"null":return String(R);case"object":if(!R)return"null";if(gap+=indent,P=[],Object.prototype.toString.apply(R)==="[object Array]"){for(D=R.length,x=0;x<D;x+=1)P[x]=str(x,R)||"null";return S=P.length===0?"[]":gap?`[
+`+gap+P.join(`,
+`+gap)+`
+`+H+"]":"["+P.join(",")+"]",gap=H,S}if(rep&&typeof rep=="object")for(D=rep.length,x=0;x<D;x+=1)typeof rep[x]=="string"&&(Q=rep[x],S=str(Q,R),S&&P.push(quote(Q)+(gap?": ":":")+S));else for(Q in R)Object.prototype.hasOwnProperty.call(R,Q)&&(S=str(Q,R),S&&P.push(quote(Q)+(gap?": ":":")+S));return S=P.length===0?"{}":gap?`{
+`+gap+P.join(`,
+`+gap)+`
+`+H+"}":"{"+P.join(",")+"}",gap=H,S}}typeof JSON.stringify!="function"&&(meta={"\b":"\\b","	":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},JSON.stringify=function(g,B,x){var Q;if(gap="",indent="",typeof x=="number")for(Q=0;Q<x;Q+=1)indent+=" ";else typeof x=="string"&&(indent=x);if(rep=B,B&&typeof B!="function"&&(typeof B!="object"||typeof B.length!="number"))throw new Error("JSON.stringify");return str("",{"":g})}),typeof JSON.parse!="function"&&(JSON.parse=function(text,reviver){var j;function walk(g,B){var x,Q,S=g[B];if(S&&typeof S=="object")for(x in S)Object.prototype.hasOwnProperty.call(S,x)&&(Q=walk(S,x),Q!==void 0?S[x]=Q:delete S[x]);return reviver.call(g,B,S)}if(text=String(text),rx_dangerous.lastIndex=0,rx_dangerous.test(text)&&(text=text.replace(rx_dangerous,function(g){return"\\u"+("0000"+g.charCodeAt(0).toString(16)).slice(-4)})),rx_one.test(text.replace(rx_two,"@").replace(rx_three,"]").replace(rx_four,"")))return j=eval("("+text+")"),typeof reviver=="function"?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}()),json2$1}var json2=json2Plugin;function json2Plugin(){return requireJson2(),{}}var engine=storeEngine,storages=all,plugins=[json2],store_legacy=engine.createStore(storages,plugins);const store=getDefaultExportFromCjs(store_legacy);function osmAuth(g){var B={};B.authenticated=function(){return!!S("oauth2_access_token")},B.logout=function(){return S("oauth2_access_token",""),S("oauth_token",""),S("oauth_token_secret",""),S("oauth_request_token_secret",""),B},B.authenticate=function(H){if(B.authenticated()){H(null,B);return}B.logout(),_generatePkceChallenge(function(P){x(P,H)})},B.authenticateAsync=function(){return B.authenticated()?Promise.resolve(B):(B.logout(),new Promise((H,P)=>{var R=(Y,G)=>{Y?P(new Error(Y)):H(G)};_generatePkceChallenge(Y=>x(Y,R))}))};function x(H,P){var R=generateState(),Y=g.url+"/oauth2/authorize?"+utilQsString({client_id:g.client_id,redirect_uri:g.redirect_uri,response_type:"code",scope:g.scope,state:R,code_challenge:H.code_challenge,code_challenge_method:H.code_challenge_method});if(g.singlepage){if(!store.enabled){var G=new Error("local storage unavailable, but require in singlepage mode");G.status="pkce-localstorage-unavailable",P(G);return}var X=utilStringQs(window.location.search.slice(1));X.code?B.bootstrapToken(X.code,P):(S("oauth2_state",R),S("oauth2_pkce_code_verifier",H.code_verifier),window.location=Y)}else{var ee=600,Ae=550,le=[["width",ee],["height",Ae],["left",window.screen.width/2-ee/2],["top",window.screen.height/2-Ae/2]].map(function(fe){return fe.join("=")}).join(","),ae=window.open("about:blank","oauth_window",le);B.popupWindow=ae,ae.location=Y,ae||(G=new Error("Popup was blocked"),G.status="popup-blocked",P(G))}window.authComplete=function(fe){var ye=utilStringQs(fe.split("?")[1]);if(ye.state!==R){G=new Error("Invalid state"),G.status="invalid-state",P(G);return}Q(ye.code,H.code_verifier,ge),delete window.authComplete};function ge(fe,ye){if(g.done(),fe){P(fe);return}var me=JSON.parse(ye.response);S("oauth2_access_token",me.access_token),P(null,B)}}function Q(H,P,R){var Y=g.url+"/oauth2/token?"+utilQsString({client_id:g.client_id,redirect_uri:g.redirect_uri,grant_type:"authorization_code",code:H,code_verifier:P});B.rawxhr("POST",Y,null,null,null,R),g.loading()}B.bringPopupWindowToFront=function(){var H=!1;try{B.popupWindow&&!B.popupWindow.closed&&(B.popupWindow.focus(),H=!0)}catch{}return H},B.bootstrapToken=function(H,P){var R=S("oauth2_state");S("oauth2_state","");var Y=utilStringQs(window.location.search.slice(1));if(Y.state!==R){var G=new Error("Invalid state");G.status="invalid-state",P(G);return}var X=S("oauth2_pkce_code_verifier");S("oauth2_pkce_code_verifier",""),Q(H,X,ee);function ee(Ae,le){if(g.done(),Ae){P(Ae);return}var ae=JSON.parse(le.response);S("oauth2_access_token",ae.access_token),P(null,B)}},B.fetch=function(H,P){if(B.authenticated())return R();return g.auto?B.authenticateAsync().then(R):Promise.reject(new Error("not authenticated"));function R(){return P=P||{},P.headers||(P.headers={"Content-Type":"application/x-www-form-urlencoded"}),P.headers.Authorization="Bearer "+S("oauth2_access_token"),fetch(H,P)}},B.xhr=function(H,P){if(B.authenticated())return R();if(g.auto){B.authenticate(R);return}else{P("not authenticated",null);return}function R(){var G=H.prefix!==!1?g.url+H.path:H.path;return B.rawxhr(H.method,G,S("oauth2_access_token"),H.content,H.headers,Y)}function Y(G,X){G?P(G):X.responseXML?P(G,X.responseXML):P(G,X.response)}},B.rawxhr=function(H,P,R,Y,G,X){G=G||{"Content-Type":"application/x-www-form-urlencoded"},R&&(G.Authorization="Bearer "+R);var ee=new XMLHttpRequest;ee.onreadystatechange=function(){ee.readyState===4&&ee.status!==0&&(/^20\d$/.test(ee.status)?X(null,ee):X(ee,null))},ee.onerror=function(le){X(le,null)},ee.open(H,P,!0);for(var Ae in G)ee.setRequestHeader(Ae,G[Ae]);return ee.send(Y),ee},B.preauth=function(H){return H&&H.access_token&&S("oauth2_access_token",H.access_token),B},B.options=function(H){return arguments.length?(g=H,g.url=g.url||"https://www.openstreetmap.org",g.auto=g.auto||!1,g.singlepage=g.singlepage||!1,g.loading=g.loading||function(){},g.done=g.done||function(){},B.preauth(g)):g};var S;if(store.enabled)S=function(H,P){if(arguments.length===1)return store.get(g.url+H);if(arguments.length===2)return store.set(g.url+H,P)};else{var D={};S=function(H,P){if(arguments.length===1)return D[g.url+H];if(arguments.length===2)return D[g.url+H]=P}}return B.options(g),B}function utilQsString(g){return Object.keys(g).filter(function(B){return g[B]!==void 0}).sort().map(function(B){return encodeURIComponent(B)+"="+encodeURIComponent(g[B])}).join("&")}function utilStringQs(g){for(var B=0;B<g.length&&(g[B]==="?"||g[B]==="#");)B++;return g=g.slice(B),g.split("&").reduce(function(x,Q){var S=Q.split("=");return S.length===2&&(x[S[0]]=decodeURIComponent(S[1])),x},{})}function supportsWebCryptoAPI(){return window&&window.crypto&&window.crypto.getRandomValues&&window.crypto.subtle&&window.crypto.subtle.digest}function _generatePkceChallenge(g){var B;if(supportsWebCryptoAPI()){var x=window.crypto.getRandomValues(new Uint8Array(32));B=base64(x.buffer);var Q=Uint8Array.from(Array.from(B).map(function(H){return H.charCodeAt(0)}));window.crypto.subtle.digest("SHA-256",Q).then(function(H){var P=base64(H);g({code_challenge:P,code_verifier:B,code_challenge_method:"S256"})})}else{var S="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";B="";for(var D=0;D<64;D++)B+=S[Math.floor(Math.random()*S.length)];g({code_verifier:B,code_challenge:B,code_challenge_method:"plain"})}}function generateState(){var g;if(supportsWebCryptoAPI()){var B=window.crypto.getRandomValues(new Uint8Array(32));g=base64(B.buffer)}else{var x="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";g="";for(var Q=0;Q<64;Q++)g+=x[Math.floor(Math.random()*x.length)]}return g}function base64(g){return btoa(String.fromCharCode.apply(null,new Uint8Array(g))).replace(/\//g,"_").replace(/\+/g,"-").replace(/[=]/g,"")}const enabled=configs.osmAuth&&configs.osmAuth.client_id;configs.osmAuth.redirect_uri||(configs.osmAuth.redirect_uri=`${window.location.origin}${window.location.pathname}land.html`);configs.osmAuth.scope="read_prefs write_prefs";let auth;enabled&&(auth=osmAuth(configs.osmAuth));const sync={enabled,load(g){auth.authenticated()?loadQueries(g):auth.authenticate(B=>{if(B)return g(B);loadQueries(g)})},save(g,B){auth.authenticated()?saveQuery(g,B):auth.authenticate(x=>{if(x)return B(x);saveQuery(g,B)})},delete(g,B){if(!auth.authenticated())return B(new Error("must be logged in to delete a synced query"));g={name:g,deleteMe:!0},saveQuery(g,B)},logout(){auth.authenticated()&&auth.logout()},authenticated(){return enabled&&auth.authenticated()}};function loadQueries(g){auth.xhr({method:"GET",path:"/api/0.6/user/preferences"},(B,x)=>{if(B)return g(B);let Q=0,S;(S=x.querySelector(`preference[k="${configs.settingNamespace}_query-count"]`))&&(Q=+S.getAttribute("v"));const D=[];for(let H=0;H<Q;H++){const P=x.querySelector(`preference[k="${configs.settingNamespace}_query_${H}_0"]`);if(!P)continue;const R=P.getAttribute("v").split("&"),Y=+R[0].slice(2),G=R[1].slice(2);let X=R[2].slice(2);for(let ee=1;ee<Y;ee++)X+=x.querySelector(`preference[k="${configs.settingNamespace}_query_${H}_${ee}"]`).getAttribute("v");D.push({name:G,query:X})}g(null,D,x)})}function saveQuery(g,B){loadQueries((x,Q,S)=>{if(x)return B(x);const D=S.querySelector("preferences"),H=D.querySelectorAll(`preference[k^="${configs.settingNamespace}_query"]`);for(const Y of H)Y.remove();let P=!0;Q.forEach((Y,G)=>{Y.name==g.name&&(Y.query=g.query,P=G)}),P===!0?Q.push(g):g.deleteMe&&Q.splice(P,1);const R=S.createElement("preference");R.setAttribute("k",`${configs.settingNamespace}_query-count`),R.setAttribute("v",Q.length),D.appendChild(R);for(let Y=0;Y<Q.length;Y++){const G=Q[Y];if(G.name.length>200)return B(new Error("query name too long to be saved on osm.org"));const X=Math.ceil((G.query.length+G.name.length+8)/255);if(X>9)return B(new Error("query too long to be saved on osm.org"));let ee=`p=${X}`;ee+=`&n=${G.name}`,ee+=`&q=${G.query}`,ee=ee.match(/.{1,255}/g);for(let Ae=0;Ae<X;Ae++){const le=S.createElement("preference");le.setAttribute("k",`${configs.settingNamespace}_query_${Y}_${Ae}`),le.setAttribute("v",ee[Ae]),D.appendChild(le)}}auth.xhr({method:"PUT",path:"/api/0.6/user/preferences",headers:{"Content-Type":"text/xml"},content:S.firstChild.outerHTML},Y=>{if(Y)return B(Y);B(null,Q)})})}const cache={};class nominatim{static request(B,x){$.ajax(`https://nominatim.openstreetmap.org/search?X-Requested-With=${configs.appname}`,{data:{format:"json",q:B},success(Q){if(typeof Q=="string")try{Q=JSON.parse(Q)}catch{}cache[B]=Q,x(void 0,Q)},error(){const Q="An error occurred while contacting the osm search server nominatim.openstreetmap.org :(";console.log(Q),x(Q,null)}})}static get(B,x){return cache[B]===void 0?this.request(B,x):x(void 0,cache[B]),this}static getBest(B,x,Q){return Q||(Q=x,x=null),this.get(B,(S,D)=>{if(S){Q(S,null);return}x&&(D=D.filter(x)),D.length===0?Q("No result found",null):Q(S,D[0])}),this}}function map2bbox(g){let B;ide.map.bboxfilter&&ide.map.bboxfilter.isEnabled()?B=ide.map.bboxfilter.getBounds():B=ide.map.getBounds();const x=Math.min(Math.max(B.getSouthWest().lat,-90),90),Q=Math.min(Math.max(B.getNorthEast().lat,-90),90),S=Math.min(Math.max(B.getSouthWest().lng,-180),180),D=Math.min(Math.max(B.getNorthEast().lng,-180),180);if(g=="OverpassQL")return`${x},${S},${Q},${D}`;if(g=="xml")return`s="${x}" w="${S}" n="${Q}" e="${D}"`}function map2coord(g){const B=ide.map.getCenter();if(g=="OverpassQL")return`${B.lat},${B.lng}`;if(g=="xml")return`lat="${B.lat}" lon="${B.lng}"`}function relativeTime(g,B){const x=Date.now();if(g==""&&(g="0 seconds"),g=g.toLowerCase().match(/(-?[0-9]+) ?(seconds?|minutes?|hours?|days?|weeks?|months?|years?)?/),g===null){B("");return}const Q=parseInt(g[1]);let S;switch(g[2]){case"second":case"seconds":S=1;break;case"minute":case"minutes":S=60;break;case"hour":case"hours":S=3600;break;case"day":case"days":default:S=86400;break;case"week":case"weeks":S=604800;break;case"month":case"months":S=2628e3;break;case"year":case"years":S=31536e3;break}const D=x-Q*S*1e3;B(new Date(D).toISOString())}function geocodeId(g,B){const x=ide.getQueryLang();function Q(S){return S.osm_type&&S.osm_id}nominatim.getBest(g,Q,(S,D)=>{if(S)return ide.onNominatimError(g,"Id");x=="OverpassQL"?D=`${D.osm_type}(${D.osm_id})`:x=="xml"&&(D=`type="${D.osm_type}" ref="${D.osm_id}"`),B(D)})}function geocodeArea(g,B){const x=ide.getQueryLang();function Q(S){return S.osm_type&&S.osm_id&&S.osm_type!=="node"}nominatim.getBest(g,Q,(S,D)=>{if(S)return ide.onNominatimError(g,"Area");let H=1*D.osm_id;if(D.osm_type=="way"&&(H+=24e8),D.osm_type=="relation"&&(H+=36e8),x=="OverpassQL")return D.osm_type==="way"&&(H+=`,${D.osm_id}`),B(`area(id:${H})`);if(x=="xml")return D.osm_type==="way"&&(H+=`" ref_1="${D.osm_id}`),B(`type="area" ref="${H}"`)})}function geocodeBbox(g,B){const x=ide.getQueryLang();nominatim.getBest(g,(Q,S)=>{if(Q)return ide.onNominatimError(g,"Bbox");const D=Math.min(Math.max(S.boundingbox[0],-90),90),H=Math.min(Math.max(S.boundingbox[1],-90),90),P=Math.min(Math.max(S.boundingbox[2],-180),180),R=Math.min(Math.max(S.boundingbox[3],-180),180);x=="OverpassQL"?S=`${D},${P},${H},${R}`:x=="xml"&&(S=`s="${D}" w="${P}" n="${H}" e="${R}"`),B(S)})}function geocodeCoords(g,B){const x=ide.getQueryLang();nominatim.getBest(g,(Q,S)=>{if(Q)return ide.onNominatimError(g,"Coords");x=="OverpassQL"?S=`${S.lat},${S.lon}`:x=="xml"&&(S=`lat="${S.lat}" lon="${S.lon}"`),B(S)})}function shortcuts(){const g=ide.getQueryLang();return{bbox:map2bbox(g),center:map2coord(g),__bbox__global_bbox_xml__ezs4K8__:map2bbox("OverpassQL"),date:relativeTime,geocodeId,geocodeArea,geocodeBbox,geocodeCoords,nominatimId:g=="xml"?geocodeId:(B,x)=>geocodeId(B,Q=>x(`${Q};`)),nominatimArea:g=="xml"?geocodeArea:(B,x)=>geocodeArea(B,Q=>x(`${Q};`)),nominatimBbox:geocodeBbox,nominatimCoords:geocodeCoords}}let copyData;$(document).on("copy",g=>{copyData&&g.originalEvent&&g.originalEvent.clipboardData?(Object.keys(copyData).forEach(B=>{g.originalEvent.clipboardData.setData(B,copyData[B])}),g.originalEvent.preventDefault(),copyData=void 0):copyData&&copyData["text/plain"]&&(prompt(i18n.t("export.copy_to_clipboard"),copyData["text/plain"]),copyData=null)});function make_combobox(g,B,x,Q){if(g[0].is_combobox){g.autocomplete("option",{source:B});return}const S=g.wrap("<span>").parent().addClass("ui-combobox");g.autocomplete({source:B,minLength:0}).addClass("ui-widget ui-widget-content ui-corner-left ui-state-default").autocomplete("instance")._renderItem=(D,H)=>$("<li>").append(x&&x.indexOf(H.value)!==-1?`<div title="shift-click to remove from list" style="font-style:italic;">${H.label}</div>`:`<div>${H.label}</div>`).on("click",function(P){if(P.shiftKey&&x.indexOf(H.value)!==-1){Q(H.value),$(this).remove();const R=g.autocomplete("option","source");return R.splice(R.indexOf(H),1),g.autocomplete("option","source",R),!1}}).appendTo(D),$("<a>").attr("tabIndex",-1).attr("title","show all items").appendTo(S).button({icons:{primary:"ui-icon-triangle-1-s"},text:!1}).removeClass("ui-corner-all").addClass("ui-corner-right ui-combobox-toggle").click(()=>{if(g.autocomplete("widget").is(":visible")){g.autocomplete("close");return}g.autocomplete("search",""),g.focus()}),g[0].is_combobox=!0}function showDialog(g,B,x){const Q=`      <div class="modal is-active">        <div class="modal-background"></div>        <div class="modal-card">          <header class="modal-card-head">            <p class="modal-card-title">${g}</p>            <button class="delete" aria-label="close"></button>          </header>          <section class="modal-card-body">            ${B}          </section>          <footer class="modal-card-foot">            <div class="level">              <div class="level-right">                <div class="level-item">                </div>              </div>            </div>          </footer>        </div>      </div>    `,S=$(Q);$(".delete",S).click(()=>$(S).remove());for(const D in x){const H=x[D];$(`<button class="button">${H.name}</button>`).click(()=>{var P;(P=H.callback)==null||P.call(H),$(S).remove()}).appendTo($("footer .level-item",S))}S.appendTo("body")}class IDE{constructor(){this.attribControl=null,this.scaleControl=null,this.queryParser=new parser,this.run_query_on_startup=!1,this.codeEditor=null,this.dataViewer=null,this.map=null,this.waiter=new class{constructor(){this.opened=!0,this.frames=["◴","◷","◶","◵"],this.frameDelay=250,this.onAbort=void 0,this.interval=0,this._initialTitle=document.title}open(x){x?($(".modal .wait-info h4").text(x),$(".wait-info").show()):$(".wait-info").hide(),$("#loading-dialog").addClass("is-active"),document.title=`${this.frames[0]} ${this._initialTitle}`;let Q=0;this.interval=setInterval(()=>{const S=this.isAlert?this.alertFrame:this.frames[++Q%this.frames.length];document.title=`${S} ${this._initialTitle}`},this.frameDelay),this.opened=!0}close(x=""){this.opened&&(clearInterval(this.interval),document.title=`${x}${this._initialTitle}`,$("#loading-dialog").removeClass("is-active"),$(".wait-info ul li").remove(),delete this.onAbort,this.opened=!1)}addInfo(x,Q){$("#aborter").remove(),$(".wait-info ul li:nth-child(n+1)").css("opacity",.5),$(".wait-info ul li span.fas").removeClass("fa-spinner").removeClass("fa-spin").addClass("fa-check"),$(".wait-info ul li:nth-child(n+4)").hide();const S=$(`<li><span class="fas fa-spinner fa-spin" style="display:inline-block; margin-bottom:-2px; margin-right:3px;"></span>${x}</li>`);if(typeof Q=="function"){this.onAbort=Q;const D=$('<span id="aborter">&nbsp;(<a href="#">abort</a>)</span>').on("click",()=>(this.abort(),!1));S.append(D)}$(".wait-info ul").prepend(S)}abort(){typeof this.onAbort=="function"&&(this.addInfo("aborting"),this.onAbort(this.close))}}}init(){this.waiter.addInfo("ide starting up"),$("#overpass-turbo-version").html("overpass-turbo <code>2024-01-15/8db5c43</code>"),$("#overpass-turbo-dependencies").html('<a href="https://www.npmjs.com/package/@fortawesome/fontawesome-free/v/5.15.4">@fortawesome/fontawesome-free</a> 5.15.4 ((CC-BY-4.0 AND OFL-1.1 AND MIT)), <a href="https://www.npmjs.com/package/@openstreetmap/id-tagging-schema/v/3.5.1">@openstreetmap/id-tagging-schema</a> 3.5.1 (ISC), <a href="https://www.npmjs.com/package/bulma/v/0.9.4">bulma</a> 0.9.4 (MIT), <a href="https://www.npmjs.com/package/canvg/v/4.0.1">canvg</a> 4.0.1 (MIT), <a href="https://www.npmjs.com/package/codemirror/v/2.38.00">codemirror</a> 2.38.00 (undefined), <a href="https://www.npmjs.com/package/html2canvas/v/1.4.1">html2canvas</a> 1.4.1 (MIT), <a href="https://www.npmjs.com/package/jquery/v/3.7.1">jquery</a> 3.7.1 (MIT), <a href="https://www.npmjs.com/package/jquery-ui/v/1.13.2">jquery-ui</a> 1.13.2 (MIT), <a href="https://www.npmjs.com/package/jquery-ui-dist/v/1.13.2">jquery-ui-dist</a> 1.13.2 (MIT), <a href="https://www.npmjs.com/package/leaflet/v/1.9.4">leaflet</a> 1.9.4 (BSD-2-Clause), <a href="https://www.npmjs.com/package/leaflet-polylineoffset/v/1.1.1">leaflet-polylineoffset</a> 1.1.1 (MIT), <a href="https://www.npmjs.com/package/leaflet-locationfilter/v/0.1.3">leaflet-locationfilter</a> 0.1.3 (MIT), <a href="https://www.npmjs.com/package/lodash/v/4.17.21">lodash</a> 4.17.21 (MIT), <a href="https://www.npmjs.com/package/osm-auth/v/2.2.0">osm-auth</a> 2.2.0 (ISC), <a href="https://www.npmjs.com/package/osmtogeojson/v/3.0.0-beta.5">osmtogeojson</a> 3.0.0-beta.5 (MIT), <a href="https://www.npmjs.com/package/rgbcolor/v/1.0.1">rgbcolor</a> 1.0.1 (MIT OR SEE LICENSE IN FEEL-FREE.md), <a href="https://www.npmjs.com/package/stackblur/v/1.0.0">stackblur</a> 1.0.0 (BSD-2-Clause), <a href="https://www.npmjs.com/package/tag2link/v/2023.10.21">tag2link</a> 2023.10.21 (ISC), <a href="https://www.npmjs.com/package/togpx/v/0.5.4">togpx</a> 0.5.4 (MIT), <a href="https://www.npmjs.com/package/tokml/v/0.4.0">tokml</a> 0.4.0 (BSD-2-Clause)'),($.support.cors!=!0||typeof function(){let B;try{localStorage.setItem("startup_localstorage_quota_test",123),localStorage.removeItem("startup_localstorage_quota_test"),B=localStorage}catch{}return B}()!="object")&&(this.not_supported=!0,$("#warning-unsupported-browser").addClass("is-active")),this.waiter.addInfo("load settings"),settings.load(),this.waiter.addInfo("translate ui"),i18n.translate().then(()=>this.initAfterI18n()),sync.enabled&&($("#load-dialog .osm").show(),sync.authenticated()&&($("#logout").show(),$("#logout").appendTo($("#logout").parent())))}initAfterI18n(){const B=this;B.waiter.addInfo("parse url parameters");const x=urlParameters();x.has_coords&&(settings.coords_lat=x.coords.lat,settings.coords_lon=x.coords.lng),x.has_zoom&&(settings.coords_zoom=x.zoom),x.run_query&&(B.run_query_on_startup=!0),settings.save(),B.waiter.addInfo("initialize page");const Q=$(window).width()/$(window).height()<.8;if(settings.editor_width!=""&&!Q&&($("#editor").css("width",settings.editor_width),$("#dataviewer").css("left",settings.editor_width)),Q&&$("#editor, #dataviewer").addClass("portrait"),$("#editor").resizable({handles:Q?"s":"e",minWidth:Q?void 0:"200",resize(){if(!Q)$(this).next().css("left",`${$(this).outerWidth()}px`);else{const G=$(this).offset().top+$(this).outerHeight();$(this).next().css("top",`${G}px`)}B.map.invalidateSize(!1)},stop(){Q||(settings.editor_width=$("#editor").css("width"),settings.save())}}),$("#editor").prepend("<span class='ui-resizable-handle ui-resizable-se ui-icon ui-icon-gripsmall-diagonal-se'/>"),$("#editor textarea")[0].value=settings.code.overpass,settings.use_rich_editor){let G=0;CodeMirror.defineMIME("text/x-overpassQL",{name:"clike",keywords:function(X){const ee={},Ae=X.split(" ");for(const le of Ae)ee[le]=!0;return ee}("out json xml custom popup timeout maxsize bbox date diff adiff foreach relation rel way node is_in area around user uid newer changed poly pivot nwr nw nr wr derived out meta body skel tags ids count qt asc center bb geom")}),CodeMirror.defineMIME("text/x-overpassXML","xml"),CodeMirror.defineMode("xml+mustache",X=>CodeMirror.multiplexingMode(CodeMirror.multiplexingMode(CodeMirror.getMode(X,"xml"),{open:"{{",close:"}}",mode:CodeMirror.getMode(X,"text/plain"),delimStyle:"mustache"}),{open:"{{style:",close:"}}",mode:CodeMirror.getMode(X,"text/css"),delimStyle:"mustache"})),CodeMirror.defineMode("ql+mustache",X=>CodeMirror.multiplexingMode(CodeMirror.multiplexingMode(CodeMirror.getMode(X,"text/x-overpassQL"),{open:"{{",close:"}}",mode:CodeMirror.getMode(X,"text/plain"),delimStyle:"mustache"}),{open:"{{style:",close:"}}",mode:CodeMirror.getMode(X,"text/css"),delimStyle:"mustache"})),B.codeEditor=CodeMirror.fromTextArea($("#editor textarea")[0],{lineNumbers:!0,lineWrapping:!0,mode:"text/plain",onChange(X){clearTimeout(G),G=setTimeout(()=>{B.getQueryLang()=="xml"?X.getOption("mode")!="xml+mustache"&&(X.closeTagEnabled=!0,X.setOption("matchBrackets",!1),X.setOption("mode","xml+mustache")):X.getOption("mode")!="ql+mustache"&&(X.closeTagEnabled=!1,X.setOption("matchBrackets",!0),X.setOption("mode","ql+mustache"));const ee=$(".leaflet-control-buttons-bboxfilter");B.getRawQuery().match(/\{\{bbox\}\}/)?ee.hasClass("disabled")&&(ee.removeClass("disabled"),ee.attr("data-t","[title]map_controlls.select_bbox"),i18n.translate_ui(ee[0])):ee.hasClass("disabled")||(ee.addClass("disabled"),ee.attr("data-t","[title]map_controlls.select_bbox_disabled"),i18n.translate_ui(ee[0]))},500),settings.code.overpass=X.getValue(),settings.save()},closeTagEnabled:!0,closeTagIndent:["osm-script","query","union","foreach","difference"],extraKeys:{"'>'"(X){X.closeTag(X,">")},"'/'"(X){X.closeTag(X,"/")}}}),B.codeEditor.getOption("onChange")(B.codeEditor)}else B.codeEditor=$("#editor textarea")[0],B.codeEditor.getValue=function(){return this.value},B.codeEditor.setValue=function(G){this.value=G},B.codeEditor.lineCount=function(){return this.value.split(/\r\n|\r|\n/).length},B.codeEditor.setLineClass=function(){},$("#editor textarea").bind("input change",G=>{settings.code.overpass=G.target.getValue(),settings.save()});x.has_query&&B.codeEditor.setValue(x.query),B.dataViewer=CodeMirror($("#data")[0],{value:"no data loaded yet",lineNumbers:!0,readOnly:!0,mode:"javascript"}),B.map=new L.Map("map",{attributionControl:!0,minZoom:0,maxZoom:configs.maxMapZoom,worldCopyJump:!1});const S=settings.tile_server,D=configs.tileServerAttribution,H=new L.TileLayer(S,{attribution:D,noWrap:!0,maxNativeZoom:19,maxZoom:B.map.options.maxZoom});B.attribControl=new L.Control.Attribution({prefix:!1}),B.attribControl.addAttribution(D);const P=new L.LatLng(settings.coords_lat,settings.coords_lon);B.map.setView(P,settings.coords_zoom).addLayer(H),B.map.tile_layer=H,B.map.inv_opacity_layer=L.tileLayer("data:image/gif;base64,R0lGODlhAQABAIAAAP7//wAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==").setOpacity(1-settings.background_opacity),settings.background_opacity!=1&&B.map.inv_opacity_layer.addTo(B.map),B.scaleControl=new L.Control.Scale({metric:!0,imperial:!1}),B.scaleControl.addTo(B.map),B.map.on("moveend",()=>{settings.coords_lat=B.map.getCenter().lat,settings.coords_lon=B.map.getCenter().lng,settings.coords_zoom=B.map.getZoom(),settings.save()}),$("#dataviewer > div#data")[0].style.zIndex=-1001,$(".tabs li").bind("click",G=>{$(G.target).hasClass("is-active")||($("#dataviewer > div#data")[0].style.zIndex=-1*$("#dataviewer > div#data")[0].style.zIndex,$(".tabs li").toggleClass("is-active"))}),$(document).keydown(G=>B.onKeyPress(G));const R=L.Control.extend({options:{position:"topleft"},onAdd(){const G=L.DomUtil.create("div","leaflet-control-buttons leaflet-bar");let X=L.DomUtil.create("a","leaflet-control-buttons-fitdata leaflet-bar-part leaflet-bar-part-top",G);return $('<span class="fas fa-search"/>').appendTo($(X)),X.href="#",X.className+=" t",X.setAttribute("data-t","[title]map_controlls.zoom_to_data"),i18n.translate_ui(X),L.DomEvent.addListener(X,"click",()=>{try{B.map.fitBounds(overpass.osmLayer.getBaseLayer().getBounds(),{maxZoom:18})}catch{}return!1},B.map),X=L.DomUtil.create("a","leaflet-control-buttons-myloc leaflet-bar-part",G),$('<span class="fas fa-crosshairs"/>').appendTo($(X)),X.href="#",X.className+=" t",X.setAttribute("data-t","[title]map_controlls.localize_user"),window.isSecureContext||(X.className+=" disabled",X.setAttribute("data-t","[title]map_controlls.localize_user_disabled")),i18n.translate_ui(X),L.DomEvent.addListener(X,"click",()=>{try{navigator.geolocation.getCurrentPosition(ee=>{const Ae=new L.LatLng(ee.coords.latitude,ee.coords.longitude);B.map.setView(Ae,settings.coords_zoom)})}catch{}return!1},B.map),X=L.DomUtil.create("a","leaflet-control-buttons-bboxfilter leaflet-bar-part",G),$('<span class="fas fa-image"/>').appendTo($(X)),X.href="#",X.className+=" t",X.setAttribute("data-t","[title]map_controlls.select_bbox"),i18n.translate_ui(X),L.DomEvent.addListener(X,"click",ee=>($(ee.target).parent().hasClass("disabled")||(B.map.bboxfilter.isEnabled()?B.map.bboxfilter.disable():(B.map.bboxfilter.setBounds(B.map.getBounds().pad(-.2)),B.map.bboxfilter.enable()),$(ee.target).toggleClass("fa-times-circle").toggleClass("fa-image")),!1),B.map),X=L.DomUtil.create("a","leaflet-control-buttons-fullscreen leaflet-bar-part",G),$('<span class="fas fa-step-backward"/>').appendTo($(X)),X.href="#",X.className+=" t",X.setAttribute("data-t","[title]map_controlls.toggle_wide_map"),i18n.translate_ui(X),L.DomEvent.addListener(X,"click",ee=>($("#dataviewer").toggleClass("fullscreen"),B.map.invalidateSize(),$(ee.target).toggleClass("fa-step-forward").toggleClass("fa-step-backward"),$("#editor").toggleClass("hidden"),$("#editor").resizable("option","disabled")?$("#editor").resizable("enable"):$("#editor").resizable("disable"),!1),B.map),X=L.DomUtil.create("a","leaflet-control-buttons-clearoverlay leaflet-bar-part leaflet-bar-part-bottom",G),$('<span class="fas fa-ban"/>').appendTo($(X)),X.href="#",X.className+=" t",X.setAttribute("data-t","[title]map_controlls.toggle_data"),i18n.translate_ui(X),L.DomEvent.addListener(X,"click",ee=>(ee.preventDefault(),B.map.hasLayer(overpass.osmLayer)?B.map.removeLayer(overpass.osmLayer):B.map.addLayer(overpass.osmLayer),!1),B.map),G}});B.map.addControl(new R),$(".leaflet-control-buttons > a").bind("dblclick",G=>G.stopPropagation()),$(".leaflet-control-buttons > a").tooltip({items:"a[title]",hide:{effect:"fadeOut",duration:100},position:{my:"left+5 center",at:"right center"}});const Y=L.Control.extend({options:{position:"topright"},onAdd(){const G=L.DomUtil.create("div","leaflet-control-search control has-icons-left");G.style.position="absolute",G.style.right="0";const X=L.DomUtil.create("input","input is-rounded",G);return $('<span class="icon is-left"><span class="fas fa-search"/></span>').click(function(){$(this).prev().autocomplete("search")}).insertAfter(X),X.id="search",X.type="search",X.onclick=function(){this.focus()},G.ondblclick=function(ee){ee.stopPropagation()},$(X).autocomplete({source(ee,Ae){$.ajax(`https://search.osmnames.org/q/${encodeURIComponent(ee.term)}.js?key=${configs.osmnamesApiKey}`,{success(le){if(typeof le=="string")try{le=$.parseJSON(le)}catch{}Ae($.map(le.results.slice(0,10),ae=>({label:ae.display_name,value:ae.display_name,lat:ae.lat,lon:ae.lon,boundingbox:ae.boundingbox})))},error(){console.error("An error occured while contacting the search server osmnames.org :(")}})},minLength:2,autoFocus:!0,select(ee,Ae){return Ae.item.boundingbox&&Ae.item.boundingbox instanceof Array?B.map.fitBounds(L.latLngBounds([[Ae.item.boundingbox[1],Ae.item.boundingbox[0]],[Ae.item.boundingbox[3],Ae.item.boundingbox[2]]]),{maxZoom:18}):B.map.panTo(new L.LatLng(Ae.item.lat,Ae.item.lon)),this.value="",!1},open(){$(this).removeClass("ui-corner-all").addClass("ui-corner-top")},close(){$(this).addClass("ui-corner-all").removeClass("ui-corner-top")}}),$(X).autocomplete("option","delay",20),G}});B.map.addControl(new Y),$('<span class="fas fa-plus" />').addClass("crosshairs").hide().appendTo("#map"),settings.enable_crosshairs&&$(".crosshairs").show(),B.map.bboxfilter=new L.LocationFilter({enable:!1,adjustButton:!1,enableButton:!1}).addTo(B.map),B.map.on("popupopen popupclose",G=>{if(typeof G.popup.layer<"u"){const X=G.popup.layer.placeholder||G.popup.layer,ee=overpass.osmLayer._baseLayer.options.style(X.feature,G.type=="popupopen");typeof X.eachLayer!="function"?typeof X.setStyle=="function"&&X.setStyle(ee):X.eachLayer(Ae=>{typeof Ae.setStyle=="function"&&Ae.setStyle(ee)})}}),overpass.init(),overpass.handlers.onProgress=function(G,X){B.waiter.addInfo(G,X)},overpass.handlers.onDone=function(){const G=B.getRawQuery().match(/@name ([^\n]+)/),X=G?`${G[1]} | `:"";B.waiter.close(X);const ee=B.map.getBounds(),Ae=overpass.osmLayer.getBaseLayer().getBounds();if(Ae.isValid()&&!ee.intersects(Ae)){const le=$(".leaflet-control-buttons-fitdata").tooltip("option","content");$(".leaflet-control-buttons-fitdata").tooltip("option","content",`← ${i18n.t("map_controlls.suggest_zoom_to_data")}`),$(".leaflet-control-buttons-fitdata").tooltip("open"),$(".leaflet-control-buttons-fitdata").tooltip("option","hide",{effect:"fadeOut",duration:1e3}),setTimeout(()=>{$(".leaflet-control-buttons-fitdata").tooltip("option","content",le),$(".leaflet-control-buttons-fitdata").tooltip("close"),$(".leaflet-control-buttons-fitdata").tooltip("option","hide",{effect:"fadeOut",duration:100})},2600)}},overpass.handlers.onEmptyMap=function(G,X){let ee=B.getRawQuery();var Ae=/out[^;]+?count/.test(ee);if(G=="no visible data")if(!Ae&&!settings.no_autorepair){const le=`<p>${i18n.t("warning.incomplete.expl.1")}</p><p>${i18n.t("warning.incomplete.expl.2")}</p><p><input type="checkbox" name="hide_incomplete_data_warning"/>&nbsp;${i18n.t("warning.incomplete.not_again")}</p>`,ae=[{name:i18n.t("dialog.repair_query"),callback(){B.repairQuery("no visible data")}},{name:i18n.t("dialog.show_data"),callback(){var ge,fe;(fe=(ge=$("input[name=hide_incomplete_data_warning]"))==null?void 0:ge[0])!=null&&fe.checked&&(settings.no_autorepair=!0,settings.save()),B.switchTab("Data")}}];showDialog(i18n.t("warning.incomplete.title"),le,ae)}else Ae&&B.switchTab("Data");G=="only areas returned"&&B.switchTab("Data"),G=="no coordinates returned"&&B.switchTab("Data"),X=="unknown"&&B.switchTab("Data"),$(`<div id="map_blank" style="z-index:700; display:block; position:relative; top:50px; width:100%; text-align:center; background-color:#eee; opacity: 0.8;">${i18n.t("map.intentionally_blank")} <small>(${G})</small></div>`).appendTo("#map")},overpass.handlers.onDataReceived=function(G,X,ee,Ae){if(G>1e6){B.waiter.close();const le=document.title;document.title=`❗ ${le}`;const ae=[{name:i18n.t("dialog.abort"),callback(){document.title=le,ee()}},{name:i18n.t("dialog.continue_anyway"),callback(){document.title=le,Ae()}}],ge=`<p>${i18n.t("warning.huge_data.expl.1").replace("{{amount_txt}}",X)}</p><p>${i18n.t("warning.huge_data.expl.2")}</p>`;showDialog(i18n.t("warning.huge_data.title"),ge,ae)}else Ae()},overpass.handlers.onAbort=function(){B.waiter.close()},overpass.handlers.onAjaxError=function(G){B.waiter.close();const X=document.title;document.title=`❗ ${X}`;const ee=[{name:i18n.t("dialog.dismiss"),callback(){document.title=X}}],Ae=`<p style="color:red;">${i18n.t("error.ajax.expl")}</p>${G}`;showDialog(i18n.t("error.ajax.title"),Ae,ee),overpass.resultText&&B.dataViewer.setValue(overpass.resultText)},overpass.handlers.onQueryError=function(G){B.waiter.close();const X=document.title;document.title=`❗ ${X}`;const ee=[{name:i18n.t("dialog.dismiss"),callback(){document.title=X}}],Ae=`<div class="notification is-danger is-light">${i18n.t("error.query.expl")}<br>${G}</div>`;showDialog(i18n.t("error.query.title"),Ae,ee)},overpass.handlers.onStyleError=function(G){const X=[{name:i18n.t("dialog.dismiss")}],ee=`<p style="color:red;">${i18n.t("error.mapcss.expl")}</p>${G}`;showDialog(i18n.t("error.mapcss.title"),ee,X)},overpass.handlers.onQueryErrorLine=function(G){B.highlightError(G)},overpass.handlers.onRawDataPresent=function(){B.dataViewer.setOption("mode",overpass.resultType),B.dataViewer.setValue(overpass.resultText)},overpass.handlers.onGeoJsonReady=function(){if(B.map.addLayer(overpass.osmLayer),typeof B.run_query_on_startup=="function"&&B.run_query_on_startup(),settings.show_data_stats){const G=overpass.stats,X=`<small>${i18n.t("data_stats.loaded")}</small>&nbsp;&ndash;&nbsp;${i18n.t("data_stats.nodes")}:&nbsp;${G.data.nodes}, ${i18n.t("data_stats.ways")}:&nbsp;${G.data.ways}, ${i18n.t("data_stats.relations")}:&nbsp;${G.data.relations}${G.data.areas>0?`, ${i18n.t("data_stats.areas")}:&nbsp;${G.data.areas}`:""}<br/><small>${i18n.t("data_stats.displayed")}</small>&nbsp;&ndash;&nbsp;${i18n.t("data_stats.pois")}:&nbsp;${G.geojson.pois}, ${i18n.t("data_stats.lines")}:&nbsp;${G.geojson.lines}, ${i18n.t("data_stats.polygons")}:&nbsp;${G.geojson.polys}</small>`;$(`<div id="data_stats" class="stats leaflet-control">${X}</div>`).insertAfter("#map .leaflet-control-attribution");const ee=overpass.timestamp&&Date.now()-Date.parse(overpass.timestamp),Ae=overpass.timestampAreas&&Date.now()-Date.parse(overpass.timestampAreas);$("#data_stats").tooltip({items:"div",tooltipClass:"stats",content(){let le="<div>";if(overpass.ajax_request_duration){let ae=overpass.ajax_request_duration;ae.toLocaleString&&(ae=ae.toLocaleString()),le+=`${i18n.t("data_stats.request_duration")}: ${ae}ms<br>`}return overpass.timestamp&&(le+=`${i18n.t("data_stats.lag")}: ${Math.floor(ee/1e3)}s <small>${i18n.t("data_stats.lag.expl")}</small>`),overpass.timestampAreas&&(le+=`<br>${i18n.t("data_stats.lag_areas")}: ${Math.floor(Ae/1e3)}s <small>${i18n.t("data_stats.lag.expl")}</small>`),le+="</div>",le},hide:{effect:"fadeOut",duration:100},position:{my:"right bottom-5",at:"right top"}}),(ee>24*60*60*1e3||Ae>96*60*60*1e3)&&$("#data_stats").css("background-color","yellow")}},overpass.handlers.onPopupReady=function(G){G.openOn(B.map)},B.waiter.close(),B.run_query_on_startup===!0&&(B.update_map(),!x.has_coords&&x.has_query&&x.query.match(/\{\{(bbox|center)\}\}/)===null&&(B.run_query_on_startup=function(){B.run_query_on_startup=null;try{B.map.fitBounds(overpass.osmLayer.getBaseLayer().getBounds(),{maxZoom:18})}catch{}}))}onNominatimError(B,x){this.waiter.close();let Q=this.getRawQuery();Q=Q.split(`
+`),Q.forEach((H,P)=>{H.indexOf(`{{geocode${x}:${B}}}`)!==-1&&this.highlightError(P+1)});const S=[{name:i18n.t("dialog.dismiss")}],D=`<p style="color:red;">${i18n.t("error.nominatim.expl")}</p><p><i>${htmlentities(B)}</i></p>`;showDialog(i18n.t("error.nominatim.title"),D,S)}getRawQuery(){return this.codeEditor.getValue()}async getQuery(){let B=this.getRawQuery();B=B.replace(/(<osm-script[^>]+bbox[^=]*=[^"'']*["'])({{bbox}})(["'])/,"$1{{__bbox__global_bbox_xml__ezs4K8__}}$3"),B=await this.queryParser.parse(B,shortcuts());let x="";this.queryParser.hasStatement("style")&&(x=this.queryParser.getStatement("style")),this.mapcss=x;let Q=null;if(this.queryParser.hasStatement("data")){Q=this.queryParser.getStatement("data"),Q=Q.split(",");const S=Q[0].toLowerCase();Q=Q.slice(1);const D={};for(const H of Q){const P=H.split("=");D[P[0]]=P[1]}Q={mode:S,options:D}}return this.data_source=Q,B}setQuery(B){this.codeEditor.setValue(B)}getQueryLang(){return $.trim(this.getRawQuery().replace(/{{.*?}}/g,"")).match(/^</)?"xml":"OverpassQL"}repairQuery(B){const x=this.getRawQuery(),Q=this.getQueryLang(),S=autorepair(x,Q);B=="no visible data"?S.recurse():B=="xml+metadata"&&S.editors(),this.setQuery(S.getQuery())}highlightError(B){this.codeEditor.setLineClass(B-1,null,"errorline")}resetErrors(){for(let B=0;B<this.codeEditor.lineCount();B++)this.codeEditor.setLineClass(B,null,null)}switchTab(B){$(`.tabs li.${B}`).click()}loadExample(B){if(typeof settings.saves[B]<"u"){let x=settings.saves[B].overpass;/@name/.test(x)||(x=`// @name ${B}
+
+${x}`),this.setQuery(x)}}removeExample(B){const x=[{name:i18n.t("dialog.delete"),callback:()=>{delete settings.saves[B],settings.save(),this.onLoadClick()}},{name:i18n.t("dialog.cancel")}],Q=`<p><span class="fas fa-exclamation-triangle" style="float:left; margin:1px 7px 20px 0;"></span>${i18n.t("dialog.delete_query.expl")}: &quot;<i>${B}</i>&quot;?</p>`;showDialog(i18n.t("dialog.delete_query.title"),Q,x)}removeExampleSync(B,x){const Q=[{name:i18n.t("dialog.delete"),callback(){sync.delete(B.name,D=>{if(D)return console.error(D);$(x).parent().remove()})}},{name:i18n.t("dialog.cancel")}],S=`<p><span class="fas fa-exclamation-triangle" style="float:left; margin:1px 7px 20px 0;"></span>${i18n.t("dialog.delete_query.expl-osm")}: &quot;<i>${B.name}</i>&quot;?</p>`;showDialog(i18n.t("dialog.delete_query.title"),S,Q)}onLoadClick(){const B=this;$("#load-dialog .panel.saved_query .panel-block").remove(),$("#load-dialog .panel.example .panel-block").remove();let x=!1;for(const Q in settings.saves){const S=settings.saves[Q].type;S!="template"&&($('<a class="panel-block">').attr("href","#").text(Q).on("click",()=>(B.loadExample(Q),$("#load-dialog").removeClass("is-active"),!1)).append($('<button class="ml-auto">').attr("title",`${i18n.t("load.delete_query")}: ${Q}`).addClass("delete").on("click",()=>(B.removeExample(Q),!1))).appendTo(`#load-dialog .panel.${S}`),S=="saved_query"&&(x=!0))}if(x||$('<div class="panel-block">').text(i18n.t("load.no_saved_query")).appendTo("#load-dialog .panel.saved_query"),$("#load-dialog").addClass("is-active"),sync.authenticated())B.loadOsmQueries();else{const Q=$("#load-dialog .panel.osm-queries");location.protocol==="https:"||location.hostname==="127.0.0.1"?(Q.show(),Q.find(".panel-block").remove(),$('<div class="panel-block">').append($(`<button class='button is-link is-outlined t' title='load.title'>${i18n.t("load.title")}</button>`).on("click",()=>{B.loadOsmQueries()})).appendTo(Q)):Q.hide()}}loadOsmQueries(){const B=this,x=$("#load-dialog .panel.osm-queries");x.show(),x.find(".panel-block").remove(),$('<div class="panel-block">').text(i18n.t("load.saved_queries-osm-loading")).appendTo(x),sync.load((Q,S)=>{if(Q)return x.find(".panel-block").remove(),$('<div class="panel-block">').text(i18n.t("load.saved_queries-osm-error")).appendTo(x),console.error(Q);x.find(".panel-block").remove(),$("#logout").show(),$("#logout").appendTo($("#logout").parent()),S.forEach(D=>{$('<a class="panel-block">').attr("href","#").text(D.name).on("click",()=>(B.setQuery(lzw_decode(Base64.decode(D.query))),$("#load-dialog").removeClass("is-active"),!1)).append($('<button class="ml-auto">').attr("title",`${i18n.t("load.delete_query")}: ${D.name}`).addClass("delete").on("click",()=>(B.removeExampleSync(D,this),!1))).appendTo(x)})})}onLoadClose(){$("#load-dialog").removeClass("is-active")}onSaveClick(){const B=[];for(const x in settings.saves)settings.saves[x].type!="template"&&B.push(x);make_combobox($("#save-dialog input[name=save]"),B),sync.enabled&&(location.protocol==="https:"||location.hostname==="127.0.0.1")&&$("#save-dialog button.osm").show(),$("#save-dialog").addClass("is-active")}onSaveSumbit(){const B=$("#save-dialog input[name=save]")[0].value;settings.saves[htmlentities(B)]={overpass:this.getRawQuery(),type:"saved_query"},settings.save(),$("#save-dialog").removeClass("is-active")}onSaveOsmSumbit(){const B=$("#save-dialog input[name=save]")[0].value,x=this.compose_share_link(this.getRawQuery(),!0).slice(3);sync.save({name:B,query:x},Q=>{if(Q)return console.error(Q);$("#logout").show(),$("#logout").appendTo($("#logout").parent()),$("#save-dialog").removeClass("is-active")})}onSaveClose(){$("#save-dialog").removeClass("is-active")}onLogoutClick(){sync.logout(),$("#load-dialog .panel.osm-queries .panel-block").remove(),$("#logout").hide(),$("#logout").insertBefore($("#logout").prev())}onRunClick(){this.update_map()}onRerenderClick(){this.rerender_map()}compose_share_link(B,x,Q,S){const D=new URLSearchParams;return x?(D.append("q",Base64.encode(lzw_encode(B))),Q&&D.append("c",H(this.map.getCenter().lat,this.map.getCenter().lng)+Base64.encodeNum(this.map.getZoom()))):(D.append("Q",B),Q&&D.append("C",`${L.Util.formatNum(this.map.getCenter().lat)};${L.Util.formatNum(this.map.getCenter().lng)};${this.map.getZoom()}`)),S&&D.append("R",""),`?${D}`;function H(P,R){const Y=Base64.encodeNum(Math.round((P+90)*1e5)+Math.round((R+180)*1e5)*180*1e5);return"AAAAAAAA".substring(0,9-Y.length)+Y}}updateShareLink(){const B=`${location.protocol}//${location.host}${location.pathname}`,x=this.getRawQuery(),Q=settings.share_compression=="auto"&&x.length>300||settings.share_compression=="on",S=$("div#share-dialog input[name=include_coords]")[0].checked,D=$("div#share-dialog input[name=run_immediately]")[0].checked,H=this.compose_share_link(x,Q,S,D),P=B+H;let R="";P.length>=2e3&&(R=`<p class="warning">${i18n.t("warning.share.long")}</p>`),P.length>=4e3&&(R=`<p class="warning severe">${i18n.t("warning.share.very_long")}</p>`),$("div#share-dialog #share_link_warning").html(R),$("div#share-dialog #share_link_a")[0].href=P,$("div#share-dialog #share_link_textarea")[0].value=P,$.get(configs.short_url_service+encodeURIComponent(P),Y=>{$("div#share-dialog #share_link_a")[0].href=Y,$("div#share-dialog #share_link_textarea")[0].value=Y})}onShareClick(){$("div#share-dialog input[name=include_coords]")[0].checked=settings.share_include_pos,this.updateShareLink(),$("#share-dialog").addClass("is-active")}onShareClose(){$("#share-dialog").removeClass("is-active")}async onExportClick(){const B=await this.getQuery(),x=`${location.protocol}//${location.host}${location.pathname.match(/.*\//)[0]}`,Q=this.data_source&&this.data_source.mode=="overpass"&&this.data_source.options.server?this.data_source.options.server:settings.server;let S=B;this.queryParser.hasStatement("style")&&(S+=`{{style: ${this.queryParser.getStatement("style")} }}`),this.queryParser.hasStatement("data")?S+=`{{data:${this.queryParser.getStatement("data")}}}`:settings.server!==configs.defaultServer&&(S+=`{{data:overpass,server=${settings.server}}}`),$("#export-dialog a#export-interactive-map")[0].href=`${x}map.html?${new URLSearchParams({Q:S})}`,$("#export-dialog a#export-overpass-api")[0].href=`${Q}interpreter?data=${encodeURIComponent(B).replace(/!/g,"%21").replace(/\(/g,"%28").replace(/\)/g,"%29")}`;function D(me,we){return`data:${we||"text/plain"};charset=${document.characterSet||document.charset};base64,${Base64.encode(me,!0)}`}function H(me,we,ve){const Ce=document.createElement("a");Ce.href=D(me,we),Ce.download=ve,Ce.dispatchEvent(new MouseEvent("click"))}function P(me,we){return function(){return $("#export-clipboard-success").addClass("is-active"),copyData={"text/plain":me},document.execCommand("copy"),$("#export-clipboard-success .message").html(i18n.t("export.copy_to_clipboard_success-message")),$("#export-clipboard-success .export-copy_to_clipboard-content").html(we),!1}}$("#export-text .format").html(i18n.t("export.format_text")),$("#export-text .export").attr({download:"query.overpassql",target:"_blank",href:D(B)}),$("#export-text .copy").attr("href","").click(P(B));const R=this.getRawQuery();$("#export-text_raw .format").html(i18n.t("export.format_text_raw")),$("#export-text_raw .export").attr({download:"query-raw.overpassql",target:"_blank",href:D(R)}),$("#export-text_raw .copy").attr("href","").click(P(R));let Y=`{{OverpassTurboExample|loc=${L.Util.formatNum(this.map.getCenter().lat)};${L.Util.formatNum(this.map.getCenter().lng)};${this.map.getZoom()}|query=
+`;Y+=R.replace(/{{/g,"mSAvmrw81O8NgWlX").replace(/{/g,"Z9P563g6zQYzjiLE").replace(/}}/g,"AtUhvGGxAlM1mP5i").replace(/}/g,"Yfxw6RTW5lewTqtg").replace(/mSAvmrw81O8NgWlX/g,"{{((}}").replace(/Z9P563g6zQYzjiLE/g,"{{(}}").replace(/AtUhvGGxAlM1mP5i/g,"{{))}}").replace(/Yfxw6RTW5lewTqtg/g,"{{)}}").replace(/\|/g,"{{!}}").replace(/{{!}}{{!}}/g,"{{!!}}"),Y+=`
+}}`,$("#export-text_wiki .format").html(i18n.t("export.format_text_wiki")),$("#export-text_wiki .export").attr({download:"query-wiki.mediawiki",target:"_blank",href:D(Y)}),$("#export-text_wiki .copy").attr("href","").click(P(Y));let G=B;G=G.replace(/\/\*[\S\s]*?\*\//g,""),G=G.replace(/\/\/.*/g,""),G=G.replace(/\n\s*/g,""),G=G.replace(new RegExp(shortcuts().bbox,"g"),"{south},{west},{north},{east}"),$("#export-text_umap .format").html(i18n.t("export.format_text_umap")),$("#export-text_umap .export").attr({download:"query-umap.overpassql",target:"_blank",href:D(G)}),$("#export-text_umap .copy").attr("href","").click(P(G,`${i18n.t("export.section.query")} (${i18n.t("export.format_text_umap")})`));const X=[{name:i18n.t("dialog.done")}];$("#export-dialog a#export-map-state").unbind("click").bind("click",()=>{const me=`<h4>${i18n.t("export.map_view.permalink")}</h4><p><a href="//www.openstreetmap.org/#map=${this.map.getZoom()}/${L.Util.formatNum(this.map.getCenter().lat)}/${L.Util.formatNum(this.map.getCenter().lng)}" target="_blank">${i18n.t("export.map_view.permalink_osm")}</a></p><h4>${i18n.t("export.map_view.center")}</h4><p>${L.Util.formatNum(this.map.getCenter().lat)}, ${L.Util.formatNum(this.map.getCenter().lng)} <small>(${i18n.t("export.map_view.center_expl")})</small></p><h4>${i18n.t("export.map_view.bounds")}</h4><p>${L.Util.formatNum(this.map.getBounds().getSouthWest().lat)}, ${L.Util.formatNum(this.map.getBounds().getSouthWest().lng)}, ${L.Util.formatNum(this.map.getBounds().getNorthEast().lat)}, ${L.Util.formatNum(this.map.getBounds().getNorthEast().lng)}<br /><small>(${i18n.t("export.map_view.bounds_expl")})</small></p>${this.map.bboxfilter.isEnabled()?`<h4>${i18n.t("export.map_view.bounds_selection")}</h4><p>${L.Util.formatNum(this.map.bboxfilter.getBounds().getSouthWest().lat)}, ${L.Util.formatNum(this.map.bboxfilter.getBounds().getSouthWest().lng)}, ${L.Util.formatNum(this.map.bboxfilter.getBounds().getNorthEast().lat)}, ${L.Util.formatNum(this.map.bboxfilter.getBounds().getNorthEast().lng)}<br /><small>(${i18n.t("export.map_view.bounds_expl")})</small></p>`:""}<h4>${i18n.t("export.map_view.zoom")}</h4><p>${this.map.getZoom()}</p>`;return showDialog(i18n.t("export.map_view.title"),me,X),!1}),$("#export-dialog a#export-image").unbind("click").on("click",()=>(this.onExportImageClick(),$("#export-dialog").removeClass("is-active"),!1));function ee(me){let we;if(!me)we=i18n.t("export.geoJSON.no_data");else{console.log(new Date);const ve={type:"FeatureCollection",generator:configs.appname,copyright:overpass.copyright,timestamp:overpass.timestamp,features:me.features.map(Ce=>({type:"Feature",properties:Ce.properties,geometry:Ce.geometry}))};ve.features.forEach(Ce=>{const Se=Ce.properties;Ce.id=`${Se.type}/${Se.id}`,Ce.properties={"@id":Ce.id};for(const We in Se.tags||{})Ce.properties[We.replace(/^@/,"@@")]=Se.tags[We];for(const We in Se.meta||{})Ce.properties[`@${We}`]=Se.meta[We];Se.tainted&&(Ce.properties["@tainted"]=Se.tainted),Se.geometry&&(Ce.properties["@geometry"]=Se.geometry),Se.relations&&Se.relations.length>0&&(Ce.properties["@relations"]=Se.relations)}),we=JSON.stringify(ve,void 0,2)}return we}$("#export-geoJSON .format").text("GeoJSON"),$("#export-geoJSON .export").attr("href","").unbind("click").on("click",()=>{const me=ee(overpass.geojson),we=$("#export-download-dialog");return overpass.geojson?H(me,"application/geo+json","export.geojson"):(we.addClass("is-active"),$(".message",we).text(me)),!1}),$("#export-geoJSON .copy").attr("href","").click(()=>{const me=overpass.geojson?$("#export-clipboard-success"):$("#export-download-dialog");if(me.addClass("is-active"),overpass.geojson){const we=ee(overpass.geojson);copyData={"text/plain":we,"application/geo+json":we},document.execCommand("copy"),$(".message",me).html(i18n.t("export.copy_to_clipboard_success-message")),$(".export-copy_to_clipboard-content",me).text("GeoJSON")}else $(".message",me).text(i18n.t("export.geoJSON.no_data"));return!1}),$("#export-dialog a#export-geoJSON-gist").unbind("click").on("click",()=>{const me=ee(overpass.geojson);return $.ajax("https://api.github.com/gists",{method:"POST",data:JSON.stringify({description:"data exported by overpass turbo",public:!0,files:{"overpass.geojson":{content:me}}})}).done(we=>{const ve=[{name:i18n.t("dialog.done")}],Ce=`<p>${i18n.t("export.geoJSON_gist.gist")}&nbsp;<a href="${we.html_url}" target="_blank" class="external">${we.id}</a></p><p>${i18n.t("export.geoJSON_gist.geojsonio")}&nbsp;<a href="http://geojson.io/#id=gist:anonymous/${we.id}" target="_blank" class="external">${i18n.t("export.geoJSON_gist.geojsonio_link")}</a></p>`;showDialog(i18n.t("export.geoJSON_gist.title"),Ce,ve)}).fail(we=>{alert(`an error occured during the creation of the overpass gist:
+${JSON.stringify(we)}`)}),!1});function Ae(me){let we;return me?(we=togpx$1(me,{creator:configs.appname,metadata:{desc:"Filtered OSM data converted to GPX by overpass turbo",copyright:{"@author":overpass.copyright},time:overpass.timestamp},featureTitle(ve){if(ve.tags){if(ve.tags.name)return ve.tags.name;if(ve.tags.ref)return ve.tags.ref;if(ve.tags["addr:housenumber"]&&ve.tags["addr:street"])return`${ve.tags["addr:street"]} ${ve.tags["addr:housenumber"]}`}return`${ve.type}/${ve.id}`},featureLink(ve){return`http://osm.org/browse/${ve.type}/${ve.id}`}}),we[1]!=="?"&&(we=`<?xml version="1.0" encoding="UTF-8"?>
+${we}`)):we=i18n.t("export.GPX.no_data"),we}$("#export-GPX .format").text("GPX"),$("#export-GPX .export").attr("href","").unbind("click").on("click",()=>{const me=overpass.geojson,we=Ae(me);if(me)H(we,"application/gpx+xml","export.gpx");else{const ve=$("#export-download-dialog");ve.addClass("is-active"),$(".message",ve).text(we)}return!1}),$("#export-GPX .copy").attr("href","").click(()=>{const me=overpass.geojson?$("#export-clipboard-success"):$("#export-download-dialog");if(me.addClass("is-active"),overpass.geojson){const we=Ae(overpass.geojson);copyData={"text/plain":we,"application/gpx+xml":we},document.execCommand("copy"),$(".message",me).html(i18n.t("export.copy_to_clipboard_success-message")),$(".export-copy_to_clipboard-content",me).text("GPX")}else $(".message",me).text(i18n.t("export.GPX.no_data"));return!1});function le(me){return me=me&&JSON.parse(ee(me)),me?tokml$1(me,{documentName:"overpass-turbo.eu export",documentDescription:`Filtered OSM data converted to KML by overpass turbo.
+Copyright: ${overpass.copyright}
+Timestamp: ${overpass.timestamp}`,name:"name",description:"description"}):i18n.t("export.KML.no_data")}$("#export-KML .format").text("KML"),$("#export-KML .export").attr("href","").unbind("click").on("click",()=>{const me=overpass.geojson,we=le(me);return me?H(we,"application/vnd.google-earth.kml+xml","export.kml"):($("#export-download-dialog").addClass("is-active"),$("#export-download-dialog .message").text(we)),!1}),$("#export-KML .copy").attr("href","").click(()=>{const me=overpass.geojson?$("#export-clipboard-success"):$("#export-download-dialog");if(me.addClass("is-active"),overpass.geojson){const we=le(overpass.geojson);copyData={"text/plain":we,"application/vnd.google-earth.kml+xml":we},document.execCommand("copy"),$(".message",me).html(i18n.t("export.copy_to_clipboard_success-message")),$(".export-copy_to_clipboard-content",me).text("KML")}else $(".message",me).text(i18n.t("export.kml.no_data"));return!1});function ae(me){let we,ve;if(!me)we=i18n.t("export.raw.no_data");else{const Ce=overpass.data;if(Ce instanceof XMLDocument)we=new XMLSerializer().serializeToString(Ce),ve=we.match(/<osm/)?"osm":"xml";else if(Ce instanceof Object)we=JSON.stringify(Ce,void 0,2),ve="json";else try{we=Ce.toString()}catch{we="Error while exporting the data"}}return{raw_str:we,raw_type:ve}}$("#export-raw .format").text(i18n.t("export.raw_data")),$("#export-raw .export").attr("href","").unbind("click").on("click",()=>{const me=overpass.geojson,we=ae(me),ve=we.raw_str,Ce=we.raw_type;if(me)Ce=="osm"||Ce=="xml"?H(ve,"application/xml",`export.${Ce}`):Ce=="json"?H(ve,"application/json","export.json"):H(ve,"application/octet-stream","export.dat");else{const Se=$("#export-download-dialog");Se.addClass("is-active"),$(".message",Se).text(ve)}return!1}),$("#export-raw .copy").attr("href","").click(()=>{const me=overpass.geojson?$("#export-clipboard-success"):$("#export-download-dialog");me.addClass("is-active");const we=overpass.geojson;if(we){const ve=ae(we),Ce=ve.raw_str,Se=ve.raw_type;copyData={"text/plain":Ce},Se=="osm"||Se=="xml"?copyData["application/xml"]=Ce:Se=="json"?copyData["application/json"]=Ce:copyData["application/octet-stream"]=Ce,document.execCommand("copy"),$(".message",me).html(i18n.t("export.copy_to_clipboard_success-message")),$(".export-copy_to_clipboard-content",me).html(i18n.t("export.raw_data"))}else $(".message",me).text(i18n.t("export.raw.no_data"));return!1}),$("#export-dialog a#export-convert-xml")[0].href=`${Q}convert?${new URLSearchParams({data:B,target:"xml"})}`,$("#export-dialog a#export-convert-ql")[0].href=`${Q}convert?${new URLSearchParams({data:B,target:"mapql"})}`,$("#export-dialog a#export-convert-compact")[0].href=`${Q}convert?${new URLSearchParams({data:B,target:"compact"})}`;const ge=autorepair.detect.editors(this.getRawQuery(),this.getQueryLang()),fe=$("#export-dialog a#export-editors-level0");fe.unbind("click");function ye(me){return`https://level0.osmz.ru/?${new URLSearchParams({url:`${Q}interpreter?${new URLSearchParams({data:me})}`})}`}ge?fe[0].href=ye(B):(fe[0].href="",fe.bind("click",()=>{const me=[{name:i18n.t("dialog.repair_query"),callback:async()=>{this.repairQuery("xml+metadata");const ve=await this.getQuery();fe.unbind("click"),fe[0].href=ye(ve)}},{name:i18n.t("dialog.continue_anyway"),callback:()=>{fe.unbind("click"),fe[0].href=ye(B)}}],we=`<p>${i18n.t("warning.incomplete.remote.expl.1")}</p><p>${i18n.t("warning.incomplete.remote.expl.2")}</p>`;return showDialog(i18n.t("warning.incomplete.title"),we,me),!1})),$("#export-dialog a#export-editors-josm").unbind("click").on("click",()=>{const me=$("#export-dialog");function we(Ce){const Se="http://127.0.0.1:8111/";$.getJSON(`${Se}version`).done(We=>{if(We.protocolversion.major==1)$.get(`${Se}import`,{url:`${Q.replace(/^\/\//,`${location.protocol}//`)}interpreter?data=${encodeURIComponent(Ce)}`}).fail(()=>{alert("Error: Unexpected JOSM remote control error.")}).done(()=>{console.log("successfully invoked JOSM remote control")});else{const Ke=[{name:i18n.t("dialog.dismiss")}],Ue=`<p>${i18n.t("error.remote.incompat")}: ${We.protocolversion.major}.${We.protocolversion.minor} :(</p>`;showDialog(i18n.t("error.remote.title"),Ue,Ke)}}).fail(()=>{const We=[{name:i18n.t("dialog.dismiss")}],Ke=`<p>${i18n.t("error.remote.not_found")}</p>`;showDialog(i18n.t("error.remote.title"),Ke,We)})}if(autorepair.detect.editors(this.getRawQuery(),this.getQueryLang()))return we(B),!1;{const Ce=[{name:i18n.t("dialog.repair_query"),callback:async()=>{this.repairQuery("xml+metadata");const We=await this.getQuery();we(We),me.removeClass("is-active")}},{name:i18n.t("dialog.continue_anyway"),callback:()=>{we(B),me.removeClass("is-active")}}],Se=`<p>${i18n.t("warning.incomplete.remote.expl.1")}</p><p>${i18n.t("warning.incomplete.remote.expl.2")}</p>`;return showDialog(i18n.t("warning.incomplete.title"),Se,Ce),!1}}),$("#export-dialog").addClass("is-active")}onExportDownloadClose(){$("#export-download-dialog").removeClass("is-active")}onExportClipboardClose(){$("#export-clipboard-success").removeClass("is-active")}onExportClose(){$("#export-dialog").removeClass("is-active")}async onExportImageClick(){this.waiter.open(i18n.t("waiter.export_as_image")),this.waiter.addInfo("prepare map"),$("#map .leaflet-control-container .leaflet-top").hide(),$("#data_stats").hide(),settings.export_image_attribution&&this.map.addControl(this.attribControl),settings.export_image_scale||this.map.removeControl(this.scaleControl),this.waiter.addInfo("rendering map tiles"),$("#map .leaflet-overlay-pane").hide();const B=await html2canvas(document.getElementById("map"),{useCORS:!0,allowTaint:!1,proxy:void 0});$("#map .leaflet-overlay-pane").show(),settings.export_image_attribution&&this.map.removeControl(this.attribControl),settings.export_image_scale||this.map.addControl(this.scaleControl),settings.show_data_stats&&$("#data_stats").show(),$("#map .leaflet-control-container .leaflet-top").show(),this.waiter.addInfo("rendering map data"),B.id="render_canvas";const x=B.getContext("2d"),Q=$("#map .leaflet-overlay-pane svg").height(),S=$("#map .leaflet-overlay-pane svg").width(),D=$("#map .leaflet-map-pane")[0].style.cssText.match(/.*?(-?\d+)px.*?(-?\d+)px.*/),H=+D[1],P=+D[2],R=$("#map .leaflet-overlay-pane").html();R.length>0&&(await Canvg.from(x,R,{ignoreAnimation:!0,ignoreClear:!0,ignoreDimensions:!0,ignoreMouse:!0,offsetX:H,offsetY:P,scaleHeight:Q,scaleWidth:S})).render(),this.waiter.addInfo("converting to png image");const Y=B.toDataURL("image/png");let G="";settings.export_image_attribution||(G='<p style="font-size:smaller; color:orange;">Make sure to include proper attributions when distributing this image!</p>');const X=[{name:i18n.t("dialog.done")}];this.waiter.close();const ee=`<p><img src="${Y}" alt="${i18n.t("export.image.alt")}" width="480px"/><br><!--<a href="${Y}" download="export.png" target="_blank">${i18n.t("export.image.download")}</a>--></p>${G}`;showDialog(i18n.t("export.image.title"),ee,X);const Ae=document.createElement("a");Ae.href=Y,Ae.download="export.png",Ae.dispatchEvent(new MouseEvent("click"))}onFfsClick(){$("#ffs-dialog #ffs-dialog-parse-error").hide(),$("#ffs-dialog #ffs-dialog-typo").hide(),$("#ffs-dialog .loading").hide(),$("#ffs-dialog").addClass("is-active"),$("#ffs-dialog input[type=search]").removeClass("is-danger").unbind("keypress").bind("keypress",B=>{B.key==="Enter"&&(this.onFfsRun(!0),B.preventDefault())}).first().focus()}onFfsClose(){$("#ffs-dialog").removeClass("is-active")}onFfsBuild(){this.onFfsRun(!1)}onFfsRun(B){$("#ffs-dialog input[type=search]").removeClass("is-danger"),$("#ffs-dialog #ffs-dialog-parse-error").hide(),$("#ffs-dialog #ffs-dialog-typo").hide(),$("#ffs-dialog .loading").show(),this.update_ffs_query(void 0,(x,Q)=>{if($("#ffs-dialog .loading").hide(),!x)$("#ffs-dialog").removeClass("is-active"),B!==!1&&this.onRunClick();else if(_$1.isArray(Q)){$("#ffs-dialog #ffs-dialog-parse-error").hide(),$("#ffs-dialog #ffs-dialog-typo").show(),$("#ffs-dialog input[type=search]").addClass("is-danger");const S=Q.join(""),D=Q.map((H,P)=>P%2===1?`<b>${H}</b>`:H).join("");$("#ffs-dialog #ffs-dialog-typo-correction").html(D),$("#ffs-dialog #ffs-dialog-typo-correction").unbind("click").bind("click",function(H){$("#ffs-dialog input[type=search]").val(S),$(this).parent().hide(),H.preventDefault()})}else $("#ffs-dialog #ffs-dialog-typo").hide(),$("#ffs-dialog #ffs-dialog-parse-error").show(),$("#ffs-dialog input[type=search]").addClass("is-danger")})}onSettingsClick(){$("#settings-dialog input[name=ui_language]")[0].value=settings.ui_language;const B=i18n.getSupportedLanguagesDescriptions();make_combobox($("#settings-dialog input[name=ui_language]"),["auto"].concat(i18n.getSupportedLanguages()).map(x=>({value:x,label:x=="auto"?"auto":`${x} - ${B[x]}`}))),$("#settings-dialog input[name=server]")[0].value=settings.server,make_combobox($("#settings-dialog input[name=server]"),configs.suggestedServers.concat(settings.customServers),settings.customServers,x=>{settings.customServers.splice(settings.customServers.indexOf(x),1),settings.save()}),$("#settings-dialog input[name=no_autorepair]")[0].checked=settings.no_autorepair,$("#settings-dialog input[name=use_rich_editor]")[0].checked=settings.use_rich_editor,$("#settings-dialog input[name=editor_width]")[0].value=settings.editor_width,$("#settings-dialog input[name=share_include_pos]")[0].checked=settings.share_include_pos,$("#settings-dialog input[name=share_compression]")[0].value=settings.share_compression,make_combobox($("#settings-dialog input[name=share_compression]"),["auto","on","off"]),$("#settings-dialog input[name=tile_server]")[0].value=settings.tile_server,make_combobox($("#settings-dialog input[name=tile_server]"),configs.suggestedTiles.concat(settings.customTiles),settings.customTiles,x=>{settings.customTiles.splice(settings.customTiles.indexOf(x),1),settings.save()}),$("#settings-dialog input[name=background_opacity]")[0].value=settings.background_opacity,$("#settings-dialog input[name=enable_crosshairs]")[0].checked=settings.enable_crosshairs,$("#settings-dialog input[name=disable_poiomatic]")[0].checked=settings.disable_poiomatic,$("#settings-dialog input[name=show_data_stats]")[0].checked=settings.show_data_stats,$("#settings-dialog input[name=export_image_scale]")[0].checked=settings.export_image_scale,$("#settings-dialog input[name=export_image_attribution]")[0].checked=settings.export_image_attribution,$("#settings-dialog").addClass("is-active")}onSettingsSave(){const B=$("#settings-dialog input[name=ui_language]")[0].value;settings.ui_language!=B&&i18n.translate(B),settings.ui_language=B,settings.server=$("#settings-dialog input[name=server]")[0].value,configs.suggestedServers.indexOf(settings.server)===-1&&settings.customServers.indexOf(settings.server)===-1&&settings.customServers.push(settings.server),settings.no_autorepair=$("#settings-dialog input[name=no_autorepair]")[0].checked,settings.use_rich_editor=$("#settings-dialog input[name=use_rich_editor]")[0].checked;const x=settings.editor_width;settings.editor_width=$("#settings-dialog input[name=editor_width]")[0].value,x!=settings.editor_width&&($("#editor").css("width",settings.editor_width),$("#dataviewer").css("left",settings.editor_width)),settings.share_include_pos=$("#settings-dialog input[name=share_include_pos]")[0].checked,settings.share_compression=$("#settings-dialog input[name=share_compression]")[0].value;const Q=settings.tile_server;settings.tile_server=$("#settings-dialog input[name=tile_server]")[0].value,configs.suggestedTiles.indexOf(settings.tile_server)===-1&&settings.customTiles.indexOf(settings.tile_server)===-1&&settings.customTiles.push(settings.tile_server),Q!=settings.tile_server&&this.map.tile_layer.setUrl(settings.tile_server);const S=settings.background_opacity;settings.background_opacity=+$("#settings-dialog input[name=background_opacity]")[0].value,settings.background_opacity!=S&&(settings.background_opacity==1?this.map.removeLayer(this.map.inv_opacity_layer):this.map.inv_opacity_layer.setOpacity(1-settings.background_opacity).addTo(this.map)),settings.enable_crosshairs=$("#settings-dialog input[name=enable_crosshairs]")[0].checked,settings.disable_poiomatic=$("#settings-dialog input[name=disable_poiomatic]")[0].checked,settings.show_data_stats=$("#settings-dialog input[name=show_data_stats]")[0].checked,$(".crosshairs").toggle(settings.enable_crosshairs),settings.export_image_scale=$("#settings-dialog input[name=export_image_scale]")[0].checked,settings.export_image_attribution=$("#settings-dialog input[name=export_image_attribution]")[0].checked,settings.save(),$("#settings-dialog").removeClass("is-active")}onSettingsClose(){$("#settings-dialog").removeClass("is-active")}onSettingsReset(){window.confirm("Reset?")&&(settings.reset(),location.reload())}onHelpClick(){$("#help-dialog").addClass("is-active")}onHelpClose(){$("#help-dialog").removeClass("is-active")}onKeyPress(B){(B.key==="F9"||B.key==="Enter"&&(B.ctrlKey||B.metaKey))&&(this.onRunClick(),B.preventDefault()),B.key=="e"&&(B.ctrlKey||B.metaKey)&&!B.shiftKey&&!B.altKey&&(this.onExportClick(),B.preventDefault()),B.key=="s"&&(B.ctrlKey||B.metaKey)&&!B.shiftKey&&!B.altKey&&(this.onSaveClick(),B.preventDefault()),B.key=="o"&&(B.ctrlKey||B.metaKey)&&!B.shiftKey&&!B.altKey&&(this.onLoadClick(),B.preventDefault()),B.key=="h"&&(B.ctrlKey||B.metaKey)&&!B.shiftKey&&!B.altKey&&(this.onHelpClick(),B.preventDefault()),(B.key=="i"&&(B.ctrlKey||B.metaKey)&&!B.shiftKey&&!B.altKey||B.key=="f"&&(B.ctrlKey||B.metaKey)&&B.shiftKey&&!B.altKey)&&(this.onFfsClick(),B.preventDefault()),B.key==="Escape"&&$(".modal").removeClass("is-active")}async update_map(){this.waiter.open(i18n.t("waiter.processing_query")),this.waiter.addInfo("resetting map"),$("#data_stats").remove(),this.resetErrors(),this.dataViewer.setValue(""),typeof overpass.osmLayer<"u"&&this.map.removeLayer(overpass.osmLayer),$("#map_blank").remove(),this.waiter.addInfo("building query");const B=await this.getQuery(),x=this.getQueryLang(),Q=this.data_source&&this.data_source.mode=="overpass"&&this.data_source.options.server?this.data_source.options.server:settings.server;overpass.run_query(B,x,void 0,void 0,Q,this.mapcss)}async rerender_map(){$("#data_stats").remove(),typeof overpass.osmLayer<"u"&&this.map.removeLayer(overpass.osmLayer),await this.getQuery(),overpass.rerender(this.mapcss)}update_ffs_query(B,x){const Q=B||$("#ffs-dialog input[type=search]").val(),S=$("#ffs-dialog input[name='ffs.comments']")[0].checked;ffs_construct_query(Q,S,(D,H)=>{D?ffs_repair_search(Q,P=>{if(P)x("repairable query",P);else{if(B)return x(!0);this.update_ffs_query(`"${Q}"`,x)}}):(this.setQuery(H),x(null))})}}const ide=new IDE;$(document).ready(()=>ide.init());$(document).ready(initClickHandler);function initClickHandler(){$("*[data-ide-handler]").each(function(){const g=$(this).attr("data-ide-handler").split(/:/),B=g[0],x=g[1],Q=ide[x].bind(ide);$(this).on(B,Q)})}
diff --git a/lib/fore-net/src/commonTest/resources/polish.txt b/lib/fore-net/src/commonTest/resources/polish.txt
new file mode 100644
index 00000000..d9ac7ff5
--- /dev/null
+++ b/lib/fore-net/src/commonTest/resources/polish.txt
@@ -0,0 +1,19 @@
+W piękny, słoneczny poranek w Warszawie, ulica Krakowskie Przedmieście tętniła życiem. Ludzie spacerowali wzdłuż chodników, delektując się ciepłym powietrzem i dźwiękami miasta. W powietrzu unosił się zapach kawy, świeżych rogalików i kwiatów z pobliskiego straganu.
+
+Starsza pani z laską przystanęła, aby spojrzeć na witrynę księgarni, gdzie promowano nową książkę pt. "Tajemnice starego domu". Tytuł przyciągnął jej uwagę, bo przypominał jej dawne lata spędzone na wsi. W jej oczach pojawił się błysk nostalgii, gdy przypomniała sobie drewniany dom, otoczony polami pełnymi kwitnących maków i chabrów.
+
+Tymczasem młoda dziewczyna, ubrana w jasną sukienkę w kwiaty, pędziła na tramwaj. W ręku trzymała bukiet białych róż – prezent dla swojej przyjaciółki, która obchodziła dziś urodziny. Dziewczyna zerkała co chwilę na zegarek, bo wiedziała, że nie może się spóźnić. „Zosia zawsze jest punktualna” – pomyślała.
+
+Na drugim końcu miasta, na placu Konstytucji, odbywał się festiwal lokalnych potraw. Stanowiska uginały się od specjałów: pierogi ruskie z chrupiącą cebulką, bigos pachnący wędzoną kiełbasą, sernik oblany słodkim sosem malinowym. Turyści i mieszkańcy tłumnie odwiedzali stragany, próbując kolejnych smakołyków. W tle grała kapela ludowa, a dźwięki skrzypiec i akordeonu wprowadzały wszystkich w dobry nastrój.
+
+W jednej z kawiarni przy Rynku Starego Miasta, para turystów popijała espresso. Kobieta studiowała mapę miasta, próbując zaplanować trasę zwiedzania. „Musimy koniecznie zobaczyć Zamek Królewski i Łazienki” – mówiła do mężczyzny, który był bardziej zainteresowany zdjęciami, jakie właśnie robił telefonem.
+
+Tymczasem w mieszkaniu na czwartym piętrze bloku w dzielnicy Mokotów, starszy pan siedział przy biurku. Przez okno wpadało słońce, oświetlając stosy książek i dokumentów. Mężczyzna pisał list do swojego wnuka. Wspominał czasy swojej młodości, opowiadał o rodzinnych tradycjach i zachęcał go, by nigdy nie zapominał o swoich korzeniach.
+
+„Drogi Piotrze,” pisał, „pamiętaj, że choć świat jest pełen możliwości, warto zawsze wracać do tego, co jest naprawdę ważne – rodzina, przyjaciele i wartości, które nas kształtują.”
+
+Wieczorem, gdy miasto spowite było blaskiem latarni, ulice stały się cichsze. Para zakochanych spacerowała brzegiem Wisły, rozmawiając szeptem. Nad rzeką unosiła się lekka mgiełka, a księżyc odbijał się w wodzie, tworząc malowniczy widok.
+
+Na dworcu kolejowym gwar nie ustawał. Pociągi przyjeżdżały i odjeżdżały, a podróżni z walizkami spieszyli się na perony. Żegnania i powitania mieszały się z odgłosami głośników zapowiadających kolejne połączenia.
+
+Warszawa, jak każde wielkie miasto, nigdy nie spała. W każdym jej zakątku toczyły się historie – małe i wielkie, radosne i smutne, codzienne i wyjątkowe. To właśnie one tworzyły jej niepowtarzalny charakter i sprawiały, że każdy, kto tu przyjeżdżał, czuł się częścią tego niezwykłego miejsca.
\ No newline at end of file
diff --git a/lib/fore-net/src/commonTest/resources/test.jpg b/lib/fore-net/src/commonTest/resources/test.jpg
new file mode 100644
index 00000000..e127f690
Binary files /dev/null and b/lib/fore-net/src/commonTest/resources/test.jpg differ
diff --git a/lib/fore-test-fixtures/build.gradle.kts b/lib/fore-test-fixtures/build.gradle.kts
new file mode 100644
index 00000000..6c3d16e9
--- /dev/null
+++ b/lib/fore-test-fixtures/build.gradle.kts
@@ -0,0 +1,131 @@
+import co.early.fore.Shared
+import co.early.fore.applyPublishingConfig
+import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiPlatformPlugin)
+    alias(libs.plugins.androidLibraryPlugin)
+    alias(libs.plugins.dokkaPlugin)
+    id("maven-publish")
+    id("signing")
+}
+
+kotlin {
+
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvm.toolchain.get().toInt()))
+    }
+
+    targets.withType<org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget> {
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+                }
+            }
+        }
+    }
+
+    androidTarget{
+        publishLibraryVariants("release")
+    }
+
+    jvm()
+
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
+
+    macosX64()
+    macosArm64()
+
+    watchosArm32()
+    watchosArm64()
+    watchosX64()
+    watchosSimulatorArm64()
+
+    tvosArm64()
+    tvosX64()
+    tvosSimulatorArm64()
+
+    linuxX64()
+    linuxArm64()
+
+    mingwX64()
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(project(":lib:fore-core"))
+                implementation(project(":lib:fore-net"))
+            }
+        }
+    }
+}
+
+android {
+
+    namespace = "co.early.fore.testfixtures"
+
+    compileSdk = Shared.Android.compileSdk
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+        targetCompatibility = JavaVersion.valueOf("VERSION_${libs.versions.jvm.target.get().replace(".", "_")}")
+    }
+
+    lint {
+        abortOnError = true
+        lintConfig = File(project.rootDir, "lint-library.xml")
+    }
+
+    defaultConfig {
+        minSdk = Shared.Android.minSdk
+        multiDexEnabled = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildFeatures {
+        buildConfig = false
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            consumerProguardFiles("../../proguard-library-consumer.pro")
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    if (name.contains("android", ignoreCase = true)) {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.target.get()))
+        }
+    }
+}
+
+ext.apply {
+    set("LIB_ARTIFACT_ID", "fore-test-fixtures")
+    set(
+        "LIB_DESCRIPTION",
+        "fore-core some test fixtures to avoid the need to use mocking frameworks during client code tests"
+    )
+}
+
+println("[${ext.get("LIB_ARTIFACT_ID")} build file]")
+
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    from(tasks.dokkaHtml)
+}
+
+applyPublishingConfig()
diff --git a/lib/fore-test-fixtures/fore_core.podspec b/lib/fore-test-fixtures/fore_core.podspec
new file mode 100644
index 00000000..17b3724e
--- /dev/null
+++ b/lib/fore-test-fixtures/fore_core.podspec
@@ -0,0 +1,50 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'fore_core'
+    spec.version                  = '1.0'
+    spec.homepage                 = 'Link to the Shared Module homepage'
+    spec.source                   = { :http=> ''}
+    spec.authors                  = ''
+    spec.license                  = ''
+    spec.summary                  = 'Some description for the Shared Module'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
+    spec.libraries                = 'c++'
+    spec.ios.deployment_target = '16.0'
+                
+                
+    if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
+        raise "
+
+        Kotlin framework 'shared' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :lib:fore-core:generateDummyFramework
+
+        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
+    end
+                
+    spec.pod_target_xcconfig = {
+        'KOTLIN_PROJECT_PATH' => ':lib:fore-core',
+        'PRODUCT_MODULE_NAME' => 'shared',
+    }
+                
+    spec.script_phases = [
+        {
+            :name => 'Build fore_core',
+            :execution_position => :before_compile,
+            :shell_path => '/bin/sh',
+            :script => <<-SCRIPT
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                  exit 0
+                fi
+                set -ev
+                REPO_ROOT="$PODS_TARGET_SRCROOT"
+                "$REPO_ROOT/../../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
+                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
+                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
+                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
+            SCRIPT
+        }
+    ]
+                
+end
\ No newline at end of file
diff --git a/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/core/logging/MockLogger.kt b/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/core/logging/MockLogger.kt
new file mode 100644
index 00000000..cb448971
--- /dev/null
+++ b/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/core/logging/MockLogger.kt
@@ -0,0 +1,111 @@
+import MockLogger.Level.V
+import MockLogger.Level.D
+import MockLogger.Level.I
+import MockLogger.Level.W
+import MockLogger.Level.E
+import co.early.fore.core.logging.Logger
+
+class MockLogger : Logger {
+
+    private val _callHistory: MutableList<Call> = mutableListOf()
+    val callHistory: List<Call> = _callHistory
+
+    class Call(
+        val level: Level,
+        val tag: String? = null,
+        val message: String? = null,
+        val throwable: Throwable? = null
+    )
+
+    enum class Level {
+        V,
+        D,
+        I,
+        W,
+        E
+    }
+
+    fun clear(){
+        _callHistory.clear()
+    }
+
+    override fun d(message: String) {
+        _callHistory.add(Call(D, message = message))
+    }
+
+    override fun d(tag: String, message: String) {
+        _callHistory.add(Call(D, tag = tag, message = message))
+    }
+
+    override fun d(message: String, throwable: Throwable) {
+        _callHistory.add(Call(D, message = message, throwable = throwable))
+    }
+
+    override fun d(tag: String, message: String, throwable: Throwable) {
+        _callHistory.add(Call(D, tag = tag, message = message, throwable = throwable))
+    }
+
+    override fun e(message: String) {
+        _callHistory.add(Call(E, message = message))
+    }
+
+    override fun e(tag: String, message: String) {
+        _callHistory.add(Call(E, tag = tag, message = message))
+    }
+
+    override fun e(message: String, throwable: Throwable) {
+        _callHistory.add(Call(E, message = message, throwable = throwable))
+    }
+
+    override fun e(tag: String, message: String, throwable: Throwable) {
+        _callHistory.add(Call(E, tag = tag, message = message, throwable = throwable))
+    }
+
+    override fun i(message: String) {
+        _callHistory.add(Call(I, message = message))
+    }
+
+    override fun i(tag: String, message: String) {
+        _callHistory.add(Call(I, tag = tag, message = message))
+    }
+
+    override fun i(message: String, throwable: Throwable) {
+        _callHistory.add(Call(I, message = message, throwable = throwable))
+    }
+
+    override fun i(tag: String, message: String, throwable: Throwable) {
+        _callHistory.add(Call(I, tag = tag, message = message, throwable = throwable))
+    }
+
+    override fun v(message: String) {
+        _callHistory.add(Call(V, message = message))
+    }
+
+    override fun v(tag: String, message: String) {
+        _callHistory.add(Call(V, tag = tag, message = message))
+    }
+
+    override fun v(message: String, throwable: Throwable) {
+        _callHistory.add(Call(V, message = message, throwable = throwable))
+    }
+
+    override fun v(tag: String, message: String, throwable: Throwable) {
+        _callHistory.add(Call(V, tag = tag, message = message, throwable = throwable))
+    }
+
+    override fun w(message: String) {
+        _callHistory.add(Call(W, message = message))
+    }
+
+    override fun w(tag: String, message: String) {
+        _callHistory.add(Call(W, tag = tag, message = message))
+    }
+
+    override fun w(message: String, throwable: Throwable) {
+        _callHistory.add(Call(W, message = message, throwable = throwable))
+    }
+
+    override fun w(tag: String, message: String, throwable: Throwable) {
+        _callHistory.add(Call(W, tag = tag, message = message, throwable = throwable))
+    }
+}
diff --git a/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/core/observer/MockObserver.kt b/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/core/observer/MockObserver.kt
new file mode 100644
index 00000000..4dc0d334
--- /dev/null
+++ b/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/core/observer/MockObserver.kt
@@ -0,0 +1,14 @@
+import co.early.fore.core.observer.Observer
+
+class MockObserver : Observer {
+
+    private var notifications = 0
+
+    fun notifications(): Int {
+        return notifications
+    }
+
+    override fun somethingChanged() {
+        notifications++
+    }
+}
\ No newline at end of file
diff --git a/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/net/wrap/FakeCallWrapper.kt b/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/net/wrap/FakeCallWrapper.kt
new file mode 100644
index 00000000..35717b22
--- /dev/null
+++ b/lib/fore-test-fixtures/src/commonMain/kotlin/co/early/fore/net/wrap/FakeCallWrapper.kt
@@ -0,0 +1,93 @@
+package co.early.fore.net.wrap
+
+import co.early.fore.core.type.Either
+import co.early.fore.net.MessageProvider
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.serialization.KSerializer
+
+
+fun <F, S> S.toFakeSuccess(): Either<Throwable, Either<F, S>> = Either.success(Either.success(this))
+fun <F> F.toFakeFail(): Either<Throwable, Either<F, Nothing>> = Either.success(Either.fail(this))
+fun Throwable.toFakeThrowable(): Either<Throwable, Nothing> = Either.fail(this)
+
+
+/**
+ * @param fakeResponses For simple test cases, just specify one fakeResponse here which will
+ * always be returned whenever this class is called. You can also specify multiple responses,
+ * in that case the responses will be made in order from first to last, once the last
+ * fakeResponse has been used it will be re-used for all subsequent calls.
+ *
+ * Be careful with the Success(S) generic of the fake responses you list here, there'll be a
+ * ClassCastException if it doesn't match what is expected by the client code
+ *
+ * Example use (see example apps in repo)
+ *
+ * fakeCallWrapper = FakeCallWrapper(
+ *     success1.toFakeSuccess(),
+ *     success2.toFakeSuccess(),
+ *     ErrorMessage.ERROR_NETWORK.toFakeFail(),
+ *     success3.toFakeSuccess(),
+ *     RuntimeException().toFakeThrowable()
+ * )
+ */
+class FakeCallWrapper<F>(
+    vararg fakeResponses: Either<Throwable, Either<F, *>>,
+) : Wrapper<F> {
+
+    private val pendingFakeResponses: MutableList<Either<Throwable, Either<F, *>>> =
+        fakeResponses.toMutableList()
+    private val mutex = Mutex()
+
+    init {
+        require(fakeResponses.isNotEmpty()) {
+            "you must include at least one fake response in the constructor"
+        }
+    }
+
+    override suspend fun <S> processCallAwait(call: suspend () -> S): Either<F, S> {
+        return processCallAsync(call).await()
+    }
+
+    override suspend fun <S, CE : MessageProvider<F>> processCallAwait(
+        kSerializer: KSerializer<CE>,
+        call: suspend () -> S
+    ): Either<F, S> {
+        return processCallAsync(kSerializer, call).await()
+    }
+
+    override suspend fun <S> processCallAsync(call: suspend () -> S): Deferred<Either<F, S>> {
+        return doCallAsync<S, MessageProvider<F>>(null, call)
+    }
+
+    override suspend fun <S, CE : MessageProvider<F>> processCallAsync(
+        kSerializer: KSerializer<CE>,
+        call: suspend () -> S
+    ): Deferred<Either<F, S>> {
+        return doCallAsync(kSerializer, call)
+    }
+
+    private suspend fun <S, CE : MessageProvider<F>> doCallAsync(
+        kSerializer: KSerializer<CE>?,
+        call: suspend () -> S
+    ): Deferred<Either<F, S>> {
+        mutex.withLock {
+            val fakeResponse = if (pendingFakeResponses.size > 1) {
+                pendingFakeResponses.removeFirst()
+            } else {
+                pendingFakeResponses.first()
+            }
+
+            return when (fakeResponse) {
+                is Either.Fail<*> -> throw fakeResponse.value as Throwable
+                is Either.Success<*> -> {
+                    CompletableDeferred(
+                        @Suppress("UNCHECKED_CAST") (fakeResponse.value as Either<F, S>)
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/proguard-library-consumer-network.pro b/proguard-library-consumer-network.pro
index 960f8a75..8d1bfa63 100644
--- a/proguard-library-consumer-network.pro
+++ b/proguard-library-consumer-network.pro
@@ -3,10 +3,8 @@
 -keep public class co.early.fore.core.observer.Observer
 -keep public class co.early.fore.core.observer.Observable
 -keep class co.early.fore.core.logging.SystemLogger
--keep class co.early.fore.kt.core.logging.SystemLogger
--keep class co.early.fore.kt.core.delegate.** { *; }
--keep class co.early.fore.core.testhelpers.** { *; }
--dontwarn co.early.fore.kt.net.**
+-keep class co.early.fore.core.logging.Logger
+-keep class co.early.fore.core.delegate.** { *; }
 -dontwarn co.early.fore.net.**
 -keep class okhttp3.Request { *;}
 -keep class okhttp3.Response { *;}
diff --git a/proguard-library-consumer.pro b/proguard-library-consumer.pro
index 81b8db3a..fdf146ac 100644
--- a/proguard-library-consumer.pro
+++ b/proguard-library-consumer.pro
@@ -3,6 +3,5 @@
 -keep public class co.early.fore.core.observer.Observer
 -keep public class co.early.fore.core.observer.Observable
 -keep class co.early.fore.core.logging.SystemLogger
--keep class co.early.fore.kt.core.logging.SystemLogger
--keep class co.early.fore.kt.core.delegate.** { *; }
--keep class co.early.fore.core.testhelpers.** { *; }
\ No newline at end of file
+-keep class co.early.fore.core.logging.Logger
+-keep class co.early.fore.core.delegate.** { *; }
\ No newline at end of file
diff --git a/publish-kmp-lib.gradle.kts b/publish-kmp-lib.gradle.kts
new file mode 100644
index 00000000..5f1d169a
--- /dev/null
+++ b/publish-kmp-lib.gradle.kts
@@ -0,0 +1,79 @@
+import co.early.fore.Shared
+import org.gradle.kotlin.dsl.`maven-publish`
+import org.gradle.kotlin.dsl.signing
+import java.net.URI
+
+apply(plugin = "maven-publish")
+apply(plugin = "signing")
+
+val LIB_ARTIFACT_ID: String? by project
+val LIB_DESCRIPTION: String? by project
+
+println("[$LIB_ARTIFACT_ID lib publish file]")
+
+group = "${Shared.Publish.LIB_GROUP}"
+version = "${Shared.Publish.LIB_VERSION_NAME}"
+
+
+configure<PublishingExtension> {
+    publications {
+        (getByName("kotlinMultiplatform") as MavenPublication).apply {
+
+            groupId = "${Shared.Publish.LIB_GROUP}"
+            artifactId = LIB_ARTIFACT_ID
+            version = "${Shared.Publish.LIB_VERSION_NAME}"
+
+            pom {
+                name.set("${Shared.Publish.PROJ_NAME}")
+                description.set(LIB_DESCRIPTION)
+                url.set("${Shared.Publish.POM_URL}")
+
+                licenses {
+                    license {
+                        name.set("${Shared.Publish.LICENCE_NAME}")
+                        url.set("${Shared.Publish.LICENCE_URL}")
+                    }
+                }
+                developers {
+                    developer {
+                        id.set("${Shared.Publish.LIB_DEVELOPER_ID}")
+                        name.set("${Shared.Publish.LIB_DEVELOPER_NAME}")
+                        email.set("${Shared.Publish.LIB_DEVELOPER_EMAIL}")
+                    }
+                }
+                scm {
+                    connection.set("${Shared.Publish.POM_SCM_CONNECTION}")
+                    developerConnection.set("${Shared.Publish.POM_SCM_CONNECTION}")
+                    url.set("${Shared.Publish.POM_SCM_URL}")
+                }
+            }
+        }
+    }
+    repositories {
+        maven {
+            name = "mavenCentral"
+
+            val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            val repoUrl = if (Shared.Publish.LIB_VERSION_NAME.endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
+
+            url = URI(repoUrl)
+
+            credentials {
+                username = "${Shared.Secrets.MAVEN_USER}"
+                password = "${Shared.Secrets.MAVEN_PASSWORD}"
+            }
+        }
+    }
+}
+
+//configure<SigningExtension> {
+//
+//    extra["signing.keyId"] = "${Shared.Secrets.SIGNING_KEY_ID}"
+//    extra["signing.password"] = "${Shared.Secrets.SIGNING_PASSWORD}"
+//    extra["signing.secretKeyRingFile"] = "${Shared.Secrets.SIGNING_KEY_RING_FILE}"
+//
+//    val pubExt = checkNotNull(extensions.findByType(PublishingExtension::class.java))
+//    val publication = pubExt.publications["release"]
+//    sign(publication)
+//}
diff --git a/publish-lib.gradle.kts b/publish-lib.gradle.kts
index 0c299980..dd434efe 100644
--- a/publish-lib.gradle.kts
+++ b/publish-lib.gradle.kts
@@ -4,7 +4,6 @@ import org.gradle.kotlin.dsl.signing
 import java.net.URI
 
 apply(plugin = "maven-publish")
-apply(plugin = "java-library")
 apply(plugin = "signing")
 
 val LIB_ARTIFACT_ID: String? by project
diff --git a/settings.gradle b/settings.gradle
index ad7b0436..923a40a2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,41 +25,16 @@ dependencyResolutionManagement {
 
 rootProject.name = "android-fore"
 
-// java
-include(":fore-jv")
-include(":fore-jv:fore-jv-core")
-include(":fore-jv:fore-jv-network")
-
-// java android
-include(":fore-jv:fore-jv-android") // everything
-include(":fore-jv:fore-jv-android-core")
-include(":fore-jv:fore-jv-android-adapters")
-include(":fore-jv:fore-jv-android-network")
-
-// kotlin
-include(":fore-kt")
-include(":fore-kt:fore-kt-core")
-include(":fore-kt:fore-kt-network")
-include(":fore-kt:fore-kt-network-okhttp3v3x")
-include(":fore-kt:fore-kt-network-okhttp3v4x")
-
-// kotlin android
-include(":fore-kt:fore-kt-android") // everything
-include(":fore-kt:fore-kt-android-core")
-include(":fore-kt:fore-kt-android-adapters")
-include(":fore-kt:fore-kt-android-network")
-include(":fore-kt:fore-kt-android-compose")
-
-include(":app-examples")
-include(":app-examples:example-kt-01reactiveui",
-        ":app-examples:example-kt-02coroutine",
-        ":app-examples:example-kt-03adapters",
-        ":app-examples:example-kt-04retrofit",
-        ":app-examples:example-kt-07apollo3",
-        ":app-examples:example-kt-08ktor",
-        ":app-examples:example-kt-09compose",
-        ":app-examples:example-jv-01reactiveui",
-        ":app-examples:example-jv-02threading",
-        ":app-examples:example-jv-03adapters",
-        ":app-examples:example-jv-04retrofit",
-        ":app-examples:example-jv-06db")
+include(':lib:fore-core')
+include(':lib:fore-net')
+include(':lib:fore-compose')
+include(':lib:fore-test-fixtures')
+
+include(':lib:fore-net-apollo')
+include(':lib:fore-net-apollo-test-fixtures')
+
+include(':app-examples:example-01-reactiveui',
+        ':app-examples:example-02-coroutine',
+        ':app-examples:example-03-ktor',
+        ':app-examples:example-04-apollo',
+        ':app-examples:example-06-compose')