fix linux 'can update'. upgrade aaxclean

Update InstallOnMac.md
new mac setup video
2025-12-31 09:58:43 -05:00 · 2023-02-16 07:57:36 -05:00 · 2023-02-16 07:44:09 -05:00 · 2023-02-15 08:38:13 -05:00 · 2023-02-15 08:33:06 -05:00 · 2023-02-15 06:31:09 -07:00
147 changed files with 4779 additions and 2466 deletions
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -66,7 +66,7 @@ jobs:
        id: zip
        working-directory: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.release_name }}
        run: |
-          delfiles=("libmp3lame.x86.dll" "libmp3lame.x64.dll" "ffmpegaac.x86.dll" "ffmpegaac.x64.dll" "ZipExtractor.exe")
+          delfiles=("libmp3lame.x86.dll" "libmp3lame.x64.dll" "ffmpegaac.x86.dll" "ffmpegaac.x64.dll")
          for n in "${delfiles[@]}"; do rm "$n"; done
          osbuild="$(echo '${{ matrix.os }}' | tr '[:upper:]' '[:lower:]')"
          artifact="Libation.${{ steps.get_version.outputs.version }}-${osbuild}-${{ matrix.release_name }}"
--- a/.github/workflows/bundle-linux.yml
+++ b/.github/workflows/bundle-linux.yml
@@ -0,0 +1,43 @@
+# build-linux.yml
+# Reusable workflow that builds the Libation installation bundles for Linux and MacOS.
+---
+name: bundle-linux
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        type: string
+        description: 'Version number'
+        required: true
+
+jobs:
+  bundle:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [linux, macos]
+        release_name: [chardonnay]
+    steps:
+      - uses: actions/checkout@v3
+      
+      - name: Download Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: "Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.tar.gz"
+          
+      - name: Build bundle
+        id: build
+        run: |
+          SCRIPT=targz2${{ matrix.os }}bundle.sh
+          chmod +rwx ./Scripts/${SCRIPT}
+          ./Scripts/${SCRIPT} "Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.tar.gz" ${{ inputs.version }}
+          artifact=$(ls ./bundle)
+          echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
+          
+      - name: Publish bundle
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.build.outputs.artifact }}
+          path: ./bundle/${{ steps.build.outputs.artifact }}
+          if-no-files-found: error
--- a/.github/workflows/deb.yml
+++ b/.github/workflows/deb.yml
@@ -1,38 +0,0 @@
-# deb.yml
-# Reusable workflow that builds the Linux Debian package.
---
-name: deb
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        type: string
-        description: 'Version number'
-        required: true
-
-env:
-  FILE_NAME: "Libation.${{ inputs.version }}-linux-chardonnay"
-  
-jobs:
-  build_deb:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      
-      - name: Download Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: "${{ env.FILE_NAME }}.tar.gz"
-
-      - name: Build .deb
-        id: deb
-        run: |
-          ./Scripts/targz2deb.sh "${{ env.FILE_NAME }}.tar.gz" ${{ inputs.version }}
-      
-      - name: Publish .deb
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.FILE_NAME }}.deb
-          path: ${{ env.FILE_NAME }}.deb
-          if-no-files-found: error
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -39,7 +39,7 @@ jobs:
          password: ${{ secrets.docker_token }}

      - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
        with:
          push: true
          build-args: 'FOLDER_NAME=Linux-chardonnay'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,14 +34,14 @@ jobs:
      version_override: ${{ needs.prerelease.outputs.version }}
      run_unit_tests: false

-  deb:
+  bundle:
    needs: [prerelease,build]
-    uses: ./.github/workflows/deb.yml
+    uses: ./.github/workflows/bundle-linux.yml
    with:
      version: ${{ needs.prerelease.outputs.version }}
      
  release:
-    needs: [prerelease,build,deb]
+    needs: [prerelease,build,bundle]
    runs-on: ubuntu-latest
    steps:
      - name: Download artifacts
@@ -53,7 +53,7 @@ jobs:
        id: release
        uses: softprops/action-gh-release@v1
        with:
-          name: Libation ${{ needs.prerelease.outputs.version }}
+          name: Libation v${{ needs.prerelease.outputs.version }}
          body: <Put a body here>
          draft: true
          prerelease: false
--- a/.releaseindex.json
+++ b/.releaseindex.json
@@ -1,6 +1,6 @@
 {
  "WindowsClassic":  "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-classic\\.zip",
  "WindowsAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-chardonnay\\.zip",
-  "LinuxAvalonia":   "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
-  "MacOSAvalonia":   "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
+  "LinuxAvalonia":   "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay\\.deb",
+  "MacOSAvalonia":   "Libation\\.app-macOS-x64-\\d+\\.\\d+\\.\\d+\\.tgz"
 }
--- a/Documentation/Advanced.md
+++ b/Documentation/Advanced.md
@@ -9,7 +9,7 @@

 - [Files and folders](#files-and-folders)
 - [Settings](#settings)
- [Custom File Naming](#custom-file-naming)
+- [Custom File Naming](NamingTemplates.md)
 - [Command Line Interface](#command-line-interface)


@@ -28,12 +28,6 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi

 * Allow Libation to fix up audiobook metadata. After decrypting a title, Libation attempts to fix details like chapters and cover art. Some power users and/or control freaks prefer to manage this themselves. By unchecking this setting, Libation will only decrypt the book and will leave metadata as-is, warts and all.

-### Custom File Naming
-
-In Settings, on the Download/Decrypt tab, you can specify the format in which you want your files to be named. As you edit these templates, a live example will be shown. Parameters are listed for folders, files, and files split by chapter including an explanation of what each naming option means. For instance: you can use template `<title short> - <ch# 0> of <ch count> - <ch title>` to create the file `A Study in Scarlet - 04 of 10 - A Flight for Life.m4b`.
-
-These templates apply to GUI and CLI.
-
 ### Command Line Interface

 Libationcli.exe allows limited access to Libation's functionalities as a CLI.
--- a/Documentation/GettingStarted.md
+++ b/Documentation/GettingStarted.md
@@ -20,6 +20,13 @@

 ### [Download Libation](https://github.com/rmcrackan/Libation/releases)

+##### Which version? Chardonnay vs Classic
+
+Nearly 100% of the difference is look and feel -- it's a matter of preference.
+
+Chardonnay has an updated look and will work and look the same on Windows, Mac, and Linux.  
+Classic is Windows only. It has an older look because it's built with older, duller, and more mature technology. This tech has built into it better support for things like accessibility for screen readers.
+
 ### Installation

 * Windows
--- a/Documentation/InstallOnMac.md
+++ b/Documentation/InstallOnMac.md
@@ -4,41 +4,37 @@
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.


-
 # Run Libation on MacOS
 This walkthrough should get you up and running with Libation on your Mac.

 ## Install Libation

- Download latest MacOS zip to downloads folder
- Extract and rename folder to Libation
- in terminal type cd and then drag your folder of libation to terminal so it looks like `cd/users/YourName/Downloads/Libation`
- Type following commands
+- Download the `Libation.app-macOS-x64-x.x.x.tgz` file from the latest release and extract it. 
+- Move the extracted Libation app bundle to your applications folder.
+- Open a terminal (Go > Utilities > Terminal)
+- Copy/paste/run the following command (you'll be prompted to enter your password)
+  ```Console
+  sudo spctl --master-disable && sudo spctl --add --label "Libation" /Applications/Libation.app && open /Applications/Libation.app && sudo spctl --master-enable
+  ```
+- Close the terminal and use Libation!

-```console
-chmod +x ./Libation
-sudo spctl --add --label "Libation" ./Libation
-./Libation
+## Running Hangover
+
+Libation comes with a recovery app called Hangover. You can start it by running this command:
+```Console
+open /Applications/Libation.app --args hangover
 ```

-## Trouble with Gatekeeper?
+## Runnign LibationCli

-If Gatekeeper is giving you trouble with Libation:
+Libation comes with a command-line interface. Unfortunately, due to the way apps are sandboxed on mac, its use is somewhat limited. To open a new sandboxed terminal in LibationCli's directory, run the following command:
+```Console
+open /Applications/Libation.app --args cli
+```
+To use LibationCli from an unsandboxed terminal, you must disable gatekeeper again and run the program directly at `/Applications/Libation.app/Contents/MacOS/LibationCli`

-Disable the block
-
-`sudo spctl --master-disable`
-
-Launch Libation and login, etc. and allow the rules to update then re-enable the block.
-
-`sudo spctl --master-enable`
-
-Once Gatekeeper reenabled, you can open Libation again without it being blocked.
-
-Thanks [joseph-holland](https://github.com/rmcrackan/Libation/issues/327#issuecomment-1268993349)!
-
-Report bugs to https://github.com/rmcrackan/Libation/issues
+Then use `./LibationCli` to execute a command.

 ## Get Libation running on Mac

-[Run Libation on MacOS](https://user-images.githubusercontent.com/37587114/213933357-983d8ede-2738-4b32-9c6e-40de21ff09c2.mp4)
+[Run Libation on MacOS](https://user-images.githubusercontent.com/37587114/219271379-a922e4e1-48a0-48e4-bd81-48aa1226a4f5.mp4)
--- a/Documentation/NamingTemplates.md
+++ b/Documentation/NamingTemplates.md
@@ -0,0 +1,116 @@
+# Naming Templates
+File and Folder names can be customized using Libation's built-in tag template naming engine. To edit how folder and file names are created, go to Settings \> Download/Decrypt and edit the naming templates. If you're splitting your audiobook into multiple files by chapter, you can also use a custom template to set each chapter's title metadata tag by editing the template in Settings \> Audio File Options.
+
+These templates apply to both GUI and CLI.
+
+# Table of Contents
+
+- [Template Tags](#template-tags)
+  - [Property Tags](#property-tags)
+  - [Conditional Tags](#conditional-tags)
+- [Tag Formatters](#tag-formatters)
+  - [Text Formatters](#text-formatters)
+  - [Name List Formatters](#name-list-formatters)
+  - [Integer Formatters](#integer-formatters)
+  - [Date Formatters](#date-formatters)
+
+
+# Template Tags
+
+These are the naming template tags currently supported by Libation.
+
+## Property Tags
+These tags will be replaced in the template with the audiobook's values.
+
+|Tag|Description|Type|
+|-|-|-|
+|\<id\> **†**|Audible book ID (ASIN)|Text|
+|\<title\>|Full title|Text|
+|\<title short\>|Title. Stop at first colon|Text|
+|\<author\>|Author(s)|Name List|
+|\<first author\>|First author|Text|
+|\<narrator\>|Narrator(s)|Name List|
+|\<first narrator\>|First narrator|Text|
+|\<series\>|Name of series|Text|
+|\<series#\>|Number order in series|Text|
+|\<bitrate\>|File's original bitrate (Kbps)|Integer|
+|\<samplerate\>|File's original audio sample rate|Integer|
+|\<channels\>|Number of audio channels|Integer|
+|\<account\>|Audible account of this book|Text|
+|\<locale\>|Region/country|Text|
+|\<year\>|Year published|Integer|
+|\<language\>|Book's language|Text|
+|\<language short\> **†**|Book's language abbreviated. Eg: ENG|Text|
+|\<file date\>|File creation date/time.|DateTime|
+|\<pub date\>|Audiobook publication date|DateTime|
+|\<date added\>|Date the book added to your Audible account|DateTime|
+|\<ch count\> **‡**|Number of chapters|Integer|
+|\<ch title\> **‡**|Chapter title|Text|
+|\<ch#\> **‡**|Chapter number|Integer|
+|\<ch# 0\> **‡**|Chapter number with leading zeros|Integer|
+
+**†** Does not support custom formatting
+
+**‡** Only valid for Chapter Filename and Chapter Tile Metadata
+
+To change how these properties are displayed, [read about custom formatters](#tag-formatters)
+
+## Conditional Tags
+Anything between the opening tag (`<tagname->`) and closing tag (`<-tagname>`) will only appear in the name if the condition evaluates to true. 
+
+|Tag|Description|Type|
+|-|-|-|
+|\<if series-\>...\<-if series\>|Only include if part of a book series or podcast|Conditional|
+|\<if podcast-\>...\<-if podcast\>|Only include if part of a podcast|Conditional|
+|\<if bookseries-\>...\<-if bookseries\>|Only include if part of a book series|Conditional|
+
+For example, <if podcast-\>\<series\>\<-if podcast\> will evaluate to the podcast's series name if the file is a podcast. For audiobooks that are not podcasts, that tag will be blank.
+
+You can invert the condition (instead of displaying the text when the condition is true, display the text when it is false) by playing a '!' symbol before the opening tag name.
+
+As an example, this folder template will place all Liberated podcasts into a "Podcasts" folder and all liberated books (not podcasts) into a "Books" folder.
+
+\<if podcast-\>Podcasts<-if podcast\>\<!if podcast-\>Books\<-if podcast\>\\\<title\>
+
+
+# Tag Formatters
+**Text**, **Name List**, **Integer**, and **DateTime** tags can be optionally formatted using format text in square brackets after the tag name. Below is a list of supported formatters for each tag type.
+
+## Text Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|L|Converts text to lowercase|\<title[L]\>|a study in scarlet꞉ a sherlock holmes novel|
+|U|Converts text to uppercase|\<title short[U]\>|A STUDY IN SCARLET|
+
+## Name List Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|separator()|Speficy the text used to join multiple people's names.<br><br>Default is ", "|`<author[separator(; )]>`|Arthur Conan Doyle; Stephen Fry|
+|format(\{T \| F \| M \| L \| S\})|Formats the human name using the name part tags.<br>\{T\} = Title (e.g. "Dr.")<br>\{F\} = First name<br>\{M\} = Middle name<br>\{L\} = Last Name<br>\{S\} = Suffix (e.g. "PhD")<br><br>Default is \{P\} \{F\} \{M\} \{L\} \{S\} |`<author[format({L}, {F}) separator(; )]>`|Doyle, Arthur; Fry, Stephen|
+|sort(F \| M \| L)|Sorts the names by first, middle, or last name<br><br>Default is unsorted|`<author[sort(M)]>`|Stephen Fry, Arthur Conan Doyle|
+|max(#)|Only use the first # of names<br><br>Default is all names|`<author[max(1)]>`|Arthur Conan Doyle|
+
+## Integer Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|# (a number)|Zero-pads the number|\<bitrate\[4\]\><br>\<series#\[3\]\><br>\<samplerate\[6\]\>|0128<br>001<br>044100|
+
+## Date Formatters
+Form more standard formatters, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings).
+### Standard DateTime Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|s|Sortable date/time pattern.|\<file date[s]\>|2023-02-14T13:45:30|
+|Y|Year month pattern.|\<file date[Y]\>|February 2023|
+
+### Custom DateTime Formatters
+You can use custom formatters to construct customized DateTime string. For more custom formatters and examples, [see this guide from Microsoft](https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings).
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|yyyy|4-digit year|\<file date[yyyy]\>|2023|
+|yy|2-digit year|\<file date[yy]\>|23|
+|MM|2-digit month|\<file date[MM]\>|02|
+|dd|2-digit day of the month|\<file date[yyyy-MM-dd]\>|2023-02-14|
+|HH<br>mm|The hour, using a 24-hour clock from 00 to 23<br>The minute, from 00 through 59.|\<file date[HH:mm]\>|14:45|
+
+
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 - [Advanced](Documentation/Advanced.md)
    - [Files and folders](Documentation/Advanced.md#files-and-folders)
    - [Settings](Documentation/Advanced.md#settings)
-    - [Custom File Naming](Documentation/Advanced.md#custom-file-naming)
+    - [Custom File Naming](Documentation/NamingTemplates.md)
    - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
 - [Docker](Documentation/Docker.md)

--- a/Scripts/targz2linuxbundle.sh
+++ b/Scripts/targz2linuxbundle.sh
@@ -106,7 +106,10 @@ ln -s /usr/lib/libation/Hangover /usr/bin/hangover
 ln -s /usr/lib/libation/LibationCli /usr/bin/libationcli

 # Increase the maximum number of inotify instances
-echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
+
+if ! grep -q 'fs.inotify.max_user_instances=524288' /etc/sysctl.conf; then  
+  echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
+fi

 # workaround until this file is moved to the user's home directory
 touch /usr/lib/libation/appsettings.json
@@ -128,9 +131,12 @@ chmod +x "$FOLDER_DEBIAN/preinst"
 chmod +x "$FOLDER_DEBIAN/postinst"

 echo "Creating .deb file..."
-dpkg-deb --build $FOLDER_MAIN
+dpkg-deb -Zxz --build $FOLDER_MAIN
+
+mkdir bundle
+echo "moving to ./bundle/$FOLDER_MAIN.deb"
+mv "$FOLDER_MAIN.deb" "./bundle/$FOLDER_MAIN.deb"

 rm -r "$FOLDER_MAIN"

 echo "Done!"
-
--- a/Scripts/targz2macosbundle.sh
+++ b/Scripts/targz2macosbundle.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+FILE=$1; shift
+VERSION=$1; shift
+
+if [ -z "$FILE" ]
+then
+  echo "This script must be called with a the Libation macos bin zip file as an argument."
+  exit
+fi
+
+if [ ! -f "$FILE" ]
+then
+  echo "The file \"$FILE\" does not exist."
+  exit
+fi
+
+if [ -z "$VERSION" ]
+then
+  echo "This script must be called with the Libation version number as an argument."
+  exit
+fi
+
+contains() { case "$1" in *"$2"*) true ;; *) false ;; esac }
+
+if ! contains "$FILE" "$VERSION"
+then
+  echo "This script must be called with a Libation version number that is present in the filename passed."
+  exit
+fi
+
+BUNDLE="Libation.app"
+echo "Bundle dir: $BUNDLE"
+
+if [[ -d "$BUNDLE" ]]
+then
+  echo "$BUNDLE directory already exists, aborting."
+  exit
+fi
+
+BUNDLE_CONTENTS="$BUNDLE/Contents"
+echo "Bundle Contents dir: $BUNDLE_CONTENTS"
+
+BUNDLE_RESOURCES="$BUNDLE_CONTENTS/Resources"
+echo "Resources dir: $BUNDLE_RESOURCES"
+
+BUNDLE_MACOS="$BUNDLE_CONTENTS/MacOS"
+echo "MacOS dir: $BUNDLE_MACOS"
+
+mkdir -p "$BUNDLE_CONTENTS"
+mkdir -p "$BUNDLE_RESOURCES"
+mkdir -p "$BUNDLE_MACOS"
+
+echo "Extracting $FILE to $BUNDLE_MACOS..."
+tar -xzf ${FILE} -C ${BUNDLE_MACOS}
+
+if [ $? -ne 0 ]
+ then echo "Error extracting ${FILE}"
+ exit
+fi
+
+echo "Copying icon..."
+cp "$BUNDLE_MACOS/libation.icns" "$BUNDLE_RESOURCES/libation.icns"
+
+echo "Copying Info.plist file..."
+cp "$BUNDLE_MACOS/Info.plist" "$BUNDLE_CONTENTS/Info.plist"
+
+echo "Set Libation version number..."
+sed -i -e "s/VERSION_STRING/$VERSION/" "$BUNDLE_CONTENTS/Info.plist"
+
+echo "deleting unneeded files.."
+delfiles=("libmp3lame.x64.so" "ffmpegaac.x64.so" "libation.icns" "Info.plist")
+for n in "${delfiles[@]}"; do rm "$BUNDLE_MACOS/$n"; done
+
+echo "Creating app bundle: $BUNDLE-$VERSION.tar.gz"
+tar -czvf "$BUNDLE-$VERSION.tar.gz" "$BUNDLE"
+
+mkdir bundle
+echo "moving to ./bundle/$BUNDLE-$VERSION.tar.gz"
+mv "$BUNDLE-$VERSION.tar.gz" "./bundle/$BUNDLE-macOS-x64-$VERSION.tgz"
+
+rm -r "$BUNDLE"
+
+echo "Done!"
--- a/Source/AaxDecrypter/AaxDecrypter.csproj
+++ b/Source/AaxDecrypter/AaxDecrypter.csproj
@@ -13,7 +13,7 @@
 	</PropertyGroup>

 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="0.5.12" />
+	  <PackageReference Include="AAXClean.Codecs" Version="0.5.14" />
 	</ItemGroup>

 	<ItemGroup>
--- a/Source/AaxDecrypter/AaxcDownloadConvertBase.cs
+++ b/Source/AaxDecrypter/AaxcDownloadConvertBase.cs
@@ -1,16 +1,15 @@
-using System;
+using AAXClean;
+using System;
 using System.Threading.Tasks;
-using AAXClean;
-using Dinah.Core.Net.Http;

 namespace AaxDecrypter
-{
+{	
 	public abstract class AaxcDownloadConvertBase : AudiobookDownloadBase
 	{
 		public event EventHandler<AppleTags> RetrievedMetadata;

-		protected AaxFile AaxFile;
-		protected Mp4Operation aaxConversion;
+		protected AaxFile AaxFile { get; private set; }
+		protected Mp4Operation AaxConversion { get; set; }

 		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 			: base(outFileName, cacheDirectory, dlOptions) { }
@@ -23,9 +22,17 @@ namespace AaxDecrypter
 				AaxFile.AppleTags.Cover = coverArt;
 		}

+		public override async Task CancelAsync()
+		{
+			IsCanceled = true;
+			await (AaxConversion?.CancelAsync() ?? Task.CompletedTask);
+			FinalizeDownload();
+		}
+
 		protected bool Step_GetMetadata()
 		{
 			AaxFile = new AaxFile(InputFileStream);
+			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);

 			if (DownloadOptions.StripUnabridged)
 			{
@@ -44,7 +51,6 @@ namespace AaxDecrypter
 					DownloadOptions.Downsample,
 					DownloadOptions.MatchSourceBitrate);

-
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
 			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
 			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
@@ -54,58 +60,5 @@ namespace AaxDecrypter

 			return !IsCanceled;
 		}
-
-		protected DownloadProgress Step_DownloadAudiobook_Start()
-		{
-			var zeroProgress = new DownloadProgress
-			{
-				BytesReceived = 0,
-				ProgressPercentage = 0,
-				TotalBytesToReceive = InputFileStream.Length
-			};
-
-			OnDecryptProgressUpdate(zeroProgress);
-
-			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
-			return zeroProgress;
-		}
-
-		protected void Step_DownloadAudiobook_End(DownloadProgress zeroProgress)
-		{
-			AaxFile.Close();
-
-			CloseInputFileStream();
-
-			OnDecryptProgressUpdate(zeroProgress);
-		}
-
-		protected void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
-		{
-			var duration = AaxFile.Duration;
-			var remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
-			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-
-			if (double.IsNormal(estTimeRemaining))
-				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-			var progressPercent = (e.ProcessPosition / e.TotalDuration);
-
-			OnDecryptProgressUpdate(
-				new DownloadProgress
-				{
-					ProgressPercentage = 100 * progressPercent,
-					BytesReceived = (long)(InputFileStream.Length * progressPercent),
-					TotalBytesToReceive = InputFileStream.Length
-				});
-		}
-
-		public override async Task CancelAsync()
-		{
-			IsCanceled = true;
-				if (aaxConversion != null)
-					await aaxConversion.CancelAsync();
-			AaxFile?.Close();
-			CloseInputFileStream();
-		}
 	}
 }
--- a/Source/AaxDecrypter/AaxcDownloadMultiConverter.cs
+++ b/Source/AaxDecrypter/AaxcDownloadMultiConverter.cs
@@ -1,81 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AAXClean;
+using AAXClean;
 using AAXClean.Codecs;
 using FileManager;
+using System;
+using System.IO;
+using System.Threading.Tasks;

 namespace AaxDecrypter
 {
 	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
 	{
-		private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
-		private List<string> multiPartFilePaths { get; } = new List<string>();
+		private static readonly TimeSpan minChapterLength = TimeSpan.FromSeconds(3);
 		private FileStream workingFileStream;

 		public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlOptions)
 		{
-			try
-			{
-				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-
-				//Step 1
-				Serilog.Log.Information("Begin Get Aaxc Metadata");
-				if (await Task.Run(Step_GetMetadata))
-					Serilog.Log.Information("Completed Get Aaxc Metadata");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Get Aaxc Metadata");
-					return false;
-				}
-
-				//Step 2
-				Serilog.Log.Information("Begin Download Decrypted Audiobook");
-				if (await Step_DownloadAudiobookAsMultipleFilesPerChapter())
-					Serilog.Log.Information("Completed Download Decrypted Audiobook");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Download Decrypted Audiobook");
-					return false;
-				}
-
-
-				//Step 3
-				if (DownloadOptions.DownloadClipsBookmarks)
-				{
-					Serilog.Log.Information("Begin Downloading Clips and Bookmarks");
-					if (await Task.Run(Step_DownloadClipsBookmarks))
-						Serilog.Log.Information("Completed Downloading Clips and Bookmarks");
-					else
-					{
-						Serilog.Log.Information("Failed to Download Clips and Bookmarks");
-						return false;
-					}
-				}
-
-				//Step 4
-				Serilog.Log.Information("Begin Cleanup");
-				if (await Task.Run(Step_Cleanup))
-					Serilog.Log.Information("Completed Cleanup");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Cleanup");
-					return false;
-				}
-
-				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return false;
-			}
+			AsyncSteps.Name = $"Download, Convert Aaxc To {DownloadOptions.OutputFormat}, and Split";
+			AsyncSteps["Step 1: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
+			AsyncSteps["Step 2: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
 		}

 		/*
@@ -102,10 +45,8 @@ The book will be split into the following files:

 That naming may not be desirable for everyone, but it's an easy change to instead use the last of the combined chapter's title in the file name.
 		 */
-		private async Task<bool> Step_DownloadAudiobookAsMultipleFilesPerChapter()
+		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			var zeroProgress = Step_DownloadAudiobook_Start();
-
 			var chapters = DownloadOptions.ChapterInfo.Chapters;

 			// Ensure split files are at least minChapterLength in duration.
@@ -128,110 +69,79 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 				}
 			}

-			// reset, just in case
-			multiPartFilePaths.Clear();
-
 			try
 			{
-				if (DownloadOptions.OutputFormat == OutputFormat.M4b)
-					aaxConversion = ConvertToMultiMp4a(splitChapters);
-				else
-					aaxConversion = ConvertToMultiMp3(splitChapters);
+				await (AaxConversion = decryptMultiAsync(splitChapters));

-				aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-				await aaxConversion;
+				if (AaxConversion.IsCompletedSuccessfully)
+					await moveMoovToBeginning(workingFileStream?.Name);

-				if (aaxConversion.IsCompletedSuccessfully)
-					moveMoovToBeginning(workingFileStream?.Name);
-
-				return aaxConversion.IsCompletedSuccessfully;
-			}
-			catch(Exception ex)
-			{
-				Serilog.Log.Error(ex, "AAXClean Error");
-				workingFileStream?.Close();
-				if (workingFileStream?.Name is not null)
-					FileUtility.SaferDelete(workingFileStream.Name);
-				return false;
+				return AaxConversion.IsCompletedSuccessfully;
 			}
 			finally
 			{
-				if (aaxConversion is not null)
-					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-				Step_DownloadAudiobook_End(zeroProgress);
+				workingFileStream?.Dispose();
+				FinalizeDownload();
 			}
 		}

-		private Mp4Operation ConvertToMultiMp4a(ChapterInfo splitChapters)
+		private Mp4Operation decryptMultiAsync(ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp4aAsync
+			return
+				DownloadOptions.OutputFormat == OutputFormat.M4b
+				? AaxFile.ConvertToMultiMp4aAsync
 				(
 					splitChapters,
-					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
+					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
 					DownloadOptions.TrimOutputToChapterLength
-				);
-		}
-
-		private Mp4Operation ConvertToMultiMp3(ChapterInfo splitChapters)
-		{
-			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp3Async
+				)
+				: AaxFile.ConvertToMultiMp3Async
 				(
 					splitChapters,
-					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
+					newSplitCallback => newSplit(++chapterCount, splitChapters, newSplitCallback),
 					DownloadOptions.LameConfig,
 					DownloadOptions.TrimOutputToChapterLength
 				);
-		}

-
-		private void Callback(int currentChapter, ChapterInfo splitChapters, NewMP3SplitCallback newSplitCallback)
-			=> Callback(currentChapter, splitChapters, newSplitCallback as NewSplitCallback);
-
-		private void Callback(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
-		{
-			MultiConvertFileProperties props = new()
+			void newSplit(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
 			{
-				OutputFileName = OutputFileName,
-				PartsPosition = currentChapter,
-				PartsTotal = splitChapters.Count,
-				Title = newSplitCallback?.Chapter?.Title,
-			};
+				MultiConvertFileProperties props = new()
+				{
+					OutputFileName = OutputFileName,
+					PartsPosition = currentChapter,
+					PartsTotal = splitChapters.Count,
+					Title = newSplitCallback?.Chapter?.Title,
+				};

-			moveMoovToBeginning(workingFileStream?.Name);
+				moveMoovToBeginning(workingFileStream?.Name).GetAwaiter().GetResult();

-			newSplitCallback.OutputFile = createOutputFileStream(props);
-			newSplitCallback.TrackTitle = DownloadOptions.GetMultipartTitleName(props);
-			newSplitCallback.TrackNumber = currentChapter;
-			newSplitCallback.TrackCount = splitChapters.Count;
+				newSplitCallback.OutputFile = workingFileStream = createOutputFileStream(props);
+				newSplitCallback.TrackTitle = DownloadOptions.GetMultipartTitle(props);
+				newSplitCallback.TrackNumber = currentChapter;
+				newSplitCallback.TrackCount = splitChapters.Count;
+
+				OnFileCreated(workingFileStream.Name);
+			}
+
+			FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
+			{
+				var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
+				FileUtility.SaferDelete(fileName);
+				return File.Open(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			}
 		}

-		private void moveMoovToBeginning(string filename)
+		private Mp4Operation moveMoovToBeginning(string filename)
 		{
 			if (DownloadOptions.OutputFormat is OutputFormat.M4b
 				&& DownloadOptions.MoveMoovToBeginning
 				&& filename is not null
 				&& File.Exists(filename))
 			{
-				Mp4File.RelocateMoovAsync(filename).GetAwaiter().GetResult();
+				return Mp4File.RelocateMoovAsync(filename);
 			}
-		}
-
-		private FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
-		{
-			var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
-			var extension = Path.GetExtension(fileName);
-			fileName = FileUtility.GetValidFilename(fileName, DownloadOptions.ReplacementCharacters, extension);
-
-			multiPartFilePaths.Add(fileName);
-
-			FileUtility.SaferDelete(fileName);
-
-			workingFileStream = File.Open(fileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-			OnFileCreated(fileName);
-			return workingFileStream;
+			else return Mp4Operation.CompletedOperation;
 		}
 	}
 }
--- a/Source/AaxDecrypter/AaxcDownloadSingleConverter.cs
+++ b/Source/AaxDecrypter/AaxcDownloadSingleConverter.cs
@@ -1,153 +1,94 @@
-using System;
+using AAXClean;
+using AAXClean.Codecs;
+using Dinah.Core.Net.Http;
+using FileManager;
+using System;
 using System.IO;
 using System.Threading.Tasks;
-using AAXClean;
-using AAXClean.Codecs;
-using FileManager;
-using Mpeg4Lib.Util;

 namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
+		private readonly AverageSpeed averageSpeed = new();
 		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlOptions)
 		{
-			try
-			{
-				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);

-				//Step 1
-				Serilog.Log.Information("Begin Step 1: Get Aaxc Metadata");
-				if (await Task.Run(Step_GetMetadata))
-					Serilog.Log.Information("Completed Step 1: Get Aaxc Metadata");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 1: Get Aaxc Metadata");
-					return false;
-				}
-
-				//Step 2
-				Serilog.Log.Information("Begin Step 2: Download Decrypted Audiobook");
-				if (await Step_DownloadAudiobookAsSingleFile())
-					Serilog.Log.Information("Completed Step 2: Download Decrypted Audiobook");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 2: Download Decrypted Audiobook");
-					return false;
-				}
-
-				//Step 3
-				Serilog.Log.Information("Begin Step 3: Create Cue");
-				if (await Task.Run(Step_CreateCue))
-					Serilog.Log.Information("Completed Step 3: Create Cue");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 3: Create Cue");
-					return false;
-				}
-
-				//Step 4
-				if (DownloadOptions.DownloadClipsBookmarks)
-				{
-					Serilog.Log.Information("Begin Downloading Clips and Bookmarks");
-					if (await Task.Run(Step_DownloadClipsBookmarks))
-						Serilog.Log.Information("Completed Downloading Clips and Bookmarks");
-					else
-					{
-						Serilog.Log.Information("Failed to Download Clips and Bookmarks");
-						return false;
-					}
-				}
-
-				//Step 5
-				Serilog.Log.Information("Begin Step 4: Cleanup");
-				if (await Task.Run(Step_Cleanup))
-					Serilog.Log.Information("Completed Step 4: Cleanup");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 4: Cleanup");
-					return false;
-				}
-
-				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return false;
-			}
+			AsyncSteps.Name = $"Download and Convert Aaxc To {DownloadOptions.OutputFormat}";
+			AsyncSteps["Step 1: Get Aaxc Metadata"] = () => Task.Run(Step_GetMetadata);
+			AsyncSteps["Step 2: Download Decrypted Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			AsyncSteps["Step 3: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
+			AsyncSteps["Step 4: Create Cue"] = Step_CreateCueAsync;
 		}

-		private async Task<bool> Step_DownloadAudiobookAsSingleFile()
+		protected async override Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			var zeroProgress = Step_DownloadAudiobook_Start();
-
 			FileUtility.SaferDelete(OutputFileName);

-			var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+			using var outputFile = File.Open(OutputFileName, FileMode.OpenOrCreate, FileAccess.ReadWrite);
 			OnFileCreated(OutputFileName);

-
 			try
 			{
-				aaxConversion =  decryptAsync(outputFile);
-				aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-				await aaxConversion;
+				await (AaxConversion = decryptAsync(outputFile));

-				outputFile.Close();
-
-				if (aaxConversion.IsCompletedSuccessfully
-					&& DownloadOptions.OutputFormat is OutputFormat.M4b
-					&& DownloadOptions.MoveMoovToBeginning)
+				if (AaxConversion.IsCompletedSuccessfully
+					&& DownloadOptions.MoveMoovToBeginning
+					&& DownloadOptions.OutputFormat is OutputFormat.M4b)
 				{
-					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-					aaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
-					aaxConversion.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-					await aaxConversion;
+					outputFile.Close();
+					AaxConversion = Mp4File.RelocateMoovAsync(OutputFileName);
+					AaxConversion.ConversionProgressUpdate += AaxConversion_MoovProgressUpdate;
+					await AaxConversion;
+					AaxConversion.ConversionProgressUpdate -= AaxConversion_MoovProgressUpdate;
 				}

-				if (aaxConversion.IsCompletedSuccessfully)
-					base.OnFileCreated(OutputFileName);
-
-				return aaxConversion.IsCompletedSuccessfully;
-			}
-			catch(Exception ex)
-			{
-				Serilog.Log.Error(ex, "AAXClean Error");
-				FileUtility.SaferDelete(OutputFileName);
-				return false;
+				return AaxConversion.IsCompletedSuccessfully;
 			}
 			finally
 			{
-				outputFile.Close();
-
-				if (aaxConversion is not null)
-					aaxConversion.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
-
-				Step_DownloadAudiobook_End(zeroProgress);
+				FinalizeDownload();
 			}
 		}

+		private void AaxConversion_MoovProgressUpdate(object sender, ConversionProgressEventArgs e)
+		{
+			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
+
+			var remainingTimeToProcess = (e.TotalDuration - e.ProcessPosition).TotalSeconds;
+			var estTimeRemaining = remainingTimeToProcess / averageSpeed.Average;
+
+			if (double.IsNormal(estTimeRemaining))
+				OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
+
+			var progressPercent = 100d * (1 - remainingTimeToProcess / e.TotalDuration.TotalSeconds);
+
+			OnDecryptProgressUpdate(
+				new DownloadProgress
+				{
+					ProgressPercentage = progressPercent,
+					BytesReceived = (long)(InputFileStream.Length * progressPercent),
+					TotalBytesToReceive = InputFileStream.Length
+				});
+		}
+
 		private Mp4Operation decryptAsync(Stream outputFile)
-			=> DownloadOptions.OutputFormat == OutputFormat.Mp3 ? 
-			AaxFile.ConvertToMp3Async
+			=> DownloadOptions.OutputFormat == OutputFormat.Mp3
+			? AaxFile.ConvertToMp3Async
 			(
 				outputFile,
 				DownloadOptions.LameConfig,
 				DownloadOptions.ChapterInfo,
 				DownloadOptions.TrimOutputToChapterLength
 			)
-			: DownloadOptions.FixupFile ?
-				AaxFile.ConvertToMp4aAsync
-				(
-					outputFile,
-					DownloadOptions.ChapterInfo,
-					DownloadOptions.TrimOutputToChapterLength
-				)
-				: AaxFile.ConvertToMp4aAsync(outputFile);
+			: DownloadOptions.FixupFile
+			? AaxFile.ConvertToMp4aAsync
+			(
+				outputFile,
+				DownloadOptions.ChapterInfo,
+				DownloadOptions.TrimOutputToChapterLength
+			)
+			: AaxFile.ConvertToMp4aAsync(outputFile);
 	}
 }
--- a/Source/AaxDecrypter/AudiobookDownloadBase.cs
+++ b/Source/AaxDecrypter/AudiobookDownloadBase.cs
@@ -1,9 +1,10 @@
-using System;
+using Dinah.Core;
+using Dinah.Core.Net.Http;
+using Dinah.Core.StepRunner;
+using FileManager;
+using System;
 using System.IO;
 using System.Threading.Tasks;
-using Dinah.Core;
-using Dinah.Core.Net.Http;
-using FileManager;

 namespace AaxDecrypter
 {
@@ -19,19 +20,17 @@ namespace AaxDecrypter
 		public event EventHandler<TimeSpan> DecryptTimeRemaining;
 		public event EventHandler<string> FileCreated;

-		public bool IsCanceled { get; set; }
-		public string TempFilePath { get; }
-
-		protected string OutputFileName { get; private set; }
+		public bool IsCanceled { get; protected set; }
+		protected AsyncStepSequence AsyncSteps { get; } = new();
+		protected string OutputFileName { get; }
 		protected IDownloadOptions DownloadOptions { get; }
-		protected NetworkFileStream InputFileStream => (nfsPersister ??= OpenNetworkFileStream()).NetworkFileStream;
+		protected NetworkFileStream InputFileStream => nfsPersister.NetworkFileStream;
+		protected virtual long InputFilePosition => InputFileStream.Position;

-		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
-		protected void SetOutputFileName(string newOutputFileName) => OutputFileName = newOutputFileName;
-
-		private NetworkFileStreamPersister nfsPersister;
-
-		private string jsonDownloadState { get; }
+		private readonly NetworkFileStreamPersister nfsPersister;
+		private readonly DownloadProgress zeroProgress;
+		private readonly string jsonDownloadState;
+		private readonly string tempFilePath;

 		protected AudiobookDownloadBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
 		{
@@ -45,16 +44,73 @@ namespace AaxDecrypter
 				Directory.CreateDirectory(cacheDirectory);

 			jsonDownloadState = Path.Combine(cacheDirectory, Path.GetFileName(Path.ChangeExtension(OutputFileName, ".json")));
-			TempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");
+			tempFilePath = Path.ChangeExtension(jsonDownloadState, ".aaxc");

 			DownloadOptions = ArgumentValidator.EnsureNotNull(dlOptions, nameof(dlOptions));
 			DownloadOptions.DownloadSpeedChanged += (_, speed) => InputFileStream.SpeedLimit = speed;

 			// delete file after validation is complete
 			FileUtility.SaferDelete(OutputFileName);
+
+			nfsPersister = OpenNetworkFileStream();
+
+			zeroProgress = new DownloadProgress
+			{
+				BytesReceived = 0,
+				ProgressPercentage = 0,
+				TotalBytesToReceive = InputFileStream.Length
+			};
+
+			OnDecryptProgressUpdate(zeroProgress);
+		}
+
+		public async Task<bool> RunAsync()
+		{
+			var progressTask = Task.Run(reportProgress);
+
+			AsyncSteps[$"Cleanup"] = CleanupAsync;
+			(bool success, var elapsed) = await AsyncSteps.RunAsync();
+
+			await progressTask;
+
+			var speedup = DownloadOptions.RuntimeLength / elapsed;
+			Serilog.Log.Information($"Speedup is {speedup:F0}x realtime.");
+
+			return success;
+
+			async Task reportProgress()
+			{
+				AverageSpeed averageSpeed = new();
+
+				while (InputFileStream.CanRead && InputFileStream.Length > InputFilePosition && !InputFileStream.IsCancelled)
+				{
+					averageSpeed.AddPosition(InputFilePosition);
+
+					var estSecsRemaining = (InputFileStream.Length - InputFilePosition) / averageSpeed.Average;
+
+					if (double.IsNormal(estSecsRemaining))
+						OnDecryptTimeRemaining(TimeSpan.FromSeconds(estSecsRemaining));
+
+					var progressPercent = 100d * InputFilePosition / InputFileStream.Length;
+
+					OnDecryptProgressUpdate(
+						new DownloadProgress
+						{
+							ProgressPercentage = progressPercent,
+							BytesReceived = InputFilePosition,
+							TotalBytesToReceive = InputFileStream.Length
+						});
+
+					await Task.Delay(200);
+				}
+
+				OnDecryptTimeRemaining(TimeSpan.Zero);
+				OnDecryptProgressUpdate(zeroProgress);
+			}
 		}

 		public abstract Task CancelAsync();
+		protected abstract Task<bool> Step_DownloadAndDecryptAudiobookAsync();

 		public virtual void SetCoverArt(byte[] coverArt)
 		{
@@ -62,8 +118,6 @@ namespace AaxDecrypter
 				OnRetrievedCoverArt(coverArt);
 		}

-		public abstract Task<bool> RunAsync();
-
 		protected void OnRetrievedTitle(string title)
 			=> RetrievedTitle?.Invoke(this, title);
 		protected void OnRetrievedAuthors(string authors)
@@ -79,69 +133,67 @@ namespace AaxDecrypter
 		protected void OnFileCreated(string path)
 			=> FileCreated?.Invoke(this, path);

-		protected void CloseInputFileStream()
+		protected virtual void FinalizeDownload()
 		{
-			nfsPersister?.NetworkFileStream?.Close();
 			nfsPersister?.Dispose();
+			OnDecryptTimeRemaining(TimeSpan.Zero);
+			OnDecryptProgressUpdate(zeroProgress);
 		}

-		protected bool Step_CreateCue()
+		protected async Task<bool> Step_DownloadClipsBookmarksAsync()
 		{
-			if (!DownloadOptions.CreateCueSheet) return true;
+			if (!IsCanceled && DownloadOptions.DownloadClipsBookmarks)
+			{
+				var recordsFile = await DownloadOptions.SaveClipsAndBookmarksAsync(OutputFileName);
+
+				if (File.Exists(recordsFile))
+					OnFileCreated(recordsFile);
+			}
+			return !IsCanceled;
+		}
+
+		protected async Task<bool> Step_CreateCueAsync()
+		{
+			if (!DownloadOptions.CreateCueSheet) return !IsCanceled;

 			// not a critical step. its failure should not prevent future steps from running
 			try
 			{
 				var path = Path.ChangeExtension(OutputFileName, ".cue");
-				path = FileUtility.GetValidFilename(path, DownloadOptions.ReplacementCharacters, ".cue");
-				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
+				await File.WriteAllTextAsync(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
 				OnFileCreated(path);
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCue)}. FAILED");
+				Serilog.Log.Logger.Error(ex, $"{nameof(Step_CreateCueAsync)} Failed");
 			}
 			return !IsCanceled;
 		}

-		protected bool Step_Cleanup()
+		private async Task<bool> CleanupAsync()
 		{
-			bool success = !IsCanceled;
-			if (success)
+			if (IsCanceled) return false;
+
+			FileUtility.SaferDelete(jsonDownloadState);
+
+			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
+				!string.IsNullOrEmpty(DownloadOptions.AudibleIV) &&
+				DownloadOptions.RetainEncryptedFile)
 			{
-				FileUtility.SaferDelete(jsonDownloadState);
+				string aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
+				FileUtility.SaferMove(tempFilePath, aaxPath);

-				if (DownloadOptions.AudibleKey is not null &&
-					DownloadOptions.AudibleIV is not null &&
-					DownloadOptions.RetainEncryptedFile)
-				{
-					string aaxPath = Path.ChangeExtension(TempFilePath, ".aax");
-					FileUtility.SaferMove(TempFilePath, aaxPath);
+				//Write aax decryption key
+				string keyPath = Path.ChangeExtension(aaxPath, ".key");
+				FileUtility.SaferDelete(keyPath);
+				await File.WriteAllTextAsync(keyPath, $"Key={DownloadOptions.AudibleKey}{Environment.NewLine}IV={DownloadOptions.AudibleIV}");

-					//Write aax decryption key
-					string keyPath = Path.ChangeExtension(aaxPath, ".key");
-					FileUtility.SaferDelete(keyPath);
-					File.WriteAllText(keyPath, $"Key={DownloadOptions.AudibleKey}\r\nIV={DownloadOptions.AudibleIV}");
-
-					OnFileCreated(aaxPath);
-					OnFileCreated(keyPath);
-				}
-				else
-					FileUtility.SaferDelete(TempFilePath);
+				OnFileCreated(aaxPath);
+				OnFileCreated(keyPath);
 			}
+			else
+				FileUtility.SaferDelete(tempFilePath);

-			return success;
-		}
-
-		protected async Task<bool> Step_DownloadClipsBookmarks()
-		{
-			if (!IsCanceled && DownloadOptions.DownloadClipsBookmarks)
-			{
-				var recordsFile = await DownloadOptions.SaveClipsAndBookmarks(OutputFileName);
-
-				if (File.Exists(recordsFile))
-					OnFileCreated(recordsFile);
-			}
 			return !IsCanceled;
 		}

@@ -151,31 +203,30 @@ namespace AaxDecrypter
 			try
 			{
 				if (!File.Exists(jsonDownloadState))
-					return nfsp = NewNetworkFilePersister();
+					return nfsp = newNetworkFilePersister();

 				nfsp = new NetworkFileStreamPersister(jsonDownloadState);
-				// If More than ~1 hour has elapsed since getting the download url, it will expire.
-				// The new url will be to the same file.
+				// The download url expires after 1 hour.
+				// The new url points to the same file.
 				nfsp.NetworkFileStream.SetUriForSameFile(new Uri(DownloadOptions.DownloadUrl));
 				return nfsp;
 			}
 			catch
 			{
 				FileUtility.SaferDelete(jsonDownloadState);
-				FileUtility.SaferDelete(TempFilePath);
-				return nfsp = NewNetworkFilePersister();
+				FileUtility.SaferDelete(tempFilePath);
+				return nfsp = newNetworkFilePersister();
 			}
 			finally
 			{
-				if (nfsp?.NetworkFileStream is not null)
-					nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
+				nfsp.NetworkFileStream.SpeedLimit = DownloadOptions.DownloadSpeedBps;
 			}
-		}

-		private NetworkFileStreamPersister NewNetworkFilePersister()
-		{
-			var networkFileStream = new NetworkFileStream(TempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, new() { { "User-Agent", DownloadOptions.UserAgent } });
-			return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+			NetworkFileStreamPersister newNetworkFilePersister()
+			{
+				var networkFileStream = new NetworkFileStream(tempFilePath, new Uri(DownloadOptions.DownloadUrl), 0, new() { { "User-Agent", DownloadOptions.UserAgent } });
+				return new NetworkFileStreamPersister(networkFileStream, jsonDownloadState);
+			}
 		}
 	}
 }
--- a/Source/AaxDecrypter/AverageSpeed.cs
+++ b/Source/AaxDecrypter/AverageSpeed.cs
@@ -0,0 +1,171 @@
+using Dinah.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AaxDecrypter;
+
+public static class LinqStats
+{
+	public static (double mean, double stdDev) BasicStatisticsBy<T>(this IEnumerable<T> values, Func<T, double> selector)
+	{
+		var count = values.Count();
+		var mean = values.Average(selector);
+
+		return (mean, Math.Sqrt(values.Sum(s => Math.Pow(selector(s) - mean, 2)) / (count - 1)));
+	}
+
+	public static bool T_Test_2By<T>(this IEnumerable<T> values, Func<T, double> selector, IEnumerable<T> secondGroup, Significance confidence)
+	{
+		var n1 = values.Count();
+		var n2 = secondGroup.Count();
+		var n = n1 + n2;
+
+		if (n1 < 3 || n2 < 3) return false;
+
+		(var mean1, var stdDev1) = values.BasicStatisticsBy(selector);
+		(var mean2, var stdDev2) = secondGroup.BasicStatisticsBy(selector);
+
+		var pooledStdDev = Math.Sqrt((((n1 - 1) * (stdDev1 * stdDev1)) + ((n2 - 1) * (stdDev2 * stdDev2))) / (n1 + n2 - 2));
+
+		var testStat = Math.Abs(mean1 - mean2) / (pooledStdDev * Math.Sqrt(1d / n1 + 1d / n2));
+		var crit = T_Stat(Math.Min(n - 2, MAX_DEGREES_FREEDOM), confidence);
+
+		return testStat > crit;
+	}
+
+	public static bool T_Test_1By<T>(this IEnumerable<T> values, Func<T, double> selector, double testMean, Significance confidence)
+	{
+		var n = values.Count();
+
+		if (n < 2) return false;
+
+		(var sampleMean, var sampleStdDev) = values.BasicStatisticsBy(selector);
+
+		var testStat = Math.Abs(sampleMean - testMean) / (sampleStdDev / Math.Sqrt(n));
+		var crit = T_Stat(Math.Min(n - 1, MAX_DEGREES_FREEDOM), confidence);
+
+		return testStat > crit;
+	}
+
+	private static double T_Stat(int degreesFreedom, Significance confidence)
+	{
+		ArgumentValidator.EnsureBetweenInclusive(degreesFreedom, nameof(degreesFreedom), MIN_DEGREES_FREEDOM, MAX_DEGREES_FREEDOM);
+
+		return T_TABLE[(int)confidence][degreesFreedom - MIN_DEGREES_FREEDOM];
+	}
+
+	static LinqStats()
+	{
+		T_TABLE = new double[][] { T_Table_01, T_Table_05, T_Table_10, T_Table_15, T_Table_20, T_Table_25 };
+	}
+
+	private const int MIN_DEGREES_FREEDOM = 1;
+	private const int MAX_DEGREES_FREEDOM = 201;
+	/// <summary>
+	/// 2-tailed  t-Distribution critical values at 75%, 80%, 85%,
+	/// 90%, 95%, and 99% confidence for 1 - 201 degrees of freedom.
+	/// </summary>
+	private readonly static double[][] T_TABLE;
+	private readonly static double[] T_Table_25 = { 2.414213562, 1.603567451, 1.422625281, 1.344397556, 1.300949037, 1.273349309, 1.254278682, 1.240318261, 1.229659173, 1.221255395, 1.214460246, 1.208852542, 1.204146242, 1.200140298, 1.196689284, 1.193685414, 1.191047107, 1.188711483, 1.186629298, 1.184761434, 1.183076432, 1.181548697, 1.180157199, 1.178884497, 1.177716003, 1.176639425, 1.175644329, 1.174721803, 1.173864189, 1.173064871, 1.1723181, 1.17161886, 1.170962753, 1.17034591, 1.169764906, 1.169216709, 1.168698615, 1.168208212, 1.167743338, 1.167302049, 1.166882595, 1.166483396, 1.166103019, 1.165740162, 1.165393644, 1.165062385, 1.164745398, 1.164441782, 1.164150707, 1.163871412, 1.163603196, 1.163345413, 1.163097467, 1.162858803, 1.162628911, 1.162407316, 1.162193577, 1.161987283, 1.161788052, 1.161595527, 1.161409375, 1.161229286, 1.161054967, 1.160886145, 1.160722566, 1.160563987, 1.160410184, 1.160260944, 1.160116066, 1.159975363, 1.159838656, 1.159705777, 1.159576569, 1.15945088, 1.15932857, 1.159209503, 1.159093552, 1.158980598, 1.158870524, 1.158763222, 1.158658589, 1.158556526, 1.15845694, 1.158359742, 1.158264847, 1.158172173, 1.158081645, 1.157993188, 1.157906731, 1.157822209, 1.157739556, 1.157658712, 1.157579617, 1.157502216, 1.157426454, 1.157352281, 1.157279646, 1.157208502, 1.157138804, 1.157070509, 1.157003573, 1.156937958, 1.156873624, 1.156810534, 1.156748653, 1.156687945, 1.156628379, 1.156569922, 1.156512543, 1.156456213, 1.156400904, 1.156346587, 1.156293237, 1.156240827, 1.156189334, 1.156138733, 1.156089001, 1.156040117, 1.155992058, 1.155944804, 1.155898335, 1.155852631, 1.155807674, 1.155763446, 1.155719928, 1.155677105, 1.155634959, 1.155593475, 1.155552637, 1.15551243, 1.155472839, 1.155433851, 1.155395452, 1.155357629, 1.155320368, 1.155283658, 1.155247486, 1.155211841, 1.15517671, 1.155142084, 1.15510795, 1.1550743, 1.155041122, 1.155008406, 1.154976144, 1.154944326, 1.154912942, 1.154881984, 1.154851443, 1.154821311, 1.15479158, 1.154762241, 1.154733287, 1.154704711, 1.154676505, 1.154648662, 1.154621175, 1.154594037, 1.154567242, 1.154540783, 1.154514654, 1.154488849, 1.154463361, 1.154438185, 1.154413316, 1.154388747, 1.154364474, 1.15434049, 1.154316792, 1.154293373, 1.154270229, 1.154247355, 1.154224746, 1.154202398, 1.154180307, 1.154158467, 1.154136875, 1.154115526, 1.154094417, 1.154073543, 1.1540529, 1.154032485, 1.154012294, 1.153992323, 1.153972568, 1.153953027, 1.153933695, 1.15391457, 1.153895647, 1.153876925, 1.153858399, 1.153840066, 1.153821925, 1.15380397, 1.153786201, 1.153768613, 1.153751204, 1.153733972, 1.153716914, 1.153700026 };
+	private readonly static double[] T_Table_20 = { 3.077683537, 1.885618083, 1.637744354, 1.533206274, 1.475884049, 1.439755747, 1.414923928, 1.39681531, 1.383028738, 1.372183641, 1.363430318, 1.356217334, 1.350171289, 1.345030374, 1.340605608, 1.336757167, 1.33337939, 1.330390944, 1.327728209, 1.325340707, 1.323187874, 1.321236742, 1.31946024, 1.317835934, 1.316345073, 1.314971864, 1.313702913, 1.312526782, 1.311433647, 1.310415025, 1.309463549, 1.308572793, 1.307737124, 1.306951587, 1.306211802, 1.305513886, 1.304854381, 1.304230204, 1.303638589, 1.303077053, 1.302543359, 1.302035487, 1.301551608, 1.30109006, 1.300649332, 1.300228048, 1.299824947, 1.299438879, 1.299068785, 1.298713694, 1.298372713, 1.298045016, 1.297729843, 1.297426488, 1.2971343, 1.296852673, 1.296581044, 1.29631889, 1.296065725, 1.295821094, 1.295584571, 1.295355762, 1.295134294, 1.29491982, 1.294712013, 1.294510568, 1.294315197, 1.294125629, 1.293941609, 1.293762898, 1.293589269, 1.293420507, 1.293256413, 1.293096793, 1.292941469, 1.292790268, 1.292643029, 1.292499597, 1.292359828, 1.292223583, 1.29209073, 1.291961144, 1.291834705, 1.291711301, 1.291590824, 1.291473171, 1.291358243, 1.291245948, 1.291136195, 1.291028899, 1.290923979, 1.290821356, 1.290720956, 1.290622708, 1.290526543, 1.290432395, 1.290340202, 1.290249904, 1.290161442, 1.290074761, 1.289989809, 1.289906533, 1.289824884, 1.289744816, 1.289666283, 1.289589241, 1.289513648, 1.289439464, 1.289366649, 1.289295166, 1.289224979, 1.289156054, 1.289088355, 1.289021851, 1.28895651, 1.288892302, 1.288829199, 1.288767171, 1.288706191, 1.288646234, 1.288587273, 1.288529284, 1.288472243, 1.288416127, 1.288360913, 1.288306581, 1.288253109, 1.288200477, 1.288148665, 1.288097654, 1.288047427, 1.287997964, 1.287949248, 1.287901264, 1.287853994, 1.287807422, 1.287761534, 1.287716314, 1.287671748, 1.287627821, 1.287584521, 1.287541833, 1.287499745, 1.287458245, 1.287417319, 1.287376957, 1.287337146, 1.287297876, 1.287259135, 1.287220914, 1.2871832, 1.287145985, 1.287109259, 1.287073012, 1.287037235, 1.287001918, 1.286967053, 1.286932631, 1.286898644, 1.286865084, 1.286831942, 1.286799212, 1.286766884, 1.286734952, 1.286703409, 1.286672248, 1.286641461, 1.286611042, 1.286580985, 1.286551283, 1.286521929, 1.286492918, 1.286464244, 1.286435901, 1.286407882, 1.286380184, 1.286352799, 1.286325724, 1.286298952, 1.286272479, 1.286246299, 1.286220408, 1.286194801, 1.286169474, 1.286144421, 1.286119638, 1.286095122, 1.286070867, 1.28604687, 1.286023127, 1.285999633, 1.285976384, 1.285953377, 1.285930609, 1.285908074, 1.285885771, 1.285863694, 1.285841842, 1.285820209, 1.285798794 };
+	private readonly static double[] T_Table_15 = { 4.16529977, 2.281930588, 1.924319657, 1.778192164, 1.699362566, 1.650173154, 1.616591737, 1.59222144, 1.573735785, 1.559235933, 1.547559766, 1.537956495, 1.529919606, 1.523095061, 1.517227969, 1.51213017, 1.507659754, 1.503707672, 1.500188756, 1.497035518, 1.494193795, 1.491619612, 1.489276897, 1.487135783, 1.485171326, 1.483362535, 1.481691617, 1.48014339, 1.478704821, 1.477364662, 1.47611315, 1.474941772, 1.473843072, 1.47281049, 1.471838233, 1.470921166, 1.470054719, 1.469234815, 1.468457801, 1.467720399, 1.467019655, 1.466352901, 1.465717725, 1.465111933, 1.464533534, 1.463980712, 1.463451805, 1.462945295, 1.46245979, 1.461994009, 1.461546775, 1.461117, 1.460703683, 1.460305896, 1.45992278, 1.459553538, 1.45919743, 1.458853767, 1.458521908, 1.458201256, 1.457891251, 1.457591373, 1.457301133, 1.457020074, 1.456747768, 1.45648381, 1.456227824, 1.455979454, 1.455738365, 1.455504241, 1.455276784, 1.455055715, 1.454840767, 1.45463169, 1.454428246, 1.454230212, 1.454037373, 1.453849529, 1.453666487, 1.453488066, 1.453314093, 1.453144404, 1.452978842, 1.452817259, 1.452659513, 1.452505469, 1.452354998, 1.452207977, 1.452064289, 1.451923821, 1.451786468, 1.451652126, 1.451520697, 1.451392088, 1.451266209, 1.451142973, 1.451022299, 1.450904108, 1.450788323, 1.450674871, 1.450563684, 1.450454694, 1.450347836, 1.450243048, 1.450140271, 1.450039448, 1.449940523, 1.449843444, 1.449748158, 1.449654617, 1.449562773, 1.449472581, 1.449383997, 1.449296977, 1.449211481, 1.449127468, 1.449044902, 1.448963744, 1.448883959, 1.448805513, 1.448728372, 1.448652503, 1.448577876, 1.44850446, 1.448432226, 1.448361146, 1.448291192, 1.448222337, 1.448154557, 1.448087826, 1.44802212, 1.447957415, 1.447893688, 1.447830919, 1.447769085, 1.447708165, 1.44764814, 1.44758899, 1.447530695, 1.447473238, 1.447416601, 1.447360765, 1.447305715, 1.447251433, 1.447197905, 1.447145113, 1.447093044, 1.447041682, 1.446991013, 1.446941023, 1.446891698, 1.446843026, 1.446794994, 1.446747588, 1.446700797, 1.446654609, 1.446609012, 1.446563996, 1.446519548, 1.446475659, 1.446432318, 1.446389514, 1.446347238, 1.44630548, 1.44626423, 1.44622348, 1.44618322, 1.446143442, 1.446104137, 1.446065296, 1.446026911, 1.445988975, 1.44595148, 1.445914417, 1.44587778, 1.445841561, 1.445805753, 1.445770349, 1.445735343, 1.445700727, 1.445666495, 1.445632641, 1.445599159, 1.445566042, 1.445533284, 1.445500881, 1.445468825, 1.445437112, 1.445405736, 1.445374691, 1.445343973, 1.445313576, 1.445283495, 1.445253726, 1.445224264, 1.445195103, 1.445166239, 1.445137668, 1.445109385, 1.445081387 };
+	private readonly static double[] T_Table_10 = { 6.313751515, 2.91998558, 2.353363435, 2.131846786, 2.015048373, 1.943180281, 1.894578605, 1.859548038, 1.833112933, 1.812461123, 1.795884819, 1.782287556, 1.770933396, 1.761310136, 1.753050356, 1.745883676, 1.739606726, 1.734063607, 1.729132812, 1.724718243, 1.720742903, 1.717144374, 1.713871528, 1.71088208, 1.708140761, 1.70561792, 1.703288446, 1.701130934, 1.699127027, 1.697260887, 1.695518783, 1.693888748, 1.692360309, 1.690924255, 1.689572458, 1.688297714, 1.68709362, 1.68595446, 1.684875122, 1.683851013, 1.682878002, 1.681952357, 1.681070703, 1.680229977, 1.679427393, 1.678660414, 1.677926722, 1.677224196, 1.676550893, 1.675905025, 1.67528495, 1.674689154, 1.674116237, 1.673564906, 1.673033965, 1.672522303, 1.672028888, 1.671552762, 1.671093032, 1.670648865, 1.670219484, 1.669804163, 1.669402222, 1.669013025, 1.668635976, 1.668270514, 1.667916114, 1.667572281, 1.667238549, 1.666914479, 1.666599658, 1.666293696, 1.665996224, 1.665706893, 1.665425373, 1.665151353, 1.664884537, 1.664624645, 1.664371409, 1.664124579, 1.663883913, 1.663649184, 1.663420175, 1.663196679, 1.6629785, 1.662765449, 1.662557349, 1.662354029, 1.662155326, 1.661961084, 1.661771155, 1.661585397, 1.661403674, 1.661225855, 1.661051817, 1.66088144, 1.66071461, 1.660551217, 1.660391156, 1.660234326, 1.66008063, 1.659929976, 1.659782273, 1.659637437, 1.659495383, 1.659356034, 1.659219312, 1.659085144, 1.658953458, 1.658824187, 1.658697265, 1.658572629, 1.658450216, 1.658329969, 1.65821183, 1.658095744, 1.657981659, 1.657869522, 1.657759285, 1.657650899, 1.657544319, 1.657439499, 1.657336397, 1.65723497, 1.657135178, 1.657036982, 1.656940344, 1.656845226, 1.656751594, 1.656659413, 1.656568649, 1.65647927, 1.656391244, 1.656304542, 1.656219133, 1.656134988, 1.65605208, 1.655970382, 1.655889868, 1.655810511, 1.655732287, 1.655655173, 1.655579143, 1.655504177, 1.655430251, 1.655357345, 1.655285437, 1.655214506, 1.655144534, 1.6550755, 1.655007387, 1.654940175, 1.654873847, 1.654808385, 1.654743774, 1.654679996, 1.654617035, 1.654554875, 1.654493503, 1.654432901, 1.654373057, 1.654313957, 1.654255585, 1.654197929, 1.654140976, 1.654084713, 1.654029128, 1.653974208, 1.653919942, 1.653866317, 1.653813324, 1.653760949, 1.653709184, 1.653658017, 1.653607437, 1.653557435, 1.653508002, 1.653459126, 1.6534108, 1.653363013, 1.653315758, 1.653269024, 1.653222803, 1.653177088, 1.653131869, 1.653087138, 1.653042889, 1.652999113, 1.652955802, 1.652912949, 1.652870547, 1.652828589, 1.652787068, 1.652745977, 1.65270531, 1.652665059, 1.652625219, 1.652585784, 1.652546746, 1.652508101 };
+	private readonly static double[] T_Table_05 = { 12.70620474, 4.30265273, 3.182446305, 2.776445105, 2.570581836, 2.446911851, 2.364624252, 2.306004135, 2.262157163, 2.228138852, 2.20098516, 2.17881283, 2.160368656, 2.144786688, 2.131449546, 2.119905299, 2.109815578, 2.10092204, 2.093024054, 2.085963447, 2.079613845, 2.073873068, 2.06865761, 2.063898562, 2.059538553, 2.055529439, 2.051830516, 2.048407142, 2.045229642, 2.042272456, 2.039513446, 2.036933343, 2.034515297, 2.032244509, 2.030107928, 2.028094001, 2.026192463, 2.024394164, 2.02269092, 2.02107539, 2.01954097, 2.018081703, 2.016692199, 2.015367574, 2.014103389, 2.012895599, 2.011740514, 2.010634758, 2.009575237, 2.008559112, 2.00758377, 2.006646805, 2.005745995, 2.004879288, 2.004044783, 2.003240719, 2.002465459, 2.001717484, 2.000995378, 2.000297822, 1.999623585, 1.998971517, 1.998340543, 1.997729654, 1.997137908, 1.996564419, 1.996008354, 1.995468931, 1.994945415, 1.994437112, 1.993943368, 1.993463567, 1.992997126, 1.992543495, 1.992102154, 1.99167261, 1.991254395, 1.990847069, 1.99045021, 1.990063421, 1.989686323, 1.989318557, 1.98895978, 1.988609667, 1.988267907, 1.987934206, 1.987608282, 1.987289865, 1.9869787, 1.986674541, 1.986377154, 1.986086317, 1.985801814, 1.985523442, 1.985251004, 1.984984312, 1.984723186, 1.984467455, 1.984216952, 1.983971519, 1.983731003, 1.983495259, 1.983264145, 1.983037526, 1.982815274, 1.982597262, 1.98238337, 1.982173483, 1.98196749, 1.981765282, 1.981566757, 1.981371815, 1.981180359, 1.980992298, 1.980807541, 1.980626002, 1.980447599, 1.980272249, 1.980099876, 1.979930405, 1.979763763, 1.979599878, 1.979438685, 1.979280117, 1.979124109, 1.978970602, 1.978819535, 1.97867085, 1.978524491, 1.978380405, 1.978238539, 1.978098842, 1.977961264, 1.977825758, 1.977692277, 1.977560777, 1.977431212, 1.977303542, 1.977177724, 1.97705372, 1.976931489, 1.976810994, 1.976692198, 1.976575066, 1.976459563, 1.976345655, 1.976233309, 1.976122494, 1.976013178, 1.975905331, 1.975798924, 1.975693928, 1.975590315, 1.975488058, 1.975387131, 1.975287508, 1.975189163, 1.975092073, 1.974996213, 1.97490156, 1.974808092, 1.974715786, 1.974624621, 1.974534576, 1.97444563, 1.974357764, 1.974270957, 1.974185191, 1.974100447, 1.974016708, 1.973933954, 1.973852169, 1.973771337, 1.97369144, 1.973612462, 1.973534388, 1.973457202, 1.973380889, 1.973305434, 1.973230823, 1.973157042, 1.973084077, 1.973011915, 1.972940542, 1.972869946, 1.972800114, 1.972731033, 1.972662692, 1.972595079, 1.972528182, 1.97246199, 1.972396491, 1.972331676, 1.972267533, 1.972204051, 1.972141222, 1.972079034, 1.972017478, 1.971956544, 1.971896224 };
+	private readonly static double[] T_Table_01 = { 63.65674116, 9.924843201, 5.84090931, 4.604094871, 4.032142984, 3.707428021, 3.499483297, 3.355387331, 3.249835542, 3.169272673, 3.105806516, 3.054539589, 3.012275839, 2.976842734, 2.946712883, 2.920781622, 2.89823052, 2.878440473, 2.860934606, 2.84533971, 2.831359558, 2.818756061, 2.807335684, 2.796939505, 2.787435814, 2.778714533, 2.770682957, 2.763262455, 2.756385904, 2.749995654, 2.744041919, 2.738481482, 2.733276642, 2.728394367, 2.723805589, 2.71948463, 2.715408722, 2.711557602, 2.707913184, 2.704459267, 2.701181304, 2.698066186, 2.695102079, 2.692278266, 2.689585019, 2.687013492, 2.684555618, 2.682204027, 2.679951974, 2.677793271, 2.675722234, 2.673733631, 2.671822636, 2.669984796, 2.668215988, 2.666512398, 2.664870482, 2.663286954, 2.661758752, 2.660283029, 2.658857127, 2.657478565, 2.656145025, 2.654854337, 2.653604469, 2.652393515, 2.651219685, 2.650081299, 2.648976774, 2.647904624, 2.646863444, 2.645851913, 2.644868782, 2.643912872, 2.642983067, 2.642078313, 2.641197611, 2.640340015, 2.639504627, 2.638690596, 2.637897113, 2.63712341, 2.636368757, 2.635632458, 2.634913852, 2.634212309, 2.633527229, 2.632858038, 2.632204191, 2.631565166, 2.630940463, 2.630329608, 2.629732145, 2.629147638, 2.628575671, 2.628015844, 2.627467774, 2.626931096, 2.626405457, 2.625890521, 2.625385965, 2.624891476, 2.624406758, 2.623931523, 2.623465496, 2.623008411, 2.622560015, 2.622120061, 2.621688313, 2.621264543, 2.620848534, 2.620440073, 2.620038957, 2.619644989, 2.619257981, 2.618877749, 2.618504116, 2.618136914, 2.617775976, 2.617421145, 2.617072266, 2.616729191, 2.616391776, 2.616059883, 2.615733377, 2.615412127, 2.615096008, 2.614784899, 2.61447868, 2.614177238, 2.613880461, 2.613588242, 2.613300477, 2.613017065, 2.612737908, 2.61246291, 2.61219198, 2.611925028, 2.611661966, 2.611402711, 2.611147181, 2.610895295, 2.610646976, 2.61040215, 2.610160742, 2.609922682, 2.609687901, 2.609456331, 2.609227907, 2.609002566, 2.608780245, 2.608560883, 2.608344423, 2.608130807, 2.60791998, 2.607711886, 2.607506474, 2.607303692, 2.607103489, 2.606905817, 2.606710628, 2.606517876, 2.606327515, 2.606139501, 2.605953791, 2.605770342, 2.605589114, 2.605410067, 2.605233162, 2.605058359, 2.604885623, 2.604714916, 2.604546204, 2.60437945, 2.604214622, 2.604051686, 2.60389061, 2.603731363, 2.603573912, 2.603418229, 2.603264282, 2.603112045, 2.602961487, 2.602812582, 2.602665303, 2.602519622, 2.602375515, 2.602232955, 2.602091918, 2.60195238, 2.601814317, 2.601677705, 2.601542523, 2.601408747, 2.601276355, 2.601145327, 2.601015642, 2.600887278, 2.600760216, 2.600634436 };
+}
+
+public enum Significance
+{
+	P01,
+	P05,
+	P10,
+	P15,
+	P20,
+	P25
+}
+
+public class AverageSpeed
+{
+	/// <summary>Average speed in units per second</summary>
+	public double Average { get; private set; }
+	public TimeSpan SlowWindow { get; }
+	public TimeSpan FastWindow { get; }
+	public Significance SlowSignificance { get; }
+	public Significance FastSignificance { get; }
+
+	private DateTime start;
+	private TimeSpan lastTime;
+	private double lastPosition = double.NaN;
+
+	private readonly record struct Point(TimeSpan Time, double Velocity);
+	private readonly LinkedList<Point> speeds = new();
+	private const int MAX_SPEEDS = 200;
+
+	public AverageSpeed() : this(TimeSpan.FromSeconds(15), Significance.P10, TimeSpan.FromSeconds(3), Significance.P01) { }
+
+	/// <param name="slowWindow">Total moving average time window</param>
+	/// <param name="slowSignificance">T-test signifance level at which the newest speed will be considered different from the slow window's mean speed.</param>
+	/// <param name="fastWindow">A shorter moving window of the most resent speeds. The average speed in <paramref name="fastWindow"/> is compared to the average speed in the rest of <paramref name="slowWindow"/> to quickly detect large changes in speed.</param>
+	/// <param name="fastSignificance">T-test significance level at which the mean speed in <paramref name="fastWindow"/> will be considered different from the mean speed of the remainder of <paramref name="slowWindow"/>.</param>
+	public AverageSpeed(TimeSpan slowWindow, Significance slowSignificance, TimeSpan fastWindow, Significance fastSignificance)
+	{
+		SlowWindow = ArgumentValidator.EnsureGreaterThan(slowWindow, nameof(slowWindow), fastWindow);
+		FastWindow = ArgumentValidator.EnsureGreaterThan(fastWindow, nameof(fastWindow), TimeSpan.Zero);
+		SlowSignificance = slowSignificance;
+		FastSignificance = fastSignificance;
+	}
+
+	/// <summary>Add a new position to the moving average</summary>
+	public void AddPosition(double position)
+	{
+		var now = DateTime.Now;
+		if (start == default)
+			start = now;
+
+		var time = now - start;
+
+		while (speeds.Count > MAX_SPEEDS || (speeds.Count > 2 && time - speeds.First.Value.Time > SlowWindow))
+			speeds.RemoveFirst();
+
+		if (!double.IsNaN(lastPosition))
+		{
+			var newSpeed = (position - lastPosition) / (time - lastTime).TotalSeconds;
+			speeds.AddLast(new Point(time, newSpeed));
+		}
+
+		lastTime = time;
+		lastPosition = position;
+
+		Average = ComputeNextAverage();
+	}
+
+	private double ComputeNextAverage()
+	{
+		if (speeds.Count == 0)
+			return 0;
+		else if (speeds.Count == 1)
+			return speeds.Last.Value.Velocity;
+		else
+		{
+			var n_newest = speeds.Count(s => s.Time > lastTime.Subtract(FastWindow));
+
+			var n_oldest = speeds.Count - n_newest;
+
+			if (speeds.Take(n_oldest).T_Test_2By(s => s.Velocity, speeds.TakeLast(n_newest), FastSignificance))
+			{
+				//Speeds in FastWindow are significantly different from reset of speeds in SlowWindow.
+				//Discard older speeds and keep only speeds in FastWindow
+				for (; n_oldest > 0; n_oldest--)
+					speeds.RemoveFirst();
+
+				return speeds.Average(s => s.Velocity);
+			}
+			else
+				return
+					speeds.T_Test_1By(s => s.Velocity, Average, SlowSignificance)
+					? speeds.Average(s => s.Velocity)
+					: Average;
+		}
+	}
+}
--- a/Source/AaxDecrypter/Cue.cs
+++ b/Source/AaxDecrypter/Cue.cs
@@ -1,8 +1,7 @@
-using System;
+using AAXClean;
+using Dinah.Core;
 using System.IO;
 using System.Text;
-using AAXClean;
-using Dinah.Core;

 namespace AaxDecrypter
 {
@@ -16,15 +15,14 @@ namespace AaxDecrypter

            var startOffset = chapters.StartOffset;

-            var trackCount = 0;
+            var trackCount = 1;
            foreach (var c in chapters.Chapters)
            {
                var startTime = c.StartOffset - startOffset;
-                trackCount++;

-                stringBuilder.AppendLine($"TRACK {trackCount} AUDIO");
+                stringBuilder.AppendLine($"TRACK {trackCount++} AUDIO");
                stringBuilder.AppendLine($"  TITLE \"{c.Title}\"");
-                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss}:{(int)(startTime.Milliseconds / 1000d * 75)}");
+                stringBuilder.AppendLine($"  INDEX 01 {(int)startTime.TotalMinutes}:{startTime:ss}:{(int)(startTime.Milliseconds * 75d / 1000):D2}");
            }

            return stringBuilder.ToString();
@@ -46,7 +44,7 @@ namespace AaxDecrypter
            for (var i = 0; i < cueContents.Length; i++)
            {
                var line = cueContents[i];
-                if (!line.Trim().StartsWith("FILE") || !line.Contains(" "))
+                if (!line.Trim().StartsWith("FILE") || !line.Contains(' '))
                    continue;

                var fileTypeBegins = line.LastIndexOf(" ") + 1;
--- a/Source/AaxDecrypter/IDownloadOptions.cs
+++ b/Source/AaxDecrypter/IDownloadOptions.cs
@@ -5,13 +5,13 @@ using System.Threading.Tasks;
 namespace AaxDecrypter
 {
    public interface IDownloadOptions
-	{
+    {
        event EventHandler<long> DownloadSpeedChanged;
-        FileManager.ReplacementCharacters ReplacementCharacters { get; }
        string DownloadUrl { get; }
        string UserAgent { get; }
        string AudibleKey { get; }
        string AudibleIV { get; }
+        TimeSpan RuntimeLength { get; }
        OutputFormat OutputFormat { get; }
        bool TrimOutputToChapterLength { get; }
        bool RetainEncryptedFile { get; }
@@ -26,7 +26,7 @@ namespace AaxDecrypter
        bool MatchSourceBitrate { get; }
        bool MoveMoovToBeginning { get; }
        string GetMultipartFileName(MultiConvertFileProperties props);
-        string GetMultipartTitleName(MultiConvertFileProperties props);
-        Task<string> SaveClipsAndBookmarks(string fileName);
-	}    
+        string GetMultipartTitle(MultiConvertFileProperties props);
+        Task<string> SaveClipsAndBookmarksAsync(string fileName);
+    }
 }
--- a/Source/AaxDecrypter/MpegUtil.cs
+++ b/Source/AaxDecrypter/MpegUtil.cs
@@ -1,7 +1,5 @@
 using AAXClean;
 using NAudio.Lame;
-using System;
-using System.Linq;

 namespace AaxDecrypter
 {
--- a/Source/AaxDecrypter/MultiConvertFileProperties.cs
+++ b/Source/AaxDecrypter/MultiConvertFileProperties.cs
@@ -1,6 +1,4 @@
 using System;
-using System.IO;
-using FileManager;

 namespace AaxDecrypter
 {
--- a/Source/AaxDecrypter/NetworkFileStream.cs
+++ b/Source/AaxDecrypter/NetworkFileStream.cs
@@ -3,7 +3,6 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading;
@@ -83,16 +82,13 @@ namespace AaxDecrypter
 		/// <param name="requestHeaders">Http headers to be sent to the server with the <see cref="HttpWebRequest"/>.</param>
 		public NetworkFileStream(string saveFilePath, Uri uri, long writePosition = 0, Dictionary<string, string> requestHeaders = null)
 		{
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(uri?.AbsoluteUri, nameof(uri));
-			ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);
+			SaveFilePath = ArgumentValidator.EnsureNotNullOrWhiteSpace(saveFilePath, nameof(saveFilePath));
+			Uri = ArgumentValidator.EnsureNotNull(uri, nameof(uri));
+			WritePosition = ArgumentValidator.EnsureGreaterThan(writePosition, nameof(writePosition), -1);

 			if (!Directory.Exists(Path.GetDirectoryName(saveFilePath)))
 				throw new ArgumentException($"Specified {nameof(saveFilePath)} directory \"{Path.GetDirectoryName(saveFilePath)}\" does not exist.");

-			SaveFilePath = saveFilePath;
-			Uri = uri;
-			WritePosition = writePosition;
 			RequestHeaders = requestHeaders ?? new();

 			_writeFile = new FileStream(SaveFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite)
@@ -109,8 +105,8 @@ namespace AaxDecrypter

 		#region Downloader

-		/// <summary> Update the <see cref="JsonFilePersister"/>. </summary>
-		private void Update()
+		/// <summary> Update the <see cref="Dinah.Core.IO.JsonFilePersister{T}"/>. </summary>
+		private void OnUpdate()
 		{
 			RequestHeaders["Range"] = $"bytes={WritePosition}-";
 			try
@@ -167,7 +163,7 @@ namespace AaxDecrypter
 			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);

 			//Download the file in the background.
-			return Task.Run(async () => await DownloadFile(networkStream), _cancellationSource.Token);
+			return Task.Run(() => DownloadFile(networkStream), _cancellationSource.Token);
 		}

 		/// <summary> Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.</summary>
@@ -184,7 +180,7 @@ namespace AaxDecrypter
 				int bytesRead;
 				do
 				{
-					bytesRead = await networkStream.ReadAsync(buff, 0, DOWNLOAD_BUFF_SZ, _cancellationSource.Token);
+					bytesRead = await networkStream.ReadAsync(buff, _cancellationSource.Token);
 					await _writeFile.WriteAsync(buff, 0, bytesRead, _cancellationSource.Token);

 					downloadPosition += bytesRead;
@@ -193,7 +189,7 @@ namespace AaxDecrypter
 					{
 						await _writeFile.FlushAsync(_cancellationSource.Token);
 						WritePosition = downloadPosition;
-						Update();
+						OnUpdate();
 						nextFlush = downloadPosition + DATA_FLUSH_SZ;
 						_downloadedPiece.Set();
 					}
@@ -233,26 +229,19 @@ namespace AaxDecrypter
 				networkStream.Close();
 				_writeFile.Close();
 				_downloadedPiece.Set();
-				Update();
+				OnUpdate();
 			}
 		}

 		#endregion

-		#region Json Connverters
-
-		public static JsonSerializerSettings GetJsonSerializerSettings()
-			=> new JsonSerializerSettings();
-
-		#endregion
-
 		#region Download Stream Reader

 		[JsonIgnore]
-		public override bool CanRead => true;
+		public override bool CanRead => _readFile.CanRead;

 		[JsonIgnore]
-		public override bool CanSeek => true;
+		public override bool CanSeek => _readFile.CanSeek;

 		[JsonIgnore]
 		public override bool CanWrite => false;
@@ -289,7 +278,7 @@ namespace AaxDecrypter

 			var toRead = Math.Min(count, Length - Position);
 			WaitToPosition(Position + toRead);
-			return IsCancelled ? 0: _readFile.Read(buffer, offset, count);
+			return IsCancelled ? 0 : _readFile.Read(buffer, offset, count);
 		}

 		public override long Seek(long offset, SeekOrigin origin)
@@ -306,7 +295,7 @@ namespace AaxDecrypter
 		}

 		/// <summary>Blocks until the file has downloaded to at least <paramref name="requiredPosition"/>, then returns. </summary>
-		/// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
+		/// <param name="requiredPosition">The minimum required flushed data length in <see cref="SaveFilePath"/>.</param>
 		private void WaitToPosition(long requiredPosition)
 		{
 			while (WritePosition < requiredPosition
@@ -317,20 +306,31 @@ namespace AaxDecrypter
 			}
 		}

-		public override void Close()
-		{
-			_cancellationSource.Cancel();
-			_backgroundDownloadTask?.Wait();
+		private bool disposed = false;

-			_readFile.Close();
-			_writeFile.Close();
-			Update();
+		/*
+		 * https://learn.microsoft.com/en-us/dotnet/api/system.io.stream.dispose?view=net-7.0
+		 * 
+		 * In derived classes, do not override the Close() method, instead, put all of the
+		 * Stream cleanup logic in the Dispose(Boolean) method.
+		 */
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && !disposed)
+			{
+				_cancellationSource.Cancel();
+				_backgroundDownloadTask?.GetAwaiter().GetResult();
+				_downloadedPiece?.Dispose();
+				_cancellationSource?.Dispose();
+				_readFile.Dispose();
+				_writeFile.Dispose();
+				OnUpdate();
+			}
+
+			disposed = true;
+			base.Dispose(disposing);
 		}

 		#endregion
-		~NetworkFileStream()
-		{
-			_downloadedPiece?.Close();
-		}
 	}
 }
--- a/Source/AaxDecrypter/NetworkFileStreamPersister.cs
+++ b/Source/AaxDecrypter/NetworkFileStreamPersister.cs
@@ -1,11 +1,9 @@
 using Dinah.Core.IO;
-using Newtonsoft.Json;

 namespace AaxDecrypter
 {
-    internal class NetworkFileStreamPersister : JsonFilePersister<NetworkFileStream>
-    {
-
+	internal class NetworkFileStreamPersister : JsonFilePersister<NetworkFileStream>
+	{
 		/// <summary>Alias for Target </summary>
 		public NetworkFileStream NetworkFileStream => Target;

@@ -17,7 +15,11 @@ namespace AaxDecrypter
 		public NetworkFileStreamPersister(string path, string jsonPath = null)
 			: base(path, jsonPath) { }

-		protected override JsonSerializerSettings GetSerializerSettings() => NetworkFileStream.GetJsonSerializerSettings();
-
-    }
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing)
+				NetworkFileStream?.Dispose();
+			base.Dispose(disposing);
+		}
+	}
 }
--- a/Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs
+++ b/Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs
@@ -1,124 +1,44 @@
-using System;
-using System.Threading;
+using FileManager;
+using System;
 using System.Threading.Tasks;
-using Dinah.Core.Net.Http;
-using FileManager;

 namespace AaxDecrypter
 {
 	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
 	{
+		protected override long InputFilePosition => InputFileStream.WritePosition;

 		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, IDownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic) { }
-
-		public override async Task<bool> RunAsync()
+			: base(outFileName, cacheDirectory, dlLic)
 		{
-			try
-			{
-				Serilog.Log.Information("Begin downloading unencrypted audiobook.");
-
-				//Step 1
-				Serilog.Log.Information("Begin Step 1: Get Mp3 Metadata");
-				if (await Task.Run(Step_GetMetadata))
-					Serilog.Log.Information("Completed Step 1: Get Mp3 Metadata");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 1: Get Mp3 Metadata");
-					return false;
-				}
-
-				//Step 2
-				Serilog.Log.Information("Begin Step 2: Download Audiobook");
-				if (await Task.Run(Step_DownloadAudiobookAsSingleFile))
-					Serilog.Log.Information("Completed Step 2: Download Audiobook");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 2: Download Audiobook");
-					return false;
-				}
-
-				//Step 3
-				if (DownloadOptions.DownloadClipsBookmarks)
-				{
-					Serilog.Log.Information("Begin Downloading Clips and Bookmarks");
-					if (await Task.Run(Step_DownloadClipsBookmarks))
-						Serilog.Log.Information("Completed Downloading Clips and Bookmarks");
-					else
-					{
-						Serilog.Log.Information("Failed to Download Clips and Bookmarks");
-						return false;
-					}
-				}
-
-				//Step 4
-				Serilog.Log.Information("Begin Step 3: Cleanup");
-				if (await Task.Run(Step_Cleanup))
-					Serilog.Log.Information("Completed Step 3: Cleanup");
-				else
-				{
-					Serilog.Log.Information("Failed to Complete Step 3: Cleanup");
-					return false;
-				}
-
-				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return true;
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
-				return false;
-			}
+			AsyncSteps.Name = "Download Unencrypted Audiobook";
+			AsyncSteps["Step 1: Download Audiobook"] = Step_DownloadAndDecryptAudiobookAsync;
+			AsyncSteps["Step 2: Download Clips and Bookmarks"] = Step_DownloadClipsBookmarksAsync;
+			AsyncSteps["Step 3: Create Cue"] = Step_CreateCueAsync;
 		}

 		public override Task CancelAsync()
 		{
 			IsCanceled = true;
-			CloseInputFileStream();
+			FinalizeDownload();
 			return Task.CompletedTask;
 		}

-		protected bool Step_GetMetadata()
+		protected override async Task<bool> Step_DownloadAndDecryptAudiobookAsync()
 		{
-			OnRetrievedCoverArt(null);
-
-			return !IsCanceled;
-		}
-
-		private bool Step_DownloadAudiobookAsSingleFile()
-		{
-			DateTime startTime = DateTime.Now;
-
 			// MUST put InputFileStream.Length first, because it starts background downloader.
+			while (InputFileStream.Length > InputFilePosition && !InputFileStream.IsCancelled)
+				await Task.Delay(200);

-			while (InputFileStream.Length > InputFileStream.WritePosition && !InputFileStream.IsCancelled) 
+			if (IsCanceled)
+				return false;
+			else
 			{
-				var rate = InputFileStream.WritePosition / (DateTime.Now - startTime).TotalSeconds;
-
-				var estTimeRemaining = (InputFileStream.Length - InputFileStream.WritePosition) / rate;
-
-				if (double.IsNormal(estTimeRemaining))
-					OnDecryptTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));
-
-				var progressPercent = (double)InputFileStream.WritePosition / InputFileStream.Length;
-
-				OnDecryptProgressUpdate(
-					new DownloadProgress
-					{
-						ProgressPercentage = 100 * progressPercent,
-						BytesReceived = (long)(InputFileStream.Length * progressPercent),
-						TotalBytesToReceive = InputFileStream.Length
-					});
-				Thread.Sleep(200);
+				FinalizeDownload();
+				FileUtility.SaferMove(InputFileStream.SaveFilePath, OutputFileName);
+				OnFileCreated(OutputFileName);
+				return true;
 			}
-
-			CloseInputFileStream();
-			
-			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName, DownloadOptions.ReplacementCharacters);
-			SetOutputFileName(realOutputFileName);
-			OnFileCreated(realOutputFileName);
-
-			return !IsCanceled;
 		}
 	}
 }
--- a/Source/AppScaffolding/AppScaffolding.csproj
+++ b/Source/AppScaffolding/AppScaffolding.csproj
@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net7.0</TargetFramework>
-    <Version>9.1.0.1</Version>
+    <Version>9.3.2.1</Version>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Octokit" Version="4.0.3" />
+    <PackageReference Include="Octokit" Version="5.0.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
--- a/Source/AppScaffolding/UNSAFE_MigrationHelper.cs
+++ b/Source/AppScaffolding/UNSAFE_MigrationHelper.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Dinah.Core;
+using LibationFileManager;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

@@ -25,9 +26,6 @@ namespace AppScaffolding
 			: value;

 		#region appsettings.json
-		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(Environment.ProcessPath), "appsettings.json");
-
-		public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON);

 		public static bool APPSETTINGS_TryGet(string key, out string value)
 		{
@@ -61,11 +59,7 @@ namespace AppScaffolding
 		/// <param name="save">True: save if contents changed. False: no not attempt save</param>
 		private static void process_APPSETTINGS_Json(Action<JObject> action, bool save = true)
 		{
-			// only insert if not exists
-			if (!APPSETTINGS_Json_Exists)
-				return;
-
-			var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+			var startingContents = File.ReadAllText(Configuration.AppsettingsJsonFile);

 			JObject jObj;
 			try
@@ -88,7 +82,7 @@ namespace AppScaffolding
 			if (startingContents.EqualsInsensitive(endingContents_indented) || startingContents.EqualsInsensitive(endingContents_compact))
 				return;

-			File.WriteAllText(APPSETTINGS_JSON, endingContents_indented);
+			File.WriteAllText(Configuration.AppsettingsJsonFile, endingContents_indented);
 			System.Threading.Thread.Sleep(100);
 		}
 		#endregion
--- a/Source/AppScaffolding/UpgradeProperties.cs
+++ b/Source/AppScaffolding/UpgradeProperties.cs
@@ -1,11 +1,11 @@
-using System;
+using NPOI.XWPF.UserModel;
+using System;
 using System.Text.RegularExpressions;

 namespace AppScaffolding
 {
-	public record UpgradeProperties
+	public partial record UpgradeProperties
 	{
-		private static readonly Regex linkstripper = new Regex(@"\[(.*)\]\(.*\)");
 		public string ZipUrl { get; }
 		public string HtmlUrl { get; }
 		public string ZipName { get; }
@@ -18,17 +18,10 @@ namespace AppScaffolding
 			HtmlUrl = htmlUrl;
 			ZipUrl = zipUrl;
 			LatestRelease = latestRelease;
-			Notes = stripMarkdownLinks(notes);
+			Notes = LinkStripRegex().Replace(notes, "$1");
 		}
-		private string stripMarkdownLinks(string body)
-		{
-			body = body.Replace(@"\", "");
-			var matches = linkstripper.Matches(body);

-			foreach (Match match in matches)
-				body = body.Replace(match.Groups[0].Value, match.Groups[1].Value);
-
-			return body;
-		}
+		[GeneratedRegex(@"\[(.*)\]\(.*\)")]
+		private static partial Regex LinkStripRegex();
 	}
 }
--- a/Source/ApplicationServices/LibraryExporter.cs
+++ b/Source/ApplicationServices/LibraryExporter.cs
@@ -103,7 +103,10 @@ namespace ApplicationServices

        [Name("Audio Format")]
 		public string AudioFormat { get; set; }
-	}
+
+		[Name("Language")]
+        public string Language { get; set; }
+    }
 	public static class LibToDtos
 	{
 		public static List<ExportDto> ToDtos(this IEnumerable<LibraryBook> library)
@@ -136,7 +139,8 @@ namespace ApplicationServices
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
 				ContentType = a.Book.ContentType.ToString(),
-				AudioFormat = a.Book.AudioFormat.ToString()
+				AudioFormat = a.Book.AudioFormat.ToString(),
+				Language = a.Book.Language
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -207,8 +211,9 @@ namespace ApplicationServices
 				nameof(ExportDto.BookStatus),
 				nameof(ExportDto.PdfStatus),
 				nameof(ExportDto.ContentType),
-				nameof(ExportDto.AudioFormat)
-			};
+				nameof(ExportDto.AudioFormat),
+                nameof(ExportDto.Language)
+            };
 			var col = 0;
 			foreach (var c in columns)
 			{
@@ -273,9 +278,10 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
-				row.CreateCell(col++).SetCellValue(dto.AudioFormat);
+                row.CreateCell(col++).SetCellValue(dto.AudioFormat);
+                row.CreateCell(col++).SetCellValue(dto.Language);

-				rowIndex++;
+                rowIndex++;
 			}

 			using var fileData = new System.IO.FileStream(saveFilePath, System.IO.FileMode.Create);
--- a/Source/AudibleUtilities/AudibleUtilities.csproj
+++ b/Source/AudibleUtilities/AudibleUtilities.csproj
@@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="7.3.1.1" />
+    <PackageReference Include="AudibleApi" Version="7.3.3.1" />
  </ItemGroup>

  <ItemGroup>
--- a/Source/DataLayer/DataLayer.csproj
+++ b/Source/DataLayer/DataLayer.csproj
@@ -10,14 +10,14 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="7.2.0.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.1.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">
+    <PackageReference Include="Dinah.Core" Version="7.2.2.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.1.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Source/DataLayer/EfClasses/Book.cs
+++ b/Source/DataLayer/EfClasses/Book.cs
@@ -50,6 +50,7 @@ namespace DataLayer
        // book details
        public bool IsAbridged { get; private set; }
        public DateTime? DatePublished { get; private set; }
+        public string Language { get; private set; }

        // non-null. use "empty pattern"
        internal int CategoryId { get; private set; }
@@ -215,11 +216,12 @@ namespace DataLayer
        public void UpdateProductRating(float overallRating, float performanceRating, float storyRating)
            => Rating.Update(overallRating, performanceRating, storyRating);

-        public void UpdateBookDetails(bool isAbridged, DateTime? datePublished)
+        public void UpdateBookDetails(bool isAbridged, DateTime? datePublished, string language)
        {
            // don't overwrite with default values
            IsAbridged |= isAbridged;
            DatePublished = datePublished ?? DatePublished;
+            Language = language?.FirstCharToUpper() ?? Language;
        }

        public void UpdateCategory(Category category, DbContext context = null)
--- a/Source/DataLayer/EfClasses/UserDefinedItem.cs
+++ b/Source/DataLayer/EfClasses/UserDefinedItem.cs
@@ -20,7 +20,7 @@ namespace DataLayer
        PartialDownload = 0x1000
    }

-    public class UserDefinedItem
+    public partial class UserDefinedItem
    {
        internal int BookId { get; private set; }
        public Book Book { get; private set; }
@@ -51,18 +51,23 @@ namespace DataLayer
 		public IEnumerable<string> TagsEnumerated => Tags == "" ? new string[0] : Tags.Split(null as char[], StringSplitOptions.RemoveEmptyEntries);

 		#region sanitize tags: space delimited. Inline/denormalized. Lower case. Alpha numeric and hyphen
-		// only legal chars are letters numbers underscores and separating whitespace
-		//
-		// technically, the only char.s which aren't easily supported are  \  [  ]
-		// however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
-		// it's easy to expand whitelist as needed
-		// for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
-		//
-		// there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
-		// full list of characters which must be escaped:
-		//   + - && || ! ( ) { } [ ] ^ " ~ * ? : \
-		static Regex regex { get; } = new Regex(@"[^\w\d\s_]", RegexOptions.Compiled);
-        private static string sanitize(string input)
+
+		/// <summary>
+		/// only legal chars are letters numbers underscores and separating whitespace
+		/// 
+		/// technically, the only char.s which aren't easily supported are  \  [  ]
+		/// however, whitelisting is far safer than blacklisting (eg: new lines, non-printable character)
+		/// it's easy to expand whitelist as needed
+		/// for lucene, ToLower() isn't needed because search is case-inspecific. for here, it prevents duplicates
+		/// 
+		/// there are also other allowed but misleading characters. eg: the ^ operator defines a 'boost' score
+		/// full list of characters which must be escaped:
+		///     + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+		/// </summary>
+
+		[GeneratedRegex(@"[^\w\d\s_]")]
+		private static partial Regex IllegalCharacterRegex();
+		private static string sanitize(string input)
        {
            if (string.IsNullOrWhiteSpace(input))
                return "";
@@ -73,9 +78,9 @@ namespace DataLayer
                // assume a hyphen is supposed to be an underscore
                .Replace("-", "_");

-            var unique = regex
-                // turn illegal characters into a space. this will also take care of turning new lines into spaces
-                .Replace(str, " ")
+            var unique = IllegalCharacterRegex()
+				// turn illegal characters into a space. this will also take care of turning new lines into spaces
+				.Replace(str, " ")
                // split and remove excess spaces
                .Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)
                // de-dup
--- a/Source/DataLayer/Migrations/20230201162454_AddBookLanguage.Designer.cs
+++ b/Source/DataLayer/Migrations/20230201162454_AddBookLanguage.Designer.cs
@@ -0,0 +1,404 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20230201162454_AddBookLanguage")]
+    partial class AddBookLanguage
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/Source/DataLayer/Migrations/20230201162454_AddBookLanguage.cs
+++ b/Source/DataLayer/Migrations/20230201162454_AddBookLanguage.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddBookLanguage : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Language",
+                table: "Books",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Language",
+                table: "Books");
+        }
+    }
+}
--- a/Source/DataLayer/Migrations/LibationContextModelSnapshot.cs
+++ b/Source/DataLayer/Migrations/LibationContextModelSnapshot.cs
@@ -15,7 +15,7 @@ namespace DataLayer.Migrations
        protected override void BuildModel(ModelBuilder modelBuilder)
        {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "7.0.0");
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.2");

            modelBuilder.Entity("DataLayer.Book", b =>
                {
@@ -41,6 +41,9 @@ namespace DataLayer.Migrations
                    b.Property<bool>("IsAbridged")
                        .HasColumnType("INTEGER");

+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
                    b.Property<int>("LengthInMinutes")
                        .HasColumnType("INTEGER");

--- a/Source/DtoImporterService/BookImporter.cs
+++ b/Source/DtoImporterService/BookImporter.cs
@@ -152,9 +152,9 @@ namespace DtoImporterService
 				book.ReplacePublisher(publisher);
 			}

-			book.UpdateBookDetails(item.IsAbridged, item.DatePublished);
+            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);

-			if (item.PdfUrl is not null)
+            if (item.PdfUrl is not null)
 				book.AddSupplementDownloadUrl(item.PdfUrl.ToString());

 			return book;
@@ -174,7 +174,12 @@ namespace DtoImporterService
 			if (item.PictureLarge is not null)
 				book.PictureLarge = item.PictureLarge;

-			book.UpdateProductRating(
+            // 2023-02-01
+            // updateBook must update language on books which were imported before the migration which added language.
+            // Can eventually delete this
+            book.UpdateBookDetails(item.IsAbridged, item.DatePublished, item.Language);
+
+            book.UpdateProductRating(
 				(float)(item.Rating?.OverallDistribution?.AverageRating ?? 0),
 				(float)(item.Rating?.PerformanceDistribution?.AverageRating ?? 0),
 				(float)(item.Rating?.StoryDistribution?.AverageRating ?? 0));
--- a/Source/FileLiberator/AudioFileStorageExt.cs
+++ b/Source/FileLiberator/AudioFileStorageExt.cs
@@ -25,13 +25,12 @@ namespace FileLiberator

 					if (seriesParent is not null)
 					{
-						var baseDir = Templates.Folder.GetFilename(seriesParent.ToDto());
-						return Templates.Folder.GetFilename(libraryBook.ToDto(), baseDir);
+						var baseDir = Templates.Folder.GetFilename(seriesParent.ToDto(), AudibleFileStorage.BooksDirectory, "");
+						return Templates.Folder.GetFilename(libraryBook.ToDto(), baseDir, "");
 					}
 				}
 			}
-
-			return Templates.Folder.GetFilename(libraryBook.ToDto());
+			return Templates.Folder.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, "");
 		}

 		/// <summary>
--- a/Source/FileLiberator/ConvertToMp3.cs
+++ b/Source/FileLiberator/ConvertToMp3.cs
@@ -16,8 +16,7 @@ namespace FileLiberator
 	{
 		public override string Name => "Convert to Mp3";
 		private Mp4Operation Mp4Operation;
-		private TimeSpan bookDuration;
-		private long fileSize;
+		private readonly AaxDecrypter.AverageSpeed averageSpeed = new();
 		private static string Mp3FileName(string m4bPath) => Path.ChangeExtension(m4bPath ?? "", ".mp3");

 		public override Task CancelAsync() => Mp4Operation?.CancelAsync() ?? Task.CompletedTask;		
@@ -45,9 +44,6 @@ namespace FileLiberator

 					var m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));

-					bookDuration = m4bBook.Duration;
-					fileSize = m4bBook.InputStream.Length;
-
 					OnTitleDiscovered(m4bBook.AppleTags.Title);
 					OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
 					OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
@@ -105,20 +101,22 @@ namespace FileLiberator

 		private void M4bBook_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
 		{
-			var remainingSecsToProcess = (bookDuration - e.ProcessPosition).TotalSeconds;
-			var estTimeRemaining = remainingSecsToProcess / e.ProcessSpeed;
-				
+			averageSpeed.AddPosition(e.ProcessPosition.TotalSeconds);
+
+			var remainingTimeToProcess = (e.TotalDuration - e.ProcessPosition).TotalSeconds;
+			var estTimeRemaining = remainingTimeToProcess / averageSpeed.Average;
+
 			if (double.IsNormal(estTimeRemaining))
 				OnStreamingTimeRemaining(TimeSpan.FromSeconds(estTimeRemaining));

-			double progressPercent = 100 * e.ProcessPosition.TotalSeconds / bookDuration.TotalSeconds;
+			double progressPercent = 100 * e.ProcessPosition.TotalSeconds / e.TotalDuration.TotalSeconds;

 			OnStreamingProgressChanged(
 				new DownloadProgress
 				{
 					ProgressPercentage = progressPercent,
-					BytesReceived = (long)(fileSize * progressPercent),
-					TotalBytesToReceive = fileSize
+					BytesReceived = (long)e.ProcessPosition.TotalSeconds,
+					TotalBytesToReceive = (long)e.TotalDuration.TotalSeconds
 				});
 		}
 	}
--- a/Source/FileLiberator/DownloadDecryptBook.cs
+++ b/Source/FileLiberator/DownloadDecryptBook.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using AaxDecrypter;
 using ApplicationServices;
-using AudibleApi;
 using DataLayer;
 using Dinah.Core;
 using Dinah.Core.ErrorHandling;
@@ -138,41 +137,27 @@ namespace FileLiberator

        private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, AudibleApi.Common.ContentLicense contentLic)
        {
-            //I assume if ContentFormat == "MPEG" that the delivered file is an unencrypted mp3.
-            //I also assume that if DrmType != Adrm, the file will be an mp3.
-            //These assumptions may be wrong, and only time and bug reports will tell.
+			//If DrmType != Adrm the delivered file is an unencrypted mp3.

-            bool encrypted = contentLic.DrmType == AudibleApi.Common.DrmType.Adrm;
+            var outputFormat
+                = contentLic.DrmType != AudibleApi.Common.DrmType.Adrm || (config.AllowLibationFixup && config.DecryptToLossy)
+                ? OutputFormat.Mp3
+                : OutputFormat.M4b;

-            var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
-                     OutputFormat.Mp3 : OutputFormat.M4b;
+            long chapterStartMs
+                = config.StripAudibleBrandAudio
+                ? contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs
+                : 0;

-            long chapterStartMs = config.StripAudibleBrandAudio ?
-                contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
-
-            var dlOptions = new DownloadOptions
-                 (
-                    libraryBook,
-                    contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
-                    Resources.USER_AGENT
-                 )
+            var dlOptions = new DownloadOptions(config, libraryBook, contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl)
            {
                AudibleKey = contentLic?.Voucher?.Key,
                AudibleIV = contentLic?.Voucher?.Iv,
-                OutputFormat = outputFormat,
-                MoveMoovToBeginning = config.MoveMoovToBeginning,
-                TrimOutputToChapterLength = config.AllowLibationFixup && config.StripAudibleBrandAudio,
-                RetainEncryptedFile = config.RetainAaxFile && encrypted,
-                StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
-                Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
-                MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
-                CreateCueSheet = config.CreateCueSheet,
-                DownloadClipsBookmarks = config.DownloadClipsBookmarks,
-                DownloadSpeedBps = config.DownloadSpeedLimit,
-                LameConfig = GetLameOptions(config),
-                ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
-                FixupFile = config.AllowLibationFixup
-            };
+				OutputFormat = outputFormat,
+				LameConfig = GetLameOptions(config),
+				ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
+				RuntimeLength = TimeSpan.FromMilliseconds(contentLic?.ContentMetadata?.ChapterInfo?.RuntimeLengthMs ?? 0),
+			};

            var chapters = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();

@@ -277,8 +262,10 @@ namespace FileLiberator

            foreach (var c in chapters)
            {
-                if (c.Chapters is not null)
-                {
+                if (c.Chapters is null)
+					chaps.Add(c);
+				else
+				{
                    if (c.LengthMs < 10000)
                    {
                        c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
@@ -296,8 +283,6 @@ namespace FileLiberator
                    chaps.AddRange(children);
                    c.Chapters = null;
                }
-                else
-                    chaps.Add(c);
            }
            return chaps;
        }
--- a/Source/FileLiberator/DownloadOptions.cs
+++ b/Source/FileLiberator/DownloadOptions.cs
@@ -3,7 +3,6 @@ using AAXClean;
 using Dinah.Core;
 using DataLayer;
 using LibationFileManager;
-using FileManager;
 using System.Threading.Tasks;
 using System;
 using System.IO;
@@ -17,36 +16,39 @@ namespace FileLiberator
 		public LibraryBook LibraryBook { get; }
 		public LibraryBookDto LibraryBookDto { get; }
 		public string DownloadUrl { get; }
-		public string UserAgent { get; }
 		public string AudibleKey { get; init; }
 		public string AudibleIV { get; init; }
-		public AaxDecrypter.OutputFormat OutputFormat { get; init; }
-		public bool TrimOutputToChapterLength { get; init; }
-		public bool RetainEncryptedFile { get; init; }
-		public bool StripUnabridged { get; init; }
-		public bool CreateCueSheet { get; init; }
-		public bool DownloadClipsBookmarks { get; init; }
-		public long DownloadSpeedBps { get; init; }
+		public TimeSpan RuntimeLength { get; init; }
+		public OutputFormat OutputFormat { get; init; }
 		public ChapterInfo ChapterInfo { get; init; }
-		public bool FixupFile { get; init; }
 		public NAudio.Lame.LameConfig LameConfig { get; init; }
-		public bool Downsample { get; init; }
-		public bool MatchSourceBitrate { get; init; }
-		public ReplacementCharacters ReplacementCharacters => Configuration.Instance.ReplacementCharacters;
-
-		public bool MoveMoovToBeginning { get; init; }
+		public string UserAgent => AudibleApi.Resources.USER_AGENT;
+		public bool TrimOutputToChapterLength => config.AllowLibationFixup && config.StripAudibleBrandAudio;
+		public bool StripUnabridged => config.AllowLibationFixup && config.StripUnabridged;
+		public bool CreateCueSheet => config.CreateCueSheet;
+		public bool DownloadClipsBookmarks => config.DownloadClipsBookmarks;
+		public long DownloadSpeedBps => config.DownloadSpeedLimit;
+		public bool RetainEncryptedFile => config.RetainAaxFile;
+		public bool FixupFile => config.AllowLibationFixup;
+		public bool Downsample => config.AllowLibationFixup && config.LameDownsampleMono;
+		public bool MatchSourceBitrate => config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate;
+		public bool MoveMoovToBeginning => config.MoveMoovToBeginning;

 		public string GetMultipartFileName(MultiConvertFileProperties props)
-			=> Templates.ChapterFile.GetFilename(LibraryBookDto, props);
+		{
+			var baseDir = Path.GetDirectoryName(props.OutputFileName);
+			var extension = Path.GetExtension(props.OutputFileName);
+			return Templates.ChapterFile.GetFilename(LibraryBookDto, props, baseDir, extension);
+		}

-		public string GetMultipartTitleName(MultiConvertFileProperties props)
-			=> Templates.ChapterTitle.GetTitle(LibraryBookDto, props);
+		public string GetMultipartTitle(MultiConvertFileProperties props)
+			=> Templates.ChapterTitle.GetName(LibraryBookDto, props);

-		public async Task<string> SaveClipsAndBookmarks(string fileName)
+		public async Task<string> SaveClipsAndBookmarksAsync(string fileName)
 		{
 			if (DownloadClipsBookmarks)
 			{
-				var format = Configuration.Instance.ClipsBookmarksFileFormat;
+				var format = config.ClipsBookmarksFileFormat;

 				var formatExtension = format.ToString().ToLowerInvariant();
 				var filePath = Path.ChangeExtension(fileName, formatExtension);
@@ -71,20 +73,21 @@ namespace FileLiberator
 			return string.Empty;
 		}

+		private readonly Configuration config;
 		private readonly IDisposable cancellation;
 		public void Dispose() => cancellation?.Dispose();

-		public DownloadOptions(LibraryBook libraryBook, string downloadUrl, string userAgent)
+		public DownloadOptions(Configuration config, LibraryBook libraryBook, string downloadUrl)
 		{
+			this.config = ArgumentValidator.EnsureNotNull(config, nameof(config));
 			LibraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));
 			DownloadUrl = ArgumentValidator.EnsureNotNullOrEmpty(downloadUrl, nameof(downloadUrl));
-			UserAgent = ArgumentValidator.EnsureNotNullOrEmpty(userAgent, nameof(userAgent));
 			// no null/empty check for key/iv. unencrypted files do not have them

 			LibraryBookDto = LibraryBook.ToDto();

 			cancellation =
-				Configuration.Instance
+				config
 				.ObservePropertyChanged<long>(
 					nameof(Configuration.DownloadSpeedLimit),
 					newVal => DownloadSpeedChanged?.Invoke(this, newVal));
--- a/Source/FileLiberator/UtilityExtensions.cs
+++ b/Source/FileLiberator/UtilityExtensions.cs
@@ -40,11 +40,13 @@ namespace FileLiberator
 			Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),

 			SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
-			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order,
+			SeriesNumber = (int?)libraryBook.Book.SeriesLink.FirstOrDefault()?.Index,
+			IsPodcast = libraryBook.Book.IsEpisodeChild(),

 			BitRate = libraryBook.Book.AudioFormat.Bitrate,
 			SampleRate = libraryBook.Book.AudioFormat.SampleRate,
 			Channels = libraryBook.Book.AudioFormat.Channels,
+			Language = libraryBook.Book.Language
 		};
 	}
 }
--- a/Source/FileLiberator/_InternalsVisible.cs
+++ b/Source/FileLiberator/_InternalsVisible.cs
@@ -1 +0,0 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileLiberator) + ".Tests")]
--- a/Source/FileManager/FileManager.csproj
+++ b/Source/FileManager/FileManager.csproj
@@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="7.2.0.1" />
+    <PackageReference Include="Dinah.Core" Version="7.2.2.1" />
    <PackageReference Include="Polly" Version="7.2.3" />
  </ItemGroup>

--- a/Source/FileManager/FileNamingTemplate.cs
+++ b/Source/FileManager/FileNamingTemplate.cs
@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace FileManager
-{
-	/// <summary>Get valid filename. Advanced features incl. parameterized template</summary>
-	public class FileNamingTemplate : NamingTemplate
-	{
-		public ReplacementCharacters ReplacementCharacters { get; }
-		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
-		public FileNamingTemplate(string template, ReplacementCharacters replacement) : base(template)
-		{
-			ReplacementCharacters = replacement ?? ReplacementCharacters.Default;
-		}
-
-		/// <summary>Generate a valid path for this file or directory</summary>
-		public LongPath GetFilePath(string fileExtension, bool returnFirstExisting = false)
-		{
-			string fileName = 
-				Template.EndsWith(Path.DirectorySeparatorChar) || Template.EndsWith(Path.AltDirectorySeparatorChar) ?
-					FileUtility.RemoveLastCharacter(Template) : 
-					Template;
-
-			List<string> pathParts = new();
-
-			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value, ReplacementCharacters));
-
-			while (!string.IsNullOrEmpty(fileName))
-			{
-				var file = Path.GetFileName(fileName);
-
-				if (Path.IsPathRooted(Template) && file == string.Empty)
-				{
-					pathParts.Add(fileName);
-					break;
-				}
-				else
-				{
-					pathParts.Add(file);
-					fileName = Path.GetDirectoryName(fileName);
-				}
-			}
-
-			pathParts.Reverse();
-			var fileNamePart = pathParts[^1];
-			pathParts.Remove(fileNamePart);
-
-			fileNamePart = fileNamePart[..^fileExtension.Length];
-
-			LongPath directory = Path.Join(pathParts.Select(p => replaceFileName(p, paramReplacements, LongPath.MaxFilenameLength)).ToArray());
-
-			//If file already exists, GetValidFilename will append " (n)" to the filename.
-			//This could cause the filename length to exceed MaxFilenameLength, so reduce
-			//allowable filename length by 5 chars, allowing for up to 99 duplicates.
-			return FileUtility
-			.GetValidFilename(
-				Path.Join(directory, replaceFileName(fileNamePart, paramReplacements, LongPath.MaxFilenameLength - fileExtension.Length - 5)) + fileExtension,
-				ReplacementCharacters,
-				fileExtension,
-				returnFirstExisting
-				);
-		}
-
-		private static string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
-		{
-			List<StringBuilder> filenameParts = new();
-			//Build the filename in parts, replacing replacement parameters with
-			//their values, and storing the parts in a list.
-			while (!string.IsNullOrEmpty(filename))
-			{
-				int openIndex = filename.IndexOf('<');
-				int closeIndex = filename.IndexOf('>');
-
-				if (openIndex == 0 && closeIndex > 0)
-				{
-					var key = filename[..(closeIndex + 1)];
-
-					if (paramReplacements.ContainsKey(key))
-						filenameParts.Add(new StringBuilder(paramReplacements[key]));
-					else
-						filenameParts.Add(new StringBuilder(key));
-
-					filename = filename[(closeIndex + 1)..];
-				}
-				else if (openIndex > 0 && closeIndex > openIndex)
-				{
-					var other = filename[..openIndex];
-					filenameParts.Add(new StringBuilder(other));
-					filename = filename[openIndex..];
-				}
-				else
-				{
-					filenameParts.Add(new StringBuilder(filename));
-					filename = string.Empty;
-				}
-			}
-
-			//Remove 1 character from the end of the longest filename part until
-			//the total filename is less than max filename length
-			while (filenameParts.Sum(p => LongPath.GetFilesystemStringLength(p)) > maxFilenameLength)
-			{
-				int maxLength = filenameParts.Max(p => p.Length);
-				var maxEntry = filenameParts.First(p => p.Length == maxLength);
-
-				maxEntry.Remove(maxLength - 1, 1);
-			}
-			return string.Join("", filenameParts);
-		}
-
-		private static string formatValue(object value, ReplacementCharacters replacements)
-		{
-			if (value is null)
-				return "";
-
-			// Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
-			// Esp important for file templates.
-			return replacements.ReplaceFilenameChars(value.ToString());
-		}
-	}
-}
--- a/Source/FileManager/LongPath.cs
+++ b/Source/FileManager/LongPath.cs
@@ -40,6 +40,7 @@ namespace FileManager
 			}
 		}

+		[JsonConstructor]
 		private LongPath(string path)
 		{
 			if (IsWindows && path.Length > MaxPathLength)
@@ -55,17 +56,16 @@ namespace FileManager
 		//don't care about encoding, so how unicode characters are encoded is
 		///a choice made by the linux kernel. As best as I can tell, pretty
 		//much everyone uses UTF-8.
-		public static int GetFilesystemStringLength(StringBuilder filename)
-			=> LongPath.IsWindows ?
-				filename.Length
-				: Encoding.UTF8.GetByteCount(filename.ToString());
+		public static int GetFilesystemStringLength(string filename)
+			=> IsWindows ? filename.Length
+			: Encoding.UTF8.GetByteCount(filename);

 		public static implicit operator LongPath(string path)
 		{
-			if (!IsWindows) return new LongPath(path);
-
 			if (path is null) return null;

+			if (!IsWindows) return new LongPath(path);
+
 			//File I/O functions in the Windows API convert "/" to "\" as part of converting
 			//the name to an NT-style name, except when using the "\\?\" prefix 
 			path = path.Replace(System.IO.Path.AltDirectorySeparatorChar, System.IO.Path.DirectorySeparatorChar);
--- a/Source/FileManager/MetadataNamingTemplate.cs
+++ b/Source/FileManager/MetadataNamingTemplate.cs
@@ -1,20 +0,0 @@
-using System;
-using System.Linq;
-
-namespace FileManager
-{
-	public class MetadataNamingTemplate : NamingTemplate
-	{
-		public MetadataNamingTemplate(string template) : base(template) { }
-
-		public string GetTagContents()
-		{
-			var tagValue = Template;
-
-			foreach (var r in ParameterReplacements)
-				tagValue = tagValue.Replace($"<{formatKey(r.Key)}>", r.Value?.ToString() ?? "");
-
-			return tagValue;
-		}
-	}
-}
--- a/Source/FileManager/NamingTemplate.cs
+++ b/Source/FileManager/NamingTemplate.cs
@@ -1,28 +0,0 @@
-using Dinah.Core;
-using System;
-using System.Collections.Generic;
-
-namespace FileManager
-{
-	public class NamingTemplate
-	{
-		/// <summary>Proposed full name. May contain optional html-styled template tags. Eg: &lt;name&gt;</summary>
-		public string Template { get; }
-
-		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
-		public NamingTemplate(string template) => Template = ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
-
-		/// <summary>Optional step 1: Replace html-styled template tags with parameters. Eg {"name", "Bill Gates"} => /&lt;name&gt;/ => /Bill Gates/</summary>
-		public Dictionary<string, object> ParameterReplacements { get; } = new Dictionary<string, object>();
-
-		/// <summary>Convenience method</summary>
-		public void AddParameterReplacement(string key, object value)
-			// using .Add() instead of "[key] = value" will make unintended overwriting throw exception
-			=> ParameterReplacements.Add(key, value);
-
-		protected static string formatKey(string key)
-			=> key
-			.Replace("<", "")
-			.Replace(">", "");
-	}
-}
--- a/Source/FileManager/NamingTemplate/ConditionalTagCollection[TClass].cs
+++ b/Source/FileManager/NamingTemplate/ConditionalTagCollection[TClass].cs
@@ -0,0 +1,66 @@
+using System;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+internal interface IClosingPropertyTag : IPropertyTag
+{
+	/// <summary>The <see cref="Regex"/> used to match the closing <see cref="IPropertyTag.TemplateTag"/> in template strings.</summary>
+	public Regex NameCloseMatcher { get; }
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="IPropertyTag.TemplateTag"/>'s closing tag signature,
+	/// and if it does output the matching tag's <see cref="ITemplateTag"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyTag">The registered <see cref="IPropertyTag"/></param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag propertyTag);
+}
+
+public class ConditionalTagCollection<TClass> : TagCollection
+{
+	public ConditionalTagCollection(bool caseSensative = true) :base(typeof(TClass), caseSensative) { }
+
+	/// <summary>
+	/// Register a conditional tag.
+	/// </summary>
+	/// <param name="propertyGetter">A Func to get the condition's <see cref="bool"/> value from <see cref="TClass"/></param>
+	public void Add(ITemplateTag templateTag, Func<TClass, bool> propertyGetter)
+	{
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+
+		AddPropertyTag(new ConditionalTag(templateTag, Options, expr));
+	}
+	
+	private class ConditionalTag : TagBase, IClosingPropertyTag
+	{
+		public Regex NameCloseMatcher { get; }
+
+		public ConditionalTag(ITemplateTag templateTag, RegexOptions options, Expression conditionExpression)
+			: base(templateTag, conditionExpression)
+		{
+			NameMatcher = new Regex($"^<(!)?{templateTag.TagName}->", options);
+			NameCloseMatcher = new Regex($"^<-{templateTag.TagName}>", options);
+		}
+
+		public bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag propertyTag)
+		{
+			var match = NameCloseMatcher.Match(templateString);
+			if (match.Success)
+			{
+				exactName = match.Value;
+				propertyTag = this;
+				return true;
+			}
+
+			exactName = null;
+			propertyTag = null;
+			return false;
+		}
+
+		protected override Expression GetTagExpression(string exactName, string formatter) => formatter == "!" ? Expression.Not(ValueExpression) : ValueExpression;
+	}
+}
--- a/Source/FileManager/NamingTemplate/ITemplateTag.cs
+++ b/Source/FileManager/NamingTemplate/ITemplateTag.cs
@@ -0,0 +1,6 @@
+namespace FileManager.NamingTemplate;
+
+public interface ITemplateTag
+{
+	string TagName { get; }
+}
--- a/Source/FileManager/NamingTemplate/NamingTemplate.cs
+++ b/Source/FileManager/NamingTemplate/NamingTemplate.cs
@@ -0,0 +1,267 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace FileManager.NamingTemplate;
+
+public class NamingTemplate
+{
+	public string TemplateText { get; private set; }
+	public IEnumerable<ITemplateTag> TagsInUse => _tagsInUse;
+	public IEnumerable<ITemplateTag> TagsRegistered => TagCollections.SelectMany(t => t).DistinctBy(t => t.TagName);
+	public IEnumerable<string> Warnings => errors.Concat(warnings);
+	public IEnumerable<string> Errors => errors;
+
+	private Delegate templateToString;
+	private readonly List<string> warnings = new();
+	private readonly List<string> errors = new();
+	private readonly IEnumerable<TagCollection> TagCollections;
+	private readonly List<ITemplateTag> _tagsInUse = new();
+
+	public const string ERROR_NULL_IS_INVALID = "Null template is invalid.";
+	public const string WARNING_EMPTY = "Template is empty.";
+	public const string WARNING_WHITE_SPACE = "Template is white space.";
+	public const string WARNING_NO_TAGS = "Should use tags. Eg: <title>";
+
+	/// <summary>
+	/// Invoke the <see cref="NamingTemplate"/>
+	/// </summary>
+	/// <param name="propertyClasses">Instances of the TClass used in <see cref="PropertyTagCollection{TClass}"/> and <see cref="ConditionalTagCollection{TClass}"/></param>
+	public TemplatePart Evaluate(params object[] propertyClasses)
+	{
+		// Match propertyClasses to the arguments required by templateToString.DynamicInvoke(). 
+		// First parameter is "this", so ignore it.
+		var delegateArgTypes = templateToString.Method.GetParameters().Skip(1);
+
+		object[] args = delegateArgTypes.Join(propertyClasses, o => o.ParameterType, i => i.GetType(), (_, i) => i).ToArray();
+		
+		if (args.Length != delegateArgTypes.Count())
+			throw new ArgumentException($"This instance of {nameof(NamingTemplate)} requires the following arguments: {string.Join(", ", delegateArgTypes.Select(t => t.Name).Distinct())}");
+
+		return ((TemplatePart)templateToString.DynamicInvoke(args)).FirstPart;
+	}
+
+	/// <summary>Parse a template string to a <see cref="NamingTemplate"/></summary>
+	/// <param name="template">The template string to parse</param>
+	/// <param name="tagCollections">A collection of <see cref="TagCollection"/> with
+	/// properties registered to match to the <paramref name="template"/></param>
+	public static NamingTemplate Parse(string template, IEnumerable<TagCollection> tagCollections)
+	{
+		var namingTemplate = new NamingTemplate(tagCollections);
+		try
+		{
+			BinaryNode intermediate = namingTemplate.IntermediateParse(template);
+			Expression evalTree = GetExpressionTree(intermediate);
+
+			namingTemplate.templateToString = Expression.Lambda(evalTree, tagCollections.Select(tc => tc.Parameter)).Compile();
+		}
+		catch(Exception ex)
+		{
+			namingTemplate.errors.Add(ex.Message);
+		}
+		return namingTemplate;
+	}
+
+	private NamingTemplate(IEnumerable<TagCollection> properties)
+	{
+		TagCollections = properties;
+	}
+
+	/// <summary>Builds an <see cref="Expression"/> tree that will evaluate to a <see cref="TemplatePart"/></summary>
+	private static Expression GetExpressionTree(BinaryNode node)
+	{
+		if (node is null) return TemplatePart.Blank;
+		else if (node.IsValue) return node.Expression;
+		else if (node.IsConditional) return Expression.Condition(node.Expression, concatExpression(node), TemplatePart.Blank);
+		else return concatExpression(node);
+
+		static Expression concatExpression(BinaryNode node)
+			=> TemplatePart.CreateConcatenation(GetExpressionTree(node.LeftChild), GetExpressionTree(node.RightChild));
+	}
+
+	/// <summary>Parse a template string into a <see cref="BinaryNode"/> tree</summary>
+	private BinaryNode IntermediateParse(string templateString)
+	{
+		if (templateString is null)
+			throw new NullReferenceException(ERROR_NULL_IS_INVALID);
+		else if (string.IsNullOrEmpty(templateString))
+			warnings.Add(WARNING_EMPTY);
+		else if (string.IsNullOrWhiteSpace(templateString))
+			warnings.Add(WARNING_WHITE_SPACE);
+
+		TemplateText = templateString;
+
+		BinaryNode topNode = BinaryNode.CreateRoot();
+		BinaryNode currentNode = topNode;
+		List<char> literalChars = new();
+
+		while (templateString.Length > 0)
+		{
+			if (StartsWith(templateString, out string exactPropertyName, out var propertyTag, out var valueExpression))
+			{
+				checkAndAddLiterals();
+
+				if (propertyTag is IClosingPropertyTag)
+					currentNode = currentNode.AddNewNode(BinaryNode.CreateConditional(propertyTag.TemplateTag, valueExpression));
+				else
+				{
+					currentNode = currentNode.AddNewNode(BinaryNode.CreateValue(propertyTag.TemplateTag, valueExpression));
+					_tagsInUse.Add(propertyTag.TemplateTag);
+				}
+
+				templateString = templateString[exactPropertyName.Length..];
+			}
+			else if (StartsWithClosing(templateString, out exactPropertyName, out var closingPropertyTag))
+			{
+				checkAndAddLiterals();
+
+				BinaryNode lastParenth = currentNode;
+
+				while (lastParenth?.IsConditional is false)
+					lastParenth = lastParenth.Parent;
+
+				if (lastParenth?.Parent is null)
+				{
+					warnings.Add($"Missing <{closingPropertyTag.TemplateTag.TagName}-> open conditional.");
+					break;
+				}
+				else if (lastParenth.Name != closingPropertyTag.TemplateTag.TagName)
+				{
+					warnings.Add($"Missing <-{lastParenth.Name}> closing conditional.");
+					break;
+				}
+
+				currentNode = lastParenth.Parent;
+				templateString = templateString[exactPropertyName.Length..];
+			}
+			else
+			{
+				//templateString does not start with a tag, so the first
+				//character is a literal and not part of a tag expression.
+				literalChars.Add(templateString[0]);
+				templateString = templateString[1..];
+			}
+		}
+		checkAndAddLiterals();
+
+		//Check for any conditionals that haven't been closed
+		while (currentNode is not null)
+		{
+			if (currentNode.IsConditional)
+				warnings.Add($"Missing <-{currentNode.Name}> closing conditional.");
+			currentNode = currentNode.Parent;
+		}
+
+		if (!_tagsInUse.Any())
+			warnings.Add(WARNING_NO_TAGS);
+
+		return topNode;
+
+		void checkAndAddLiterals()
+		{
+			if (literalChars.Count != 0)
+			{
+				currentNode = currentNode.AddNewNode(BinaryNode.CreateValue(string.Concat(literalChars)));
+				literalChars.Clear();
+			}
+		}
+	}
+
+	private bool StartsWith(string template, out string exactName, out IPropertyTag propertyTag, out Expression valueExpression)
+	{
+		foreach (var pc in TagCollections)
+		{
+			if (pc.StartsWith(template, out exactName, out propertyTag, out valueExpression))
+				return true;
+		}
+
+		exactName = null;
+		valueExpression = null;
+		propertyTag = null;
+		return false;
+	}
+
+	private bool StartsWithClosing(string template, out string exactName, out IClosingPropertyTag closingPropertyTag)
+	{
+		foreach (var pc in TagCollections)
+		{
+			if (pc.StartsWithClosing(template, out exactName, out closingPropertyTag))
+				return true;
+		}
+
+		exactName = null;
+		closingPropertyTag = null;
+		return false;
+	}
+
+	private class BinaryNode
+	{
+		public string Name { get; }
+		public BinaryNode Parent { get; private set; }
+		public BinaryNode RightChild { get; private set; }
+		public BinaryNode LeftChild { get; private set; }
+		public Expression Expression { get; private init; }
+		public bool IsConditional { get; private init; } = false;
+		public bool IsValue { get; private init; } = false;
+
+		public static BinaryNode CreateRoot() => new("Root");
+
+		public static BinaryNode CreateValue(string literal) => new("Literal")
+		{
+			IsValue = true,
+			Expression = TemplatePart.CreateLiteral(literal)
+		};
+
+		public static BinaryNode CreateValue(ITemplateTag templateTag, Expression property) => new(templateTag.TagName)
+		{
+			IsValue = true,
+			Expression = TemplatePart.CreateProperty(templateTag, property)
+		};
+
+		public static BinaryNode CreateConditional(ITemplateTag templateTag, Expression property) => new(templateTag.TagName)
+		{
+			IsConditional = true,
+			Expression = property
+		};
+
+		private static BinaryNode CreateConcatenation(BinaryNode left, BinaryNode right)
+		{
+			var newNode = new BinaryNode("Concatenation")
+			{
+				LeftChild = left,
+				RightChild = right
+			};
+			newNode.LeftChild.Parent = newNode;
+			newNode.RightChild.Parent = newNode;
+			return newNode;
+		}
+
+		private BinaryNode(string name) => Name = name;
+		public override string ToString() => Name;
+
+		public BinaryNode AddNewNode(BinaryNode newNode)
+		{
+			BinaryNode currentNode = this;
+
+			if (LeftChild is null)
+			{
+				newNode.Parent = currentNode;
+				LeftChild = newNode;
+			}
+			else if (RightChild is null)
+			{
+				newNode.Parent = currentNode;
+				RightChild = newNode;
+			}
+			else
+			{
+				RightChild = CreateConcatenation(RightChild, newNode);
+				RightChild.Parent = currentNode;
+				currentNode = RightChild;
+			}
+
+			return newNode.IsConditional ? newNode : currentNode;
+		}
+	}
+}
--- a/Source/FileManager/NamingTemplate/PropertyTagCollection[TClass].cs
+++ b/Source/FileManager/NamingTemplate/PropertyTagCollection[TClass].cs
@@ -0,0 +1,156 @@
+using Dinah.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+public delegate string PropertyFormatter<T>(ITemplateTag templateTag, T value, string formatString);
+
+public class PropertyTagCollection<TClass> : TagCollection
+{
+	private readonly Dictionary<Type, MulticastDelegate> defaultFormatters = new();
+
+	public PropertyTagCollection(bool caseSensative = true, params MulticastDelegate[] defaultFormatters) : base(typeof(TClass), caseSensative)
+	{
+		foreach (var formatter in defaultFormatters)
+		{
+			var parameters = formatter.Method.GetParameters();
+
+			if (formatter.Method.ReturnType != typeof(string)
+				|| parameters.Length != 3
+				|| parameters[0].ParameterType != typeof(ITemplateTag)
+				|| parameters[2].ParameterType != typeof(string))
+				throw new ArgumentException($"{nameof(defaultFormatters)} must have a signature of [{nameof(String)} PropertyFormatter<T>({nameof(ITemplateTag)}, T, {nameof(String)})]");
+
+			this.defaultFormatters[parameters[1].ParameterType] = formatter;
+		}
+	}
+
+	/// <summary>
+	/// Register a nullable value type <typeparamref name="TClass"/> property.
+	/// </summary>
+	/// <typeparam name="TProperty">Type of the property from <see cref="TClass"/></typeparam>
+	/// <param name="propertyGetter">A Func to get the property value from <see cref="TClass"/></param>
+	/// <param name="formatter">Optional formatting function that accepts the <typeparamref name="TProperty"/> property
+	/// and a formatting string and returnes the value the formatted string. If <see cref="null"/>, use the default
+	/// <typeparamref name="TProperty"/> formatter if present, or <see cref="object.ToString"/></param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty?> propertyGetter, PropertyFormatter<TProperty> formatter = null)
+		where TProperty : struct
+		=> RegisterWithFormatter(templateTag, propertyGetter, formatter);
+
+	/// <summary>
+	/// Register a nullable value type <typeparamref name="TClass"/> property.
+	/// </summary>
+	/// <typeparam name="TProperty">Type of the property from <see cref="TClass"/></typeparam>
+	/// <param name="propertyGetter">A Func to get the string property from <see cref="TClass"/></param>
+	/// <param name="toString">ToString function that accepts the <typeparamref name="TProperty"/> property and returnes a string</param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty?> propertyGetter, Func<TProperty, string> toString)
+		where TProperty : struct
+		=> RegisterWithToString(templateTag, propertyGetter, toString);
+
+	/// <summary>
+	/// Register a <typeparamref name="TClass"/> property
+	/// </summary>
+	/// <typeparam name="TProperty">Type of the property from <see cref="TClass"/></typeparam>
+	/// <param name="propertyGetter">A Func to get the property value from <see cref="TClass"/></param>
+	/// <param name="formatter">Optional formatting function that accepts the <typeparamref name="TProperty"/> property
+	/// and a formatting string and returnes the value formatted to string. If <see cref="null"/>, use the default
+	/// <typeparamref name="TProperty"/> formatter if present, or <see cref="object.ToString"/></param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, PropertyFormatter<TProperty> formatter = null)
+		=> RegisterWithFormatter(templateTag, propertyGetter, formatter);
+
+	/// <summary>
+	/// Register a <typeparamref name="TClass"/> property.
+	/// </summary>
+	/// <typeparam name="TProperty">Type of the property from <see cref="TClass"/></typeparam>
+	/// <param name="propertyGetter">A Func to get the string property from <see cref="TClass"/></param>
+	/// <param name="toString">ToString function that accepts the <typeparamref name="TProperty"/> property and returnes a string</param>
+	public void Add<TProperty>(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, Func<TProperty, string> toString)
+		=> RegisterWithToString(templateTag, propertyGetter, toString);
+
+	private void RegisterWithFormatter<TProperty, TPropertyValue>
+		(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, PropertyFormatter<TPropertyValue> formatter)
+	{
+		ArgumentValidator.EnsureNotNull(templateTag, nameof(templateTag));
+		ArgumentValidator.EnsureNotNull(propertyGetter, nameof(propertyGetter));
+
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+
+		if ((formatter ??= GetDefaultFormatter<TPropertyValue>()) is null)
+			AddPropertyTag(new PropertyTag<TPropertyValue>(templateTag, Options, expr, ToStringFunc));
+		else
+			AddPropertyTag(new PropertyTag<TPropertyValue>(templateTag, Options, expr, formatter));
+	}
+
+	private void RegisterWithToString<TProperty, TPropertyValue>
+		(ITemplateTag templateTag, Func<TClass, TProperty> propertyGetter, Func<TPropertyValue, string> toString)
+	{
+		ArgumentValidator.EnsureNotNull(templateTag, nameof(templateTag));
+		ArgumentValidator.EnsureNotNull(propertyGetter, nameof(propertyGetter));
+
+		var expr = Expression.Call(Expression.Constant(propertyGetter.Target), propertyGetter.Method, Parameter);
+		AddPropertyTag(new PropertyTag<TPropertyValue>(templateTag, Options, expr, toString ?? ToStringFunc));
+	}
+
+	private static string ToStringFunc<T>(T propertyValue) => propertyValue?.ToString() ?? "";
+
+	private PropertyFormatter<T> GetDefaultFormatter<T>()
+	{
+		try
+		{
+			var del = defaultFormatters.FirstOrDefault(kvp => kvp.Key == typeof(T)).Value;
+			return del is null ? null : Delegate.CreateDelegate(typeof(PropertyFormatter<T>), del.Target, del.Method) as PropertyFormatter<T>;
+		}
+		catch { return null; }
+	}
+
+	private class PropertyTag<TPropertyValue> : TagBase
+	{
+		private Func<Expression, string, Expression> CreateToStringExpression { get; }
+
+		public PropertyTag(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, PropertyFormatter<TPropertyValue> formatter)
+			: base(templateTag, propertyGetter)
+		{
+			NameMatcher = new Regex(@$"^<{templateTag.TagName.Replace(" ", "\\s*?")}\s*?(?:\[([^\[\]]*?)\]\s*?)?>", options);
+			CreateToStringExpression = (expVal, format) =>
+				Expression.Call(
+					formatter.Target is null ? null : Expression.Constant(formatter.Target),
+					formatter.Method,
+					Expression.Constant(templateTag),
+					expVal,
+					Expression.Constant(format));
+		}
+
+		public PropertyTag(ITemplateTag templateTag, RegexOptions options, Expression propertyGetter, Func<TPropertyValue, string> toString)
+			: base(templateTag, propertyGetter)
+		{
+			NameMatcher = new Regex(@$"^<{templateTag.TagName.Replace(" ", "\\s*?")}>", options);
+			CreateToStringExpression = (expVal, _) =>
+					Expression.Call(
+						toString.Target is null ? null : Expression.Constant(toString.Target),
+						toString.Method,
+						expVal);
+		}
+
+		protected override Expression GetTagExpression(string exactName, string formatString)
+		{
+			Expression toStringExpression
+				= !ReturnType.IsValueType
+				? Expression.Condition(
+					Expression.Equal(ValueExpression, Expression.Constant(null)),
+					Expression.Constant(""),
+					CreateToStringExpression(ValueExpression, formatString))
+				: Nullable.GetUnderlyingType(ReturnType) is null
+				? CreateToStringExpression(ValueExpression, formatString)
+				: Expression.Condition(
+					Expression.PropertyOrField(ValueExpression, "HasValue"),
+					CreateToStringExpression(Expression.PropertyOrField(ValueExpression, "Value"), formatString),
+					Expression.Constant(""));
+
+			return Expression.TryCatch(toStringExpression, Expression.Catch(typeof(Exception), Expression.Constant(exactName)));
+		}
+	}
+}
--- a/Source/FileManager/NamingTemplate/TagBase.cs
+++ b/Source/FileManager/NamingTemplate/TagBase.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+internal interface IPropertyTag
+{
+	/// <summary>The tag that will be matched in a tag string</summary>
+	ITemplateTag TemplateTag { get; }
+
+	/// <summary><see cref="TemplateTag"/>'s <see cref="Type"/></summary>
+	Type ReturnType { get; }
+
+	/// <summary>The <see cref="Regex"/> used to match <see cref="TemplateTag"/> in template strings.</summary>
+	Regex NameMatcher { get; }
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="TemplateTag"/>, and if it does parse the tag to an <see cref="Expression"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyValue">The <see cref="Expression"/> that returns the property's value</param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	bool StartsWith(string templateString, out string exactName, out Expression propertyValue);
+}
+
+internal abstract class TagBase : IPropertyTag
+{
+	public ITemplateTag TemplateTag { get; }
+	public Regex NameMatcher { get; protected init; }
+	public Type ReturnType => ValueExpression.Type;
+	protected Expression ValueExpression { get; }
+
+	protected TagBase(ITemplateTag templateTag, Expression propertyExpression)
+	{
+		TemplateTag = templateTag;
+		ValueExpression = propertyExpression;
+	}
+
+	/// <summary>Create an <see cref="Expression"/> that returns the property's value.</summary>
+	/// <param name="exactName">The exact string that was matched to <see cref="ITemplateTag"/></param>
+	/// <param name="formatter">The optional format string in the match inside the square brackets</param>
+	protected abstract Expression GetTagExpression(string exactName, string formatter);
+
+	public bool StartsWith(string templateString, out string exactName, out Expression propertyValue)
+	{
+		var match = NameMatcher.Match(templateString);
+		if (match.Success)
+		{
+			exactName = match.Value;
+			propertyValue = GetTagExpression(exactName, match.Groups.Count == 2 ? match.Groups[1].Value.Trim() : "");
+			return true;
+		}
+
+		exactName = null;
+		propertyValue = null;
+		return false;
+	}
+
+	public override string ToString()
+	{
+		return $"[Name = {TemplateTag.TagName}, Type = {ReturnType.Name}]";
+	}
+}
--- a/Source/FileManager/NamingTemplate/TagCollection.cs
+++ b/Source/FileManager/NamingTemplate/TagCollection.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace FileManager.NamingTemplate;
+
+/// <summary>A collection of <see cref="IPropertyTag"/>s registered to a single <see cref="Type"/>.</summary>
+public abstract class TagCollection : IEnumerable<ITemplateTag>
+{
+	/// <summary>The <see cref="ITemplateTag"/>s registered with this <see cref="TagCollection"/> </summary>
+	public IEnumerator<ITemplateTag> GetEnumerator() => PropertyTags.Select(p => p.TemplateTag).GetEnumerator();
+
+	/// <summary>The <see cref="ParameterExpression"/> of the <see cref="TagCollection"/>'s TClass type.</summary>
+	internal ParameterExpression Parameter { get; }
+	protected RegexOptions Options { get; } = RegexOptions.Compiled;
+	private List<IPropertyTag> PropertyTags { get; } = new();
+
+	protected TagCollection(Type classType, bool caseSensative = true)
+	{
+		Parameter = Expression.Parameter(classType, classType.Name);
+		Options |= caseSensative ? RegexOptions.None : RegexOptions.IgnoreCase;
+	}
+
+	/// <summary>
+	/// Determine if the template string starts with any of the <see cref="TemplateTags"/>s' <see cref="ITemplateTag"/> signatures,
+	/// and if it does parse the tag to an <see cref="Expression"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="propertyValue">The <see cref="Expression"/> that returns the <paramref name="propertyTag"/>'s value</param>
+	/// <returns>True if the <paramref name="templateString"/> starts with a tag registered in this class.</returns>
+	internal bool StartsWith(string templateString, out string exactName, out IPropertyTag propertyTag, out Expression propertyValue)
+	{
+		foreach (var p in PropertyTags)
+		{
+			if (p.StartsWith(templateString, out exactName, out propertyValue))
+			{
+				propertyTag = p;
+				return true;
+			}
+		}
+
+		propertyValue = null;
+		propertyTag = null;
+		exactName = null;
+		return false;
+	}
+
+	/// <summary>
+	/// Determine if the template string starts with <see cref="IPropertyTag.TemplateTag"/>'s closing tag signature,
+	/// and if it does output the matching tag's <see cref="ITemplateTag"/>
+	/// </summary>
+	/// <param name="templateString">Template string</param>
+	/// <param name="exactName">The <paramref name="templateString"/> substring that was matched.</param>
+	/// <param name="closingPropertyTag">The registered <see cref="IClosingPropertyTag"/></param>
+	/// <returns>True if the <paramref name="templateString"/> starts with this tag.</returns>
+	internal bool StartsWithClosing(string templateString, out string exactName, out IClosingPropertyTag closingPropertyTag)
+	{
+		foreach (var  cg in PropertyTags.OfType<IClosingPropertyTag>())
+		{
+			if (cg.StartsWithClosing(templateString, out exactName, out closingPropertyTag))
+				return true;
+		}
+
+		closingPropertyTag = null;
+		exactName = null;
+		return false;
+	}
+
+	private protected void AddPropertyTag(IPropertyTag propertyTag)
+	{
+		if (!PropertyTags.Any(c => c.TemplateTag.TagName == propertyTag.TemplateTag.TagName))
+			PropertyTags.Add(propertyTag);
+	}
+
+	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+}
--- a/Source/FileManager/NamingTemplate/TemplatePart.cs
+++ b/Source/FileManager/NamingTemplate/TemplatePart.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace FileManager.NamingTemplate;
+
+/// <summary>Represents one part of an evaluated <see cref="NamingTemplate"/>.</summary>
+public class TemplatePart : IEnumerable<TemplatePart>
+{
+	/// <summary>The <see cref="TemplatePart"/> name. If <see cref="TemplatePart"/> is
+	/// a registered property, this value is <see cref="ITemplateTag.TagName"/></summary>
+	public string TagName { get; }
+
+	/// <summary> The <see cref="IPropertyTag"/>'s <see cref="ITemplateTag"/> if <see cref="TemplatePart"/> is
+	/// a registered property, otherwise <see cref="null"/> for string literals. </summary>
+	public ITemplateTag TemplateTag { get; }
+
+	/// <summary>The evaluated string.</summary>
+	public string Value { get; }
+
+	private TemplatePart previous;
+	private TemplatePart next;
+	private TemplatePart(string name, string value)
+	{
+		TagName = name;
+		Value = value;
+	}
+	private TemplatePart(ITemplateTag templateTag, string value)
+	{
+		TemplateTag = templateTag;
+		TagName = templateTag.TagName;
+		Value = value;
+	}
+
+	internal static Expression Blank
+		=> CreateExpression("Blank", Expression.Constant(""));
+
+	internal static Expression CreateLiteral(string constant)
+		=> CreateExpression("Literal", Expression.Constant(constant));
+
+	internal static Expression CreateProperty(ITemplateTag templateTag, Expression property)
+		=> Expression.New(tagTemplateConstructorInfo, Expression.Constant(templateTag), property);
+
+	internal static Expression CreateConcatenation(Expression left, Expression right)
+	{
+		if (left.Type != typeof(TemplatePart) || right.Type != typeof(TemplatePart))
+			throw new InvalidOperationException($"Cannot concatenate expressions of types {left.Type.Name} and {right.Type.Name}");
+		return Expression.Add(left, right, addMethodInfo);
+	}
+
+	private static Expression CreateExpression(string name, Expression value)
+		=> Expression.New(constructorInfo, Expression.Constant(name), value);
+
+	private static readonly ConstructorInfo constructorInfo
+		= typeof(TemplatePart).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, new Type[] { typeof(string), typeof(string) });
+
+	private static readonly ConstructorInfo tagTemplateConstructorInfo
+		= typeof(TemplatePart).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, new Type[] { typeof(ITemplateTag), typeof(string)	});
+
+	private static readonly MethodInfo addMethodInfo
+		= typeof(TemplatePart).GetMethod(nameof(Concatenate), BindingFlags.NonPublic | BindingFlags.Static, new Type[] { typeof(TemplatePart), typeof(TemplatePart) });
+
+	public IEnumerator<TemplatePart> GetEnumerator()
+	{
+		var firstPart = FirstPart;
+
+		do
+		{
+			if (firstPart.TemplateTag is not null || firstPart.TagName is not "Blank")
+				yield return firstPart;
+			firstPart = firstPart.next;
+		}
+		while (firstPart is not null);
+	}
+
+	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+	internal TemplatePart FirstPart
+	{
+		get
+		{
+			var part = this;
+			while (part.previous is not null)
+				part = part.previous;
+			return part;
+		}
+	}
+
+	private TemplatePart LastPart
+	{
+		get
+		{
+			var part = this;
+			while (part.next is not null)
+				part = part.next;
+			return part;
+		}
+	}
+
+	private static TemplatePart Concatenate(TemplatePart left, TemplatePart right)
+	{
+		var last = left.LastPart;
+		last.next = right;
+		right.previous = last;
+		return left.FirstPart;
+	}
+}
--- a/Source/FileManager/_InternalsVisible.cs
+++ b/Source/FileManager/_InternalsVisible.cs
@@ -1 +0,0 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileManager) + ".Tests")]
--- a/Source/HangoverAvalonia/ViewModels/MainVM.Database.cs
+++ b/Source/HangoverAvalonia/ViewModels/MainVM.Database.cs
@@ -17,7 +17,7 @@ namespace HangoverAvalonia.ViewModels

 		private void Load_databaseVM()
 		{
-			_tab = new(new(() => SqlQuery, s => SqlResults = s, s => SqlResults = s));
+			_tab = new(new DatabaseTabCommands(() => SqlQuery, s => SqlResults += s, s => SqlResults = s));

 			_tab.LoadDatabaseFile();
 			if (_tab.DbFile is null)
--- a/Source/HangoverWinForms/HangoverWinForms.csproj
+++ b/Source/HangoverWinForms/HangoverWinForms.csproj
@@ -4,6 +4,7 @@
    <OutputType>WinExe</OutputType>
    <TargetFramework>net7.0-windows</TargetFramework>
    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+	<AssemblyName>Hangover</AssemblyName>
    <UseWindowsForms>true</UseWindowsForms>
    <ApplicationIcon>hangover.ico</ApplicationIcon>
    <ImplicitUsings>enable</ImplicitUsings>
--- a/Source/Libation.sln
+++ b/Source/Libation.sln
@@ -93,6 +93,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MacOSConfigApp", "LoadByOS\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsConfigApp", "LoadByOS\WindowsConfigApp\WindowsConfigApp.csproj", "{5F65A509-26E3-4B02-B403-EEB6F0EF391F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationUiBase", "LibationUiBase\LibationUiBase.csproj", "{E90C4651-AF11-41B4-A839-10082D0391F9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hangover", "Hangover", "{FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation UI", "Libation UI", "{53758A35-1C7E-4702-9B96-433ABA457B37}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libation CLI", "Libation CLI", "{47E27674-595D-4F7A-8CFB-127E768E1D1E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -207,6 +215,10 @@ Global
 		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F65A509-26E3-4B02-B403-EEB6F0EF391F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E90C4651-AF11-41B4-A839-10082D0391F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E90C4651-AF11-41B4-A839-10082D0391F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E90C4651-AF11-41B4-A839-10082D0391F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E90C4651-AF11-41B4-A839-10082D0391F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -218,21 +230,21 @@ Global
 		{393B5B27-D15C-4F77-9457-FA14BA8F3C73} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{06882742-27A6-4347-97D9-56162CEC9C11} = {F0CBB7A7-D3FB-41FF-8F47-CF3F6A592249}
 		{2E1F5DB4-40CC-4804-A893-5DCE0193E598} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
-		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6} = {53758A35-1C7E-4702-9B96-433ABA457B37}
 		{401865F5-1942-4713-B230-04544C0A97B0} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{B95650EA-25F0-449E-BA5D-99126BC5D730} = {41CDCC73-9B81-49DD-9570-C54406E852AF}
 		{C5B21768-C7C9-4FCB-AC1E-187B223D5A98} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{428163C3-D558-4914-B570-A92069521877} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{428163C3-D558-4914-B570-A92069521877} = {47E27674-595D-4F7A-8CFB-127E768E1D1E}
 		{595E7C4D-506D-486D-98B7-5FDDF398D033} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 		{E86014F9-E4B3-4CD4-A210-2B3DB571DD86} = {43E3ACB3-E0BC-4370-8DBB-E3720C8C8FD1}
 		{788294BE-0D8E-40D4-9CEE-67896FBB52CE} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{5B8FC827-BF58-4CB1-A59E-BDEB9C62A05E} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
-		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{F612D06F-3134-4B9B-95CD-EB3FC798AE60} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{8A7B01D3-9830-44FD-91A1-D8D010996BEB} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
-		{5C7005BA-7D83-4E99-8073-D970943A7D61} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60} = {53758A35-1C7E-4702-9B96-433ABA457B37}
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
+		{5C7005BA-7D83-4E99-8073-D970943A7D61} = {FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE}
 		{59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F} = {185AC9FF-381E-4AA1-B649-9771F4917214}
 		{CC275937-DFE4-4383-B1BF-1D5D42B70C98} = {59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}
 		{47325742-5B38-48E7-95FB-CD94E6E07332} = {59DF46F3-ECD0-43CA-AD12-3FEE8FCF9E4F}
@@ -241,6 +253,10 @@ Global
 		{357DF797-4EC2-4DBD-A4BD-D045277F2666} = {9B906374-1142-4D69-86FF-B384806CA5FE}
 		{ECED4E13-B676-4277-8A8F-C8B2507B7D8C} = {9B906374-1142-4D69-86FF-B384806CA5FE}
 		{5F65A509-26E3-4B02-B403-EEB6F0EF391F} = {9B906374-1142-4D69-86FF-B384806CA5FE}
+		{E90C4651-AF11-41B4-A839-10082D0391F9} = {53758A35-1C7E-4702-9B96-433ABA457B37}
+		{FDDABAFE-35AD-42FC-AC95-0B1FE0DF0DDE} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{53758A35-1C7E-4702-9B96-433ABA457B37} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{47E27674-595D-4F7A-8CFB-127E768E1D1E} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}
--- a/Source/LibationAvalonia/App.axaml.cs
+++ b/Source/LibationAvalonia/App.axaml.cs
@@ -11,7 +11,6 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.IO;
 using ApplicationServices;
-using Dinah.Core;

 namespace LibationAvalonia
 {
@@ -53,7 +52,7 @@ namespace LibationAvalonia
 					// check for existing settings in default location
 					var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
 					if (Configuration.SettingsFileIsValid(defaultSettingsFile))
-						config.SetLibationFiles(defaultLibationFilesDir);
+						Configuration.SetLibationFiles(defaultLibationFilesDir);

 					if (config.LibationSettingsAreValid)
 					{
@@ -86,7 +85,7 @@ namespace LibationAvalonia
 				// - error message, Exit()
 				if (setupDialog.IsNewUser)
 				{
-					setupDialog.Config.SetLibationFiles(Configuration.UserProfile);
+					Configuration.SetLibationFiles(Configuration.UserProfile);
 					ShowSettingsWindow(desktop, setupDialog.Config, OnSettingsCompleted);
 				}
 				else if (setupDialog.IsReturningUser)
@@ -178,7 +177,7 @@ namespace LibationAvalonia

 		private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
 		{
-			config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+			Configuration.SetLibationFiles(libationFilesDialog.SelectedDirectory);
 			if (config.LibationSettingsAreValid)
 			{
 				await RunMigrationsAsync(config);
--- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
@@ -105,6 +105,8 @@ namespace LibationAvalonia.Dialogs

 			public BookDetailsDialogViewModel(LibraryBook libraryBook)
 			{
+				var Book = libraryBook.Book;
+
 				//init tags
 				Tags = libraryBook.Book.UserDefinedItem.Tags;

@@ -115,14 +117,15 @@ namespace LibationAvalonia.Dialogs

 				//init book details
 				DetailsText = @$"
-Title: {libraryBook.Book.Title}
-Author(s): {libraryBook.Book.AuthorNames()}
-Narrator(s): {libraryBook.Book.NarratorNames()}
-Length: {(libraryBook.Book.LengthInMinutes == 0 ? "" : $"{libraryBook.Book.LengthInMinutes / 60} hr {libraryBook.Book.LengthInMinutes % 60} min")}
-Audio Bitrate: {libraryBook.Book.AudioFormat}
-Category: {string.Join(" > ", libraryBook.Book.CategoriesNames())}
+Title: {Book.Title}
+Author(s): {Book.AuthorNames()}
+Narrator(s): {Book.NarratorNames()}
+Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min")}
+Audio Bitrate: {Book.AudioFormat}
+Category: {string.Join(" > ", Book.CategoriesNames())}
 Purchase Date: {libraryBook.DateAdded:d}
-Audible ID: {libraryBook.Book.AudibleProductId}
+Language: {Book.Language}
+Audible ID: {Book.AudibleProductId}
 ".Trim();

 				var seriesNames = libraryBook.Book.SeriesNames();
--- a/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs
@@ -11,14 +11,12 @@ using ReactiveUI;
 using Avalonia.Controls.Documents;
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml.Templates;

 namespace LibationAvalonia.Dialogs
 {
 	public partial class EditTemplateDialog : DialogWindow
 	{
-		// final value. post-validity check
-		public string TemplateText { get; private set; }
-
 		private EditTemplateViewModel _viewModel;

 		public EditTemplateDialog()
@@ -28,20 +26,21 @@ namespace LibationAvalonia.Dialogs
 			if (Design.IsDesignMode)
 			{
 				_ = Configuration.Instance.LibationFiles;
-				_viewModel = new(Configuration.Instance, Templates.File);
-				_viewModel.resetTextBox(_viewModel.Template.DefaultTemplate);
-				Title = $"Edit {_viewModel.Template.Name}";
+				var editor = TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(Configuration.Instance.Books, Configuration.Instance.FileTemplate);
+				_viewModel = new(Configuration.Instance, editor);
+				_viewModel.resetTextBox(editor.EditingTemplate.TemplateText);
+				Title = $"Edit {editor.TemplateName}";
 				DataContext = _viewModel;
 			}
 		}

-		public EditTemplateDialog(Templates template, string inputTemplateText) : this()
+		public EditTemplateDialog(ITemplateEditor templateEditor) : this()
 		{
-			ArgumentValidator.EnsureNotNull(template, nameof(template));
+			ArgumentValidator.EnsureNotNull(templateEditor, nameof(templateEditor));

-			_viewModel = new EditTemplateViewModel(Configuration.Instance, template);
-			_viewModel.resetTextBox(inputTemplateText);
-			Title = $"Edit {template.Name}";
+			_viewModel = new EditTemplateViewModel(Configuration.Instance, templateEditor);
+			_viewModel.resetTextBox(templateEditor.EditingTemplate.TemplateText);
+			Title = $"Edit {templateEditor.TemplateName}";
 			DataContext = _viewModel;
 		}

@@ -64,7 +63,6 @@ namespace LibationAvalonia.Dialogs
 			if (!await _viewModel.Validate())
 				return;

-			TemplateText = _viewModel.workingTemplateText;
 			await base.SaveAndCloseAsync();
 		}

@@ -72,23 +70,25 @@ namespace LibationAvalonia.Dialogs
 			=> await SaveAndCloseAsync();

 		public void ResetButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> _viewModel.resetTextBox(_viewModel.Template.DefaultTemplate);
+			=> _viewModel.resetTextBox(_viewModel.TemplateEditor.DefaultTemplate);

 		private class EditTemplateViewModel : ViewModels.ViewModelBase
 		{
 			private readonly Configuration config;
 			public FontFamily FontFamily { get; } = FontManager.Current.DefaultFontFamilyName;
 			public InlineCollection Inlines { get; } = new();
-			public Templates Template { get; }
-			public EditTemplateViewModel(Configuration configuration, Templates templates)
+			public ITemplateEditor TemplateEditor { get; }
+			public EditTemplateViewModel(Configuration configuration, ITemplateEditor templates)
 			{
 				config = configuration;
-				Template = templates;
-				Description = templates.Description;
+				TemplateEditor = templates;
+				Description = templates.TemplateDescription;
 				ListItems
 				= new AvaloniaList<Tuple<string, string, string>>(
-					Template
-					.GetTemplateTags()
+					TemplateEditor
+					.EditingTemplate
+					.TagsRegistered
+					.Cast<TemplateTags>()
 					.Select(
 						t => new Tuple<string, string, string>(
 							$"<{t.TagName.Replace("->", "-\x200C>").Replace("<-", "<\x200C-")}>",
@@ -111,7 +111,6 @@ namespace LibationAvalonia.Dialogs
 				}
 			}

-			public string workingTemplateText => Template.Sanitize(UserTemplateText, Configuration.Instance.ReplacementCharacters);
 			private string _warningText;
 			public string WarningText { get => _warningText; set => this.RaiseAndSetIfChanged(ref _warningText, value); }

@@ -123,77 +122,22 @@ namespace LibationAvalonia.Dialogs

 			public async Task<bool> Validate()
 			{
-				if (Template.IsValid(workingTemplateText))
+				if (TemplateEditor.EditingTemplate.IsValid)
 					return true;
-				var errors = Template
-					.GetErrors(workingTemplateText)
-					.Select(err => $"- {err}")
-					.Aggregate((a, b) => $"{a}\r\n{b}");
+
+				var errors
+					= TemplateEditor
+						.EditingTemplate
+						.Errors
+						.Select(err => $"- {err}")
+						.Aggregate((a, b) => $"{a}\r\n{b}");
 				await MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return false;
 			}

 			private void templateTb_TextChanged()
 			{
-				var isChapterTitle = Template == Templates.ChapterTitle;
-				var isFolder = Template == Templates.Folder;
-
-				var libraryBookDto = new LibraryBookDto
-				{
-					Account = "my account",
-					DateAdded = new DateTime(2022, 6, 9, 0, 0, 0),
-					DatePublished = new DateTime(2017, 2, 27, 0, 0, 0),
-					AudibleProductId = "123456789",
-					Title = "A Study in Scarlet: A Sherlock Holmes Novel",
-					Locale = "us",
-					YearPublished = 2017,
-					Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
-					Narrators = new List<string> { "Stephen Fry" },
-					SeriesName = "Sherlock Holmes",
-					SeriesNumber = "1",
-					BitRate = 128,
-					SampleRate = 44100,
-					Channels = 2
-				};
-				var chapterName = "A Flight for Life";
-				var chapterNumber = 4;
-				var chaptersTotal = 10;
-
-				var partFileProperties = new AaxDecrypter.MultiConvertFileProperties()
-				{
-					OutputFileName = "",
-					PartsPosition = chapterNumber,
-					PartsTotal = chaptersTotal,
-					Title = chapterName
-				};
-
-				/*
-				* Path must be rooted for windows to allow long file paths. This is
-				* only necessary for folder templates because they may contain several
-				* subdirectories. Without rooting, we won't be allowed to create a
-				* relative path longer than MAX_PATH.
-				*/
-
-				var books = config.Books;
-				var folder = Templates.Folder.GetPortionFilename(
-					libraryBookDto,
-					Path.Combine(books, isFolder ? workingTemplateText : config.FolderTemplate), "");
-
-				folder = Path.GetRelativePath(books, folder);
-
-				var file
-				= Template == Templates.ChapterFile
-				? Templates.ChapterFile.GetPortionFilename(
-					libraryBookDto,
-					workingTemplateText,
-					partFileProperties,
-					"")
-				: Templates.File.GetPortionFilename(
-					libraryBookDto,
-					isFolder ? config.FileTemplate : workingTemplateText, "");
-				var ext = config.DecryptToLossy ? "mp3" : "m4b";
-
-				var chapterTitle = Templates.ChapterTitle.GetPortionTitle(libraryBookDto, workingTemplateText, partFileProperties);
+				TemplateEditor.SetTemplateText(UserTemplateText);

 				const char ZERO_WIDTH_SPACE = '\u200B';
 				var sing = $"{Path.DirectorySeparatorChar}";
@@ -206,11 +150,12 @@ namespace LibationAvalonia.Dialogs
 				string slashWrap(string val) => val.Replace(sing, $"{ZERO_WIDTH_SPACE}{sing}");

 				WarningText
-					= !Template.HasWarnings(workingTemplateText)
+					= !TemplateEditor.EditingTemplate.HasWarnings
 					? ""
 					: "Warning:\r\n" +
-						Template
-						.GetWarnings(workingTemplateText)
+						TemplateEditor
+						.EditingTemplate
+						.Warnings
 						.Select(err => $"- {err}")
 						.Aggregate((a, b) => $"{a}\r\n{b}");

@@ -219,20 +164,24 @@ namespace LibationAvalonia.Dialogs

 				Inlines.Clear();

-				if (isChapterTitle)
+				if (!TemplateEditor.IsFilePath)
 				{
-					Inlines.Add(new Run(chapterTitle) { FontWeight = bold });
+					Inlines.Add(new Run(TemplateEditor.GetName()) { FontWeight = bold });
 					return;
 				}

-				Inlines.Add(new Run(slashWrap(books)) { FontWeight = reg });
+				var folder = TemplateEditor.GetFolderName();
+				var file = TemplateEditor.GetFileName();
+				var ext = config.DecryptToLossy ? "mp3" : "m4b";
+
+				Inlines.Add(new Run(slashWrap(TemplateEditor.BaseDirectory.PathWithoutPrefix)) { FontWeight = reg });
 				Inlines.Add(new Run(sing) { FontWeight = reg });

-				Inlines.Add(new Run(slashWrap(folder)) { FontWeight = isFolder ? bold : reg });
+				Inlines.Add(new Run(slashWrap(folder)) { FontWeight = TemplateEditor.IsFolder ? bold : reg });

 				Inlines.Add(new Run(sing));

-				Inlines.Add(new Run(slashWrap(file)) { FontWeight = isFolder ? reg : bold });
+				Inlines.Add(new Run(slashWrap(file)) { FontWeight = TemplateEditor.IsFolder ? reg : bold });

 				Inlines.Add(new Run($".{ext}"));
 			}
--- a/Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml
@@ -0,0 +1,30 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450"
+		Width="600" Height="450"
+		x:Class="LibationAvalonia.Dialogs.LocateAudiobooksDialog"
+        Title="Locate Audiobooks"
+		WindowStartupLocation="CenterOwner"
+		Icon="/Assets/libation.ico">
+
+	<Grid Margin="5" ColumnDefinitions="*,Auto" RowDefinitions="Auto,*">
+		<TextBlock Grid.Column="0" Text="Found Audiobooks" />
+		<StackPanel Grid.Column="1"  Orientation="Horizontal">
+
+			<TextBlock Text="IDs Found: " />
+			<TextBlock Text="{Binding FoundAsins}" />
+		</StackPanel>
+		<ListBox Margin="0,5,0,0" Grid.Row="1" Grid.ColumnSpan="2" Name="foundAudiobooksLB" Items="{Binding FoundFiles}" AutoScrollToSelectedItem="true">
+			<ListBox.ItemTemplate>
+				<DataTemplate>
+					<Grid ColumnDefinitions="Auto,*">
+						<TextBlock Grid.Column="0" Margin="0,0,10,0" Text="{Binding Item1}" />
+						<TextBlock Grid.Column="1" Text="{Binding Item2}" />
+					</Grid>
+				</DataTemplate>
+			</ListBox.ItemTemplate>
+		</ListBox>
+	</Grid>
+</Window>
--- a/Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml.cs
@@ -0,0 +1,115 @@
+using ApplicationServices;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Platform.Storage.FileIO;
+using DataLayer;
+using LibationAvalonia.ViewModels;
+using LibationFileManager;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class LocateAudiobooksDialog : DialogWindow
+	{
+		private event EventHandler<FilePathCache.CacheEntry> FileFound;
+		private readonly CancellationTokenSource tokenSource = new();
+		private readonly List<string> foundAsins = new();
+		private readonly LocatedAudiobooksViewModel _viewModel;
+		public LocateAudiobooksDialog()
+		{
+			InitializeComponent();
+
+			DataContext = _viewModel = new();
+			this.RestoreSizeAndLocation(Configuration.Instance);
+
+			if (Design.IsDesignMode)
+			{
+				_viewModel.FoundFiles.Add(new("[0000001]", "Filename 1.m4b"));
+				_viewModel.FoundFiles.Add(new("[0000002]", "Filename 2.m4b"));
+			}
+			else
+			{
+				Opened += LocateAudiobooksDialog_Opened;
+				FileFound += LocateAudiobooks_FileFound;
+				Closing += LocateAudiobooksDialog_Closing;
+			}
+		}
+
+		private void LocateAudiobooksDialog_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			tokenSource.Cancel();
+			//If this dialog is closed before it's completed, Closing is fired
+			//once for the form closing and again for the MessageBox closing.
+			Closing -= LocateAudiobooksDialog_Closing;
+			this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
+		private void LocateAudiobooks_FileFound(object sender, FilePathCache.CacheEntry e)
+		{
+			var newItem = new Tuple<string,string>($"[{e.Id}]", Path.GetFileName(e.Path));
+			_viewModel.FoundFiles.Add(newItem);
+			foundAudiobooksLB.SelectedItem = newItem;
+
+			if (!foundAsins.Any(asin => asin == e.Id))
+			{
+				foundAsins.Add(e.Id);
+				_viewModel.FoundAsins = foundAsins.Count;
+			}
+		}
+
+		private async void LocateAudiobooksDialog_Opened(object sender, EventArgs e)
+		{
+			var folderPicker = new FolderPickerOpenOptions
+			{
+				Title = "Select the folder to search for audiobooks",
+				AllowMultiple = false,
+				SuggestedStartLocation = new BclStorageFolder(Configuration.Instance.Books.PathWithoutPrefix) 
+			};
+
+			var selectedFolder = await StorageProvider.OpenFolderPickerAsync(folderPicker);
+
+			if (selectedFolder.FirstOrDefault().TryGetUri(out var uri) is not true || !Directory.Exists(uri.LocalPath))
+			{
+				await CancelAndCloseAsync();
+				return;
+			}
+
+			using var context = DbContexts.GetContext();
+
+			await foreach (var book in AudioFileStorage.FindAudiobooksAsync(uri.LocalPath, tokenSource.Token))
+			{
+				try
+				{
+					FilePathCache.Insert(book);
+
+					var lb = context.GetLibraryBook_Flat_NoTracking(book.Id);
+					if (lb.Book.UserDefinedItem.BookStatus is not LiberatedStatus.Liberated)
+						await Task.Run(() => lb.UpdateBookStatus(LiberatedStatus.Liberated));
+
+					FileFound?.Invoke(this, book);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Error(ex, "Error adding found audiobook file to Libation. {@audioFile}", book);
+				}
+			}
+
+			await MessageBox.Show(this, $"Libation has found {foundAsins.Count} unique audiobooks and added them to its database. ", $"Found {foundAsins.Count} Audiobooks");
+			await SaveAndCloseAsync();
+		}
+	}
+
+	public class LocatedAudiobooksViewModel : ViewModelBase
+	{
+		private int _foundAsins = 0;
+		public AvaloniaList<Tuple<string, string>> FoundFiles { get; } = new();
+		public int FoundAsins { get => _foundAsins; set => this.RaiseAndSetIfChanged(ref _foundAsins, value); }
+	}
+}
--- a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
@@ -35,13 +35,13 @@
 			</DockPanel.Styles>
 			<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="5" DockPanel.Dock="Bottom">
 				<Button Grid.Column="0" MinWidth="75" MinHeight="28" Name="Button1" Click="Button1_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" Text="{Binding Button1Text}"/>
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button1Text}"/>
 				</Button>
 				<Button Grid.Column="1" IsVisible="{Binding HasButton2}" MinWidth="75" MinHeight="28" Name="Button2" Click="Button2_Click" Margin="5">
-					<TextBlock VerticalAlignment="Center" Text="{Binding Button2Text}"/>
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button2Text}"/>
 				</Button>
 				<Button Grid.Column="2" IsVisible="{Binding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Content="Cancel" Margin="5">
-					<TextBlock VerticalAlignment="Center" Text="{Binding Button3Text}"/>
+					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button3Text}"/>
 				</Button>
 			</StackPanel>
 		</DockPanel>
--- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs
@@ -52,21 +52,22 @@ namespace LibationAvalonia.Dialogs

 		public async void EditFolderTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			var newTemplate = await editTemplate(Templates.Folder, settingsDisp.DownloadDecryptSettings.FolderTemplate);
+			var newTemplate = await editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.FolderTemplate));
 			if (newTemplate is not null)
 				settingsDisp.DownloadDecryptSettings.FolderTemplate = newTemplate;
 		}

 		public async void EditFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var newTemplate = await editTemplate(Templates.File, settingsDisp.DownloadDecryptSettings.FileTemplate);
+		{			
+			var newTemplate = await editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.FileTemplate));
 			if (newTemplate is not null)
 				settingsDisp.DownloadDecryptSettings.FileTemplate = newTemplate;
 		}

 		public async void EditChapterFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			var newTemplate = await editTemplate(Templates.ChapterFile, settingsDisp.DownloadDecryptSettings.ChapterFileTemplate);
+			
+			var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.ChapterFileTemplate));
 			if (newTemplate is not null)
 				settingsDisp.DownloadDecryptSettings.ChapterFileTemplate = newTemplate;
 		}
@@ -79,16 +80,16 @@ namespace LibationAvalonia.Dialogs

 		public async void EditChapterTitleTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			var newTemplate = await editTemplate(Templates.ChapterTitle, settingsDisp.AudioSettings.ChapterTitleTemplate);
+			var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(settingsDisp.AudioSettings.ChapterTitleTemplate));
 			if (newTemplate is not null)
 				settingsDisp.AudioSettings.ChapterTitleTemplate = newTemplate;
 		}

-		private async Task<string> editTemplate(Templates template, string existingTemplate)
+		private async Task<string> editTemplate(ITemplateEditor template)
 		{
-			var form = new EditTemplateDialog(template, existingTemplate);
+			var form = new EditTemplateDialog(template);
 			if (await form.ShowDialog<DialogResult>(this) == DialogResult.OK)
-				return form.TemplateText;
+				return template.EditingTemplate.TemplateText;
 			else return null;
 		}
 	}
@@ -266,28 +267,8 @@ namespace LibationAvalonia.Dialogs
 			UseCoverAsFolderIcon = config.UseCoverAsFolderIcon;
 		}

-		public async Task<bool> SaveSettingsAsync(Configuration config)
+		public Task<bool> SaveSettingsAsync(Configuration config)
 		{
-			static Task validationError(string text, string caption)
-				=> MessageBox.Show(text, caption, MessageBoxButtons.OK, MessageBoxIcon.Error);
-
-			// these 3 should do nothing. Configuration will only init these with a valid value. EditTemplateDialog ensures valid before returning
-			if (!Templates.Folder.IsValid(FolderTemplate))
-			{
-				await validationError($"Not saving change to folder naming template. Invalid format.", "Invalid folder template");
-				return false;
-			}
-			if (!Templates.File.IsValid(FileTemplate))
-			{
-				await validationError($"Not saving change to file naming template. Invalid format.", "Invalid file template");
-				return false;
-			}
-			if (!Templates.ChapterFile.IsValid(ChapterFileTemplate))
-			{
-				await validationError($"Not saving change to chapter file naming template. Invalid format.", "Invalid chapter file template");
-				return false;
-			}
-
 			config.BadBook
 				= BadBookAbort ? Configuration.BadBookAction.Abort
 				: BadBookRetry ? Configuration.BadBookAction.Retry
@@ -301,7 +282,7 @@ namespace LibationAvalonia.Dialogs

 			config.UseCoverAsFolderIcon = UseCoverAsFolderIcon;

-			return true;
+			return Task.FromResult(true);
 		}

 		public string UseCoverAsFolderIconText { get; } = Configuration.GetDescription(nameof(Configuration.UseCoverAsFolderIcon));
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -9,9 +9,7 @@
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<ApplicationIcon>libation.ico</ApplicationIcon>
 		<AssemblyName>Libation</AssemblyName>
-
 		<IsPublishable>true</IsPublishable>
-
 		<PublishReadyToRun>true</PublishReadyToRun>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -82,12 +80,6 @@
 		<None Remove="Assets\up.png" />
 	</ItemGroup>

-	<ItemGroup>
-		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
-		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
-		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
 			<DesignTime>True</DesignTime>
@@ -117,24 +109,13 @@
 		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview4 " />
 		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
 		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview4" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview4" />
 		<PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
 	</ItemGroup>

-
 	<ItemGroup>
-		<None Update="glass-with-glow_256.svg">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-		<None Update="Libation.desktop">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-		<None Update="ZipExtractor.exe">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
+	  <ProjectReference Include="..\LibationUiBase\LibationUiBase.csproj" />
 	</ItemGroup>

-
 	<Target Name="SpicNSpan" AfterTargets="Clean">
 		<!-- Remove obj folder -->
 		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
--- a/Source/LibationAvalonia/LogMe.cs
+++ b/Source/LibationAvalonia/LogMe.cs
@@ -1,58 +0,0 @@
-using Avalonia.Threading;
-using System;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia
-{
-	public interface ILogForm
-	{
-		void WriteLine(string text);
-	}
-
-	// decouple serilog and form. include convenience factory method
-	public class LogMe
-	{
-		public event EventHandler<string> LogInfo;
-		public event EventHandler<string> LogErrorString;
-		public event EventHandler<(Exception, string)> LogError;
-
-		private LogMe()
-		{
-			LogInfo += (_, text) => Serilog.Log.Logger.Information($"Automated backup: {text}");
-			LogErrorString += (_, text) => Serilog.Log.Logger.Error(text);
-			LogError += (_, tuple) => Serilog.Log.Logger.Error(tuple.Item1, tuple.Item2 ?? "Automated backup: error");
-		}
-		private static ILogForm LogForm;
-		public static LogMe RegisterForm<T>(T form) where T : ILogForm
-		{
-			var logMe = new LogMe();
-
-			if (form is null)
-				return logMe;
-
-			LogForm = form;
-
-			logMe.LogInfo += LogMe_LogInfo;
-			logMe.LogErrorString += LogMe_LogErrorString;
-			logMe.LogError += LogMe_LogError;
-
-			return logMe;
-		}
-
-		private static async void LogMe_LogError(object sender, (Exception, string) tuple)
-		{
-			await Dispatcher.UIThread.InvokeAsync(() => LogForm?.WriteLine(tuple.Item2 ?? "Automated backup: error"));
-			await Dispatcher.UIThread.InvokeAsync(() => LogForm?.WriteLine("ERROR: " + tuple.Item1.Message));
-		}
-
-		private static async void LogMe_LogErrorString(object sender, string text)
-			=> await Dispatcher.UIThread.InvokeAsync(() => LogForm?.WriteLine(text));
-
-		private static async void LogMe_LogInfo(object sender, string text)
-			=> await Dispatcher.UIThread.InvokeAsync(() => LogForm?.WriteLine(text));
-
-		public void Info(string text) => LogInfo?.Invoke(this, text);
-		public void Error(string text) => LogErrorString?.Invoke(this, text);
-		public void Error(Exception ex, string text = null) => LogError?.Invoke(this, (ex, text));
-	}
-}
--- a/Source/LibationAvalonia/MessageBox.cs
+++ b/Source/LibationAvalonia/MessageBox.cs
@@ -154,6 +154,7 @@ Libation.

 		private static async Task<DialogResult> ShowCoreAsync(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)
 		{
+			owner = owner?.IsLoaded is true ? owner : null;
 			var dialog = await Dispatcher.UIThread.InvokeAsync(() => CreateMessageBox(owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition));

 			return await DisplayWindow(dialog, owner);
--- a/Source/LibationAvalonia/Program.cs
+++ b/Source/LibationAvalonia/Program.cs
@@ -2,6 +2,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using ApplicationServices;
 using Avalonia;
@@ -13,8 +14,30 @@ namespace LibationAvalonia
 {
 	static class Program
 	{
-		static void Main()
+		static void Main(string[] args)
 		{
+
+			if (Configuration.IsMacOs && args?.Length > 0 && args[0] == "hangover")
+			{
+				//Launch the Hangover app within the sandbox
+				//We can do this because we're already executing inside the sandbox.
+				//Any process created in the sandbox executes in the same sandbox.
+				//Unfortunately, all sandbox files are read/execute, so no writing!
+
+				Assembly asm = Assembly.GetExecutingAssembly();
+				string path = Path.GetDirectoryName(asm.Location);
+				Process.Start("Hangover" + (Configuration.IsWindows ? ".exe" : ""));
+				return;
+			}
+			if (Configuration.IsMacOs && args?.Length > 0 && args[0] == "cli")
+			{
+				//Open a new Terminal in the sandbox
+				Assembly asm2 = Assembly.GetExecutingAssembly();
+				string libationProgramFiles = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+				Process.Start("/System/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal", $"\"{libationProgramFiles}\"");
+				return;
+			}
+
 			//***********************************************//
 			//                                               //
 			//   do not use Configuration before this line   //
--- a/Source/LibationAvalonia/ViewModels/GridEntry.cs
+++ b/Source/LibationAvalonia/ViewModels/GridEntry.cs
@@ -4,6 +4,7 @@ using DataLayer;
 using Dinah.Core;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;
 using System;
 using System.Collections;
@@ -130,8 +131,17 @@ namespace LibationAvalonia.ViewModels
 		}

 		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
-		{
-			if (e.Definition.PictureId == Book.PictureId)
+        {
+            // state validation
+            if (e is null ||
+                e.Definition.PictureId is null ||
+                Book?.PictureId is null ||
+                e.Picture is null ||
+                e.Picture.Length == 0)
+                return;
+
+            // logic validation
+            if (e.Definition.PictureId == Book.PictureId)
 			{
 				using var ms = new System.IO.MemoryStream(e.Picture);
 				Cover = new Avalonia.Media.Imaging.Bitmap(ms);
--- a/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
@@ -12,6 +12,7 @@ using Dinah.Core;
 using Dinah.Core.ErrorHandling;
 using FileLiberator;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;

 namespace LibationAvalonia.ViewModels
@@ -394,7 +395,7 @@ $@"  Title: {libraryBook.Book.Title}
 			return ProcessBookResult.FailedRetry;
 		}

-		private string SkipDialogText => @"
+		private static string SkipDialogText => @"
 An error occurred while trying to process this book.
 {0}

@@ -404,9 +405,9 @@ An error occurred while trying to process this book.

 - IGNORE: Permanently ignore this book. Continue processing books. (Will not try this book again later.)
 ".Trim();
-		private MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
-		private MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
-		private DialogResult SkipResult => DialogResult.Ignore;
+		private static MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
+		private static MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
+		private static DialogResult SkipResult => DialogResult.Ignore;
 	}

 	#endregion
--- a/Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using DataLayer;
 using LibationFileManager;
+using LibationUiBase;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;
@@ -43,11 +44,11 @@ namespace LibationAvalonia.ViewModels
 		private bool _progressBarVisible;
 		private decimal _speedLimit;

-		public int CompletedCount { get => _completedCount; private set { this.RaiseAndSetIfChanged(ref _completedCount, value); this.RaisePropertyChanged(nameof(AnyCompleted)); } }
-		public int QueuedCount { get => _queuedCount; private set { this.RaiseAndSetIfChanged(ref _queuedCount, value); this.RaisePropertyChanged(nameof(AnyQueued)); } }
-		public int ErrorCount { get => _errorCount; private set { this.RaiseAndSetIfChanged(ref _errorCount, value); this.RaisePropertyChanged(nameof(AnyErrors)); } }
-		public string RunningTime { get => _runningTime; set { this.RaiseAndSetIfChanged(ref _runningTime, value); } }
-		public bool ProgressBarVisible { get => _progressBarVisible; set { this.RaiseAndSetIfChanged(ref _progressBarVisible, value); } }
+		public int CompletedCount { get => _completedCount; private set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _completedCount, value); this.RaisePropertyChanged(nameof(AnyCompleted)); }); }
+		public int QueuedCount { get => _queuedCount; private set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _queuedCount, value); this.RaisePropertyChanged(nameof(AnyQueued)); }); }
+		public int ErrorCount { get => _errorCount; private set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _errorCount, value); this.RaisePropertyChanged(nameof(AnyErrors)); }); }
+		public string RunningTime { get => _runningTime; set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _runningTime, value); }); }
+		public bool ProgressBarVisible { get => _progressBarVisible; set => Dispatcher.UIThread.Post(() => { this.RaiseAndSetIfChanged(ref _progressBarVisible, value); }); }
 		public bool AnyCompleted => CompletedCount > 0;
 		public bool AnyQueued => QueuedCount > 0;
 		public bool AnyErrors => ErrorCount > 0;
@@ -77,8 +78,11 @@ namespace LibationAvalonia.ViewModels
 					: _speedLimit > 1 ? 0.1m
 					: 0.01m;

-				this.RaisePropertyChanged(nameof(SpeedLimitIncrement));
-				this.RaisePropertyChanged();
+				Dispatcher.UIThread.Post(() =>
+				   {
+					   this.RaisePropertyChanged(nameof(SpeedLimitIncrement));
+					   this.RaisePropertyChanged();
+				   });
 			}
 		}

@@ -91,12 +95,12 @@ namespace LibationAvalonia.ViewModels

 			ErrorCount = errCount;
 			CompletedCount = completeCount;
-			this.RaisePropertyChanged(nameof(Progress));
+			Dispatcher.UIThread.Post(() => this.RaisePropertyChanged(nameof(Progress)));
 		}
 		private void Queue_QueuededCountChanged(object sender, int cueCount)
 		{
 			QueuedCount = cueCount;
-			this.RaisePropertyChanged(nameof(Progress));
+			Dispatcher.UIThread.Post(() => this.RaisePropertyChanged(nameof(Progress)));
 		}

 		public void WriteLine(string text)
--- a/Source/LibationAvalonia/Views/MainWindow.Export.cs
+++ b/Source/LibationAvalonia/Views/MainWindow.Export.cs
@@ -1,6 +1,7 @@
 using ApplicationServices;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using FileManager;
 using LibationFileManager;
 using System;
 using System.Linq;
@@ -19,15 +20,15 @@ namespace LibationAvalonia.Views
 				var options = new FilePickerSaveOptions
 				{
 					Title = "Where to export Library",
-					SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books),
-					SuggestedFileName = $"Libation Library Export {DateTime.Now:yyyy-MM-dd}.xlsx",
+					SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books.PathWithoutPrefix),
+					SuggestedFileName = $"Libation Library Export {DateTime.Now:yyyy-MM-dd}",
 					DefaultExtension = "xlsx",
 					ShowOverwritePrompt = true,
 					FileTypeChoices = new FilePickerFileType[]
 					{
-						new("Excel Workbook (*.xlsx)") { Patterns = new[] { "xlsx" } },
-						new("CSV files (*.csv)") { Patterns = new[] { "csv" } },
-						new("JSON files (*.json)") { Patterns = new[] { "json" } },
+						new("Excel Workbook (*.xlsx)") { Patterns = new[] { "*.xlsx" } },
+						new("CSV files (*.csv)") { Patterns = new[] { "*.csv" } },
+						new("JSON files (*.json)") { Patterns = new[] { "*.json" } },
 						new("All files (*.*)") { Patterns = new[] { "*" } },
 					}
 				};
@@ -36,17 +37,17 @@ namespace LibationAvalonia.Views

 				if (selectedFile?.TryGetUri(out var uri) is not true) return;

-				var ext = System.IO.Path.GetExtension(uri.LocalPath);
+				var ext = FileUtility.GetStandardizedExtension(System.IO.Path.GetExtension(uri.LocalPath));
 				switch (ext)
 				{
-					case "xlsx": // xlsx
+					case ".xlsx": // xlsx
 					default:
 						LibraryExporter.ToXlsx(uri.LocalPath);
 						break;
-					case "csv": // csv
+					case ".csv": // csv
 						LibraryExporter.ToCsv(uri.LocalPath);
 						break;
-					case "json": // json
+					case ".json": // json
 						LibraryExporter.ToJson(uri.LocalPath);
 						break;
 				}
--- a/Source/LibationAvalonia/Views/MainWindow.ScanManual.cs
+++ b/Source/LibationAvalonia/Views/MainWindow.ScanManual.cs
@@ -1,6 +1,7 @@
 using ApplicationServices;
 using AudibleUtilities;
 using Avalonia.Controls;
+using LibationAvalonia.Dialogs;
 using LibationFileManager;
 using System;
 using System.Collections.Generic;
@@ -77,5 +78,11 @@ namespace LibationAvalonia.Views
 					ex);
 			}
 		}
+
+		private async void locateAudiobooksToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			var locateDialog = new LocateAudiobooksDialog();
+			await locateDialog.ShowDialog(this);
+		}
 	}
 }
--- a/Source/LibationAvalonia/Views/MainWindow.Settings.cs
+++ b/Source/LibationAvalonia/Views/MainWindow.Settings.cs
@@ -1,5 +1,5 @@
-using System;
-using System.Linq;
+using LibationFileManager;
+using System;

 namespace LibationAvalonia.Views
 {
@@ -16,5 +16,17 @@ namespace LibationAvalonia.Views

 		public async void aboutToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> await MessageBox.Show($"Libation {AppScaffolding.LibationScaffolding.Variety}{Environment.NewLine}Version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
+
+		public void launchHangoverToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			try
+			{
+				System.Diagnostics.Process.Start("Hangover" + (Configuration.IsWindows ? ".exe" : ""));
+			}
+			catch(Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Failed to launch Hangover");
+			}
+		}
 	}
 }
--- a/Source/LibationAvalonia/Views/MainWindow.Update.cs
+++ b/Source/LibationAvalonia/Views/MainWindow.Update.cs
@@ -14,7 +14,7 @@ namespace LibationAvalonia.Views
 			Opened += async (_, _) => await checkForUpdates();
 		}

-        private async Task checkForUpdates()
+		private async Task checkForUpdates()
 		{
 			async Task<string> downloadUpdate(UpgradeProperties upgradeProperties)
 			{
@@ -26,7 +26,7 @@ namespace LibationAvalonia.Views

 				//Silently download the update in the background, save it to a temp file.

-				var zipFile = Path.GetTempFileName();
+				var zipFile = Path.Combine(Path.GetTempPath(), Path.GetFileName(upgradeProperties.ZipUrl));
 				try
 				{
 					System.Net.Http.HttpClient cli = new();
@@ -42,36 +42,6 @@ namespace LibationAvalonia.Views
 				return zipFile;
 			}

-			void runWindowsUpgrader(string zipFile)
-			{
-				var thisExe = Environment.ProcessPath;
-				var thisDir = Path.GetDirectoryName(thisExe);
-
-				var zipExtractor = Path.Combine(Path.GetTempPath(), "ZipExtractor.exe");
-
-				File.Copy("ZipExtractor.exe", zipExtractor, overwrite: true);
-
-				var psi = new System.Diagnostics.ProcessStartInfo()
-				{
-					FileName = zipExtractor,
-					UseShellExecute = true,
-					Verb = "runas",
-					WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal,
-					CreateNoWindow = true,
-					ArgumentList =
-					{
-						"--input",
-						zipFile,
-						"--output",
-						thisDir,
-						"--executable",
-						thisExe
-					}
-				};
-
-				System.Diagnostics.Process.Start(psi);
-			}
-
 			try
 			{
 				var upgradeProperties = await Task.Run(LibationScaffolding.GetLatestRelease);
@@ -83,26 +53,22 @@ namespace LibationAvalonia.Views
 				if (config.GetString(propertyName: ignoreUpdate) == upgradeProperties.LatestRelease.ToString())
 					return;

-				var notificationResult = await new UpgradeNotificationDialog(upgradeProperties, Configuration.IsWindows).ShowDialog<DialogResult>(this);
+				var interop = InteropFactory.Create();
+
+				var notificationResult = await new UpgradeNotificationDialog(upgradeProperties, interop.CanUpdate).ShowDialog<DialogResult>(this);

 				if (notificationResult == DialogResult.Ignore)
 					config.SetString(upgradeProperties.LatestRelease.ToString(), ignoreUpdate);

-				if (notificationResult != DialogResult.OK || !Configuration.IsWindows) return;
+				if (notificationResult != DialogResult.OK) return;

 				//Download the update file in the background,
-				//then wire up installaion on window close.
+				string updateBundle = await downloadUpdate(upgradeProperties);

-				string zipFile = await downloadUpdate(upgradeProperties);
+				if (string.IsNullOrEmpty(updateBundle) || !File.Exists(updateBundle)) return;

-				if (string.IsNullOrEmpty(zipFile) || !File.Exists(zipFile))
-					return;
-
-				Closed += (_, _) =>
-				{
-					if (File.Exists(zipFile))
-						runWindowsUpgrader(zipFile);
-				};
+				//Install the update
+				interop.InstallUpdate(updateBundle);
 			}
 			catch (Exception ex)
 			{
--- a/Source/LibationAvalonia/Views/MainWindow.axaml
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml
@@ -51,6 +51,9 @@
 						<MenuItem IsVisible="{Binding OneAccount}" IsEnabled="{Binding RemoveMenuItemsEnabled}" Click="removeLibraryBooksToolStripMenuItem_Click" Header="_Remove Library Books" />
 						<MenuItem IsVisible="{Binding MultipleAccounts}" IsEnabled="{Binding RemoveMenuItemsEnabled}" Click="removeAllAccountsToolStripMenuItem_Click" Header="_Remove Books from All Accounts" />
 						<MenuItem IsVisible="{Binding MultipleAccounts}" IsEnabled="{Binding RemoveMenuItemsEnabled}" Click="removeSomeAccountsToolStripMenuItem_Click" Header="_Remove Books from Some Accounts" />
+						
+						<Separator />
+						<MenuItem Click="locateAudiobooksToolStripMenuItem_Click" Header="L_ocate Audiobooks" />

 					</MenuItem>
 					
@@ -128,6 +131,8 @@
 						<MenuItem Click="accountsToolStripMenuItem_Click" Header="_Accounts..." />
 						<MenuItem Click="basicSettingsToolStripMenuItem_Click" Header="_Settings..." />
 						<Separator />
+						<MenuItem Click="launchHangoverToolStripMenuItem_Click" Header="Launch _Hangover" />
+						<Separator />
 						<MenuItem Click="aboutToolStripMenuItem_Click" Header="A_bout..." />
 					</MenuItem>
 				</Menu>
--- a/Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
@@ -1,10 +1,10 @@
-using Avalonia;
 using System;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using LibationAvalonia.ViewModels;
 using ApplicationServices;
 using DataLayer;
+using LibationUiBase;

 namespace LibationAvalonia.Views
 {
--- a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
@@ -5,6 +5,7 @@ using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 using DataLayer;
 using LibationAvalonia.ViewModels;
+using LibationUiBase;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
--- a/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using ApplicationServices;
 using Avalonia;
 using Avalonia.Controls;
@@ -100,9 +101,9 @@ namespace LibationAvalonia.Views
                setNotDownloadMenuItem.Click += (_, __) => entry.Book.UpdateBookStatus(LiberatedStatus.NotLiberated);

                var removeMenuItem = new MenuItem() { Header = "_Remove from library" };
-                removeMenuItem.Click += (_, __) => LibraryCommands.RemoveBook(entry.AudibleProductId);
+				removeMenuItem.Click += async (_, __) => await Task.Run(() => LibraryCommands.RemoveBook(entry.AudibleProductId));

-                var locateFileMenuItem = new MenuItem() { Header = "_Locate file..." };
+				var locateFileMenuItem = new MenuItem() { Header = "_Locate file..." };
                locateFileMenuItem.Click += async (_, __) =>
                {
                    try
@@ -111,7 +112,7 @@ namespace LibationAvalonia.Views
 						{
 							Title = $"Locate the audio file for '{entry.Book.Title}'",
 							AllowMultiple = false,
-							SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books),
+							SuggestedStartLocation = new Avalonia.Platform.Storage.FileIO.BclStorageFolder(Configuration.Instance.Books.PathWithoutPrefix),
 							FileTypeFilter = new FilePickerFileType[]
 							{
 								new("All files (*.*)") { Patterns = new[] { "*" } },
--- a/Source/LibationFileManager/AudibleFileStorage.cs
+++ b/Source/LibationFileManager/AudibleFileStorage.cs
@@ -2,7 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
+using Dinah.Core;
+using System.Threading.Tasks;
+using System.Threading;
 using FileManager;

 namespace LibationFileManager
@@ -104,8 +108,14 @@ namespace LibationFileManager

        private static BackgroundFileSystem BookDirectoryFiles { get; set; }
        private static object bookDirectoryFilesLocker { get; } = new();
+		private static EnumerationOptions enumerationOptions { get; } = new()
+		{
+			RecurseSubdirectories = true,
+			IgnoreInaccessible = true,
+			MatchCasing = MatchCasing.CaseInsensitive
+		};

-        protected override LongPath GetFilePathCustom(string productId)
+		protected override LongPath GetFilePathCustom(string productId)
            => GetFilePathsCustom(productId).FirstOrDefault();

        protected override List<LongPath> GetFilePathsCustom(string productId)
@@ -122,5 +132,40 @@ namespace LibationFileManager
        public void Refresh() => BookDirectoryFiles.RefreshFiles();

        public LongPath GetPath(string productId) => GetFilePath(productId);
+
+		public static async IAsyncEnumerable<FilePathCache.CacheEntry> FindAudiobooksAsync(LongPath searchDirectory, [EnumeratorCancellation] CancellationToken cancellationToken)
+		{
+			ArgumentValidator.EnsureNotNull(searchDirectory, nameof(searchDirectory));
+
+			foreach (LongPath path in Directory.EnumerateFiles(searchDirectory, "*.M4B", enumerationOptions))
+			{
+				if (cancellationToken.IsCancellationRequested)
+					yield break;
+
+				FilePathCache.CacheEntry audioFile = default;
+
+				try
+				{
+					using var fileStream = File.OpenRead(path);
+
+					var mp4File = await Task.Run(() => new AAXClean.Mp4File(fileStream), cancellationToken);
+
+					if (mp4File?.AppleTags?.Asin is not null)
+						audioFile = new FilePathCache.CacheEntry(mp4File.AppleTags.Asin, FileType.Audio, path);
+
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Error(ex, "Error checking for asin in {@file}", path);
+				}
+				finally
+				{
+					GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
+				}
+
+				if (audioFile is not null)
+					yield return audioFile;
+			}
+		}
 	}
 }
--- a/Source/LibationFileManager/Configuration.LibationFiles.cs
+++ b/Source/LibationFileManager/Configuration.LibationFiles.cs
@@ -5,20 +5,22 @@ using FileManager;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 using Serilog;
+using Dinah.Core.Logging;

 namespace LibationFileManager
 {
    public partial class Configuration
    {
-        private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "appsettings.json");
-        private const string LIBATION_FILES_KEY = "LibationFiles";
+        public static string AppsettingsJsonFile { get; } = getOrCreateAppsettingsFile();
+
+		private const string LIBATION_FILES_KEY = "LibationFiles";

        [Description("Location for storage of program-created files")]
        public string LibationFiles
        {
            get
            {
-                if (libationFilesPathCache is not null)
+				if (libationFilesPathCache is not null)
                    return libationFilesPathCache;

                // FIRST: must write here before SettingsFilePath in next step reads cache
@@ -44,54 +46,93 @@ namespace LibationFileManager

        private static string libationFilesPathCache { get; set; }

-        private string getLibationFilesSettingFromJson()
+		/// <summary>
+		/// Try to find appsettings.json in the following locations:
+		///  <list type="number">
+		///		<item>
+		///			<description>[App Directory]</description>
+		///		</item>
+		///		<item>
+		///			<description>%LocalAppData%\Libation</description>
+		///		</item>
+		///		<item>
+		///			<description>%AppData%\Libation</description>
+		///		</item>
+		///		<item>
+		///			<description>%Temp%\Libation</description>
+		///		</item>
+		///  </list>   
+		///    
+		/// If not found, try to create it in each of the same locations in-order until successful.
+		///  
+		/// <para>This method must complete successfully for Libation to continue.</para>
+		/// </summary>
+		/// <returns>appsettings.json file path</returns>
+		/// <exception cref="ApplicationException">appsettings.json could not be found or created.</exception>
+		private static string getOrCreateAppsettingsFile()
+		{
+			const string appsettings_filename = "appsettings.json";
+
+			//Possible appsettings.json locations, in order of preference.
+			string[] possibleAppsettingsFiles = new[]
+			{
+				Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), appsettings_filename),
+				Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Libation", appsettings_filename),
+				Path.Combine(UserProfile, appsettings_filename),
+				Path.Combine(Path.GetTempPath(), "Libation", appsettings_filename)
+			};
+
+			//Try to find and validate appsettings.json in each folder
+			foreach (var appsettingsFile in possibleAppsettingsFiles)
+			{
+				if (File.Exists(appsettingsFile))
+				{
+					try
+					{
+						var appSettings = JObject.Parse(File.ReadAllText(appsettingsFile));
+
+						if (appSettings.ContainsKey(LIBATION_FILES_KEY)
+							&& appSettings[LIBATION_FILES_KEY] is JValue jval
+							&& jval.Value is string settingsPath
+							&& !string.IsNullOrWhiteSpace(settingsPath))
+							return appsettingsFile;
+					}
+					catch { }
+				}
+			}
+
+			//Valid appsettings.json not found. Try to create it in each folder.
+			var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile } }.ToString(Formatting.Indented);
+			foreach (var appsettingsFile in possibleAppsettingsFiles)
+			{
+				try
+				{
+					File.WriteAllText(appsettingsFile, endingContents);
+					return appsettingsFile;
+				}
+				catch(Exception ex)
+				{
+					Log.Logger.TryLogError(ex, $"Failed to create {appsettingsFile}");
+				}
+			}
+
+			throw new ApplicationException($"Could not locate or create {appsettings_filename}");
+		}
+
+		private static string getLibationFilesSettingFromJson()
        {
-            string startingContents = null;
-            try
-            {
-                if (File.Exists(APPSETTINGS_JSON))
-                {
-                    startingContents = File.ReadAllText(APPSETTINGS_JSON);
-                    var startingJObj = JObject.Parse(startingContents);
-
-                    if (startingJObj.ContainsKey(LIBATION_FILES_KEY))
-                    {
-                        var startingValue = startingJObj[LIBATION_FILES_KEY].Value<string>();
-                        if (!string.IsNullOrWhiteSpace(startingValue))
-                            return startingValue;
-                    }
-                }
-            }
-            catch { }
-
-            // not found. write to file. read from file
-            var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile.ToString() } }.ToString(Formatting.Indented);
-            if (startingContents != endingContents)
-            {
-                File.WriteAllText(APPSETTINGS_JSON, endingContents);
-                System.Threading.Thread.Sleep(100);
-            }
-
            // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
            // verify from live file. no try/catch. want failures to be visible
-            var jObjFinal = JObject.Parse(File.ReadAllText(APPSETTINGS_JSON));
+            var jObjFinal = JObject.Parse(File.ReadAllText(AppsettingsJsonFile));
            var valueFinal = jObjFinal[LIBATION_FILES_KEY].Value<string>();
            return valueFinal;
        }

-        public void SetLibationFiles(string directory)
+        public static void SetLibationFiles(string directory)
        {
-            // ensure exists
-            if (!File.Exists(APPSETTINGS_JSON))
-            {
-                // getter creates new file, loads PersistentDictionary
-                var _ = LibationFiles;
-                System.Threading.Thread.Sleep(100);
-            }
-
            libationFilesPathCache = null;

-            var startingContents = File.ReadAllText(APPSETTINGS_JSON);
+            var startingContents = File.ReadAllText(AppsettingsJsonFile);
            var jObj = JObject.Parse(startingContents);

            jObj[LIBATION_FILES_KEY] = directory;
@@ -100,14 +141,17 @@ namespace LibationFileManager
            if (startingContents == endingContents)
                return;

-            // now it's set in the file again but no settings have moved yet
-            File.WriteAllText(APPSETTINGS_JSON, endingContents);
-
            try
            {
-                Log.Logger.Information("Libation files changed {@DebugInfo}", new { APPSETTINGS_JSON, LIBATION_FILES_KEY, directory });
-            }
-            catch { }
-        }
+                // now it's set in the file again but no settings have moved yet
+                File.WriteAllText(AppsettingsJsonFile, endingContents);
+
+				Log.Logger.TryLogInformation("Libation files changed {@DebugInfo}", new { AppsettingsJsonFile, LIBATION_FILES_KEY, directory });
+			}
+			catch (IOException ex)
+			{
+                Log.Logger.TryLogError(ex, "Failed to change Libation files location {@DebugInfo}", new { AppsettingsJsonFile, LIBATION_FILES_KEY, directory });
+			}
+		}
    }
 }
--- a/Source/LibationFileManager/Configuration.PersistentSettings.cs
+++ b/Source/LibationFileManager/Configuration.PersistentSettings.cs
@@ -80,7 +80,7 @@ namespace LibationFileManager
 		public bool BetaOptIn { get => GetNonString(defaultValue: false); set => SetNonString(value); }

 		[Description("Location for book storage. Includes destination of newly liberated books")]
-		public string Books { get => GetString(); set => SetString(value); }
+		public LongPath Books { get => GetString(); set => SetString(value); }

 		// temp/working dir(s) should be outside of dropbox
 		[Description("Temporary location of files while they're in process of being downloaded and decrypted.\r\nWhen decryption is complete, the final file will be in Books location\r\nRecommend not using a folder which is backed up real time. Eg: Dropbox, iCloud, Google Drive")]
@@ -223,36 +223,41 @@ namespace LibationFileManager
 		[Description("How to format the folders in which files will be saved")]
 		public string FolderTemplate
 		{
-			get => Templates.Folder.GetValid(GetString(defaultValue: Templates.Folder.DefaultTemplate));
-			set => setTemplate(Templates.Folder, value);
+			get => getTemplate<Templates.FolderTemplate>();
+			set => setTemplate<Templates.FolderTemplate>(value);
 		}

 		[Description("How to format the saved pdf and audio files")]
 		public string FileTemplate
 		{
-			get => Templates.File.GetValid(GetString(defaultValue: Templates.File.DefaultTemplate));
-			set => setTemplate(Templates.File, value);
+			get => getTemplate<Templates.FileTemplate>();
+			set => setTemplate<Templates.FileTemplate>(value);
 		}

 		[Description("How to format the saved audio files when split by chapters")]
 		public string ChapterFileTemplate
 		{
-			get => Templates.ChapterFile.GetValid(GetString(defaultValue: Templates.ChapterFile.DefaultTemplate));
-			set => setTemplate(Templates.ChapterFile, value);
+			get => getTemplate<Templates.ChapterFileTemplate>();
+			set => setTemplate<Templates.ChapterFileTemplate>(value);
 		}

 		[Description("How to format the file's Tile stored in metadata")]
 		public string ChapterTitleTemplate
 		{
-			get => Templates.ChapterTitle.GetValid(GetString(defaultValue: Templates.ChapterTitle.DefaultTemplate));
-			set => setTemplate(Templates.ChapterTitle, value);
+			get => getTemplate<Templates.ChapterTitleTemplate>();
+			set => setTemplate<Templates.ChapterTitleTemplate>(value);
 		}

-		private void setTemplate(Templates templ, string newValue, [CallerMemberName] string propertyName = "")
+		private string getTemplate<T>([CallerMemberName] string propertyName = "")
+			where T : Templates, ITemplate, new()
 		{
-			var template = newValue?.Trim();
-			if (templ.IsValid(template))
-				SetString(template, propertyName);
+			return Templates.GetTemplate<T>(GetString(defaultValue: T.DefaultTemplate, propertyName)).TemplateText;
+		}
+
+		private void setTemplate<T>(string newValue, [CallerMemberName] string propertyName = "")
+			where T : Templates, ITemplate, new()
+		{
+			SetString(Templates.GetTemplate<T>(newValue).TemplateText, propertyName);
 		}
 		#endregion
 	}
--- a/Source/LibationFileManager/Configuration.PropertyChange.cs
+++ b/Source/LibationFileManager/Configuration.PropertyChange.cs
@@ -2,7 +2,7 @@

 namespace LibationFileManager
 {
-	public partial class Configuration : PropertyChangeFilter
+	public partial class Configuration
 	{
 		/*
 		 * Use this type in the getter for any Dictionary<TKey, TValue> settings,
--- a/Source/LibationFileManager/Configuration.cs
+++ b/Source/LibationFileManager/Configuration.cs
@@ -7,11 +7,9 @@ using FileManager;

 namespace LibationFileManager
 {
-	public partial class Configuration
+	public partial class Configuration : PropertyChangeFilter
 	{
-		public bool LibationSettingsAreValid
-			=> File.Exists(APPSETTINGS_JSON)
-			&& SettingsFileIsValid(SettingsFilePath);
+		public bool LibationSettingsAreValid => SettingsFileIsValid(SettingsFilePath);

 		public static bool SettingsFileIsValid(string settingsFile)
 		{
--- a/Source/LibationFileManager/FilePathCache.cs
+++ b/Source/LibationFileManager/FilePathCache.cs
@@ -86,7 +86,11 @@ namespace LibationFileManager
        public static void Insert(string id, string path)
 		{
 			var type = FileTypes.GetFileTypeFromPath(path);
-			var entry = new CacheEntry(id, type, path);
+			Insert(new CacheEntry(id, type, path));
+		}
+
+		public static void Insert(CacheEntry entry)
+		{
 			cache.Add(entry);
 			Inserted?.Invoke(null, entry);
 			save();
--- a/Source/LibationFileManager/IInteropFunctions.cs
+++ b/Source/LibationFileManager/IInteropFunctions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;

 namespace LibationFileManager
 {
@@ -6,6 +7,8 @@ namespace LibationFileManager
    {
        void SetFolderIcon(string image, string directory);
        void DeleteFolderIcon(string directory);
-        void CopyTextToClipboard(string text);
+        Process RunAsRoot(string exe, string args);
+        void InstallUpdate(string updateBundle);
+        bool CanUpdate { get; }
    }
 }
--- a/Source/LibationFileManager/LibationFileManager.csproj
+++ b/Source/LibationFileManager/LibationFileManager.csproj
@@ -6,6 +6,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="NameParserSharp" Version="1.5.0" />
    <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
  </ItemGroup>

--- a/Source/LibationFileManager/LibraryBookDto.cs
+++ b/Source/LibationFileManager/LibraryBookDto.cs
@@ -20,14 +20,16 @@ namespace LibationFileManager
        public string FirstNarrator => Narrators.FirstOrDefault();

        public string SeriesName { get; set; }
-        public string SeriesNumber { get; set; }
+        public int? SeriesNumber { get; set; }
+        public bool IsSeries => !string.IsNullOrEmpty(SeriesName);
+        public bool IsPodcast { get; set; }

        public int BitRate { get; set; }
        public int SampleRate { get; set; }
        public int Channels { get; set; }
 		public DateTime FileDate { get; set; } = DateTime.Now;
        public DateTime? DatePublished { get; set; }
-
+        public string Language { get; set; }
 	}

    public class LibraryBookDto : BookDto
--- a/Source/LibationFileManager/NameListFormat.cs
+++ b/Source/LibationFileManager/NameListFormat.cs
@@ -0,0 +1,95 @@
+using FileManager.NamingTemplate;
+using NameParser;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace LibationFileManager
+{
+	internal partial class NameListFormat
+	{
+		public static string Formatter(ITemplateTag _, IEnumerable<string> names, string formatString)
+		{
+			var humanNames = names.Select(n => new HumanName(RemoveSuffix(n), Prefer.FirstOverPrefix));
+
+			var sortedNames = Sort(humanNames, formatString);
+			var nameFormatString = Format(formatString, defaultValue: "{T} {F} {M} {L} {S}");
+			var separatorString = Separator(formatString, defaultValue: ", ");
+			var maxNames = Max(formatString, defaultValue: humanNames.Count());
+
+			var formattedNames = string.Join(separatorString, sortedNames.Take(maxNames).Select(n => FormatName(n, nameFormatString)));
+
+			while (formattedNames.Contains("  "))
+				formattedNames = formattedNames.Replace("  ", " ");
+
+			return formattedNames;
+		}
+
+		private static string RemoveSuffix(string namesString)
+		{
+			namesString = namesString.Replace('’', '\'').Replace(" - Ret.", ", Ret.");
+			int dashIndex = namesString.IndexOf(" - ");
+			return (dashIndex > 0 ? namesString[..dashIndex] : namesString).Trim();
+		}
+
+		private static IEnumerable<HumanName> Sort(IEnumerable<HumanName> humanNames, string formatString)
+		{
+			var sortMatch = SortRegex().Match(formatString);
+			return
+				sortMatch.Success
+				? sortMatch.Groups[1].Value == "F" ? humanNames.OrderBy(n => n.First)
+					: sortMatch.Groups[1].Value == "M" ? humanNames.OrderBy(n => n.Middle)
+					: sortMatch.Groups[1].Value == "L" ? humanNames.OrderBy(n => n.Last)
+					: humanNames
+				: humanNames;
+		}
+
+		private static string Format(string formatString, string defaultValue)
+		{
+			var formatMatch = FormatRegex().Match(formatString);
+			return formatMatch.Success ? formatMatch.Groups[1].Value : defaultValue;
+		}
+
+		private static string Separator(string formatString, string defaultValue)
+		{
+			var separatorMatch = SeparatorRegex().Match(formatString);
+			return separatorMatch.Success ? separatorMatch.Groups[1].Value : defaultValue;
+		}
+
+		private static int Max(string formatString, int defaultValue)
+		{
+			var maxMatch = MaxRegex().Match(formatString);
+			return maxMatch.Success && int.TryParse(maxMatch.Groups[1].Value, out var max) ? int.Max(1, max) : defaultValue;
+		}
+
+		private static string FormatName(HumanName humanName, string nameFormatString)
+		{
+			//Single-word names parse as first names. Use it as last name.
+			var lastName = string.IsNullOrWhiteSpace(humanName.Last) ? humanName.First : humanName.Last;
+
+			nameFormatString
+				= nameFormatString
+				.Replace("{T}", "{0}")
+				.Replace("{F}", "{1}")
+				.Replace("{M}", "{2}")
+				.Replace("{L}", "{3}")
+				.Replace("{S}", "{4}");
+
+			return string.Format(nameFormatString, humanName.Title, humanName.First, humanName.Middle, lastName, humanName.Suffix).Trim();
+		}
+
+		/// <summary> Sort must have exactly one of the characters F, M, or L </summary>
+		[GeneratedRegex(@"[Ss]ort\(\s*?([FML])\s*?\)")]
+		private static partial Regex SortRegex();
+		/// <summary> Format must have at least one of the string {T}, {F}, {M}, {L}, or {S} </summary>
+		[GeneratedRegex(@"[Ff]ormat\((.*?(?:{[TFMLS]})+.*?)\)")]
+		private static partial Regex FormatRegex();
+		/// <summary> Separator can be anything </summary>
+		[GeneratedRegex(@"[Ss]eparator\((.*?)\)")]
+		private static partial Regex SeparatorRegex();
+		/// <summary> Max must have a 1 or 2-digit number </summary>
+		[GeneratedRegex(@"[Mm]ax\(\s*?(\d{1,2})\s*?\)")]
+		private static partial Regex MaxRegex();
+	}
+}
--- a/Source/LibationFileManager/NullInteropFunctions.cs
+++ b/Source/LibationFileManager/NullInteropFunctions.cs
@@ -1,14 +1,18 @@
 using System;
+using System.Diagnostics;

 namespace LibationFileManager
 {
    public class NullInteropFunctions : IInteropFunctions
    {
-        public NullInteropFunctions() { }
+
+		public NullInteropFunctions() { }
        public NullInteropFunctions(params object[] values) { }

        public void SetFolderIcon(string image, string directory) => throw new PlatformNotSupportedException();
        public void DeleteFolderIcon(string directory) => throw new PlatformNotSupportedException();
-        public void CopyTextToClipboard(string text) => throw new PlatformNotSupportedException();
-    }
+		public bool CanUpdate => throw new PlatformNotSupportedException();
+		public Process RunAsRoot(string exe, string args) => throw new PlatformNotSupportedException();
+		public void InstallUpdate(string updateBundle) => throw new PlatformNotSupportedException();
+	}
 }
--- a/Source/LibationFileManager/PropertyChangeFilter.cs
+++ b/Source/LibationFileManager/PropertyChangeFilter.cs
@@ -1,326 +0,0 @@
-using Dinah.Core;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-
-namespace LibationFileManager
-{
-	#region Useage
-
-	/*
-	 * USEAGE
-	 
-		*************************
-		*						*
-		*   Event Filter Mode   *
-		*						*
-		*************************
-
-	 
-	 	propertyChangeFilter.PropertyChanged += MyPropertiesChanged;
-
-		[PropertyChangeFilter("MyProperty1")]
-		[PropertyChangeFilter("MyProperty2")]
-		void MyPropertiesChanged(object sender, PropertyChangedEventArgsEx e)
-		{
-			// Only properties whose names match either "MyProperty1"
-			// or "MyProperty2" will fire this event handler.
-		}
-
-	******
-	* OR *
-	******
-	
-		propertyChangeFilter.PropertyChanged +=
-			[PropertyChangeFilter("MyProperty1")]
-			[PropertyChangeFilter("MyProperty2")]
-			(_, _) => 
-			{
-				// Only properties whose names match either "MyProperty1"
-				// or "MyProperty2" will fire this event handler.
-			};
-
-
-		*************************
-		*						*
-		*    Observable Mode	*
-		*						*
-		*************************
-		
-		using var cancellation = propertyChangeFilter.ObservePropertyChanging<int>("MyProperty", MyPropertyChanging);
-		
-        void MyPropertyChanging(int oldValue, int newValue)
-        {
-			// Only the property whose name match
-			// "MyProperty" will fire this method.
-        }
-	
-		//The observer is delisted when cancellation is disposed
-
-	******
-	* OR *
-	******
-	
-		using var cancellation = propertyChangeFilter.ObservePropertyChanged<bool>("MyProperty", s =>
-			{
-				// Only the property whose name match
-				// "MyProperty" will fire this action.
-			});
-		
-		//The observer is delisted when cancellation is disposed
-
-	 */
-
-	#endregion
-
-	public abstract class PropertyChangeFilter
-	{
-		private readonly Dictionary<string, List<Delegate>> propertyChangedActions = new();
-		private readonly Dictionary<string, List<Delegate>> propertyChangingActions = new();
-
-		private readonly List<(PropertyChangedEventHandlerEx subscriber, PropertyChangedEventHandlerEx wrapper)> changedFilters = new();
-		private readonly List<(PropertyChangingEventHandlerEx subscriber, PropertyChangingEventHandlerEx wrapper)> changingFilters = new();
-
-		protected void OnPropertyChanged(string propertyName, object newValue)
-		{
-			if (propertyChangedActions.ContainsKey(propertyName))
-			{
-				//Invoke observables registered for propertyName 
-				foreach (var action in propertyChangedActions[propertyName])
-					action.DynamicInvoke(newValue);
-			}
-
-			_propertyChanged?.Invoke(this, new(propertyName, newValue));
-		}
-
-		protected void OnPropertyChanging(string propertyName, object oldValue, object newValue)
-		{
-			if (propertyChangingActions.ContainsKey(propertyName))
-			{
-				//Invoke observables registered for propertyName
-				foreach (var action in propertyChangingActions[propertyName])
-					action.DynamicInvoke(oldValue, newValue);
-			}
-
-			_propertyChanging?.Invoke(this, new(propertyName, oldValue, newValue));
-		}
-
-		#region Events
-
-		private PropertyChangedEventHandlerEx _propertyChanged;
-		private PropertyChangingEventHandlerEx _propertyChanging;
-
-		public event PropertyChangedEventHandlerEx PropertyChanged
-		{
-			add
-			{
-				var attributes = getAttributes<PropertyChangeFilterAttribute>(value.Method);
-
-				if (attributes.Any())
-				{
-					var matches = attributes.Select(a => a.PropertyName).ToArray();
-
-					void filterer(object s, PropertyChangedEventArgsEx e)
-					{
-						if (e.PropertyName.In(matches)) value(s, e);
-					}
-
-					changedFilters.Add((value, filterer));
-
-					_propertyChanged += filterer;
-				}
-				else
-					_propertyChanged += value;
-			}
-			remove
-			{
-				var del = changedFilters.LastOrDefault(d => d.subscriber == value);
-				if (del == default)
-					_propertyChanged -= value;
-				else
-				{
-					_propertyChanged -= del.wrapper;
-					changedFilters.Remove(del);
-				}
-			}
-		}
-
-		public event PropertyChangingEventHandlerEx PropertyChanging
-		{
-			add
-			{
-				var attributes = getAttributes<PropertyChangeFilterAttribute>(value.Method);
-
-				if (attributes.Any())
-				{
-					var matches = attributes.Select(a => a.PropertyName).ToArray();
-
-					void filterer(object s, PropertyChangingEventArgsEx e)
-					{
-						if (e.PropertyName.In(matches)) value(s, e);
-					}
-
-					changingFilters.Add((value, filterer));
-
-					_propertyChanging += filterer;
-
-				}
-				else
-					_propertyChanging += value;
-			}
-			remove
-			{
-				var del = changingFilters.LastOrDefault(d => d.subscriber == value);
-				if (del == default)
-					_propertyChanging -= value;
-				else
-				{
-					_propertyChanging -= del.wrapper;
-					changingFilters.Remove(del);
-				}
-			}
-		}
-
-		private static T[] getAttributes<T>(MethodInfo methodInfo) where T : Attribute
-			=> Attribute.GetCustomAttributes(methodInfo, typeof(T)) as T[];
-
-		#endregion
-
-		#region Observables
-
-		/// <summary>
-		/// Clear all subscriptions to Property<b>Changed</b> for <paramref name="propertyName"/>
-		/// </summary>
-		public void ClearChangedSubscriptions(string propertyName)
-		{
-			if (propertyChangedActions.ContainsKey(propertyName)
-				&& propertyChangedActions[propertyName] is not null)
-				propertyChangedActions[propertyName].Clear();
-		}
-
-		/// <summary>
-		/// Clear all subscriptions to Property<b>Changing</b> for <paramref name="propertyName"/>
-		/// </summary>
-		public void ClearChangingSubscriptions(string propertyName)
-		{
-			if (propertyChangingActions.ContainsKey(propertyName)
-				&& propertyChangingActions[propertyName] is not null)
-				propertyChangingActions[propertyName].Clear();
-		}
-
-		/// <summary>
-		/// Add an action to be executed when a property's value has changed
-		/// </summary>
-		/// <typeparam name="T">The <paramref name="propertyName"/>'s <see cref="Type"/></typeparam>
-		/// <param name="propertyName">Name of the property whose change triggers the <paramref name="action"/></param>
-		/// <param name="action">Action to be executed with the NewValue as a parameter</param>
-		/// <returns>A reference to an interface that allows observers to stop receiving notifications before the provider has finished sending them.</returns>
-		public IDisposable ObservePropertyChanged<T>(string propertyName, Action<T> action)
-		{
-			validateSubscriber<T>(propertyName, action);
-
-			if (!propertyChangedActions.ContainsKey(propertyName))
-				propertyChangedActions.Add(propertyName, new List<Delegate>());
-
-			var actionlist = propertyChangedActions[propertyName];
-
-			if (!actionlist.Contains(action))
-				actionlist.Add(action);
-
-			return new Unsubscriber(actionlist, action);
-		}
-
-		/// <summary>
-		/// Add an action to be executed when a property's value is changing
-		/// </summary>
-		/// <typeparam name="T">The <paramref name="propertyName"/>'s <see cref="Type"/></typeparam>
-		/// <param name="propertyName">Name of the property whose change triggers the <paramref name="action"/></param>
-		/// <param name="action">Action to be executed with OldValue and NewValue as parameters</param>
-		/// <returns>A reference to an interface that allows observers to stop receiving notifications before the provider has finished sending them.</returns>
-		public IDisposable ObservePropertyChanging<T>(string propertyName, Action<T, T> action)
-		{
-			validateSubscriber<T>(propertyName, action);
-
-			if (!propertyChangingActions.ContainsKey(propertyName))
-				propertyChangingActions.Add(propertyName, new List<Delegate>());
-
-			var actionlist = propertyChangingActions[propertyName];
-
-			if (!actionlist.Contains(action))
-				actionlist.Add(action);
-
-			return new Unsubscriber(actionlist, action);
-		}
-
-		private void validateSubscriber<T>(string propertyName, Delegate action)
-		{
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(propertyName, nameof(propertyName));
-			ArgumentValidator.EnsureNotNull(action, nameof(action));
-
-			var propertyInfo = GetType().GetProperty(propertyName);
-
-			if (propertyInfo is null)
-				throw new MissingMemberException($"{nameof(Configuration)}.{propertyName} does not exist.");
-
-			if (propertyInfo.PropertyType != typeof(T))
-				throw new InvalidCastException($"{nameof(Configuration)}.{propertyName} is {propertyInfo.PropertyType}, but parameter is {typeof(T)}.");
-		}
-
-		private class Unsubscriber : IDisposable
-		{
-			private List<Delegate> _observers;
-			private Delegate _observer;
-
-			internal Unsubscriber(List<Delegate> observers, Delegate observer)
-			{
-				_observers = observers;
-				_observer = observer;
-			}
-
-			public void Dispose()
-			{
-				if (_observers.Contains(_observer))
-					_observers.Remove(_observer);
-			}
-		}
-
-		#endregion
-	}
-
-	public delegate void PropertyChangedEventHandlerEx(object sender, PropertyChangedEventArgsEx e);
-	public delegate void PropertyChangingEventHandlerEx(object sender, PropertyChangingEventArgsEx e);
-
-	public class PropertyChangedEventArgsEx : PropertyChangedEventArgs
-	{
-		public object NewValue { get; }
-
-		public PropertyChangedEventArgsEx(string propertyName, object newValue) : base(propertyName)
-		{
-			NewValue = newValue;
-		}
-	}
-
-	public class PropertyChangingEventArgsEx : PropertyChangingEventArgs
-	{
-		public object OldValue { get; }
-		public object NewValue { get; }
-
-		public PropertyChangingEventArgsEx(string propertyName, object oldValue, object newValue) : base(propertyName)
-		{
-			OldValue = oldValue;
-			NewValue = newValue;
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
-	public class PropertyChangeFilterAttribute : Attribute
-	{
-		public string PropertyName { get; }
-		public PropertyChangeFilterAttribute(string propertyName)
-		{
-			PropertyName = propertyName;
-		}
-	}
-}
--- a/Source/LibationFileManager/TemplateEditor[T].cs
+++ b/Source/LibationFileManager/TemplateEditor[T].cs
@@ -0,0 +1,139 @@
+using AaxDecrypter;
+using FileManager;
+using System.Collections.Generic;
+using System;
+using System.IO;
+
+namespace LibationFileManager
+{
+	public interface ITemplateEditor
+	{
+		bool IsFolder { get; }
+		bool IsFilePath { get; }
+		LongPath BaseDirectory { get; }
+		string DefaultTemplate { get; }
+		string TemplateName { get; }
+		string TemplateDescription { get; }
+		Templates Folder { get; }
+		Templates File { get; }
+		Templates Name { get; }
+		Templates EditingTemplate { get; }
+		void SetTemplateText(string templateText);
+		string GetFolderName();
+		string GetFileName();
+		string GetName();
+	}
+
+	public class TemplateEditor<T> : ITemplateEditor where T : Templates, ITemplate, new()
+	{
+		public bool IsFolder => EditingTemplate is Templates.FolderTemplate;
+		public bool IsFilePath => EditingTemplate is not Templates.ChapterTitleTemplate;
+		public LongPath BaseDirectory { get; private init; }
+		public string DefaultTemplate { get; private init; }
+		public string TemplateName { get; private init; }
+		public string TemplateDescription { get; private init; }
+		public Templates Folder { get; private set; }
+		public Templates File { get; private set; }
+		public Templates Name { get; private set; }
+		public Templates EditingTemplate
+		{
+			get => _editingTemplate;
+			private set => _editingTemplate = !IsFilePath ? Name = value : IsFolder ? Folder = value : File = value;
+		}
+
+		private Templates _editingTemplate;
+
+		public void SetTemplateText(string templateText)
+		{
+			Templates.TryGetTemplate<T>(templateText, out var template);
+			EditingTemplate = template;
+		}
+
+		private static readonly LibraryBookDto libraryBookDto
+			= new()
+			{
+				Account = "my account",
+				DateAdded = new DateTime(2022, 6, 9, 0, 0, 0),
+				DatePublished = new DateTime(2017, 2, 27, 0, 0, 0),
+				AudibleProductId = "123456789",
+				Title = "A Study in Scarlet: A Sherlock Holmes Novel",
+				Locale = "us",
+				YearPublished = 2017,
+				Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
+				Narrators = new List<string> { "Stephen Fry" },
+				SeriesName = "Sherlock Holmes",
+				SeriesNumber = 1,
+				BitRate = 128,
+				SampleRate = 44100,
+				Channels = 2,
+				Language = "English"
+			};
+
+		private static readonly MultiConvertFileProperties partFileProperties
+			= new()
+			{
+				OutputFileName = "",
+				PartsPosition = 4,
+				PartsTotal = 10,
+				Title = "A Flight for Life"
+			};
+
+		public string GetFolderName()
+		{
+			/*
+			* Path must be rooted for windows to allow long file paths. This is
+			* only necessary for folder templates because they may contain several
+			* subdirectories. Without rooting, we won't be allowed to create a
+			* relative path longer than MAX_PATH.
+			*/
+			var dir = Folder.GetFilename(libraryBookDto, BaseDirectory, "");
+			return Path.GetRelativePath(BaseDirectory, dir);
+		}
+
+		public string GetFileName()
+			=> File.GetFilename(libraryBookDto, partFileProperties, "", "");
+		public string GetName()
+			=> Name.GetName(libraryBookDto, partFileProperties);
+
+		public static ITemplateEditor CreateFilenameEditor(LongPath baseDir, string templateText)
+		{
+			Templates.TryGetTemplate<T>(templateText, out var template);
+
+			var templateEditor = new TemplateEditor<T>
+			{
+				_editingTemplate = template,
+				BaseDirectory = baseDir,
+				DefaultTemplate = T.DefaultTemplate,
+				TemplateName = T.Name,
+				TemplateDescription = T.Description
+				
+			};
+
+			if (!templateEditor.IsFolder && !templateEditor.IsFilePath)
+				throw new InvalidOperationException($"This method is only for File and Folder templates. Use {nameof(CreateNameEditor)} for name templates");
+
+			templateEditor.Folder = templateEditor.IsFolder ? template : Templates.Folder;
+			templateEditor.File = templateEditor.IsFolder ? Templates.File : template;
+
+			return templateEditor;
+		}
+
+		public static ITemplateEditor CreateNameEditor(string templateText)
+		{
+			Templates.TryGetTemplate<T>(templateText, out var nameTemplate);
+
+			var templateEditor = new TemplateEditor<T>
+			{
+				_editingTemplate = nameTemplate,
+				DefaultTemplate = T.DefaultTemplate,
+				TemplateName = T.Name,
+				TemplateDescription = T.Description
+			};
+
+			if (templateEditor.IsFolder || templateEditor.IsFilePath)
+				throw new InvalidOperationException($"This method is only for name templates. Use {nameof(CreateFilenameEditor)} for file templates");
+
+			return templateEditor;
+		}
+	}
+}
--- a/Source/LibationFileManager/TemplateTags.cs
+++ b/Source/LibationFileManager/TemplateTags.cs
@@ -1,31 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core;
+using FileManager.NamingTemplate;

 namespace LibationFileManager
 {
-    public sealed class TemplateTags : Enumeration<TemplateTags>
-    {
-		public string TagName => DisplayName;
-        public string DefaultValue { get; }
+    public sealed class TemplateTags : ITemplateTag
+	{
+		public const string DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+		public string TagName { get; }
+		public string DefaultValue { get; }
        public string Description { get; }
-        public bool IsChapterOnly { get; }
-
-        private static int value = 0;
-        private TemplateTags(string tagName, string description, bool isChapterOnly = false, string defaultValue = null) : base(value++, tagName)
-        {
-            Description = description;
-            IsChapterOnly = isChapterOnly;
-            DefaultValue = defaultValue ?? $"<{tagName}>";
+        public string Display { get; }

+		private TemplateTags(string tagName, string description, string defaultValue = null, string display = null)
+		{
+			TagName = tagName;
+			Description = description;
+			DefaultValue = defaultValue ?? $"<{tagName}>";
+			Display = display ?? $"<{tagName}>";
 		}

-        // putting these first is the incredibly lazy way to make them show up first in the EditTemplateDialog
-        public static TemplateTags ChCount { get; } = new TemplateTags("ch count", "Number of chapters", true);
-        public static TemplateTags ChTitle { get; } = new TemplateTags("ch title", "Chapter title", true);
-        public static TemplateTags ChNumber { get; } = new TemplateTags("ch#", "Chapter #", true);
-        public static TemplateTags ChNumber0 { get; } = new TemplateTags("ch# 0", "Chapter # with leading zeros", true);
+		public static TemplateTags ChCount { get; } = new TemplateTags("ch count", "Number of chapters");
+        public static TemplateTags ChTitle { get; } = new TemplateTags("ch title", "Chapter title");
+        public static TemplateTags ChNumber { get; } = new TemplateTags("ch#", "Chapter #");
+        public static TemplateTags ChNumber0 { get; } = new TemplateTags("ch# 0", "Chapter # with leading zeros");

        public static TemplateTags Id { get; } = new TemplateTags("id", "Audible ID");
        public static TemplateTags Title { get; } = new TemplateTags("title", "Full title");
@@ -41,14 +37,16 @@ namespace LibationFileManager
        public static TemplateTags SampleRate { get; } = new TemplateTags("samplerate", "File's orig. sample rate");
        public static TemplateTags Channels { get; } = new TemplateTags("channels", "Number of audio channels");
        public static TemplateTags Account { get; } = new TemplateTags("account", "Audible account of this book");
-        public static TemplateTags Locale { get; } = new TemplateTags("locale", "Region/country");
-        public static TemplateTags YearPublished { get; } = new TemplateTags("year", "Year published");
+        public static TemplateTags Locale { get; } = new ("locale", "Region/country");
+        public static TemplateTags YearPublished { get; } = new("year", "Year published");
+		public static TemplateTags Language { get; } = new("language", "Book's language");
+		public static TemplateTags LanguageShort { get; } = new("language short", "Book's language abbreviated. Eg: ENG");

-        // Special cases. Aren't mapped to replacements in Templates.cs
-        // Included here for display by EditTemplateDialog
-        public static TemplateTags FileDate { get; } = new TemplateTags("file date [...]", "File date/time. e.g. yyyy-MM-dd HH-mm", false, $"<file date [{Templates.DEFAULT_DATE_FORMAT}]>");
-        public static TemplateTags DatePublished { get; } = new TemplateTags("pub date [...]", "Publication date. e.g. yyyy-MM-dd", false, $"<pub date [{Templates.DEFAULT_DATE_FORMAT}]>");
-        public static TemplateTags DateAdded { get; } = new TemplateTags("date added [...]", "Date added to your Audible account. e.g. yyyy-MM-dd", false, $"<date added [{Templates.DEFAULT_DATE_FORMAT}]>");
-        public static TemplateTags IfSeries { get; } = new TemplateTags("if series->...<-if series", "Only include if part of a series", false, "<if series-><-if series>");
+		public static TemplateTags FileDate { get; } = new TemplateTags("file date", "File date/time. e.g. yyyy-MM-dd HH-mm", $"<file date [{DEFAULT_DATE_FORMAT}]>", "<file date [...]>");
+        public static TemplateTags DatePublished { get; } = new TemplateTags("pub date", "Publication date. e.g. yyyy-MM-dd", $"<pub date [{DEFAULT_DATE_FORMAT}]>", "<pub date [...]>");
+        public static TemplateTags DateAdded { get; } = new TemplateTags("date added", "Date added to your Audible account. e.g. yyyy-MM-dd", $"<date added [{DEFAULT_DATE_FORMAT}]>", "<date added [...]>");
+        public static TemplateTags IfSeries { get; } = new TemplateTags("if series", "Only include if part of a book series or podcast", "<if series-><-if series>", "<if series->...<-if series>");
+        public static TemplateTags IfPodcast { get; } = new TemplateTags("if podcast", "Only include if part of a podcast", "<if podcast-><-if podcast>", "<if podcast->...<-if podcast>");
+        public static TemplateTags IfBookseries { get; } = new TemplateTags("if bookseries", "Only include if part of a book series", "<if bookseries-><-if bookseries>", "<if bookseries->...<-if bookseries>");
    }
 }
--- a/Source/LibationFileManager/Templates.cs
+++ b/Source/LibationFileManager/Templates.cs
@@ -2,438 +2,341 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
+using AaxDecrypter;
 using Dinah.Core;
-using Dinah.Core.Collections.Generic;
 using FileManager;
+using FileManager.NamingTemplate;
+using NameParser;

 namespace LibationFileManager
 {
+	public interface ITemplate
+	{
+		static abstract string Name { get; }
+		static abstract string Description { get; }
+		static abstract string DefaultTemplate { get; }
+		static abstract IEnumerable<TagCollection> TagCollections { get; }
+	}
+
 	public abstract class Templates
 	{
-		protected static string[] Valid => Array.Empty<string>();
-		public const string ERROR_NULL_IS_INVALID = "Null template is invalid.";
 		public const string ERROR_FULL_PATH_IS_INVALID = @"No colons or full paths allowed. Eg: should not start with C:\";
-		public const string ERROR_INVALID_FILE_NAME_CHAR = @"Only file name friendly characters allowed. Eg: no colons or slashes";
-
-		public const string WARNING_EMPTY = "Template is empty.";
-		public const string WARNING_WHITE_SPACE = "Template is white space.";
-		public const string WARNING_NO_TAGS = "Should use tags. Eg: <title>";
-		public const string WARNING_HAS_CHAPTER_TAGS = "Chapter tags should only be used in the template used for naming files which are split by chapter. Eg: <ch title>";
 		public const string WARNING_NO_CHAPTER_NUMBER_TAG = "Should include chapter number tag in template used for naming files which are split by chapter. Ie: <ch#> or <ch# 0>";

-		public static FolderTemplate Folder { get; } = new FolderTemplate();
-		public static FileTemplate File { get; } = new FileTemplate();
-		public static ChapterFileTemplate ChapterFile { get; } = new ChapterFileTemplate();
-		public static ChapterTitleTemplate ChapterTitle { get; } = new ChapterTitleTemplate();
+		//Assigning the properties in the static constructor will require all
+		//Templates users to have a valid configuration file. To allow tests
+		//to work without access to Configuration, only load templates on demand.
+		private static FolderTemplate _folder;
+		private static FileTemplate _file;
+		private static ChapterFileTemplate _chapterFile;
+		private static ChapterTitleTemplate _chapterTitle;

-		public abstract string Name { get; }
-		public abstract string Description { get; }
-		public abstract string DefaultTemplate { get; }
-		protected abstract bool IsChapterized { get; }
+		public static FolderTemplate Folder => _folder ??= GetTemplate<FolderTemplate>(Configuration.Instance.FolderTemplate);
+		public static FileTemplate File => _file ??= GetTemplate<FileTemplate>(Configuration.Instance.FileTemplate);
+		public static ChapterFileTemplate ChapterFile => _chapterFile ??= GetTemplate<ChapterFileTemplate>(Configuration.Instance.ChapterFileTemplate);
+		public static ChapterTitleTemplate ChapterTitle => _chapterTitle ??= GetTemplate<ChapterTitleTemplate>(Configuration.Instance.ChapterTitleTemplate);

-		protected Templates() { }
+		#region Template Parsing
+
+		public static T GetTemplate<T>(string templateText) where T : Templates, ITemplate, new()
+			=> TryGetTemplate<T>(templateText, out var template) ? template : GetDefaultTemplate<T>();
+
+		public static bool TryGetTemplate<T>(string templateText, out T template) where T : Templates, ITemplate, new()
+		{
+			var namingTemplate = NamingTemplate.Parse(templateText, T.TagCollections);
+
+			template = new() { NamingTemplate = namingTemplate };
+			return !namingTemplate.Errors.Any();
+		}
+
+		private static T GetDefaultTemplate<T>() where T : Templates, ITemplate, new()
+			=> new() { NamingTemplate = NamingTemplate.Parse(T.DefaultTemplate, T.TagCollections) };
+
+		static Templates()
+		{
+			Configuration.Instance.PropertyChanged +=
+				[PropertyChangeFilter(nameof(Configuration.FolderTemplate))]
+				(_,e) => _folder = GetTemplate<FolderTemplate>((string)e.NewValue);
+
+			Configuration.Instance.PropertyChanged +=
+				[PropertyChangeFilter(nameof(Configuration.FileTemplate))]
+				(_, e) => _file = GetTemplate<FileTemplate>((string)e.NewValue);
+
+			Configuration.Instance.PropertyChanged +=
+				[PropertyChangeFilter(nameof(Configuration.ChapterFileTemplate))]
+				(_, e) => _chapterFile = GetTemplate<ChapterFileTemplate>((string)e.NewValue);
+
+			Configuration.Instance.PropertyChanged +=
+				[PropertyChangeFilter(nameof(Configuration.ChapterTitleTemplate))]
+				(_, e) => _chapterTitle = GetTemplate<ChapterTitleTemplate>((string)e.NewValue);
+
+			HumanName.Suffixes.Add("ret");
+			HumanName.Titles.Add("professor");
+		}
+
+		#endregion
+
+		#region Template Properties
+
+		public IEnumerable<TemplateTags> TagsRegistered => NamingTemplate.TagsRegistered.Cast<TemplateTags>();
+		public IEnumerable<TemplateTags> TagsInUse => NamingTemplate.TagsInUse.Cast<TemplateTags>();
+		public string TemplateText => NamingTemplate.TemplateText;
+		protected NamingTemplate NamingTemplate { get; private set; }
+
+		#endregion

 		#region validation
-		internal string GetValid(string configValue)
-		{
-			var value = configValue?.Trim();
-			return IsValid(value) ? value : DefaultTemplate;
-		}

-		public abstract IEnumerable<string> GetErrors(string template);
-		public bool IsValid(string template) => !GetErrors(template).Any();
+		public virtual IEnumerable<string> Errors => NamingTemplate.Errors;
+		public bool IsValid => !Errors.Any();

-		public abstract IEnumerable<string> GetWarnings(string template);
-		public bool HasWarnings(string template) => GetWarnings(template).Any();
+		public virtual IEnumerable<string> Warnings => NamingTemplate.Warnings;
+		public bool HasWarnings => Warnings.Any();

-		protected static string[] GetFileErrors(string template)
-		{
-			// File name only; not path. all other path chars are valid enough to pass this check and will be handled on final save.
-
-			// null is invalid. whitespace is valid but not recommended
-			if (template is null)
-				return new[] { ERROR_NULL_IS_INVALID };
-
-			if (ReplacementCharacters.ContainsInvalidFilenameChar(template.Replace("<","").Replace(">","")))
-				return new[] { ERROR_INVALID_FILE_NAME_CHAR };
-
-			return Valid;
-		}
-
-		protected IEnumerable<string> GetStandardWarnings(string template)
-		{
-			var warnings = GetErrors(template).ToList();
-			if (template is null)
-				return warnings;
-
-			if (string.IsNullOrEmpty(template))
-				warnings.Add(WARNING_EMPTY);
-			else if (string.IsNullOrWhiteSpace(template))
-				warnings.Add(WARNING_WHITE_SPACE);
-
-			if (TagCount(template) == 0)
-				warnings.Add(WARNING_NO_TAGS);
-
-			if (!IsChapterized && ContainsChapterOnlyTags(template))
-				warnings.Add(WARNING_HAS_CHAPTER_TAGS);
-
-			return warnings;
-		}
-
-		internal int TagCount(string template)
-			=> GetTemplateTags()
-			// for <id><id> == 1, use:
-			//   .Count(t => template.Contains($"<{t.TagName}>"))
-			// .Sum() impl: <id><id> == 2
-			.Sum(t => template.Split($"<{t.TagName}>").Length - 1);
-
-		internal static bool ContainsChapterOnlyTags(string template)
-			=> TemplateTags.GetAll()
-			.Where(t => t.IsChapterOnly)
-			.Any(t => ContainsTag(template, t.TagName));
-
-		internal static bool ContainsTag(string template, string tag) => template.Contains($"<{tag}>");
 		#endregion

 		#region to file name
-		/// <summary>
-		/// EditTemplateDialog: Get template generated filename for portion of path
-		/// </summary>
-		public string GetPortionFilename(LibraryBookDto libraryBookDto, string template, string fileExtension)
-			=> string.IsNullOrWhiteSpace(template)
-			? ""
-			: getFileNamingTemplate(libraryBookDto, template, null, fileExtension, Configuration.Instance.ReplacementCharacters)
-			.GetFilePath(fileExtension).PathWithoutPrefix;

-		public const string DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
-		private static Regex fileDateTagRegex { get; } = new Regex(@"<file\s*?date\s*?(?:\[([^\[\]]*?)\]\s*?)?>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-		private static Regex dateAddedTagRegex { get; } = new Regex(@"<date\s*?added\s*?(?:\[([^\[\]]*?)\]\s*?)?>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-		private static Regex datePublishedTagRegex { get; } = new Regex(@"<pub\s*?date\s*?(?:\[([^\[\]]*?)\]\s*?)?>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-		private static Regex ifSeriesRegex { get; } = new Regex("<if series->(.*?)<-if series>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-		internal static FileNamingTemplate getFileNamingTemplate(LibraryBookDto libraryBookDto, string template, string dirFullPath, string extension, ReplacementCharacters replacements)
+		public string GetName(LibraryBookDto libraryBookDto, MultiConvertFileProperties multiChapProps)
 		{
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(template, nameof(template));
 			ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
+			ArgumentValidator.EnsureNotNull(multiChapProps, nameof(multiChapProps));
+			return string.Concat(NamingTemplate.Evaluate(libraryBookDto, multiChapProps).Select(p => p.Value));
+		}
+
+		public LongPath GetFilename(LibraryBookDto libraryBookDto, string baseDir, string fileExtension, ReplacementCharacters replacements = null, bool returnFirstExisting = false)
+		{
+			ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
+			ArgumentValidator.EnsureNotNull(baseDir, nameof(baseDir));
+			ArgumentValidator.EnsureNotNull(fileExtension, nameof(fileExtension));

 			replacements ??= Configuration.Instance.ReplacementCharacters;
-			dirFullPath = dirFullPath?.Trim() ?? "";
-
-			// for non-series, remove <if series-> and <-if series> tags and everything in between
-			// for series, remove <if series-> and <-if series> tags, what's in between will remain
-			template = ifSeriesRegex.Replace(
-				template,
-				string.IsNullOrWhiteSpace(libraryBookDto.SeriesName) ? "" : "$1");
-
-			//Get date replacement parameters. Sanitizes the format text and replaces
-			//the template with the sanitized text before creating FileNamingTemplate
-			var fileDateParams = getSanitizeDateReplacementParameters(fileDateTagRegex, ref template, replacements, libraryBookDto.FileDate);
-			var dateAddedParams = getSanitizeDateReplacementParameters(dateAddedTagRegex, ref template, replacements, libraryBookDto.DateAdded);
-			var pubDateParams = getSanitizeDateReplacementParameters(datePublishedTagRegex, ref template, replacements, libraryBookDto.DatePublished);
-
-			var t = template + FileUtility.GetStandardizedExtension(extension);
-			var fullfilename = dirFullPath == "" ? t : Path.Combine(dirFullPath, t);
-
-			var fileNamingTemplate = new FileNamingTemplate(fullfilename, replacements);
-
-			var title = libraryBookDto.Title ?? "";
-			var titleShort = title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':'));
-
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Id, libraryBookDto.AudibleProductId);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Title, title);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.TitleShort, titleShort);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Author, libraryBookDto.AuthorNames);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstAuthor, libraryBookDto.FirstAuthor);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Narrator, libraryBookDto.NarratorNames);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.FirstNarrator, libraryBookDto.FirstNarrator);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Series, libraryBookDto.SeriesName);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.SeriesNumber, libraryBookDto.SeriesNumber);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Bitrate, libraryBookDto.BitRate);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.SampleRate, libraryBookDto.SampleRate);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Channels, libraryBookDto.Channels);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Account, libraryBookDto.Account);
-			fileNamingTemplate.AddParameterReplacement(TemplateTags.Locale, libraryBookDto.Locale);
-            fileNamingTemplate.AddParameterReplacement(TemplateTags.YearPublished, libraryBookDto.YearPublished?.ToString() ?? "1900");
-
-			//Add the sanitized replacement parameters
-			foreach (var param in fileDateParams)
-				fileNamingTemplate.ParameterReplacements.AddIfNotContains(param);
-			foreach (var param in dateAddedParams)
-				fileNamingTemplate.ParameterReplacements.AddIfNotContains(param);
-			foreach (var param in pubDateParams)
-				fileNamingTemplate.ParameterReplacements.AddIfNotContains(param);
-
-			return fileNamingTemplate;
+			return GetFilename(baseDir, fileExtension,replacements, returnFirstExisting, libraryBookDto);
 		}
-		#endregion

-		#region DateTime Tags
-
-		/// <param name="template">the file naming template. Any found date tags will be sanitized,
-		/// and the template's original date tag will be replaced with the sanitized tag.</param>
-		/// <returns>A list of parameter replacement key-value pairs</returns>
-		private static List<KeyValuePair<string, object>> getSanitizeDateReplacementParameters(Regex datePattern, ref string template, ReplacementCharacters replacements, DateTime? dateTime)
+		public LongPath GetFilename(LibraryBookDto libraryBookDto, MultiConvertFileProperties multiChapProps, string baseDir, string fileExtension, ReplacementCharacters replacements = null, bool returnFirstExisting = false)
 		{
-			List<KeyValuePair<string, object>> dateParams = new();
+			ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
+			ArgumentValidator.EnsureNotNull(multiChapProps, nameof(multiChapProps));
+			ArgumentValidator.EnsureNotNull(baseDir, nameof(baseDir));
+			ArgumentValidator.EnsureNotNull(fileExtension, nameof(fileExtension));

-			foreach (Match dateTag in datePattern.Matches(template))
+			replacements ??= Configuration.Instance.ReplacementCharacters;
+			return GetFilename(baseDir, fileExtension, replacements, returnFirstExisting, libraryBookDto, multiChapProps);
+		}
+
+		protected virtual IEnumerable<string> GetTemplatePartsStrings(List<TemplatePart> parts, ReplacementCharacters replacements)
+			=> parts.Select(p => replacements.ReplaceFilenameChars(p.Value));
+
+		private LongPath GetFilename(string baseDir, string fileExtension, ReplacementCharacters replacements, bool returnFirstExisting, params object[] dtos)
+		{
+			fileExtension = FileUtility.GetStandardizedExtension(fileExtension);
+
+			var parts = NamingTemplate.Evaluate(dtos).ToList();
+			var pathParts = GetPathParts(GetTemplatePartsStrings(parts, replacements));
+
+			//Remove 1 character from the end of the longest filename part until
+			//the total filename is less than max filename length
+			for (int i = 0; i < pathParts.Count; i++)
 			{
-				var sanitizedTag = sanitizeDateParameterTag(dateTag, replacements, out var sanitizedFormatter);
-				if (tryFormatDateTime(dateTime, sanitizedFormatter, replacements, out var formattedDateString))
+				var part = pathParts[i];
+
+				//If file already exists, GetValidFilename will append " (n)" to the filename.
+				//This could cause the filename length to exceed MaxFilenameLength, so reduce
+				//allowable filename length by 5 chars, allowing for up to 99 duplicates.
+				var maxFilenameLength = LongPath.MaxFilenameLength - 
+					(i < pathParts.Count - 1 || string.IsNullOrEmpty(fileExtension) ? 0 : fileExtension.Length + 5);
+
+				while (part.Sum(LongPath.GetFilesystemStringLength) > maxFilenameLength)
 				{
-					dateParams.Add(new(sanitizedTag, formattedDateString));
-					template = template.Replace(dateTag.Value, sanitizedTag);
+					int maxLength = part.Max(p => p.Length);
+					var maxEntry = part.First(p => p.Length == maxLength);
+
+					var maxIndex = part.IndexOf(maxEntry);
+					part.RemoveAt(maxIndex);
+					part.Insert(maxIndex, maxEntry.Remove(maxLength - 1, 1));
 				}
 			}
-			return dateParams;
+
+			var fullPath = Path.Combine(pathParts.Select(fileParts => string.Concat(fileParts)).Prepend(baseDir).ToArray());
+
+			return  FileUtility.GetValidFilename(fullPath, replacements, fileExtension, returnFirstExisting);
 		}

-		/// <returns>a date parameter replacement tag with the format string sanitized</returns>
-		private static string sanitizeDateParameterTag(Match dateTag, ReplacementCharacters replacements, out string sanitizedFormatter)
+		/// <summary>
+		/// Organize template parts into directories. Any Extra slashes will be
+		/// returned as empty directories and are taken care of by Path.Combine()
+		/// </summary>
+		/// <returns>A List of template directories. Each directory is a list of template part strings</returns>
+		private static List<List<string>> GetPathParts(IEnumerable<string> templateParts)
 		{
-			if (dateTag.Groups.Count != 2 || string.IsNullOrWhiteSpace(dateTag.Groups[1].Value))
+			List<List<string>> directories = new();
+			List<string> dir = new();
+
+			foreach (var part in templateParts)
 			{
-				sanitizedFormatter = DEFAULT_DATE_FORMAT;
-				return dateTag.Value;
+				int slashIndex, lastIndex = 0;
+				while((slashIndex = part.IndexOf(Path.DirectorySeparatorChar, lastIndex)) > -1)
+				{
+					dir.Add(part[lastIndex..slashIndex]);
+					directories.Add(dir);
+					dir = new();
+
+					lastIndex = slashIndex + 1;
+				}
+				dir.Add(part[lastIndex..]);
 			}
+			directories.Add(dir);

-			var formatter = dateTag.Groups[1].Value;
-
-			sanitizedFormatter = replacements.ReplaceFilenameChars(formatter).Trim();
-
-			return dateTag.Value.Replace(formatter, sanitizedFormatter);
+			return directories;
 		}

-		private static bool tryFormatDateTime(DateTime? dateTime, string sanitizedFormatter, ReplacementCharacters replacements, out string formattedDateString)
-		{
-			if (!dateTime.HasValue)
-			{
-				formattedDateString = string.Empty;
-				return true;
-			}
-
-			try
-			{
-				formattedDateString = replacements.ReplaceFilenameChars(dateTime.Value.ToString(sanitizedFormatter)).Trim();
-				return true;
-			}
-			catch
-			{
-				formattedDateString = null;
-				return false;
-			}
-		}
 		#endregion

-		public virtual IEnumerable<TemplateTags> GetTemplateTags()
-			=> TemplateTags.GetAll()
-			// yeah, this line is a little funky but it works when you think through it. also: trust the unit tests
-			.Where(t => IsChapterized || !t.IsChapterOnly);
+		#region Registered Template Properties

-		public string Sanitize(string template, ReplacementCharacters replacements)
+		private static readonly PropertyTagCollection<LibraryBookDto> filePropertyTags =
+			new(caseSensative: true, StringFormatter, DateTimeFormatter, IntegerFormatter)
 		{
-			var value = template ?? "";
+			//Don't allow formatting of Id
+			{ TemplateTags.Id, lb => lb.AudibleProductId, v => v },
+			{ TemplateTags.Title, lb => lb.Title },
+			{ TemplateTags.TitleShort, lb => getTitleShort(lb.Title) },
+			{ TemplateTags.Author, lb => lb.Authors, NameListFormat.Formatter },
+			{ TemplateTags.FirstAuthor, lb => lb.FirstAuthor },
+			{ TemplateTags.Narrator, lb => lb.Narrators, NameListFormat.Formatter },
+			{ TemplateTags.FirstNarrator, lb => lb.FirstNarrator },
+			{ TemplateTags.Series, lb => lb.SeriesName },
+			{ TemplateTags.SeriesNumber, lb => lb.SeriesNumber },
+			{ TemplateTags.Language, lb => lb.Language },
+			//Don't allow formatting of LanguageShort
+			{ TemplateTags.LanguageShort, lb =>lb.Language, getLanguageShort },
+			{ TemplateTags.Bitrate, lb => lb.BitRate },
+			{ TemplateTags.SampleRate, lb => lb.SampleRate },
+			{ TemplateTags.Channels, lb => lb.Channels },
+			{ TemplateTags.Account, lb => lb.Account },
+			{ TemplateTags.Locale, lb => lb.Locale },
+			{ TemplateTags.YearPublished, lb => lb.YearPublished },
+			{ TemplateTags.DatePublished, lb => lb.DatePublished },
+			{ TemplateTags.DateAdded, lb => lb.DateAdded },
+			{ TemplateTags.FileDate, lb => lb.FileDate },
+		};

-			// Replace invalid filename characters in the DateTime format provider so we don't trip any alarms.
-			// Illegal filename characters in the formatter are allowed because they will be replaced by
-			// getFileNamingTemplate()
-			value = fileDateTagRegex.Replace(value, m => sanitizeDateParameterTag(m, replacements, out _));
-			value = dateAddedTagRegex.Replace(value, m => sanitizeDateParameterTag(m, replacements, out _));
-			value = datePublishedTagRegex.Replace(value, m => sanitizeDateParameterTag(m, replacements, out _));
-
-			// don't use alt slash
-			value = value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-
-			// don't allow double slashes
-			var sing = $"{Path.DirectorySeparatorChar}";
-			var dbl = $"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}";
-			while (value.Contains(dbl))
-				value = value.Replace(dbl, sing);
-
-			// trim. don't start or end with slash
-			while (true)
+		private static readonly List<TagCollection> chapterPropertyTags = new()
+		{
+			new PropertyTagCollection<LibraryBookDto>(caseSensative: true, StringFormatter)
 			{
-				var start = value.Length;
-				value = value
-					.Trim()
-					.Trim(Path.DirectorySeparatorChar);
-				var end = value.Length;
-				if (start == end)
-					break;
+				{ TemplateTags.Title, lb => lb.Title },
+				{ TemplateTags.TitleShort, lb => getTitleShort(lb.Title) },
+				{ TemplateTags.Series, lb => lb.SeriesName },
+			},
+			new PropertyTagCollection<MultiConvertFileProperties>(caseSensative: true, StringFormatter, IntegerFormatter, DateTimeFormatter)
+			{
+				{ TemplateTags.ChCount, m => m.PartsTotal },
+				{ TemplateTags.ChNumber, m => m.PartsPosition },
+				{ TemplateTags.ChNumber0, m => m.PartsPosition.ToString("D" + ((int)Math.Log10(m.PartsTotal) + 1)) },
+				{ TemplateTags.ChTitle, m => m.Title },
+				{ TemplateTags.FileDate, m => m.FileDate }
 			}
+		};

-			return value;
+		private static readonly ConditionalTagCollection<LibraryBookDto> conditionalTags = new()
+		{
+			{ TemplateTags.IfSeries, lb => lb.IsSeries },
+			{ TemplateTags.IfPodcast, lb => lb.IsPodcast },
+			{ TemplateTags.IfBookseries, lb => lb.IsSeries && !lb.IsPodcast },
+		};
+
+		#endregion
+
+		#region Tag Formatters
+
+		private static string getTitleShort(string title)
+			=> title?.IndexOf(':') > 0 ? title.Substring(0, title.IndexOf(':')) : title;
+
+		private static string getLanguageShort(string language)
+		{
+			if (language is null)
+				return null;
+
+			language = language.Trim();
+			if (language.Length <= 3)
+				return language.ToUpper();
+			return language[..3].ToUpper();
 		}

-		public class FolderTemplate : Templates
+		private static string StringFormatter(ITemplateTag templateTag, string value, string formatString)
 		{
-			public override string Name => "Folder Template";
-			public override string Description => Configuration.GetDescription(nameof(Configuration.FolderTemplate));
-			public override string DefaultTemplate { get; } = "<title short> [<id>]";
-			protected override bool IsChapterized { get; } = false;
-
-			internal FolderTemplate() : base() { }
-
-			#region validation
-			public override IEnumerable<string> GetErrors(string template)
-			{
-				// null is invalid. whitespace is valid but not recommended
-				if (template is null)
-					return new[] { ERROR_NULL_IS_INVALID };
-
-				// must be relative. no colons. all other path chars are valid enough to pass this check and will be handled on final save.
-				if (template.Contains(':'))
-					return new[] { ERROR_FULL_PATH_IS_INVALID };
-
-				// must be relative. no colons. all other path chars are valid enough to pass this check and will be handled on final save.
-				if (ReplacementCharacters.ContainsInvalidPathChar(template.Replace("<", "").Replace(">", "")))
-					return new[] { ERROR_INVALID_FILE_NAME_CHAR };
-
-				return Valid;
-			}
-			
-			public override IEnumerable<string> GetWarnings(string template) => GetStandardWarnings(template);
-			#endregion
-
-			#region to file name
-			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
-			public string GetFilename(LibraryBookDto libraryBookDto, string baseDir = null)
-				=> getFileNamingTemplate(libraryBookDto, Configuration.Instance.FolderTemplate, baseDir ?? AudibleFileStorage.BooksDirectory, null, Configuration.Instance.ReplacementCharacters)
-				.GetFilePath(string.Empty);
-			#endregion
+			if (string.Compare(formatString, "u", ignoreCase: true) == 0) return value?.ToUpper();
+			else if (string.Compare(formatString, "l", ignoreCase: true) == 0) return value?.ToLower();
+			else return value;
 		}

-		public class FileTemplate : Templates
+		private static string IntegerFormatter(ITemplateTag templateTag, int value, string formatString)
 		{
-			public override string Name => "File Template";
-			public override string Description => Configuration.GetDescription(nameof(Configuration.FileTemplate));
-			public override string DefaultTemplate { get; } = "<title> [<id>]";
-			protected override bool IsChapterized { get; } = false;
-
-			internal FileTemplate() : base() { }
-
-			#region validation
-			public override IEnumerable<string> GetErrors(string template) => GetFileErrors(template);
-
-			public override IEnumerable<string> GetWarnings(string template) => GetStandardWarnings(template);
-			#endregion
-
-			#region to file name
-			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
-			public string GetFilename(LibraryBookDto libraryBookDto, string dirFullPath, string extension, bool returnFirstExisting = false)
-				=> getFileNamingTemplate(libraryBookDto, Configuration.Instance.FileTemplate, dirFullPath, extension, Configuration.Instance.ReplacementCharacters)
-				.GetFilePath(extension, returnFirstExisting);
-			#endregion
+			if (int.TryParse(formatString, out var numDigits))
+				return value.ToString($"D{numDigits}");
+			return value.ToString();
 		}

-		public class ChapterFileTemplate : Templates
+		private static string DateTimeFormatter(ITemplateTag templateTag, DateTime value, string formatString)
 		{
-			public override string Name => "Chapter File Template";
-			public override string Description => Configuration.GetDescription(nameof(Configuration.ChapterFileTemplate));
-			public override string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
-			protected override bool IsChapterized { get; } = true;
-
-			internal ChapterFileTemplate() : base() { }
-
-			#region validation
-			public override IEnumerable<string> GetErrors(string template) => GetFileErrors(template);
-
-			public override IEnumerable<string> GetWarnings(string template)
-			{
-				var warnings = GetStandardWarnings(template).ToList();
-				if (template is null)
-					return warnings;
-
-				// recommended to incl. <ch#> or <ch# 0>
-				if (!ContainsTag(template, TemplateTags.ChNumber.TagName) && !ContainsTag(template, TemplateTags.ChNumber0.TagName))
-					warnings.Add(WARNING_NO_CHAPTER_NUMBER_TAG);
-
-				return warnings;
-			}
-			#endregion
-
-			#region to file name
-			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
-			public string GetFilename(LibraryBookDto libraryBookDto, AaxDecrypter.MultiConvertFileProperties props)
-				=> GetPortionFilename(libraryBookDto, Configuration.Instance.ChapterFileTemplate, props, AudibleFileStorage.DecryptInProgressDirectory);
-
-			public string GetPortionFilename(LibraryBookDto libraryBookDto, string template,  AaxDecrypter.MultiConvertFileProperties props, string fullDirPath, ReplacementCharacters replacements = null)
-			{
-				if (string.IsNullOrWhiteSpace(template)) return string.Empty;
-
-				replacements ??= Configuration.Instance.ReplacementCharacters;
-				var fileExtension = Path.GetExtension(props.OutputFileName);
-				var fileNamingTemplate = getFileNamingTemplate(libraryBookDto, template, fullDirPath, fileExtension, replacements);
-
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChCount, props.PartsTotal);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber, props.PartsPosition);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(props.PartsPosition, props.PartsTotal));
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChTitle, props.Title ?? "");
-
-				foreach (Match dateTag in fileDateTagRegex.Matches(fileNamingTemplate.Template))
-				{
-					var sanitizedTag = sanitizeDateParameterTag(dateTag, replacements, out string sanitizedFormatter);
-					if (tryFormatDateTime(props.FileDate, sanitizedFormatter, replacements, out var formattedDateString))
-						fileNamingTemplate.ParameterReplacements[sanitizedTag] = formattedDateString;
-				}
-
-				return fileNamingTemplate.GetFilePath(fileExtension).PathWithoutPrefix;
-			}
-			#endregion
+			if (string.IsNullOrEmpty(formatString))
+				return value.ToString(TemplateTags.DEFAULT_DATE_FORMAT);
+			return value.ToString(formatString);
 		}

-		public class ChapterTitleTemplate : Templates
+		#endregion
+
+		public class FolderTemplate : Templates, ITemplate
 		{
-			private List<TemplateTags> _templateTags { get; } = new()
-			{
-				TemplateTags.Title,
-				TemplateTags.TitleShort,
-				TemplateTags.Series,
-				TemplateTags.ChCount,
-				TemplateTags.ChNumber,
-				TemplateTags.ChNumber0,
-				TemplateTags.ChTitle,
-			};
-			public override string Name => "Chapter Title Template";
+			public static string Name { get; }= "Folder Template";
+			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.FolderTemplate));
+			public static string DefaultTemplate { get; } = "<title short> [<id>]";
+			public static IEnumerable<TagCollection> TagCollections => new TagCollection[] { filePropertyTags, conditionalTags };

-			public override string Description => Configuration.GetDescription(nameof(Configuration.ChapterTitleTemplate));
+			public override IEnumerable<string> Errors
+				=> TemplateText?.Length >= 2 && Path.IsPathFullyQualified(TemplateText) ? base.Errors.Append(ERROR_FULL_PATH_IS_INVALID) : base.Errors;

-			public override string DefaultTemplate => "<ch#> - <title short>: <ch title>";
+			protected override List<string> GetTemplatePartsStrings(List<TemplatePart> parts, ReplacementCharacters replacements)
+				=> parts
+				.Select(tp => tp.TemplateTag is null
+					//FolderTemplate literals can have directory separator characters
+					? replacements.ReplacePathChars(tp.Value.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar))
+					: replacements.ReplaceFilenameChars(tp.Value)
+				).ToList();
+		}

-			protected override bool IsChapterized => true;
+		public class FileTemplate : Templates, ITemplate
+		{
+			public static string Name { get; } = "File Template";
+			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.FileTemplate));
+			public static string DefaultTemplate { get; } = "<title> [<id>]";
+			public static IEnumerable<TagCollection> TagCollections { get; } = new TagCollection[] { filePropertyTags, conditionalTags };
+		}

-			public override IEnumerable<string> GetErrors(string template)
-				=> new List<string>();
+		public class ChapterFileTemplate : Templates, ITemplate
+		{
+			public static string Name { get; } = "Chapter File Template";
+			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.ChapterFileTemplate));
+			public static string DefaultTemplate { get; } = "<title> [<id>] - <ch# 0> - <ch title>";
+			public static IEnumerable<TagCollection> TagCollections { get; } = chapterPropertyTags.Append(filePropertyTags).Append(conditionalTags);

-			public override IEnumerable<string> GetWarnings(string template)
-				=> GetStandardWarnings(template).ToList();
+			public override IEnumerable<string> Warnings
+				=> NamingTemplate.TagsInUse.Any(t => t.TagName.In(TemplateTags.ChNumber.TagName, TemplateTags.ChNumber0.TagName))
+				? base.Warnings
+				: base.Warnings.Append(WARNING_NO_CHAPTER_NUMBER_TAG);
+		}

-			public string GetTitle(LibraryBookDto libraryBookDto, AaxDecrypter.MultiConvertFileProperties props)
-				=> GetPortionTitle(libraryBookDto, Configuration.Instance.ChapterTitleTemplate, props);
+		public class ChapterTitleTemplate : Templates, ITemplate
+		{
+			public static string Name { get; } = "Chapter Title Template";
+			public static string Description { get; } = Configuration.GetDescription(nameof(Configuration.ChapterTitleTemplate));
+			public static string DefaultTemplate => "<ch#> - <title short>: <ch title>";
+			public static IEnumerable<TagCollection> TagCollections { get; } = chapterPropertyTags.Append(conditionalTags);

-			public string GetPortionTitle(LibraryBookDto libraryBookDto, string template, AaxDecrypter.MultiConvertFileProperties props)
-			{
-				if (string.IsNullOrEmpty(template)) return string.Empty;
-
-				ArgumentValidator.EnsureNotNull(libraryBookDto, nameof(libraryBookDto));
-
-				var fileNamingTemplate = new MetadataNamingTemplate(template);
-			  
-				var title = libraryBookDto.Title ?? "";
-				var titleShort = title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':'));
-
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.Title, title);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.TitleShort, titleShort);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.Series, libraryBookDto.SeriesName);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChCount, props.PartsTotal);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber, props.PartsPosition);
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(props.PartsPosition, props.PartsTotal));
-				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChTitle, props.Title ?? "");
-
-				return fileNamingTemplate.GetTagContents();
-			}
-			public override IEnumerable<TemplateTags> GetTemplateTags() => _templateTags;
+			protected override IEnumerable<string> GetTemplatePartsStrings(List<TemplatePart> parts, ReplacementCharacters replacements)
+				=> parts.Select(p => p.Value);
 		}
 	}
 }
--- a/Source/LibationFileManager/UtilityExtensions.cs
+++ b/Source/LibationFileManager/UtilityExtensions.cs
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FileManager;
-
-namespace LibationFileManager
-{
-	public static class UtilityExtensions
-	{
-		public static void AddParameterReplacement(this NamingTemplate fileNamingTemplate, TemplateTags templateTags, object value)
-			=> fileNamingTemplate.AddParameterReplacement(templateTags.TagName, value);
-
-		public static void AddUniqueParameterReplacement(this NamingTemplate namingTemplate, string key, object value)
-			=> namingTemplate.ParameterReplacements[key] = value;
-	}
-}
--- a/Source/LibationFileManager/_InternalsVisible.cs
+++ b/Source/LibationFileManager/_InternalsVisible.cs
@@ -1 +0,0 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(LibationFileManager) + ".Tests")]
--- a/Source/LibationSearchEngine/LuceneRegex.cs
+++ b/Source/LibationSearchEngine/LuceneRegex.cs
@@ -5,7 +5,7 @@ using System.Text.RegularExpressions;

 namespace LibationSearchEngine
 {
-    internal static class LuceneRegex
+    internal static partial class LuceneRegex
    {
        #region pattern pieces
        //  negative lookbehind: cannot be preceeded by an escaping \
@@ -38,28 +38,32 @@ namespace LibationSearchEngine
        private static string fieldPattern { get; } = NOT_ESCAPED + WORD_CAPTURE + FIELD_END;
        public static Regex FieldRegex { get; } = new Regex(fieldPattern, RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);

-        // auto-pad numbers to 8 char.s. This will match int.s and dates (yyyyMMdd)
-        //   positive look behind: beginning  space  {  [  :
-        //   positive look ahead: end  space  ]  }
-        public static Regex NumbersRegex { get; } = new Regex(@"(?<=^|\s|\{|\[|:)(\d+\.?\d*)(?=$|\s|\]|\})", RegexOptions.Compiled);
+		/// <summary>
+		/// auto-pad numbers to 8 char.s. This will match int.s and dates (yyyyMMdd)
+		///   positive look behind: beginning  space  {  [  :
+		///   positive look ahead: end  space  ]  }
+		/// </summary>

-        /// <summary>
-        /// proper bools are single keywords which are turned into keyword:True
-        /// if bordered by colons or inside brackets, they are not stand-alone bool keywords
-        /// the negative lookbehind and lookahead patterns prevent bugs where a bool keyword is also a user-defined tag:
-        ///   [israted]
-        ///     parseTag => tags:israted
-        ///     replaceBools => tags:israted:True
-        ///   or
-        ///     [israted]
-        ///       replaceBools => israted:True
-        ///         parseTag => [israted:True]
-        /// also don't want to apply :True where the value already exists:
-        ///   israted:false => israted:false:True
-        ///   
-        /// despite using parans, lookahead and lookbehind are zero-length assertions which do not capture. therefore the bool search keyword is still $1 since it's the first and only capture
-        /// </summary>
-        private static string boolPattern_parameterized { get; }
+		[GeneratedRegex(@"(?<=^|\s|\{|\[|:)(\d+\.?\d*)(?=$|\s|\]|\})", RegexOptions.Compiled)]
+		public static partial Regex NumbersRegex();
+
+		/// <summary>
+		/// proper bools are single keywords which are turned into keyword:True
+		/// if bordered by colons or inside brackets, they are not stand-alone bool keywords
+		/// the negative lookbehind and lookahead patterns prevent bugs where a bool keyword is also a user-defined tag:
+		///   [israted]
+		///     parseTag => tags:israted
+		///     replaceBools => tags:israted:True
+		///   or
+		///     [israted]
+		///       replaceBools => israted:True
+		///         parseTag => [israted:True]
+		/// also don't want to apply :True where the value already exists:
+		///   israted:false => israted:false:True
+		///   
+		/// despite using parans, lookahead and lookbehind are zero-length assertions which do not capture. therefore the bool search keyword is still $1 since it's the first and only capture
+		/// </summary>
+		private static string boolPattern_parameterized { get; }
            = @"
 ### IMPORTANT: 'ignore whitespace' is only partially honored in character sets
 ### - new lines are ok
@@ -95,5 +99,5 @@ namespace LibationSearchEngine

            return regex;
        }
-    }
+	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Robert McRackan	2f347e83e8	fix linux 'can update'. upgrade aaxclean	2023-02-16 07:57:36 -05:00
rmcrackan	080a74884d	Update InstallOnMac.md new mac setup video	2023-02-16 07:44:09 -05:00
Robert McRackan	2dbeb64c38	incr ver. updates for mac and linux	2023-02-15 08:38:13 -05:00
rmcrackan	bb508c0718	Merge pull request #489 from Mbucari/master Mac App Bundle and added mp3 conversion support on mac	2023-02-15 08:33:06 -05:00
Michael Bucari-Tovo	9a450b0d63	add 'macOS' to mac bundle name	2023-02-15 06:31:09 -07:00
Michael Bucari-Tovo	c1de0e60d2	Hopefully fix #492	2023-02-14 23:07:40 -07:00
Mbucari	dc7c03661d	Add auto update to linux and macos	2023-02-14 23:06:14 -07:00
Mbucari	952eee6d32	Merge branch 'rmcrackan:master' into master	2023-02-13 21:42:11 -07:00
Michael Bucari-Tovo	472a0f30b9	Launch hangover from Libation app bundle for mac	2023-02-13 21:40:53 -07:00
Robert McRackan	73533c58a8	update dependencies	2023-02-13 21:14:56 -05:00
Mbucari	65ef018719	Move NameListFormatter to its own class	2023-02-13 10:09:13 -07:00
Mbucari	f0ca349539	Update UNSAFE_MigrationHelper with new appsettings.json getter	2023-02-13 09:03:03 -07:00
Mbucari	500b287721	Fix #490	2023-02-13 08:08:10 -07:00
Mbucari	21f3ae45d3	Delete deb.yml	2023-02-12 22:25:39 -07:00
Michael Bucari-Tovo	d496564f0d	Edit Mac and Linux bundle build workflows	2023-02-12 21:50:33 -07:00
Michael Bucari-Tovo	6fdd6293ce	Ensure appsettings.json is created in a writable location.	2023-02-12 15:32:51 -07:00
Michael Bucari-Tovo	3bca495521	Add MacOS app bundle workflow	2023-02-11 23:38:17 -07:00
Michael Bucari-Tovo	0fb580f1a5	Ensure appsettings.json is created in a writable location.	2023-02-11 20:06:04 -07:00
Michael Bucari-Tovo	a7cd47e0b1	Update AAXClean	2023-02-11 18:34:07 -07:00
Robert McRackan	30aecedfae	incr ver	2023-02-10 23:16:22 -05:00
rmcrackan	e72799efe5	Merge pull request #487 from Mbucari/master Custom author and narrator names formatting and batch locate books	2023-02-10 23:14:31 -05:00
Michael Bucari-Tovo	ee8c0ae27b	Use new .NET regular expression source generators	2023-02-10 19:45:52 -07:00
Mbucari	5b4a4341ad	More agressive garbage collection	2023-02-10 15:03:43 -07:00
Mbucari	56823c1105	Move FindAudiobooks() to AudioFileStorage	2023-02-10 14:54:29 -07:00
Mbucari	1f4ada604a	Make suggested changes	2023-02-10 14:37:28 -07:00
Mbucari	3a4ab80892	Add human name parsing and formatting to naming templates	2023-02-10 12:53:12 -07:00
Mbucari	bba9c2ba7b	Add Locate Audiobooks function (#485 )	2023-02-10 09:35:21 -07:00
Robert McRackan	c4acd5d208	incr ver	2023-02-08 13:56:13 -05:00
rmcrackan	381440db4c	Merge pull request #479 from Mbucari/master Fix #478 and other stuff I'd already worked on	2023-02-08 13:43:56 -05:00
Michael Bucari-Tovo	00c8be1f7e	Create LibationUiBase for shared UI code	2023-02-08 09:30:13 -07:00
rmcrackan	d665122aa2	Update GettingStarted.md Classic vs Chardonnay	2023-02-08 07:49:18 -05:00
Michael Bucari-Tovo	bb40df5fa3	Fix #478	2023-02-07 22:58:29 -07:00
Mbucari	e3c9f70dff	Move shared GUI code into AppScaffolding	2023-02-06 16:04:58 -07:00
Mbucari	b351033cec	Improve download and convert speed estimate	2023-02-06 15:54:12 -07:00
Mbucari	18f69bc73d	Refactor Naming Template	2023-02-06 15:24:18 -07:00
Robert McRackan	39fe7b79d2	Bug fix #474	2023-02-06 08:35:24 -05:00
rmcrackan	85769d797b	Merge pull request #473 from Mbucari/master Made changes discussed in previous PR and fixed #472	2023-02-04 17:32:53 -05:00
Michael Bucari-Tovo	9a80f18e1c	Rename ConditionalTagClass to ConditionalTagCollection	2023-02-04 15:19:47 -07:00
Michael Bucari-Tovo	aec8305e52	Fix #472	2023-02-04 12:49:59 -07:00
Michael Bucari-Tovo	a672174a9b	Refactor Naming Templates	2023-02-04 12:49:48 -07:00
Mbucari	6f490b4491	Rename TagClass to TagCollection	2023-02-03 17:14:04 -07:00
Mbucari	5917d059e4	Add Enumerable initializers	2023-02-03 17:03:15 -07:00
Robert McRackan	40602c7626	incr ver	2023-02-03 17:26:17 -05:00
rmcrackan	7d5ee2afa8	Merge pull request #471 from Mbucari/master Add a more general NamingTemplate	2023-02-03 17:24:37 -05:00
Mbucari	08b6f8fa11	Add test	2023-02-03 14:46:48 -07:00
Mbucari	5f9699aa3b	Merge branch 'master' of https://github.com/Mbucari/Libation	2023-02-03 14:43:42 -07:00
Mbucari	70607aaaf4	Documentation	2023-02-03 14:43:35 -07:00
Mbucari	1d96d39af7	Add Naming Template Documentation	2023-02-03 14:33:11 -07:00
Mbucari	5557772957	Add conditional negation	2023-02-03 11:47:55 -07:00
Mbucari	5c7db6cd23	Add <series#> tag zero padding (#466 )	2023-02-03 11:31:15 -07:00
Mbucari	c72b64d74c	Properly truncate filenames	2023-02-03 09:53:40 -07:00
Mbucari	20474e0b3c	Add a more general NamingTemplate	2023-02-02 22:48:27 -07:00
Robert McRackan	867085600c	New feature #469 - <language> and <language short> template options	2023-02-01 12:12:50 -05:00
rmcrackan	74290ec609	Merge pull request #468 from rmcrackan/dependabot/github_actions/docker/build-push-action-4 Bump docker/build-push-action from 3 to 4	2023-01-31 10:18:40 -05:00
dependabot[bot]	5ee555e60c	Bump docker/build-push-action from 3 to 4 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-31 14:11:36 +00:00
Robert McRackan	a36c28d48f	incr. ver.	2023-01-30 21:24:54 -05:00
rmcrackan	0877f2c042	Merge pull request #464 from Mbucari/master Fix #463	2023-01-25 20:48:58 -05:00
Mbucari	2baf5243ea	Fix #463	2023-01-25 14:23:02 -07:00
rmcrackan	b7e71f5812	Merge pull request #462 from Mbucari/master Refactor AaxDecrypter	2023-01-25 07:06:37 -05:00
Michael Bucari-Tovo	2ed1076fab	Cleanup	2023-01-24 23:35:05 -07:00
Michael Bucari-Tovo	0b20aa751f	Only Dispose of NFS on disposing	2023-01-24 23:00:07 -07:00
Michael Bucari-Tovo	05a4ece8d1	Merged	2023-01-24 22:27:31 -07:00
Michael Bucari-Tovo	25b37c6266	Refactor AaxDecrypter	2023-01-24 22:25:55 -07:00
Robert McRackan	b668cff0ac	Update dependenciesd. Build is broken until the ambiguous ref.s moved into Dinah.Core are resolved	2023-01-24 22:40:08 -05:00
				`@@ -1 +0,0 @@`
				`[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileLiberator) + ".Tests")]`