diff --git a/Source/LibationAvalonia/App.axaml b/Source/LibationAvalonia/App.axaml
index da3b6fad..7677075b 100644
--- a/Source/LibationAvalonia/App.axaml
+++ b/Source/LibationAvalonia/App.axaml
@@ -1,7 +1,8 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:LibationAvalonia"
-			 x:Class="LibationAvalonia.App">
+			 x:Class="LibationAvalonia.App"
+             Name="Libation">
 
 	<Application.DataTemplates>
 		<local:ViewLocator/>
@@ -69,4 +70,9 @@
 			</Style>
 		</Style>
 	</Application.Styles>
+
+	<NativeMenu.Menu>
+		<NativeMenu />
+	</NativeMenu.Menu>
+
 </Application>
\ No newline at end of file
diff --git a/Source/LibationAvalonia/App.axaml.cs b/Source/LibationAvalonia/App.axaml.cs
index c5e309ea..9d1c5159 100644
--- a/Source/LibationAvalonia/App.axaml.cs
+++ b/Source/LibationAvalonia/App.axaml.cs
@@ -14,6 +14,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using ReactiveUI;
+using DataLayer;
 
 namespace LibationAvalonia
 {
@@ -45,9 +47,6 @@ namespace LibationAvalonia
 		{
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
-				var acceleratorKey = Configuration.IsMacOs ? KeyModifiers.Meta : KeyModifiers.Alt;
-				AvaloniaLocator.CurrentMutable.Bind<IAccessKeyHandler>().ToFunc(() => new AccessKeyHandlerEx(acceleratorKey));
-
 				var config = Configuration.Instance;
 
 				if (!config.LibationSettingsAreValid)
@@ -219,9 +218,8 @@ namespace LibationAvalonia
 			LoadStyles();
 			var mainWindow = new MainWindow();
 			desktop.MainWindow = MainWindow = mainWindow;
-			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
-			mainWindow.OnLoad();
 			mainWindow.OnLibraryLoaded(LibraryTask.GetAwaiter().GetResult());
+			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
 			mainWindow.Show();
 		}
 
diff --git a/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml b/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml
index 45f6fe02..c66c7a1b 100644
--- a/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml
+++ b/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml
@@ -27,7 +27,7 @@
 				<DataTemplate>
 
 					<TextBlock
-						Text="{Binding, Converter={StaticResource KnownDirectoryConverter}}" />
+						Text="{Binding Converter={StaticResource KnownDirectoryConverter}}" />
 
 				</DataTemplate>
 			</ComboBox.ItemTemplate>
diff --git a/Source/LibationAvalonia/Controls/GroupBox.axaml b/Source/LibationAvalonia/Controls/GroupBox.axaml
index 91246b19..e94dfe41 100644
--- a/Source/LibationAvalonia/Controls/GroupBox.axaml
+++ b/Source/LibationAvalonia/Controls/GroupBox.axaml
@@ -6,9 +6,6 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="LibationAvalonia.Controls.GroupBox">
 
-	<Design.DataContext>
-	</Design.DataContext>
-
 	<ContentControl.Styles>
 		<Style Selector="controls|GroupBox Border">
 			<Setter Property="BorderBrush" Value="DarkGray" />
diff --git a/Source/LibationAvalonia/Dialogs/AboutDialog.axaml b/Source/LibationAvalonia/Dialogs/AboutDialog.axaml
new file mode 100644
index 00000000..0468bebb
--- /dev/null
+++ b/Source/LibationAvalonia/Dialogs/AboutDialog.axaml
@@ -0,0 +1,13 @@
+<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="550" d:DesignHeight="450"
+		MinWidth="550" MinHeight="450"
+		Width="650" Height="500"
+        x:Class="LibationAvalonia.Dialogs.AboutDialog"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        Title="About Libation"
+		Icon="/Assets/libation.ico">
+  Welcome to Avalonia!
+</Window>
diff --git a/Source/LibationAvalonia/Dialogs/AboutDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/AboutDialog.axaml.cs
new file mode 100644
index 00000000..cf508104
--- /dev/null
+++ b/Source/LibationAvalonia/Dialogs/AboutDialog.axaml.cs
@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class AboutDialog : DialogWindow
+	{
+		public AboutDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
index cb88ce89..f47dee76 100644
--- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
@@ -65,13 +65,10 @@
 					Binding="{Binding LibraryScan, Mode=TwoWay}"
 					Header="Include in&#xa;library scan?"/>
 				
-				<DataGridTemplateColumn Width="2*" Header="Audible&#xa;email/login">
-					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate>
-							<TextBox Text="{Binding AccountId, Mode=TwoWay}" />
-						</DataTemplate>
-					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>
+				<DataGridTextColumn
+					Width="2*"
+					Binding="{Binding AccountId, Mode=TwoWay}"
+					Header="Audible&#xa;email/login"/>
 
 				<DataGridTemplateColumn Width="Auto" Header="Locale">
 					<DataGridTemplateColumn.CellTemplate>
diff --git a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
index a6e3c036..ea9980a5 100644
--- a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
@@ -40,7 +40,7 @@
 				<Button Grid.Column="1" IsVisible="{Binding HasButton2}" MinWidth="75" MinHeight="28" Name="Button2" Click="Button2_Click" Margin="5">
 					<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">
+				<Button Grid.Column="2" IsVisible="{Binding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Margin="5">
 					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button3Text}"/>
 				</Button>
 			</StackPanel>
diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj
index 47eb7468..63ea3003 100644
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -51,8 +51,8 @@
 		<Compile Update="Views\LiberateStatusButton.axaml.cs">
 		  <DependentUpon>LiberateStatusButton.axaml</DependentUpon>
 		</Compile>
-		<Compile Update="Views\MainWindow.*.cs">
-			<DependentUpon>MainWindow.axaml</DependentUpon>
+		<Compile Update="ViewModels\MainVM.*.cs">
+			<DependentUpon>MainVM.cs</DependentUpon>
 		</Compile>
 	</ItemGroup>
 
diff --git a/Source/LibationAvalonia/AccessKeyHandlerEx.cs b/Source/LibationAvalonia/MacAccessKeyHandler.cs
similarity index 52%
rename from Source/LibationAvalonia/AccessKeyHandlerEx.cs
rename to Source/LibationAvalonia/MacAccessKeyHandler.cs
index 9369eb14..bee7eebf 100644
--- a/Source/LibationAvalonia/AccessKeyHandlerEx.cs
+++ b/Source/LibationAvalonia/MacAccessKeyHandler.cs
@@ -1,54 +1,44 @@
 using Avalonia;
 using Avalonia.Input;
-using System.Linq;
 
 namespace LibationAvalonia
 {
-    internal class AccessKeyHandlerEx : AccessKeyHandler
+    internal class MacAccessKeyHandler : AccessKeyHandler
     {
-        public KeyModifiers KeyModifier { get; }
-        private readonly Key[] ActivatorKeys;
-
-        public AccessKeyHandlerEx(KeyModifiers menuKeyModifier)
-        {
-			KeyModifier = menuKeyModifier;
-			ActivatorKeys = menuKeyModifier switch
-			{
-				KeyModifiers.Alt => new[] { Key.LeftAlt, Key.RightAlt },
-				KeyModifiers.Control => new[] { Key.LeftCtrl, Key.RightCtrl },
-				KeyModifiers.Meta => new[] { Key.LWin, Key.RWin },
-				_ => throw new System.NotSupportedException($"{nameof(KeyModifiers)}.{menuKeyModifier} is not implemented"),
-			};
-		}
-
         protected override void OnPreviewKeyDown(object sender, KeyEventArgs e)
         {
-			if (ActivatorKeys.Contains(e.Key) && e.KeyModifiers.HasAllFlags(KeyModifier))
+			if (e.Key is Key.LWin or Key.RWin)
             {
                 var newArgs = new KeyEventArgs { Key = Key.LeftAlt, Handled = e.Handled };
                 base.OnPreviewKeyDown(sender, newArgs);
                 e.Handled = newArgs.Handled;
             }
-        }
+            else if (e.Key is not Key.LeftAlt and not Key.RightAlt)
+				base.OnPreviewKeyDown(sender, e);
+		}
 
         protected override void OnPreviewKeyUp(object sender, KeyEventArgs e)
         {
-            if (ActivatorKeys.Contains(e.Key) && e.KeyModifiers.HasAllFlags(KeyModifier))
+            if (e.Key is Key.LWin or Key.RWin)
             {
                 var newArgs = new KeyEventArgs { Key = Key.LeftAlt,  Handled = e.Handled };
                 base.OnPreviewKeyUp(sender, newArgs);
                 e.Handled = newArgs.Handled;
-            }
-        }
+			}
+			else if (e.Key is not Key.LeftAlt and not Key.RightAlt)
+				base.OnPreviewKeyDown(sender, e);
+		}
 
         protected override void OnKeyDown(object sender, KeyEventArgs e)
         {
-            if (e.KeyModifiers.HasAllFlags(KeyModifier))
+            if (e.KeyModifiers.HasAllFlags(KeyModifiers.Meta))
             {
                 var newArgs = new KeyEventArgs { Key = e.Key, Handled = e.Handled, KeyModifiers = KeyModifiers.Alt };
                 base.OnKeyDown(sender, newArgs);
                 e.Handled = newArgs.Handled;
-            }
-        }
+			}
+			else if (!e.KeyModifiers.HasFlag(KeyModifiers.Alt))
+				base.OnPreviewKeyDown(sender, e);
+		}
     }
 }
diff --git a/Source/LibationAvalonia/ViewModels/MainVM.BackupCounts.cs b/Source/LibationAvalonia/ViewModels/MainVM.BackupCounts.cs
new file mode 100644
index 00000000..ed3cfd5f
--- /dev/null
+++ b/Source/LibationAvalonia/ViewModels/MainVM.BackupCounts.cs
@@ -0,0 +1,58 @@
+using ApplicationServices;
+using Avalonia.Threading;
+using ReactiveUI;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.ViewModels
+{
+	partial class MainVM
+	{
+		private Task<LibraryCommands.LibraryStats> updateCountsTask;
+		private LibraryCommands.LibraryStats _libraryStats;
+
+		/// <summary> The "Begin Book and PDF Backup" menu item header text </summary>
+		public string BookBackupsToolStripText { get; private set; } = "Begin Book and PDF Backups: 0";
+		/// <summary> The "Begin PDF Only Backup" menu item header text </summary>
+		public string PdfBackupsToolStripText { get; private set; } = "Begin PDF Only Backups: 0";
+
+		/// <summary> The user's library statistics </summary>
+		public LibraryCommands.LibraryStats LibraryStats
+		{
+			get => _libraryStats;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _libraryStats, value);
+
+				BookBackupsToolStripText
+					= LibraryStats.HasPendingBooks
+					? "Begin " + menufyText($"Book and PDF Backups: {LibraryStats.PendingBooks} remaining")
+					: "All books have been liberated";
+
+				PdfBackupsToolStripText
+					= LibraryStats.pdfsNotDownloaded > 0
+					? "Begin " + menufyText($"PDF Only Backups: {LibraryStats.pdfsNotDownloaded} remaining")
+					: "All PDFs have been downloaded";
+
+				this.RaisePropertyChanged(nameof(BookBackupsToolStripText));
+				this.RaisePropertyChanged(nameof(PdfBackupsToolStripText));
+			}
+		}
+
+		private void Configure_BackupCounts()
+		{
+			MainWindow.Loaded += setBackupCounts;
+			LibraryCommands.LibrarySizeChanged += setBackupCounts;
+			LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
+		}
+
+		private async void setBackupCounts(object _, object __)
+		{
+			if (updateCountsTask?.IsCompleted ?? true)
+			{
+				updateCountsTask = Task.Run(() => LibraryCommands.GetCounts());
+				var stats = await updateCountsTask;
+				await Dispatcher.UIThread.InvokeAsync(() => LibraryStats = stats);
+			}
+		}
+	}
+}
diff --git a/Source/LibationAvalonia/Views/MainWindow.Export.cs b/Source/LibationAvalonia/ViewModels/MainVM.Export.cs
similarity index 76%
rename from Source/LibationAvalonia/Views/MainWindow.Export.cs
rename to Source/LibationAvalonia/ViewModels/MainVM.Export.cs
index 7bcd0fb9..c29f90ce 100644
--- a/Source/LibationAvalonia/Views/MainWindow.Export.cs
+++ b/Source/LibationAvalonia/ViewModels/MainVM.Export.cs
@@ -3,21 +3,22 @@ using Avalonia.Platform.Storage;
 using FileManager;
 using LibationFileManager;
 using System;
+using System.Threading.Tasks;
 
-namespace LibationAvalonia.Views
+namespace LibationAvalonia.ViewModels
 {
-	public partial class MainWindow
+	partial class MainVM
 	{
 		private void Configure_Export() { }
 
-		public async void exportLibraryToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public async Task ExportLibraryAsync()
 		{
 			try
 			{
 				var options = new FilePickerSaveOptions
 				{
 					Title = "Where to export Library",
-					SuggestedStartLocation = await StorageProvider.TryGetFolderFromPathAsync(Configuration.Instance.Books.PathWithoutPrefix),
+					SuggestedStartLocation = await MainWindow.StorageProvider.TryGetFolderFromPathAsync(Configuration.Instance.Books.PathWithoutPrefix),
 					SuggestedFileName = $"Libation Library Export {DateTime.Now:yyyy-MM-dd}",
 					DefaultExtension = "xlsx",
 					ShowOverwritePrompt = true,
@@ -43,7 +44,7 @@ namespace LibationAvalonia.Views
 					}
 				};
 
-				var selectedFile = (await StorageProvider.SaveFilePickerAsync(options))?.TryGetLocalPath();
+				var selectedFile = (await MainWindow.StorageProvider.SaveFilePickerAsync(options))?.TryGetLocalPath();
 
 				if (selectedFile is null) return;
 
@@ -66,7 +67,7 @@ namespace LibationAvalonia.Views
 			}
 			catch (Exception ex)
 			{
-				await MessageBox.ShowAdminAlert(this, "Error attempting to export your library.", "Error exporting", ex);
+				await MessageBox.ShowAdminAlert(MainWindow, "Error attempting to export your library.", "Error exporting", ex);
 			}
 		}
 	}
diff --git a/Source/LibationAvalonia/ViewModels/MainVM.Filters.cs b/Source/LibationAvalonia/ViewModels/MainVM.Filters.cs
new file mode 100644
index 00000000..3a961c1b
--- /dev/null
+++ b/Source/LibationAvalonia/ViewModels/MainVM.Filters.cs
@@ -0,0 +1,108 @@
+using Avalonia;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Data;
+using LibationFileManager;
+using ReactiveUI;
+using System;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.ViewModels
+{
+	partial class MainVM
+	{
+		private string lastGoodFilter = "";
+		private string _filterString;
+		private bool _firstFilterIsDefault = true;
+
+		/// <summary> Library filterting query </summary>
+		public string FilterString { get => _filterString; set => this.RaiseAndSetIfChanged(ref _filterString, value); }
+		public AvaloniaList<Control> QuickFilterMenuItems { get; } = new();
+
+		/// <summary> Indicates if the first quick filter is the default filter </summary>
+		public bool FirstFilterIsDefault
+		{
+			get => _firstFilterIsDefault;
+			set
+			{
+				if (value != _firstFilterIsDefault)
+					QuickFilters.UseDefault = value;
+				this.RaiseAndSetIfChanged(ref _firstFilterIsDefault, value);
+			}
+		}
+
+
+
+		private void Configure_Filters()
+		{
+			FirstFilterIsDefault = QuickFilters.UseDefault;
+			MainWindow.Initialized += updateFiltersMenu;
+			QuickFilters.Updated += updateFiltersMenu;
+
+			//We need to be able to dynamically add and remove menu items from the Quick Filters menu.
+			//To do that, we need quick filter's menu items source to be writable, which we can only
+			//achieve by creating the list ourselves (instead of allowing Avalonia to create it from the xaml)
+
+			QuickFilterMenuItems.Add(new MenuItem
+			{
+
+				Header = "Start Libation with 1st filter _Default",
+				Command = ReactiveCommand.Create(FirstFilterIsDefaultToggle),
+				Icon = new CheckBox
+				{
+					BorderThickness = new Thickness(0),
+					IsHitTestVisible = false,
+					[!CheckBox.IsCheckedProperty] = new Binding(nameof(FirstFilterIsDefault))
+				}
+			});
+			QuickFilterMenuItems.Add(new MenuItem { Header = "_Edit quick filters...", Command = ReactiveCommand.Create(EditQuickFiltersAsync) });
+			QuickFilterMenuItems.Add(new Separator());
+		}
+
+		public void AddQuickFilterBtn() => QuickFilters.Add(FilterString);
+		public async Task FilterBtn() => await PerformFilter(FilterString);
+		public async Task FilterHelpBtn() => await new LibationAvalonia.Dialogs.SearchSyntaxDialog().ShowDialog(MainWindow);
+		public void FirstFilterIsDefaultToggle() => FirstFilterIsDefault = !FirstFilterIsDefault;
+		public async Task EditQuickFiltersAsync() => await new LibationAvalonia.Dialogs.EditQuickFilters().ShowDialog(MainWindow);
+		public async Task PerformFilter(string filterString)
+		{
+			FilterString = filterString;
+
+			try
+			{
+				await ProductsDisplay.Filter(filterString);
+				lastGoodFilter = filterString;
+			}
+			catch (Exception ex)
+			{
+				await MessageBox.Show($"Bad filter string:\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+				// re-apply last good filter
+				await PerformFilter(lastGoodFilter);
+			}
+		}
+
+		private void updateFiltersMenu(object _ = null, object __ = null)
+		{
+			//Clear all filters
+			var quickFilterNativeMenu = (NativeMenuItem)NativeMenu.GetMenu(MainWindow).Items[3];
+			for (int i = quickFilterNativeMenu.Menu.Items.Count - 1; i >= 3; i--)
+			{
+				(((NativeMenuItem)quickFilterNativeMenu.Menu.Items[i]).Command as IDisposable).Dispose();
+				quickFilterNativeMenu.Menu.Items.RemoveAt(i);
+				QuickFilterMenuItems.RemoveAt(i);
+			}
+
+			// re-populate
+			var index = 0;
+			foreach (var filter in QuickFilters.Filters)
+			{
+				var command = ReactiveCommand.Create(async () => await PerformFilter(filter));
+
+				quickFilterNativeMenu.Menu.Items.Add(new NativeMenuItem { Header = $"{++index}: {filter}", Command = command, Gesture = new Avalonia.Input.KeyGesture(Avalonia.Input.Key.D0 + index, Avalonia.Input.KeyModifiers.Meta) });
+
+				QuickFilterMenuItems.Add(new MenuItem { Header = $"_{index}: {filter}", Command = command });
+			}
+		}		
+	}
+}
diff --git a/Source/LibationAvalonia/ViewModels/MainVM.Import.cs b/Source/LibationAvalonia/ViewModels/MainVM.Import.cs
new file mode 100644
index 00000000..1bae061f
--- /dev/null
+++ b/Source/LibationAvalonia/ViewModels/MainVM.Import.cs
@@ -0,0 +1,254 @@
+using ApplicationServices;
+using AudibleUtilities;
+using Avalonia.Controls;
+using LibationFileManager;
+using ReactiveUI;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Input;
+
+namespace LibationAvalonia.ViewModels
+{
+	public partial class MainVM
+	{
+		private bool _autoScanChecked = Configuration.Instance.AutoScan;
+		private string _removeBooksButtonText = "Remove # Books from Libation";
+		private bool _removeBooksButtonEnabled = Design.IsDesignMode;
+		private bool _removeButtonsVisible = Design.IsDesignMode;
+		private int _numAccountsScanning = 2;
+		private int _accountsCount = 0;
+
+		/// <summary> Auto scanning accounts is enables </summary>
+		public bool AutoScanChecked { get => _autoScanChecked; set => Configuration.Instance.AutoScan = this.RaiseAndSetIfChanged(ref _autoScanChecked, value); }
+		/// <summary> Display text for the "Remove # Books from Libation" button </summary>
+		public string RemoveBooksButtonText { get => _removeBooksButtonText; set => this.RaiseAndSetIfChanged(ref _removeBooksButtonText, value); }
+		/// <summary> Indicates if the "Remove # Books from Libation" button is enabled </summary>
+		public bool RemoveBooksButtonEnabled { get => _removeBooksButtonEnabled; set { this.RaiseAndSetIfChanged(ref _removeBooksButtonEnabled, value); } }
+		/// <summary> Indicates if the "Remove # Books from Libation" and "Done Removing" buttons should be visible </summary>
+		public bool RemoveButtonsVisible
+		{
+			get => _removeButtonsVisible;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _removeButtonsVisible, value);
+				this.RaisePropertyChanged(nameof(RemoveMenuItemsEnabled));
+			}
+		}
+		/// <summary> Indicates if Libation is currently scanning account(s) </summary>
+		public bool ActivelyScanning => _numAccountsScanning > 0;
+		/// <summary> Indicates if the "Remove Books" menu items are enabled</summary>
+		public bool RemoveMenuItemsEnabled => !RemoveButtonsVisible && !ActivelyScanning;
+		/// <summary> The library scanning status text </summary>
+		public string ScanningText => _numAccountsScanning == 1 ? "Scanning..." : $"Scanning {_numAccountsScanning} accounts...";
+		/// <summary> There is at least one Audible account </summary>
+		public bool AnyAccounts => AccountsCount > 0;
+		/// <summary> There is exactly one Audible account </summary>
+		public bool OneAccount => AccountsCount == 1;
+		/// <summary> There are more than 1 Audible accounts </summary>
+		public bool MultipleAccounts => AccountsCount > 1;
+		/// <summary> The number of accounts added to Libation </summary>
+		public int AccountsCount
+		{
+			get => _accountsCount;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _accountsCount, value);
+				this.RaisePropertyChanged(nameof(AnyAccounts));
+				this.RaisePropertyChanged(nameof(OneAccount));
+				this.RaisePropertyChanged(nameof(MultipleAccounts));
+			}
+		}
+
+
+		public void Configure_Import()
+		{
+			MainWindow.Loaded += (_, _) =>
+			{
+				refreshImportMenu();
+				AccountsSettingsPersister.Saved += refreshImportMenu;
+			};
+
+			AutoScanChecked = Configuration.Instance.AutoScan;
+
+			setyNumScanningAccounts(0);
+			LibraryCommands.ScanBegin += (_, accountsLength) => setyNumScanningAccounts(accountsLength);
+			LibraryCommands.ScanEnd += (_, newCount) => setyNumScanningAccounts(0);
+
+			if (!Design.IsDesignMode)
+				RemoveButtonsVisible = false;
+		}
+
+		public void ToggleAutoScan() => AutoScanChecked = !AutoScanChecked;
+
+		public async Task AddAccountsAsync()
+		{
+			await MessageBox.Show("To load your Audible library, come back here to the Import menu after adding your account");
+			await new LibationAvalonia.Dialogs.AccountsDialog().ShowDialog(MainWindow);
+		}
+
+		public async Task ScanAccountAsync()
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			await scanLibrariesAsync(persister.AccountsSettings.GetAll().FirstOrDefault());
+		}
+
+		public async Task ScanAllAccountsAsync()
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			await scanLibrariesAsync(persister.AccountsSettings.GetAll().ToArray());
+		}
+
+		public async Task ScanSomeAccountsAsync()
+		{
+			var scanAccountsDialog = new LibationAvalonia.Dialogs.ScanAccountsDialog();
+
+			if (await scanAccountsDialog.ShowDialog<DialogResult>(MainWindow) != DialogResult.OK)
+				return;
+
+			if (!scanAccountsDialog.CheckedAccounts.Any())
+				return;
+
+			await scanLibrariesAsync(scanAccountsDialog.CheckedAccounts.ToArray());
+		}
+
+		public async Task RemoveBooksAsync()
+		{
+			// if 0 accounts, this will not be visible
+			// if 1 account, run scanLibrariesRemovedBooks() on this account
+			// if multiple accounts, another menu set will open. do not run scanLibrariesRemovedBooks()
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var accounts = persister.AccountsSettings.GetAll();
+
+			if (accounts.Count != 1)
+				return;
+
+			var firstAccount = accounts.Single();
+			await scanLibrariesRemovedBooks(firstAccount);
+		}
+
+		// selectively remove books from all accounts
+		public async Task RemoveBooksAllAsync()
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var allAccounts = persister.AccountsSettings.GetAll();
+			await scanLibrariesRemovedBooks(allAccounts.ToArray());
+		}
+
+		public async Task RemoveBooksBtn()
+		{
+			RemoveBooksButtonEnabled = false;
+			await ProductsDisplay.RemoveCheckedBooksAsync();
+			RemoveBooksButtonEnabled = true;
+		}
+
+		public async Task DoneRemovingBtn()
+		{
+			RemoveButtonsVisible = false;
+
+			ProductsDisplay.DoneRemovingBooks();
+
+			//Restore the filter
+			await PerformFilter(lastGoodFilter);
+		}
+
+		// selectively remove books from some accounts
+		public async Task RemoveBooksSomeAsync()
+		{
+			var scanAccountsDialog = new LibationAvalonia.Dialogs.ScanAccountsDialog();
+
+			if (await scanAccountsDialog.ShowDialog<DialogResult>(MainWindow) != DialogResult.OK)
+				return;
+
+			if (!scanAccountsDialog.CheckedAccounts.Any())
+				return;
+
+			await scanLibrariesRemovedBooks(scanAccountsDialog.CheckedAccounts.ToArray());
+		}
+
+		public async Task LocateAudiobooksAsync()
+		{
+			var locateDialog = new LibationAvalonia.Dialogs.LocateAudiobooksDialog();
+			await locateDialog.ShowDialog(MainWindow);
+		}
+
+		private void setyNumScanningAccounts(int numScanning)
+		{
+			_numAccountsScanning = numScanning;
+			this.RaisePropertyChanged(nameof(ActivelyScanning));
+			this.RaisePropertyChanged(nameof(RemoveMenuItemsEnabled));
+			this.RaisePropertyChanged(nameof(ScanningText));
+		}
+
+		private async Task scanLibrariesRemovedBooks(params Account[] accounts)
+		{
+			//This action is meant to operate on the entire library.
+			//For removing books within a filter set, use
+			//Visible Books > Remove from library
+
+			await ProductsDisplay.Filter(null);
+
+			RemoveBooksButtonEnabled = true;
+			RemoveButtonsVisible = true;
+
+			await ProductsDisplay.ScanAndRemoveBooksAsync(accounts);
+		}
+
+		private async Task scanLibrariesAsync(params Account[] accounts)
+		{
+			try
+			{
+				var (totalProcessed, newAdded) = await LibraryCommands.ImportAccountAsync(LibationAvalonia.Dialogs.Login.AvaloniaLoginChoiceEager.ApiExtendedFunc, accounts);
+
+				// this is here instead of ScanEnd so that the following is only possible when it's user-initiated, not automatic loop
+				if (Configuration.Instance.ShowImportedStats && newAdded > 0)
+					await MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
+			}
+			catch (OperationCanceledException)
+			{
+				Serilog.Log.Information("Audible login attempt cancelled by user");
+			}
+			catch (Exception ex)
+			{
+				await MessageBox.ShowAdminAlert(
+					MainWindow,
+					"Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator",
+					"Error importing library",
+					ex);
+			}
+		}
+
+		private void refreshImportMenu(object _ = null, EventArgs __ = null)
+		{
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			AccountsCount = persister.AccountsSettings.Accounts.Count;
+
+			var importMenuItem = (NativeMenuItem)NativeMenu.GetMenu(MainWindow).Items[0];
+
+			for (int i = importMenuItem.Menu.Items.Count - 1; i >= 2; i--)
+				importMenuItem.Menu.Items.RemoveAt(i);
+
+			if (AccountsCount < 1)
+			{
+				importMenuItem.Menu.Items.Add(new NativeMenuItem { Header = "No accounts yet. Add Account...", Command = ReactiveCommand.Create(AddAccountsAsync) });
+			}
+			else if (AccountsCount == 1)
+			{
+				importMenuItem.Menu.Items.Add(new NativeMenuItem { Header = "Scan Library", Command = ReactiveCommand.Create(ScanAccountAsync), Gesture = new KeyGesture(Key.S, KeyModifiers.Alt | KeyModifiers.Meta)});
+				importMenuItem.Menu.Items.Add(new NativeMenuItemSeparator());
+				importMenuItem.Menu.Items.Add(new NativeMenuItem { Header = "Remove Library Books", Command = ReactiveCommand.Create(RemoveBooksAsync), Gesture = new KeyGesture(Key.R, KeyModifiers.Alt | KeyModifiers.Meta)});
+			}
+			else
+			{
+				importMenuItem.Menu.Items.Add(new NativeMenuItem { Header = "Scan Library of All Accounts", Command = ReactiveCommand.Create(ScanAllAccountsAsync), Gesture = new KeyGesture(Key.S, KeyModifiers.Alt | KeyModifiers.Meta)});
+				importMenuItem.Menu.Items.Add(new NativeMenuItem { Header = "Scan Library of Some Accounts", Command = ReactiveCommand.Create(ScanSomeAccountsAsync), Gesture = new KeyGesture(Key.S, KeyModifiers.Alt | KeyModifiers.Meta | KeyModifiers.Shift) });
+				importMenuItem.Menu.Items.Add(new NativeMenuItemSeparator());
+				importMenuItem.Menu.Items.Add(new NativeMenuItem { Header = "Remove Books from All Accounts", Command = ReactiveCommand.Create(RemoveBooksAllAsync), Gesture = new KeyGesture(Key.R, KeyModifiers.Alt | KeyModifiers.Meta)});
+				importMenuItem.Menu.Items.Add(new NativeMenuItem { Header = "Remove Books from Some Accounts", Command = ReactiveCommand.Create(RemoveBooksSomeAsync), Gesture = new KeyGesture(Key.R, KeyModifiers.Alt | KeyModifiers.Meta | KeyModifiers.Shift) });
+			}
+
+			importMenuItem.Menu.Items.Add(new NativeMenuItemSeparator());
+			importMenuItem.Menu.Items.Add(new NativeMenuItem { Header = "Locate Audiobooks...", Command = ReactiveCommand.Create(LocateAudiobooksAsync) });
+		}
+	}
+}
diff --git a/Source/LibationAvalonia/ViewModels/MainVM.Liberate.cs b/Source/LibationAvalonia/ViewModels/MainVM.Liberate.cs
new file mode 100644
index 00000000..f5487022
--- /dev/null
+++ b/Source/LibationAvalonia/ViewModels/MainVM.Liberate.cs
@@ -0,0 +1,64 @@
+using ApplicationServices;
+using LibationFileManager;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using DataLayer;
+
+namespace LibationAvalonia.ViewModels
+{
+	partial class MainVM
+	{
+		public void Configure_Liberate() { }
+
+		public void BackupAllBooks()
+		{
+			try
+			{
+				setQueueCollapseState(false);
+
+				Serilog.Log.Logger.Information("Begin backing up all library books");
+
+				ProcessQueue.AddDownloadDecrypt(
+					DbContexts
+					.GetLibrary_Flat_NoTracking()
+					.UnLiberated()
+					);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occurred while backing up all library books");
+			}
+		}
+
+		public void BackupAllPdfs()
+		{
+			setQueueCollapseState(false);
+			ProcessQueue.AddDownloadPdf(DbContexts.GetLibrary_Flat_NoTracking().Where(lb => lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated));
+		}
+
+		public async Task ConvertAllToMp3Async()
+		{
+			var result = await MessageBox.Show(MainWindow,
+				"This converts all m4b titles in your library to mp3 files. Original files are not deleted."
+				+ "\r\nFor large libraries this will take a long time and will take up more disk space."
+				+ "\r\n\r\nContinue?"
+				+ "\r\n\r\n(To always download titles as mp3 instead of m4b, go to Settings: Download my books as .MP3 files)",
+				"Convert all M4b => Mp3?",
+				MessageBoxButtons.YesNo,
+				MessageBoxIcon.Warning);
+			if (result == DialogResult.Yes)
+			{
+				setQueueCollapseState(false);
+				ProcessQueue.AddConvertMp3(DbContexts.GetLibrary_Flat_NoTracking().Where(lb => lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated && lb.Book.ContentType is ContentType.Product));
+			}
+			//Only Queue Liberated books for conversion.  This isn't a perfect filter, but it's better than nothing.
+		}
+
+		private void setQueueCollapseState(bool collapsed)
+		{
+			QueueOpen = !collapsed;
+			Configuration.Instance.SetNonString(!collapsed, nameof(QueueOpen));
+		}
+	}
+}
diff --git a/Source/LibationAvalonia/Views/MainWindow.ProcessQueue.cs b/Source/LibationAvalonia/ViewModels/MainVM.ProcessQueue.cs
similarity index 60%
rename from Source/LibationAvalonia/Views/MainWindow.ProcessQueue.cs
rename to Source/LibationAvalonia/ViewModels/MainVM.ProcessQueue.cs
index 7b3699d5..a0aab56d 100644
--- a/Source/LibationAvalonia/Views/MainWindow.ProcessQueue.cs
+++ b/Source/LibationAvalonia/ViewModels/MainVM.ProcessQueue.cs
@@ -1,35 +1,52 @@
-using DataLayer;
-using Dinah.Core;
-using LibationFileManager;
-using LibationUiBase.GridView;
+using LibationFileManager;
 using System;
 using System.Linq;
+using DataLayer;
+using Dinah.Core;
+using LibationUiBase.GridView;
+using ReactiveUI;
 
-namespace LibationAvalonia.Views
+namespace LibationAvalonia.ViewModels
 {
-	public partial class MainWindow
+	partial class MainVM
 	{
-		private void Configure_ProcessQueue()
+		private bool _queueOpen = false;
+
+		/// <summary> The Process Queue panel is open </summary>
+		public bool QueueOpen
 		{
-			var collapseState = !Configuration.Instance.GetNonString(defaultValue: true, nameof(_viewModel.QueueOpen));
-			SetQueueCollapseState(collapseState);
+			get => _queueOpen;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _queueOpen, value);
+				QueueButtonAngle = value ? 180 : 0;
+				this.RaisePropertyChanged(nameof(QueueButtonAngle));
+			}
 		}
 
-		public async void ProductsDisplay_LiberateClicked(object sender, LibraryBook libraryBook)
+		public double QueueButtonAngle { get; private set; }
+
+		private void Configure_ProcessQueue()
+		{
+			var collapseState = !Configuration.Instance.GetNonString(defaultValue: true, nameof(QueueOpen));
+			setQueueCollapseState(collapseState);
+		}
+
+		public async void LiberateClicked(LibraryBook libraryBook)
 		{
 			try
 			{
 				if (libraryBook.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload)
 				{
 					Serilog.Log.Logger.Information("Begin single book backup of {libraryBook}", libraryBook);
-					SetQueueCollapseState(false);
-					_viewModel.ProcessQueue.AddDownloadDecrypt(libraryBook);
+					setQueueCollapseState(false);
+					ProcessQueue.AddDownloadDecrypt(libraryBook);
 				}
 				else if (libraryBook.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated)
 				{
 					Serilog.Log.Logger.Information("Begin single pdf backup of {libraryBook}", libraryBook);
-					SetQueueCollapseState(false);
-					_viewModel.ProcessQueue.AddDownloadPdf(libraryBook);
+					setQueueCollapseState(false);
+					ProcessQueue.AddDownloadPdf(libraryBook);
 				}
 				else if (libraryBook.Book.Audio_Exists())
 				{
@@ -49,15 +66,15 @@ namespace LibationAvalonia.Views
 			}
 		}
 
-		public void ProductsDisplay_LiberateSeriesClicked(object sender, ISeriesEntry series)
+		public void LiberateSeriesClicked(ISeriesEntry series)
 		{
 			try
 			{
-				SetQueueCollapseState(false);
+				setQueueCollapseState(false);
 
 				Serilog.Log.Logger.Information("Begin backing up all {series} episodes", series.LibraryBook);
 
-				_viewModel.ProcessQueue.AddDownloadDecrypt(series.Children.Select(c => c.LibraryBook).UnLiberated());
+				ProcessQueue.AddDownloadDecrypt(series.Children.Select(c => c.LibraryBook).UnLiberated());
 			}
 			catch (Exception ex)
 			{
@@ -65,15 +82,15 @@ namespace LibationAvalonia.Views
 			}
 		}
 
-		public void ProductsDisplay_ConvertToMp3Clicked(object sender, LibraryBook libraryBook)
+		public void ConvertToMp3Clicked(LibraryBook libraryBook)
 		{
 			try
 			{
 				if (libraryBook.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated)
 				{
 					Serilog.Log.Logger.Information("Begin single pdf backup of {libraryBook}", libraryBook);
-					SetQueueCollapseState(false);
-					_viewModel.ProcessQueue.AddConvertMp3(libraryBook);
+					setQueueCollapseState(false);
+					ProcessQueue.AddConvertMp3(libraryBook);
 				}
 			}
 			catch (Exception ex)
@@ -81,15 +98,7 @@ namespace LibationAvalonia.Views
 				Serilog.Log.Logger.Error(ex, "An error occurred while handling the stop light button click for {libraryBook}", libraryBook);
 			}
 		}
-		private void SetQueueCollapseState(bool collapsed)
-		{
-			_viewModel.QueueOpen = !collapsed;
-			Configuration.Instance.SetNonString(!collapsed, nameof(_viewModel.QueueOpen));
-		}
 
-		public void ToggleQueueHideBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			SetQueueCollapseState(_viewModel.QueueOpen);
-		}
+		public void ToggleQueueHideBtn() => setQueueCollapseState(QueueOpen);
 	}
 }
diff --git a/Source/LibationAvalonia/Views/MainWindow.ScanAuto.cs b/Source/LibationAvalonia/ViewModels/MainVM.ScanAuto.cs
similarity index 65%
rename from Source/LibationAvalonia/Views/MainWindow.ScanAuto.cs
rename to Source/LibationAvalonia/ViewModels/MainVM.ScanAuto.cs
index 785202da..2dd4829c 100644
--- a/Source/LibationAvalonia/Views/MainWindow.ScanAuto.cs
+++ b/Source/LibationAvalonia/ViewModels/MainVM.ScanAuto.cs
@@ -1,23 +1,19 @@
 using ApplicationServices;
 using AudibleUtilities;
-using Avalonia.Controls;
 using Dinah.Core;
 using LibationFileManager;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LibationAvalonia.Views
+namespace LibationAvalonia.ViewModels
 {
-	public partial class MainWindow
+	partial class MainVM
 	{
-		private InterruptableTimer autoScanTimer;
+		private readonly InterruptableTimer autoScanTimer = new InterruptableTimer(TimeSpan.FromMinutes(5));
 
 		private void Configure_ScanAuto()
 		{
-			// creating InterruptableTimer inside 'Configure_' is a break from the pattern. As long as no one else needs to access or subscribe to it, this is ok
-			autoScanTimer = new InterruptableTimer(TimeSpan.FromMinutes(5));
-
 			// subscribe as async/non-blocking. I'd actually rather prefer blocking but real-world testing found that caused a deadlock in the AudibleAPI
 			autoScanTimer.Elapsed += async (_, __) =>
 			{
@@ -30,7 +26,7 @@ namespace LibationAvalonia.Views
 				// in autoScan, new books SHALL NOT show dialog
 				try
 				{
-					await LibraryCommands.ImportAccountAsync(Dialogs.Login.AvaloniaLoginChoiceEager.ApiExtendedFunc, accounts);
+					await LibraryCommands.ImportAccountAsync(LibationAvalonia.Dialogs.Login.AvaloniaLoginChoiceEager.ApiExtendedFunc, accounts);
 				}
 				catch (OperationCanceledException)
 				{
@@ -42,10 +38,8 @@ namespace LibationAvalonia.Views
 				}
 			};
 
-			_viewModel.AutoScanChecked = Configuration.Instance.AutoScan;
-
 			// if enabled: begin on load
-			Opened += startAutoScan;
+			MainWindow.Loaded += startAutoScan;
 
 			// if new 'default' account is added, run autoscan
 			AccountsSettingsPersister.Saving += accountsPreSave;
@@ -55,6 +49,7 @@ namespace LibationAvalonia.Views
 			Configuration.Instance.PropertyChanged += startAutoScan;
 		}
 
+
 		private List<(string AccountId, string LocaleName)> preSaveDefaultAccounts;
 		private List<(string AccountId, string LocaleName)> getDefaultAccounts()
 		{
@@ -65,32 +60,24 @@ namespace LibationAvalonia.Views
 				.Select(a => (a.AccountId, a.Locale.Name))
 				.ToList();
 		}
+
 		private void accountsPreSave(object sender = null, EventArgs e = null)
 			=> preSaveDefaultAccounts = getDefaultAccounts();
+
 		private void accountsPostSave(object sender = null, EventArgs e = null)
 		{
-			var postSaveDefaultAccounts = getDefaultAccounts();
-			var newDefaultAccounts = postSaveDefaultAccounts.Except(preSaveDefaultAccounts).ToList();
-
-			if (newDefaultAccounts.Any())
+			if (getDefaultAccounts().Except(preSaveDefaultAccounts).Any())
 				startAutoScan();
 		}
 
 		[PropertyChangeFilter(nameof(Configuration.AutoScan))]
 		private void startAutoScan(object sender = null, EventArgs e = null)
 		{
-			_viewModel.AutoScanChecked = Configuration.Instance.AutoScan;
-			if (_viewModel.AutoScanChecked)
+			AutoScanChecked = Configuration.Instance.AutoScan;
+			if (AutoScanChecked)
 				autoScanTimer.PerformNow();
 			else
 				autoScanTimer.Stop();
 		}
-		public void autoScanLibraryToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			if (sender is MenuItem mi && mi.Icon is CheckBox checkBox)
-			{
-				checkBox.IsChecked = !(checkBox.IsChecked ?? false);
-			}
-		}
 	}
 }
diff --git a/Source/LibationAvalonia/ViewModels/MainVM.Settings.cs b/Source/LibationAvalonia/ViewModels/MainVM.Settings.cs
new file mode 100644
index 00000000..58897954
--- /dev/null
+++ b/Source/LibationAvalonia/ViewModels/MainVM.Settings.cs
@@ -0,0 +1,38 @@
+using LibationFileManager;
+using ReactiveUI;
+using System;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.ViewModels
+{
+	partial class MainVM
+	{
+		private bool _menuBarVisible = !Configuration.IsMacOs;
+		public bool MenuBarVisible { get => _menuBarVisible; set => this.RaiseAndSetIfChanged(ref _menuBarVisible, value); }
+		private void Configure_Settings() { }
+
+		public Task ShowAboutAsync() => MessageBox.Show(MainWindow, $"Libation {AppScaffolding.LibationScaffolding.Variety}{Environment.NewLine}Version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}");
+		public Task ShowAccountsAsync() => new LibationAvalonia.Dialogs.AccountsDialog().ShowDialog(MainWindow);
+		public Task ShowSettingsAsync() => new LibationAvalonia.Dialogs.SettingsDialog().ShowDialog(MainWindow);
+		public Task ShowTrashBinAsync() => new LibationAvalonia.Dialogs.TrashBinDialog().ShowDialog(MainWindow);
+
+		public void LaunchHangover()
+		{
+			try
+			{
+				System.Diagnostics.Process.Start("Hangover" + (Configuration.IsWindows ? ".exe" : ""));
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Failed to launch Hangover");
+			}
+		}
+
+		public async Task StartWalkthroughAsync()
+		{
+			MenuBarVisible = true;
+			await new Walkthrough(MainWindow).RunAsync();
+			MenuBarVisible = !Configuration.IsMacOs;
+		}
+	}
+}
diff --git a/Source/LibationAvalonia/ViewModels/MainVM.VisibleBooks.cs b/Source/LibationAvalonia/ViewModels/MainVM.VisibleBooks.cs
new file mode 100644
index 00000000..075ab48d
--- /dev/null
+++ b/Source/LibationAvalonia/ViewModels/MainVM.VisibleBooks.cs
@@ -0,0 +1,202 @@
+using ApplicationServices;
+using System;
+using System.Threading.Tasks;
+using DataLayer;
+using Avalonia.Threading;
+using LibationAvalonia.Dialogs;
+using ReactiveUI;
+
+namespace LibationAvalonia.ViewModels
+{
+	partial class MainVM
+	{
+		private int _visibleNotLiberated = 1;
+		private int _visibleCount = 1;
+
+		/// <summary> The Bottom-right visible book count status text </summary>
+		public string VisibleCountText => $"Visible: {_visibleCount}";
+		/// <summary> The Visible Books menu item header text </summary>
+		public string VisibleCountMenuItemText => menufyText($"Visible Books {_visibleCount}");
+		/// <summary> Indicates if any of the books visible in the Products Display haven't been liberated </summary>
+		public bool AnyVisibleNotLiberated => _visibleNotLiberated > 0;
+		/// <summary> The "Liberate Visible Books" menu item header text (submenu item of the "Liberate Menu" menu item) </summary>
+		public string LiberateVisibleToolStripText { get; private set; } = "Liberate _Visible Books: 0";
+		/// <summary> The "Liberate" menu item header text (submenu item of the "Visible Books" menu item) </summary>
+		public string LiberateVisibleToolStripText_2 { get; private set; } = menufyText("Liberate: 0");
+
+
+		private void Configure_VisibleBooks()
+		{
+			LibraryCommands.BookUserDefinedItemCommitted += setLiberatedVisibleMenuItemAsync;
+			ProductsDisplay.VisibleCountChanged += ProductsDisplay_VisibleCountChanged;
+		}
+
+		private void setVisibleCount(int visibleCount)
+		{
+			_visibleCount = visibleCount;
+			this.RaisePropertyChanged(nameof(VisibleCountText));
+			this.RaisePropertyChanged(nameof(VisibleCountMenuItemText));
+		}
+		private void setVisibleNotLiberatedCount(int visibleNotLiberated)
+		{
+			_visibleNotLiberated = visibleNotLiberated;
+
+			LiberateVisibleToolStripText
+				= AnyVisibleNotLiberated
+				? "Liberate " + menufyText($"Visible Books: {visibleNotLiberated}")
+				: "All visible books are liberated";
+
+			LiberateVisibleToolStripText_2
+				= AnyVisibleNotLiberated
+				? menufyText($"Liberate: {visibleNotLiberated}")
+				: "All visible books are liberated";
+
+			this.RaisePropertyChanged(nameof(AnyVisibleNotLiberated));
+			this.RaisePropertyChanged(nameof(LiberateVisibleToolStripText));
+			this.RaisePropertyChanged(nameof(LiberateVisibleToolStripText_2));
+		}
+
+		public async void ProductsDisplay_VisibleCountChanged(object sender, int qty)
+		{
+			setVisibleCount(qty);
+			await Dispatcher.UIThread.InvokeAsync(setLiberatedVisibleMenuItem);
+		}
+
+		private async void setLiberatedVisibleMenuItemAsync(object _, object __)
+			=> await Dispatcher.UIThread.InvokeAsync(setLiberatedVisibleMenuItem);
+
+
+		public void LiberateVisible()
+		{
+			try
+			{
+				setQueueCollapseState(false);
+
+				Serilog.Log.Logger.Information("Begin backing up visible library books");
+
+				ProcessQueue.AddDownloadDecrypt(
+					ProductsDisplay
+					.GetVisibleBookEntries()
+					.UnLiberated()
+					);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error occurred while backing up visible library books");
+			}
+		}
+		public async Task ReplaceTagsAsync()
+		{
+			var dialog = new TagsBatchDialog();
+			var result = await dialog.ShowDialog<DialogResult>(MainWindow);
+			if (result != DialogResult.OK)
+				return;
+
+			var visibleLibraryBooks = ProductsDisplay.GetVisibleBookEntries();
+
+			var confirmationResult = await MessageBox.ShowConfirmationDialog(
+				MainWindow,
+				visibleLibraryBooks,
+				// do not use `$` string interpolation. See impl.
+				"Are you sure you want to replace tags in {0}?",
+				"Replace tags?");
+
+			if (confirmationResult != DialogResult.Yes)
+				return;
+
+			visibleLibraryBooks.UpdateTags(dialog.NewTags);
+		}
+
+		public async Task SetBookDownloadedAsync()
+		{
+			var dialog = new LiberatedStatusBatchManualDialog();
+			var result = await dialog.ShowDialog<DialogResult>(MainWindow);
+			if (result != DialogResult.OK)
+				return;
+
+			var visibleLibraryBooks = ProductsDisplay.GetVisibleBookEntries();
+
+			var confirmationResult = await MessageBox.ShowConfirmationDialog(
+				MainWindow,
+				visibleLibraryBooks,
+				// do not use `$` string interpolation. See impl.
+				"Are you sure you want to replace book downloaded status in {0}?",
+				"Replace downloaded status?");
+
+			if (confirmationResult != DialogResult.Yes)
+				return;
+
+			visibleLibraryBooks.UpdateBookStatus(dialog.BookLiberatedStatus);
+		}
+
+		public async Task SetPdfDownloadedAsync()
+		{
+			var dialog = new LiberatedStatusBatchManualDialog(isPdf: true);
+			var result = await dialog.ShowDialog<DialogResult>(MainWindow);
+			if (result != DialogResult.OK)
+				return;
+
+			var visibleLibraryBooks = ProductsDisplay.GetVisibleBookEntries();
+
+			var confirmationResult = await MessageBox.ShowConfirmationDialog(
+				MainWindow,
+				visibleLibraryBooks,
+				// do not use `$` string interpolation. See impl.
+				"Are you sure you want to replace PDF downloaded status in {0}?",
+				"Replace downloaded status?");
+
+			if (confirmationResult != DialogResult.Yes)
+				return;
+
+			visibleLibraryBooks.UpdatePdfStatus(dialog.BookLiberatedStatus);
+		}
+
+		public async Task SetDownloadedAutoAsync()
+		{
+			var dialog = new LiberatedStatusBatchAutoDialog();
+			var result = await dialog.ShowDialog<DialogResult>(MainWindow);
+			if (result != DialogResult.OK)
+				return;
+
+			var bulkSetStatus = new BulkSetDownloadStatus(ProductsDisplay.GetVisibleBookEntries(), dialog.SetDownloaded, dialog.SetNotDownloaded);
+			var count = await Task.Run(bulkSetStatus.Discover);
+
+			if (count == 0)
+				return;
+
+			var confirmationResult = await MessageBox.Show(
+				bulkSetStatus.AggregateMessage,
+				"Replace downloaded status?",
+				MessageBoxButtons.YesNo,
+				MessageBoxIcon.Question,
+				MessageBoxDefaultButton.Button1);
+
+			if (confirmationResult != DialogResult.Yes)
+				return;
+
+			bulkSetStatus.Execute();
+		}
+
+		public async Task RemoveVisibleAsync()
+		{
+			var visibleLibraryBooks = ProductsDisplay.GetVisibleBookEntries();
+
+			var confirmationResult = await MessageBox.ShowConfirmationDialog(
+				MainWindow,
+				visibleLibraryBooks,
+				// do not use `$` string interpolation. See impl.
+				"Are you sure you want to remove {0} from Libation's library?",
+				"Remove books from Libation?",
+				MessageBoxDefaultButton.Button2);
+
+			if (confirmationResult is DialogResult.Yes)
+				await visibleLibraryBooks.RemoveBooksAsync();
+		}
+
+		private void setLiberatedVisibleMenuItem()
+		{
+			var libraryStats = LibraryCommands.GetCounts(ProductsDisplay.GetVisibleBookEntries());
+			setVisibleNotLiberatedCount(libraryStats.PendingBooks);
+		}
+	}
+}
diff --git a/Source/LibationAvalonia/Views/MainWindow.NoUI.cs b/Source/LibationAvalonia/ViewModels/MainVM._NoUI.cs
similarity index 92%
rename from Source/LibationAvalonia/Views/MainWindow.NoUI.cs
rename to Source/LibationAvalonia/ViewModels/MainVM._NoUI.cs
index 22542e70..9cfd5dd8 100644
--- a/Source/LibationAvalonia/Views/MainWindow.NoUI.cs
+++ b/Source/LibationAvalonia/ViewModels/MainVM._NoUI.cs
@@ -2,9 +2,9 @@
 using LibationUiBase;
 using System.IO;
 
-namespace LibationAvalonia.Views
+namespace LibationAvalonia.ViewModels
 {
-	public partial class MainWindow
+	partial class MainVM
 	{
 		private void Configure_NonUI()
 		{
diff --git a/Source/LibationAvalonia/ViewModels/MainVM.cs b/Source/LibationAvalonia/ViewModels/MainVM.cs
new file mode 100644
index 00000000..6585113a
--- /dev/null
+++ b/Source/LibationAvalonia/ViewModels/MainVM.cs
@@ -0,0 +1,39 @@
+using ApplicationServices;
+using LibationAvalonia.Views;
+using LibationFileManager;
+using ReactiveUI;
+
+namespace LibationAvalonia.ViewModels
+{
+	public partial class MainVM : ViewModelBase
+	{
+		public ProcessQueueViewModel ProcessQueue { get; } = new ProcessQueueViewModel();
+		public ProductsDisplayViewModel ProductsDisplay { get; } = new ProductsDisplayViewModel();
+
+		private double? _downloadProgress = null;
+		public double? DownloadProgress { get => _downloadProgress; set => this.RaiseAndSetIfChanged(ref _downloadProgress, value); }
+
+
+		private readonly MainWindow MainWindow;
+		public MainVM(MainWindow mainWindow)
+		{
+			MainWindow = mainWindow;
+
+			ProductsDisplay.RemovableCountChanged += (_, removeCount) => RemoveBooksButtonText = removeCount == 1 ? "Remove 1 Book from Libation" : $"Remove {removeCount} Books from Libation";
+			LibraryCommands.LibrarySizeChanged += async (_, _) => await ProductsDisplay.UpdateGridAsync(DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+
+			Configure_NonUI();
+			Configure_BackupCounts();
+			Configure_Filters();
+			Configure_Import();
+			Configure_Liberate();
+			Configure_ProcessQueue();
+			Configure_ScanAuto();
+			Configure_Export();
+			Configure_Settings();
+			Configure_VisibleBooks();
+		}
+
+		private static string menufyText(string header) => Configuration.IsMacOs ? header : $"_{header}";
+	}
+}
diff --git a/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs b/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs
deleted file mode 100644
index 367e0702..00000000
--- a/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-using ApplicationServices;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using LibationFileManager;
-using ReactiveUI;
-
-namespace LibationAvalonia.ViewModels
-{
-	public class MainWindowViewModel : ViewModelBase
-	{
-		private string _filterString;
-		private string _removeBooksButtonText = "Remove # Books from Libation";
-		private bool _removeBooksButtonEnabled = true;
-		private bool _autoScanChecked = true;
-		private bool _firstFilterIsDefault = true;
-		private bool _removeButtonsVisible = true;
-		private int _numAccountsScanning = 2;
-		private int _accountsCount = 0;
-		private bool _queueOpen = true;
-		private int _visibleCount = 1;
-		private LibraryCommands.LibraryStats _libraryStats;
-		private int _visibleNotLiberated = 1;
-		public bool IsMp3Supported => Configuration.IsLinux || Configuration.IsWindows;
-
-		/// <summary> The Process Queue's viewmodel </summary>
-		public ProcessQueueViewModel ProcessQueue { get; } = new ProcessQueueViewModel();
-		public ProductsDisplayViewModel ProductsDisplay { get; } = new ProductsDisplayViewModel();
-
-		private double? _downloadProgress = null;
-		public double? DownloadProgress { get => _downloadProgress; set => this.RaiseAndSetIfChanged(ref _downloadProgress, value); }
-
-
-		/// <summary> Library filterting query </summary>
-		public string FilterString { get => _filterString; set => this.RaiseAndSetIfChanged(ref _filterString, value); }
-
-
-		/// <summary> Display text for the "Remove # Books from Libation" button </summary>
-		public string RemoveBooksButtonText { get => _removeBooksButtonText; set => this.RaiseAndSetIfChanged(ref _removeBooksButtonText, value); }
-
-
-		/// <summary> Indicates if the "Remove # Books from Libation" button is enabled </summary>
-		public bool RemoveBooksButtonEnabled { get => _removeBooksButtonEnabled; set { this.RaiseAndSetIfChanged(ref _removeBooksButtonEnabled, value); } }
-
-
-		/// <summary> Auto scanning accounts is enables </summary>
-		public bool AutoScanChecked
-		{
-			get => _autoScanChecked;
-			set
-			{
-				if (value != _autoScanChecked)
-					Configuration.Instance.AutoScan = value;
-				this.RaiseAndSetIfChanged(ref _autoScanChecked, value);
-			}
-		}
-
-		public AvaloniaList<Control> QuickFilterMenuItems { get; } = new();
-
-		/// <summary> Indicates if the first quick filter is the default filter </summary>
-		public bool FirstFilterIsDefault
-		{
-			get => _firstFilterIsDefault;
-			set
-			{
-				if (value != _firstFilterIsDefault)
-					QuickFilters.UseDefault = value;
-				this.RaiseAndSetIfChanged(ref _firstFilterIsDefault, value);
-			}
-		}
-
-
-		/// <summary> Indicates if the "Remove # Books from Libation" and "Done Removing" buttons should be visible </summary>
-		public bool RemoveButtonsVisible
-		{
-			get => _removeButtonsVisible;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _removeButtonsVisible, value);
-				this.RaisePropertyChanged(nameof(RemoveMenuItemsEnabled));
-			}
-		}
-
-
-
-
-		/// <summary> The number of accounts currently being scanned </summary>
-		public int NumAccountsScanning
-		{
-			get => _numAccountsScanning;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _numAccountsScanning, value);
-				this.RaisePropertyChanged(nameof(ActivelyScanning));
-				this.RaisePropertyChanged(nameof(RemoveMenuItemsEnabled));
-				this.RaisePropertyChanged(nameof(ScanningText));
-			}
-		}
-
-		/// <summary> Indicates if Libation is currently scanning account(s) </summary>
-		public bool ActivelyScanning => _numAccountsScanning > 0;
-		/// <summary> Indicates if the "Remove Books" menu items are enabled</summary>
-		public bool RemoveMenuItemsEnabled => !RemoveButtonsVisible && !ActivelyScanning;
-		/// <summary> The library scanning status text </summary>
-		public string ScanningText => _numAccountsScanning == 1 ? "Scanning..." : $"Scanning {_numAccountsScanning} accounts...";
-
-
-
-		/// <summary> The number of accounts added to Libation </summary>
-		public int AccountsCount
-		{
-			get => _accountsCount;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _accountsCount, value);
-				this.RaisePropertyChanged(nameof(ZeroAccounts));
-				this.RaisePropertyChanged(nameof(AnyAccounts));
-				this.RaisePropertyChanged(nameof(OneAccount));
-				this.RaisePropertyChanged(nameof(MultipleAccounts));
-			}
-		}
-
-		/// <summary> There are no Audible accounts </summary>
-		public bool ZeroAccounts => _accountsCount == 0;
-		/// <summary> There is at least one Audible account </summary>
-		public bool AnyAccounts => _accountsCount > 0;
-		/// <summary> There is exactly one Audible account </summary>
-		public bool OneAccount => _accountsCount == 1;
-		/// <summary> There are more than 1 Audible accounts </summary>
-		public bool MultipleAccounts => _accountsCount > 1;
-
-
-
-		/// <summary> The Process Queue panel is open </summary>
-		public bool QueueOpen
-		{
-			get => _queueOpen;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _queueOpen, value);
-				QueueButtonAngle = value ? 180 : 0;
-				this.RaisePropertyChanged(nameof(QueueButtonAngle));
-			}
-		}
-		public double QueueButtonAngle { get; private set; }
-
-
-		/// <summary> The number of books visible in the Product Display </summary>
-		public int VisibleCount
-		{
-			get => _visibleCount;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _visibleCount, value);
-				this.RaisePropertyChanged(nameof(VisibleCountText));
-				this.RaisePropertyChanged(nameof(VisibleCountMenuItemText));
-			}
-		}
-
-		/// <summary> The Bottom-right visible book count status text </summary>
-		public string VisibleCountText => $"Visible: {VisibleCount}";
-		/// <summary> The Visible Books menu item header text </summary>
-		public string VisibleCountMenuItemText => $"_Visible Books {VisibleCount}";
-
-
-
-		/// <summary> The user's library statistics </summary>
-		public LibraryCommands.LibraryStats LibraryStats
-		{
-			get => _libraryStats;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _libraryStats, value);
-
-				BookBackupsToolStripText
-					= LibraryStats.HasPendingBooks
-					? $"Begin _Book and PDF Backups: {LibraryStats.PendingBooks} remaining"
-					: "All books have been liberated";
-
-				PdfBackupsToolStripText
-					= LibraryStats.pdfsNotDownloaded > 0
-					? $"Begin _PDF Only Backups: {LibraryStats.pdfsNotDownloaded} remaining"
-					: "All PDFs have been downloaded";
-
-				this.RaisePropertyChanged(nameof(BookBackupsToolStripText));
-				this.RaisePropertyChanged(nameof(PdfBackupsToolStripText));
-			}
-		}
-
-		/// <summary> The "Begin Book and PDF Backup" menu item header text </summary>
-		public string BookBackupsToolStripText { get; private set; } = "Begin _Book and PDF Backups: 0";
-		/// <summary> The "Begin PDF Only Backup" menu item header text </summary>
-		public string PdfBackupsToolStripText { get; private set; } = "Begin _PDF Only Backups: 0";
-
-
-		/// <summary> The number of books visible in the Products Display that have not yet been liberated </summary>
-		public int VisibleNotLiberated
-		{
-			get => _visibleNotLiberated;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _visibleNotLiberated, value);
-
-				LiberateVisibleToolStripText
-					= AnyVisibleNotLiberated
-					? $"Liberate _Visible Books: {VisibleNotLiberated}"
-					: "All visible books are liberated";
-
-				LiberateVisibleToolStripText_2
-					= AnyVisibleNotLiberated
-					? $"_Liberate: {VisibleNotLiberated}"
-					: "All visible books are liberated";
-
-				this.RaisePropertyChanged(nameof(AnyVisibleNotLiberated));
-				this.RaisePropertyChanged(nameof(LiberateVisibleToolStripText));
-				this.RaisePropertyChanged(nameof(LiberateVisibleToolStripText_2));
-			}
-		}
-
-		/// <summary> Indicates if any of the books visible in the Products Display haven't been liberated </summary>
-		public bool AnyVisibleNotLiberated => VisibleNotLiberated > 0;
-		/// <summary> The "Liberate Visible Books" menu item header text (submenu item of the "Liberate Menu" menu item) </summary>
-		public string LiberateVisibleToolStripText { get; private set; } = "Liberate _Visible Books: 0";
-		/// <summary> The "Liberate" menu item header text (submenu item of the "Visible Books" menu item) </summary>
-		public string LiberateVisibleToolStripText_2 { get; private set; } = "_Liberate: 0";
-	}
-}
diff --git a/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs
index 481f1b7b..127a3b00 100644
--- a/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs
@@ -117,7 +117,7 @@ namespace LibationAvalonia.ViewModels
 			}
 
 			//Create the filtered-in list before adding entries to avoid a refresh
-			FilteredInGridEntries = QueryResults(geList, FilterString);
+			FilteredInGridEntries = QueryResults(geList.Union(geList.OfType<ISeriesEntry>().SelectMany(s => s.Children)), FilterString);
 			SOURCE.AddRange(geList.OrderByDescending(e => e.DateAdded));
 
 			//Add all children beneath their parent
diff --git a/Source/LibationAvalonia/Views/MainWindow.BackupCounts.cs b/Source/LibationAvalonia/Views/MainWindow.BackupCounts.cs
deleted file mode 100644
index 762175e9..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.BackupCounts.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using ApplicationServices;
-using Avalonia.Threading;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private Task updateCountsTask;
-		private void Configure_BackupCounts()
-		{
-			Load += setBackupCounts;
-			LibraryCommands.LibrarySizeChanged += setBackupCounts;
-			LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
-		}
-
-		private void setBackupCounts(object _, object __)
-		{
-			if (updateCountsTask?.IsCompleted is not false)
-				updateCountsTask = Dispatcher.UIThread.InvokeAsync(() => _viewModel.LibraryStats = LibraryCommands.GetCounts());
-		}
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.Filter.cs b/Source/LibationAvalonia/Views/MainWindow.Filter.cs
deleted file mode 100644
index 9874b586..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.Filter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Avalonia.Input;
-using System;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		protected void Configure_Filter() { }
-
-		public async void filterHelpBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> await (new LibationAvalonia.Dialogs.SearchSyntaxDialog()).ShowDialog(this);
-
-		public async void filterSearchTb_KeyPress(object sender, KeyEventArgs e)
-		{
-			if (e.Key == Key.Return)
-			{
-				await performFilter(_viewModel.FilterString);
-
-				// silence the 'ding'
-				e.Handled = true;
-			}
-		}
-
-		public async void filterBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> await performFilter(_viewModel.FilterString);
-
-		private string lastGoodFilter = "";
-		private async Task performFilter(string filterString)
-		{
-			_viewModel.FilterString = filterString;
-
-			try
-			{
-				await _viewModel.ProductsDisplay.Filter(filterString);
-				lastGoodFilter = filterString;
-			}
-			catch (Exception ex)
-			{
-				await MessageBox.Show($"Bad filter string:\r\n\r\n{ex.Message}", "Bad filter string", MessageBoxButtons.OK, MessageBoxIcon.Error);
-
-				// re-apply last good filter
-				await performFilter(lastGoodFilter);
-			}
-		}
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.Liberate.cs b/Source/LibationAvalonia/Views/MainWindow.Liberate.cs
deleted file mode 100644
index c79ba1e9..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.Liberate.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using DataLayer;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private void Configure_Liberate() { }
-
-		//GetLibrary_Flat_NoTracking() may take a long time on a hugh library. so run in new thread 
-		public void beginBookBackupsToolStripMenuItem_Click(object _ = null, Avalonia.Interactivity.RoutedEventArgs __ = null)
-		{
-			try
-			{
-				SetQueueCollapseState(false);
-
-				Serilog.Log.Logger.Information("Begin backing up all library books");
-
-				_viewModel.ProcessQueue.AddDownloadDecrypt(
-					ApplicationServices.DbContexts
-					.GetLibrary_Flat_NoTracking()
-					.UnLiberated()
-					);
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "An error occurred while backing up all library books");
-			}
-		}
-
-		public async void beginPdfBackupsToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
-		{
-			SetQueueCollapseState(false);
-			await Task.Run(() => _viewModel.ProcessQueue.AddDownloadPdf(ApplicationServices.DbContexts.GetLibrary_Flat_NoTracking()
-				  .Where(lb => lb.Book.UserDefinedItem.PdfStatus is DataLayer.LiberatedStatus.NotLiberated)));
-		}
-
-		public async void convertAllM4bToMp3ToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
-		{
-			var result = await MessageBox.Show(
-				"This converts all m4b titles in your library to mp3 files. Original files are not deleted."
-				+ "\r\nFor large libraries this will take a long time and will take up more disk space."
-				+ "\r\n\r\nContinue?"
-				+ "\r\n\r\n(To always download titles as mp3 instead of m4b, go to Settings: Download my books as .MP3 files)",
-				"Convert all M4b => Mp3?",
-				MessageBoxButtons.YesNo,
-				MessageBoxIcon.Warning);
-			if (result == DialogResult.Yes)
-			{
-				SetQueueCollapseState(false);
-				await Task.Run(() => _viewModel.ProcessQueue.AddConvertMp3(ApplicationServices.DbContexts.GetLibrary_Flat_NoTracking()
-					.Where(lb => lb.Book.UserDefinedItem.BookStatus is DataLayer.LiberatedStatus.Liberated && lb.Book.ContentType is DataLayer.ContentType.Product)));
-			}
-			//Only Queue Liberated books for conversion.  This isn't a perfect filter, but it's better than nothing.
-		}
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.QuickFilters.cs b/Source/LibationAvalonia/Views/MainWindow.QuickFilters.cs
deleted file mode 100644
index 74220033..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.QuickFilters.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using LibationFileManager;
-using System.Linq;
-using Avalonia.Data;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private void Configure_QuickFilters()
-		{
-			_viewModel.FirstFilterIsDefault = QuickFilters.UseDefault;
-			Load += updateFiltersMenu;
-			QuickFilters.Updated += updateFiltersMenu;
-
-			//We need to be able to dynamically add and remove menu items from the Quick Filters menu.
-			//To do that, we need quick filter's menu items source to be writable, which we can only
-			//achieve by creating the list ourselves (instead of allowing Avalonia to create it from the xaml)
-			
-			var startWithFilterMenuItem = new MenuItem
-			{
-				Header = "Start Libation with 1st filter _Default",
-				Icon = new CheckBox
-				{
-					BorderThickness = new Thickness(0),
-					IsHitTestVisible = false,
-					[!CheckBox.IsCheckedProperty] = new Binding(nameof(_viewModel.FirstFilterIsDefault))
-				}
-			};
-
-			var editFiltersMenuItem = new MenuItem { Header = "_Edit quick filters..." };
-
-			startWithFilterMenuItem.Click += firstFilterIsDefaultToolStripMenuItem_Click;
-			editFiltersMenuItem.Click += editQuickFiltersToolStripMenuItem_Click;
-
-			_viewModel.QuickFilterMenuItems.Add(startWithFilterMenuItem);
-			_viewModel.QuickFilterMenuItems.Add(editFiltersMenuItem);
-			_viewModel.QuickFilterMenuItems.Add(new Separator());
-		}
-
-		private async void QuickFiltersMenuItem_KeyDown(object sender, Avalonia.Input.KeyEventArgs e)
-		{
-			int keyNum = (int)e.Key - 34;
-
-			if (keyNum <=9 && keyNum >= 1)
-			{
-				var menuItem = _viewModel.QuickFilterMenuItems
-					.OfType<MenuItem>()
-					.FirstOrDefault(i => i.Header is string h && h.StartsWith($"_{keyNum}"));
-
-				if (menuItem is not null)
-				{
-					await performFilter(menuItem.Tag as string);
-					e.Handled = true;
-				}
-			}
-		}
-
-		private void updateFiltersMenu(object _ = null, object __ = null)
-		{
-			//Clear all filters
-			_viewModel.QuickFilterMenuItems.RemoveAll(_viewModel.QuickFilterMenuItems.Where(i => i.Tag is string).ToList());
-
-			// re-populate
-			var index = 0;
-			foreach (var filter in QuickFilters.Filters)
-			{
-				var quickFilterMenuItem = new MenuItem
-				{
-					Tag = filter,
-					Header = $"_{++index}: {filter}"
-				};
-				quickFilterMenuItem.Click += async (_, __) => await performFilter(filter);
-				_viewModel.QuickFilterMenuItems.Add(quickFilterMenuItem);
-			}
-		}
-
-		private void firstFilterIsDefaultToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			_viewModel.FirstFilterIsDefault = !_viewModel.FirstFilterIsDefault;
-		}
-
-		private void addQuickFilterBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> QuickFilters.Add(_viewModel.FilterString);
-
-		private async void editQuickFiltersToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> await new Dialogs.EditQuickFilters().ShowDialog(this);
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.RemoveBooks.cs b/Source/LibationAvalonia/Views/MainWindow.RemoveBooks.cs
deleted file mode 100644
index 785bddcb..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.RemoveBooks.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using AudibleUtilities;
-using LibationAvalonia.Dialogs;
-using System.Linq;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private void Configure_RemoveBooks()
-		{
-			if (Avalonia.Controls.Design.IsDesignMode)
-				return;
-
-			_viewModel.RemoveButtonsVisible = false;
-		}
-
-		public async void openTrashBinToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var trash = new TrashBinDialog();
-			await trash.ShowDialog(this);
-		}
-
-		public void removeLibraryBooksToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			// if 0 accounts, this will not be visible
-			// if 1 account, run scanLibrariesRemovedBooks() on this account
-			// if multiple accounts, another menu set will open. do not run scanLibrariesRemovedBooks()
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var accounts = persister.AccountsSettings.GetAll();
-
-			if (accounts.Count != 1)
-				return;
-
-			var firstAccount = accounts.Single();
-			scanLibrariesRemovedBooks(firstAccount);
-		}
-
-		// selectively remove books from all accounts
-		public void removeAllAccountsToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var allAccounts = persister.AccountsSettings.GetAll();
-			scanLibrariesRemovedBooks(allAccounts.ToArray());
-		}
-
-		// selectively remove books from some accounts
-		public async void removeSomeAccountsToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var scanAccountsDialog = new Dialogs.ScanAccountsDialog();
-
-			if (await scanAccountsDialog.ShowDialog<DialogResult>(this) != DialogResult.OK)
-				return;
-
-			if (!scanAccountsDialog.CheckedAccounts.Any())
-				return;
-
-			scanLibrariesRemovedBooks(scanAccountsDialog.CheckedAccounts.ToArray());
-		}
-
-		private async void scanLibrariesRemovedBooks(params Account[] accounts)
-		{
-			//This action is meant to operate on the entire library.
-			//For removing books within a filter set, use
-			//Visible Books > Remove from library
-
-			await _viewModel.ProductsDisplay.Filter(null);
-
-			_viewModel.RemoveBooksButtonEnabled = true;
-			_viewModel.RemoveButtonsVisible = true;
-
-			await _viewModel.ProductsDisplay.ScanAndRemoveBooksAsync(accounts);
-		}
-
-		public async void removeBooksBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			_viewModel.RemoveBooksButtonEnabled = false;
-			await _viewModel.ProductsDisplay.RemoveCheckedBooksAsync();
-			_viewModel.RemoveBooksButtonEnabled = true;
-		}
-
-		public async void doneRemovingBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			_viewModel.RemoveButtonsVisible = false;
-
-			_viewModel.ProductsDisplay.DoneRemovingBooks();
-
-			//Restore the filter
-			await performFilter(lastGoodFilter);
-		}
-
-		public void ProductsDisplay_RemovableCountChanged(object sender, int removeCount)
-		{
-			_viewModel.RemoveBooksButtonText = removeCount switch
-			{
-				1 => "Remove 1 Book from Libation",
-				_ => $"Remove {removeCount} Books from Libation"
-			};
-		}
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.ScanManual.cs b/Source/LibationAvalonia/Views/MainWindow.ScanManual.cs
deleted file mode 100644
index 4375c7c3..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.ScanManual.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using ApplicationServices;
-using AudibleUtilities;
-using LibationAvalonia.Dialogs;
-using LibationFileManager;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private void Configure_ScanManual()
-		{
-			Load += refreshImportMenu;
-			AccountsSettingsPersister.Saved += refreshImportMenu;
-		}
-
-		private void refreshImportMenu(object _, EventArgs __)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			_viewModel.AccountsCount = persister.AccountsSettings.Accounts.Count;
-		}
-
-		public async void noAccountsYetAddAccountToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			await MessageBox.Show("To load your Audible library, come back here to the Import menu after adding your account");
-			await new Dialogs.AccountsDialog().ShowDialog(this);
-		}
-
-		public async void scanLibraryToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var firstAccount = persister.AccountsSettings.GetAll().FirstOrDefault();
-			await scanLibrariesAsync(firstAccount);
-		}
-
-		public async void scanLibraryOfAllAccountsToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var allAccounts = persister.AccountsSettings.GetAll();
-			await scanLibrariesAsync(allAccounts);
-		}
-
-		public async void scanLibraryOfSomeAccountsToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var scanAccountsDialog = new Dialogs.ScanAccountsDialog();
-
-			if (await scanAccountsDialog.ShowDialog<DialogResult>(this) != DialogResult.OK)
-				return;
-
-			if (!scanAccountsDialog.CheckedAccounts.Any())
-				return;
-
-			await scanLibrariesAsync(scanAccountsDialog.CheckedAccounts);
-		}
-
-		private async Task scanLibrariesAsync(IEnumerable<Account> accounts) => await scanLibrariesAsync(accounts.ToArray());
-		private async Task scanLibrariesAsync(params Account[] accounts)
-		{
-			try
-			{
-				var (totalProcessed, newAdded) = await LibraryCommands.ImportAccountAsync(Dialogs.Login.AvaloniaLoginChoiceEager.ApiExtendedFunc, accounts);
-
-				// this is here instead of ScanEnd so that the following is only possible when it's user-initiated, not automatic loop
-				if (Configuration.Instance.ShowImportedStats && newAdded > 0)
-					await MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
-			}
-			catch (OperationCanceledException)
-			{
-				Serilog.Log.Information("Audible login attempt cancelled by user");
-			}
-			catch (Exception ex)
-			{
-				await MessageBox.ShowAdminAlert(
-					this,
-					"Error importing library. Please try again. If this still happens after 2 or 3 tries, stop and contact administrator",
-					"Error importing library",
-					ex);
-			}
-		}
-
-		private async void locateAudiobooksToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var locateDialog = new LocateAudiobooksDialog();
-			await locateDialog.ShowDialog(this);
-		}
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.ScanNotification.cs b/Source/LibationAvalonia/Views/MainWindow.ScanNotification.cs
deleted file mode 100644
index 1c5272a2..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.ScanNotification.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using ApplicationServices;
-using System;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private void Configure_ScanNotification()
-		{
-			_viewModel.NumAccountsScanning = 0;
-			LibraryCommands.ScanBegin += LibraryCommands_ScanBegin;
-			LibraryCommands.ScanEnd += LibraryCommands_ScanEnd;
-		}
-		private void LibraryCommands_ScanBegin(object sender, int accountsLength)
-		{
-			_viewModel.NumAccountsScanning = accountsLength;
-		}
-
-		private void LibraryCommands_ScanEnd(object sender, int newCount)
-		{
-			_viewModel.NumAccountsScanning = 0;
-		}
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.Settings.cs b/Source/LibationAvalonia/Views/MainWindow.Settings.cs
deleted file mode 100644
index 0989855d..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.Settings.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using LibationFileManager;
-using System;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private void Configure_Settings() { }
-
-		public async void accountsToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> await new Dialogs.AccountsDialog().ShowDialog(this);
-
-		public async void basicSettingsToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> await new Dialogs.SettingsDialog().ShowDialog(this);
-
-		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 async void tourToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> await new Walkthrough(this).RunAsync();
-
-		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");
-			}
-		}
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.Upgrade.cs b/Source/LibationAvalonia/Views/MainWindow.Upgrade.cs
deleted file mode 100644
index ade9bfbc..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.Upgrade.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Avalonia.Threading;
-using LibationAvalonia.Dialogs;
-using LibationUiBase;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private void Configure_Upgrade()
-		{
-			setProgressVisible(false);
-#if !DEBUG
-			async Task upgradeAvailable(UpgradeEventArgs e)
-			{
-				var notificationResult = await new UpgradeNotificationDialog(e.UpgradeProperties, e.CapUpgrade).ShowDialogAsync(this);
-
-				e.Ignore = notificationResult == DialogResult.Ignore;
-				e.InstallUpgrade = notificationResult == DialogResult.OK;
-			}
-
-			var upgrader = new Upgrader();
-			upgrader.DownloadProgress += async (_, e) => await Dispatcher.UIThread.InvokeAsync(() => _viewModel.DownloadProgress = e.ProgressPercentage);
-			upgrader.DownloadBegin += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(true));
-			upgrader.DownloadCompleted += async (_, _) => await Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(false));
-
-			Opened += async (_, _) => await upgrader.CheckForUpgradeAsync(upgradeAvailable);
-#endif
-		}
-
-		private void setProgressVisible(bool visible) => _viewModel.DownloadProgress = visible ? 0 : null;
-
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.VisibleBooks.cs b/Source/LibationAvalonia/Views/MainWindow.VisibleBooks.cs
deleted file mode 100644
index 097d26a5..00000000
--- a/Source/LibationAvalonia/Views/MainWindow.VisibleBooks.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using ApplicationServices;
-using Avalonia.Threading;
-using DataLayer;
-using System;
-using System.Threading.Tasks;
-
-namespace LibationAvalonia.Views
-{
-	public partial class MainWindow
-	{
-		private void Configure_VisibleBooks()
-		{
-			LibraryCommands.BookUserDefinedItemCommitted += setLiberatedVisibleMenuItemAsync;
-		}
-
-		private async void setLiberatedVisibleMenuItemAsync(object _, object __)
-			=> await Dispatcher.UIThread.InvokeAsync(setLiberatedVisibleMenuItem);
-
-		public void liberateVisible(object sender, Avalonia.Interactivity.RoutedEventArgs args)
-		{
-			try
-			{
-				SetQueueCollapseState(false);
-
-				Serilog.Log.Logger.Information("Begin backing up visible library books");
-
-				_viewModel.ProcessQueue.AddDownloadDecrypt(
-					_viewModel
-					.ProductsDisplay
-					.GetVisibleBookEntries()
-					.UnLiberated()
-					);
-			}
-			catch (Exception ex)
-			{
-				Serilog.Log.Logger.Error(ex, "An error occurred while backing up visible library books");
-			}
-		}
-		public async void replaceTagsToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
-		{
-			var dialog = new Dialogs.TagsBatchDialog();
-			var result = await dialog.ShowDialog<DialogResult>(this);
-			if (result != DialogResult.OK)
-				return;
-
-			var visibleLibraryBooks = _viewModel.ProductsDisplay.GetVisibleBookEntries();
-
-			var confirmationResult = await MessageBox.ShowConfirmationDialog(
-				this,
-				visibleLibraryBooks,
-				// do not use `$` string interpolation. See impl.
-				"Are you sure you want to replace tags in {0}?",
-				"Replace tags?");
-
-			if (confirmationResult != DialogResult.Yes)
-				return;
-
-			visibleLibraryBooks.UpdateTags(dialog.NewTags);
-		}
-
-		public async void setBookDownloadedManualToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
-		{
-			var dialog = new Dialogs.LiberatedStatusBatchManualDialog();
-			var result = await dialog.ShowDialog<DialogResult>(this);
-			if (result != DialogResult.OK)
-				return;
-
-			var visibleLibraryBooks = _viewModel.ProductsDisplay.GetVisibleBookEntries();
-
-			var confirmationResult = await MessageBox.ShowConfirmationDialog(
-				this,
-				visibleLibraryBooks,
-				// do not use `$` string interpolation. See impl.
-				"Are you sure you want to replace book downloaded status in {0}?",
-				"Replace downloaded status?");
-
-			if (confirmationResult != DialogResult.Yes)
-				return;
-
-			visibleLibraryBooks.UpdateBookStatus(dialog.BookLiberatedStatus);
-		}
-
-		public async void setPdfDownloadedManualToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
-		{
-			var dialog = new Dialogs.LiberatedStatusBatchManualDialog(isPdf: true);
-			var result = await dialog.ShowDialog<DialogResult>(this);
-			if (result != DialogResult.OK)
-				return;
-
-			var visibleLibraryBooks = _viewModel.ProductsDisplay.GetVisibleBookEntries();
-
-			var confirmationResult = await MessageBox.ShowConfirmationDialog(
-				this,
-				visibleLibraryBooks,
-				// do not use `$` string interpolation. See impl.
-				"Are you sure you want to replace PDF downloaded status in {0}?",
-				"Replace downloaded status?");
-
-			if (confirmationResult != DialogResult.Yes)
-				return;
-
-			visibleLibraryBooks.UpdatePdfStatus(dialog.BookLiberatedStatus);
-		}
-
-		public async void setDownloadedAutoToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
-		{
-			var dialog = new Dialogs.LiberatedStatusBatchAutoDialog();
-			var result = await dialog.ShowDialog<DialogResult>(this);
-			if (result != DialogResult.OK)
-				return;
-
-			var bulkSetStatus = new BulkSetDownloadStatus(_viewModel.ProductsDisplay.GetVisibleBookEntries(), dialog.SetDownloaded, dialog.SetNotDownloaded);
-			var count = await Task.Run(bulkSetStatus.Discover);
-
-			if (count == 0)
-				return;
-
-			var confirmationResult = await MessageBox.Show(
-				bulkSetStatus.AggregateMessage,
-				"Replace downloaded status?",
-				MessageBoxButtons.YesNo,
-				MessageBoxIcon.Question,
-				MessageBoxDefaultButton.Button1);
-
-			if (confirmationResult != DialogResult.Yes)
-				return;
-
-			bulkSetStatus.Execute();
-		}
-
-		public async void removeToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
-		{
-			var visibleLibraryBooks = _viewModel.ProductsDisplay.GetVisibleBookEntries();
-
-			var confirmationResult = await MessageBox.ShowConfirmationDialog(
-				this,
-				visibleLibraryBooks,
-				// do not use `$` string interpolation. See impl.
-				"Are you sure you want to remove {0} from Libation's library?",
-				"Remove books from Libation?",
-				MessageBoxDefaultButton.Button2);
-
-			if (confirmationResult is DialogResult.Yes)
-				await visibleLibraryBooks.RemoveBooksAsync();
-		}
-		public async void ProductsDisplay_VisibleCountChanged(object sender, int qty)
-		{
-			_viewModel.VisibleCount = qty;
-
-			await Dispatcher.UIThread.InvokeAsync(setLiberatedVisibleMenuItem);
-		}
-		void setLiberatedVisibleMenuItem()
-		{
-			var libraryStats = LibraryCommands.GetCounts(_viewModel.ProductsDisplay.GetVisibleBookEntries());
-			_viewModel.VisibleNotLiberated = libraryStats.PendingBooks;
-		}
-	}
-}
diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml b/Source/LibationAvalonia/Views/MainWindow.axaml
index 13380bbb..6e8c9230 100644
--- a/Source/LibationAvalonia/Views/MainWindow.axaml
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml
@@ -9,15 +9,77 @@
 		mc:Ignorable="d" d:DesignWidth="1850" d:DesignHeight="700"
 		x:Class="LibationAvalonia.Views.MainWindow"
 		Title="Libation: Liberate your Library"
+		x:DataType="vm:MainVM"
 		Name="Form1"
 		Icon="/Assets/libation.ico">
 
+	<NativeMenu.Menu>
+		<NativeMenu>
+			<NativeMenuItem Header="Import">
+				<NativeMenu>
+					<NativeMenuItem
+						Header="Auto Scan Library"
+						Command="{CompiledBinding ToggleAutoScan}"
+						IsChecked="{CompiledBinding AutoScanChecked}"
+						ToggleType="CheckBox" />
+					<NativeMenuItemSeparator />
+				</NativeMenu>
+			</NativeMenuItem>
+			<NativeMenuItem Header="Liberate">
+				<NativeMenu>
+					<NativeMenuItem Command="{CompiledBinding BackupAllBooks}" Header="{CompiledBinding BookBackupsToolStripText}" Gesture="{OnPlatform macOS='alt+⌘+B'}" />
+					<NativeMenuItem Command="{CompiledBinding BackupAllPdfs}" Header="{CompiledBinding PdfBackupsToolStripText}"  Gesture="{OnPlatform macOS='alt+⌘+P'}"/>
+					<NativeMenuItem Command="{CompiledBinding ConvertAllToMp3Async}" Header="Convert all M4b to Mp3 [Long-running]..." />
+					<NativeMenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" />
+				</NativeMenu>
+			</NativeMenuItem>
+			<NativeMenuItem Header="Export">
+				<NativeMenu>
+					<NativeMenuItem Command="{CompiledBinding ExportLibraryAsync}" Header="Export Library" Gesture="{OnPlatform macOS='alt+⌘+X'}"/>
+				</NativeMenu>
+			</NativeMenuItem>
+			<NativeMenuItem Header="Quick Filters">
+				<NativeMenu>
+					<NativeMenuItem
+						Header="Start Libation with 1st filter Default"
+						Command="{CompiledBinding FirstFilterIsDefaultToggle}"
+						IsChecked="{CompiledBinding FirstFilterIsDefault}"
+						ToggleType="CheckBox" />
+					<NativeMenuItem Command="{CompiledBinding EditQuickFiltersAsync}" Header="Edit quick filters..." Gesture="{OnPlatform macOS='alt+⌘+Q'}" />
+					<NativeMenuItemSeparator />
+				</NativeMenu>
+			</NativeMenuItem>
+			<NativeMenuItem Header="Visible Books">
+				<NativeMenu>
+					<NativeMenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText_2}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" Gesture="{OnPlatform macOS='alt+⌘+V'}" />
+					<NativeMenuItem Command="{CompiledBinding ReplaceTagsAsync}" Header="Replace Tags..." />
+					<NativeMenuItem Command="{CompiledBinding SetBookDownloadedAsync}" Header="Set book 'Downloaded' status manually..." />
+					<NativeMenuItem Command="{CompiledBinding SetPdfDownloadedAsync}" Header="Set PDF 'Downloaded' status manually..." />
+					<NativeMenuItem Command="{CompiledBinding SetDownloadedAutoAsync}" Header="Set 'Downloaded' status automatically..." />
+					<NativeMenuItem Command="{CompiledBinding RemoveVisibleAsync}" Header="Remove from library..." />
+				</NativeMenu>
+			</NativeMenuItem>
+			<NativeMenuItem Header="Settings">
+				<NativeMenu>
+					<NativeMenuItem Command="{CompiledBinding ShowAccountsAsync}" Header="Accounts..." Gesture="{OnPlatform macOS='⌘+.'}" />
+					<NativeMenuItem Command="{CompiledBinding ShowSettingsAsync}" Header="Settings..." Gesture="{OnPlatform macOS='⌘+,'}" />
+					<NativeMenuItemSeparator />
+					<NativeMenuItem Command="{CompiledBinding ShowTrashBinAsync}" Header="Trash Bin" Gesture="{OnPlatform macOS='alt+⌘+T'}" />
+					<NativeMenuItem Command="{CompiledBinding LaunchHangover}" Header="Launch Hangover" />
+					<NativeMenuItemSeparator />
+					<NativeMenuItem Command="{CompiledBinding StartWalkthroughAsync}" Header="Take a Guided Tour of Libation" />
+					<NativeMenuItem Command="{CompiledBinding ShowAboutAsync}" Header="About..." />
+				</NativeMenu>
+			</NativeMenuItem>
+		</NativeMenu>
+	</NativeMenu.Menu>
+
 	<Border BorderBrush="{DynamicResource DataGridGridLinesBrush}" BorderThickness="2" Padding="10,0,10,10">
 		<Grid RowDefinitions="Auto,Auto,*,Auto">
 			<Grid Grid.Row="0" ColumnDefinitions="1*,Auto">
 
 				<!-- Menu Strip -->
-				<Menu Grid.Column="0" VerticalAlignment="Top">
+				<Menu Grid.Column="0" VerticalAlignment="Top" IsVisible="{CompiledBinding MenuBarVisible}">
 					<!-- Decrease height of menu strop -->
 					
 					<Menu.Styles>
@@ -35,26 +97,27 @@
 								<Setter Property="Height" Value="NaN"/>
 							</Style>
 						</MenuItem.Styles>
-						<MenuItem IsVisible="{Binding AnyAccounts}" Click="autoScanLibraryToolStripMenuItem_Click" Header="A_uto Scan Library">
+						<MenuItem IsVisible="{CompiledBinding AnyAccounts}" Command="{CompiledBinding ToggleAutoScan}" Header="A_uto Scan Library">
 							<MenuItem.Icon>
-								<CheckBox BorderThickness="0" IsChecked="{Binding AutoScanChecked, Mode=TwoWay}" IsHitTestVisible="False" />
+								<CheckBox BorderThickness="0" IsChecked="{CompiledBinding AutoScanChecked, Mode=TwoWay}" IsHitTestVisible="False" />
 							</MenuItem.Icon>
 						</MenuItem>
-						<MenuItem IsVisible="{Binding !AnyAccounts}" Click="noAccountsYetAddAccountToolStripMenuItem_Click" Header="No accounts yet. A_dd Account..." />
+						<MenuItem IsVisible="{CompiledBinding !AnyAccounts}" Command="{CompiledBinding AddAccountsAsync}" Header="No accounts yet. A_dd Account..." />
 						
 						<!-- Scan Library -->
-						<MenuItem IsVisible="{Binding OneAccount}" IsEnabled="{Binding !ActivelyScanning}" Name="scanLibraryToolStripMenuItem" Click="scanLibraryToolStripMenuItem_Click" Header="Scan _Library" />
-						<MenuItem IsVisible="{Binding MultipleAccounts}" IsEnabled="{Binding !ActivelyScanning}" Name="scanLibraryOfAllAccountsToolStripMenuItem" Click="scanLibraryOfAllAccountsToolStripMenuItem_Click" Header="Scan Library of _All Accounts" />
-						<MenuItem IsVisible="{Binding MultipleAccounts}" IsEnabled="{Binding !ActivelyScanning}" Click="scanLibraryOfSomeAccountsToolStripMenuItem_Click" Header="Scan Library of _Some Accounts" />
-						<Separator />
+						<MenuItem IsVisible="{CompiledBinding OneAccount}" IsEnabled="{CompiledBinding !ActivelyScanning}" Name="scanLibraryToolStripMenuItem" Command="{CompiledBinding ScanAccountAsync}" Header="Scan _Library" />
+						<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding !ActivelyScanning}" Name="scanLibraryOfAllAccountsToolStripMenuItem" Command="{CompiledBinding ScanAllAccountsAsync}" Header="Scan Library of _All Accounts" />
+						<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding !ActivelyScanning}" Command="{CompiledBinding ScanSomeAccountsAsync}" Header="Scan Library of _Some Accounts" />
+						
+						<Separator IsVisible="{CompiledBinding AnyAccounts}" />
 						
 						<!-- Remove Books -->
-						<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" />
+						<MenuItem IsVisible="{CompiledBinding OneAccount}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksAsync}" Header="_Remove Library Books" />
+						<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksAllAsync}" Header="_Remove Books from All Accounts" />
+						<MenuItem IsVisible="{CompiledBinding MultipleAccounts}" IsEnabled="{CompiledBinding RemoveMenuItemsEnabled}" Command="{CompiledBinding RemoveBooksSomeAsync}" Header="_Remove Books from Some Accounts" />
 						
 						<Separator />
-						<MenuItem Click="locateAudiobooksToolStripMenuItem_Click" Header="L_ocate Audiobooks" />
+						<MenuItem Command="{CompiledBinding LocateAudiobooksAsync}" Header="L_ocate Audiobooks..." />
 
 					</MenuItem>
 					
@@ -67,10 +130,10 @@
 								<Setter Property="Height" Value="NaN"/>
 							</Style>
 						</MenuItem.Styles>
-						<MenuItem Click="beginBookBackupsToolStripMenuItem_Click" Header="{Binding BookBackupsToolStripText}" />
-						<MenuItem Click="beginPdfBackupsToolStripMenuItem_Click" Header="{Binding PdfBackupsToolStripText}" />
-						<MenuItem Click="convertAllM4bToMp3ToolStripMenuItem_Click" Header="Convert all _M4b to Mp3 [Long-running]..." IsVisible="{Binding IsMp3Supported}" />
-						<MenuItem Click="liberateVisible" Header="{Binding LiberateVisibleToolStripText}" IsEnabled="{Binding AnyVisibleNotLiberated}" />
+						<MenuItem Command="{CompiledBinding BackupAllBooks}" Header="{CompiledBinding BookBackupsToolStripText}" />
+						<MenuItem Command="{CompiledBinding BackupAllPdfs}" Header="{CompiledBinding PdfBackupsToolStripText}" />
+						<MenuItem Command="{CompiledBinding ConvertAllToMp3Async}" Header="Convert all _M4b to Mp3 [Long-running]..." />
+						<MenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" />
 					</MenuItem>
 
 					<!-- Export Menu -->
@@ -82,12 +145,12 @@
 								<Setter Property="Height" Value="NaN"/>
 							</Style>
 						</MenuItem.Styles>
-						<MenuItem IsEnabled="{Binding LibraryStats.HasBookResults}" Click="exportLibraryToolStripMenuItem_Click" Header="E_xport Library" />
+						<MenuItem IsEnabled="{CompiledBinding LibraryStats.HasBookResults}" Command="{CompiledBinding ExportLibraryAsync}" Header="E_xport Library" />
 					</MenuItem>
 
 					<!-- Quick Filters Menu -->
 
-					<MenuItem Name="quickFiltersToolStripMenuItem" Header="Quick _Filters" ItemsSource="{Binding QuickFilterMenuItems}" KeyDown="QuickFiltersMenuItem_KeyDown">
+					<MenuItem Name="quickFiltersToolStripMenuItem" Header="Quick _Filters" ItemsSource="{CompiledBinding QuickFilterMenuItems}" KeyDown="QuickFiltersMenuItem_KeyDown">
 						<!-- Remove height style property for menu item -->
 						<MenuItem.Styles>
 							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
@@ -98,19 +161,19 @@
 
 					<!-- Visible Books Menu -->
 
-					<MenuItem Header="{Binding VisibleCountMenuItemText}" >
+					<MenuItem Header="{CompiledBinding VisibleCountMenuItemText}" >
 						<!-- Remove height style property for menu item -->
 						<MenuItem.Styles>
 							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
 								<Setter Property="Height" Value="NaN"/>
 							</Style>
 						</MenuItem.Styles>
-						<MenuItem Click="liberateVisible" Header="{Binding LiberateVisibleToolStripText_2}" IsEnabled="{Binding AnyVisibleNotLiberated}" />
-						<MenuItem Click="replaceTagsToolStripMenuItem_Click" Header="Replace _Tags..." />
-						<MenuItem Click="setBookDownloadedManualToolStripMenuItem_Click" Header="Set book '_Downloaded' status manually..." />
-						<MenuItem Click="setPdfDownloadedManualToolStripMenuItem_Click" Header="Set _PDF 'Downloaded' status manually..." />
-						<MenuItem Click="setDownloadedAutoToolStripMenuItem_Click" Header="Set '_Downloaded' status automatically..." />
-						<MenuItem Click="removeToolStripMenuItem_Click" Header="_Remove from library..." />
+						<MenuItem Command="{CompiledBinding LiberateVisible}" Header="{CompiledBinding LiberateVisibleToolStripText_2}" IsEnabled="{CompiledBinding AnyVisibleNotLiberated}" />
+						<MenuItem Command="{CompiledBinding ReplaceTagsAsync}" Header="Replace _Tags..." />
+						<MenuItem Command="{CompiledBinding SetBookDownloadedAsync}" Header="Set book '_Downloaded' status manually..." />
+						<MenuItem Command="{CompiledBinding SetPdfDownloadedAsync}" Header="Set _PDF 'Downloaded' status manually..." />
+						<MenuItem Command="{CompiledBinding SetDownloadedAutoAsync}" Header="Set '_Downloaded' status automatically..." />
+						<MenuItem Command="{CompiledBinding RemoveVisibleAsync}" Header="_Remove from library..." />
 					</MenuItem>
 
 					<!-- Settings Menu -->
@@ -122,19 +185,19 @@
 								<Setter Property="Height" Value="NaN"/>
 							</Style>
 						</MenuItem.Styles>
-						<MenuItem Name="accountsToolStripMenuItem" Click="accountsToolStripMenuItem_Click" Header="_Accounts..." />
-						<MenuItem Name="basicSettingsToolStripMenuItem" Click="basicSettingsToolStripMenuItem_Click" Header="_Settings..." />
+						<MenuItem Name="accountsToolStripMenuItem" Command="{CompiledBinding ShowAccountsAsync}" Header="_Accounts..." />
+						<MenuItem Name="basicSettingsToolStripMenuItem" Command="{CompiledBinding ShowSettingsAsync}" Header="_Settings..." />
 						<Separator />
-						<MenuItem Click="openTrashBinToolStripMenuItem_Click" Header="Trash Bin" />
-						<MenuItem Click="launchHangoverToolStripMenuItem_Click" Header="Launch _Hangover" />
+						<MenuItem Command="{CompiledBinding ShowTrashBinAsync}" Header="Trash Bin" />
+						<MenuItem Command="{CompiledBinding LaunchHangover}" Header="Launch _Hangover" />
 						<Separator />
-						<MenuItem Click="tourToolStripMenuItem_Click" Header="Take a Guided _Tour of Libation" />
-						<MenuItem Click="aboutToolStripMenuItem_Click" Header="A_bout..." />
+						<MenuItem Command="{CompiledBinding StartWalkthroughAsync}" Header="Take a Guided _Tour of Libation" />
+						<MenuItem Command="{CompiledBinding ShowAboutAsync}" Header="A_bout..." />
 					</MenuItem>
 				</Menu>
-				<StackPanel IsVisible="{Binding ActivelyScanning}" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+				<StackPanel IsVisible="{CompiledBinding ActivelyScanning}" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
 					<Path VerticalAlignment="Center" Fill="{StaticResource IconFill}" Data="{StaticResource ImportIcon}" />
-					<TextBlock Margin="5,0,5,0" VerticalAlignment="Center" Text="{Binding ScanningText}"/>
+					<TextBlock Margin="5,0,5,0" VerticalAlignment="Center" Text="{CompiledBinding ScanningText}"/>
 				</StackPanel>
 			</Grid>
 
@@ -155,23 +218,23 @@
 				</Grid.Styles>
 				
 				<StackPanel Grid.Column="0" Orientation="Horizontal">
-					<Button Name="filterHelpBtn" Margin="0" Click="filterHelpBtn_Click" Content="?"/>
-					<Button Name="addQuickFilterBtn" Click="addQuickFilterBtn_Click" Content="Add To Quick Filters"/>
+					<Button Name="filterHelpBtn" Margin="0" Command="{CompiledBinding FilterHelpBtn}" Content="?"/>
+					<Button Name="addQuickFilterBtn" Command="{CompiledBinding AddQuickFilterBtn}" Content="Add To Quick Filters"/>
 				</StackPanel>
 
 				<StackPanel Grid.Column="1" Orientation="Horizontal">
-					<Button IsVisible="{Binding RemoveButtonsVisible}" IsEnabled="{Binding RemoveBooksButtonEnabled}" Click="removeBooksBtn_Click" Content="{Binding RemoveBooksButtonText}"/>
-					<Button IsVisible="{Binding RemoveButtonsVisible}" Click="doneRemovingBtn_Click" Content="Done Removing Books"/>
+					<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" IsEnabled="{CompiledBinding RemoveBooksButtonEnabled}" Command="{CompiledBinding RemoveBooksBtn}" Content="{CompiledBinding RemoveBooksButtonText}"/>
+					<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" Command="{CompiledBinding DoneRemovingBtn}" Content="Done Removing Books"/>
 				</StackPanel>
 				
-				<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{Binding !RemoveButtonsVisible}" Text="{Binding FilterString, Mode=TwoWay}" KeyDown="filterSearchTb_KeyPress" />
+				<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{CompiledBinding !RemoveButtonsVisible}" Text="{CompiledBinding FilterString, Mode=TwoWay}" KeyDown="filterSearchTb_KeyPress" />
 
 				<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
-					<Button Name="filterBtn" Click="filterBtn_Click" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
-					<Button Padding="2,6,2,6" VerticalAlignment="Stretch" Click="ToggleQueueHideBtn_Click">
+					<Button Name="filterBtn" Command="{CompiledBinding FilterBtn}" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
+					<Button Padding="2,6,2,6" VerticalAlignment="Stretch" Command="{CompiledBinding ToggleQueueHideBtn}">
 						<Path Stretch="Uniform" Fill="{DynamicResource IconFill}" Data="{StaticResource	LeftArrows}">
 							<Path.RenderTransform>
-								<RotateTransform Angle="{Binding QueueButtonAngle}"/>
+								<RotateTransform Angle="{CompiledBinding QueueButtonAngle}"/>
 							</Path.RenderTransform>
 						</Path>
 					</Button>
@@ -179,17 +242,17 @@
 
 			</Grid>
 			<Border Grid.Row="2" BorderThickness="1" BorderBrush="{DynamicResource DataGridGridLinesBrush}">
-				<SplitView IsPaneOpen="{Binding QueueOpen}" DisplayMode="Inline" OpenPaneLength="400" MinWidth="400" PanePlacement="Right">
+				<SplitView IsPaneOpen="{CompiledBinding QueueOpen}" DisplayMode="Inline" OpenPaneLength="400" MinWidth="400" PanePlacement="Right">
 
 					<!-- Process Queue -->
 					<SplitView.Pane>
-						<views:ProcessQueueControl DataContext="{Binding ProcessQueue}"/>
+						<views:ProcessQueueControl DataContext="{CompiledBinding ProcessQueue}"/>
 					</SplitView.Pane>
 
 					<!-- Product Display Grid -->
 					<views:ProductsDisplay
 						Name="productsDisplay"
-						DataContext="{Binding ProductsDisplay}"						
+						DataContext="{CompiledBinding ProductsDisplay}"						
 						LiberateClicked="ProductsDisplay_LiberateClicked"
 						LiberateSeriesClicked="ProductsDisplay_LiberateSeriesClicked"
 						ConvertToMp3Clicked="ProductsDisplay_ConvertToMp3Clicked" />				
@@ -203,10 +266,10 @@
 						<Setter Property="MinWidth" Value="100" />
 					</Style>
 				</Grid.Styles>
-				<TextBlock FontSize="14" Grid.Column="0" Text="Upgrading:" VerticalAlignment="Center" IsVisible="{Binding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}" />
-				<ProgressBar Grid.Column="1" Margin="5,0,10,0" VerticalAlignment="Stretch" Width="100" Value="{Binding DownloadProgress}" IsVisible="{Binding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}"/>
-				<TextBlock FontSize="14" Grid.Column="2" Text="{Binding VisibleCountText}" VerticalAlignment="Center" />
-				<TextBlock FontSize="14" Grid.Column="3" Text="{Binding LibraryStats.StatusString}" VerticalAlignment="Center" />		
+				<TextBlock FontSize="14" Grid.Column="0" Text="Upgrading:" VerticalAlignment="Center" IsVisible="{CompiledBinding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}" />
+				<ProgressBar Grid.Column="1" Margin="5,0,10,0" VerticalAlignment="Stretch" Width="100" Value="{CompiledBinding DownloadProgress}" IsVisible="{CompiledBinding DownloadProgress, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+				<TextBlock FontSize="14" Grid.Column="2" Text="{CompiledBinding VisibleCountText}" VerticalAlignment="Center" />
+				<TextBlock FontSize="14" Grid.Column="3" Text="{CompiledBinding LibraryStats.StatusString}" VerticalAlignment="Center" />		
 			</Grid>
 		</Grid>
 	</Border>
diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
index 20dfe906..21e2b87a 100644
--- a/Source/LibationAvalonia/Views/MainWindow.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
@@ -1,58 +1,32 @@
-using ApplicationServices;
+using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using DataLayer;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
+using LibationUiBase.GridView;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace LibationAvalonia.Views
 {
-	public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
+	public partial class MainWindow : ReactiveWindow<MainVM>
 	{
-		public event EventHandler Load;
 		public event EventHandler<List<LibraryBook>> LibraryLoaded;
-		private readonly MainWindowViewModel _viewModel;
-
 		public MainWindow()
 		{
-			this.DataContext = _viewModel = new MainWindowViewModel();
+			DataContext = new MainVM(this);
 
 			InitializeComponent();
-
-			// eg: if one of these init'd productsGrid, then another can't reliably subscribe to it
-			Configure_BackupCounts();
-			Configure_ScanAuto();
-			Configure_ScanNotification();
-			Configure_VisibleBooks();
-			Configure_QuickFilters();
-			Configure_ScanManual();
-			Configure_RemoveBooks();
-			Configure_Liberate();
-			Configure_Export();
-			Configure_Settings();
-			Configure_ProcessQueue();
 			Configure_Upgrade();
-			Configure_Filter();
-			// misc which belongs in winforms app but doesn't have a UI element
-			Configure_NonUI();
 
-			_viewModel.ProductsDisplay.RemovableCountChanged += ProductsDisplay_RemovableCountChanged;
-			_viewModel.ProductsDisplay.VisibleCountChanged += ProductsDisplay_VisibleCountChanged;
-
-			{
-				this.LibraryLoaded += MainWindow_LibraryLoaded;
-
-				LibraryCommands.LibrarySizeChanged += async (_, _) => await _viewModel.ProductsDisplay.UpdateGridAsync(DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-				Closing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
-			}
+			Loaded += MainWindow_Loaded;
 			Closing += MainWindow_Closing;
-
-			Opened += MainWindow_Opened;
+			LibraryLoaded += MainWindow_LibraryLoaded;
 		}
 
-		private async void MainWindow_Opened(object sender, EventArgs e)
+		private async void MainWindow_Loaded(object sender, EventArgs e)
 		{
 			if (Configuration.Instance.FirstLaunch)
 			{
@@ -66,21 +40,71 @@ namespace LibationAvalonia.Views
 				Configuration.Instance.FirstLaunch = false;
 			}
 		}
-
+		
 		private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
 		{
 			productsDisplay?.CloseImageDisplay();
+			this.SaveSizeAndLocation(Configuration.Instance);
 		}
 
 		private async void MainWindow_LibraryLoaded(object sender, List<LibraryBook> dbBooks)
 		{
 			if (QuickFilters.UseDefault)
-				await performFilter(QuickFilters.Filters.FirstOrDefault());
+				await ViewModel.PerformFilter(QuickFilters.Filters.FirstOrDefault());
 
-			_viewModel.ProductsDisplay.BindToGrid(dbBooks);
+			ViewModel.ProductsDisplay.BindToGrid(dbBooks);
 		}
 
-		public void OnLoad() => Load?.Invoke(this, EventArgs.Empty);
 		public void OnLibraryLoaded(List<LibraryBook> initialLibrary) => LibraryLoaded?.Invoke(this, initialLibrary);
+		public void ProductsDisplay_LiberateClicked(object _, LibraryBook libraryBook) => ViewModel.LiberateClicked(libraryBook);
+		public void ProductsDisplay_LiberateSeriesClicked(object _, ISeriesEntry series) => ViewModel.LiberateSeriesClicked(series);
+		public void ProductsDisplay_ConvertToMp3Clicked(object _, LibraryBook libraryBook) => ViewModel.ConvertToMp3Clicked(libraryBook);
+
+		public async void filterSearchTb_KeyPress(object _, KeyEventArgs e)
+		{
+			if (e.Key == Key.Return)
+			{
+				await ViewModel.PerformFilter(ViewModel.FilterString);
+
+				// silence the 'ding'
+				e.Handled = true;
+			}
+		}
+
+		private void QuickFiltersMenuItem_KeyDown(object _, KeyEventArgs e)
+		{
+			int keyNum = (int)e.Key - 34;
+
+			if (keyNum <= 9 && keyNum >= 1)
+			{
+				ViewModel.QuickFilterMenuItems
+					.OfType<MenuItem>()
+					.FirstOrDefault(i => i.Header is string h && h.StartsWith($"_{keyNum}"))
+					?.Command
+					?.Execute(null);
+			}
+		}
+		private void Configure_Upgrade()
+		{
+			setProgressVisible(false);
+#if DEBUG
+			async System.Threading.Tasks.Task upgradeAvailable(LibationUiBase.UpgradeEventArgs e)
+			{
+				var notificationResult = await new LibationAvalonia.Dialogs.UpgradeNotificationDialog(e.UpgradeProperties, e.CapUpgrade).ShowDialogAsync(this);
+
+				e.Ignore = notificationResult == DialogResult.Ignore;
+				e.InstallUpgrade = notificationResult == DialogResult.OK;
+			}
+
+			var upgrader = new LibationUiBase.Upgrader();
+			upgrader.DownloadProgress += async (_, e) => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => ViewModel.DownloadProgress = e.ProgressPercentage);
+			upgrader.DownloadBegin += async (_, _) => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(true));
+			upgrader.DownloadCompleted += async (_, _) => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => setProgressVisible(false));
+
+			Opened += async (_, _) => await upgrader.CheckForUpgradeAsync(upgradeAvailable);
+#endif
+		}
+
+		private void setProgressVisible(bool visible) => ViewModel.DownloadProgress = visible ? 0 : null;
 	}
 }
diff --git a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml
index 87b50442..555576dc 100644
--- a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml
+++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml
@@ -11,9 +11,6 @@
 
 	<UserControl.Resources>
 		<views:DecimalConverter x:Key="myConverter" />
-	</UserControl.Resources>
-
-	<UserControl.Resources>
 		<RecyclePool x:Key="RecyclePool" />
 		<DataTemplate x:Key="queuedBook">
 			<views:ProcessBookControl />
diff --git a/Source/LibationAvalonia/Walkthrough.cs b/Source/LibationAvalonia/Walkthrough.cs
index b7bd49d1..8cee6272 100644
--- a/Source/LibationAvalonia/Walkthrough.cs
+++ b/Source/LibationAvalonia/Walkthrough.cs
@@ -149,7 +149,7 @@ namespace LibationAvalonia
 			await displayControlAsync(MainForm.importToolStripMenuItem);
 			await displayControlAsync(scanItem);
 
-			scanItem.RaiseEvent(new RoutedEventArgs(MenuItem.ClickEvent));
+			scanItem.Command.Execute(null);
 			MainForm.importToolStripMenuItem.Close();
 
 			var tcs = new TaskCompletionSource();
@@ -193,7 +193,7 @@ namespace LibationAvalonia
 
 			await displayControlAsync(MainForm.filterBtn);
 
-			MainForm.filterBtn.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+			MainForm.filterBtn.Command.Execute(null);
 
 			await Task.Delay(1000);
 
@@ -222,7 +222,7 @@ namespace LibationAvalonia
 
 			await Task.Delay(750);
 			await displayControlAsync(MainForm.addQuickFilterBtn);
-			MainForm.addQuickFilterBtn.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+			MainForm.addQuickFilterBtn.Command.Execute(null);
 			await displayControlAsync(MainForm.quickFiltersToolStripMenuItem);
 			await displayControlAsync(editQuickFiltersToolStripMenuItem);