diff --git a/app/build.gradle b/app/build.gradle
index 46c1be6..816d1cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,5 +36,8 @@ android {
 
 dependencies {
     debugImplementation project(":savestateobserver")
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
     implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.startup:startup-runtime:1.1.1'
 }
diff --git a/app/src/debug/kotlin/com/pnuema/android/savestateobserver/app/AppInitializer.kt b/app/src/debug/kotlin/com/pnuema/android/savestateobserver/app/AppInitializer.kt
new file mode 100644
index 0000000..92b635e
--- /dev/null
+++ b/app/src/debug/kotlin/com/pnuema/android/savestateobserver/app/AppInitializer.kt
@@ -0,0 +1,20 @@
+package com.pnuema.android.savestateobserver.app
+
+import android.content.Context
+import android.util.Log
+import androidx.startup.Initializer
+import com.pnuema.android.savestateobserver.OversizeBundleRegistrar
+
+class AppInitializer: Initializer<Unit> {
+    override fun create(context: Context) {
+        OversizeBundleRegistrar.register { stringifyBundle ->
+            Log.e(
+                "AppBundleWorker",
+                "OVERSIZE BUNDLE DETECTED: $stringifyBundle"
+            )
+        }
+    }
+
+    override fun dependencies(): MutableList<Class<out Initializer<*>>> = mutableListOf()
+
+}
\ No newline at end of file
diff --git a/app/src/debug/kotlin/com/pnuema/android/savestateobserver/app/BaseActivity.kt b/app/src/debug/kotlin/com/pnuema/android/savestateobserver/app/BaseActivity.kt
deleted file mode 100644
index 6749bb2..0000000
--- a/app/src/debug/kotlin/com/pnuema/android/savestateobserver/app/BaseActivity.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.pnuema.android.savestateobserver.app
-
-import android.os.Bundle
-import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
-import com.pnuema.android.savestateobserver.OversizeBundleRegistrar
-import java.util.*
-
-open class BaseActivity: AppCompatActivity() {
-
-    private lateinit var uuid: UUID
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
-        uuid = OversizeBundleRegistrar.register { stringifyBundle ->
-            Log.e(
-                "AppBundleWorker",
-                "OVERSIZE BUNDLE DETECTED: $stringifyBundle"
-            )
-        }
-    }
-
-    override fun onDestroy() {
-        if (::uuid.isInitialized) {
-            OversizeBundleRegistrar.unregister(uuid)
-        }
-        super.onDestroy()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3f3e34c..d221dbc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,26 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.pnuema.android.savestateobserver.app">
 
     <application
-        android:fullBackupContent="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="com.pnuema.android.savestateobserver.app.AppInitializer"
+                android:value="androidx.startup" />
+        </provider>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/BundleGenerator.kt b/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/BundleGenerator.kt
new file mode 100644
index 0000000..09c9655
--- /dev/null
+++ b/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/BundleGenerator.kt
@@ -0,0 +1,29 @@
+package com.pnuema.android.savestateobserver.app
+
+import android.os.Bundle
+import java.util.*
+
+object BundleGenerator {
+    /**
+     * Generate oversize bundle
+     */
+    fun Bundle.generateOversizeBundle() = apply {
+        putInt("Integer", 1234)
+        putString("String", "StringTest")
+        putFloat("Float", 12.34F)
+
+        val innerBundle = Bundle()
+        innerBundle.putInt("Integer", 5678)
+        innerBundle.putString("String", "InnerStringTest")
+        innerBundle.putFloat("Float", 56.78F)
+
+        //generate 50k of data for the bundle
+        var bigString = ""
+        while (bigString.length < 50000) {
+            bigString += UUID.randomUUID().toString()
+        }
+        innerBundle.putString("BigString", bigString)
+
+        putBundle("innerBundle", innerBundle)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/MainActivity.kt b/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/MainActivity.kt
index 252e281..10777ea 100644
--- a/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/MainActivity.kt
+++ b/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/MainActivity.kt
@@ -1,33 +1,21 @@
 package com.pnuema.android.savestateobserver.app
 
 import android.os.Bundle
-import java.util.*
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.commit
+import com.pnuema.android.savestateobserver.app.BundleGenerator.generateOversizeBundle
 
-class MainActivity : BaseActivity() {
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putInt("Integer", 1234)
-        outState.putString("String", "StringTest")
-        outState.putFloat("Float", 12.34F)
-
-        val innerBundle = Bundle()
-        innerBundle.putInt("Integer", 5678)
-        innerBundle.putString("String", "InnerStringTest")
-        innerBundle.putFloat("Float", 56.78F)
+class MainActivity : AppCompatActivity(R.layout.activity_main) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
 
-        //generate 50k of data for the bundle
-        var bigString = ""
-        while (bigString.length < 50000) {
-            bigString += UUID.randomUUID().toString()
+        supportFragmentManager.commit {
+            replace(R.id.fragment_container_view, MainFragment.newInstance())
         }
-        innerBundle.putString("BigString", bigString)
-
-        outState.putBundle("innerBundle", innerBundle)
-
-        super.onSaveInstanceState(outState)
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.generateOversizeBundle()
+        super.onSaveInstanceState(outState)
     }
 }
diff --git a/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/MainFragment.kt b/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/MainFragment.kt
new file mode 100644
index 0000000..f763820
--- /dev/null
+++ b/app/src/main/kotlin/com/pnuema/android/savestateobserver/app/MainFragment.kt
@@ -0,0 +1,23 @@
+package com.pnuema.android.savestateobserver.app
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import com.pnuema.android.savestateobserver.app.BundleGenerator.generateOversizeBundle
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [MainFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class MainFragment private constructor() : Fragment(R.layout.fragment_main) {
+    companion object {
+        fun newInstance() = MainFragment().apply {
+            arguments = Bundle().generateOversizeBundle() //TODO detect oversize arguments
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.generateOversizeBundle()
+        super.onSaveInstanceState(outState)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e9701b0..0aad31a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_container_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/instructions"/>
-
-</LinearLayout>
\ No newline at end of file
+    tools:context=".MainActivity" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
new file mode 100644
index 0000000..d479b7b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainFragment">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/instructions"
+        android:textSize="24sp"
+        android:textAlignment="center"
+        android:layout_gravity="center"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d205097..743518e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
     <string name="app_name">SaveStateObserver</string>
-    <string name="instructions">Minimize this app while watching the LogCat to see the results</string>
+    <string name="instructions">Minimize this app while watching LogCat to see the results</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..3d8448c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/app/src/release/kotlin/com/pnuema/android/savestateobserver/app/AppInitializer.kt b/app/src/release/kotlin/com/pnuema/android/savestateobserver/app/AppInitializer.kt
new file mode 100644
index 0000000..c07ef93
--- /dev/null
+++ b/app/src/release/kotlin/com/pnuema/android/savestateobserver/app/AppInitializer.kt
@@ -0,0 +1,9 @@
+package com.pnuema.android.savestateobserver.app
+
+import android.content.Context
+import androidx.startup.Initializer
+
+class AppInitializer: Initializer<Unit> {
+    override fun create(context: Context) = Unit
+    override fun dependencies(): MutableList<Class<out Initializer<*>>> = mutableListOf()
+}
\ No newline at end of file
diff --git a/app/src/release/kotlin/com/pnuema/android/savestateobserver/app/BaseActivity.kt b/app/src/release/kotlin/com/pnuema/android/savestateobserver/app/BaseActivity.kt
deleted file mode 100644
index e1fc86c..0000000
--- a/app/src/release/kotlin/com/pnuema/android/savestateobserver/app/BaseActivity.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pnuema.android.savestateobserver.app
-
-import androidx.appcompat.app.AppCompatActivity
-
-open class BaseActivity: AppCompatActivity()
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ebc8f1a..97b11f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ wrapper {
 }
 
 buildscript {
-    ext.kotlin_version = '1.6.20'
+    ext.kotlin_version = '1.6.21'
 
     repositories {
         google()
diff --git a/gradle.properties b/gradle.properties
index 007f5a1..7d7d863 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,7 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 GROUP=com.pnuema.android
-VERSION_NAME=2.6.1
+VERSION_NAME=2.7.0
 
 POM_NAME=SaveStateObserver
 POM_ARTIFACT_ID=savestateobserver
diff --git a/savestateobserver/build.gradle b/savestateobserver/build.gradle
index 47040e9..3aae321 100644
--- a/savestateobserver/build.gradle
+++ b/savestateobserver/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'org.jetbrains.dokka'
 apply plugin: "com.vanniktech.maven.publish"
 
-version = "2.6.1"
+version = "2.7.0"
 group = "com.pnuema.android"
 archivesBaseName = 'savestateobserver'
 
@@ -44,6 +44,7 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.startup:startup-runtime:1.1.1'
     testImplementation 'junit:junit:4.13.2'
 }
 
diff --git a/savestateobserver/src/main/AndroidManifest.xml b/savestateobserver/src/main/AndroidManifest.xml
index c4501b2..ef72451 100644
--- a/savestateobserver/src/main/AndroidManifest.xml
+++ b/savestateobserver/src/main/AndroidManifest.xml
@@ -1,12 +1,17 @@
 <manifest package="com.pnuema.android.savestateobserver"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <application>
 
         <provider
-            android:authorities="${applicationId}.savestateobserverinitprovider"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
             android:exported="false"
-            android:enabled="true"
-            android:name=".SaveStateLibraryContentProvider" />
+            tools:node="merge">
+            <meta-data
+                android:name="com.pnuema.android.savestateobserver.SaveStateLibraryInitializer"
+                android:value="androidx.startup" />
+        </provider>
 
     </application>
 
diff --git a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/BaseContentProvider.kt b/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/BaseContentProvider.kt
deleted file mode 100644
index 9e8d3d0..0000000
--- a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/BaseContentProvider.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.pnuema.android.savestateobserver
-
-import android.content.ContentProvider
-import android.content.ContentValues
-import android.database.Cursor
-import android.net.Uri
-
-abstract class BaseContentProvider : ContentProvider() {
-    override fun onCreate(): Boolean = false
-    override fun query(uri: Uri, projection: Array<String>?, selection: String?, selectionArgs: Array<String>?, sortOrder: String?): Cursor? = null
-    override fun getType(uri: Uri): String? = null
-    override fun insert(uri: Uri, values: ContentValues?): Uri? = null
-    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<String>?): Int = 0
-    override fun update(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array<String>?): Int = 0
-}
diff --git a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/SaveStateLibraryContentProvider.kt b/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/SaveStateLibraryContentProvider.kt
deleted file mode 100644
index 4d439c2..0000000
--- a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/SaveStateLibraryContentProvider.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.pnuema.android.savestateobserver
-
-import android.app.Application
-
-import com.pnuema.android.savestateobserver.observers.ActivitySaveStateObserver
-
-class SaveStateLibraryContentProvider : BaseContentProvider() {
-    override fun onCreate(): Boolean {
-        (context as? Application)?.registerActivityLifecycleCallbacks(ActivitySaveStateObserver())
-        return super.onCreate()
-    }
-}
diff --git a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/BundlePrinter.kt b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/BundlePrinter.kt
similarity index 77%
rename from savestateobserver/src/main/java/com/pnuema/android/savestateobserver/BundlePrinter.kt
rename to savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/BundlePrinter.kt
index 2fa8f7c..5f2b601 100644
--- a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/BundlePrinter.kt
+++ b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/BundlePrinter.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Bundle
 import android.os.Parcel
 import android.util.Log
+import androidx.fragment.app.Fragment
 import java.nio.CharBuffer
 import java.util.*
 
@@ -15,6 +16,14 @@ internal object BundlePrinter {
     private const val BUNDLE_SIZE_THRESHOLD = 50000 //Recommended by Google (https://developer.android.com/guide/components/activities/parcelables-and-bundles.html#sdbp)
 
     fun printBundleContents(context: Context, bundle: Bundle?) {
+        printBundleContentsInternal(context = context, clazz = context.javaClass, bundle = bundle)
+    }
+
+    fun printBundleContents(fragment: Fragment, bundle: Bundle?) {
+        printBundleContentsInternal(context = fragment.requireContext(), clazz = fragment.javaClass, bundle = bundle)
+    }
+
+    private fun printBundleContentsInternal(context: Context, clazz: Class<*>, bundle: Bundle?) {
         //TODO multiple logging levels
         if (bundle == null) {
             Log.d(context.getString(R.string.libname), context.getString(R.string.banner) + System.lineSeparator() + context.getString(R.string.bundle_empty))
@@ -24,16 +33,16 @@ internal object BundlePrinter {
         val bundleSizeRaw = getBundleTotalSize(bundle)
         if (bundleSizeRaw > BUNDLE_SIZE_THRESHOLD) {
             Log.w(context.getString(R.string.libname), context.getString(R.string.bundle_overthreshold, condense(context, bundleSizeRaw)))
-            OversizeBundleRegistrar.notifyOversizeBundle(stringifyBundle = stringifyBundle(context = context, bundle = bundle))
+            OversizeBundleRegistrar.notifyOversizeBundle(stringifyBundle = stringifyBundle(context = context, clazz = clazz, bundle = bundle))
         }
 
-        Log.d(context.getString(R.string.libname), context.getString(R.string.banner) + System.lineSeparator() + stringifyBundle(context = context, bundle = bundle))
+        Log.d(context.getString(R.string.libname), context.getString(R.string.banner) + System.lineSeparator() + stringifyBundle(context = context, clazz = clazz, bundle = bundle))
     }
 
-    private fun stringifyBundle(context: Context, bundle: Bundle) = getHeaderAsString(context, bundle) + System.lineSeparator() + getContents(context, 1, bundle)
+    private fun stringifyBundle(context: Context, clazz: Class<*>, bundle: Bundle) = getHeaderAsString(context, clazz, bundle) + System.lineSeparator() + getContents(context, 1, bundle)
 
-    private fun getHeaderAsString(context: Context, bundle: Bundle): String {
-        return context.resources.getQuantityString(R.plurals.title, bundle.size(), context.javaClass.simpleName, System.identityHashCode(bundle), bundle.size(), condense(context, getBundleTotalSize(bundle)))
+    private fun getHeaderAsString(context: Context, clazz: Class<*>, bundle: Bundle): String {
+        return context.resources.getQuantityString(R.plurals.title, bundle.size(), clazz.simpleName, System.identityHashCode(bundle), bundle.size(), condense(context, getBundleTotalSize(bundle)))
     }
 
     private fun getBundleTotalSize(bundle: Bundle): Int {
diff --git a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/OversizeBundleRegistrar.kt b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/OversizeBundleRegistrar.kt
similarity index 100%
rename from savestateobserver/src/main/java/com/pnuema/android/savestateobserver/OversizeBundleRegistrar.kt
rename to savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/OversizeBundleRegistrar.kt
diff --git a/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/SaveStateLibraryInitializer.kt b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/SaveStateLibraryInitializer.kt
new file mode 100644
index 0000000..f6fea1c
--- /dev/null
+++ b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/SaveStateLibraryInitializer.kt
@@ -0,0 +1,14 @@
+package com.pnuema.android.savestateobserver
+
+import android.app.Application
+import android.content.Context
+import androidx.startup.Initializer
+import com.pnuema.android.savestateobserver.observers.ActivitySaveStateObserver
+
+@Suppress("unused") //initializer
+class SaveStateLibraryInitializer : Initializer<Unit> {
+    override fun create(context: Context) {
+        (context as? Application)?.registerActivityLifecycleCallbacks(ActivitySaveStateObserver())
+    }
+    override fun dependencies(): MutableList<Class<out Initializer<*>>> = mutableListOf()
+}
diff --git a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/observers/ActivitySaveStateObserver.kt b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/observers/ActivitySaveStateObserver.kt
similarity index 100%
rename from savestateobserver/src/main/java/com/pnuema/android/savestateobserver/observers/ActivitySaveStateObserver.kt
rename to savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/observers/ActivitySaveStateObserver.kt
diff --git a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/observers/BaseActivityLifecycleCallbacks.kt b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/observers/BaseActivityLifecycleCallbacks.kt
similarity index 100%
rename from savestateobserver/src/main/java/com/pnuema/android/savestateobserver/observers/BaseActivityLifecycleCallbacks.kt
rename to savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/observers/BaseActivityLifecycleCallbacks.kt
diff --git a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/observers/FragmentSaveStateSupportObserver.kt b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/observers/FragmentSaveStateSupportObserver.kt
similarity index 52%
rename from savestateobserver/src/main/java/com/pnuema/android/savestateobserver/observers/FragmentSaveStateSupportObserver.kt
rename to savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/observers/FragmentSaveStateSupportObserver.kt
index 6ea6d2f..1c432f4 100644
--- a/savestateobserver/src/main/java/com/pnuema/android/savestateobserver/observers/FragmentSaveStateSupportObserver.kt
+++ b/savestateobserver/src/main/kotlin/com/pnuema/android/savestateobserver/observers/FragmentSaveStateSupportObserver.kt
@@ -1,25 +1,13 @@
 package com.pnuema.android.savestateobserver.observers
 
 import android.os.Bundle
-import android.util.SparseArray
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import com.pnuema.android.savestateobserver.BundlePrinter
 
 class FragmentSaveStateSupportObserver : FragmentManager.FragmentLifecycleCallbacks() {
-    private val bundles = SparseArray<Bundle>()
-
-    override fun onFragmentStopped(fragmentManager: FragmentManager, fragment: Fragment) {
-        super.onFragmentStopped(fragmentManager, fragment)
-
-        bundles.remove(fragment.hashCode())
-    }
-
     override fun onFragmentSaveInstanceState(fragmentManager: FragmentManager, fragment: Fragment, outState: Bundle) {
         super.onFragmentSaveInstanceState(fragmentManager, fragment, outState)
-
-        val hashcode = fragment.hashCode()
-        bundles.put(hashcode, outState)
-        BundlePrinter.printBundleContents(fragment.context ?: return, bundles.get(hashcode))
+        BundlePrinter.printBundleContents(fragment, outState)
     }
 }
diff --git a/savestateobserver/src/test/java/com/pnuema/android/savestateobserver/ExampleUnitTest.java b/savestateobserver/src/test/kotlin/com/pnuema/android/savestateobserver/ExampleUnitTest.java
similarity index 100%
rename from savestateobserver/src/test/java/com/pnuema/android/savestateobserver/ExampleUnitTest.java
rename to savestateobserver/src/test/kotlin/com/pnuema/android/savestateobserver/ExampleUnitTest.java