diff --git a/client/components/AudioPlayer.vue b/client/components/AudioPlayer.vue
index 597c90973..1a8cf9115 100644
--- a/client/components/AudioPlayer.vue
+++ b/client/components/AudioPlayer.vue
@@ -8,7 +8,16 @@
         <p class="font-mono text-sm">{{ totalDurationPretty }}</p>
       </div>
 
-      <div class="absolute right-24 top-0 bottom-0">
+      <div class="absolute right-20 top-0 bottom-0">
+        <div v-if="chapters.length" class="cursor-pointer flex items-center justify-center text-gray-300" @mousedown.prevent @mouseup.prevent @click.stop="showChapters">
+          <span class="material-icons text-3xl">format_list_bulleted</span>
+        </div>
+        <div v-else class="flex items-center justify-center text-gray-500">
+          <span class="material-icons text-3xl">format_list_bulleted</span>
+        </div>
+      </div>
+
+      <div class="absolute right-32 top-0 bottom-0">
         <controls-volume-control v-model="volume" @input="updateVolume" />
       </div>
       <div class="flex my-2">
@@ -58,6 +67,8 @@
     </div>
 
     <audio ref="audio" @pause="paused" @playing="playing" @progress="progress" @timeupdate="timeupdate" @loadeddata="audioLoadedData" />
+
+    <modals-chapters-modal v-model="showChaptersModal" :chapters="chapters" @select="selectChapter" />
   </div>
 </template>
 
@@ -66,7 +77,11 @@ import Hls from 'hls.js'
 
 export default {
   props: {
-    loading: Boolean
+    loading: Boolean,
+    chapters: {
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {
@@ -84,7 +99,8 @@ export default {
       audioEl: null,
       totalDuration: 0,
       seekedTime: 0,
-      seekLoading: false
+      seekLoading: false,
+      showChaptersModal: false
     }
   },
   computed: {
@@ -96,6 +112,10 @@ export default {
     }
   },
   methods: {
+    selectChapter(chapter) {
+      this.seek(chapter.start)
+      this.showChaptersModal = false
+    },
     seek(time) {
       if (this.loading) {
         return
@@ -110,7 +130,7 @@ export default {
       }
       this.seekedTime = time
       this.seekLoading = true
-      console.warn('SEEK TO', this.$secondsToTimestamp(time))
+
       this.audioEl.currentTime = time
 
       if (this.$refs.playedTrack) {
@@ -361,7 +381,7 @@ export default {
           xhr.setRequestHeader('Authorization', `Bearer ${this.token}`)
         }
       }
-      console.log('[AudioPlayer-Set] HLS Config', hlsOptions)
+      // console.log('[AudioPlayer-Set] HLS Config', hlsOptions)
       this.hlsInstance = new Hls(hlsOptions)
       var audio = this.$refs.audio
       audio.volume = this.volume
@@ -386,10 +406,13 @@ export default {
           }
         })
         this.hlsInstance.on(Hls.Events.DESTROYING, () => {
-          console.warn('[HLS] Destroying HLS Instance')
+          console.log('[HLS] Destroying HLS Instance')
         })
       })
     },
+    showChapters() {
+      this.showChaptersModal = true
+    },
     play() {
       if (!this.$refs.audio) {
         console.error('No Audio ref')
@@ -410,7 +433,6 @@ export default {
         this.staleHlsInstance = this.hlsInstance
         this.staleHlsInstance.destroy()
         this.hlsInstance = null
-        console.log('Terminated HLS Instance', this.staleHlsInstance)
       }
     },
     async resetStream(startTime) {
diff --git a/client/components/app/StreamContainer.vue b/client/components/app/StreamContainer.vue
index 3468db560..a45e2e9b5 100644
--- a/client/components/app/StreamContainer.vue
+++ b/client/components/app/StreamContainer.vue
@@ -14,7 +14,7 @@
       <span v-if="stream" class="material-icons px-4 cursor-pointer" @click="cancelStream">close</span>
     </div>
 
-    <audio-player ref="audioPlayer" :loading="isLoading" @updateTime="updateTime" @hook:mounted="audioPlayerMounted" />
+    <audio-player ref="audioPlayer" :chapters="chapters" :loading="isLoading" @updateTime="updateTime" @hook:mounted="audioPlayerMounted" />
   </div>
 </template>
 
@@ -49,6 +49,9 @@ export default {
     book() {
       return this.streamAudiobook ? this.streamAudiobook.book || {} : {}
     },
+    chapters() {
+      return this.streamAudiobook ? this.streamAudiobook.chapters || [] : []
+    },
     title() {
       return this.book.title || 'No Title'
     },
@@ -94,7 +97,7 @@ export default {
     streamProgress(data) {
       if (!data.numSegments) return
       var chunks = data.chunks
-      console.log(`[STREAM-CONTAINER] Stream Progress ${data.percent}`)
+      console.log(`[StreamContainer] Stream Progress ${data.percent}`)
       if (this.$refs.audioPlayer) {
         this.$refs.audioPlayer.setChunksReady(chunks, data.numSegments)
       } else {
@@ -104,7 +107,7 @@ export default {
     streamOpen(stream) {
       this.stream = stream
       if (this.$refs.audioPlayer) {
-        console.log('[STREAM-CONTAINER] streamOpen', stream)
+        console.log('[StreamContainer] streamOpen', stream)
         this.openStream()
       } else if (this.audioPlayerReady) {
         console.error('No Audio Ref')
diff --git a/client/components/modals/ChaptersModal.vue b/client/components/modals/ChaptersModal.vue
new file mode 100644
index 000000000..1a0a349ac
--- /dev/null
+++ b/client/components/modals/ChaptersModal.vue
@@ -0,0 +1,44 @@
+<template>
+  <modals-modal v-model="show" :width="500" :height="'unset'">
+    <div class="w-full rounded-lg bg-primary box-shadow-md overflow-y-auto overflow-x-hidden" style="max-height: 500px">
+      <template v-for="chap in chapters">
+        <div :key="chap.id" class="flex items-center px-6 py-3 justify-start cursor-pointer hover:bg-bg bg-opacity-20 rounded-lg relative" @click="clickChapter(chap)">
+          {{ chap.title }}
+          <span class="flex-grow" />
+          <span class="font-mono text-sm text-gray-300">{{ $secondsToTimestamp(chap.start) }}</span>
+        </div>
+      </template>
+    </div>
+  </modals-modal>
+</template>
+
+<script>
+export default {
+  props: {
+    value: Boolean,
+    chapters: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    }
+  },
+  methods: {
+    clickChapter(chap) {
+      this.$emit('select', chap)
+    }
+  },
+  mounted() {}
+}
+</script>
\ No newline at end of file
diff --git a/client/components/modals/EditModal.vue b/client/components/modals/EditModal.vue
index 163d03ac8..a4fbbc201 100644
--- a/client/components/modals/EditModal.vue
+++ b/client/components/modals/EditModal.vue
@@ -46,6 +46,11 @@ export default {
           title: 'Tracks',
           component: 'modals-edit-tabs-tracks'
         },
+        {
+          id: 'chapters',
+          title: 'Chapters',
+          component: 'modals-edit-tabs-chapters'
+        },
         {
           id: 'download',
           title: 'Download',
diff --git a/client/components/modals/Modal.vue b/client/components/modals/Modal.vue
index 7b5609cbc..aeb57b61f 100644
--- a/client/components/modals/Modal.vue
+++ b/client/components/modals/Modal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="wrapper" class="modal modal-bg w-full h-full fixed top-0 left-0 bg-primary bg-opacity-75 flex items-center justify-center z-30 opacity-0">
+  <div ref="wrapper" class="modal modal-bg w-full h-full fixed top-0 left-0 bg-primary bg-opacity-75 flex items-center justify-center z-40 opacity-0">
     <div class="absolute top-0 left-0 right-0 w-full h-36 bg-gradient-to-t from-transparent via-black-500 to-black-700 opacity-90 pointer-events-none" />
 
     <div class="absolute top-5 right-5 h-12 w-12 flex items-center justify-center cursor-pointer text-white hover:text-gray-300" @click="show = false">
diff --git a/client/components/modals/edit-tabs/Chapters.vue b/client/components/modals/edit-tabs/Chapters.vue
new file mode 100644
index 000000000..0d8a32855
--- /dev/null
+++ b/client/components/modals/edit-tabs/Chapters.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="w-full h-full overflow-y-auto overflow-x-hidden px-4 py-6">
+    <div v-if="!chapters.length" class="flex my-4 text-center justify-center text-xl">No Chapters</div>
+    <table v-else class="text-sm tracksTable">
+      <tr class="font-book">
+        <th class="text-left w-16"><span class="px-4">Id</span></th>
+        <th class="text-left">Title</th>
+        <th class="text-center">Start</th>
+        <th class="text-center">End</th>
+      </tr>
+      <template v-for="chapter in chapters">
+        <tr :key="chapter.id">
+          <td class="text-left">
+            <p class="px-4">{{ chapter.id }}</p>
+          </td>
+          <td class="font-book">
+            {{ chapter.title }}
+          </td>
+          <td class="font-mono text-center">
+            {{ $secondsToTimestamp(chapter.start) }}
+          </td>
+          <td class="font-mono text-center">
+            {{ $secondsToTimestamp(chapter.end) }}
+          </td>
+        </tr>
+      </template>
+    </table>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    audiobook: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      chapters: []
+    }
+  },
+  watch: {
+    audiobook: {
+      immediate: true,
+      handler(newVal) {
+        if (newVal) this.init()
+      }
+    }
+  },
+  computed: {},
+  methods: {
+    init() {
+      this.chapters = this.audiobook.chapters || []
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/client/components/modals/edit-tabs/Details.vue b/client/components/modals/edit-tabs/Details.vue
index 6542dd62e..e387becf2 100644
--- a/client/components/modals/edit-tabs/Details.vue
+++ b/client/components/modals/edit-tabs/Details.vue
@@ -177,7 +177,7 @@ export default {
       }
     },
     deleteAudiobook() {
-      if (confirm(`Are you sure you want to remove this audiobook?`)) {
+      if (confirm(`Are you sure you want to remove this audiobook?\n\n*Does not delete your files, only removes the audiobook from AudioBookshelf`)) {
         this.isProcessing = true
         this.$axios
           .$delete(`/api/audiobook/${this.audiobookId}`)
diff --git a/client/components/modals/edit-tabs/Download.vue b/client/components/modals/edit-tabs/Download.vue
index 3c06c8a72..76c08efcf 100644
--- a/client/components/modals/edit-tabs/Download.vue
+++ b/client/components/modals/edit-tabs/Download.vue
@@ -1,13 +1,17 @@
 <template>
   <div class="w-full h-full overflow-hidden overflow-y-auto px-4 py-6">
     <div class="w-full border border-black-200 p-4 my-4">
-      <p class="text-center text-lg mb-4 pb-8 border-b border-black-200">
+      <!-- <p class="text-center text-lg mb-4 pb-8 border-b border-black-200">
         <span class="text-error">Experimental Feature!</span> If your audiobook is made up of multiple audio files, this will concatenate them into a single file. The file type will be the same as the first track. Preparing downloads can take anywhere from a few seconds to several minutes and will be stored in
         <span class="bg-primary bg-opacity-75 font-mono p-1 text-base">/metadata/downloads</span>. After the download is ready, it will remain available for 10 minutes then get deleted.
+      </p> -->
+      <p class="text-center text-lg mb-4 pb-8 border-b border-black-200">
+        <span class="text-error">Experimental Feature!</span> If your audiobook has multiple tracks, this will merge them into a single M4B audiobook file.<br />Preparing downloads can take several minutes and will be stored in <span class="bg-primary bg-opacity-75 font-mono p-1 text-base">/metadata/downloads</span>. After the download is ready, it will remain available for 60 minutes, then be
+        deleted.
       </p>
 
       <div class="flex items-center">
-        <p class="text-lg">Single audio file</p>
+        <p class="text-lg">{{ isSingleTrack ? 'Single Track' : 'M4B Audiobook File' }}</p>
         <div class="flex-grow" />
         <div>
           <p v-if="singleAudioDownloadFailed" class="text-error mb-2">Download Failed</p>
diff --git a/client/components/ui/Btn.vue b/client/components/ui/Btn.vue
index 734e0d768..6691470b5 100644
--- a/client/components/ui/Btn.vue
+++ b/client/components/ui/Btn.vue
@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style>
-button.btn::before {
+.btn::before {
   content: '';
   position: absolute;
   border-radius: 6px;
@@ -70,7 +70,7 @@ button.btn::before {
   background-color: rgba(255, 255, 255, 0);
   transition: all 0.1s ease-in-out;
 }
-button.btn:hover:not(:disabled)::before {
+.btn:hover:not(:disabled)::before {
   background-color: rgba(255, 255, 255, 0.1);
 }
 button:disabled::before {
diff --git a/client/package.json b/client/package.json
index 5f95ec3a7..03b23a56e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index 82275be9e..cde943a2d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Self-hosted audiobook server for managing and playing audiobooks.",
   "main": "index.js",
   "scripts": {
diff --git a/server/ApiController.js b/server/ApiController.js
index e23d2b73d..72ed8bb45 100644
--- a/server/ApiController.js
+++ b/server/ApiController.js
@@ -418,12 +418,9 @@ class ApiController {
 
     var options = {
       headers: {
-        // 'Content-Disposition': `attachment; filename=${download.filename}`,
         'Content-Type': download.mimeType
-        // 'Content-Length': download.size
       }
     }
-    Logger.info('Starting Download', options, 'SIZE', download.size)
     res.download(download.fullPath, download.filename, options, (err) => {
       if (err) {
         Logger.error('Download Error', err)
diff --git a/server/DownloadManager.js b/server/DownloadManager.js
index 83ad34568..683191597 100644
--- a/server/DownloadManager.js
+++ b/server/DownloadManager.js
@@ -4,7 +4,7 @@ const fs = require('fs-extra')
 const workerThreads = require('worker_threads')
 const Logger = require('./Logger')
 const Download = require('./objects/Download')
-const { writeConcatFile } = require('./utils/ffmpegHelpers')
+const { writeConcatFile, writeMetadataFile } = require('./utils/ffmpegHelpers')
 const { getFileSize } = require('./utils/fileUtils')
 
 class DownloadManager {
@@ -49,14 +49,6 @@ class DownloadManager {
     this.prepareDownload(client, audiobook, options)
   }
 
-  getBestFileType(tracks) {
-    if (!tracks || !tracks.length) {
-      return null
-    }
-    var firstTrack = tracks[0]
-    return firstTrack.ext.substr(1)
-  }
-
   async prepareDownload(client, audiobook, options = {}) {
     var downloadId = (Math.trunc(Math.random() * 1000) + Date.now()).toString(36)
     var dlpath = Path.join(this.downloadDirPath, downloadId)
@@ -73,7 +65,7 @@ class DownloadManager {
     var audiobookDirname = Path.basename(audiobook.path)
 
     if (downloadType === 'singleAudio') {
-      var audioFileType = options.audioFileType || this.getBestFileType(audiobook.tracks)
+      var audioFileType = options.audioFileType || 'm4b'
       delete options.audioFileType
       filename = audiobookDirname + '.' + audioFileType
       fileext = '.' + audioFileType
@@ -105,21 +97,47 @@ class DownloadManager {
   }
 
   async processSingleAudioDownload(audiobook, download) {
-    // var ffmpeg = Ffmpeg()
     var concatFilePath = Path.join(download.dirpath, 'files.txt')
     await writeConcatFile(audiobook.tracks, concatFilePath)
 
-    var workerData = {
-      input: concatFilePath,
-      inputFormat: 'concat',
-      inputOption: '-safe 0',
-      options: [
-        '-loglevel warning',
-        '-map 0:a',
-        '-c:a copy'
-      ],
-      output: download.fullPath
+    var metadataFilePath = Path.join(download.dirpath, 'metadata.txt')
+    await writeMetadataFile(audiobook, metadataFilePath)
+
+    const ffmpegInputs = [
+      {
+        input: concatFilePath,
+        options: ['-safe 0', '-f concat']
+      },
+      {
+        input: metadataFilePath
+      }
+    ]
+
+    const logLevel = process.env.NODE_ENV === 'production' ? 'error' : 'warning'
+    const ffmpegOptions = [
+      `-loglevel ${logLevel}`,
+      '-map 0:a',
+      '-map_metadata 1',
+      '-acodec aac',
+      '-ac 2',
+      '-b:a 64k',
+      '-id3v2_version 3']
+
+    if (audiobook.book.cover) {
+      ffmpegInputs.push({
+        input: audiobook.book.cover,
+        options: ['-f image2pipe']
+      })
+      ffmpegOptions.push('-vf [2:v]crop=trunc(iw/2)*2:trunc(ih/2)*2')
+      ffmpegOptions.push('-map 2:v')
     }
+
+    var workerData = {
+      inputs: ffmpegInputs,
+      options: ffmpegOptions,
+      output: download.fullPath,
+    }
+
     var worker = new workerThreads.Worker('./server/utils/downloadWorker.js', { workerData })
     worker.on('message', (message) => {
       if (message != null && typeof message === 'object') {
@@ -166,14 +184,14 @@ class DownloadManager {
     }
 
     // Remove files.txt if it was used
-    if (download.type === 'singleAudio') {
-      var concatFilePath = Path.join(download.dirpath, 'files.txt')
-      try {
-        await fs.remove(concatFilePath)
-      } catch (error) {
-        Logger.error('[DownloadManager] Failed to remove files.txt')
-      }
-    }
+    // if (download.type === 'singleAudio') {
+    //   var concatFilePath = Path.join(download.dirpath, 'files.txt')
+    //   try {
+    //     await fs.remove(concatFilePath)
+    //   } catch (error) {
+    //     Logger.error('[DownloadManager] Failed to remove files.txt')
+    //   }
+    // }
 
     result.size = await getFileSize(download.fullPath)
     download.setComplete(result)
diff --git a/server/Scanner.js b/server/Scanner.js
index 3df852bc9..7d204be9d 100644
--- a/server/Scanner.js
+++ b/server/Scanner.js
@@ -135,6 +135,8 @@ class Scanner {
       }
 
       if (hasUpdates) {
+        existingAudiobook.setChapters()
+
         Logger.info(`[Scanner] "${existingAudiobook.title}" was updated - saving`)
         existingAudiobook.lastUpdate = Date.now()
         await this.db.updateAudiobook(existingAudiobook)
@@ -161,6 +163,8 @@ class Scanner {
     }
 
     audiobook.checkUpdateMissingParts()
+    audiobook.setChapters()
+
     Logger.info(`[Scanner] Audiobook "${audiobook.title}" Scanned (${audiobook.sizePretty}) [${audiobook.durationPretty}]`)
     await this.db.insertAudiobook(audiobook)
     this.emitter('audiobook_added', audiobook.toJSONMinified())
diff --git a/server/Server.js b/server/Server.js
index 2489b5ad2..122d48e82 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -14,7 +14,6 @@ const StreamManager = require('./StreamManager')
 const RssFeeds = require('./RssFeeds')
 const DownloadManager = require('./DownloadManager')
 const Logger = require('./Logger')
-const { ScanResult } = require('./utils/constants')
 
 class Server {
   constructor(PORT, CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH) {
diff --git a/server/objects/AudioFile.js b/server/objects/AudioFile.js
index a3a433718..2fcd71fd6 100644
--- a/server/objects/AudioFile.js
+++ b/server/objects/AudioFile.js
@@ -20,6 +20,7 @@ class AudioFile {
     this.timeBase = null
     this.channels = null
     this.channelLayout = null
+    this.chapters = []
 
     this.tagAlbum = null
     this.tagArtist = null
@@ -60,6 +61,7 @@ class AudioFile {
       timeBase: this.timeBase,
       channels: this.channels,
       channelLayout: this.channelLayout,
+      chapters: this.chapters,
       tagAlbum: this.tagAlbum,
       tagArtist: this.tagArtist,
       tagGenre: this.tagGenre,
@@ -93,6 +95,7 @@ class AudioFile {
     this.timeBase = data.timeBase
     this.channels = data.channels
     this.channelLayout = data.channelLayout
+    this.chapters = data.chapters
 
     this.tagAlbum = data.tagAlbum
     this.tagArtist = data.tagArtist
@@ -121,12 +124,13 @@ class AudioFile {
     this.format = data.format
     this.duration = data.duration
     this.size = data.size
-    this.bitRate = data.bit_rate
+    this.bitRate = data.bit_rate || null
     this.language = data.language
     this.codec = data.codec
     this.timeBase = data.time_base
     this.channels = data.channels
     this.channelLayout = data.channel_layout
+    this.chapters = data.chapters || []
 
     this.tagAlbum = data.file_tag_album || null
     this.tagArtist = data.file_tag_artist || null
diff --git a/server/objects/AudioTrack.js b/server/objects/AudioTrack.js
index ef88a6860..90761f36e 100644
--- a/server/objects/AudioTrack.js
+++ b/server/objects/AudioTrack.js
@@ -97,12 +97,12 @@ class AudioTrack {
     this.format = probeData.format
     this.duration = probeData.duration
     this.size = probeData.size
-    this.bitRate = probeData.bit_rate
+    this.bitRate = probeData.bitRate
     this.language = probeData.language
     this.codec = probeData.codec
-    this.timeBase = probeData.time_base
+    this.timeBase = probeData.timeBase
     this.channels = probeData.channels
-    this.channelLayout = probeData.channel_layout
+    this.channelLayout = probeData.channelLayout
 
     this.tagAlbum = probeData.file_tag_album || null
     this.tagArtist = probeData.file_tag_artist || null
diff --git a/server/objects/Audiobook.js b/server/objects/Audiobook.js
index 8358bf658..f39d264b9 100644
--- a/server/objects/Audiobook.js
+++ b/server/objects/Audiobook.js
@@ -26,6 +26,7 @@ class Audiobook {
 
     this.tags = []
     this.book = null
+    this.chapters = []
 
     if (audiobook) {
       this.construct(audiobook)
@@ -51,6 +52,9 @@ class Audiobook {
     if (audiobook.book) {
       this.book = new Book(audiobook.book)
     }
+    if (audiobook.chapters) {
+      this.chapters = audiobook.chapters.map(c => ({ ...c }))
+    }
   }
 
   get title() {
@@ -122,7 +126,8 @@ class Audiobook {
       book: this.bookToJSON(),
       tracks: this.tracksToJSON(),
       audioFiles: (this.audioFiles || []).map(audioFile => audioFile.toJSON()),
-      otherFiles: (this.otherFiles || []).map(otherFile => otherFile.toJSON())
+      otherFiles: (this.otherFiles || []).map(otherFile => otherFile.toJSON()),
+      chapters: this.chapters || []
     }
   }
 
@@ -141,7 +146,8 @@ class Audiobook {
       hasBookMatch: !!this.book,
       hasMissingParts: this.missingParts ? this.missingParts.length : 0,
       hasInvalidParts: this.invalidParts ? this.invalidParts.length : 0,
-      numTracks: this.tracks.length
+      numTracks: this.tracks.length,
+      chapters: this.chapters || []
     }
   }
 
@@ -162,7 +168,8 @@ class Audiobook {
       otherFiles: (this.otherFiles || []).map(otherFile => otherFile.toJSON()),
       tags: this.tags,
       book: this.bookToJSON(),
-      tracks: this.tracksToJSON()
+      tracks: this.tracksToJSON(),
+      chapters: this.chapters || []
     }
   }
 
@@ -403,5 +410,31 @@ class Audiobook {
   getAudioFileByIno(ino) {
     return this.audioFiles.find(af => af.ino === ino)
   }
+
+  setChaptersFromAudioFile(audioFile) {
+    if (!audioFile.chapters) return []
+    return audioFile.chapters.map(c => ({ ...c }))
+  }
+
+  setChapters() {
+    if (this.audioFiles.length === 1) {
+      if (this.audioFiles[0].chapters) {
+        this.chapters = this.audioFiles[0].chapters.map(c => ({ ...c }))
+      }
+    } else {
+      this.chapters = []
+      var currTrackId = 0
+      var currStartTime = 0
+      this.tracks.forEach((track) => {
+        this.chapters.push({
+          id: currTrackId++,
+          start: currStartTime,
+          end: currStartTime + track.duration,
+          title: `Chapter ${currTrackId}`
+        })
+        currStartTime += track.duration
+      })
+    }
+  }
 }
 module.exports = Audiobook
\ No newline at end of file
diff --git a/server/objects/Download.js b/server/objects/Download.js
index 22e10bfb6..dff559483 100644
--- a/server/objects/Download.js
+++ b/server/objects/Download.js
@@ -1,4 +1,4 @@
-const DEFAULT_EXPIRATION = 1000 * 60 * 10 // 10 minutes
+const DEFAULT_EXPIRATION = 1000 * 60 * 60 // 60 minutes
 
 class Download {
   constructor(download) {
diff --git a/server/objects/Stream.js b/server/objects/Stream.js
index 1669d5979..8beb12bcc 100644
--- a/server/objects/Stream.js
+++ b/server/objects/Stream.js
@@ -191,7 +191,7 @@ class Stream extends EventEmitter {
 
       this.socket.emit('stream_progress', {
         stream: this.id,
-        percentCreated: perc,
+        percent: perc,
         chunks,
         numSegments: this.numSegments
       })
@@ -201,7 +201,7 @@ class Stream extends EventEmitter {
   }
 
   startLoop() {
-    this.socket.emit('stream_progress', { chunks: [], numSegments: 0 })
+    this.socket.emit('stream_progress', { stream: this.id, chunks: [], numSegments: 0, percent: '0%' })
     this.loop = setInterval(() => {
       if (!this.isTranscodeComplete) {
         this.checkFiles()
@@ -230,8 +230,9 @@ class Stream extends EventEmitter {
       this.ffmpeg.inputOption('-noaccurate_seek')
     }
 
+    const logLevel = process.env.NODE_ENV === 'production' ? 'error' : 'warning'
     this.ffmpeg.addOption([
-      '-loglevel warning',
+      `-loglevel ${logLevel}`,
       '-map 0:a',
       '-c:a copy'
     ])
diff --git a/server/utils/audioFileScanner.js b/server/utils/audioFileScanner.js
index a29058523..20617ac72 100644
--- a/server/utils/audioFileScanner.js
+++ b/server/utils/audioFileScanner.js
@@ -33,7 +33,8 @@ async function scan(path) {
     language: audioStream.language,
     channel_layout: audioStream.channel_layout,
     channels: audioStream.channels,
-    sample_rate: audioStream.sample_rate
+    sample_rate: audioStream.sample_rate,
+    chapters: probeData.chapters || []
   }
 
   for (const key in probeData) {
diff --git a/server/utils/downloadWorker.js b/server/utils/downloadWorker.js
index a314446b0..273e37456 100644
--- a/server/utils/downloadWorker.js
+++ b/server/utils/downloadWorker.js
@@ -13,9 +13,11 @@ Logger.info('[DownloadWorker] Starting Worker...')
 const ffmpegCommand = Ffmpeg()
 const startTime = Date.now()
 
-ffmpegCommand.input(workerData.input)
-if (workerData.inputFormat) ffmpegCommand.inputFormat(workerData.inputFormat)
-if (workerData.inputOption) ffmpegCommand.inputOption(workerData.inputOption)
+workerData.inputs.forEach((inputData) => {
+  ffmpegCommand.input(inputData.input)
+  if (inputData.options) ffmpegCommand.inputOption(inputData.options)
+})
+
 if (workerData.options) ffmpegCommand.addOption(workerData.options)
 ffmpegCommand.output(workerData.output)
 
diff --git a/server/utils/ffmpegHelpers.js b/server/utils/ffmpegHelpers.js
index 62168dce6..011c274ef 100644
--- a/server/utils/ffmpegHelpers.js
+++ b/server/utils/ffmpegHelpers.js
@@ -1,4 +1,5 @@
 const fs = require('fs-extra')
+const package = require('../../package.json')
 
 function escapeSingleQuotes(path) {
   // return path.replace(/'/g, '\'\\\'\'')
@@ -34,4 +35,33 @@ async function writeConcatFile(tracks, outputPath, startTime = 0) {
 
   return firstTrackStartTime
 }
-module.exports.writeConcatFile = writeConcatFile
\ No newline at end of file
+module.exports.writeConcatFile = writeConcatFile
+
+
+async function writeMetadataFile(audiobook, outputPath) {
+  var inputstrs = [
+    ';FFMETADATA1',
+    `title=${audiobook.title}`,
+    `artist=${audiobook.author}`,
+    `date=${audiobook.book.publishYear || ''}`,
+    `comment=AudioBookshelf v${package.version}`,
+    'genre=Audiobook'
+  ]
+
+  if (audiobook.chapters) {
+    audiobook.chapters.forEach((chap) => {
+      const chapterstrs = [
+        '[CHAPTER]',
+        'TIMEBASE=1/1000',
+        `START=${Math.round(chap.start * 1000)}`,
+        `END=${Math.round(chap.end * 1000)}`,
+        `title=${chap.title}`
+      ]
+      inputstrs = inputstrs.concat(chapterstrs)
+    })
+  }
+
+  await fs.writeFile(outputPath, inputstrs.join('\n'))
+  return inputstrs
+}
+module.exports.writeMetadataFile = writeMetadataFile
\ No newline at end of file
diff --git a/server/utils/prober.js b/server/utils/prober.js
index 6dce90814..3742a5ebd 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -110,9 +110,23 @@ function parseMediaStreamInfo(stream, all_streams, total_bit_rate) {
   return info
 }
 
+function parseChapters(chapters) {
+  if (!chapters) return []
+  return chapters.map(chap => {
+    var title = chap['TAG:title'] || chap.title
+    var timebase = chap.time_base && chap.time_base.includes('/') ? Number(chap.time_base.split('/')[1]) : 1
+    return {
+      id: chap.id,
+      start: !isNaN(chap.start_time) ? chap.start_time : (chap.start / timebase),
+      end: chap.end_time || (chap.end / timebase),
+      title
+    }
+  })
+}
+
 function parseProbeData(data) {
   try {
-    var { format, streams } = data
+    var { format, streams, chapters } = data
     var { format_long_name, duration, size, bit_rate } = format
 
     var sizeBytes = !isNaN(size) ? Number(size) : null
@@ -146,6 +160,8 @@ function parseProbeData(data) {
       }
     }
 
+    cleanedData.chapters = parseChapters(chapters)
+
     return cleanedData
   } catch (error) {
     console.error('Parse failed', error)
@@ -155,7 +171,7 @@ function parseProbeData(data) {
 
 function probe(filepath) {
   return new Promise((resolve) => {
-    Ffmpeg.ffprobe(filepath, (err, raw) => {
+    Ffmpeg.ffprobe(filepath, ['-show_chapters'], (err, raw) => {
       if (err) {
         console.error(err)
         resolve(null)