diff --git a/README.md b/README.md
index 1f1e03a..9852d68 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,7 @@ the project and functionality that must be provided by the hosting application.
 
 The [org.librarysimplified.r2.api](org.librarysimplified.r2.api) module defines a _controller API_ that accepts
 commands and publishes events in response to those commands. A _controller_ encapsulates
-a Readium [Publication](https://readium.org/webpub-manifest/) and an internal server
-used to expose resources from that `Publication`. A single _controller_ instance has
+a Readium [Publication](https://readium.org/webpub-manifest/). A single _controller_ instance has
 a lifetime matching that of the `Publication`; when the user wants to open a book,
 a new _controller_ instance is created for that book, and then destroyed when the
 user closes the book.
@@ -70,9 +69,7 @@ restoring this state each time a `WebView` is (re)connected.
 The [org.librarysimplified.r2.views](org.librarysimplified.r2.views) module defines a set of Android [Fragments](https://developer.android.com/guide/fragments)
 that implement a simple user interface for displaying a book and allowing the user to
 manage bookmarks and choose items from the book's table of contents. The fragments are
-conceptually stateless views that simply respond to events published by the current
-_controller_ instance. The fragments communicate by a shared, public [ViewModel](https://developer.android.com/topic/libraries/architecture/viewmodel),
-with the _controller_ instance being stored in this `ViewModel`.
+stateless views that simply respond to events published by the current _controller_ instance.
 
 ### Usage
 
@@ -85,11 +82,10 @@ The user's application has the following responsibilities:
     database. Failing to handle events will merely result in bookmarks not being saved.
     
   * The application _must_ respond to requests from the fragments to instantiate other
-    fragments, and to pop the backstack as necessary. For example, when the user clicks
-    the _table of contents_ button in the `SR2ReaderFragment`, the `ViewModel` will
-    publish an event indicating that the user's application should now instantiate and
-    attach a `SR2TOCFragment` in order to show the table of contents. Failing to handle
-    these events will merely result in a UI that does nothing when the user selects
+    fragments. For example, when the user clicks the _table of contents_ button in the
+    `SR2ReaderFragment`, an event will be published indicating that the user's application
+    should now instantiate and attach a `SR2TOCFragment` in order to show the table of contents. 
+    Failing to handle these events will merely result in a UI that does nothing when the user selects
     various menu items.
 
 An extremely minimal [demo application](org.librarysimplified.r2.demo) is included that
diff --git a/gradle.properties b/gradle.properties
index 0e7615c..29ece90 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ POM_SCM_CONNECTION=scm:git:git://github.com/ThePalaceProject/android-r2
 POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/ThePalaceProject/android-r2
 POM_SCM_URL=http://github.com/ThePalaceProject/android-r2
 POM_URL=http://github.com/ThePalaceProject/android-r2
-VERSION_NAME=2.6.0-SNAPSHOT
+VERSION_NAME=3.0.0-SNAPSHOT
 VERSION_PREVIOUS=2.5.0
 
 android.useAndroidX=true
diff --git a/org.librarysimplified.r2.api/build.gradle.kts b/org.librarysimplified.r2.api/build.gradle.kts
index e431621..e1e44eb 100644
--- a/org.librarysimplified.r2.api/build.gradle.kts
+++ b/org.librarysimplified.r2.api/build.gradle.kts
@@ -1,8 +1,8 @@
 dependencies {
-    implementation(libs.google.guava)
     implementation(libs.joda.time)
     implementation(libs.kotlin.stdlib)
     implementation(libs.r2.shared)
     implementation(libs.r2.streamer)
     implementation(libs.rxjava2)
+    implementation(libs.slf4j)
 }
diff --git a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2ControllerConfiguration.kt b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2ControllerConfiguration.kt
index ae3cec9..f0b4bb0 100644
--- a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2ControllerConfiguration.kt
+++ b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2ControllerConfiguration.kt
@@ -1,9 +1,8 @@
 package org.librarysimplified.r2.api
 
 import android.content.Context
-import com.google.common.util.concurrent.ListeningExecutorService
-import org.readium.r2.shared.publication.ContentProtection
-import org.readium.r2.shared.publication.asset.PublicationAsset
+import org.readium.r2.shared.publication.protection.ContentProtection
+import org.readium.r2.shared.util.asset.Asset
 
 /**
  * Configuration values for an R2 controller.
@@ -15,7 +14,7 @@ data class SR2ControllerConfiguration(
    * A publication asset containing a book.
    */
 
-  val bookFile: PublicationAsset,
+  val bookFile: Asset,
 
   /**
    * An identifier used to uniquely identify a publication. Unfortunately, identifier are optional
@@ -42,12 +41,6 @@ data class SR2ControllerConfiguration(
 
   val contentProtections: List<ContentProtection>,
 
-  /**
-   * An executor service used to execute I/O code on one or more background threads.
-   */
-
-  val ioExecutor: ListeningExecutorService,
-
   /**
    * A function that executes `f` on the Android UI thread.
    */
diff --git a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2ControllerProviderType.kt b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2ControllerProviderType.kt
index 80a38e1..55e2f69 100644
--- a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2ControllerProviderType.kt
+++ b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2ControllerProviderType.kt
@@ -1,7 +1,6 @@
 package org.librarysimplified.r2.api
 
-import com.google.common.util.concurrent.ListenableFuture
-import java.util.concurrent.Callable
+import android.app.Application
 
 /**
  * A provider of R2 controllers.
@@ -9,20 +8,6 @@ import java.util.concurrent.Callable
 
 interface SR2ControllerProviderType {
 
-  /**
-   * Create a new R2 controller on a thread provided by the given I/O executor.
-   */
-
-  fun create(
-    configuration: SR2ControllerConfiguration,
-  ): ListenableFuture<SR2ControllerType> {
-    return configuration.ioExecutor.submit(
-      Callable {
-        this.createHere(configuration)
-      },
-    )
-  }
-
   /**
    * Create a new controller on the current thread.
    *
@@ -30,7 +15,8 @@ interface SR2ControllerProviderType {
    * should _not_ be called on the Android UI thread.
    */
 
-  fun createHere(
+  fun create(
+    context: Application,
     configuration: SR2ControllerConfiguration,
   ): SR2ControllerType
 }
diff --git a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Event.kt b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Event.kt
index 71d0ea5..3f099ae 100644
--- a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Event.kt
+++ b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Event.kt
@@ -1,6 +1,7 @@
 package org.librarysimplified.r2.api
 
 import org.readium.r2.shared.Search
+import org.readium.r2.shared.publication.Href
 import org.readium.r2.shared.publication.services.search.SearchIterator
 
 /**
@@ -51,7 +52,7 @@ sealed class SR2Event {
    */
 
   data class SR2ReadingPositionChanged(
-    val chapterHref: String,
+    val chapterHref: Href,
     val chapterProgress: Double,
     val chapterTitle: String?,
     val currentPage: Int?,
diff --git a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Executors.kt b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Executors.kt
new file mode 100644
index 0000000..9ffeac4
--- /dev/null
+++ b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Executors.kt
@@ -0,0 +1,21 @@
+package org.librarysimplified.r2.api
+
+import org.slf4j.LoggerFactory
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+
+object SR2Executors {
+
+  private val logger =
+    LoggerFactory.getLogger(SR2Executors::class.java)
+
+  val ioExecutor: Executor =
+    Executors.newSingleThreadExecutor { r ->
+      val thread = Thread(r)
+      thread.name = "org.librarysimplified.r2.io"
+      thread.setUncaughtExceptionHandler { t, e ->
+        logger.error("Uncaught exception: ", e)
+      }
+      thread
+    }
+}
diff --git a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Locator.kt b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Locator.kt
index 7fb9fd0..f293d92 100644
--- a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Locator.kt
+++ b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2Locator.kt
@@ -1,15 +1,17 @@
 package org.librarysimplified.r2.api
 
+import org.readium.r2.shared.publication.Href
+
 /**
  * A location within a book.
  */
 
 sealed class SR2Locator : Comparable<SR2Locator> {
 
-  abstract val chapterHref: String
+  abstract val chapterHref: Href
 
   data class SR2LocatorPercent(
-    override val chapterHref: String,
+    override val chapterHref: Href,
     val chapterProgress: Double,
   ) : SR2Locator() {
 
@@ -20,13 +22,13 @@ sealed class SR2Locator : Comparable<SR2Locator> {
     }
 
     companion object {
-      fun start(href: String): SR2LocatorPercent {
+      fun start(href: Href): SR2LocatorPercent {
         return SR2LocatorPercent(chapterProgress = 0.0, chapterHref = href)
       }
     }
 
     override fun compareTo(other: SR2Locator): Int {
-      val indexCmp = this.chapterHref.compareTo(other.chapterHref)
+      val indexCmp = this.chapterHref.toString().compareTo(other.chapterHref.toString())
       return if (indexCmp == 0) {
         when (other) {
           is SR2LocatorPercent ->
@@ -41,10 +43,10 @@ sealed class SR2Locator : Comparable<SR2Locator> {
   }
 
   data class SR2LocatorChapterEnd(
-    override val chapterHref: String,
+    override val chapterHref: Href,
   ) : SR2Locator() {
     override fun compareTo(other: SR2Locator): Int {
-      val indexCmp = this.chapterHref.compareTo(other.chapterHref)
+      val indexCmp = this.chapterHref.toString().compareTo(other.chapterHref.toString())
       return if (indexCmp == 0) {
         when (other) {
           is SR2LocatorPercent ->
diff --git a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2TOCEntry.kt b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2TOCEntry.kt
index b590288..c3e0214 100644
--- a/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2TOCEntry.kt
+++ b/org.librarysimplified.r2.api/src/main/java/org/librarysimplified/r2/api/SR2TOCEntry.kt
@@ -1,12 +1,14 @@
 package org.librarysimplified.r2.api
 
+import org.readium.r2.shared.publication.Href
+
 /**
  * A flattened entry from the table of contents.
  */
 
 data class SR2TOCEntry(
   val title: String,
-  val href: String,
+  val href: Href,
   val depth: Int,
 ) {
   init {
diff --git a/org.librarysimplified.r2.demo/build.gradle.kts b/org.librarysimplified.r2.demo/build.gradle.kts
index 974a9f7..648a70f 100644
--- a/org.librarysimplified.r2.demo/build.gradle.kts
+++ b/org.librarysimplified.r2.demo/build.gradle.kts
@@ -57,8 +57,6 @@ dependencies {
     implementation(libs.androidx.vectordrawable.animated)
     implementation(libs.androidx.viewpager)
     implementation(libs.androidx.viewpager2)
-    implementation(libs.google.failureaccess)
-    implementation(libs.google.guava)
     implementation(libs.google.material)
     implementation(libs.joda.time)
     implementation(libs.jsoup)
diff --git a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoActivity.kt b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoActivity.kt
index 6a5576e..b6a78ac 100644
--- a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoActivity.kt
+++ b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoActivity.kt
@@ -3,21 +3,16 @@ package org.librarysimplified.r2.demo
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.view.View
-import android.widget.Button
-import android.widget.CheckBox
 import android.widget.Toast
 import androidx.annotation.UiThread
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import io.reactivex.disposables.Disposable
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.coroutines.runBlocking
 import org.librarysimplified.r2.api.SR2Command
-import org.librarysimplified.r2.api.SR2ControllerType
 import org.librarysimplified.r2.api.SR2Event
 import org.librarysimplified.r2.api.SR2Event.SR2BookmarkEvent.SR2BookmarkCreate
 import org.librarysimplified.r2.api.SR2Event.SR2BookmarkEvent.SR2BookmarkCreated
@@ -36,25 +31,26 @@ import org.librarysimplified.r2.api.SR2Event.SR2ExternalLinkSelected
 import org.librarysimplified.r2.api.SR2Event.SR2OnCenterTapped
 import org.librarysimplified.r2.api.SR2Event.SR2ReadingPositionChanged
 import org.librarysimplified.r2.api.SR2Event.SR2ThemeChanged
-import org.librarysimplified.r2.api.SR2PageNumberingMode
-import org.librarysimplified.r2.api.SR2ScrollingMode
 import org.librarysimplified.r2.ui_thread.SR2UIThread
 import org.librarysimplified.r2.vanilla.SR2Controllers
 import org.librarysimplified.r2.views.SR2ControllerReference
+import org.librarysimplified.r2.views.SR2Fragment
 import org.librarysimplified.r2.views.SR2ReaderFragment
-import org.librarysimplified.r2.views.SR2ReaderFragmentFactory
-import org.librarysimplified.r2.views.SR2ReaderParameters
+import org.librarysimplified.r2.views.SR2ReaderModel
+import org.librarysimplified.r2.views.SR2ReaderViewCommand
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationReaderClose
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationSearchClose
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationSearchOpen
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationTOCClose
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationTOCOpen
 import org.librarysimplified.r2.views.SR2ReaderViewEvent
 import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewBookEvent.SR2BookLoadingFailed
 import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewControllerEvent.SR2ControllerBecameAvailable
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationClose
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationOpenSearch
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationOpenTOC
-import org.librarysimplified.r2.views.SR2ReaderViewModel
-import org.librarysimplified.r2.views.SR2ReaderViewModelFactory
+import org.librarysimplified.r2.views.SR2SearchFragment
 import org.librarysimplified.r2.views.SR2TOCFragment
-import org.librarysimplified.r2.views.search.SR2SearchFragment
-import org.readium.r2.shared.publication.asset.FileAsset
+import org.readium.r2.shared.util.Try
+import org.readium.r2.shared.util.asset.AssetRetriever
+import org.readium.r2.shared.util.http.DefaultHttpClient
 import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.FileNotFoundException
@@ -66,42 +62,26 @@ import java.security.MessageDigest
 
 class DemoActivity : AppCompatActivity(R.layout.demo_activity_host) {
 
+  private val logger =
+    LoggerFactory.getLogger(DemoActivity::class.java)
+
   companion object {
     const val PICK_DOCUMENT = 1001
   }
 
-  private val logger =
-    LoggerFactory.getLogger(DemoActivity::class.java)
-
-  private lateinit var readerFragmentFactory: SR2ReaderFragmentFactory
-  private lateinit var readerParameters: SR2ReaderParameters
-  private var controller: SR2ControllerType? = null
-  private var controllerSubscription: Disposable? = null
-  private var epubFile: File? = null
-  private var epubId: String? = null
-  private var viewSubscription: Disposable? = null
-  private lateinit var scrollMode: CheckBox
-  private lateinit var perChapterPageNumbering: CheckBox
-  private lateinit var readerFragment: Fragment
-  private lateinit var searchFragment: Fragment
-  private lateinit var tocFragment: Fragment
+  private lateinit var subscriptions: CompositeDisposable
+  private var fragmentNow: Fragment? = null
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
     val toolbar = this.findViewById(R.id.mainToolbar) as Toolbar
     this.setSupportActionBar(toolbar)
-
-    if (savedInstanceState == null) {
-      this.setContentView(R.layout.demo_fragment_host)
-
-      val browseButton = this.findViewById<Button>(R.id.browse_button)!!
-      browseButton.setOnClickListener { this.startDocumentPickerForResult() }
-      this.scrollMode = this.findViewById(R.id.scrollMode)
-      this.perChapterPageNumbering = this.findViewById(R.id.perChapterPageNumbering)
-    }
+    this.fragmentNow = null
+    this.subscriptions = CompositeDisposable()
   }
 
+  @Deprecated("Deprecated in Java")
   override fun onActivityResult(
     requestCode: Int,
     resultCode: Int,
@@ -116,56 +96,49 @@ class DemoActivity : AppCompatActivity(R.layout.demo_activity_host) {
 
   override fun onStart() {
     super.onStart()
-    this.epubFile?.let(this::startReader)
-  }
 
-  override fun onStop() {
-    super.onStop()
-    this.controllerSubscription?.dispose()
-    this.viewSubscription?.dispose()
-  }
-
-  override fun onBackPressed() {
-    if (this.tocFragment.isVisible) {
-      this.tocClose()
-    } else if (this.searchFragment.isVisible) {
-      this.searchClose()
+    this.subscriptions = CompositeDisposable()
+    this.subscriptions.add(
+      SR2ReaderModel.controllerEvents.subscribe(this::onControllerEvent),
+    )
+    this.subscriptions.add(
+      SR2ReaderModel.viewCommands.subscribe(this::onViewCommandReceived),
+    )
+    this.subscriptions.add(
+      SR2ReaderModel.viewEvents.subscribe(this::onViewEventReceived),
+    )
+
+    if (DemoModel.epubFile == null) {
+      this.switchFragment(DemoFileSelectionFragment())
     } else {
-      super.onBackPressed()
+      this.switchFragment(SR2ReaderFragment())
     }
   }
 
-  private fun tocClose() {
-    SR2UIThread.checkIsUIThread()
-
-    this.supportFragmentManager.beginTransaction()
-      .hide(this.tocFragment)
-      .show(this.readerFragment)
-      .commit()
-  }
+  override fun onStop() {
+    super.onStop()
 
-  private fun searchClose() {
-    SR2UIThread.checkIsUIThread()
+    val fragment = this.fragmentNow
+    if (fragment != null) {
+      this.supportFragmentManager.beginTransaction()
+        .remove(fragment)
+        .commitAllowingStateLoss()
+    }
 
-    this.supportFragmentManager.beginTransaction()
-      .hide(this.searchFragment)
-      .show(this.readerFragment)
-      .commit()
+    this.subscriptions.dispose()
   }
 
+  @UiThread
   private fun onControllerBecameAvailable(reference: SR2ControllerReference) {
-    this.controller = reference.controller
-
-    // Listen for messages from the controller.
-    this.controllerSubscription =
-      reference.controller.events.subscribe(this::onControllerEvent)
+    this.switchFragment(SR2ReaderFragment())
 
     if (reference.isFirstStartup) {
       // Navigate to the first chapter or saved reading position.
-      val database = DemoApplication.application.database()
       val bookId = reference.controller.bookMetadata.id
-      reference.controller.submitCommand(SR2Command.BookmarksLoad(database.bookmarksFor(bookId)))
-      val lastRead = database.bookmarkFindLastReadLocation(bookId)
+      reference.controller.submitCommand(
+        SR2Command.BookmarksLoad(DemoModel.database.bookmarksFor(bookId)),
+      )
+      val lastRead = DemoModel.database.bookmarkFindLastReadLocation(bookId)
       val startLocator = lastRead?.locator ?: reference.controller.bookMetadata.start
       reference.controller.submitCommand(SR2Command.OpenChapter(startLocator))
     } else {
@@ -179,119 +152,121 @@ class DemoActivity : AppCompatActivity(R.layout.demo_activity_host) {
    */
 
   @UiThread
-  private fun startReader(file: File) {
+  private fun startReader() {
     SR2UIThread.checkIsUIThread()
 
-    val database =
-      DemoApplication.application.database()
-
-    this.readerParameters =
-      SR2ReaderParameters(
-        contentProtections = emptyList(),
-        bookFile = FileAsset(file),
-        bookId = this.epubId!!,
-        isPreview = false,
-        theme = database.theme(),
-        controllers = SR2Controllers(),
-        scrollingMode = if (this.scrollMode.isChecked) {
-          SR2ScrollingMode.SCROLLING_MODE_CONTINUOUS
-        } else {
-          SR2ScrollingMode.SCROLLING_MODE_PAGINATED
-        },
-        pageNumberingMode = if (this.perChapterPageNumbering.isChecked) {
-          SR2PageNumberingMode.PER_CHAPTER
-        } else {
-          SR2PageNumberingMode.WHOLE_BOOK
-        },
+    this.logger.debug("Opening asset...")
+    val assetRetriever =
+      AssetRetriever(
+        contentResolver = this.contentResolver,
+        httpClient = DefaultHttpClient(),
       )
 
-    this.readerFragmentFactory =
-      SR2ReaderFragmentFactory(this.readerParameters)
-
-    if (!::readerFragment.isInitialized) {
-      this.readerFragment =
-        this.readerFragmentFactory.instantiate(this.classLoader, SR2ReaderFragment::class.java.name)
-
-      this.searchFragment =
-        this.readerFragmentFactory.instantiate(this.classLoader, SR2SearchFragment::class.java.name)
-
-      this.tocFragment =
-        this.readerFragmentFactory.instantiate(this.classLoader, SR2TOCFragment::class.java.name)
-    }
-
-    val readerModel =
-      ViewModelProvider(this, SR2ReaderViewModelFactory(this.readerParameters))
-        .get(SR2ReaderViewModel::class.java)
-
-    this.viewSubscription =
-      readerModel.viewEvents.subscribe(this::onViewEvent)
-
-    val selectFileArea =
-      this.findViewById<View>(R.id.selectFileArea)
+    val file = DemoModel.epubFile!!
+    val id = DemoModel.epubId!!
 
-    selectFileArea.visibility = View.GONE
+    val asset =
+      when (val a = runBlocking { assetRetriever.retrieve(file) }) {
+        is Try.Failure -> TODO()
+        is Try.Success -> a.value
+      }
 
-    if (!readerFragment.isAdded) {
-      this.supportFragmentManager.beginTransaction()
-        .add(R.id.demoFragmentArea, readerFragment)
-        .commit()
-    }
+    SR2ReaderModel.controllerCreate(
+      contentProtections = emptyList(),
+      bookFile = asset,
+      bookId = id,
+      theme = DemoModel.database.theme(),
+      context = DemoApplication.application,
+      controllers = SR2Controllers(),
+    )
   }
 
   /**
    * Handle incoming messages from the view fragments.
    */
 
-  private fun onViewEvent(event: SR2ReaderViewEvent) {
+  @UiThread
+  private fun onViewEventReceived(event: SR2ReaderViewEvent) {
     SR2UIThread.checkIsUIThread()
 
     return when (event) {
-      SR2ReaderViewNavigationClose ->
-        this.onBackPressed()
-      SR2ReaderViewNavigationOpenTOC ->
-        this.openTOC()
       is SR2ControllerBecameAvailable ->
         this.onControllerBecameAvailable(event.reference)
+
       is SR2BookLoadingFailed ->
         this.onBookLoadingFailed(event.exception)
-      SR2ReaderViewNavigationOpenSearch -> {
-        this.openSearch()
-      }
     }
   }
 
-  private fun onBookLoadingFailed(exception: Throwable) {
-    AlertDialog.Builder(this)
-      .setMessage(exception.message)
-      .setOnDismissListener { this.finish() }
-      .create()
-      .show()
+  @Deprecated("Deprecated in Java")
+  override fun onBackPressed() {
+    return when (val f = this.fragmentNow) {
+      is DemoFileSelectionFragment -> {
+        super.onBackPressed()
+      }
+      is DemoLoadingFragment -> {
+        super.onBackPressed()
+      }
+      is SR2Fragment -> {
+        when (f) {
+          is SR2ReaderFragment -> {
+            this.switchFragment(DemoFileSelectionFragment())
+          }
+
+          is SR2SearchFragment -> {
+            this.switchFragment(SR2ReaderFragment())
+          }
+
+          is SR2TOCFragment -> {
+            this.switchFragment(SR2ReaderFragment())
+          }
+        }
+      }
+      null -> {
+        super.onBackPressed()
+      }
+      else -> {
+        throw IllegalStateException("Unrecognized fragment: $f")
+      }
+    }
   }
 
-  private fun openSearch() {
-    val transaction = this.supportFragmentManager.beginTransaction()
-      .hide(readerFragment)
+  @UiThread
+  private fun onViewCommandReceived(command: SR2ReaderViewCommand) {
+    SR2UIThread.checkIsUIThread()
 
-    if (searchFragment.isAdded) {
-      transaction.show(searchFragment)
-    } else {
-      transaction.add(R.id.demoFragmentArea, searchFragment)
+    return when (command) {
+      SR2ReaderViewNavigationSearchOpen -> {
+        this.switchFragment(SR2SearchFragment())
+      }
+      SR2ReaderViewNavigationTOCOpen -> {
+        this.switchFragment(SR2TOCFragment())
+      }
+      SR2ReaderViewNavigationReaderClose -> {
+        this.switchFragment(DemoFileSelectionFragment())
+      }
+      SR2ReaderViewNavigationSearchClose -> {
+        this.switchFragment(SR2ReaderFragment())
+      }
+      SR2ReaderViewNavigationTOCClose -> {
+        this.switchFragment(SR2ReaderFragment())
+      }
     }
-
-    transaction.commit()
   }
 
-  private fun openTOC() {
-    val transaction = this.supportFragmentManager.beginTransaction()
-      .hide(readerFragment)
-
-    if (tocFragment.isAdded) {
-      transaction.show(tocFragment)
-    } else {
-      transaction.add(R.id.demoFragmentArea, tocFragment)
-    }
+  private fun switchFragment(fragment: Fragment) {
+    this.fragmentNow = fragment
+    this.supportFragmentManager.beginTransaction()
+      .replace(R.id.mainFragmentHolder, fragment)
+      .commit()
+  }
 
-    transaction.commit()
+  private fun onBookLoadingFailed(exception: Throwable) {
+    AlertDialog.Builder(this)
+      .setMessage(exception.message)
+      .setOnDismissListener { this.finish() }
+      .create()
+      .show()
   }
 
   /**
@@ -301,19 +276,22 @@ class DemoActivity : AppCompatActivity(R.layout.demo_activity_host) {
   private fun onControllerEvent(event: SR2Event) {
     when (event) {
       is SR2BookmarkCreate -> {
-        val database = DemoApplication.application.database()
-        database.bookmarkSave(this.controller!!.bookMetadata.id, event.bookmark)
+        DemoModel.database.bookmarkSave(
+          SR2ReaderModel.controller().bookMetadata.id,
+          event.bookmark,
+        )
         event.onBookmarkCreationCompleted(event.bookmark)
       }
 
       is SR2BookmarkDeleted -> {
-        val database = DemoApplication.application.database()
-        database.bookmarkDelete(this.controller!!.bookMetadata.id, event.bookmark)
+        DemoModel.database.bookmarkDelete(
+          SR2ReaderModel.controller().bookMetadata.id,
+          event.bookmark,
+        )
       }
 
       is SR2ThemeChanged -> {
-        val database = DemoApplication.application.database()
-        database.themeSet(event.theme)
+        DemoModel.database.themeSet(event.theme)
       }
 
       is SR2BookmarkCreated,
@@ -341,14 +319,19 @@ class DemoActivity : AppCompatActivity(R.layout.demo_activity_host) {
    */
 
   private fun onPickDocumentResult(resultCode: Int, intent: Intent?) {
+    SR2UIThread.checkIsUIThread()
+    this.switchFragment(DemoLoadingFragment())
+
     // Assume the user picked a valid EPUB file. In reality, we'd want to verify
     // this is a supported file type.
     if (resultCode == Activity.RESULT_OK) {
       intent?.data?.let { uri ->
         // This copy operation should be done on a worker thread; omitted for brevity.
         val data = this.copyToStorage(uri)!!
-        this.epubFile = data.first
-        this.epubId = data.second
+        DemoModel.setEpubAndId(data)
+
+        this.logger.debug("Starting reader...")
+        this.startReader()
       }
     }
   }
@@ -374,7 +357,7 @@ class DemoActivity : AppCompatActivity(R.layout.demo_activity_host) {
       ips = this.contentResolver.openInputStream(uri)
       ops = file.outputStream()
       ips?.copyTo(ops)
-      return Pair(file, hashOf(file))
+      return Pair(file, this.hashOf(file))
     } catch (e: FileNotFoundException) {
       this.logger.warn("File not found", e)
       this.showError("File not found")
@@ -406,25 +389,4 @@ class DemoActivity : AppCompatActivity(R.layout.demo_activity_host) {
     override fun write(b: Int) {
     }
   }
-
-  /**
-   * Present the native document picker and prompt the user to select an EPUB.
-   */
-
-  private fun startDocumentPickerForResult() {
-    val pickIntent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-      this.type = "*/*"
-      this.addCategory(Intent.CATEGORY_OPENABLE)
-
-      // Filter by MIME type; Android versions prior to Marshmallow don't seem
-      // to understand the 'application/epub+zip' MIME type.
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        this.putExtra(
-          Intent.EXTRA_MIME_TYPES,
-          arrayOf("application/epub+zip"),
-        )
-      }
-    }
-    this.startActivityForResult(pickIntent, PICK_DOCUMENT)
-  }
 }
diff --git a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoApplication.kt b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoApplication.kt
index 3453500..dd67120 100644
--- a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoApplication.kt
+++ b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoApplication.kt
@@ -18,18 +18,13 @@ class DemoApplication : MultiDexApplication() {
       get() = this.INSTANCE
   }
 
-  private lateinit var database: DemoDatabase
   private val logger = LoggerFactory.getLogger(DemoApplication::class.java)
 
-  fun database(): DemoDatabase {
-    return this.database
-  }
-
   override fun onCreate() {
     super.onCreate()
 
     this.configureLogging()
-    this.database = DemoDatabase(this)
+    DemoModel.initialize(this)
 
     this.logger.debug("starting app: pid {}", android.os.Process.myPid())
     INSTANCE = this
diff --git a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoDatabase.kt b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoDatabase.kt
index e16d3e9..9cfa0d1 100644
--- a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoDatabase.kt
+++ b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoDatabase.kt
@@ -1,6 +1,5 @@
 package org.librarysimplified.r2.demo
 
-import android.content.Context
 import org.joda.time.DateTime
 import org.librarysimplified.r2.api.SR2Bookmark
 import org.librarysimplified.r2.api.SR2Bookmark.Type
@@ -11,6 +10,7 @@ import org.librarysimplified.r2.api.SR2Font
 import org.librarysimplified.r2.api.SR2Locator.SR2LocatorChapterEnd
 import org.librarysimplified.r2.api.SR2Locator.SR2LocatorPercent
 import org.librarysimplified.r2.api.SR2Theme
+import org.readium.r2.shared.publication.Href
 import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.ObjectInputStream
@@ -25,7 +25,7 @@ import java.util.concurrent.Executors
  * This object provides an excessively simple persistent database.
  */
 
-class DemoDatabase(private val context: Context) {
+class DemoDatabase(private val baseDirectory: File) {
 
   private val logger =
     LoggerFactory.getLogger(DemoDatabase::class.java)
@@ -72,7 +72,7 @@ class DemoDatabase(private val context: Context) {
           date = bookmark.time,
           type = bookmark.type,
           title = bookmark.title,
-          locator = SR2LocatorPercent(bookmark.chapterHref, bookmark.chapterProgress),
+          locator = SR2LocatorPercent(Href(bookmark.chapterHref)!!, bookmark.chapterProgress),
           bookProgress = bookmark.bookProgress,
           uri = bookmark.uri,
         )
@@ -90,7 +90,7 @@ class DemoDatabase(private val context: Context) {
     }
 
     val existing = this.bookmarks[bookId]?.toMutableList() ?: mutableListOf()
-    existing.removeAll { it == toSerializable(bookmark) }
+    existing.removeAll { it == this.toSerializable(bookmark) }
     this.bookmarks[bookId] = existing.toList()
     this.ioExecutor.execute { this.saveMap() }
   }
@@ -111,7 +111,7 @@ class DemoDatabase(private val context: Context) {
       }
     }
 
-    val serializable = toSerializable(bookmark)
+    val serializable = this.toSerializable(bookmark)
     existing.removeAll { it == serializable }
     existing.add(serializable)
     this.bookmarks[bookId] = existing.toList()
@@ -127,7 +127,7 @@ class DemoDatabase(private val context: Context) {
           time = bookmark.date,
           type = bookmark.type,
           title = bookmark.title,
-          chapterHref = bookmark.locator.chapterHref,
+          chapterHref = bookmark.locator.chapterHref.toString(),
           chapterProgress = locator.chapterProgress,
           uri = bookmark.uri,
         )
@@ -137,7 +137,7 @@ class DemoDatabase(private val context: Context) {
           time = bookmark.date,
           type = bookmark.type,
           title = bookmark.title,
-          chapterHref = bookmark.locator.chapterHref,
+          chapterHref = bookmark.locator.chapterHref.toString(),
           chapterProgress = 1.0,
           uri = bookmark.uri,
         )
@@ -149,12 +149,12 @@ class DemoDatabase(private val context: Context) {
     return try {
       this.logger.debug("loading bookmarks")
 
-      val file = File(this.context.filesDir, "bookmarks.dat")
+      val file = File(this.baseDirectory, "bookmarks.dat")
       file.inputStream().use { stream ->
         ObjectInputStream(stream).use { objectStream ->
           val map = objectStream.readObject() as ConcurrentHashMap<String, List<SerializableBookmark>>
           this.logger.debug("loaded {} bookmarks", this.countBookmarks(map))
-          logBookmarks(map)
+          this.logBookmarks(map)
           map
         }
       }
@@ -177,9 +177,9 @@ class DemoDatabase(private val context: Context) {
       this.logger.debug("saving {} bookmarks", this.countBookmarks(this.bookmarks))
 
       val fileTmp =
-        File(this.context.filesDir, "bookmarks.dat.tmp")
+        File(this.baseDirectory, "bookmarks.dat.tmp")
       val file =
-        File(this.context.filesDir, "bookmarks.dat")
+        File(this.baseDirectory, "bookmarks.dat")
 
       fileTmp.outputStream().use { stream ->
         ObjectOutputStream(stream).use { objectStream ->
@@ -196,7 +196,7 @@ class DemoDatabase(private val context: Context) {
     return try {
       this.logger.debug("loading theme")
 
-      val file = File(this.context.filesDir, "theme.dat")
+      val file = File(this.baseDirectory, "theme.dat")
       val properties = Properties()
       file.inputStream().use(properties::load)
 
@@ -216,9 +216,9 @@ class DemoDatabase(private val context: Context) {
       this.logger.debug("saving theme")
 
       val fileTmp =
-        File(this.context.filesDir, "theme.dat.tmp")
+        File(this.baseDirectory, "theme.dat.tmp")
       val file =
-        File(this.context.filesDir, "theme.dat")
+        File(this.baseDirectory, "theme.dat")
 
       val properties = Properties()
       properties["colorScheme"] = theme.colorScheme.name
diff --git a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoFileSelectionFragment.kt b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoFileSelectionFragment.kt
new file mode 100644
index 0000000..a5b93e1
--- /dev/null
+++ b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoFileSelectionFragment.kt
@@ -0,0 +1,78 @@
+package org.librarysimplified.r2.demo
+
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.CheckBox
+import androidx.fragment.app.Fragment
+import org.librarysimplified.r2.api.SR2PageNumberingMode
+import org.librarysimplified.r2.api.SR2ScrollingMode
+
+class DemoFileSelectionFragment : Fragment(R.layout.demo_file_selection) {
+
+  private lateinit var demoLoaderBrowseButton: Button
+  private lateinit var demoLoaderPerChapterPageNumbering: CheckBox
+  private lateinit var demoLoaderScrollMode: CheckBox
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?,
+  ): View? {
+    val layout =
+      inflater.inflate(R.layout.demo_file_selection, container, false)
+
+    this.demoLoaderBrowseButton =
+      layout.findViewById(R.id.demoBrowseFileButton)
+    this.demoLoaderScrollMode =
+      layout.findViewById(R.id.demoScrollMode)
+    this.demoLoaderPerChapterPageNumbering =
+      layout.findViewById(R.id.demoPerChapterPageNumbering)
+
+    this.demoLoaderBrowseButton.setOnClickListener {
+      this.startDocumentPickerForResult()
+    }
+
+    this.demoLoaderScrollMode.setOnCheckedChangeListener { _, isChecked ->
+      DemoModel.scrollMode = when (isChecked) {
+        true -> SR2ScrollingMode.SCROLLING_MODE_CONTINUOUS
+        false -> SR2ScrollingMode.SCROLLING_MODE_PAGINATED
+      }
+    }
+
+    this.demoLoaderPerChapterPageNumbering.setOnCheckedChangeListener { _, isChecked ->
+      DemoModel.perChapterNumbering = when (isChecked) {
+        true -> SR2PageNumberingMode.PER_CHAPTER
+        false -> SR2PageNumberingMode.WHOLE_BOOK
+      }
+    }
+
+    return layout
+  }
+
+  /**
+   * Present the native document picker and prompt the user to select an EPUB.
+   */
+
+  private fun startDocumentPickerForResult() {
+    val pickIntent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+      this.type = "*/*"
+      this.addCategory(Intent.CATEGORY_OPENABLE)
+
+      // Filter by MIME type; Android versions prior to Marshmallow don't seem
+      // to understand the 'application/epub+zip' MIME type.
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        this.putExtra(
+          Intent.EXTRA_MIME_TYPES,
+          arrayOf("application/epub+zip"),
+        )
+      }
+    }
+
+    this.requireActivity().startActivityForResult(pickIntent, DemoActivity.PICK_DOCUMENT)
+  }
+}
diff --git a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoLoadingFragment.kt b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoLoadingFragment.kt
new file mode 100644
index 0000000..8cd69e0
--- /dev/null
+++ b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoLoadingFragment.kt
@@ -0,0 +1,5 @@
+package org.librarysimplified.r2.demo
+
+import androidx.fragment.app.Fragment
+
+class DemoLoadingFragment : Fragment(R.layout.demo_loading)
diff --git a/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoModel.kt b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoModel.kt
new file mode 100644
index 0000000..4d45b11
--- /dev/null
+++ b/org.librarysimplified.r2.demo/src/main/java/org/librarysimplified/r2/demo/DemoModel.kt
@@ -0,0 +1,43 @@
+package org.librarysimplified.r2.demo
+
+import android.content.Context
+import org.librarysimplified.r2.api.SR2PageNumberingMode
+import org.librarysimplified.r2.api.SR2ScrollingMode
+import java.io.File
+
+object DemoModel {
+
+  private lateinit var databaseField: DemoDatabase
+
+  @Volatile
+  private var epubIdField: String? = null
+
+  @Volatile
+  private var epubFileField: File? = null
+
+  @Volatile
+  var scrollMode: SR2ScrollingMode =
+    SR2ScrollingMode.SCROLLING_MODE_PAGINATED
+
+  @Volatile
+  var perChapterNumbering: SR2PageNumberingMode =
+    SR2PageNumberingMode.PER_CHAPTER
+
+  val database: DemoDatabase
+    get() = this.databaseField
+
+  val epubFile: File?
+    get() = this.epubFileField
+
+  val epubId: String?
+    get() = this.epubIdField
+
+  fun initialize(context: Context) {
+    this.databaseField = DemoDatabase(context.filesDir)
+  }
+
+  fun setEpubAndId(data: Pair<File, String>) {
+    this.epubFileField = data.first
+    this.epubIdField = data.second
+  }
+}
diff --git a/org.librarysimplified.r2.demo/src/main/res/layout/demo_activity_host.xml b/org.librarysimplified.r2.demo/src/main/res/layout/demo_activity_host.xml
index ba850c7..c8a8941 100644
--- a/org.librarysimplified.r2.demo/src/main/res/layout/demo_activity_host.xml
+++ b/org.librarysimplified.r2.demo/src/main/res/layout/demo_activity_host.xml
@@ -1,4 +1,5 @@
 <?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"
@@ -15,5 +16,5 @@
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_weight="1" />
-</LinearLayout>
 
+</LinearLayout>
diff --git a/org.librarysimplified.r2.demo/src/main/res/layout/demo_file_selection.xml b/org.librarysimplified.r2.demo/src/main/res/layout/demo_file_selection.xml
new file mode 100644
index 0000000..2a354c0
--- /dev/null
+++ b/org.librarysimplified.r2.demo/src/main/res/layout/demo_file_selection.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/demoSelectFileArea"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:gravity="center"
+  android:orientation="vertical">
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/text_pick_epub"
+    android:textAppearance="?android:textAppearanceMedium" />
+
+  <Button
+    android:id="@+id/demoBrowseFileButton"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dp"
+    android:text="@string/btn_browse_files" />
+
+  <CheckBox
+    android:id="@+id/demoScrollMode"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dp"
+    android:text="Scrolling mode" />
+
+  <CheckBox
+    android:id="@+id/demoPerChapterPageNumbering"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dp"
+    android:text="Per chapter page numbering" />
+
+</LinearLayout>
diff --git a/org.librarysimplified.r2.demo/src/main/res/layout/demo_fragment_host.xml b/org.librarysimplified.r2.demo/src/main/res/layout/demo_fragment_host.xml
deleted file mode 100644
index 35e3a31..0000000
--- a/org.librarysimplified.r2.demo/src/main/res/layout/demo_fragment_host.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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:id="@+id/demoFragmentArea"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-  <LinearLayout
-    android:id="@+id/selectFileArea"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical"
-    tools:ignore="UselessParent">
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/text_pick_epub"
-      android:textAppearance="?android:textAppearanceMedium" />
-
-    <Button
-      android:id="@+id/browse_button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="16dp"
-      android:text="@string/btn_browse_files" />
-
-    <CheckBox
-      android:id="@+id/scrollMode"
-      android:layout_marginTop="16dp"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="Scrolling mode" />
-
-    <CheckBox
-      android:id="@+id/perChapterPageNumbering"
-      android:layout_marginTop="16dp"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="Per chapter page numbering" />
-  </LinearLayout>
-</FrameLayout>
diff --git a/org.librarysimplified.r2.demo/src/main/res/layout/demo_loading.xml b/org.librarysimplified.r2.demo/src/main/res/layout/demo_loading.xml
new file mode 100644
index 0000000..480945c
--- /dev/null
+++ b/org.librarysimplified.r2.demo/src/main/res/layout/demo_loading.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/demoSelectFileArea"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:gravity="center"
+  android:orientation="vertical">
+
+  <ProgressBar
+    android:id="@+id/progressBar"
+    style="?android:attr/progressBarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/org.librarysimplified.r2.tests/src/test/java/org/librarysimplified/r2/tests/SR2NavigationGraphsTest.kt b/org.librarysimplified.r2.tests/src/test/java/org/librarysimplified/r2/tests/SR2NavigationGraphsTest.kt
index 2c1393f..b1bed3a 100644
--- a/org.librarysimplified.r2.tests/src/test/java/org/librarysimplified/r2/tests/SR2NavigationGraphsTest.kt
+++ b/org.librarysimplified.r2.tests/src/test/java/org/librarysimplified/r2/tests/SR2NavigationGraphsTest.kt
@@ -6,12 +6,14 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.librarysimplified.r2.api.SR2Locator
+import org.librarysimplified.r2.api.SR2Locator.*
+import org.librarysimplified.r2.api.SR2Locator.SR2LocatorPercent.*
 import org.librarysimplified.r2.vanilla.internal.SR2NavigationGraphs
 import org.librarysimplified.r2.vanilla.internal.SR2NavigationNode
 import org.librarysimplified.r2.vanilla.internal.SR2NavigationNode.SR2NavigationReadingOrderNode
 import org.librarysimplified.r2.vanilla.internal.SR2NavigationTarget
 import org.mockito.Mockito
+import org.readium.r2.shared.publication.Href
 import org.slf4j.LoggerFactory
 import java.io.File
 
@@ -77,18 +79,18 @@ class SR2NavigationGraphsTest {
     val graph = SR2NavigationGraphs.create(publication)
 
     fun List<SR2NavigationNode>.firstWithHref(href: String): SR2NavigationNode =
-      this.first { it.navigationPoint.locator.chapterHref == href }
+      this.first { it.navigationPoint.locator.chapterHref == Href(href)!! }
 
     assertEquals(1, graph.readingOrder.size)
     assertEquals(4, graph.resources.size)
     assertEquals("Something", graph.readingOrder[0].navigationPoint.title)
 
     var target: SR2NavigationTarget? = null
-    target = graph.findNavigationNode(SR2Locator.SR2LocatorPercent.start("/epub/text/p1.xhtml"))
+    target = graph.findNavigationNode(SR2LocatorPercent.start(Href("/epub/text/p1.xhtml")!!))
     assertEquals("Something Nested", target!!.node.navigationPoint.title)
     assertEquals(null, target.extraFragment)
 
-    target = graph.findNavigationNode(SR2Locator.SR2LocatorPercent.start("/epub/text/p2.xhtml"))
+    target = graph.findNavigationNode(SR2LocatorPercent.start(Href("/epub/text/p2.xhtml")!!))
     assertEquals("Something Else Nested", target!!.node.navigationPoint.title)
     assertEquals(null, target.extraFragment)
 
@@ -141,27 +143,27 @@ class SR2NavigationGraphsTest {
     assertEquals(null, node)
 
     var target: SR2NavigationTarget? = null
-    target = graph.findNavigationNode(SR2Locator.SR2LocatorPercent.start("/epub/text/p0.xhtml"))
+    target = graph.findNavigationNode(SR2LocatorPercent.start(Href("/epub/text/p0.xhtml")!!))
     assertEquals("Chapter 0", target!!.node.navigationPoint.title)
     assertEquals(null, target.extraFragment)
 
-    target = graph.findNavigationNode(SR2Locator.SR2LocatorPercent.start("/epub/text/p0.xhtml#p0_02"))
+    target = graph.findNavigationNode(SR2LocatorPercent.start(Href("/epub/text/p0.xhtml#p0_02")!!))
     assertEquals("Chapter 0", target!!.node.navigationPoint.title)
     assertEquals("p0_02", target.extraFragment)
 
-    target = graph.findNavigationNode(SR2Locator.SR2LocatorPercent.start("/epub/text/p1.xhtml#p1_01"))
+    target = graph.findNavigationNode(SR2LocatorPercent.start(Href("/epub/text/p1.xhtml#p1_01")!!))
     assertEquals("Chapter 1", target!!.node.navigationPoint.title)
     assertEquals("p1_01", target.extraFragment)
 
-    target = graph.findNavigationNode(SR2Locator.SR2LocatorPercent.start("/epub/text/p1.xhtml#p1_02"))
+    target = graph.findNavigationNode(SR2LocatorPercent.start(Href("/epub/text/p1.xhtml#p1_02")!!))
     assertEquals("Chapter 1", target!!.node.navigationPoint.title)
     assertEquals("p1_02", target.extraFragment)
 
-    target = graph.findNavigationNode(SR2Locator.SR2LocatorPercent.start("/epub/text/p2.xhtml#p2_01"))
+    target = graph.findNavigationNode(SR2LocatorPercent.start(Href("/epub/text/p2.xhtml#p2_01")!!))
     assertEquals("Chapter 2", target!!.node.navigationPoint.title)
     assertEquals("p2_01", target.extraFragment)
 
-    target = graph.findNavigationNode(SR2Locator.SR2LocatorPercent.start("/epub/text/p2.xhtml#p2_02"))
+    target = graph.findNavigationNode(SR2LocatorPercent.start(Href("/epub/text/p2.xhtml#p2_02")!!))
     assertEquals("Chapter 2", target!!.node.navigationPoint.title)
     assertEquals("p2_02", target.extraFragment)
   }
diff --git a/org.librarysimplified.r2.tests/src/test/java/org/librarysimplified/r2/tests/TestPublication.kt b/org.librarysimplified.r2.tests/src/test/java/org/librarysimplified/r2/tests/TestPublication.kt
index 64706d5..04d5519 100644
--- a/org.librarysimplified.r2.tests/src/test/java/org/librarysimplified/r2/tests/TestPublication.kt
+++ b/org.librarysimplified.r2.tests/src/test/java/org/librarysimplified/r2/tests/TestPublication.kt
@@ -2,11 +2,16 @@ package org.librarysimplified.r2.tests
 
 import android.content.Context
 import kotlinx.coroutines.runBlocking
+import org.librarysimplified.r2.vanilla.BuildConfig
+import org.librarysimplified.r2.vanilla.internal.SR2NoPDFFactory
 import org.mockito.Mockito
 import org.readium.r2.shared.publication.Publication
-import org.readium.r2.shared.publication.asset.FileAsset
-import org.readium.r2.shared.util.getOrElse
-import org.readium.r2.streamer.Streamer
+import org.readium.r2.shared.util.ErrorException
+import org.readium.r2.shared.util.Try
+import org.readium.r2.shared.util.asset.AssetRetriever
+import org.readium.r2.shared.util.http.DefaultHttpClient
+import org.readium.r2.streamer.PublicationOpener
+import org.readium.r2.streamer.parser.DefaultPublicationParser
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -30,11 +35,39 @@ object TestPublication {
     Mockito.`when`(context.applicationContext)
       .thenReturn(context)
 
-    val streamer = Streamer(context)
+    val httpClient =
+      DefaultHttpClient(userAgent = "${BuildConfig.LIBRARY_PACKAGE_NAME}/${BuildConfig.R2_VERSION_NAME}")
+    val assetRetriever =
+      AssetRetriever(context.contentResolver, httpClient)
+
+    val publicationParser =
+      DefaultPublicationParser(
+        context = context,
+        httpClient = httpClient,
+        assetRetriever = assetRetriever,
+        pdfFactory = SR2NoPDFFactory,
+      )
+    val publicationOpener =
+      PublicationOpener(
+        publicationParser = publicationParser,
+        contentProtections = listOf(),
+        onCreatePublication = {
+        },
+      )
+
     return runBlocking {
-      streamer.open(FileAsset(output), allowUserInteraction = false)
-    }.getOrElse {
-      throw IOException("Failed to open EPUB", it)
+      when (val result = assetRetriever.retrieve(output)) {
+        is Try.Failure -> throw IOException("Failed to open EPUB", ErrorException(result.value))
+        is Try.Success ->
+          when (val pub = publicationOpener.open(
+            asset = result.value,
+            credentials = null,
+            allowUserInteraction = false,
+          )) {
+            is Try.Failure -> throw IOException("Failed to open EPUB", ErrorException(pub.value))
+            is Try.Success -> pub.value
+          }
+      }
     }
   }
 }
diff --git a/org.librarysimplified.r2.vanilla/build.gradle.kts b/org.librarysimplified.r2.vanilla/build.gradle.kts
index 01239fa..94e0b12 100644
--- a/org.librarysimplified.r2.vanilla/build.gradle.kts
+++ b/org.librarysimplified.r2.vanilla/build.gradle.kts
@@ -3,8 +3,6 @@ dependencies {
     implementation(project(":org.librarysimplified.r2.ui_thread"))
 
     implementation(libs.androidx.annotation)
-    implementation(libs.google.failureaccess)
-    implementation(libs.google.guava)
     implementation(libs.jcip.annotations)
     implementation(libs.joda.time)
     implementation(libs.kotlin.stdlib)
@@ -18,4 +16,9 @@ dependencies {
 
 android {
     buildFeatures.buildConfig = true
+
+    defaultConfig {
+        val versionName = project.extra["VERSION_NAME"] as String
+        buildConfigField("String", "R2_VERSION_NAME", "\"${versionName}\"")
+    }
 }
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/SR2Controllers.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/SR2Controllers.kt
index ce034fb..b9618b7 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/SR2Controllers.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/SR2Controllers.kt
@@ -1,5 +1,6 @@
 package org.librarysimplified.r2.vanilla
 
+import android.app.Application
 import org.librarysimplified.r2.api.SR2ControllerConfiguration
 import org.librarysimplified.r2.api.SR2ControllerProviderType
 import org.librarysimplified.r2.api.SR2ControllerType
@@ -11,7 +12,10 @@ import org.librarysimplified.r2.vanilla.internal.SR2Controller
 
 class SR2Controllers : SR2ControllerProviderType {
 
-  override fun createHere(configuration: SR2ControllerConfiguration): SR2ControllerType {
-    return SR2Controller.create(configuration)
+  override fun create(
+    context: Application,
+    configuration: SR2ControllerConfiguration,
+  ): SR2ControllerType {
+    return SR2Controller.create(context, configuration)
   }
 }
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Books.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Books.kt
index a4d26d5..e45c52e 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Books.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Books.kt
@@ -20,7 +20,7 @@ object SR2Books {
 
     return SR2BookMetadata(
       id = bookId,
-      title = publication.metadata.title,
+      title = publication.metadata.title ?: "",
       tableOfContents = this.makeTableOfContents(publication),
       start = startLocator,
     )
@@ -55,7 +55,7 @@ object SR2Books {
     results: MutableList<SR2TOCEntry>,
   ) {
     // Items in tableOfContents are unlikely to have no title because it makes no sense.
-    val title = link.title?.takeUnless(String::isBlank) ?: link.href
+    val title = link.title?.takeUnless(String::isBlank) ?: link.href.toString()
     results.add(SR2TOCEntry(title, link.href, depth))
     for (child in link.children) {
       this.flattenTOCNode(child, depth + 1, results)
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt
index bd46e0f..9ad2c03 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2Controller.kt
@@ -1,11 +1,8 @@
 package org.librarysimplified.r2.vanilla.internal
 
+import android.app.Application
+import android.webkit.WebResourceResponse
 import android.webkit.WebView
-import com.google.common.util.concurrent.AsyncFunction
-import com.google.common.util.concurrent.Futures
-import com.google.common.util.concurrent.ListenableFuture
-import com.google.common.util.concurrent.MoreExecutors
-import com.google.common.util.concurrent.SettableFuture
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.subjects.PublishSubject
@@ -43,8 +40,9 @@ import org.librarysimplified.r2.api.SR2Locator.SR2LocatorChapterEnd
 import org.librarysimplified.r2.api.SR2Locator.SR2LocatorPercent
 import org.librarysimplified.r2.api.SR2PageNumberingMode
 import org.librarysimplified.r2.api.SR2Theme
-import org.readium.r2.shared.Search
-import org.readium.r2.shared.fetcher.TransformingFetcher
+import org.librarysimplified.r2.vanilla.BuildConfig
+import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.publication.Href
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.publication.epub.EpubLayout.FIXED
 import org.readium.r2.shared.publication.epub.EpubLayout.REFLOWABLE
@@ -54,141 +52,108 @@ import org.readium.r2.shared.publication.services.positionsByReadingOrder
 import org.readium.r2.shared.publication.services.protectionError
 import org.readium.r2.shared.publication.services.search.SearchIterator
 import org.readium.r2.shared.publication.services.search.search
+import org.readium.r2.shared.util.ErrorException
+import org.readium.r2.shared.util.Try
+import org.readium.r2.shared.util.Url
+import org.readium.r2.shared.util.asset.AssetRetriever
+import org.readium.r2.shared.util.data.asInputStream
 import org.readium.r2.shared.util.getOrElse
-import org.readium.r2.streamer.Streamer
-import org.readium.r2.streamer.parser.epub.EpubParser
-import org.readium.r2.streamer.server.Server
+import org.readium.r2.shared.util.http.DefaultHttpClient
+import org.readium.r2.shared.util.mediatype.MediaType
+import org.readium.r2.streamer.PublicationOpener
+import org.readium.r2.streamer.parser.DefaultPublicationParser
 import org.slf4j.LoggerFactory
+import java.io.ByteArrayInputStream
 import java.io.IOException
-import java.net.ServerSocket
-import java.net.URI
+import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.collections.List
 import kotlin.math.round
 
 /**
  * The default R2 controller implementation.
  */
 
-@OptIn(Search::class)
 internal class SR2Controller private constructor(
   private val configuration: SR2ControllerConfiguration,
-  private val port: Int,
-  private val server: Server,
   private val publication: Publication,
-  private val epubFileName: String,
-  private val baseUrl: URI,
+  private val assetRetriever: AssetRetriever,
 ) : SR2ControllerType {
 
   companion object {
 
+    const val PREFIX_PUBLICATION =
+      "https://org.librarysimplified.r2/publication/"
+    const val PREFIX_ASSETS =
+      "https://org.librarysimplified.r2/assets/"
+
     private val logger =
       LoggerFactory.getLogger(SR2Controller::class.java)
 
-    /**
-     * Find a high-numbered port upon which to run the internal server. Tries up to ten
-     * times to find a port and then gives up with an exception if it can't.
-     */
-
-    private fun fetchUnusedHTTPPort(): Int {
-      for (i in 0 until 10) {
-        try {
-          val socket = ServerSocket(0)
-          val port = socket.localPort
-          socket.close()
-          return port
-        } catch (e: IOException) {
-          this.logger.error("failed to open port: ", e)
-        }
-
-        try {
-          Thread.sleep(1_000L)
-        } catch (e: InterruptedException) {
-          Thread.currentThread().interrupt()
-        }
-      }
-
-      throw IOException("Unable to find an unused port for the server")
-    }
-
     /**
      * Create a new controller based on the given configuration.
      */
 
     fun create(
+      context: Application,
       configuration: SR2ControllerConfiguration,
     ): SR2ControllerType {
       val bookFile = configuration.bookFile
-      this.logger.debug("creating controller for {}", bookFile)
-
-      val onCreatePublication: Publication.Builder.() -> Unit = {
-        this.fetcher = TransformingFetcher(this.fetcher, SR2HtmlInjector(this.manifest)::transform)
-      }
-
-      val streamer =
-        Streamer(
-          context = configuration.context,
-          onCreatePublication = onCreatePublication,
-          parsers = listOf(EpubParser()),
-          contentProtections = configuration.contentProtections,
-          ignoreDefaultParsers = true,
+      this.logger.debug("Creating controller for {}", bookFile)
+
+      val httpClient =
+        DefaultHttpClient(userAgent = "${BuildConfig.LIBRARY_PACKAGE_NAME}/${BuildConfig.R2_VERSION_NAME}")
+      val assetRetriever =
+        AssetRetriever(context.contentResolver, httpClient)
+
+      val publicationParser =
+        DefaultPublicationParser(
+          context = context,
+          httpClient = httpClient,
+          assetRetriever = assetRetriever,
+          pdfFactory = SR2NoPDFFactory,
+        )
+      val publicationOpener =
+        PublicationOpener(
+          publicationParser = publicationParser,
+          contentProtections =
+          configuration.contentProtections,
+          onCreatePublication = {
+          },
         )
 
-      val publication = runBlocking {
-        streamer.open(bookFile, allowUserInteraction = false)
-      }.getOrElse {
-        throw IOException("Failed to open EPUB", it)
-      }
+      val publication =
+        runBlocking {
+          publicationOpener.open(
+            asset = configuration.bookFile,
+            credentials = null,
+            allowUserInteraction = false,
+          )
+        }.getOrElse {
+          throw IOException("Failed to open EPUB", ErrorException(it))
+        }
 
       if (publication.isRestricted) {
-        throw IOException("Failed to unlock EPUB", publication.protectionError)
+        val protectionError = publication.protectionError
+        if (protectionError != null) {
+          throw IOException("Failed to unlock EPUB", ErrorException(protectionError))
+        } else {
+          throw IOException("Failed to unlock EPUB")
+        }
       }
 
       if (publication.readingOrder.isEmpty()) {
         throw IOException("Publication has no chapters!")
       }
 
-      this.logger.debug("publication title: {}", publication.metadata.title)
-      val port = this.fetchUnusedHTTPPort()
-      this.logger.debug("server port: {}", port)
-
-      val server = Server(port, configuration.context, enableReadiumNavigatorSupport = false)
-      this.logger.debug("starting server")
-      server.start(5_000)
-
-      try {
-        this.logger.debug("loading epub into server")
-        val epubName = "/${bookFile.name}"
-        val baseUrl = server.addPublication(
-          publication = publication,
-          userPropertiesFile = null,
-        )
-
-        this.logger.debug("publication uri: {}", baseUrl)
-        if (baseUrl == null) {
-          throw IOException("Publication cannot be served")
-        }
-
-        this.logger.debug("server ready")
-        return SR2Controller(
-          configuration = configuration,
-          epubFileName = epubName,
-          baseUrl = baseUrl.toURI(),
-          port = port,
-          publication = publication,
-          server = server,
-        )
-      } catch (e: Exception) {
-        try {
-          server.stop()
-        } catch (e: Exception) {
-          this.logger.error("error stopping server: ", e)
-        }
-        throw e
-      }
+      this.logger.debug("Publication title: {}", publication.metadata.title)
+      return SR2Controller(
+        configuration = configuration,
+        publication = publication,
+        assetRetriever = assetRetriever,
+      )
     }
   }
 
@@ -213,6 +178,7 @@ internal class SR2Controller private constructor(
 
   private val closed = AtomicBoolean(false)
 
+  @OptIn(ExperimentalReadiumApi::class)
   private var searchIterator: SearchIterator? = null
 
   @Volatile
@@ -275,12 +241,8 @@ internal class SR2Controller private constructor(
 
   private fun serverLocationOfTarget(
     target: SR2NavigationTarget,
-  ): String {
-    val href = target.node.navigationPoint.locator.chapterHref.replace("^/+".toRegex(), "")
-    return when (target.extraFragment) {
-      null -> String.format("%s/%s", this.baseUrl, href)
-      else -> String.format("%s/%s#%s", this.baseUrl, href, target.extraFragment)
-    }
+  ): Url {
+    return target.node.navigationPoint.locator.chapterHref.resolve(Url(PREFIX_PUBLICATION))
   }
 
   private fun setCurrentNode(target: SR2NavigationTarget) {
@@ -338,12 +300,12 @@ internal class SR2Controller private constructor(
 
   private fun executeInternalCommand(
     command: SR2CommandSubmission,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     this.logger.debug("executing {}", command)
 
     if (this.closed.get()) {
-      this.logger.debug("executor has been shut down")
-      return Futures.immediateFuture(Unit)
+      this.logger.debug("Executor has been shut down")
+      return CompletableFuture.completedFuture(Unit)
     }
 
     return this.executeCommandSubmission(command)
@@ -351,7 +313,7 @@ internal class SR2Controller private constructor(
 
   private fun executeCommandSubmission(
     command: SR2CommandSubmission,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     return when (val apiCommand = command.command) {
       is SR2Command.OpenChapter ->
         this.executeCommandOpenChapter(command, apiCommand)
@@ -407,7 +369,7 @@ internal class SR2Controller private constructor(
   private fun executeCommandThemeSet(
     command: SR2CommandSubmission,
     apiCommand: SR2Command.ThemeSet,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     this.publishCommandRunningLong(command)
     return this.executeThemeSet(this.waitForWebViewAvailability(), apiCommand.theme)
   }
@@ -415,36 +377,21 @@ internal class SR2Controller private constructor(
   private fun executeThemeSet(
     viewConnection: SR2WebViewConnectionType,
     theme: SR2Theme,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     this.themeMostRecent = theme
 
-    val tasks = mutableListOf<ListenableFuture<Any>>()
-    tasks.add(
+    val allFutures = CompletableFuture.allOf(
       viewConnection.executeJS { js -> js.setFontFamily(SR2Fonts.fontFamilyStringOf(theme.font)) },
-    )
-    tasks.add(
       viewConnection.executeJS { js -> js.setTheme(SR2ReadiumInternalTheme.from(theme.colorScheme)) },
-    )
-    tasks.add(
       viewConnection.executeJS { js -> js.setFontSize(theme.textSize) },
-    )
-    tasks.add(
       viewConnection.executeJS { js -> js.setPublisherCSS(theme.publisherCSS) },
-    )
-    tasks.add(
       viewConnection.executeJS { js -> js.broadcastReadingPosition() },
     )
 
-    val allFutures = Futures.allAsList(tasks)
-    val setFuture = SettableFuture.create<Unit>()
-    allFutures.addListener(
-      {
-        this.publishEvent(SR2Event.SR2ThemeChanged(theme))
-        setFuture.set(Unit)
-      },
-      MoreExecutors.directExecutor(),
-    )
-    return setFuture
+    allFutures.whenComplete { _, _ ->
+      this.publishEvent(SR2Event.SR2ThemeChanged(theme))
+    }
+    return allFutures
   }
 
   /**
@@ -453,7 +400,7 @@ internal class SR2Controller private constructor(
 
   private fun executeCommandBookmarkDelete(
     apiCommand: SR2Command.BookmarkDelete,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     this.bookmarks = this.bookmarks.map { bookmark ->
       bookmark.copy(
         isBeingDeleted = bookmark == apiCommand.bookmark,
@@ -483,14 +430,15 @@ internal class SR2Controller private constructor(
         },
       ),
     )
-    return Futures.immediateFuture(Unit)
+
+    return CompletableFuture.completedFuture(Unit)
   }
 
   /**
    * Execute the [SR2Command.BookmarkCreate] command.
    */
 
-  private fun executeCommandBookmarkCreate(): ListenableFuture<*> {
+  private fun executeCommandBookmarkCreate(): CompletableFuture<*> {
     val bookmark =
       SR2Bookmark(
         date = DateTime.now(),
@@ -518,7 +466,7 @@ internal class SR2Controller private constructor(
       ),
     )
 
-    return Futures.immediateFuture(Unit)
+    return CompletableFuture.completedFuture(Unit)
   }
 
   /**
@@ -527,7 +475,7 @@ internal class SR2Controller private constructor(
 
   private fun executeCommandRefresh(
     command: SR2CommandSubmission,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     return this.openNodeForLocator(
       command,
       SR2LocatorPercent(
@@ -543,12 +491,12 @@ internal class SR2Controller private constructor(
 
   private fun executeCommandBookmarksLoad(
     apiCommand: SR2Command.BookmarksLoad,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     val newBookmarks = this.bookmarks.toMutableList()
     newBookmarks.addAll(apiCommand.bookmarks)
     this.bookmarks = newBookmarks.distinct().toList()
     this.publishEvent(SR2BookmarksLoaded)
-    return Futures.immediateFuture(Unit)
+    return CompletableFuture.completedFuture(Unit)
   }
 
   /**
@@ -557,10 +505,10 @@ internal class SR2Controller private constructor(
 
   private fun executeCommandOpenChapterPrevious(
     command: SR2CommandSubmission,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     val previousNode =
       this.navigationGraph.findPreviousNode(this.currentTarget.node)
-        ?: return Futures.immediateFuture(Unit)
+        ?: return CompletableFuture.completedFuture(Unit)
 
     return this.openNodeForLocator(
       command,
@@ -574,10 +522,10 @@ internal class SR2Controller private constructor(
 
   private fun executeCommandOpenChapterNext(
     command: SR2CommandSubmission,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     val nextNode =
       this.navigationGraph.findNextNode(this.currentTarget.node)
-        ?: return Futures.immediateFuture(Unit)
+        ?: return CompletableFuture.completedFuture(Unit)
 
     return this.openNodeForLocator(
       command,
@@ -592,7 +540,7 @@ internal class SR2Controller private constructor(
    * Execute the [SR2Command.OpenPagePrevious] command.
    */
 
-  private fun executeCommandOpenPagePrevious(): ListenableFuture<*> {
+  private fun executeCommandOpenPagePrevious(): CompletableFuture<*> {
     return this.waitForWebViewAvailability().executeJS(SR2JavascriptAPIType::openPagePrevious)
   }
 
@@ -602,9 +550,9 @@ internal class SR2Controller private constructor(
 
   private fun executeCommandHighlightTerms(
     apiCommand: SR2Command.HighlightTerms,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     if (this.searchingTerms.isBlank() && apiCommand.searchingTerms.isBlank()) {
-      return Futures.immediateFuture(Unit)
+      return CompletableFuture.completedFuture(Unit)
     }
 
     val clearHighlight = apiCommand.clearHighlight
@@ -628,9 +576,9 @@ internal class SR2Controller private constructor(
    * Execute the [SR2Command.HighlightCurrentTerms] command.
    */
 
-  private fun executeCommandHighlightCurrentTerms(): ListenableFuture<*> {
+  private fun executeCommandHighlightCurrentTerms(): CompletableFuture<*> {
     if (this.searchingTerms.isBlank()) {
-      return Futures.immediateFuture(Unit)
+      return CompletableFuture.completedFuture(Unit)
     }
     return this.waitForWebViewAvailability()
       .executeJS { js ->
@@ -645,7 +593,7 @@ internal class SR2Controller private constructor(
    * Execute the [SR2Command.OpenPageNext] command.
    */
 
-  private fun executeCommandOpenPageNext(): ListenableFuture<*> {
+  private fun executeCommandOpenPageNext(): CompletableFuture<*> {
     return this.waitForWebViewAvailability().executeJS(SR2JavascriptAPIType::openPageNext)
   }
 
@@ -656,7 +604,7 @@ internal class SR2Controller private constructor(
   private fun executeCommandOpenChapter(
     command: SR2CommandSubmission,
     apiCommand: SR2Command.OpenChapter,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     return this.openNodeForLocator(command, apiCommand.locator)
   }
 
@@ -666,7 +614,7 @@ internal class SR2Controller private constructor(
 
   private fun executeCommandOpenLink(
     apiCommand: SR2Command.OpenLink,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     try {
       /*
        * Determine if the link is an internal EPUB link. If it is, translate it to an "open chapter"
@@ -674,42 +622,37 @@ internal class SR2Controller private constructor(
        */
 
       val link = apiCommand.link
-      val baseText = this.baseUrl.toString()
-      if (apiCommand.link.startsWith(baseText)) {
-        val target = link.removePrefix(baseText)
+      if (apiCommand.link.startsWith(PREFIX_PUBLICATION)) {
+        val target = Href(link.removePrefix(PREFIX_PUBLICATION))!!
         this.submitCommand(SR2Command.OpenChapter(SR2LocatorPercent(target, 0.0)))
-        return Futures.immediateFuture(Unit)
+        return CompletableFuture.completedFuture(Unit)
       }
 
       this.publishEvent(SR2ExternalLinkSelected(apiCommand.link))
-      return Futures.immediateFuture(Unit)
+      return CompletableFuture.completedFuture(Unit)
     } catch (e: Exception) {
-      this.logger.error("unable to open link ${apiCommand.link}: ", e)
+      this.logger.error("Unable to open link ${apiCommand.link}: ", e)
       this.publishEvent(
         SR2Event.SR2Error.SR2ChapterNonexistent(
           chapterHref = apiCommand.link,
           message = e.message ?: "Unable to open chapter ${apiCommand.link}",
         ),
       )
-      val future = SettableFuture.create<Unit>()
-      future.setException(e)
+      val future = CompletableFuture<Unit>()
+      future.completeExceptionally(e)
       return future
     }
   }
 
+  @OptIn(ExperimentalReadiumApi::class)
   private fun executeCommandSearch(
     command: SR2Command.Search,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     val searchQuery = command.searchQuery
-
     if (searchQuery != this.lastQuery) {
       this.coroutineScope.launch {
-        this@SR2Controller.searchIterator = this@SR2Controller.publication.search(searchQuery)
-          .onFailure {
-            this@SR2Controller.logger.error("Error searching for query: {}", searchQuery, it)
-          }
-          .getOrNull()
-
+        this@SR2Controller.searchIterator =
+          this@SR2Controller.publication.search(searchQuery)
         this@SR2Controller.publishEvent(
           SR2CommandSearchResults(command, this@SR2Controller.searchIterator),
         )
@@ -717,17 +660,17 @@ internal class SR2Controller private constructor(
     }
 
     this.lastQuery = searchQuery
-
-    return Futures.immediateFuture(Unit)
+    return CompletableFuture.completedFuture(Unit)
   }
 
-  private fun executeCommandCancelSearch(): ListenableFuture<*> {
+  @OptIn(ExperimentalReadiumApi::class)
+  private fun executeCommandCancelSearch(): CompletableFuture<*> {
     this.coroutineScope.launch {
       this@SR2Controller.searchIterator?.close()
       this@SR2Controller.searchIterator = null
     }
 
-    return Futures.immediateFuture(Unit)
+    return CompletableFuture.completedFuture(Unit)
   }
 
   /**
@@ -737,7 +680,7 @@ internal class SR2Controller private constructor(
   private fun openNodeForLocator(
     command: SR2CommandSubmission,
     locator: SR2Locator,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     val previousNode = this.currentTarget
 
     return try {
@@ -753,56 +696,42 @@ internal class SR2Controller private constructor(
 
       val connection =
         this.waitForWebViewAvailability()
-      val openFuture =
-        connection.openURL(targetLocation)
-
-      val themeFuture =
-        Futures.transformAsync(
-          openFuture,
-          AsyncFunction { this.executeThemeSet(connection, this.themeMostRecent) },
-          MoreExecutors.directExecutor(),
-        )
 
-      val scrollModeFuture =
-        Futures.transformAsync(
-          themeFuture,
-          AsyncFunction { connection.executeJS { js -> js.setScrollMode(this.configuration.scrollingMode) } },
-          MoreExecutors.directExecutor(),
-        )
-
-      val moveFuture =
-        Futures.transformAsync(
-          scrollModeFuture,
-          AsyncFunction { this.executeLocatorSet(connection, locator) },
-          MoreExecutors.directExecutor(),
-        )
+      val future =
+        connection.openURL(targetLocation.toString())
+          .thenCompose {
+            this.executeThemeSet(connection, this.themeMostRecent)
+          }
+          .thenCompose {
+            connection.executeJS { js -> js.setScrollMode(this.configuration.scrollingMode) }
+          }
+          .thenCompose {
+            this.executeLocatorSet(connection, locator)
+          }
 
       /*
        * If there's a fragment, attempt to scroll to it.
        */
 
-      when (val fragment = locator.chapterHref.substringAfter('#', "")) {
-        "" ->
-          moveFuture
+      when (val fragment = locator.chapterHref.toString().substringAfter('#', "")) {
+        "" -> future
 
         else ->
-          Futures.transformAsync(
-            moveFuture,
-            AsyncFunction { connection.executeJS { js -> js.scrollToId(fragment) } },
-            MoreExecutors.directExecutor(),
-          )
+          future.thenCompose {
+            connection.executeJS { js -> js.scrollToId(fragment) }
+          }
       }
     } catch (e: Exception) {
-      this.logger.error("unable to open chapter ${locator.chapterHref}: ", e)
+      this.logger.error("Unable to open chapter ${locator.chapterHref}: ", e)
       this.setCurrentNode(previousNode)
       this.publishEvent(
         SR2Event.SR2Error.SR2ChapterNonexistent(
-          chapterHref = locator.chapterHref,
+          chapterHref = locator.chapterHref.toString(),
           message = e.message ?: "Unable to open chapter ${locator.chapterHref}",
         ),
       )
-      val future = SettableFuture.create<Unit>()
-      future.setException(e)
+      val future = CompletableFuture<Any>()
+      future.completeExceptionally(e)
       return future
     }
   }
@@ -810,7 +739,7 @@ internal class SR2Controller private constructor(
   private fun executeLocatorSet(
     connection: SR2WebViewConnectionType,
     locator: SR2Locator,
-  ): ListenableFuture<*> =
+  ): CompletableFuture<*> =
     when (locator) {
       is SR2LocatorPercent -> {
         connection.executeJS { js -> js.setProgression(locator.chapterProgress) }
@@ -822,7 +751,7 @@ internal class SR2Controller private constructor(
 
   private fun getBookProgress(chapterProgress: Double): Double? {
     require(chapterProgress < 1 || chapterProgress > 0) {
-      "progress must be in [0, 1]; was $chapterProgress"
+      "Progress must be in [0, 1]; was $chapterProgress"
     }
 
     val currentNode = this.currentTarget.node
@@ -1015,7 +944,7 @@ internal class SR2Controller private constructor(
             throw e.cause!!
           }
         } catch (e: SR2WebViewDisconnectedException) {
-          this.logger.debug("webview disconnected: could not execute {}", command)
+          this.logger.debug("Webview disconnected: could not execute {}", command)
           this.publishEvent(SR2Event.SR2Error.SR2WebViewInaccessible("No web view is connected"))
           this.publishCommandFailed(command, e)
         } catch (e: Exception) {
@@ -1100,13 +1029,14 @@ internal class SR2Controller private constructor(
     synchronized(this.webViewConnectionLock) {
       this.webViewConnection = newConnection
     }
+
+    this.submitCommand(SR2Command.Refresh)
   }
 
   override fun viewDisconnect() {
     this.logger.debug("viewDisconnect")
 
     synchronized(this.webViewConnectionLock) {
-      this.webViewConnection?.close()
       this.webViewConnection = null
     }
   }
@@ -1139,42 +1069,133 @@ internal class SR2Controller private constructor(
       try {
         this.viewDisconnect()
       } catch (e: Exception) {
-        this.logger.error("could not disconnect view: ", e)
-      }
-
-      try {
-        this.server.closeAllConnections()
-      } catch (e: Exception) {
-        this.logger.error("could not close connections: ", e)
+        this.logger.error("Could not disconnect view: ", e)
       }
 
       try {
-        this.server.stop()
-      } catch (e: Exception) {
-        this.logger.error("could not stop server: ", e)
-      }
-
-      try {
-        this.publication.close()
+        runBlocking {
+          this@SR2Controller.publication.close()
+        }
       } catch (e: Exception) {
-        this.logger.error("could not close publication: ", e)
+        this.logger.error("Could not close publication: ", e)
       }
 
       try {
         this.queueExecutor.shutdown()
       } catch (e: Exception) {
-        this.logger.error("could not stop command queue: ", e)
+        this.logger.error("Could not stop command queue: ", e)
       }
 
       try {
         this.eventSubject.onComplete()
       } catch (e: Exception) {
-        this.logger.error("could not complete event stream: ", e)
+        this.logger.error("Could not complete event stream: ", e)
       }
+    }
+  }
 
-      try {
-      } catch (e: Exception) {
-        this.logger.error("could not unsubscribe: ", e)
+  internal fun openAsset(path: String): WebResourceResponse {
+    this.logger.debug("openAsset: {}", path)
+
+    val resourcePath =
+      "/org/librarysimplified/r2/vanilla/readium/$path"
+    val resourceURL =
+      SR2Controller::class.java.getResource(resourcePath)
+        ?: return WebResourceResponse(
+          "text/plain",
+          null,
+          404,
+          "not found",
+          mapOf(),
+          ByteArrayInputStream(ByteArray(0)),
+        )
+
+    return resourceURL.openStream().use { stream ->
+      WebResourceResponse(
+        guessMimeType(path),
+        null,
+        200,
+        "OK",
+        mapOf(),
+        ByteArrayInputStream(stream.readBytes()),
+      )
+    }
+  }
+
+  private fun guessMimeType(path: String): String {
+    val upper = path.uppercase()
+    if (upper.endsWith(".CSS")) {
+      return MediaType.CSS.toString()
+    }
+    if (upper.endsWith(".JS")) {
+      return MediaType.JAVASCRIPT.toString()
+    }
+    if (upper.endsWith(".TTF")) {
+      return MediaType.TTF.toString()
+    }
+    if (upper.endsWith(".OTF")) {
+      return MediaType.OTF.toString()
+    }
+    if (upper.endsWith(".HTML")) {
+      return MediaType.HTML.toString()
+    }
+    if (upper.endsWith(".XHTML")) {
+      return MediaType.XHTML.toString()
+    }
+    return "application/octet-stream"
+  }
+
+  internal fun openPublicationResource(path: String): WebResourceResponse? {
+    this.logger.debug("openPublicationResource: {}", path)
+
+    val urlPath = Url(path)
+    if (urlPath == null) {
+      this.logger.error("Could not decode publication resource path: {}", path)
+      return null
+    }
+
+    val resourceValue = this.publication.get(urlPath)
+    if (resourceValue == null) {
+      this.logger.error("Could not retrieve publication resource for URL: {}", urlPath)
+      return null
+    }
+
+    return runBlocking {
+      val c = this@SR2Controller
+      when (val result = c.assetRetriever.retrieve(resourceValue)) {
+        is Try.Failure -> {
+          c.logger.error(
+            "Failed to retrieve publication resource for {}: {}",
+            urlPath,
+            result.value.message,
+          )
+          WebResourceResponse(
+            result.value.message,
+            "text/plain",
+            500,
+            result.value.message,
+            null,
+            result.value.message.byteInputStream(),
+          )
+        }
+
+        is Try.Success -> {
+          val resourceInjected =
+            SR2HtmlInjectingResource(
+              publication = c.publication,
+              mediaType = result.value.format.mediaType,
+              resourceValue,
+            )
+
+          WebResourceResponse(
+            result.value.format.mediaType.toString(),
+            result.value.format.mediaType.charset?.name(),
+            200,
+            "OK",
+            null,
+            resourceInjected.asInputStream(),
+          )
+        }
       }
     }
   }
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2HtmlInjector.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2HtmlInjectingResource.kt
similarity index 54%
rename from org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2HtmlInjector.kt
rename to org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2HtmlInjectingResource.kt
index 4629d46..8406c38 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2HtmlInjector.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2HtmlInjectingResource.kt
@@ -1,41 +1,55 @@
 package org.librarysimplified.r2.vanilla.internal
 
-import org.readium.r2.shared.fetcher.LazyResource
-import org.readium.r2.shared.fetcher.Resource
-import org.readium.r2.shared.fetcher.ResourceTry
-import org.readium.r2.shared.fetcher.TransformingResource
-import org.readium.r2.shared.fetcher.mapCatching
+import org.librarysimplified.r2.vanilla.internal.SR2Controller.Companion.PREFIX_ASSETS
 import org.readium.r2.shared.publication.Manifest
+import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.publication.epub.EpubLayout
-import org.readium.r2.shared.publication.epub.layoutOf
 import org.readium.r2.shared.publication.presentation.presentation
+import org.readium.r2.shared.util.Try
+import org.readium.r2.shared.util.data.ReadError
+import org.readium.r2.shared.util.flatMap
+import org.readium.r2.shared.util.mediatype.MediaType
+import org.readium.r2.shared.util.resource.Resource
+import org.readium.r2.shared.util.resource.TransformingResource
+
+class SR2HtmlInjectingResource(
+  private val publication: Publication,
+  private val mediaType: MediaType,
+  resource: Resource,
+) : TransformingResource(resource) {
+
+  override suspend fun transform(
+    data: Try<ByteArray, ReadError>,
+  ): Try<ByteArray, ReadError> {
+    if (!this.mediaType.isHtml) {
+      return data
+    }
+    return data.flatMap { bytes ->
+      transformBytes(bytes)
+    }
+  }
 
-internal class SR2HtmlInjector(private val manifest: Manifest) {
+  private fun transformBytes(bytes: ByteArray): Try<ByteArray, ReadError> {
+    val charset =
+      this.mediaType.charset ?: Charsets.UTF_8
+    val trimmedText =
+      bytes.toString(charset).trim()
 
-  fun transform(resource: Resource): Resource = LazyResource {
-    val link = resource.link()
-    if (link.mediaType.isHtml) {
-      inject(resource)
+    val outputBytes = if (isReflowable()) {
+      injectReflowableHtml(trimmedText)
     } else {
-      resource
+      injectFixedLayoutHtml(trimmedText)
     }
+    return Try.success(outputBytes.toByteArray(charset))
   }
 
-  private suspend fun inject(resource: Resource): Resource = object : TransformingResource(resource) {
-
-    override suspend fun transform(data: ResourceTry<ByteArray>): ResourceTry<ByteArray> =
-      resource.read().mapCatching {
-        val trimmedText = it.toString(link().mediaType.charset ?: Charsets.UTF_8).trim()
-        val res = if (manifest.metadata.presentation.layoutOf(link()) == EpubLayout.REFLOWABLE) {
-          injectReflowableHtml(trimmedText)
-        } else {
-          injectFixedLayoutHtml(trimmedText)
-        }
-        res.toByteArray()
-      }
+  private fun isReflowable(): Boolean {
+    return this.publication.metadata.presentation.layout == EpubLayout.REFLOWABLE
   }
 
-  private fun injectReflowableHtml(content: String): String {
+  private fun injectReflowableHtml(
+    content: String,
+  ): String {
     var resourceHtml = content
     // Inject links to css and js files
     val head = regexForOpeningHTMLTag("head").find(resourceHtml, 0)
@@ -45,18 +59,17 @@ internal class SR2HtmlInjector(private val manifest: Manifest) {
       return content
     }
 
-    val layout = SR2ReadiumCssLayout(manifest.metadata)
-
+    val layout = SR2ReadiumCssLayout(this.publication.metadata)
     val endIncludes = mutableListOf<String>()
     val beginIncludes = mutableListOf<String>()
     beginIncludes.add("<meta name=\"viewport\" content=\"width=device-width, height=device-height, initial-scale=1.0, maximum-scale=1.0, user-scalable=0\" />")
 
-    beginIncludes.add(getHtmlLink("/assets/readium-css/${layout.readiumCSSPath}ReadiumCSS-before.css"))
-    endIncludes.add(getHtmlLink("/assets/readium-css/${layout.readiumCSSPath}ReadiumCSS-after.css"))
-    endIncludes.add(getHtmlScript("/assets/scripts/gestures.js"))
-    endIncludes.add(getHtmlScript("/assets/scripts/utils.js"))
-    endIncludes.add(getHtmlScript("/assets/scripts/crypto-sha256.js"))
-    endIncludes.add(getHtmlScript("/assets/scripts/highlight.js"))
+    beginIncludes.add(linkToCSS("readium-css/${layout.readiumCSSPath}ReadiumCSS-before.css"))
+    endIncludes.add(linkToCSS("readium-css/${layout.readiumCSSPath}ReadiumCSS-after.css"))
+    endIncludes.add(linkToScript("scripts/gestures.js"))
+    endIncludes.add(linkToScript("scripts/utils.js"))
+    endIncludes.add(linkToScript("scripts/crypto-sha256.js"))
+    endIncludes.add(linkToScript("scripts/highlight.js"))
 
     for (element in beginIncludes) {
       resourceHtml = StringBuilder(resourceHtml).insert(beginHeadIndex, element).toString()
@@ -67,15 +80,16 @@ internal class SR2HtmlInjector(private val manifest: Manifest) {
       resourceHtml = StringBuilder(resourceHtml).insert(endHeadIndex, element).toString()
       endHeadIndex += element.length
     }
-    resourceHtml = StringBuilder(resourceHtml).insert(endHeadIndex, getHtmlFont(fontFamily = "OpenDyslexic", href = "/assets/fonts/OpenDyslexic-Regular.otf")).toString()
+    resourceHtml = StringBuilder(resourceHtml).insert(endHeadIndex, getHtmlFont(fontFamily = "OpenDyslexic", href = "/fonts/OpenDyslexic-Regular.otf")).toString()
     resourceHtml = StringBuilder(resourceHtml).insert(endHeadIndex, "<style>@import url('https://fonts.googleapis.com/css?family=PT+Serif|Roboto|Source+Sans+Pro|Vollkorn');</style>\n").toString()
-
-    resourceHtml = applyDirectionAttribute(resourceHtml, manifest)
-
+    resourceHtml = applyDirectionAttribute(resourceHtml, this.publication.manifest)
     return resourceHtml
   }
 
-  private fun applyDirectionAttribute(resourceHtml: String, manifest: Manifest): String {
+  private fun applyDirectionAttribute(
+    resourceHtml: String,
+    manifest: Manifest,
+  ): String {
     var resourceHtml1 = resourceHtml
     fun addRTLDir(tagName: String, html: String): String {
       return regexForOpeningHTMLTag(tagName).find(html, 0)?.let { result ->
@@ -110,30 +124,32 @@ internal class SR2HtmlInjector(private val manifest: Manifest) {
       return content
     }
     val includes = mutableListOf<String>()
-    includes.add(getHtmlScript("/assets/scripts/gestures.js"))
-    includes.add(getHtmlScript("/assets/scripts/utils.js"))
+    includes.add(linkToScript("scripts/gestures.js"))
+    includes.add(linkToScript("scripts/utils.js"))
     for (element in includes) {
       resourceHtml = StringBuilder(resourceHtml).insert(endHeadIndex, element).toString()
     }
     return resourceHtml
   }
 
-  private fun getHtmlFont(fontFamily: String, href: String): String {
+  private fun getHtmlFont(
+    fontFamily: String,
+    href: String,
+  ): String {
     val prefix = "<style type=\"text/css\"> @font-face{font-family: \"$fontFamily\"; src:url(\""
     val suffix = "\") format('truetype');}</style>\n"
     return prefix + href + suffix
   }
 
-  private fun getHtmlLink(resourceName: String): String {
+  private fun linkToCSS(resourceName: String): String {
     val prefix = "<link rel=\"stylesheet\" type=\"text/css\" href=\""
     val suffix = "\"/>\n"
-    return prefix + resourceName + suffix
+    return prefix + PREFIX_ASSETS + resourceName + suffix
   }
 
-  private fun getHtmlScript(resourceName: String): String {
+  private fun linkToScript(resourceName: String): String {
     val prefix = "<script type=\"text/javascript\" src=\""
     val suffix = "\"></script>\n"
-
-    return prefix + resourceName + suffix
+    return prefix + PREFIX_ASSETS + resourceName + suffix
   }
 }
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2JavascriptAPI.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2JavascriptAPI.kt
index ffe323c..92e2328 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2JavascriptAPI.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2JavascriptAPI.kt
@@ -2,10 +2,6 @@ package org.librarysimplified.r2.vanilla.internal
 
 import android.webkit.WebView
 import androidx.annotation.UiThread
-import com.google.common.util.concurrent.Futures
-import com.google.common.util.concurrent.ListenableFuture
-import com.google.common.util.concurrent.MoreExecutors
-import com.google.common.util.concurrent.SettableFuture
 import org.librarysimplified.r2.api.SR2Command
 import org.librarysimplified.r2.api.SR2ControllerCommandQueueType
 import org.librarysimplified.r2.api.SR2PublisherCSS
@@ -21,6 +17,7 @@ import org.librarysimplified.r2.vanilla.internal.SR2ReadiumInternalTheme.LIGHT
 import org.librarysimplified.r2.vanilla.internal.SR2ReadiumInternalTheme.NIGHT
 import org.librarysimplified.r2.vanilla.internal.SR2ReadiumInternalTheme.SEPIA
 import org.slf4j.LoggerFactory
+import java.util.concurrent.CompletableFuture
 
 /**
  * The default implementation of the Javascript API.
@@ -37,16 +34,16 @@ internal class SR2JavascriptAPI(
   @UiThread
   private fun executeJavascript(
     script: String,
-  ): ListenableFuture<String> {
+  ): CompletableFuture<String> {
     SR2UIThread.checkIsUIThread()
 
-    val future = SettableFuture.create<String>()
+    val future = CompletableFuture<String>()
     this.logger.debug("evaluating {}", script)
     this.webView.evaluateJavascript(script) {
       try {
         this.logger.debug("evaluated {} ⇒ {}", script, it)
       } finally {
-        future.set(it)
+        future.complete(it)
       }
     }
     return future
@@ -56,68 +53,62 @@ internal class SR2JavascriptAPI(
   override fun highlightSearchingTerms(
     searchingTerms: String,
     clearHighlight: Boolean,
-  ): ListenableFuture<String> {
+  ): CompletableFuture<String> {
     return this.executeJavascript("readium.highlightSearchingTerms(\"$searchingTerms\", $clearHighlight);")
   }
 
   @UiThread
-  override fun openPageNext(): ListenableFuture<String> {
-    val future = this.executeJavascript("readium.scrollRight();")
-    future.addListener(
-      {
-        when (future.get()) {
+  override fun openPageNext(): CompletableFuture<String> {
+    return this.executeJavascript("readium.scrollRight();")
+      .thenApply { r: String ->
+        return@thenApply when (r) {
           "false" -> {
             this.commandQueue.submitCommand(SR2Command.OpenChapterNext)
+            r
           }
-
           else -> {
+            r
           }
         }
-      },
-      MoreExecutors.directExecutor(),
-    )
-    return future
+      }
   }
 
   @UiThread
-  override fun openPagePrevious(): ListenableFuture<String> {
-    val future = this.executeJavascript("readium.scrollLeft();")
-    future.addListener(
-      {
-        when (future.get()) {
+  override fun openPagePrevious(): CompletableFuture<String> {
+    return this.executeJavascript("readium.scrollLeft();")
+      .thenApply { r: String ->
+        return@thenApply when (r) {
           "false" -> {
             this.commandQueue.submitCommand(SR2Command.OpenChapterPrevious(atEnd = true))
+            r
           }
-
           else -> {
+            r
           }
         }
-      },
-      MoreExecutors.directExecutor(),
-    )
-    return future
+      }
   }
 
   @UiThread
-  override fun openPageLast(): ListenableFuture<String> {
+  override fun openPageLast(): CompletableFuture<String> {
     return this.executeJavascript("readium.scrollToEnd();")
   }
 
   @UiThread
-  override fun setFontFamily(value: String): ListenableFuture<*> {
-    return Futures.allAsList(
+  override fun setFontFamily(value: String): CompletableFuture<*> {
+    return CompletableFuture.allOf(
       this.setUserProperty("fontFamily", value),
       this.setUserProperty("fontOverride", "readium-font-on"),
     )
   }
 
   @UiThread
-  override fun setFontSize(value: Double): ListenableFuture<String> {
+  override fun setFontSize(value: Double): CompletableFuture<String> {
     val percent = (value * 100.0).toString() + "%"
     return this.setUserProperty("fontSize", percent)
   }
 
-  override fun setTheme(value: SR2ReadiumInternalTheme): ListenableFuture<String> =
+  override fun setTheme(value: SR2ReadiumInternalTheme): CompletableFuture<String> =
     when (value) {
       LIGHT, DAY ->
         this.setUserProperty("appearance", "readium-default-on")
@@ -130,17 +121,17 @@ internal class SR2JavascriptAPI(
     }
 
   @UiThread
-  override fun setProgression(progress: Double): ListenableFuture<String> {
+  override fun setProgression(progress: Double): CompletableFuture<String> {
     return this.executeJavascript("readium.scrollToPosition($progress);")
   }
 
   @UiThread
-  override fun broadcastReadingPosition(): ListenableFuture<*> {
+  override fun broadcastReadingPosition(): CompletableFuture<*> {
     return this.executeJavascript("readium.broadcastReadingPosition();")
   }
 
   @UiThread
-  override fun setScrollMode(mode: SR2ScrollingMode): ListenableFuture<*> {
+  override fun setScrollMode(mode: SR2ScrollingMode): CompletableFuture<*> {
     return this.setUserProperty(
       name = "scroll",
       value = when (mode) {
@@ -151,23 +142,23 @@ internal class SR2JavascriptAPI(
   }
 
   @UiThread
-  override fun scrollToId(id: String): ListenableFuture<*> {
+  override fun scrollToId(id: String): CompletableFuture<*> {
     return this.executeJavascript("readium.scrollToId(\"$id\");")
   }
 
   @UiThread
   override fun setPublisherCSS(
     css: SR2PublisherCSS,
-  ): ListenableFuture<*> {
+  ): CompletableFuture<*> {
     return when (css) {
       SR2_PUBLISHER_DEFAULT_CSS_ENABLED ->
-        Futures.allAsList(
+        CompletableFuture.allOf(
           this.setUserProperty("advancedSettings", ""),
           this.setUserProperty("fontOverride", ""),
         )
 
       SR2_PUBLISHER_DEFAULT_CSS_DISABLED ->
-        Futures.allAsList(
+        CompletableFuture.allOf(
           this.setUserProperty("advancedSettings", "readium-advanced-on"),
           this.setUserProperty("fontOverride", "readium-font-on"),
         )
@@ -178,7 +169,7 @@ internal class SR2JavascriptAPI(
   fun setUserProperty(
     name: String,
     value: String,
-  ): ListenableFuture<String> {
+  ): CompletableFuture<String> {
     return this.executeJavascript("readium.setProperty(\"--USER__${name}\", \"${value}\");")
   }
 }
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2JavascriptAPIType.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2JavascriptAPIType.kt
index 86ad4c7..4c01685 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2JavascriptAPIType.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2JavascriptAPIType.kt
@@ -1,9 +1,9 @@
 package org.librarysimplified.r2.vanilla.internal
 
 import androidx.annotation.UiThread
-import com.google.common.util.concurrent.ListenableFuture
 import org.librarysimplified.r2.api.SR2PublisherCSS
 import org.librarysimplified.r2.api.SR2ScrollingMode
+import java.util.concurrent.CompletableFuture
 
 /**
  * The Javascript API exported by web views.
@@ -18,82 +18,82 @@ internal interface SR2JavascriptAPIType {
   fun highlightSearchingTerms(
     searchingTerms: String,
     clearHighlight: Boolean,
-  ): ListenableFuture<String>
+  ): CompletableFuture<String>
 
   /**
    * Open the next page in the current chapter.
    */
 
   @UiThread
-  fun openPageNext(): ListenableFuture<String>
+  fun openPageNext(): CompletableFuture<String>
 
   /**
    * Open the previous page in the current chapter.
    */
 
   @UiThread
-  fun openPagePrevious(): ListenableFuture<String>
+  fun openPagePrevious(): CompletableFuture<String>
 
   /**
    * Open the final page in the current chapter.
    */
 
   @UiThread
-  fun openPageLast(): ListenableFuture<String>
+  fun openPageLast(): CompletableFuture<String>
 
   /**
    * Set the font family for the reader.
    */
 
   @UiThread
-  fun setFontFamily(value: String): ListenableFuture<*>
+  fun setFontFamily(value: String): CompletableFuture<*>
 
   /**
    * Set the text scale (in the range [0, n], where `n = 1.0` means "100%".
    */
 
   @UiThread
-  fun setFontSize(value: Double): ListenableFuture<*>
+  fun setFontSize(value: Double): CompletableFuture<*>
 
   /**
    * Set the reader color scheme.
    */
 
   @UiThread
-  fun setTheme(value: SR2ReadiumInternalTheme): ListenableFuture<String>
+  fun setTheme(value: SR2ReadiumInternalTheme): CompletableFuture<String>
 
   /**
    * Set the current chapter position. This must be in the range [0, 1].
    */
 
   @UiThread
-  fun setProgression(progress: Double): ListenableFuture<String>
+  fun setProgression(progress: Double): CompletableFuture<String>
 
   /**
    * Broadcast the current reading position.
    */
 
   @UiThread
-  fun broadcastReadingPosition(): ListenableFuture<*>
+  fun broadcastReadingPosition(): CompletableFuture<*>
 
   /**
    * Set the scrolling mode.
    */
 
   @UiThread
-  fun setScrollMode(mode: SR2ScrollingMode): ListenableFuture<*>
+  fun setScrollMode(mode: SR2ScrollingMode): CompletableFuture<*>
 
   /**
    * Scroll to the element with the given ID.
    */
 
   @UiThread
-  fun scrollToId(id: String): ListenableFuture<*>
+  fun scrollToId(id: String): CompletableFuture<*>
 
   /**
    * Enable/disable publisher CSS.
    */
 
   @UiThread
-  fun setPublisherCSS(css: SR2PublisherCSS): ListenableFuture<*>
+  fun setPublisherCSS(css: SR2PublisherCSS): CompletableFuture<*>
 }
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2NavigationGraph.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2NavigationGraph.kt
index 3e6819f..09f3b39 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2NavigationGraph.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2NavigationGraph.kt
@@ -3,6 +3,7 @@ package org.librarysimplified.r2.vanilla.internal
 import org.librarysimplified.r2.api.SR2Locator
 import org.librarysimplified.r2.vanilla.internal.SR2NavigationNode.SR2NavigationReadingOrderNode
 import org.librarysimplified.r2.vanilla.internal.SR2NavigationNode.SR2NavigationResourceNode
+import org.readium.r2.shared.publication.Href
 
 /**
  * A navigation graph.
@@ -91,14 +92,15 @@ data class SR2NavigationGraph(
      * again but without the fragment (if there is one). Record the fragment as an extra.
      */
 
-    val fragment = locator.chapterHref.substringAfter('#', "")
+    val locationText = locator.chapterHref.toString()
+    val fragment = locationText.substringAfter('#', "")
     return if (fragment.isNotBlank()) {
       val withoutFragment =
         when (locator) {
           is SR2Locator.SR2LocatorChapterEnd ->
-            locator.copy(chapterHref = locator.chapterHref.substringBefore('#'))
+            locator.copy(chapterHref = Href(locationText.substringBefore('#'))!!)
           is SR2Locator.SR2LocatorPercent ->
-            locator.copy(chapterHref = locator.chapterHref.substringBefore('#'))
+            locator.copy(chapterHref = Href(locationText.substringBefore('#'))!!)
         }
 
       (
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2NoPDFFactory.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2NoPDFFactory.kt
new file mode 100644
index 0000000..d557e1d
--- /dev/null
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2NoPDFFactory.kt
@@ -0,0 +1,22 @@
+package org.librarysimplified.r2.vanilla.internal
+
+import org.readium.r2.shared.util.data.ReadError
+import org.readium.r2.shared.util.data.ReadTry
+import org.readium.r2.shared.util.pdf.PdfDocument
+import org.readium.r2.shared.util.pdf.PdfDocumentFactory
+import org.readium.r2.shared.util.resource.Resource
+import kotlin.reflect.KClass
+
+/**
+ * A PDF factory that always fails.
+ */
+
+object SR2NoPDFFactory : PdfDocumentFactory<PdfDocument> {
+
+  override val documentType: KClass<PdfDocument>
+    get() = PdfDocument::class
+
+  override suspend fun open(resource: Resource, password: String?): ReadTry<PdfDocument> {
+    return ReadTry.failure(ReadError.UnsupportedOperation("Not supported!"))
+  }
+}
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2ReadiumCssLayout.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2ReadiumCssLayout.kt
index bdd6c03..8ed5254 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2ReadiumCssLayout.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2ReadiumCssLayout.kt
@@ -44,14 +44,14 @@ internal enum class SR2ReadiumCssLayout(val cssId: String) {
         }
 
       return when (readingProgression) {
-        ReadingProgression.RTL, ReadingProgression.BTT ->
+        ReadingProgression.RTL ->
           if (isCjk) {
             CJK_VERTICAL
           } else {
             RTL
           }
 
-        ReadingProgression.LTR, ReadingProgression.TTB, ReadingProgression.AUTO ->
+        ReadingProgression.LTR ->
           if (isCjk) {
             CJK_HORIZONTAL
           } else {
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewClient.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewClient.kt
index 43a4f49..3402a76 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewClient.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewClient.kt
@@ -6,11 +6,12 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import com.google.common.util.concurrent.SettableFuture
 import org.librarysimplified.r2.api.SR2Command
-import org.librarysimplified.r2.api.SR2ControllerCommandQueueType
+import org.librarysimplified.r2.vanilla.internal.SR2Controller.Companion.PREFIX_ASSETS
+import org.librarysimplified.r2.vanilla.internal.SR2Controller.Companion.PREFIX_PUBLICATION
 import org.slf4j.LoggerFactory
 import java.net.URLDecoder
+import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -21,8 +22,8 @@ import java.util.concurrent.ConcurrentHashMap
 
 internal class SR2WebViewClient(
   private val requestLocation: String,
-  private val future: SettableFuture<Unit>,
-  private val commandQueue: SR2ControllerCommandQueueType,
+  private val future: CompletableFuture<Any>,
+  private val commandQueue: SR2Controller,
 ) : WebViewClient() {
 
   companion object {
@@ -62,6 +63,14 @@ internal class SR2WebViewClient(
     if (request != null) {
       val url = request.url?.toString() ?: ""
 
+      if (url.startsWith(PREFIX_ASSETS)) {
+        return this.commandQueue.openAsset(url.removePrefix(PREFIX_ASSETS))
+      }
+
+      if (url.startsWith(PREFIX_PUBLICATION)) {
+        return this.commandQueue.openPublicationResource(url.removePrefix(PREFIX_PUBLICATION))
+      }
+
       if (url.endsWith("favicon.ico")) {
         return WebResourceResponse(
           "image/vnd.microsoft.icon",
@@ -95,11 +104,11 @@ internal class SR2WebViewClient(
         if (this.errors.isEmpty()) {
           this.logger.debug("onPageFinished: {} succeeded", url)
           this.commandQueue.submitCommand(SR2Command.HighlightCurrentTerms)
-          this.future.set(Unit)
+          this.future.complete(Unit)
           return
         } else {
           this.logger.error("onPageFinished: {} failed with {} errors", url, this.errors.size)
-          this.future.setException(
+          this.future.completeExceptionally(
             SR2WebViewLoadException("Failed to load $requestLocation", this.errors.toMap()),
           )
           return
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewConnection.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewConnection.kt
index 61031f2..0789166 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewConnection.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewConnection.kt
@@ -2,19 +2,14 @@ package org.librarysimplified.r2.vanilla.internal
 
 import android.view.MotionEvent
 import android.webkit.WebView
-import com.google.common.util.concurrent.ListenableFuture
-import com.google.common.util.concurrent.MoreExecutors
-import com.google.common.util.concurrent.SettableFuture
-import org.librarysimplified.r2.api.SR2ControllerCommandQueueType
+import org.librarysimplified.r2.api.SR2Executors
 import org.librarysimplified.r2.api.SR2ScrollingMode
 import org.librarysimplified.r2.api.SR2ScrollingMode.SCROLLING_MODE_CONTINUOUS
 import org.librarysimplified.r2.api.SR2ScrollingMode.SCROLLING_MODE_PAGINATED
 import org.readium.r2.shared.publication.epub.EpubLayout
 import org.slf4j.LoggerFactory
 import java.util.UUID
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-import java.util.concurrent.ThreadFactory
+import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 
@@ -25,9 +20,8 @@ import java.util.concurrent.TimeoutException
 internal class SR2WebViewConnection(
   private val jsAPI: SR2JavascriptAPI,
   private val webView: WebView,
-  private val requestQueue: ExecutorService,
   private val uiExecutor: (f: () -> Unit) -> Unit,
-  private val commandQueue: SR2ControllerCommandQueueType,
+  private val commandQueue: SR2Controller,
 ) : SR2WebViewConnectionType {
 
   private val logger =
@@ -39,17 +33,10 @@ internal class SR2WebViewConnection(
       webView: WebView,
       jsReceiver: SR2JavascriptAPIReceiverType,
       uiExecutor: (f: () -> Unit) -> Unit,
-      commandQueue: SR2ControllerCommandQueueType,
+      commandQueue: SR2Controller,
       scrollingMode: SR2ScrollingMode,
       layout: EpubLayout,
     ): SR2WebViewConnectionType {
-      val threadFactory = ThreadFactory { runnable ->
-        val thread = Thread(runnable)
-        thread.name = "org.librarysimplified.r2.vanilla.WebViewConnection[${thread.id}]"
-        return@ThreadFactory thread
-      }
-
-      val requestQueue = Executors.newFixedThreadPool(1, threadFactory)
       val webChromeClient = SR2WebChromeClient()
       webView.webChromeClient = webChromeClient
       webView.settings.javaScriptEnabled = true
@@ -96,7 +83,6 @@ internal class SR2WebViewConnection(
       return SR2WebViewConnection(
         jsAPI = SR2JavascriptAPI(webView, commandQueue),
         webView = webView,
-        requestQueue = requestQueue,
         uiExecutor = uiExecutor,
         commandQueue = commandQueue,
       )
@@ -105,9 +91,11 @@ internal class SR2WebViewConnection(
 
   override fun openURL(
     location: String,
-  ): ListenableFuture<*> {
-    val id = UUID.randomUUID()
-    val future = SettableFuture.create<Unit>()
+  ): CompletableFuture<*> {
+    val id =
+      UUID.randomUUID()
+    val future =
+      CompletableFuture<Any>()
 
     /*
      * Execute a request to the web view on the UI thread, and wait for that request to
@@ -118,7 +106,7 @@ internal class SR2WebViewConnection(
      * waiting for the request to complete.
      */
 
-    this.requestQueue.execute {
+    SR2Executors.ioExecutor.execute {
       this.logger.debug("[{}]: openURL {}", id, location)
       this.uiExecutor.invoke {
         this.webView.webViewClient = SR2WebViewClient(location, future, this.commandQueue)
@@ -136,26 +124,28 @@ internal class SR2WebViewConnection(
 
   private fun <T> waitOrFail(
     id: UUID,
-    future: SettableFuture<T>,
+    future: CompletableFuture<T>,
   ) {
     try {
-      this.logger.debug("[{}]: waiting for request to complete", id)
+      this.logger.debug("[{}]: Waiting for request to complete", id)
       future.get(1L, TimeUnit.MINUTES)
-      this.logger.debug("[{}]: request completed", id)
+      this.logger.debug("[{}]: Request completed", id)
     } catch (e: TimeoutException) {
-      this.logger.error("[{}]: timed out waiting for the web view to complete: ", id, e)
-      future.setException(e)
-    } catch (e: Exception) {
-      this.logger.error("[{}]: future failed: ", id, e)
-      future.setException(e)
+      this.logger.error("[{}]: Timed out waiting for the web view to complete: ", id, e)
+      future.completeExceptionally(e)
+    } catch (e: Throwable) {
+      this.logger.error("[{}]: Future failed: ", id, e)
+      future.completeExceptionally(e)
     }
   }
 
   override fun executeJS(
-    function: (SR2JavascriptAPIType) -> ListenableFuture<*>,
-  ): ListenableFuture<Any> {
-    val id = UUID.randomUUID()
-    val future = SettableFuture.create<Any>()
+    function: (SR2JavascriptAPIType) -> CompletableFuture<*>,
+  ): CompletableFuture<*> {
+    val id =
+      UUID.randomUUID()
+    val future =
+      CompletableFuture<Any>()
 
     /*
      * Execute a request to the web view on the UI thread, and wait for that request to
@@ -166,29 +156,22 @@ internal class SR2WebViewConnection(
      * waiting for the request to complete.
      */
 
-    this.requestQueue.execute {
+    SR2Executors.ioExecutor.execute {
       this.logger.debug("[{}] executeJS", id)
 
       this.uiExecutor.invoke {
         val jsFuture = function.invoke(this.jsAPI)
-        jsFuture.addListener(
-          {
-            try {
-              future.set(jsFuture.get())
-            } catch (e: Throwable) {
-              future.setException(e)
-            }
-          },
-          MoreExecutors.directExecutor(),
-        )
+        jsFuture.whenComplete { value, exception ->
+          if (exception == null) {
+            future.complete(value)
+          } else {
+            future.completeExceptionally(exception)
+          }
+        }
       }
 
       this.waitOrFail(id, future)
     }
     return future
   }
-
-  override fun close() {
-    this.requestQueue.shutdown()
-  }
 }
diff --git a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewConnectionType.kt b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewConnectionType.kt
index 5649d08..636f828 100644
--- a/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewConnectionType.kt
+++ b/org.librarysimplified.r2.vanilla/src/main/java/org/librarysimplified/r2/vanilla/internal/SR2WebViewConnectionType.kt
@@ -1,19 +1,18 @@
 package org.librarysimplified.r2.vanilla.internal
 
-import com.google.common.util.concurrent.ListenableFuture
-import java.io.Closeable
+import java.util.concurrent.CompletableFuture
 
 /**
  * A connection to a web view.
  */
 
-internal interface SR2WebViewConnectionType : Closeable {
+internal interface SR2WebViewConnectionType {
 
   fun openURL(
     location: String,
-  ): ListenableFuture<*>
+  ): CompletableFuture<*>
 
   fun executeJS(
-    f: (SR2JavascriptAPIType) -> ListenableFuture<*>,
-  ): ListenableFuture<Any>
+    f: (SR2JavascriptAPIType) -> CompletableFuture<*>,
+  ): CompletableFuture<*>
 }
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/divina/divinaPlayer.html b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/divina/divinaPlayer.html
similarity index 76%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/divina/divinaPlayer.html
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/divina/divinaPlayer.html
index 9e2cdf9..77467de 100755
--- a/org.librarysimplified.r2.vanilla/src/main/assets/readium/divina/divinaPlayer.html
+++ b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/divina/divinaPlayer.html
@@ -12,8 +12,8 @@
 			background-color: rgb(0, 0, 0);
 		}
 	</style>
-	<script type="text/javascript" src="./divinaTouchHandling.js"></script>
-	<script type="text/javascript" src="./divinaPlayer.js"></script>
+	<script type="text/javascript" src="divinaTouchHandling.js"></script>
+	<script type="text/javascript" src="divinaPlayer.js"></script>
 </head>
 <body>
 	<script type="text/javascript">
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/divina/divinaPlayer.js b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/divina/divinaPlayer.js
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/divina/divinaPlayer.js
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/divina/divinaPlayer.js
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/divina/divinaTouchHandling.js b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/divina/divinaTouchHandling.js
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/divina/divinaTouchHandling.js
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/divina/divinaTouchHandling.js
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/fonts/OpenDyslexic-Regular.otf b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/fonts/OpenDyslexic-Regular.otf
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/fonts/OpenDyslexic-Regular.otf
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/fonts/OpenDyslexic-Regular.otf
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadMe.md b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadMe.md
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadMe.md
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadMe.md
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadiumCSS-after.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadiumCSS-after.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadiumCSS-after.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadiumCSS-after.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadiumCSS-before.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadiumCSS-before.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadiumCSS-before.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadiumCSS-before.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadiumCSS-default.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadiumCSS-default.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadiumCSS-default.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadiumCSS-default.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadiumCSS-ebpaj_fonts_patch.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadiumCSS-ebpaj_fonts_patch.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/ReadiumCSS-ebpaj_fonts_patch.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/ReadiumCSS-ebpaj_fonts_patch.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-horizontal/ReadiumCSS-after.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-horizontal/ReadiumCSS-after.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-horizontal/ReadiumCSS-after.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-horizontal/ReadiumCSS-after.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-horizontal/ReadiumCSS-before.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-horizontal/ReadiumCSS-before.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-horizontal/ReadiumCSS-before.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-horizontal/ReadiumCSS-before.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-horizontal/ReadiumCSS-default.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-horizontal/ReadiumCSS-default.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-horizontal/ReadiumCSS-default.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-horizontal/ReadiumCSS-default.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-vertical/ReadiumCSS-after.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-vertical/ReadiumCSS-after.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-vertical/ReadiumCSS-after.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-vertical/ReadiumCSS-after.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-vertical/ReadiumCSS-before.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-vertical/ReadiumCSS-before.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-vertical/ReadiumCSS-before.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-vertical/ReadiumCSS-before.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-vertical/ReadiumCSS-default.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-vertical/ReadiumCSS-default.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/cjk-vertical/ReadiumCSS-default.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/cjk-vertical/ReadiumCSS-default.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/fonts/AccessibleDfA.otf b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/fonts/AccessibleDfA.otf
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/fonts/AccessibleDfA.otf
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/fonts/AccessibleDfA.otf
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/fonts/LICENSE-AccessibleDfa b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/fonts/LICENSE-AccessibleDfa
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/fonts/LICENSE-AccessibleDfa
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/fonts/LICENSE-AccessibleDfa
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/fonts/LICENSE-IaWriterDuospace.md b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/fonts/LICENSE-IaWriterDuospace.md
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/fonts/LICENSE-IaWriterDuospace.md
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/fonts/LICENSE-IaWriterDuospace.md
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/fonts/iAWriterDuospace-Regular.ttf b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/fonts/iAWriterDuospace-Regular.ttf
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/fonts/iAWriterDuospace-Regular.ttf
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/fonts/iAWriterDuospace-Regular.ttf
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/rtl/ReadiumCSS-after.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/rtl/ReadiumCSS-after.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/rtl/ReadiumCSS-after.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/rtl/ReadiumCSS-after.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/rtl/ReadiumCSS-before.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/rtl/ReadiumCSS-before.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/rtl/ReadiumCSS-before.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/rtl/ReadiumCSS-before.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/rtl/ReadiumCSS-default.css b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/rtl/ReadiumCSS-default.css
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/readium-css/rtl/ReadiumCSS-default.css
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/readium-css/rtl/ReadiumCSS-default.css
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/scripts/crypto-sha256.js b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/scripts/crypto-sha256.js
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/scripts/crypto-sha256.js
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/scripts/crypto-sha256.js
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/scripts/gestures.js b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/scripts/gestures.js
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/scripts/gestures.js
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/scripts/gestures.js
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/scripts/highlight.js b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/scripts/highlight.js
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/scripts/highlight.js
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/scripts/highlight.js
diff --git a/org.librarysimplified.r2.vanilla/src/main/assets/readium/scripts/utils.js b/org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/scripts/utils.js
similarity index 100%
rename from org.librarysimplified.r2.vanilla/src/main/assets/readium/scripts/utils.js
rename to org.librarysimplified.r2.vanilla/src/main/resources/org/librarysimplified/r2/vanilla/readium/scripts/utils.js
diff --git a/org.librarysimplified.r2.views/build.gradle.kts b/org.librarysimplified.r2.views/build.gradle.kts
index 17765a3..2205e4b 100644
--- a/org.librarysimplified.r2.views/build.gradle.kts
+++ b/org.librarysimplified.r2.views/build.gradle.kts
@@ -40,8 +40,6 @@ dependencies {
     implementation(libs.androidx.vectordrawable)
     implementation(libs.androidx.viewpager)
     implementation(libs.androidx.viewpager2)
-    implementation(libs.google.failureaccess)
-    implementation(libs.google.guava)
     implementation(libs.google.material)
     implementation(libs.joda.time)
     implementation(libs.kotlin.stdlib)
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2Fragment.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2Fragment.kt
new file mode 100644
index 0000000..fb0ea46
--- /dev/null
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2Fragment.kt
@@ -0,0 +1,5 @@
+package org.librarysimplified.r2.views
+
+import androidx.fragment.app.Fragment
+
+sealed class SR2Fragment : Fragment()
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderFragment.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderFragment.kt
index f6f0487..b01b274 100644
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderFragment.kt
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderFragment.kt
@@ -16,14 +16,10 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.view.MenuItemCompat
 import androidx.core.view.forEach
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import com.google.common.base.Preconditions
-import io.reactivex.disposables.Disposable
+import io.reactivex.disposables.CompositeDisposable
 import org.librarysimplified.r2.api.SR2Bookmark
 import org.librarysimplified.r2.api.SR2Bookmark.Type.EXPLICIT
 import org.librarysimplified.r2.api.SR2Command
-import org.librarysimplified.r2.api.SR2ControllerConfiguration
 import org.librarysimplified.r2.api.SR2ControllerType
 import org.librarysimplified.r2.api.SR2Event
 import org.librarysimplified.r2.api.SR2Event.SR2BookmarkEvent.SR2BookmarkCreate
@@ -47,31 +43,18 @@ import org.librarysimplified.r2.api.SR2ScrollingMode.SCROLLING_MODE_CONTINUOUS
 import org.librarysimplified.r2.api.SR2ScrollingMode.SCROLLING_MODE_PAGINATED
 import org.librarysimplified.r2.api.SR2Theme
 import org.librarysimplified.r2.ui_thread.SR2UIThread
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewBookEvent.SR2BookLoadingFailed
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewControllerEvent.SR2ControllerBecameAvailable
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationClose
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationOpenSearch
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationOpenTOC
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationReaderClose
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationSearchOpen
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationTOCOpen
 import org.librarysimplified.r2.views.internal.SR2BrightnessService
 import org.librarysimplified.r2.views.internal.SR2SettingsDialog
-import org.librarysimplified.r2.views.internal.SR2ViewModelBookEvent
-import org.librarysimplified.r2.views.internal.SR2ViewModelBookEvent.SR2ViewModelBookOpenFailed
-import org.librarysimplified.r2.views.internal.SR2ViewModelBookEvent.SR2ViewModelBookOpened
 import org.slf4j.LoggerFactory
 
-class SR2ReaderFragment private constructor(
-  private val parameters: SR2ReaderParameters,
-) : Fragment() {
+class SR2ReaderFragment : SR2Fragment() {
 
   private val logger =
     LoggerFactory.getLogger(SR2ReaderFragment::class.java)
 
-  companion object {
-    fun create(parameters: SR2ReaderParameters): SR2ReaderFragment {
-      return SR2ReaderFragment(parameters)
-    }
-  }
-
   private lateinit var container: ViewGroup
   private lateinit var loadingView: ProgressBar
   private lateinit var menuBookmarkItem: MenuItem
@@ -80,13 +63,10 @@ class SR2ReaderFragment private constructor(
   private lateinit var positionTitleView: TextView
   private lateinit var progressContainer: ViewGroup
   private lateinit var progressView: ProgressBar
-  private lateinit var readerModel: SR2ReaderViewModel
   private lateinit var titleText: TextView
   private lateinit var toolbar: Toolbar
   private lateinit var webView: WebView
-  private var controller: SR2ControllerType? = null
-  private var controllerEvents: Disposable? = null
-  private var controllerLifecycleEvents: Disposable? = null
+  private lateinit var eventSubscriptions: CompositeDisposable
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -131,11 +111,11 @@ class SR2ReaderFragment private constructor(
 
     val addBookmarkOption = this.toolbar.menu.findItem(R.id.readerMenuAddBookmark)
     addBookmarkOption.setOnMenuItemClickListener { this.onReaderMenuAddBookmarkSelected() }
-    addBookmarkOption.isVisible = !this.parameters.isPreview
+    addBookmarkOption.isVisible = !SR2ReaderModel.isPreview
 
     val searchOption = this.toolbar.menu.findItem(R.id.readerMenuSearch)
     searchOption.setOnMenuItemClickListener {
-      this.readerModel.publishViewEvent(SR2ReaderViewNavigationOpenSearch)
+      SR2ReaderModel.submitViewCommand(SR2ReaderViewNavigationSearchOpen)
       true
     }
 
@@ -146,7 +126,7 @@ class SR2ReaderFragment private constructor(
      * We don't show page numbers in continuous scroll mode.
      */
 
-    when (this.parameters.scrollingMode) {
+    when (SR2ReaderModel.scrollMode) {
       SCROLLING_MODE_PAGINATED -> {
         // The defaults are fine
       }
@@ -155,23 +135,20 @@ class SR2ReaderFragment private constructor(
       }
     }
 
-    this.configureForTheme(this.controller?.themeNow() ?: this.parameters.theme)
+    this.configureForTheme(SR2ReaderModel.controller().themeNow())
     this.viewsHandleLoadingState(showLoading = true)
-
     return view
   }
 
   private fun onReaderMenuAddBookmarkSelected(): Boolean {
     SR2UIThread.checkIsUIThread()
 
-    val controllerNow = this.controller
-    if (controllerNow != null) {
-      val found = this.findBookmarkForCurrentPage(controllerNow, controllerNow.positionNow())
-      if (found == null) {
-        controllerNow.submitCommand(SR2Command.BookmarkCreate)
-      } else {
-        controllerNow.submitCommand(SR2Command.BookmarkDelete(found))
-      }
+    val controllerNow = SR2ReaderModel.controller()
+    val found = this.findBookmarkForCurrentPage(controllerNow, controllerNow.positionNow())
+    if (found == null) {
+      controllerNow.submitCommand(SR2Command.BookmarkCreate)
+    } else {
+      controllerNow.submitCommand(SR2Command.BookmarkDelete(found))
     }
     return true
   }
@@ -179,7 +156,7 @@ class SR2ReaderFragment private constructor(
   private fun onReaderMenuTOCSelected(): Boolean {
     SR2UIThread.checkIsUIThread()
 
-    this.readerModel.publishViewEvent(SR2ReaderViewNavigationOpenTOC)
+    SR2ReaderModel.submitViewCommand(SR2ReaderViewNavigationTOCOpen)
     return true
   }
 
@@ -193,7 +170,7 @@ class SR2ReaderFragment private constructor(
   private fun onToolbarNavigationSelected(): Boolean {
     SR2UIThread.checkIsUIThread()
 
-    this.readerModel.publishViewEvent(SR2ReaderViewNavigationClose)
+    SR2ReaderModel.submitViewCommand(SR2ReaderViewNavigationReaderClose)
     return true
   }
 
@@ -217,61 +194,42 @@ class SR2ReaderFragment private constructor(
   }
 
   private fun openSettings() {
-    val activity = this.requireActivity()
+    val activity = requireActivity()
     SR2SettingsDialog.create(
       brightness = SR2BrightnessService(activity),
       context = activity,
-      controller = this.controller!!,
     )
   }
 
   override fun onStart() {
-    super.onStart()
     this.logger.debug("onStart")
+    super.onStart()
 
-    Preconditions.checkArgument(this.controller == null, "Controller must be null")
-
-    val activity =
-      this.requireActivity()
-
-    this.readerModel =
-      ViewModelProvider(activity, SR2ReaderViewModelFactory(this.parameters))
-        .get(SR2ReaderViewModel::class.java)
-
-    this.controllerEvents =
-      this.readerModel.controllerEvents.subscribe(this::onControllerEvent)
-    this.controllerLifecycleEvents =
-      this.readerModel.bookEvents.subscribe(this::onControllerLifecycleEvent)
-
-    /*
-     * Fetch or create a controller with the given EPUB loaded into it.
-     */
-
-    this.readerModel.createOrGet(
-      configuration = SR2ControllerConfiguration(
-        bookFile = this.parameters.bookFile,
-        bookId = this.parameters.bookId,
-        context = activity,
-        ioExecutor = this.readerModel.ioExecutor,
-        contentProtections = this.parameters.contentProtections,
-        theme = this.parameters.theme,
-        uiExecutor = SR2UIThread::runOnUIThread,
-        scrollingMode = this.parameters.scrollingMode,
-        pageNumberingMode = this.parameters.pageNumberingMode,
-      ),
-    )
+    this.eventSubscriptions = CompositeDisposable()
+    this.eventSubscriptions.add(SR2ReaderModel.controllerEvents.subscribe(this::onControllerEvent))
 
+    val controller = SR2ReaderModel.controller()
+    this.toolbar.title = controller.bookMetadata.title
+    this.titleText.text = controller.bookMetadata.title
     this.showOrHideReadingUI(true)
+    controller.viewConnect(this.webView)
   }
 
   override fun onStop() {
-    super.onStop()
     this.logger.debug("onStop")
+    super.onStop()
+
+    try {
+      this.eventSubscriptions.dispose()
+    } catch (e: Throwable) {
+      this.logger.error("Error closing subscriptions: ", e)
+    }
 
-    this.controllerEvents?.dispose()
-    this.controllerLifecycleEvents?.dispose()
-    this.controller?.viewDisconnect()
-    this.controller = null
+    try {
+      SR2ReaderModel.controller().viewDisconnect()
+    } catch (e: Throwable) {
+      this.logger.error("Error disconnecting the view: ", e)
+    }
   }
 
   private fun onReadingPositionChanged(event: SR2ReadingPositionChanged) {
@@ -310,25 +268,22 @@ class SR2ReaderFragment private constructor(
   private fun reconfigureBookmarkMenuItem(currentPosition: SR2Locator) {
     SR2UIThread.checkIsUIThread()
 
-    val controllerNow = this.controller
-    if (controllerNow != null) {
-      val currentColorFilter = menuBookmarkItem.icon?.colorFilter
-      val bookmark = this.findBookmarkForCurrentPage(controllerNow, currentPosition)
-      if (bookmark != null) {
-        this.menuBookmarkItem.setIcon(R.drawable.sr2_bookmark_active)
-        MenuItemCompat.setContentDescription(
-          this.menuBookmarkItem,
-          this.resources.getString(R.string.readerAccessDeleteBookmark),
-        )
-      } else {
-        this.menuBookmarkItem.setIcon(R.drawable.sr2_bookmark_inactive)
-        MenuItemCompat.setContentDescription(
-          this.menuBookmarkItem,
-          this.resources.getString(R.string.readerAccessAddBookmark),
-        )
-      }
-      menuBookmarkItem.icon?.colorFilter = currentColorFilter
+    val currentColorFilter = this.menuBookmarkItem.icon?.colorFilter
+    val bookmark = this.findBookmarkForCurrentPage(SR2ReaderModel.controller(), currentPosition)
+    if (bookmark != null) {
+      this.menuBookmarkItem.setIcon(R.drawable.sr2_bookmark_active)
+      MenuItemCompat.setContentDescription(
+        this.menuBookmarkItem,
+        this.resources.getString(R.string.readerAccessDeleteBookmark),
+      )
+    } else {
+      this.menuBookmarkItem.setIcon(R.drawable.sr2_bookmark_inactive)
+      MenuItemCompat.setContentDescription(
+        this.menuBookmarkItem,
+        this.resources.getString(R.string.readerAccessAddBookmark),
+      )
     }
+    this.menuBookmarkItem.icon?.colorFilter = currentColorFilter
   }
 
   private fun findBookmarkForCurrentPage(
@@ -346,31 +301,6 @@ class SR2ReaderFragment private constructor(
     return bookmark.type == EXPLICIT && location.compareTo(bookmark.locator) == 0
   }
 
-  private fun onControllerLifecycleEvent(event: SR2ViewModelBookEvent) {
-    SR2UIThread.checkIsUIThread()
-
-    return when (event) {
-      is SR2ViewModelBookOpened -> {
-        val newController = event.reference.controller
-        this.logger.debug(
-          "SR2LifecycleControllerBecameAvailable: {} first startup {}",
-          newController,
-          event.reference.isFirstStartup,
-        )
-        this.controller = newController
-        newController.viewConnect(this.webView)
-        this.toolbar.title = newController.bookMetadata.title
-        this.titleText.text = newController.bookMetadata.title
-        this.readerModel.publishViewEvent(SR2ControllerBecameAvailable(event.reference))
-      }
-
-      is SR2ViewModelBookOpenFailed -> {
-        this.logger.error("SR2LifecycleControllerFailedToOpen: ", event.exception)
-        this.readerModel.publishViewEvent(SR2BookLoadingFailed(event.exception))
-      }
-    }
-  }
-
   private fun onControllerEvent(event: SR2Event) {
     SR2UIThread.checkIsUIThread()
 
@@ -394,7 +324,7 @@ class SR2ReaderFragment private constructor(
       SR2BookmarkFailedToBeDeleted -> {
         this.onBookmarksChanged()
         Toast.makeText(
-          requireContext(),
+          this.requireContext(),
           R.string.tocBookmarkDeleteErrorMessage,
           Toast.LENGTH_SHORT,
         ).show()
@@ -462,10 +392,6 @@ class SR2ReaderFragment private constructor(
 
   private fun onBookmarksChanged() {
     SR2UIThread.checkIsUIThread()
-
-    val controllerNow = this.controller
-    if (controllerNow != null) {
-      this.reconfigureBookmarkMenuItem(controllerNow.positionNow())
-    }
+    this.reconfigureBookmarkMenuItem(SR2ReaderModel.controller().positionNow())
   }
 }
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderFragmentFactory.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderFragmentFactory.kt
deleted file mode 100644
index 7db8300..0000000
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderFragmentFactory.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.librarysimplified.r2.views
-
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentFactory
-import org.librarysimplified.r2.views.internal.SR2TOCBookmarksFragment
-import org.librarysimplified.r2.views.internal.SR2TOCChaptersFragment
-import org.librarysimplified.r2.views.search.SR2SearchFragment
-
-class SR2ReaderFragmentFactory(
-  private val parameters: SR2ReaderParameters,
-) : FragmentFactory() {
-
-  override fun instantiate(
-    classLoader: ClassLoader,
-    className: String,
-  ): Fragment {
-    return when (loadFragmentClass(classLoader, className)) {
-      SR2ReaderFragment::class.java ->
-        SR2ReaderFragment.create(this.parameters)
-      SR2TOCFragment::class.java ->
-        SR2TOCFragment.create(this.parameters)
-      SR2TOCBookmarksFragment::class.java ->
-        SR2TOCBookmarksFragment.create(this.parameters)
-      SR2TOCChaptersFragment::class.java ->
-        SR2TOCChaptersFragment.create(this.parameters)
-      SR2SearchFragment::class.java ->
-        SR2SearchFragment.create(this.parameters)
-      else ->
-        super.instantiate(classLoader, className)
-    }
-  }
-}
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderModel.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderModel.kt
new file mode 100644
index 0000000..0716fe2
--- /dev/null
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderModel.kt
@@ -0,0 +1,181 @@
+package org.librarysimplified.r2.views
+
+import android.app.Application
+import androidx.annotation.UiThread
+import androidx.paging.InvalidatingPagingSourceFactory
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.subjects.PublishSubject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.librarysimplified.r2.api.SR2ControllerConfiguration
+import org.librarysimplified.r2.api.SR2ControllerProviderType
+import org.librarysimplified.r2.api.SR2ControllerType
+import org.librarysimplified.r2.api.SR2Event
+import org.librarysimplified.r2.api.SR2Event.SR2CommandEvent.SR2CommandSearchResults
+import org.librarysimplified.r2.api.SR2Executors
+import org.librarysimplified.r2.api.SR2PageNumberingMode
+import org.librarysimplified.r2.api.SR2ScrollingMode
+import org.librarysimplified.r2.api.SR2Theme
+import org.librarysimplified.r2.ui_thread.SR2UIThread
+import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewBookEvent.SR2BookLoadingFailed
+import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewControllerEvent.SR2ControllerBecameAvailable
+import org.librarysimplified.r2.views.search.SR2SearchPagingSource
+import org.librarysimplified.r2.views.search.SR2SearchPagingSourceListener
+import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.publication.Locator
+import org.readium.r2.shared.publication.LocatorCollection
+import org.readium.r2.shared.publication.protection.ContentProtection
+import org.readium.r2.shared.publication.services.search.SearchIterator
+import org.readium.r2.shared.publication.services.search.SearchTry
+import org.readium.r2.shared.util.Try
+import org.readium.r2.shared.util.asset.Asset
+import org.slf4j.LoggerFactory
+import java.util.concurrent.CompletableFuture
+
+object SR2ReaderModel {
+
+  private val logger =
+    LoggerFactory.getLogger(SR2ReaderModel::class.java)
+
+  var isPreview: Boolean =
+    false
+
+  var searchTerm: String =
+    ""
+
+  var scrollMode: SR2ScrollingMode =
+    SR2ScrollingMode.SCROLLING_MODE_PAGINATED
+
+  var perChapterNumbering: SR2PageNumberingMode =
+    SR2PageNumberingMode.PER_CHAPTER
+
+  private val viewCommandSource =
+    PublishSubject.create<SR2ReaderViewCommand>()
+      .toSerialized()
+
+  private val viewEventSource =
+    PublishSubject.create<SR2ReaderViewEvent>()
+      .toSerialized()
+
+  private val controllerEventSource =
+    PublishSubject.create<SR2Event>()
+      .toSerialized()
+
+  val viewCommands: Observable<SR2ReaderViewCommand> =
+    this.viewCommandSource.observeOn(AndroidSchedulers.mainThread())
+
+  val viewEvents: Observable<SR2ReaderViewEvent> =
+    this.viewEventSource.observeOn(AndroidSchedulers.mainThread())
+
+  val controllerEvents: Observable<SR2Event> =
+    this.controllerEventSource.observeOn(AndroidSchedulers.mainThread())
+
+  @OptIn(ExperimentalReadiumApi::class)
+  private var searchIterator: SearchIterator? = null
+
+  private val mutableSearchLocators =
+    MutableStateFlow<List<Locator>>(emptyList())
+
+  @OptIn(ExperimentalReadiumApi::class)
+  private val pagingSourceFactory = InvalidatingPagingSourceFactory {
+    SR2SearchPagingSource(object : SR2SearchPagingSourceListener {
+      override suspend fun getIteratorNext(): SearchTry<LocatorCollection?> {
+        val iterator = searchIterator ?: return Try.success(null)
+        return iterator.next().onSuccess {
+          this@SR2ReaderModel.mutableSearchLocators.value += (it?.locators.orEmpty())
+        }
+      }
+    })
+  }
+
+  val searchLocators: StateFlow<List<Locator>> =
+    this.mutableSearchLocators
+
+  val searchResult: Flow<PagingData<Locator>> =
+    Pager(PagingConfig(pageSize = 20), pagingSourceFactory = this.pagingSourceFactory).flow
+
+  @UiThread
+  fun submitViewCommand(command: SR2ReaderViewCommand) {
+    SR2UIThread.checkIsUIThread()
+    this.viewCommandSource.onNext(command)
+  }
+
+  private var controllerField: SR2ControllerType? = null
+
+  fun controller(): SR2ControllerType {
+    val c = this.controllerField
+    if (c != null) {
+      return c
+    }
+    throw IllegalStateException("No controller has been created!")
+  }
+
+  fun controllerCreate(
+    context: Application,
+    contentProtections: List<ContentProtection>,
+    bookFile: Asset,
+    bookId: String,
+    theme: SR2Theme,
+    controllers: SR2ControllerProviderType,
+  ): CompletableFuture<SR2ControllerType> {
+    val future = CompletableFuture<SR2ControllerType>()
+    SR2Executors.ioExecutor.execute {
+      try {
+        future.complete(
+          controllers.create(
+            context,
+            SR2ControllerConfiguration(
+              bookFile = bookFile,
+              bookId = bookId,
+              theme = theme,
+              context = context,
+              contentProtections = contentProtections,
+              uiExecutor = SR2UIThread::runOnUIThread,
+              scrollingMode = this.scrollMode,
+              pageNumberingMode = this.perChapterNumbering,
+            ),
+          ),
+        )
+      } catch (e: Throwable) {
+        future.completeExceptionally(e)
+      }
+    }
+
+    future.whenComplete { newController, exception ->
+      this.logger.debug("Completed controller opening...")
+
+      if (exception != null) {
+        this.logger.error("Failed to open controller: ", exception)
+        this.viewEventSource.onNext(SR2BookLoadingFailed(exception))
+        return@whenComplete
+      }
+
+      check(newController != null)
+      val oldController = this.controllerField
+      if (oldController != null) {
+        try {
+          oldController.close()
+        } catch (e: Exception) {
+          logger.error("Could not close old controller: ", e)
+        }
+      }
+
+      this.controllerField = newController
+      val reference = SR2ControllerReference(controller = newController, isFirstStartup = true)
+      this.viewEventSource.onNext(SR2ControllerBecameAvailable(reference))
+      newController.events.subscribe(this.controllerEventSource::onNext)
+    }
+    return future
+  }
+
+  @OptIn(ExperimentalReadiumApi::class)
+  fun consumeSearchResults(event: SR2CommandSearchResults) {
+    this.searchIterator = event.searchIterator
+    this.pagingSourceFactory.invalidate()
+  }
+}
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderParameters.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderParameters.kt
deleted file mode 100644
index ca72574..0000000
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderParameters.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.librarysimplified.r2.views
-
-import org.librarysimplified.r2.api.SR2ControllerProviderType
-import org.librarysimplified.r2.api.SR2PageNumberingMode
-import org.librarysimplified.r2.api.SR2ScrollingMode
-import org.librarysimplified.r2.api.SR2Theme
-import org.readium.r2.shared.publication.ContentProtection
-import org.readium.r2.shared.publication.asset.PublicationAsset
-
-/**
- * The parameters required to open an SR2 fragment.
- */
-
-data class SR2ReaderParameters(
-
-  /**
-   * Content protections to provide the Readium Streamer with.
-   */
-
-  val contentProtections: List<ContentProtection>,
-
-  /**
-   * The publication asset containing the book to be opened.
-   */
-
-  val bookFile: PublicationAsset,
-
-  /**
-   * An identifier used to uniquely identify a publication. Unfortunately, identifier are optional
-   * in EPUB files. For the sake of consistency, we require an identifier to always be provided.
-   */
-
-  val bookId: String,
-
-  /**
-   * A flag that indicates if the reader will be open for a book preview or not in order to know
-   * what options should be displayed to the user.
-   */
-
-  val isPreview: Boolean,
-
-  /**
-   * The initial theme used for the reader.
-   */
-
-  val theme: SR2Theme,
-
-  /**
-   * A provider of controllers.
-   */
-
-  val controllers: SR2ControllerProviderType,
-
-  /**
-   * The book scrolling mode.
-   */
-
-  val scrollingMode: SR2ScrollingMode,
-
-  /**
-   * The pagination numbering mode.
-   */
-
-  val pageNumberingMode: SR2PageNumberingMode,
-)
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewCommand.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewCommand.kt
new file mode 100644
index 0000000..d7f8b38
--- /dev/null
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewCommand.kt
@@ -0,0 +1,38 @@
+package org.librarysimplified.r2.views
+
+/**
+ * The type of commands from the SR2 views to the application.
+ */
+
+sealed class SR2ReaderViewCommand {
+
+  /**
+   * The user performed an action that means the current view should be closed.
+   */
+
+  data object SR2ReaderViewNavigationReaderClose : SR2ReaderViewCommand()
+
+  /**
+   * The user performed an action that means the current view should be closed.
+   */
+
+  data object SR2ReaderViewNavigationTOCClose : SR2ReaderViewCommand()
+
+  /**
+   * The user performed an action that means the TOC should be opened.
+   */
+
+  data object SR2ReaderViewNavigationTOCOpen : SR2ReaderViewCommand()
+
+  /**
+   * The user performed an action that means the search view should be opened.
+   */
+
+  data object SR2ReaderViewNavigationSearchOpen : SR2ReaderViewCommand()
+
+  /**
+   * The user performed an action that means the search view should be closed.
+   */
+
+  data object SR2ReaderViewNavigationSearchClose : SR2ReaderViewCommand()
+}
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewEvent.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewEvent.kt
index 686a52e..ecbc599 100644
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewEvent.kt
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewEvent.kt
@@ -6,23 +6,6 @@ package org.librarysimplified.r2.views
 
 sealed class SR2ReaderViewEvent {
 
-  sealed class SR2ReaderViewNavigationEvent : SR2ReaderViewEvent() {
-    object SR2ReaderViewNavigationClose : SR2ReaderViewNavigationEvent() {
-      override fun toString(): String =
-        "[SR2ReaderViewNavigationClose]"
-    }
-
-    object SR2ReaderViewNavigationOpenTOC : SR2ReaderViewNavigationEvent() {
-      override fun toString(): String =
-        "[SR2ReaderViewNavigationOpenTOC]"
-    }
-
-    object SR2ReaderViewNavigationOpenSearch : SR2ReaderViewNavigationEvent() {
-      override fun toString(): String =
-        "[SR2ReaderViewNavigationOpenSearch]"
-    }
-  }
-
   sealed class SR2ReaderViewControllerEvent : SR2ReaderViewEvent() {
     data class SR2ControllerBecameAvailable(
       val reference: SR2ControllerReference,
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewModel.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewModel.kt
deleted file mode 100644
index 1f3e1c7..0000000
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewModel.kt
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.librarysimplified.r2.views
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import androidx.paging.InvalidatingPagingSourceFactory
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.cachedIn
-import com.google.common.util.concurrent.Futures
-import com.google.common.util.concurrent.ListenableFuture
-import com.google.common.util.concurrent.ListeningExecutorService
-import com.google.common.util.concurrent.MoreExecutors
-import com.google.common.util.concurrent.SettableFuture
-import hu.akarnokd.rxjava2.subjects.UnicastWorkSubject
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import org.librarysimplified.r2.api.SR2ControllerConfiguration
-import org.librarysimplified.r2.api.SR2ControllerType
-import org.librarysimplified.r2.api.SR2Event
-import org.librarysimplified.r2.api.SR2Event.SR2CommandEvent.SR2CommandSearchResults
-import org.librarysimplified.r2.views.internal.SR2ViewModelBookEvent
-import org.librarysimplified.r2.views.internal.SR2ViewModelBookEvent.SR2ViewModelBookOpenFailed
-import org.librarysimplified.r2.views.internal.SR2ViewModelBookEvent.SR2ViewModelBookOpened
-import org.librarysimplified.r2.views.search.SR2SearchPagingSource
-import org.librarysimplified.r2.views.search.SR2SearchPagingSourceListener
-import org.readium.r2.shared.Search
-import org.readium.r2.shared.publication.Locator
-import org.readium.r2.shared.publication.LocatorCollection
-import org.readium.r2.shared.publication.services.search.SearchIterator
-import org.readium.r2.shared.publication.services.search.SearchTry
-import org.readium.r2.shared.util.Try
-import org.slf4j.LoggerFactory
-import java.util.concurrent.Executors
-
-/**
- * The view model shared between all SR2 fragments and the hosting activity.
- */
-
-@OptIn(Search::class)
-class SR2ReaderViewModel(
-  private val parameters: SR2ReaderParameters,
-) : ViewModel() {
-
-  private val logger =
-    LoggerFactory.getLogger(SR2ReaderViewModel::class.java)
-
-  private val controllerLock = Any()
-  private var controller: SR2ControllerType? = null
-  private var searchIterator: SearchIterator? = null
-
-  /*
-   * An event subject that can receive events from any thread, and an event subscription that
-   * publishes those events on the UI thread to a single unicast observable.
-   */
-
-  private val viewEventsSubject: Subject<SR2ReaderViewEvent> =
-    PublishSubject.create<SR2ReaderViewEvent>()
-      .toSerialized()
-  private val viewEventsUnicast: UnicastWorkSubject<SR2ReaderViewEvent> =
-    UnicastWorkSubject.create()
-  private val viewEventSubscription =
-    this.viewEventsSubject.observeOn(AndroidSchedulers.mainThread())
-      .subscribe(this.viewEventsUnicast::onNext)
-
-  /*
-   * An event subject that can receive events from any thread, and an event subscription that
-   * publishes those events on the UI thread to a single unicast observable.
-   */
-
-  private val bookEventsSubject: Subject<SR2ViewModelBookEvent> =
-    PublishSubject.create<SR2ViewModelBookEvent>()
-      .toSerialized()
-  private val bookEventsUnicast: UnicastWorkSubject<SR2ViewModelBookEvent> =
-    UnicastWorkSubject.create()
-  private val bookEventSubscription =
-    this.bookEventsSubject.observeOn(AndroidSchedulers.mainThread())
-      .subscribe(this.bookEventsUnicast::onNext)
-
-  private val subscriptions =
-    CompositeDisposable()
-
-  private val pagingSourceFactory = InvalidatingPagingSourceFactory {
-    SR2SearchPagingSource(object : SR2SearchPagingSourceListener {
-      override suspend fun getIteratorNext(): SearchTry<LocatorCollection?> {
-        val iterator = searchIterator ?: return Try.success(null)
-        return iterator.next().onSuccess {
-          mutableSearchLocators.value += (it?.locators.orEmpty())
-        }
-      }
-    })
-  }
-
-  private val mutableSearchLocators = MutableStateFlow<List<Locator>>(emptyList())
-
-  val searchLocators: StateFlow<List<Locator>> = mutableSearchLocators
-
-  val searchResult: Flow<PagingData<Locator>> =
-    Pager(PagingConfig(pageSize = 20), pagingSourceFactory = pagingSourceFactory)
-      .flow
-      .cachedIn(viewModelScope)
-
-  init {
-    this.logger.debug("{}: initialized", this)
-  }
-
-  override fun toString(): String =
-    "[SR2ReaderViewModel 0x${Integer.toHexString(this.hashCode())}]"
-
-  /**
-   * Events published by the views. This event stream is always observed upon the
-   * Android UI thread.
-   *
-   * Note: This observable may only have a single observer at any given time, and is expected
-   * to be used only by the activity hosting the reader fragment.
-   */
-
-  val viewEvents: Observable<SR2ReaderViewEvent> =
-    this.viewEventsUnicast
-
-  /**
-   * Events published by the controller. This event stream is always observed upon the
-   * Android UI thread.
-   */
-
-  val controllerEvents: BehaviorSubject<SR2Event> = BehaviorSubject.create()
-
-  /**
-   * Events published by the controller's lifecycle. This event stream is always observed upon the
-   * Android UI thread.
-   *
-   * Note: This observable may only have a single observer at any given time, and is expected
-   * to be used only by the reader fragment.
-   */
-
-  val bookEvents: Observable<SR2ViewModelBookEvent> =
-    this.bookEventsUnicast
-
-  /**
-   * Publish a view event.
-   */
-
-  fun publishViewEvent(event: SR2ReaderViewEvent) =
-    this.viewEventsSubject.onNext(event)
-
-  /**
-   * An I/O executor used for executing commands on the controller.
-   */
-
-  val ioExecutor: ListeningExecutorService =
-    MoreExecutors.listeningDecorator(
-      Executors.newFixedThreadPool(1) { runnable ->
-        val thread = Thread(runnable)
-        thread.name = "org.librarysimplified.r2.io"
-        thread
-      },
-    )
-
-  override fun onCleared() {
-    super.onCleared()
-
-    this.logger.debug("{}: onCleared", this)
-    synchronized(this.controllerLock) {
-      this.subscriptions.clear()
-      this.viewEventSubscription.dispose()
-      this.bookEventSubscription.dispose()
-      this.controller?.close()
-      this.controller = null
-      this.ioExecutor.shutdown()
-    }
-  }
-
-  fun get(): SR2ControllerType? {
-    return synchronized(this.controllerLock) {
-      this.controller
-    }
-  }
-
-  fun createOrGet(
-    configuration: SR2ControllerConfiguration,
-  ): ListenableFuture<SR2ControllerReference> {
-    /*
-     * If there's an existing controller, then return it.
-     */
-
-    synchronized(this.controllerLock) {
-      val existing = this.controller
-      if (existing != null) {
-        val controllerReference =
-          SR2ControllerReference(controller = existing, isFirstStartup = false)
-        this.bookEventsSubject.onNext(SR2ViewModelBookOpened(controllerReference))
-        return Futures.immediateFuture(controllerReference)
-      }
-    }
-
-    /*
-     * Otherwise, asynchronously create a new controller.
-     */
-
-    val refFuture =
-      SettableFuture.create<SR2ControllerReference>()
-    val future =
-      this.parameters.controllers.create(configuration)
-
-    future.addListener(
-      Runnable {
-        try {
-          val newController = future.get()
-          synchronized(this.controllerLock) {
-            this.controller = newController
-            this.subscriptions.clear()
-            this.subscriptions.add(
-              newController.events.observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this.controllerEvents::onNext),
-            )
-          }
-
-          val controllerReference =
-            SR2ControllerReference(controller = newController, isFirstStartup = true)
-
-          this.bookEventsSubject.onNext(SR2ViewModelBookOpened(controllerReference))
-          refFuture.set(controllerReference)
-        } catch (e: Throwable) {
-          this.logger.error("unable to create controller: ", e)
-          this.bookEventsSubject.onNext(SR2ViewModelBookOpenFailed(e))
-          refFuture.setException(e)
-        }
-      },
-      MoreExecutors.directExecutor(),
-    )
-
-    return refFuture
-  }
-
-  fun extractResults(event: SR2CommandSearchResults) {
-    searchIterator = event.searchIterator
-    pagingSourceFactory.invalidate()
-  }
-}
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewModelFactory.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewModelFactory.kt
deleted file mode 100644
index 5588dea..0000000
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2ReaderViewModelFactory.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.librarysimplified.r2.views
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-
-class SR2ReaderViewModelFactory constructor(
-  private val parameters: SR2ReaderParameters,
-) : ViewModelProvider.Factory {
-
-  override fun <T : ViewModel> create(modelClass: Class<T>): T {
-    return if (modelClass.isAssignableFrom(SR2ReaderViewModel::class.java)) {
-      SR2ReaderViewModel(this.parameters) as T
-    } else {
-      throw IllegalArgumentException("Cannot instantiate a value of type $modelClass")
-    }
-  }
-}
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/search/SR2SearchFragment.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2SearchFragment.kt
similarity index 51%
rename from org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/search/SR2SearchFragment.kt
rename to org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2SearchFragment.kt
index 4056e13..9d76223 100644
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/search/SR2SearchFragment.kt
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2SearchFragment.kt
@@ -1,4 +1,4 @@
-package org.librarysimplified.r2.views.search
+package org.librarysimplified.r2.views
 
 import android.content.Context
 import android.os.Bundle
@@ -8,51 +8,36 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
+import androidx.annotation.UiThread
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import io.reactivex.disposables.Disposable
+import io.reactivex.disposables.CompositeDisposable
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.librarysimplified.r2.api.SR2Command
-import org.librarysimplified.r2.api.SR2ControllerConfiguration
-import org.librarysimplified.r2.api.SR2ControllerType
 import org.librarysimplified.r2.api.SR2Event
 import org.librarysimplified.r2.api.SR2Locator
 import org.librarysimplified.r2.ui_thread.SR2UIThread
-import org.librarysimplified.r2.views.R
-import org.librarysimplified.r2.views.SR2ReaderParameters
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationClose
-import org.librarysimplified.r2.views.SR2ReaderViewModel
-import org.librarysimplified.r2.views.SR2ReaderViewModelFactory
-
-class SR2SearchFragment private constructor(
-  private val parameters: SR2ReaderParameters,
-) : Fragment() {
-
-  companion object {
-    fun create(parameters: SR2ReaderParameters): SR2SearchFragment {
-      return SR2SearchFragment(parameters)
-    }
-  }
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationSearchClose
+import org.librarysimplified.r2.views.search.SR2SearchResultAdapter
+import org.librarysimplified.r2.views.search.SR2SearchResultSectionItemDecoration
+import org.librarysimplified.r2.views.search.SR2SearchResultSectionListener
+import org.readium.r2.shared.publication.Href
 
-  private lateinit var controller: SR2ControllerType
+class SR2SearchFragment : SR2Fragment() {
+
+  private lateinit var subscriptions: CompositeDisposable
   private lateinit var noResultLabel: TextView
-  private lateinit var readerModel: SR2ReaderViewModel
   private lateinit var searchAdapter: SR2SearchResultAdapter
   private lateinit var searchResultsList: RecyclerView
   private lateinit var searchView: SearchView
   private lateinit var toolbar: Toolbar
 
-  private var controllerEvents: Disposable? = null
-  private var searchingTerms = ""
-
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
@@ -64,67 +49,53 @@ class SR2SearchFragment private constructor(
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
 
-    this.readerModel =
-      ViewModelProvider(requireActivity(), SR2ReaderViewModelFactory(this.parameters))
-        .get(SR2ReaderViewModel::class.java)
-
-    val activity =
-      this.requireActivity()
-
-    this.controller =
-      this.readerModel.createOrGet(
-        configuration = SR2ControllerConfiguration(
-          bookFile = this.parameters.bookFile,
-          bookId = this.parameters.bookId,
-          context = activity,
-          ioExecutor = this.readerModel.ioExecutor,
-          contentProtections = this.parameters.contentProtections,
-          theme = this.parameters.theme,
-          uiExecutor = SR2UIThread::runOnUIThread,
-          scrollingMode = this.parameters.scrollingMode,
-          pageNumberingMode = this.parameters.pageNumberingMode,
-        ),
-      ).get().controller
-
     this.toolbar =
       view.findViewById(R.id.searchToolbar)
+    this.searchResultsList =
+      view.findViewById(R.id.searchResultsList)
+    this.noResultLabel =
+      view.findViewById(R.id.noResultLabel)
 
     this.toolbar.inflateMenu(R.menu.sr2_search_menu)
-    this.toolbar.setNavigationOnClickListener {
-      close()
-    }
+    this.toolbar.setNavigationOnClickListener { this.close() }
     this.toolbar.setNavigationContentDescription(R.string.settingsAccessibilityBack)
 
     this.searchAdapter = SR2SearchResultAdapter(
       onItemClicked = { locator ->
-        this.controller.submitCommand(
+        val controller = SR2ReaderModel.controller()
+
+        controller.submitCommand(
           SR2Command.HighlightTerms(
-            searchingTerms = searchView.query.toString(),
+            searchingTerms = this.searchView.query.toString(),
             clearHighlight = false,
           ),
         )
-        this.controller.submitCommand(
+
+        controller.submitCommand(
           SR2Command.OpenChapter(
             SR2Locator.SR2LocatorPercent(
-              chapterHref = locator.href,
+              chapterHref = Href(locator.href),
               chapterProgress = locator.locations.progression ?: 0.0,
             ),
           ),
         )
-        close()
+        this.close()
       },
     )
 
-    this.searchResultsList = view.findViewById(R.id.searchResultsList)
     this.searchResultsList.apply {
-      adapter = searchAdapter
-      layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-      addItemDecoration(
+      this.adapter = this@SR2SearchFragment.searchAdapter
+      this.layoutManager = LinearLayoutManager(
+        this@SR2SearchFragment.requireContext(),
+        LinearLayoutManager.VERTICAL,
+        false,
+      )
+      this.addItemDecoration(
         SR2SearchResultSectionItemDecoration(
-          context,
+          this.context,
           object : SR2SearchResultSectionListener {
             override fun isStartOfSection(index: Int): Boolean =
-              readerModel.searchLocators.value.run {
+              SR2ReaderModel.searchLocators.value.run {
                 when {
                   index == 0 -> {
                     true
@@ -140,69 +111,60 @@ class SR2SearchFragment private constructor(
                 }
               }
 
-            override fun sectionTitle(index: Int): String =
-              readerModel.searchLocators.value.getOrNull(index)?.title.orEmpty()
+            override fun sectionTitle(index: Int): String {
+              return SR2ReaderModel.searchLocators.value.getOrNull(index)?.title.orEmpty()
+            }
           },
         ),
       )
-      addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
+      this.addItemDecoration(DividerItemDecoration(this.context, DividerItemDecoration.VERTICAL))
     }
 
-    this.noResultLabel = view.findViewById(R.id.noResultLabel)
-
-    configureSearch()
-  }
-
-  override fun onStop() {
-    this.controllerEvents?.dispose()
-    if (::controller.isInitialized) {
-      this.controller.viewDisconnect()
-    }
-    super.onStop()
+    this.configureSearch()
   }
 
   override fun onHiddenChanged(hidden: Boolean) {
     super.onHiddenChanged(hidden)
     if (!hidden) {
-      showKeyboard()
+      this.showKeyboard()
     }
   }
 
+  @UiThread
   private fun close() {
     SR2UIThread.checkIsUIThread()
-
-    this.readerModel.publishViewEvent(SR2ReaderViewNavigationClose)
+    SR2ReaderModel.submitViewCommand(SR2ReaderViewNavigationSearchClose)
   }
 
   private fun configureSearch() {
-    val search = toolbar.menu.findItem(R.id.readerMenuSearch)
-    searchView = search.actionView as SearchView
+    val search = this.toolbar.menu.findItem(R.id.readerMenuSearch)
+    this.searchView = search.actionView as SearchView
 
-    searchView.inputType = InputType.TYPE_CLASS_TEXT
-    searchView.isIconified = false
+    this.searchView.inputType = InputType.TYPE_CLASS_TEXT
+    this.searchView.isIconified = false
+    this.searchView.setOnCloseListener {
+      SR2ReaderModel.controller().submitCommand(SR2Command.CancelSearch)
 
-    searchView.setOnCloseListener {
-      controller.submitCommand(SR2Command.CancelSearch)
-      if (searchView.query.isNotBlank()) {
-        searchView.setQuery("", false)
+      if (this.searchView.query.isNotBlank()) {
+        this.searchView.setQuery("", false)
       } else {
-        controller.submitCommand(
+        SR2ReaderModel.controller().submitCommand(
           SR2Command.HighlightTerms(
-            searchingTerms = searchingTerms,
+            searchingTerms = SR2ReaderModel.searchTerm,
             clearHighlight = true,
           ),
         )
 
-        searchingTerms = ""
-
-        close()
+        SR2ReaderModel.searchTerm = ""
+        this.close()
       }
       true
     }
-    searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+
+    this.searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
       override fun onQueryTextSubmit(query: String): Boolean {
-        controller.submitCommand(SR2Command.Search(query))
-        searchView.clearFocus()
+        SR2ReaderModel.controller().submitCommand(SR2Command.Search(query))
+        this@SR2SearchFragment.searchView.clearFocus()
         return true
       }
 
@@ -211,20 +173,33 @@ class SR2SearchFragment private constructor(
       }
     })
 
-    showKeyboard()
+    this.showKeyboard()
 
-    this.controllerEvents =
-      this.readerModel.controllerEvents.subscribe(this::onControllerEvent)
+    SR2ReaderModel.searchResult
+      .onEach { this.searchAdapter.submitData(it) }
+      .launchIn(this.viewLifecycleOwner.lifecycleScope)
 
-    readerModel.searchResult
-      .onEach { searchAdapter.submitData(it) }
-      .launchIn(viewLifecycleOwner.lifecycleScope)
+    SR2ReaderModel.searchLocators
+      .onEach { this.noResultLabel.isVisible = it.isEmpty() }
+      .launchIn(this.viewLifecycleOwner.lifecycleScope)
+  }
+
+  override fun onStart() {
+    super.onStart()
 
-    readerModel.searchLocators
-      .onEach { noResultLabel.isVisible = it.isEmpty() }
-      .launchIn(viewLifecycleOwner.lifecycleScope)
+    this.subscriptions =
+      CompositeDisposable()
+    this.subscriptions.add(
+      SR2ReaderModel.controllerEvents.subscribe(this::onControllerEvent),
+    )
+  }
+
+  override fun onStop() {
+    super.onStop()
+    this.subscriptions.dispose()
   }
 
+  @UiThread
   private fun onControllerEvent(event: SR2Event) {
     SR2UIThread.checkIsUIThread()
 
@@ -250,16 +225,16 @@ class SR2SearchFragment private constructor(
       }
 
       is SR2Event.SR2CommandEvent.SR2CommandSearchResults -> {
-        this.readerModel.extractResults(event)
+        SR2ReaderModel.consumeSearchResults(event)
       }
     }
   }
 
   private fun showKeyboard() {
-    searchView.post {
-      searchView.requestFocus()
-      (requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager)
-        ?.showSoftInput(requireView().findFocus(), 0)
+    this.searchView.post {
+      this.searchView.requestFocus()
+      (this.requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager)
+        ?.showSoftInput(this.requireView().findFocus(), 0)
     }
   }
 }
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2TOCFragment.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2TOCFragment.kt
index b8b5292..a5487f9 100644
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2TOCFragment.kt
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/SR2TOCFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
-import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
@@ -14,15 +13,7 @@ import org.librarysimplified.r2.views.internal.SR2TOCBookmarksFragment
 import org.librarysimplified.r2.views.internal.SR2TOCChaptersFragment
 import org.librarysimplified.r2.views.internal.SR2TOCPage
 
-class SR2TOCFragment private constructor(
-  private val parameters: SR2ReaderParameters,
-) : Fragment() {
-
-  companion object {
-    fun create(parameters: SR2ReaderParameters): SR2TOCFragment {
-      return SR2TOCFragment(parameters)
-    }
-  }
+class SR2TOCFragment : SR2Fragment() {
 
   private lateinit var viewPagerAdapter: SR2TOCAdapter
   private lateinit var viewPager: ViewPager2
@@ -49,11 +40,11 @@ class SR2TOCFragment private constructor(
         pages = listOf(
           SR2TOCPage(
             title = this.resources.getString(R.string.tocTitle),
-            fragmentConstructor = { SR2TOCChaptersFragment.create(this.parameters) },
+            fragmentConstructor = { SR2TOCChaptersFragment() },
           ),
           SR2TOCPage(
             title = this.resources.getString(R.string.tocBookmarks),
-            fragmentConstructor = { SR2TOCBookmarksFragment.create(this.parameters) },
+            fragmentConstructor = { SR2TOCBookmarksFragment() },
           ),
         ),
       )
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2SettingsDialog.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2SettingsDialog.kt
index 8484a00..684a005 100644
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2SettingsDialog.kt
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2SettingsDialog.kt
@@ -11,13 +11,13 @@ import com.google.android.material.tabs.TabLayout
 import io.reactivex.disposables.CompositeDisposable
 import org.librarysimplified.r2.api.SR2ColorScheme
 import org.librarysimplified.r2.api.SR2Command
-import org.librarysimplified.r2.api.SR2ControllerType
 import org.librarysimplified.r2.api.SR2Event
 import org.librarysimplified.r2.api.SR2Font
 import org.librarysimplified.r2.api.SR2PublisherCSS.SR2_PUBLISHER_DEFAULT_CSS_DISABLED
 import org.librarysimplified.r2.api.SR2PublisherCSS.SR2_PUBLISHER_DEFAULT_CSS_ENABLED
 import org.librarysimplified.r2.api.SR2Theme
 import org.librarysimplified.r2.views.R
+import org.librarysimplified.r2.views.SR2ReaderModel
 
 internal class SR2SettingsDialog private constructor() {
 
@@ -58,25 +58,22 @@ internal class SR2SettingsDialog private constructor() {
 
   companion object {
     private fun updateTheme(
-      controller: SR2ControllerType,
       updater: (SR2Theme) -> SR2Theme,
     ) {
+      val controller = SR2ReaderModel.controller()
       controller.submitCommand(SR2Command.ThemeSet(updater.invoke(controller.themeNow())))
     }
 
     fun create(
       brightness: SR2BrightnessServiceType,
       context: Context,
-      controller: SR2ControllerType,
     ): SR2SettingsDialog {
       val eventSubscriptions = CompositeDisposable()
 
       val dialog =
         MaterialAlertDialogBuilder(context)
           .setView(R.layout.sr2_settings)
-          .setOnDismissListener {
-            eventSubscriptions.dispose()
-          }
+          .setOnDismissListener { eventSubscriptions.dispose() }
           .create()
 
       dialog.show()
@@ -104,7 +101,7 @@ internal class SR2SettingsDialog private constructor() {
         override fun onTabSelected(tab: TabLayout.Tab) {
           val selectedTab = FontSelectionTab.values()[tab.position]
           val updater = selectedTab.toThemeUpdater()
-          this@Companion.updateTheme(controller, updater)
+          this@Companion.updateTheme(updater)
           val showDetail = selectedTab == FontSelectionTab.PUB
           setFontDetail.visibility = if (showDetail) View.VISIBLE else View.GONE
         }
@@ -118,7 +115,8 @@ internal class SR2SettingsDialog private constructor() {
         }
       })
 
-      val currentTabIndex = FontSelectionTab.fromTheme(controller.themeNow()).ordinal
+      val currentTabIndex =
+        FontSelectionTab.fromTheme(SR2ReaderModel.controller().themeNow()).ordinal
       setFontTabs.selectTab(setFontTabs.getTabAt(currentTabIndex))
 
       val setThemeLight =
@@ -129,13 +127,13 @@ internal class SR2SettingsDialog private constructor() {
         dialog.findViewById<View>(R.id.setThemeSepia)!!
 
       setThemeLight.setOnClickListener {
-        this.updateTheme(controller) { it.copy(colorScheme = SR2ColorScheme.DARK_TEXT_LIGHT_BACKGROUND) }
+        this.updateTheme { it.copy(colorScheme = SR2ColorScheme.DARK_TEXT_LIGHT_BACKGROUND) }
       }
       setThemeDark.setOnClickListener {
-        this.updateTheme(controller) { it.copy(colorScheme = SR2ColorScheme.LIGHT_TEXT_DARK_BACKGROUND) }
+        this.updateTheme { it.copy(colorScheme = SR2ColorScheme.LIGHT_TEXT_DARK_BACKGROUND) }
       }
       setThemeSepia.setOnClickListener {
-        this.updateTheme(controller) { it.copy(colorScheme = SR2ColorScheme.DARK_TEXT_ON_SEPIA) }
+        this.updateTheme { it.copy(colorScheme = SR2ColorScheme.DARK_TEXT_ON_SEPIA) }
       }
 
       val setTextSmaller =
@@ -148,26 +146,26 @@ internal class SR2SettingsDialog private constructor() {
         dialog.findViewById<SeekBar>(R.id.setBrightness)!!
 
       setTextLarger.setOnClickListener {
-        this.updateTheme(controller) { it.copy(textSize = SR2Theme.sizeConstrain(it.textSize + 0.1)) }
+        this.updateTheme { it.copy(textSize = SR2Theme.sizeConstrain(it.textSize + 0.1)) }
       }
       setTextReset.setOnClickListener {
-        this.updateTheme(controller) { it.copy(textSize = 1.0) }
+        this.updateTheme { it.copy(textSize = 1.0) }
       }
       setTextSmaller.setOnClickListener {
-        this.updateTheme(controller) { it.copy(textSize = SR2Theme.sizeConstrain(it.textSize - 0.1)) }
+        this.updateTheme { it.copy(textSize = SR2Theme.sizeConstrain(it.textSize - 0.1)) }
       }
 
       fun updateSetText() {
-        val themeNow = controller.themeNow()
-
+        val themeNow = SR2ReaderModel.controller().themeNow()
         setTextSmaller.isEnabled = !themeNow.isTextSizeMinimized
         setTextLarger.isEnabled = !themeNow.isTextSizeMaximized
       }
 
       eventSubscriptions.add(
-        controller.events.ofType(SR2Event.SR2ThemeChanged::class.java).subscribe {
-          updateSetText()
-        },
+        SR2ReaderModel.controller()
+          .events
+          .ofType(SR2Event.SR2ThemeChanged::class.java)
+          .subscribe { updateSetText() },
       )
 
       updateSetText()
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2TOCBookmarksFragment.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2TOCBookmarksFragment.kt
index 9a3cb23..102f58b 100644
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2TOCBookmarksFragment.kt
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2TOCBookmarksFragment.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.UiThread
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
@@ -15,35 +14,22 @@ import io.reactivex.disposables.CompositeDisposable
 import org.librarysimplified.r2.api.SR2Bookmark
 import org.librarysimplified.r2.api.SR2Bookmark.Type.LAST_READ
 import org.librarysimplified.r2.api.SR2Command
-import org.librarysimplified.r2.api.SR2ControllerConfiguration
-import org.librarysimplified.r2.api.SR2ControllerType
 import org.librarysimplified.r2.api.SR2Event.SR2BookmarkEvent
 import org.librarysimplified.r2.ui_thread.SR2UIThread
 import org.librarysimplified.r2.views.R
-import org.librarysimplified.r2.views.SR2ReaderParameters
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationClose
-import org.librarysimplified.r2.views.SR2ReaderViewModel
-import org.librarysimplified.r2.views.SR2ReaderViewModelFactory
+import org.librarysimplified.r2.views.SR2ReaderModel
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationTOCClose
 import org.slf4j.LoggerFactory
 
-internal class SR2TOCBookmarksFragment private constructor(
-  private val parameters: SR2ReaderParameters,
-) : Fragment() {
+internal class SR2TOCBookmarksFragment : Fragment() {
 
-  private val logger = LoggerFactory.getLogger(SR2TOCBookmarksFragment::class.java)
-
-  companion object {
-    fun create(parameters: SR2ReaderParameters): SR2TOCBookmarksFragment {
-      return SR2TOCBookmarksFragment(parameters)
-    }
-  }
+  private val logger =
+    LoggerFactory.getLogger(SR2TOCBookmarksFragment::class.java)
 
   private lateinit var lastReadItem: SR2TOCBookmarkViewHolder
   private lateinit var emptyMessage: TextView
   private lateinit var bookmarkAdapter: SR2TOCBookmarkAdapter
-  private lateinit var controller: SR2ControllerType
-  private lateinit var readerModel: SR2ReaderViewModel
-  private val bookmarkSubscriptions = CompositeDisposable()
+  private lateinit var bookmarkSubscriptions: CompositeDisposable
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -71,7 +57,7 @@ internal class SR2TOCBookmarksFragment private constructor(
     val recyclerView =
       layout.findViewById<RecyclerView>(R.id.tocBookmarksList)
 
-    emptyMessage = layout.findViewById(R.id.empty_bookmarks_text)
+    this.emptyMessage = layout.findViewById(R.id.empty_bookmarks_text)
 
     recyclerView.adapter = this.bookmarkAdapter
     recyclerView.setHasFixedSize(true)
@@ -87,35 +73,21 @@ internal class SR2TOCBookmarksFragment private constructor(
   override fun onStart() {
     super.onStart()
 
-    val activity = this.requireActivity()
-
-    this.readerModel =
-      ViewModelProvider(activity, SR2ReaderViewModelFactory(this.parameters))
-        .get(SR2ReaderViewModel::class.java)
-
-    this.controller =
-      this.readerModel.createOrGet(
-        configuration = SR2ControllerConfiguration(
-          bookFile = this.parameters.bookFile,
-          bookId = this.parameters.bookId,
-          context = activity,
-          ioExecutor = this.readerModel.ioExecutor,
-          contentProtections = this.parameters.contentProtections,
-          theme = this.parameters.theme,
-          uiExecutor = SR2UIThread::runOnUIThread,
-          scrollingMode = this.parameters.scrollingMode,
-          pageNumberingMode = this.parameters.pageNumberingMode,
-        ),
-      ).get().controller
-
+    this.bookmarkSubscriptions = CompositeDisposable()
     this.bookmarkSubscriptions.add(
-      this.controller.events.ofType(SR2BookmarkEvent::class.java)
+      SR2ReaderModel.controllerEvents
+        .ofType(SR2BookmarkEvent::class.java)
         .subscribe { this.reloadBookmarks() },
     )
 
     this.reloadBookmarks()
   }
 
+  override fun onStop() {
+    super.onStop()
+    this.bookmarkSubscriptions.dispose()
+  }
+
   private fun reloadBookmarks() {
     SR2UIThread.runOnUIThread {
       this.reloadBookmarksUI()
@@ -126,7 +98,7 @@ internal class SR2TOCBookmarksFragment private constructor(
   private fun reloadBookmarksUI() {
     SR2UIThread.checkIsUIThread()
 
-    val bookmarksNow = this.controller.bookmarksNow()
+    val bookmarksNow = SR2ReaderModel.controller().bookmarksNow()
     this.logger.debug("received {} bookmarks", bookmarksNow.size)
     val bookmarks = bookmarksNow.filter { it.type != LAST_READ }
     this.bookmarkAdapter.setBookmarks(bookmarks)
@@ -144,7 +116,7 @@ internal class SR2TOCBookmarksFragment private constructor(
       this.lastReadItem.rootView.visibility = View.GONE
     }
 
-    emptyMessage.visibility = if (bookmarks.isEmpty() && lastRead == null) {
+    this.emptyMessage.visibility = if (bookmarks.isEmpty() && lastRead == null) {
       View.VISIBLE
     } else {
       View.GONE
@@ -152,20 +124,15 @@ internal class SR2TOCBookmarksFragment private constructor(
   }
 
   private fun onBookmarkSelected(bookmark: SR2Bookmark) {
-    this.controller.submitCommand(SR2Command.OpenChapter(bookmark.locator))
+    SR2ReaderModel.controller().submitCommand(SR2Command.OpenChapter(bookmark.locator))
 
     SR2UIThread.runOnUIThreadDelayed(
-      Runnable { this.readerModel.publishViewEvent(SR2ReaderViewNavigationClose) },
+      { SR2ReaderModel.submitViewCommand(SR2ReaderViewNavigationTOCClose) },
       SR2TOC.tocSelectionDelay(),
     )
   }
 
   private fun onBookmarkDeleteRequested(bookmark: SR2Bookmark) {
-    this.controller.submitCommand(SR2Command.BookmarkDelete(bookmark))
-  }
-
-  override fun onStop() {
-    super.onStop()
-    this.bookmarkSubscriptions.dispose()
+    SR2ReaderModel.controller().submitCommand(SR2Command.BookmarkDelete(bookmark))
   }
 }
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2TOCChaptersFragment.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2TOCChaptersFragment.kt
index dad5760..4b91363 100644
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2TOCChaptersFragment.kt
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2TOCChaptersFragment.kt
@@ -7,33 +7,20 @@ import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
 import org.librarysimplified.r2.api.SR2Command
-import org.librarysimplified.r2.api.SR2ControllerConfiguration
-import org.librarysimplified.r2.api.SR2ControllerType
 import org.librarysimplified.r2.api.SR2Locator.SR2LocatorPercent
 import org.librarysimplified.r2.api.SR2TOCEntry
 import org.librarysimplified.r2.ui_thread.SR2UIThread
 import org.librarysimplified.r2.views.R
-import org.librarysimplified.r2.views.SR2ReaderParameters
-import org.librarysimplified.r2.views.SR2ReaderViewEvent.SR2ReaderViewNavigationEvent.SR2ReaderViewNavigationClose
-import org.librarysimplified.r2.views.SR2ReaderViewModel
-import org.librarysimplified.r2.views.SR2ReaderViewModelFactory
+import org.librarysimplified.r2.views.SR2ReaderModel
+import org.librarysimplified.r2.views.SR2ReaderViewCommand.SR2ReaderViewNavigationTOCClose
 
-internal class SR2TOCChaptersFragment private constructor(
-  private val parameters: SR2ReaderParameters,
-) : Fragment() {
+internal class SR2TOCChaptersFragment : Fragment() {
 
-  companion object {
-    fun create(parameters: SR2ReaderParameters): SR2TOCChaptersFragment {
-      return SR2TOCChaptersFragment(parameters)
-    }
-  }
-
-  private lateinit var controller: SR2ControllerType
-  private lateinit var readerModel: SR2ReaderViewModel
+  private lateinit var chaptersError: View
+  private lateinit var chapterList: RecyclerView
   private lateinit var chapterAdapter: SR2TOCChapterAdapter
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -53,60 +40,44 @@ internal class SR2TOCChaptersFragment private constructor(
   ): View? {
     val layout =
       inflater.inflate(R.layout.sr2_toc_chapters, container, false)
-    val recyclerView =
-      layout.findViewById<RecyclerView>(R.id.tocChaptersList)
+    this.chaptersError =
+      layout.findViewById(R.id.tocChaptersError)
+    this.chapterList =
+      layout.findViewById(R.id.tocChaptersList)
 
-    recyclerView.adapter = this.chapterAdapter
-    recyclerView.setHasFixedSize(true)
-    recyclerView.setItemViewCacheSize(32)
-    (recyclerView.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
+    this.chapterList.adapter = this.chapterAdapter
+    this.chapterList.setHasFixedSize(true)
+    this.chapterList.setItemViewCacheSize(32)
+    (this.chapterList.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
     return layout
   }
 
   override fun onStart() {
     super.onStart()
 
-    val activity = this.requireActivity()
-
-    this.readerModel =
-      ViewModelProvider(activity, SR2ReaderViewModelFactory(this.parameters))
-        .get(SR2ReaderViewModel::class.java)
-
-    this.controller =
-      this.readerModel.createOrGet(
-        configuration = SR2ControllerConfiguration(
-          bookFile = this.parameters.bookFile,
-          bookId = this.parameters.bookId,
-          context = activity,
-          ioExecutor = this.readerModel.ioExecutor,
-          contentProtections = this.parameters.contentProtections,
-          theme = this.parameters.theme,
-          uiExecutor = SR2UIThread::runOnUIThread,
-          scrollingMode = this.parameters.scrollingMode,
-          pageNumberingMode = this.parameters.pageNumberingMode,
-        ),
-      ).get().controller
-
-    val toc = this.controller.bookMetadata.tableOfContents
-    view?.apply {
-      findViewById<View>(R.id.tocChaptersError)?.isVisible = toc.isEmpty()
-      findViewById<RecyclerView>(R.id.tocChaptersList)?.isGone = toc.isEmpty()
+    val toc = SR2ReaderModel.controller().bookMetadata.tableOfContents
+    if (toc.isEmpty()) {
+      this.chaptersError.isVisible = true
+      this.chapterList.isGone = true
+      return
     }
+
     this.chapterAdapter.setTableOfContentsEntries(toc)
   }
 
   private fun onTOCEntrySelected(entry: SR2TOCEntry) {
-    this.controller.submitCommand(
-      SR2Command.OpenChapter(
-        SR2LocatorPercent(
-          chapterHref = entry.href,
-          chapterProgress = 0.0,
+    SR2ReaderModel.controller()
+      .submitCommand(
+        SR2Command.OpenChapter(
+          SR2LocatorPercent(
+            chapterHref = entry.href,
+            chapterProgress = 0.0,
+          ),
         ),
-      ),
-    )
+      )
 
     SR2UIThread.runOnUIThreadDelayed(
-      { this.readerModel.publishViewEvent(SR2ReaderViewNavigationClose) },
+      { SR2ReaderModel.submitViewCommand(SR2ReaderViewNavigationTOCClose) },
       SR2TOC.tocSelectionDelay(),
     )
   }
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2ViewModelBookEvent.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2ViewModelBookEvent.kt
deleted file mode 100644
index 52c2fe2..0000000
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/internal/SR2ViewModelBookEvent.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.librarysimplified.r2.views.internal
-
-import org.librarysimplified.r2.views.SR2ControllerReference
-
-/**
- * An internal set of events published by the reader's view model. These events indicate
- * that a book was opened or failed to open.
- */
-
-sealed class SR2ViewModelBookEvent {
-
-  data class SR2ViewModelBookOpened(
-    val reference: SR2ControllerReference,
-  ) : SR2ViewModelBookEvent()
-
-  data class SR2ViewModelBookOpenFailed(
-    val exception: Throwable,
-  ) : SR2ViewModelBookEvent()
-}
diff --git a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/search/SR2SearchPagingSource.kt b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/search/SR2SearchPagingSource.kt
index aef17f0..054748f 100644
--- a/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/search/SR2SearchPagingSource.kt
+++ b/org.librarysimplified.r2.views/src/main/java/org/librarysimplified/r2/views/search/SR2SearchPagingSource.kt
@@ -16,7 +16,7 @@ class SR2SearchPagingSource(
 
   override suspend fun load(params: LoadParams<Unit>): LoadResult<Unit, Locator> {
     return try {
-      val page = pagingSourceListener.getIteratorNext().getOrThrow()
+      val page = pagingSourceListener.getIteratorNext().getOrNull()
       LoadResult.Page(
         data = page?.locators.orEmpty(),
         prevKey = null,
diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
index 032cb4a..a4edada 160000
--- a/org.thepalaceproject.android.platform
+++ b/org.thepalaceproject.android.platform
@@ -1 +1 @@
-Subproject commit 032cb4a496e3d78bd154e5374d97efa036a5d8e4
+Subproject commit a4edada39576035e53f9c5778f7f71c77b54899e