diff --git a/ApplicationServices/LibraryCommands.cs b/ApplicationServices/LibraryCommands.cs
index ee3b1565..8410ade2 100644
--- a/ApplicationServices/LibraryCommands.cs
+++ b/ApplicationServices/LibraryCommands.cs
@@ -6,6 +6,7 @@ using AudibleApi;
 using DataLayer;
 using Dinah.Core;
 using DtoImporterService;
+using FileManager;
 using InternalUtilities;
 using Serilog;
 
@@ -13,6 +14,7 @@ namespace ApplicationServices
 {
 	public static class LibraryCommands
 	{
+		#region FULL LIBRARY scan and import
 		public static async Task<(int totalCount, int newCount)> ImportAccountAsync(Func<Account, ILoginCallback> loginCallbackFactoryFunc, params Account[] accounts)
 		{
 			if (accounts is null || accounts.Length == 0)
@@ -100,7 +102,9 @@ namespace ApplicationServices
 
 			return newCount;
 		}
+		#endregion
 
+		#region Update book details
 		public static int UpdateTags(Book book, string newTags)
 		{
 			try
@@ -172,5 +176,40 @@ namespace ApplicationServices
 				throw;
 			}
 		}
+		#endregion
+
+		// this is a query, not command so maybe I should make a LibraryQueries. except there's already one of those...
+		private enum AudioFileState { full, aax, none }
+		private static AudioFileState getAudioFileState(string productId)
+			=> AudibleFileStorage.Audio.Exists(productId) ? AudioFileState.full
+			: AudibleFileStorage.AAXC.Exists(productId) ? AudioFileState.aax
+			: AudioFileState.none;
+		public record LibraryStats(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress, int pdfsDownloaded, int pdfsNotDownloaded) { }
+		public static LibraryStats GetCounts()
+		{
+			var libraryBooks = DbContexts.GetContext().GetLibrary_Flat_NoTracking();
+
+			var results = libraryBooks
+				.AsParallel()
+				.Select(lb => getAudioFileState(lb.Book.AudibleProductId))
+				.ToList();
+			var booksFullyBackedUp = results.Count(r => r == AudioFileState.full);
+			var booksDownloadedOnly = results.Count(r => r == AudioFileState.aax);
+			var booksNoProgress = results.Count(r => r == AudioFileState.none);
+
+			Log.Logger.Information("Book counts. {@DebugInfo}", new { total = results.Count, booksFullyBackedUp, booksDownloadedOnly, booksNoProgress });
+
+			var boolResults = libraryBooks
+				.AsParallel()
+				.Where(lb => lb.Book.Supplements.Any())
+				.Select(lb => AudibleFileStorage.PDF.Exists(lb.Book.AudibleProductId))
+				.ToList();
+			var pdfsDownloaded = boolResults.Count(r => r);
+			var pdfsNotDownloaded = boolResults.Count(r => !r);
+
+			Log.Logger.Information("PDF counts. {@DebugInfo}", new { total = boolResults.Count, pdfsDownloaded, pdfsNotDownloaded });
+
+			return new(booksFullyBackedUp, booksDownloadedOnly, booksNoProgress, pdfsDownloaded, pdfsNotDownloaded);
+		}
 	}
 }
diff --git a/LibationWinForms/Form1.cs b/LibationWinForms/Form1.cs
index 16b69224..8acabf08 100644
--- a/LibationWinForms/Form1.cs
+++ b/LibationWinForms/Form1.cs
@@ -191,45 +191,24 @@ namespace LibationWinForms
         #region bottom: backup counts
         private async void setBackupCountsAsync(object _, object __)
         {
-            await Task.Run(() => {
-                var books = DbContexts.GetContext()
-                    .GetLibrary_Flat_NoTracking()
-                    .Select(sp => sp.Book)
-                    .ToList();
+            LibraryCommands.LibraryStats libraryStats = null;
+            await Task.Run(() => libraryStats = LibraryCommands.GetCounts());
 
-                setBookBackupCounts(books);
-                setPdfBackupCounts(books);
-            });
-		}
-        enum AudioFileState { full, aax, none }
-        private void setBookBackupCounts(IEnumerable<Book> books)
+            setBookBackupCounts(libraryStats.booksFullyBackedUp, libraryStats.booksDownloadedOnly, libraryStats.booksNoProgress);
+            setPdfBackupCounts(libraryStats.pdfsDownloaded, libraryStats.pdfsNotDownloaded);
+        }
+        private void setBookBackupCounts(int booksFullyBackedUp, int booksDownloadedOnly, int booksNoProgress)
         {
-            static AudioFileState getAudioFileState(string productId)
-            {
-                if (AudibleFileStorage.Audio.Exists(productId))
-                    return AudioFileState.full;
-                if (AudibleFileStorage.AAXC.Exists(productId))
-                    return AudioFileState.aax;
-                return AudioFileState.none;
-			}
-
-			var results = books
-				.AsParallel()
-				.Select(b => getAudioFileState(b.AudibleProductId))
-				.ToList();
-			var fullyBackedUp = results.Count(r => r == AudioFileState.full);
-			var downloadedOnly = results.Count(r => r == AudioFileState.aax);
-			var noProgress = results.Count(r => r == AudioFileState.none);
-
             // enable/disable export
-            exportLibraryToolStripMenuItem.Enabled = results.Any();
+            var hasResults = 0 < (booksFullyBackedUp + booksDownloadedOnly + booksNoProgress);
+            exportLibraryToolStripMenuItem.Enabled = hasResults;
 
             // update bottom numbers
-            var pending = noProgress + downloadedOnly;
+            var pending = booksNoProgress + booksDownloadedOnly;
             var statusStripText
-                = !results.Any() ? "No books. Begin by importing your library"
-                : pending > 0 ? string.Format(backupsCountsLbl_Format, noProgress, downloadedOnly, fullyBackedUp)
-                : $"All {"book".PluralizeWithCount(fullyBackedUp)} backed up";
+                = !hasResults ? "No books. Begin by importing your library"
+                : pending > 0 ? string.Format(backupsCountsLbl_Format, booksNoProgress, booksDownloadedOnly, booksFullyBackedUp)
+                : $"All {"book".PluralizeWithCount(booksFullyBackedUp)} backed up";
 
             // update menu item
             var menuItemText
@@ -237,40 +216,29 @@ namespace LibationWinForms
                 ? $"{pending} remaining"
                 : "All books have been liberated";
 
-            Serilog.Log.Logger.Information("Book counts. {@DebugInfo}", new { fullyBackedUp, downloadedOnly, noProgress, pending, statusStripText, menuItemText });
-
             // update UI
             statusStrip1.UIThread(() => backupsCountsLbl.Text = statusStripText);
             menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Enabled = pending > 0);
             menuStrip1.UIThread(() => beginBookBackupsToolStripMenuItem.Text = string.Format(beginBookBackupsToolStripMenuItem_format, menuItemText));
         }
-        private void setPdfBackupCounts(IEnumerable<Book> books)
+        private void setPdfBackupCounts(int pdfsDownloaded, int pdfsNotDownloaded)
         {
-            var boolResults = books
-				.AsParallel()
-				.Where(b => b.Supplements.Any())
-				.Select(b => AudibleFileStorage.PDF.Exists(b.AudibleProductId))
-				.ToList();
-            var downloaded = boolResults.Count(r => r);
-            var notDownloaded = boolResults.Count(r => !r);
-
             // update bottom numbers
+            var hasResults = 0 < (pdfsNotDownloaded + pdfsDownloaded);
             var statusStripText
-                = !boolResults.Any() ? ""
-                : notDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, notDownloaded, downloaded)
-                : $"|  All {downloaded} PDFs downloaded";
+                = !hasResults ? ""
+                : pdfsNotDownloaded > 0 ? string.Format(pdfsCountsLbl_Format, pdfsNotDownloaded, pdfsDownloaded)
+                : $"|  All {pdfsDownloaded} PDFs downloaded";
 
             // update menu item
             var menuItemText
-                = notDownloaded > 0
-                ? $"{notDownloaded} remaining"
+                = pdfsNotDownloaded > 0
+                ? $"{pdfsNotDownloaded} remaining"
                 : "All PDFs have been downloaded";
 
-            Serilog.Log.Logger.Information("PDF counts. {@DebugInfo}", new { downloaded, notDownloaded, statusStripText, menuItemText });
-
             // update UI
             statusStrip1.UIThread(() => pdfsCountsLbl.Text = statusStripText);
-            menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = notDownloaded > 0);
+            menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Enabled = pdfsNotDownloaded > 0);
             menuStrip1.UIThread(() => beginPdfBackupsToolStripMenuItem.Text = string.Format(beginPdfBackupsToolStripMenuItem_format, menuItemText));
         }
         #endregion