diff --git a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsAudioPlayer.kt b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsAudioPlayer.kt
index 3bf086d8..0dec5b59 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsAudioPlayer.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsAudioPlayer.kt
@@ -16,6 +16,8 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.getcapacitor.*
 import com.getcapacitor.annotation.CapacitorPlugin
 import com.google.android.gms.cast.CastDevice
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
 import org.json.JSONObject
 
 @CapacitorPlugin(name = "AbsAudioPlayer")
@@ -25,7 +27,7 @@ class AbsAudioPlayer : Plugin() {
 
   private lateinit var mainActivity: MainActivity
   private lateinit var apiHandler:ApiHandler
-  lateinit var castManager:CastManager
+  var castManager:CastManager? = null
 
   lateinit var playerNotificationService: PlayerNotificationService
 
@@ -95,6 +97,24 @@ class AbsAudioPlayer : Plugin() {
   }
 
   private fun initCastManager() {
+    val googleApi = GoogleApiAvailability.getInstance()
+    val statusCode = googleApi.isGooglePlayServicesAvailable(mainActivity)
+
+    if (statusCode != ConnectionResult.SUCCESS) {
+        if (statusCode == ConnectionResult.SERVICE_MISSING) {
+          Log.w(tag, "initCastManager: Google Api Missing")
+        } else if (statusCode == ConnectionResult.SERVICE_DISABLED) {
+          Log.w(tag, "initCastManager: Google Api Disabled")
+        } else if (statusCode == ConnectionResult.SERVICE_INVALID) {
+          Log.w(tag, "initCastManager: Google Api Invalid")
+        } else if (statusCode == ConnectionResult.SERVICE_UPDATING) {
+          Log.w(tag, "initCastManager: Google Api Updating")
+        } else if (statusCode == ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED) {
+          Log.w(tag, "initCastManager: Google Api Update Required")
+        }
+        return
+    }
+
     val connListener = object: CastManager.ChromecastListener() {
       override fun onReceiverAvailableUpdate(available: Boolean) {
         Log.d(tag, "ChromecastListener: CAST Receiver Update Available $available")
@@ -128,7 +148,7 @@ class AbsAudioPlayer : Plugin() {
     }
 
     castManager = CastManager(mainActivity)
-    castManager.startRouteScan(connListener)
+    castManager?.startRouteScan(connListener)
   }
 
   @PluginMethod
@@ -144,7 +164,7 @@ class AbsAudioPlayer : Plugin() {
     val libraryItemId = call.getString("libraryItemId", "").toString()
     val episodeId = call.getString("episodeId", "").toString()
     val playWhenReady = call.getBoolean("playWhenReady") == true
-    var playbackRate = call.getFloat("playbackRate",1f) ?: 1f
+    val playbackRate = call.getFloat("playbackRate",1f) ?: 1f
 
     if (libraryItemId.isEmpty()) {
       Log.e(tag, "Invalid call to play library item no library item id")
@@ -322,7 +342,11 @@ class AbsAudioPlayer : Plugin() {
     // Need to make sure the player service has been started
     Log.d(tag, "CAST REQUEST SESSION PLUGIN")
     call.resolve()
-    castManager.requestSession(playerNotificationService, object : CastManager.RequestSessionCallback() {
+    if (castManager == null) {
+      Log.e(tag, "Cast Manager not initialized")
+      return
+    }
+    castManager?.requestSession(playerNotificationService, object : CastManager.RequestSessionCallback() {
       override fun onError(errorCode: Int) {
         Log.e(tag, "CAST REQUEST SESSION CALLBACK ERROR $errorCode")
       }
diff --git a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDatabase.kt b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDatabase.kt
index a6c26c0a..53ea45ee 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDatabase.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDatabase.kt
@@ -206,45 +206,93 @@ class AbsDatabase : Plugin() {
 
   @PluginMethod
   fun updateLocalMediaProgressFinished(call:PluginCall) {
-    var localMediaProgressId = call.getString("localMediaProgressId", "").toString()
-    var isFinished = call.getBoolean("isFinished", false) == true
+    val localLibraryItemId = call.getString("localLibraryItemId", "").toString()
+    var localEpisodeId:String? = call.getString("localEpisodeId", "").toString()
+    if (localEpisodeId.isNullOrEmpty()) localEpisodeId = null
+
+    val localMediaProgressId = if (localEpisodeId.isNullOrEmpty()) localLibraryItemId else "$localLibraryItemId-$localEpisodeId"
+    val isFinished = call.getBoolean("isFinished", false) == true
+
     Log.d(tag, "updateLocalMediaProgressFinished $localMediaProgressId | Is Finished:$isFinished")
     var localMediaProgress = DeviceManager.dbManager.getLocalMediaProgress(localMediaProgressId)
-    if (localMediaProgress == null) {
-     Log.e(tag, "updateLocalMediaProgressFinished Local Media Progress not found $localMediaProgressId")
-      call.resolve(JSObject("{\"error\":\"Progress not found\"}"))
+
+    if (localMediaProgress == null) { // Create new local media progress if does not exist
+     Log.d(tag, "updateLocalMediaProgressFinished Local Media Progress not found $localMediaProgressId - Creating new")
+      val localLibraryItem = DeviceManager.dbManager.getLocalLibraryItem(localLibraryItemId)
+
+      if (localLibraryItem == null) {
+        return call.resolve(JSObject("{\"error\":\"Library Item not found\"}"))
+      }
+      if (localLibraryItem.mediaType != "podcast" && !localEpisodeId.isNullOrEmpty()) {
+        return call.resolve(JSObject("{\"error\":\"Invalid library item not a podcast\"}"))
+      }
+
+      var duration = 0.0
+      var podcastEpisode:PodcastEpisode? = null
+      if (!localEpisodeId.isNullOrEmpty()) {
+          val podcast = localLibraryItem.media as Podcast
+        podcastEpisode = podcast.episodes?.find { episode ->
+            episode.id == localEpisodeId
+          }
+        if (podcastEpisode == null) {
+          return call.resolve(JSObject("{\"error\":\"Podcast episode not found\"}"))
+        }
+        duration = podcastEpisode.duration ?: 0.0
+      } else {
+        val book = localLibraryItem.media as Book
+        duration = book.duration ?: 0.0
+      }
+
+      val currentTime = System.currentTimeMillis()
+      localMediaProgress = LocalMediaProgress(
+        id = localMediaProgressId,
+        localLibraryItemId = localLibraryItemId,
+        localEpisodeId = localEpisodeId,
+        duration = duration,
+        progress = if (isFinished) 1.0 else 0.0,
+        currentTime = 0.0,
+        isFinished = isFinished,
+        lastUpdate = currentTime,
+        startedAt = if (isFinished) currentTime else 0L,
+        finishedAt = if (isFinished) currentTime else null,
+        serverConnectionConfigId = localLibraryItem.serverConnectionConfigId,
+        serverAddress = localLibraryItem.serverAddress,
+        serverUserId = localLibraryItem.serverUserId,
+        libraryItemId = localLibraryItem.libraryItemId,
+        episodeId = podcastEpisode?.serverEpisodeId)
     } else {
       localMediaProgress.updateIsFinished(isFinished)
+    }
 
-      var lmpstring = jacksonMapper.writeValueAsString(localMediaProgress)
-      Log.d(tag, "updateLocalMediaProgressFinished: Local Media Progress String $lmpstring")
+    // Save local media progress locally
+    DeviceManager.dbManager.saveLocalMediaProgress(localMediaProgress)
 
-      // Send update to server media progress is linked to a server and user is logged into that server
-      localMediaProgress.serverConnectionConfigId?.let { configId ->
-        if (DeviceManager.serverConnectionConfigId == configId) {
-          var libraryItemId = localMediaProgress.libraryItemId ?: ""
-          var episodeId = localMediaProgress.episodeId ?: ""
-          var updatePayload = JSObject()
-          updatePayload.put("isFinished", isFinished)
-          apiHandler.updateMediaProgress(libraryItemId,episodeId,updatePayload) {
-            Log.d(tag, "updateLocalMediaProgressFinished: Updated media progress isFinished on server")
-            var jsobj = JSObject()
-            jsobj.put("local", true)
-            jsobj.put("server", true)
-            jsobj.put("localMediaProgress", JSObject(lmpstring))
-            call.resolve(jsobj)
-//            call.resolve(JSObject("{\"local\":true,\"server\":true,\"localMediaProgress\":$lmpstring}"))
-          }
+    val lmpstring = jacksonMapper.writeValueAsString(localMediaProgress)
+    Log.d(tag, "updateLocalMediaProgressFinished: Local Media Progress String $lmpstring")
+
+    // Send update to server media progress is linked to a server and user is logged into that server
+    localMediaProgress.serverConnectionConfigId?.let { configId ->
+      if (DeviceManager.serverConnectionConfigId == configId) {
+        var libraryItemId = localMediaProgress.libraryItemId ?: ""
+        var episodeId = localMediaProgress.episodeId ?: ""
+        var updatePayload = JSObject()
+        updatePayload.put("isFinished", isFinished)
+        apiHandler.updateMediaProgress(libraryItemId,episodeId,updatePayload) {
+          Log.d(tag, "updateLocalMediaProgressFinished: Updated media progress isFinished on server")
+          var jsobj = JSObject()
+          jsobj.put("local", true)
+          jsobj.put("server", true)
+          jsobj.put("localMediaProgress", JSObject(lmpstring))
+          call.resolve(jsobj)
         }
       }
-      if (localMediaProgress.serverConnectionConfigId == null || DeviceManager.serverConnectionConfigId != localMediaProgress.serverConnectionConfigId) {
-//        call.resolve(JSObject("{\"local\":true,\"localMediaProgress\":$lmpstring}}"))
-        var jsobj = JSObject()
-        jsobj.put("local", true)
-        jsobj.put("server", false)
-        jsobj.put("localMediaProgress", JSObject(lmpstring))
-        call.resolve(jsobj)
-      }
+    }
+    if (localMediaProgress.serverConnectionConfigId == null || DeviceManager.serverConnectionConfigId != localMediaProgress.serverConnectionConfigId) {
+      var jsobj = JSObject()
+      jsobj.put("local", true)
+      jsobj.put("server", false)
+      jsobj.put("localMediaProgress", JSObject(lmpstring))
+      call.resolve(jsobj)
     }
   }
 
diff --git a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt
index 4e3e18be..b242e2a5 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt
@@ -180,15 +180,30 @@ class AbsDownloader : Plugin() {
 
   // Item filenames could be the same if they are in sub-folders, this will make them unique
   private fun getFilenameFromRelPath(relPath: String): String {
-    val cleanedRelPath = relPath.replace("\\", "_").replace("/", "_")
+    var cleanedRelPath = relPath.replace("\\", "_").replace("/", "_")
+    cleanedRelPath = cleanStringForFileSystem(cleanedRelPath)
     return if (cleanedRelPath.startsWith("_")) cleanedRelPath.substring(1) else cleanedRelPath
   }
 
+  // Replace characters that cant be used in the file system
+  // Reserved characters: ?:\"*|/\\<>
+  private fun cleanStringForFileSystem(str:String):String {
+    val reservedCharacters = listOf("?", "\"", "*", "|", "/", "\\", "<", ">")
+    var newTitle = str
+    newTitle = newTitle.replace(":", " -") // Special case replace : with -
+
+    reservedCharacters.forEach {
+      newTitle = newTitle.replace(it, "")
+    }
+    return newTitle
+  }
+
   private fun startLibraryItemDownload(libraryItem: LibraryItem, localFolder: LocalFolder, episode:PodcastEpisode?) {
     val tempFolderPath = mainActivity.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
 
     if (libraryItem.mediaType == "book") {
-      val bookTitle = libraryItem.media.metadata.title
+      val bookTitle = cleanStringForFileSystem(libraryItem.media.metadata.title)
+
       val tracks = libraryItem.media.getAudioTracks()
       Log.d(tag, "Starting library item download with ${tracks.size} tracks")
       val itemFolderPath = localFolder.absolutePath + "/" + bookTitle
@@ -243,8 +258,8 @@ class AbsDownloader : Plugin() {
       }
     } else {
       // Podcast episode download
+      val podcastTitle = cleanStringForFileSystem(libraryItem.media.metadata.title)
 
-      val podcastTitle = libraryItem.media.metadata.title
       val audioTrack = episode?.audioTrack
       Log.d(tag, "Starting podcast episode download")
       val itemFolderPath = localFolder.absolutePath + "/" + podcastTitle
diff --git a/components/bookshelf/LazyBookshelf.vue b/components/bookshelf/LazyBookshelf.vue
index 386b5fe4..6ca0c1fa 100644
--- a/components/bookshelf/LazyBookshelf.vue
+++ b/components/bookshelf/LazyBookshelf.vue
@@ -3,6 +3,7 @@
     <template v-for="shelf in totalShelves">
       <div :key="shelf" class="w-full px-2 relative" :class="showBookshelfListView ? '' : 'bookshelfRow'" :id="`shelf-${shelf - 1}`" :style="{ height: shelfHeight + 'px' }">
         <div v-if="!showBookshelfListView" class="bookshelfDivider w-full absolute bottom-0 left-0 z-30" style="min-height: 16px" :class="`h-${shelfDividerHeightIndex}`" />
+        <div v-else class="flex border-t border-white border-opacity-10 my-3 py-1"/>
       </div>
     </template>
 
diff --git a/components/cards/LazyListBookCard.vue b/components/cards/LazyListBookCard.vue
index cdd0fcb3..cc7355cb 100644
--- a/components/cards/LazyListBookCard.vue
+++ b/components/cards/LazyListBookCard.vue
@@ -20,6 +20,8 @@
         </p>
         <p class="truncate text-gray-400" :style="{ fontSize: 0.7 * sizeMultiplier + 'rem' }">by {{ displayAuthor }}</p>
         <p v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.7 * sizeMultiplier + 'rem' }">{{ displaySortLine }}</p>
+        <p v-if="duration" class="truncate text-gray-400" :style="{ fontSize: 0.7 * sizeMultiplier + 'rem' }">{{ $elapsedPretty(duration) }}</p>
+        <p v-if="episodes" class="truncate text-gray-400" :style="{ fontSize: 0.7 * sizeMultiplier + 'rem' }">{{ episodes }}</p>
       </div>
 
       <div v-if="localLibraryItem || isLocal" class="absolute top-0 right-0 z-20" :style="{ top: 0.375 * sizeMultiplier + 'rem', right: 0.375 * sizeMultiplier + 'rem', padding: `${0.1 * sizeMultiplier}rem ${0.25 * sizeMultiplier}rem` }">
@@ -99,9 +101,23 @@ export default {
     mediaType() {
       return this._libraryItem.mediaType
     },
+    duration() {
+      return this.media.duration || null
+    },
     isPodcast() {
       return this.mediaType === 'podcast'
     },
+    episodes() {
+      if (this.isPodcast) {
+        if (this.media.numEpisodes==1) {
+          return "1 episode"
+        } else {
+          return this.media.numEpisodes + ' episodes'
+        }
+      } else {
+        return null
+      }
+    },
     placeholderUrl() {
       return '/book_placeholder.jpg'
     },
diff --git a/components/tables/podcast/EpisodeRow.vue b/components/tables/podcast/EpisodeRow.vue
index 984afee8..4551dcad 100644
--- a/components/tables/podcast/EpisodeRow.vue
+++ b/components/tables/podcast/EpisodeRow.vue
@@ -27,9 +27,11 @@
 
         <ui-read-icon-btn :disabled="isProcessingReadUpdate" :is-read="userIsFinished" borderless class="mx-1 mt-0.5" @click="toggleFinished" />
 
-        <span v-if="isLocal" class="material-icons-outlined px-2 text-success text-lg">audio_file</span>
-        <span v-else-if="!localEpisode" class="material-icons px-2" :class="downloadItem ? 'animate-bounce text-warning text-opacity-75 text-xl' : 'text-gray-300 text-xl'" @click="downloadClick">{{ downloadItem ? 'downloading' : 'download' }}</span>
-        <span v-else class="material-icons px-2 text-success text-xl">download_done</span>
+        <div v-if="!isIos">
+          <span v-if="isLocal" class="material-icons-outlined px-2 text-success text-lg">audio_file</span>
+          <span v-else-if="!localEpisode" class="material-icons mx-1 mt-2" :class="downloadItem ? 'animate-bounce text-warning text-opacity-75 text-xl' : 'text-gray-300 text-xl'" @click="downloadClick">{{ downloadItem ? 'downloading' : 'download' }}</span>
+          <span v-else class="material-icons px-2 text-success text-xl">download_done</span>
+        </div>
       </div>
     </div>
 
@@ -61,6 +63,9 @@ export default {
     }
   },
   computed: {
+    isIos() {
+      return this.$platform === 'ios'
+    },
     mediaType() {
       return 'podcast'
     },
@@ -204,9 +209,7 @@ export default {
         var isFinished = !this.userIsFinished
         var localLibraryItemId = this.isLocal ? this.libraryItemId : this.localLibraryItemId
         var localEpisodeId = this.isLocal ? this.episode.id : this.localEpisode.id
-        var localMediaProgressId = `${localLibraryItemId}-${localEpisodeId}`
-        console.log('toggleFinished local media progress id', localMediaProgressId, isFinished)
-        var payload = await this.$db.updateLocalMediaProgressFinished({ localMediaProgressId, isFinished })
+        var payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId, localEpisodeId, isFinished })
         console.log('toggleFinished payload', JSON.stringify(payload))
         if (!payload || payload.error) {
           var errorMsg = payload ? payload.error : 'Unknown error'
diff --git a/components/ui/ReadIconBtn.vue b/components/ui/ReadIconBtn.vue
index 934b0c6b..c26c7167 100644
--- a/components/ui/ReadIconBtn.vue
+++ b/components/ui/ReadIconBtn.vue
@@ -1,5 +1,5 @@
 <template>
-  <button class="icon-btn rounded-md flex items-center justify-center h-9 w-9 relative" :class="borderless ? '' : 'bg-primary border border-gray-600'" @click="clickBtn">
+  <button class="icon-btn rounded-md flex items-center justify-center px-2 relative" :class="borderless ? '' : 'bg-primary border border-gray-600'" @click="clickBtn">
     <div class="w-5 h-5 text-white relative">
       <svg v-if="isRead" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="rgb(63, 181, 68)">
         <path d="M19 1H5c-1.1 0-1.99.9-1.99 2L3 15.93c0 .69.35 1.3.88 1.66L12 23l8.11-5.41c.53-.36.88-.97.88-1.66L21 3c0-1.1-.9-2-2-2zm-9 15l-5-5 1.41-1.41L10 13.17l7.59-7.59L19 7l-9 9z" />
diff --git a/ios/App/Shared/player/AudioPlayer.swift b/ios/App/Shared/player/AudioPlayer.swift
index 29156d40..4802558c 100644
--- a/ios/App/Shared/player/AudioPlayer.swift
+++ b/ios/App/Shared/player/AudioPlayer.swift
@@ -24,29 +24,25 @@ class AudioPlayer: NSObject {
     private var playWhenReady: Bool
     private var initialPlaybackRate: Float
     
-    private var audioPlayer: AVPlayer
+    private var audioPlayer: AVQueuePlayer
     private var playbackSession: PlaybackSession
-    private var activeAudioTrack: AudioTrack
+
+    private var queueObserver:NSKeyValueObservation?
+    private var queueItemStatusObserver:NSKeyValueObservation?
+    
+    private var currentTrackIndex = 0
+    private var allPlayerItems:[AVPlayerItem] = []
     
     // MARK: - Constructor
     init(playbackSession: PlaybackSession, playWhenReady: Bool = false, playbackRate: Float = 1) {
         self.playWhenReady = playWhenReady
         self.initialPlaybackRate = playbackRate
-        self.audioPlayer = AVPlayer()
+        self.audioPlayer = AVQueuePlayer()
         self.playbackSession = playbackSession
         self.status = -1
         self.rate = 0.0
         self.tmpRate = playbackRate
         
-        if playbackSession.audioTracks.count != 1 || playbackSession.audioTracks[0].mimeType != "application/vnd.apple.mpegurl" {
-            NSLog("The player only support HLS streams right now")
-            self.activeAudioTrack = AudioTrack(index: 0, startOffset: -1, duration: -1, title: "", contentUrl: nil, mimeType: "", metadata: nil, serverIndex: 0)
-            
-            super.init()
-            return
-        }
-        self.activeAudioTrack = playbackSession.audioTracks[0]
-        
         super.init()
         
         initAudioSession()
@@ -56,15 +52,29 @@ class AudioPlayer: NSObject {
         self.audioPlayer.addObserver(self, forKeyPath: #keyPath(AVPlayer.rate), options: .new, context: &playerContext)
         self.audioPlayer.addObserver(self, forKeyPath: #keyPath(AVPlayer.currentItem), options: .new, context: &playerContext)
         
-        let playerItem = AVPlayerItem(asset: createAsset())
-        playerItem.addObserver(self, forKeyPath: #keyPath(AVPlayerItem.status), options: .new, context: &playerItemContext)
+        for track in playbackSession.audioTracks {
+            let playerItem = AVPlayerItem(asset: createAsset(itemId: playbackSession.libraryItemId!, track: track))
+            self.allPlayerItems.append(playerItem)
+        }
         
-        self.audioPlayer.replaceCurrentItem(with: playerItem)
-        seek(playbackSession.currentTime)
+        self.currentTrackIndex = getItemIndexForTime(time: playbackSession.currentTime)
+        NSLog("TEST: Starting track index \(self.currentTrackIndex) for start time \(playbackSession.currentTime)")
         
+        let playerItems = self.allPlayerItems[self.currentTrackIndex..<self.allPlayerItems.count]
+        NSLog("TEST: Setting player items \(playerItems.count)")
+        
+        for item in Array(playerItems) {
+            self.audioPlayer.insert(item, after:self.audioPlayer.items().last)
+        }
+
+        setupQueueObserver()
+        setupQueueItemStatusObserver()
+
         NSLog("Audioplayer ready")
     }
     deinit {
+        self.queueObserver?.invalidate()
+        self.queueItemStatusObserver?.invalidate()
         destroy()
     }
     public func destroy() {
@@ -87,6 +97,50 @@ class AudioPlayer: NSObject {
         NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.closed.rawValue), object: nil)
     }
     
+    func getItemIndexForTime(time:Double) -> Int {
+        for index in 0..<self.allPlayerItems.count {
+            let startOffset = playbackSession.audioTracks[index].startOffset ?? 0.0
+            let duration = playbackSession.audioTracks[index].duration
+            let trackEnd = startOffset + duration
+            if (time < trackEnd.rounded(.down)) {
+                return index
+            }
+        }
+        return 0
+    }
+    
+    func setupQueueObserver() {
+        self.queueObserver = self.audioPlayer.observe(\.currentItem, options: [.new]) {_,_ in
+            let prevTrackIndex = self.currentTrackIndex
+            self.audioPlayer.currentItem.map { item in
+                self.currentTrackIndex = self.allPlayerItems.firstIndex(of:item) ?? 0
+                if (self.currentTrackIndex != prevTrackIndex) {
+                    NSLog("TEST: New Current track index \(self.currentTrackIndex)")
+                }
+            }
+        }
+    }
+    
+    func setupQueueItemStatusObserver() {
+        self.queueItemStatusObserver?.invalidate()
+        self.queueItemStatusObserver = self.audioPlayer.currentItem?.observe(\.status, options: [.new, .old], changeHandler: { (playerItem, change) in
+            if (playerItem.status == .readyToPlay) {
+                NSLog("TEST: queueStatusObserver: Current Item Ready to play. PlayWhenReady: \(self.playWhenReady)")
+                self.updateNowPlaying()
+                
+                let firstReady = self.status < 0
+                self.status = 0
+                if self.playWhenReady {
+                    self.seek(self.playbackSession.currentTime, from: "queueItemStatusObserver")
+                    self.playWhenReady = false
+                    self.play()
+                } else if (firstReady) { // Only seek on first readyToPlay
+                    self.seek(self.playbackSession.currentTime, from: "queueItemStatusObserver")
+                }
+            }
+        })
+    }
+    
     // MARK: - Methods
     public func play(allowSeekBack: Bool = false) {
         if allowSeekBack {
@@ -110,11 +164,11 @@ class AudioPlayer: NSObject {
             }
             
             if time != nil {
-                seek(getCurrentTime() - Double(time!))
+                seek(getCurrentTime() - Double(time!), from: "play")
             }
         }
         lastPlayTime = Date.timeIntervalSinceReferenceDate
-        
+
         self.audioPlayer.play()
         self.status = 1
         self.rate = self.tmpRate
@@ -122,6 +176,7 @@ class AudioPlayer: NSObject {
         
         updateNowPlaying()
     }
+    
     public func pause() {
         self.audioPlayer.pause()
         self.status = 0
@@ -130,24 +185,60 @@ class AudioPlayer: NSObject {
         updateNowPlaying()
         lastPlayTime = Date.timeIntervalSinceReferenceDate
     }
-    public func seek(_ to: Double) {
-        let continuePlaing = rate > 0.0
+    
+    public func seek(_ to: Double, from:String) {
+        let continuePlaying = rate > 0.0
         
         pause()
-        self.audioPlayer.seek(to: CMTime(seconds: to, preferredTimescale: 1000)) { completed in
-            if !completed {
-                NSLog("WARNING: seeking not completed (to \(to)")
+        
+        NSLog("TEST: Seek to \(to) from \(from)")
+        
+        let currentTrack = self.playbackSession.audioTracks[self.currentTrackIndex]
+        let ctso = currentTrack.startOffset ?? 0.0
+        let trackEnd = ctso + currentTrack.duration
+        NSLog("TEST: Seek current track END = \(trackEnd)")
+        
+        
+        let indexOfSeek = getItemIndexForTime(time: to)
+        NSLog("TEST: Seek to index \(indexOfSeek) | Current index \(self.currentTrackIndex)")
+        
+        // Reconstruct queue if seeking to a different track
+        if (self.currentTrackIndex != indexOfSeek) {
+            self.currentTrackIndex = indexOfSeek
+            
+            self.playbackSession.currentTime = to
+            
+            self.playWhenReady = continuePlaying // Only playWhenReady if already playing
+            self.status = -1
+            let playerItems = self.allPlayerItems[indexOfSeek..<self.allPlayerItems.count]
+            
+            self.audioPlayer.removeAllItems()
+            for item in Array(playerItems) {
+                self.audioPlayer.insert(item, after:self.audioPlayer.items().last)
             }
             
-            if continuePlaing {
-                self.play()
+            setupQueueItemStatusObserver()
+        } else {
+            NSLog("TEST: Seeking in current item \(to)")
+            let currentTrackStartOffset = self.playbackSession.audioTracks[self.currentTrackIndex].startOffset ?? 0.0
+            let seekTime = to - currentTrackStartOffset
+            
+            self.audioPlayer.seek(to: CMTime(seconds: seekTime, preferredTimescale: 1000)) { completed in
+                if !completed {
+                    NSLog("WARNING: seeking not completed (to \(seekTime)")
+                }
+                
+                if continuePlaying {
+                    self.play()
+                }
+                self.updateNowPlaying()
             }
-            self.updateNowPlaying()
         }
     }
     
     public func setPlaybackRate(_ rate: Float, observed: Bool = false) {
         if self.audioPlayer.rate != rate {
+            NSLog("TEST: setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)")
             self.audioPlayer.rate = rate
         }
         if rate > 0.0 && !(observed && rate == 1) {
@@ -159,20 +250,31 @@ class AudioPlayer: NSObject {
     }
     
     public func getCurrentTime() -> Double {
-        self.audioPlayer.currentTime().seconds
+        let currentTrackTime = self.audioPlayer.currentTime().seconds
+        let audioTrack = playbackSession.audioTracks[currentTrackIndex]
+        let startOffset = audioTrack.startOffset ?? 0.0
+        return startOffset + currentTrackTime
     }
     public func getDuration() -> Double {
-        self.audioPlayer.currentItem?.duration.seconds ?? 0
+        return playbackSession.duration
     }
     
     // MARK: - Private
-    private func createAsset() -> AVAsset {
-        let headers: [String: String] = [
-            "Authorization": "Bearer \(Store.serverConfig!.token)"
-        ]
+    private func createAsset(itemId:String, track:AudioTrack) -> AVAsset {
+        let filename = track.metadata?.filename ?? ""
+        let filenameEncoded = filename.addingPercentEncoding(withAllowedCharacters: NSCharacterSet.urlQueryAllowed)
+        let urlstr = "\(Store.serverConfig!.address)/s/item/\(itemId)/\(filenameEncoded ?? "")?token=\(Store.serverConfig!.token)"
+        let url = URL(string: urlstr)!
+        return AVURLAsset(url: url)
         
-        return AVURLAsset(url: URL(string: "\(Store.serverConfig!.address)\(activeAudioTrack.contentUrl ?? "")")!, options: ["AVURLAssetHTTPHeaderFieldsKey": headers])
+        // Method for HLS
+//        let headers: [String: String] = [
+//            "Authorization": "Bearer \(Store.serverConfig!.token)"
+//        ]
+//
+//        return AVURLAsset(url: URL(string: "\(Store.serverConfig!.address)\(activeAudioTrack.contentUrl ?? "")")!, options: ["AVURLAssetHTTPHeaderFieldsKey": headers])
     }
+    
     private func initAudioSession() {
         do {
             try AVAudioSession.sharedInstance().setCategory(.playback, mode: .spokenAudio, options: [.allowAirPlay])
@@ -208,7 +310,7 @@ class AudioPlayer: NSObject {
                 return .noSuchContent
             }
             
-            seek(getCurrentTime() + command.preferredIntervals[0].doubleValue)
+            seek(getCurrentTime() + command.preferredIntervals[0].doubleValue, from: "remote")
             return .success
         }
         commandCenter.skipBackwardCommand.isEnabled = true
@@ -218,7 +320,7 @@ class AudioPlayer: NSObject {
                 return .noSuchContent
             }
             
-            seek(getCurrentTime() - command.preferredIntervals[0].doubleValue)
+            seek(getCurrentTime() - command.preferredIntervals[0].doubleValue, from: "remote")
             return .success
         }
         
@@ -228,7 +330,7 @@ class AudioPlayer: NSObject {
                 return .noSuchContent
             }
             
-            self.seek(event.positionTime)
+            self.seek(event.positionTime, from: "remote")
             return .success
         }
         
@@ -250,23 +352,9 @@ class AudioPlayer: NSObject {
     
     // MARK: - Observer
     public override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        if context == &playerItemContext {
-            if keyPath == #keyPath(AVPlayer.status) {
-                guard let playerStatus = AVPlayerItem.Status(rawValue: (change?[.newKey] as? Int ?? -1)) else { return }
-                
-                if playerStatus == .readyToPlay {
-                    self.updateNowPlaying()
-                    
-                    self.status = 0
-                    if self.playWhenReady {
-                        seek(playbackSession.currentTime)
-                        self.playWhenReady = false
-                        self.play()
-                    }
-                }
-            }
-        } else if context == &playerContext {
+        if context == &playerContext {
             if keyPath == #keyPath(AVPlayer.rate) {
+                NSLog("TEST: playerContext observer player rate")
                 self.setPlaybackRate(change?[.newKey] as? Float ?? 1.0, observed: true)
             } else if keyPath == #keyPath(AVPlayer.currentItem) {
                 NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.update.rawValue), object: nil)
diff --git a/ios/App/Shared/player/PlayerHandler.swift b/ios/App/Shared/player/PlayerHandler.swift
index 5cb05a43..1bdf6593 100644
--- a/ios/App/Shared/player/PlayerHandler.swift
+++ b/ios/App/Shared/player/PlayerHandler.swift
@@ -32,6 +32,7 @@ class PlayerHandler {
         }
     }
     private static var listeningTimePassedSinceLastSync: Double = 0.0
+    private static var lastSyncReport: PlaybackReport?
     
     public static var paused: Bool {
         get {
@@ -86,7 +87,7 @@ class PlayerHandler {
         }
         
         let destinationTime = player.getCurrentTime() + amount
-        player.seek(destinationTime)
+        player.seek(destinationTime, from: "handler")
     }
     public static func seekBackward(amount: Double) {
         guard let player = player else {
@@ -94,10 +95,10 @@ class PlayerHandler {
         }
         
         let destinationTime = player.getCurrentTime() - amount
-        player.seek(destinationTime)
+        player.seek(destinationTime, from: "handler")
     }
     public static func seek(amount: Double) {
-        player?.seek(amount)
+        player?.seek(amount, from: "handler")
     }
     public static func getMetdata() -> [String: Any] {
         DispatchQueue.main.async {
@@ -132,10 +133,17 @@ class PlayerHandler {
         if session == nil { return }
         guard let player = player else { return }
         
-        let report = PlaybackReport(currentTime: player.getCurrentTime(), duration: player.getDuration(), timeListened: listeningTimePassedSinceLastSync)
+        let playerCurrentTime = player.getCurrentTime()
+        if (lastSyncReport != nil && lastSyncReport?.currentTime == playerCurrentTime) {
+            // No need to syncProgress
+            return
+        }
         
-        session!.currentTime = player.getCurrentTime()
+        let report = PlaybackReport(currentTime: playerCurrentTime, duration: player.getDuration(), timeListened: listeningTimePassedSinceLastSync)
+        
+        session!.currentTime = playerCurrentTime
         listeningTimePassedSinceLastSync = 0
+        lastSyncReport = report
         
         // TODO: check if online
         NSLog("sending playback report")
diff --git a/ios/App/Shared/util/ApiClient.swift b/ios/App/Shared/util/ApiClient.swift
index 3a0404cc..c3ec12ac 100644
--- a/ios/App/Shared/util/ApiClient.swift
+++ b/ios/App/Shared/util/ApiClient.swift
@@ -68,7 +68,8 @@ class ApiClient {
         }
         
         ApiClient.postResource(endpoint: endpoint, parameters: [
-            "forceTranscode": "true", // TODO: direct play
+            "forceDirectPlay": "true",
+            "forceTranscode": "false", // TODO: direct play
             "mediaPlayer": "AVPlayer",
         ], decodable: PlaybackSession.self) { obj in
             var session = obj
diff --git a/pages/item/_id.vue b/pages/item/_id.vue
index e9d9017d..1c17d9c5 100644
--- a/pages/item/_id.vue
+++ b/pages/item/_id.vue
@@ -20,33 +20,36 @@
         <div v-if="!isPodcast && progressPercent > 0" class="px-4 py-2 bg-primary text-sm font-semibold rounded-md text-gray-200 mt-4 relative" :class="resettingProgress ? 'opacity-25' : ''">
           <p class="leading-6">Your Progress: {{ Math.round(progressPercent * 100) }}%</p>
           <p v-if="progressPercent < 1" class="text-gray-400 text-xs">{{ $elapsedPretty(userTimeRemaining) }} remaining</p>
+          <p v-else class="text-gray-400 text-xs">Finished {{ $formatDate(userProgressFinishedAt) }}</p>
           <div v-if="!resettingProgress" class="absolute -top-1.5 -right-1.5 p-1 w-5 h-5 rounded-full bg-bg hover:bg-error border border-primary flex items-center justify-center cursor-pointer" @click.stop="clearProgressClick">
             <span class="material-icons text-sm">close</span>
           </div>
         </div>
 
-        <div v-if="isLocal" class="flex mt-4 -mr-2">
+        <div v-if="isLocal" class="flex mt-4">
           <ui-btn color="success" :disabled="isPlaying" class="flex items-center justify-center flex-grow mr-2" :padding-x="4" @click="playClick">
             <span v-show="!isPlaying" class="material-icons">play_arrow</span>
-            <span class="px-1 text-sm">{{ isPlaying ? 'Playing' : 'Play Local' }}</span>
+            <span class="px-1 text-sm">{{ isPlaying ? 'Playing' : 'Play' }}</span>
           </ui-btn>
           <ui-btn v-if="showRead && isConnected" color="info" class="flex items-center justify-center mr-2" :class="showPlay ? '' : 'flex-grow'" :padding-x="2" @click="readBook">
             <span class="material-icons">auto_stories</span>
             <span v-if="!showPlay" class="px-2 text-base">Read {{ ebookFormat }}</span>
           </ui-btn>
+          <ui-read-icon-btn v-if="!isPodcast" :disabled="isProcessingReadUpdate" :is-read="userIsFinished" class="flex items-center justify-center" @click="toggleFinished" />
         </div>
-        <div v-else-if="(user && (showPlay || showRead)) || hasLocal" class="flex mt-4 -mr-2">
+        <div v-else-if="(user && (showPlay || showRead)) || hasLocal" class="flex mt-4">
           <ui-btn v-if="showPlay" color="success" :disabled="isPlaying" class="flex items-center justify-center flex-grow mr-2" :padding-x="4" @click="playClick">
             <span v-show="!isPlaying" class="material-icons">play_arrow</span>
-            <span class="px-1 text-sm">{{ isPlaying ? (isStreaming ? 'Streaming' : 'Playing') : hasLocal ? 'Play Local' : 'Play Stream' }}</span>
+            <span class="px-1 text-sm">{{ isPlaying ? (isStreaming ? 'Streaming' : 'Playing') : hasLocal ? 'Play' : 'Stream' }}</span>
           </ui-btn>
           <ui-btn v-if="showRead && user" color="info" class="flex items-center justify-center mr-2" :class="showPlay ? '' : 'flex-grow'" :padding-x="2" @click="readBook">
             <span class="material-icons">auto_stories</span>
             <span v-if="!showPlay" class="px-2 text-base">Read {{ ebookFormat }}</span>
           </ui-btn>
-          <ui-btn v-if="user && showPlay && !isIos && !hasLocal" :color="downloadItem ? 'warning' : 'primary'" class="flex items-center justify-center" :padding-x="2" @click="downloadClick">
+          <ui-btn v-if="user && showPlay && !isIos && !hasLocal" :color="downloadItem ? 'warning' : 'primary'" class="flex items-center justify-center mr-2" :padding-x="2" @click="downloadClick">
             <span class="material-icons" :class="downloadItem ? 'animate-pulse' : ''">{{ downloadItem ? 'downloading' : 'download' }}</span>
           </ui-btn>
+          <ui-read-icon-btn v-if="!isPodcast" :disabled="isProcessingReadUpdate" :is-read="userIsFinished" class="flex items-center justify-center" @click="toggleFinished" />
         </div>
       </div>
     </div>
@@ -103,6 +106,7 @@ export default {
   data() {
     return {
       resettingProgress: false,
+      isProcessingReadUpdate: false,
       showSelectLocalFolder: false
     }
   },
@@ -352,6 +356,50 @@ export default {
         console.log('New local library item', item.id)
         this.$set(this.libraryItem, 'localLibraryItem', item)
       }
+    },
+    async toggleFinished() {
+      this.isProcessingReadUpdate = true
+      if (this.isLocal) {
+        var isFinished = !this.userIsFinished
+        var payload = await this.$db.updateLocalMediaProgressFinished({ localLibraryItemId: this.localLibraryItemId, isFinished })
+        console.log('toggleFinished payload', JSON.stringify(payload))
+        if (!payload || payload.error) {
+          var errorMsg = payload ? payload.error : 'Unknown error'
+          this.$toast.error(errorMsg)
+        } else {
+          var localMediaProgress = payload.localMediaProgress
+          console.log('toggleFinished localMediaProgress', JSON.stringify(localMediaProgress))
+          if (localMediaProgress) {
+            this.$store.commit('globals/updateLocalMediaProgress', localMediaProgress)
+          }
+
+          var lmp = this.$store.getters['globals/getLocalMediaProgressById'](this.libraryItemId)
+          console.log('toggleFinished Check LMP', this.libraryItemId, JSON.stringify(lmp))
+
+          var serverUpdated = payload.server
+          if (serverUpdated) {
+            this.$toast.success(`Local & Server Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`)
+          } else {
+            this.$toast.success(`Local Item marked as ${isFinished ? 'Finished' : 'Not Finished'}`)
+          }
+        }
+        this.isProcessingReadUpdate = false
+      } else {
+        var updatePayload = {
+          isFinished: !this.userIsFinished
+        }
+        this.$axios
+          .$patch(`/api/me/progress/${this.libraryItemId}`, updatePayload)
+          .then(() => {
+            this.isProcessingReadUpdate = false
+            this.$toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`)
+          })
+          .catch((error) => {
+            console.error('Failed', error)
+            this.isProcessingReadUpdate = false
+            this.$toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`)
+          })
+      }
     }
   },
   mounted() {
diff --git a/plugins/capacitor/AbsDatabase.js b/plugins/capacitor/AbsDatabase.js
index 1b46aaed..7ad26378 100644
--- a/plugins/capacitor/AbsDatabase.js
+++ b/plugins/capacitor/AbsDatabase.js
@@ -199,7 +199,8 @@ class AbsDatabaseWeb extends WebPlugin {
     return []
   }
 
-  async updateLocalMediaProgressFinished({ localMediaProgressId, isFinished }) {
+  async updateLocalMediaProgressFinished(payload) {
+    // { localLibraryItemId, localEpisodeId, isFinished }
     return null
   }
 }