From c181d60951c11a23d9f7b75da6512b6e64762720 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 20 Mar 2026 15:44:52 +0100
Subject: [PATCH 001/150] added TODOs

---
 AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs | 2 ++
 AudioCuesheetEditor/Model/AudioCuesheet/Track.cs    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 65ea5d96..b66bbc6c 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -285,6 +285,8 @@ public Boolean MoveTracksPossible(IEnumerable<Track> tracksToMove, MoveDirection
         }
         public void MoveTracks(IEnumerable<Track> tracksToMove, MoveDirection moveDirection)
         {
+            //TODO: Move tracks corresponding to its position in cuesheet
+            //TODO: Use result pattern
             lock (syncLock)
             {
                 if (!MoveTracksPossible(tracksToMove, moveDirection))
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 09b511b7..a8acfa82 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -44,6 +44,7 @@ public class Track : Validateable, ITraceable, ITrack
         /// <summary>
         /// A property with influence to position of this track in cuesheet has been changed. Name of the property changed is provided in event arguments.
         /// </summary>
+        //TODO: Check if this event is really needed because of reordering
         public event EventHandler<String>? RankPropertyValueChanged;
 
         /// <summary>

From 3d212ddd93e0fbb15a8b12c64a249ff660768938 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 09:44:15 +0100
Subject: [PATCH 002/150] Update TrackList.razor

---
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 912fc315..45240ad3 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -131,6 +131,8 @@ along with Foobar.  If not, see
 </MudMenu>
 
 @code {
+    //TODO: Disallow editing of position
+    //TODO: Disallow sorting
     HashSet<Track> selectedTracks = new();
     MudMenu? trackContextMenu;
     Track? contextMenuTrack;

From ba1b827c637d54ff0529d5bc782d1017eddb7a93 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 09:52:04 +0100
Subject: [PATCH 003/150] disallow sorting of tracks

---
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 45240ad3..c90571f6 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -57,7 +57,7 @@ along with Foobar.  If not, see
 <MudForm @ref="form">
     <MudDataGrid T="Track" Items="Cuesheet?.Tracks" ReadOnly="false" Bordered MultiSelection SelectOnRowClick="false" @bind-SelectedItems="selectedTracks" EditTrigger="DataGridEditTrigger.OnRowClick"
                  EditMode="DataGridEditMode.Cell" ColumnResizeMode="ResizeMode.Column" RowContextMenuClick="OpenMenuContent" Height="@(applicationOptions?.FixedTracksTableHeader == true ? "600px" : null)" 
-                 FixedHeader="applicationOptions?.FixedTracksTableHeader == true" Validator="form" Virtualize>
+                 FixedHeader="applicationOptions?.FixedTracksTableHeader == true" Validator="form" Virtualize SortMode="SortMode.None">
         <Columns>
             <SelectColumn Hidden="CurrentViewMode == ViewMode.RecordView" />
             <TemplateColumn Title="@_localizer["Controls"]" Hidden="CurrentViewMode != ViewMode.RecordView">
@@ -132,7 +132,6 @@ along with Foobar.  If not, see
 
 @code {
     //TODO: Disallow editing of position
-    //TODO: Disallow sorting
     HashSet<Track> selectedTracks = new();
     MudMenu? trackContextMenu;
     Track? contextMenuTrack;

From 679803a3189c15f30b797867250ac27009d97edd Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 11:04:41 +0100
Subject: [PATCH 004/150] Update ITraceChangeManager.cs

---
 .../Services/UI/ITraceChangeManager.cs          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
index 757b64bd..96f22035 100644
--- a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
@@ -1,4 +1,19 @@
-using AudioCuesheetEditor.Model.UI;
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.UI;
 
 namespace AudioCuesheetEditor.Services.UI
 {

From 0ea50a491ac0052dadb9c73ed2ac61f9ccacb990 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 14:13:45 +0100
Subject: [PATCH 005/150] Update TraceChangeManager.cs

---
 .../Services/UI/TraceChangeManager.cs         | 117 ++++++++++--------
 1 file changed, 62 insertions(+), 55 deletions(-)

diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index 45e944db..39fc67b5 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -50,10 +50,10 @@ public class TraceChangeManager(ILogger<TraceChangeManager> logger) : ITraceChan
     {
         private readonly ILogger<TraceChangeManager> _logger = logger;
 
-        private readonly List<TracedChanges> undoStack = [];
-        private readonly List<TracedChanges> redoStack = [];
+        private readonly List<TracedChanges> _undoStack = [];
+        private readonly List<TracedChanges> _redoStack = [];
 
-        private List<TracedChange>? bulkEditTracedChanges;
+        private List<TracedChange>? _bulkEditTracedChanges;
 
         public event EventHandler? TracedObjectHistoryChanged;
         public event EventHandler? UndoDone;
@@ -61,21 +61,10 @@ public class TraceChangeManager(ILogger<TraceChangeManager> logger) : ITraceChan
 
         public bool CurrentlyHandlingRedoOrUndoChanges { get; private set; } = false;
         /// <inheritdoc />
-        public bool CanUndo
-        {
-            get
-            {
-                return undoStack.Count > 0;
-            }
-        }
+        public bool CanUndo => _undoStack.Count > 0;
+
         /// <inheritdoc />
-        public bool CanRedo
-        {
-            get
-            {
-                return redoStack.Count > 0;
-            }
-        }
+        public bool CanRedo => _redoStack.Count > 0;
 
         public void TraceChanges(ITraceable traceable)
         {
@@ -84,8 +73,8 @@ public void TraceChanges(ITraceable traceable)
 
         public void Reset()
         {
-            Reset(redoStack);
-            Reset(undoStack);
+            Reset(_redoStack);
+            Reset(_undoStack);
         }
 
         public void Undo()
@@ -95,10 +84,10 @@ public void Undo()
             {
                 CurrentlyHandlingRedoOrUndoChanges = true; 
                 TracedChanges? changes = null;
-                while (undoStack.Count > 0 && changes == null)
+                while (_undoStack.Count > 0 && changes == null)
                 {
-                    changes = undoStack[^1];
-                    undoStack.Remove(changes);
+                    changes = _undoStack[^1];
+                    _undoStack.Remove(changes);
                     if (changes.HasTraceableObject == false)
                     {
                         changes = null;
@@ -112,7 +101,10 @@ public void Undo()
                         var change = changes.Changes.ElementAt(i);
                         var tracedObject = change?.TraceableObject;
                         var traceAbleChange = change?.TraceableChange;
-                        _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
+                        if (_logger.IsEnabled(LogLevel.Debug))
+                        {
+                            _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
+                        }
                         if (tracedObject != null && traceAbleChange != null)
                         {
                             var propertyInfo = tracedObject.GetType().GetProperty(traceAbleChange.PropertyName);
@@ -120,7 +112,10 @@ public void Undo()
                             {
                                 var currentValue = propertyInfo.GetValue(tracedObject);
                                 redoChanges.Add(new TracedChange(tracedObject, new TraceableChange(currentValue, traceAbleChange.PropertyName)));
-                                _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
+                                if (_logger.IsEnabled(LogLevel.Debug))
+                                {
+                                    _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
+                                }
                                 propertyInfo.SetValue(tracedObject, traceAbleChange.PreviousValue);
                             }
                             else
@@ -134,7 +129,7 @@ public void Undo()
                         }
                     }
                     //Push the old value to redo stack
-                    redoStack.Add(new TracedChanges(redoChanges));
+                    _redoStack.Add(new TracedChanges(redoChanges));
                 }
                 CurrentlyHandlingRedoOrUndoChanges = false;
                 UndoDone?.Invoke(this, EventArgs.Empty);
@@ -148,10 +143,10 @@ public void Redo()
             {
                 CurrentlyHandlingRedoOrUndoChanges = true;
                 TracedChanges? changes = null;
-                while (redoStack.Count > 0 && changes == null)
+                while (_redoStack.Count > 0 && changes == null)
                 {
-                    changes = redoStack[^1];
-                    redoStack.Remove(changes);
+                    changes = _redoStack[^1];
+                    _redoStack.Remove(changes);
                     if (changes.HasTraceableObject == false)
                     {
                         changes = null;
@@ -165,7 +160,10 @@ public void Redo()
                         var change = changes.Changes.ElementAt(i);
                         var tracedObject = change?.TraceableObject;
                         var traceAbleChange = change?.TraceableChange;
-                        _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
+                        if (_logger.IsEnabled(LogLevel.Debug))
+                        {
+                            _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
+                        }
                         if (tracedObject != null && traceAbleChange != null)
                         {
                             var propertyInfo = tracedObject.GetType().GetProperty(traceAbleChange.PropertyName);
@@ -173,7 +171,10 @@ public void Redo()
                             {
                                 var currentValue = propertyInfo.GetValue(tracedObject);
                                 undoChanges.Add(new TracedChange(tracedObject, new TraceableChange(currentValue, traceAbleChange.PropertyName)));
-                                _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
+                                if (_logger.IsEnabled(LogLevel.Debug))
+                                {
+                                    _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
+                                }
                                 propertyInfo.SetValue(tracedObject, traceAbleChange.PreviousValue);
                             }
                             else
@@ -187,7 +188,7 @@ public void Redo()
                         }
                     }
                     //Push the old value to redo stack
-                    undoStack.Add(new TracedChanges(undoChanges));
+                    _undoStack.Add(new TracedChanges(undoChanges));
                 }
                 CurrentlyHandlingRedoOrUndoChanges = false;
                 RedoDone?.Invoke(this, EventArgs.Empty);
@@ -196,21 +197,24 @@ public void Redo()
 
         public bool BulkEdit 
         {
-            get => bulkEditTracedChanges != null;
+            get => _bulkEditTracedChanges != null;
             set
             {
-                _logger.LogDebug("Set BulkEdit called with {value}", value);
+                if (_logger.IsEnabled(LogLevel.Debug))
+                {
+                    _logger.LogDebug("Set BulkEdit called with {value}", value);
+                }
                 if (value)
                 {
-                    bulkEditTracedChanges = [];
+                    _bulkEditTracedChanges = [];
                 }
                 else
                 {
-                    if (bulkEditTracedChanges != null)
+                    if (_bulkEditTracedChanges != null)
                     {
-                        undoStack.Add(new TracedChanges(bulkEditTracedChanges));
+                        _undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
                         TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
-                        bulkEditTracedChanges = null;
+                        _bulkEditTracedChanges = null;
                     }
                 }
             }
@@ -218,11 +222,11 @@ public bool BulkEdit
 
         public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
         {
-            var edit = undoStack.FirstOrDefault(targetEdit);
-            if ((edit != null) && (undoStack.Count > 0))
+            var edit = _undoStack.FirstOrDefault(targetEdit);
+            if ((edit != null) && (_undoStack.Count > 0))
             {
-                var lastEdits = undoStack[^1];
-                undoStack.Remove(lastEdits);
+                var lastEdits = _undoStack[^1];
+                _undoStack.Remove(lastEdits);
                 edit.Changes.AddRange(lastEdits.Changes);
                 UndoDone?.Invoke(this, EventArgs.Empty);
             }
@@ -230,10 +234,10 @@ public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
 
         public void RemoveTracedChanges(IEnumerable<ITraceable> traceables)
         {
-            undoStack.RemoveAll(x => x.HasTraceableObject == false);
-            undoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
-            redoStack.RemoveAll(x => x.HasTraceableObject == false);
-            redoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
+            _undoStack.RemoveAll(x => x.HasTraceableObject == false);
+            _undoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
+            _redoStack.RemoveAll(x => x.HasTraceableObject == false);
+            _redoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
             TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
         }
 
@@ -245,10 +249,7 @@ private void Reset(List<TracedChanges> stack)
                 stack.Remove(tracedChange);
                 foreach (var change in tracedChange.Changes)
                 {
-                    if (change.TraceableObject != null)
-                    {
-                        change.TraceableObject.TraceablePropertyChanged -= Traceable_TraceablePropertyChanged;
-                    }
+                    change.TraceableObject?.TraceablePropertyChanged -= Traceable_TraceablePropertyChanged;
                 }
             }
             stack.Clear();
@@ -256,25 +257,31 @@ private void Reset(List<TracedChanges> stack)
 
         private void Traceable_TraceablePropertyChanged(object? sender, TraceablePropertiesChangedEventArgs e)
         {
-            _logger.LogDebug("Traceable_TraceablePropertyChanged called with {sender}, {PropertyName}, {PreviousValue}", sender, e.TraceableChange.PropertyName, e.TraceableChange.PreviousValue);
-            _logger.LogDebug("CurrentlyHandlingRedoOrUndoChanges = {CurrentlyHandlingRedoOrUndoChanges}", CurrentlyHandlingRedoOrUndoChanges);
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("Traceable_TraceablePropertyChanged called with {sender}, {PropertyName}, {PreviousValue}", sender, e.TraceableChange.PropertyName, e.TraceableChange.PreviousValue);
+                _logger.LogDebug("CurrentlyHandlingRedoOrUndoChanges = {CurrentlyHandlingRedoOrUndoChanges}", CurrentlyHandlingRedoOrUndoChanges);
+            }
             if (CurrentlyHandlingRedoOrUndoChanges == false)
             {
                 if (sender != null)
                 {
-                    _logger.LogDebug("BulkEdit = {BulkEdit}", BulkEdit);
+                    if (_logger.IsEnabled(LogLevel.Debug))
+                    {
+                        _logger.LogDebug("BulkEdit = {BulkEdit}", BulkEdit);
+                    }
                     if (BulkEdit == false)
                     {
                         //Single change
                         var changes = new TracedChanges([new((ITraceable)sender, e.TraceableChange)]);
-                        undoStack.Add(changes);
-                        redoStack.Clear();
+                        _undoStack.Add(changes);
+                        _redoStack.Clear();
                         TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
                     }
                     else
                     {
                         //We are tracing multiple changes
-                        bulkEditTracedChanges?.Add(new TracedChange((ITraceable)sender, e.TraceableChange));
+                        _bulkEditTracedChanges?.Add(new TracedChange((ITraceable)sender, e.TraceableChange));
                     }
                 }
                 else

From 092afb57f021589edd163df15b9af3073a62c6bb Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 14:53:22 +0100
Subject: [PATCH 006/150] fix tests

---
 .../Tests/Desktop/ImportTest.cs               | 226 ++++----------
 .../Tests/Desktop/TracingTest.cs              | 276 +++++-------------
 2 files changed, 125 insertions(+), 377 deletions(-)

diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
index f7f63a60..5c1298a8 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
@@ -32,33 +32,15 @@ public async Task Import_ShouldImportTracks_WhenUsingSampleInputfile()
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
@@ -263,33 +245,15 @@ public async Task Import_ShouldBeEditable_WhenEditingTrack()
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
@@ -487,7 +451,7 @@ public async Task Import_ShouldImportTracks_WithSpecialTextfile()
             await importView.ImportFileAsync("Textimport-Bug-#54.txt");
             await importView.SwitchImportProfileAsync("Textfile (just track data)");
             await importView.Analyze();
-            await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync("- table:\n  - rowgroup:\n    - row \"# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options\":\n      - columnheader:\n        - checkbox\n      - columnheader \"# Sort Column options\":\n        - button \"Sort\"\n        - button \"Column options\"\n      - columnheader \"Artist Sort Column options\":\n        - button \"Sort\"\n        - button \"Column options\"\n      - columnheader \"Title Sort Column options\":\n        - button \"Sort\"\n        - button \"Column options\"\n      - columnheader \"Begin Sort Column options\":\n        - button \"Sort\"\n        - button \"Column options\"\n      - columnheader \"End Sort Column options\":\n        - button \"Sort\"\n        - button \"Column options\"\n      - columnheader \"Length Sort Column options\":\n        - button \"Sort\"\n        - button \"Column options\"\n  - rowgroup:\n    - row /Increment Decrement Adriatique Clear X\\. Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"1\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Adriatique Clear\":\n        - textbox: Adriatique\n        - button \"Clear\"\n        - button\n      - cell \"X. Clear\":\n        - textbox: X.\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Third Harmony Clear Fears And Dreams \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"2\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Third Harmony Clear\":\n        - textbox: Third Harmony\n        - button \"Clear\"\n        - button\n      - cell \"Fears And Dreams (Original Mix) Clear\":\n        - textbox: Fears And Dreams (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Dele Sosimi Afrobeat Orchestra Clear Too Much Information \\(Laolu Remix; Edit\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"3\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Dele Sosimi Afrobeat Orchestra Clear\":\n        - textbox: Dele Sosimi Afrobeat Orchestra\n        - button \"Clear\"\n        - button\n      - cell \"Too Much Information (Laolu Remix; Edit) Clear\":\n        - textbox: Too Much Information (Laolu Remix; Edit)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Edem, Govan Clear Ankh \\(Onetwo MX Remix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"4\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Edem, Govan Clear\":\n        - textbox: Edem, Govan\n        - button \"Clear\"\n        - button\n      - cell \"Ankh (Onetwo MX Remix) Clear\":\n        - textbox: Ankh (Onetwo MX Remix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Jody Wisternoff Clear For All Time \\(feat\\. Hendrik Burkhard\\) \\(Extended Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"5\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Jody Wisternoff Clear\":\n        - textbox: Jody Wisternoff\n        - button \"Clear\"\n        - button\n      - cell \"For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear\":\n        - textbox: For All Time (feat. Hendrik Burkhard) (Extended Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Einmusik Clear Bead \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"6\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Einmusik Clear\":\n        - textbox: Einmusik\n        - button \"Clear\"\n        - button\n      - cell \"Bead (Original Mix) Clear\":\n        - textbox: Bead (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Sebastien Leger Clear La Danse du Scorpion Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"7\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Sebastien Leger Clear\":\n        - textbox: Sebastien Leger\n        - button \"Clear\"\n        - button\n      - cell \"La Danse du Scorpion Clear\":\n        - textbox: La Danse du Scorpion\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Paul Thomas & Solid Stone Clear La Bombo \\(Solid Stone Remix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"8\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Paul Thomas & Solid Stone Clear\":\n        - textbox: Paul Thomas & Solid Stone\n        - button \"Clear\"\n        - button\n      - cell \"La Bombo (Solid Stone Remix) Clear\":\n        - textbox: La Bombo (Solid Stone Remix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement GusGus Clear Crossfade \\(Maceo Plex Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: \"9\"\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"GusGus Clear\":\n        - textbox: GusGus\n        - button \"Clear\"\n        - button\n      - cell \"Crossfade (Maceo Plex Mix) Clear\":\n        - textbox: Crossfade (Maceo Plex Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Klangkarussell Clear Time \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Klangkarussell Clear\":\n        - textbox: Klangkarussell\n        - button \"Clear\"\n        - button\n      - cell \"Time (Original Mix) Clear\":\n        - textbox: Time (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Anysense & Un:said Clear Missing Path \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Anysense & Un:said Clear\":\n        - textbox: Anysense & Un:said\n        - button \"Clear\"\n        - button\n      - cell \"Missing Path (Original Mix) Clear\":\n        - textbox: Missing Path (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Space Food Clear Bombay Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Space Food Clear\":\n        - textbox: Space Food\n        - button \"Clear\"\n        - button\n      - cell \"Bombay Clear\":\n        - textbox: Bombay\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement SHDW & Obscure Shape Clear Wächter der Nacht \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"SHDW & Obscure Shape Clear\":\n        - textbox: SHDW & Obscure Shape\n        - button \"Clear\"\n        - button\n      - cell \"Wächter der Nacht (Original Mix) Clear\":\n        - textbox: Wächter der Nacht (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement HOSH Clear Karma Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"HOSH Clear\":\n        - textbox: HOSH\n        - button \"Clear\"\n        - button\n      - cell \"Karma Clear\":\n        - textbox: Karma\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Alexey Union Clear Olympia \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Alexey Union Clear\":\n        - textbox: Alexey Union\n        - button \"Clear\"\n        - button\n      - cell \"Olympia (Original Mix) Clear\":\n        - textbox: Olympia (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Paul Taylor Clear Afterglow Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Paul Taylor Clear\":\n        - textbox: Paul Taylor\n        - button \"Clear\"\n        - button\n      - cell \"Afterglow Clear\":\n        - textbox: Afterglow\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Philter Clear Stranger Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Philter Clear\":\n        - textbox: Philter\n        - button \"Clear\"\n        - button\n      - cell \"Stranger Clear\":\n        - textbox: Stranger\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Skizologic Clear Hypersphere \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Skizologic Clear\":\n        - textbox: Skizologic\n        - button \"Clear\"\n        - button\n      - cell \"Hypersphere (Original Mix) Clear\":\n        - textbox: Hypersphere (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Thomas Schumacher, Caitlin Clear All of You \\(Remix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Thomas Schumacher, Caitlin Clear\":\n        - textbox: Thomas Schumacher, Caitlin\n        - button \"Clear\"\n        - button\n      - cell \"All of You (Remix) Clear\":\n        - textbox: All of You (Remix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement A\\. Skomoroh Clear White Horse Conquest \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"A. Skomoroh Clear\":\n        - textbox: A. Skomoroh\n        - button \"Clear\"\n        - button\n      - cell \"White Horse Conquest (Original Mix) Clear\":\n        - textbox: White Horse Conquest (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Patrik Berg Clear Bright \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Patrik Berg Clear\":\n        - textbox: Patrik Berg\n        - button \"Clear\"\n        - button\n      - cell \"Bright (Original Mix) Clear\":\n        - textbox: Bright (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Hidden Empire Clear Bengal Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Hidden Empire Clear\":\n        - textbox: Hidden Empire\n        - button \"Clear\"\n        - button\n      - cell \"Bengal Clear\":\n        - textbox: Bengal\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Mario Ochoa Clear Levitate Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Mario Ochoa Clear\":\n        - textbox: Mario Ochoa\n        - button \"Clear\"\n        - button\n      - cell \"Levitate Clear\":\n        - textbox: Levitate\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Raul Facio Clear Eyes Wide Shut \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Raul Facio Clear\":\n        - textbox: Raul Facio\n        - button \"Clear\"\n        - button\n      - cell \"Eyes Wide Shut (Original Mix) Clear\":\n        - textbox: Eyes Wide Shut (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Soolver Clear Regular \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Soolver Clear\":\n        - textbox: Soolver\n        - button \"Clear\"\n        - button\n      - cell \"Regular (Original Mix) Clear\":\n        - textbox: Regular (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Weska Clear EQ64 \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Weska Clear\":\n        - textbox: Weska\n        - button \"Clear\"\n        - button\n      - cell \"EQ64 (Original Mix) Clear\":\n        - textbox: EQ64 (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Tempo Giusto Clear The Fall \\(Extended Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Tempo Giusto Clear\":\n        - textbox: Tempo Giusto\n        - button \"Clear\"\n        - button\n      - cell \"The Fall (Extended Mix) Clear\":\n        - textbox: The Fall (Extended Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Vlind & Asteroid & Gary Leroy Clear Trinity \\(Extended Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Vlind & Asteroid & Gary Leroy Clear\":\n        - textbox: Vlind & Asteroid & Gary Leroy\n        - button \"Clear\"\n        - button\n      - cell \"Trinity (Extended Mix) Clear\":\n        - textbox: Trinity (Extended Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Astral Legacy Clear Vaveyla \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Astral Legacy Clear\":\n        - textbox: Astral Legacy\n        - button \"Clear\"\n        - button\n      - cell \"Vaveyla (Original Mix) Clear\":\n        - textbox: Vaveyla (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Gerrox Clear Chakra \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Gerrox Clear\":\n        - textbox: Gerrox\n        - button \"Clear\"\n        - button\n      - cell \"Chakra (Original Mix) Clear\":\n        - textbox: Chakra (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Charlotte De Witte Clear Pattern Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Charlotte De Witte Clear\":\n        - textbox: Charlotte De Witte\n        - button \"Clear\"\n        - button\n      - cell \"Pattern Clear\":\n        - textbox: Pattern\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Space Food Clear Amabey Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Space Food Clear\":\n        - textbox: Space Food\n        - button \"Clear\"\n        - button\n      - cell \"Amabey Clear\":\n        - textbox: Amabey\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement ARTBAT Clear Papilion \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"ARTBAT Clear\":\n        - textbox: ARTBAT\n        - button \"Clear\"\n        - button\n      - cell \"Papilion (Original Mix) Clear\":\n        - textbox: Papilion (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement PETER PAHN Clear Enjoy Infinity \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"PETER PAHN Clear\":\n        - textbox: PETER PAHN\n        - button \"Clear\"\n        - button\n      - cell \"Enjoy Infinity (Original Mix) Clear\":\n        - textbox: Enjoy Infinity (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Solitek Clear Instinct \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Solitek Clear\":\n        - textbox: Solitek\n        - button \"Clear\"\n        - button\n      - cell \"Instinct (Original Mix) Clear\":\n        - textbox: Instinct (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Veerus Clear Heavy Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Veerus Clear\":\n        - textbox: Veerus\n        - button \"Clear\"\n        - button\n      - cell \"Heavy Clear\":\n        - textbox: Heavy\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Secret Cinema & Reinier Zonneveld Clear Pain Thing \\(Original Mix\\) Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Secret Cinema & Reinier Zonneveld Clear\":\n        - textbox: Secret Cinema & Reinier Zonneveld\n        - button \"Clear\"\n        - button\n      - cell \"Pain Thing (Original Mix) Clear\":\n        - textbox: Pain Thing (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Amelie Lens Clear Hypnotized Clear \\d+:\\d+:\\d+ \\d+:\\d+:\\d+ \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Amelie Lens Clear\":\n        - textbox: Amelie Lens\n        - button \"Clear\"\n        - button\n      - cell \"Hypnotized Clear\":\n        - textbox: Hypnotized\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n    - row /Increment Decrement Nikolay Kirov Clear Chasing the Sun \\(Original Mix\\) Clear \\d+:\\d+:\\d+/:\n      - cell:\n        - checkbox\n      - cell \"Increment Decrement\":\n        - spinbutton: /\\d+/\n        - button \"Increment\"\n        - button \"Decrement\"\n      - cell \"Nikolay Kirov Clear\":\n        - textbox: Nikolay Kirov\n        - button \"Clear\"\n        - button\n      - cell \"Chasing the Sun (Original Mix) Clear\":\n        - textbox: Chasing the Sun (Original Mix)\n        - button \"Clear\"\n        - button\n      - cell /\\d+:\\d+:\\d+/:\n        - textbox: /\\d+:\\d+:\\d+/\n      - cell:\n        - textbox\n      - cell:\n        - textbox\n  - rowgroup:\n    - row");
+            await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync("- table:\r\n  - rowgroup:\r\n    - row \"# Artist Title Begin End Length\":\r\n      - columnheader:\r\n        - checkbox\r\n      - columnheader \"#\"\r\n      - columnheader \"Artist\"\r\n      - columnheader \"Title\"\r\n      - columnheader \"Begin\"\r\n      - columnheader \"End\"\r\n      - columnheader \"Length\"\r\n  - rowgroup:\r\n    - row \"Increment Decrement Adriatique Clear X. Clear 00:00:00 00:05:24 00:05:24\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"1\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Adriatique Clear\":\r\n        - textbox: Adriatique\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"X. Clear\":\r\n        - textbox: X.\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:00:00\":\r\n        - textbox: 00:00:00\r\n      - cell \"00:05:24\":\r\n        - textbox: 00:05:24\r\n      - cell \"00:05:24\":\r\n        - textbox: 00:05:24\r\n    - row \"Increment Decrement Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24 00:10:39 00:05:15\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"2\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Third Harmony Clear\":\r\n        - textbox: Third Harmony\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Fears And Dreams (Original Mix) Clear\":\r\n        - textbox: Fears And Dreams (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:05:24\":\r\n        - textbox: 00:05:24\r\n      - cell \"00:10:39\":\r\n        - textbox: 00:10:39\r\n      - cell \"00:05:15\":\r\n        - textbox: 00:05:15\r\n    - row \"Increment Decrement Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"3\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Dele Sosimi Afrobeat Orchestra Clear\":\r\n        - textbox: Dele Sosimi Afrobeat Orchestra\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Too Much Information (Laolu Remix; Edit) Clear\":\r\n        - textbox: Too Much Information (Laolu Remix; Edit)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:10:39\":\r\n        - textbox: 00:10:39\r\n      - cell \"00:17:06\":\r\n        - textbox: 00:17:06\r\n      - cell \"00:06:27\":\r\n        - textbox: 00:06:27\r\n    - row \"Increment Decrement Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"4\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Edem, Govan Clear\":\r\n        - textbox: Edem, Govan\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Ankh (Onetwo MX Remix) Clear\":\r\n        - textbox: Ankh (Onetwo MX Remix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:17:06\":\r\n        - textbox: 00:17:06\r\n      - cell \"00:23:21\":\r\n        - textbox: 00:23:21\r\n      - cell \"00:06:15\":\r\n        - textbox: 00:06:15\r\n    - row \"Increment Decrement Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"5\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Jody Wisternoff Clear\":\r\n        - textbox: Jody Wisternoff\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear\":\r\n        - textbox: For All Time (feat. Hendrik Burkhard) (Extended Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:23:21\":\r\n        - textbox: 00:23:21\r\n      - cell \"00:29:02\":\r\n        - textbox: 00:29:02\r\n      - cell \"00:05:41\":\r\n        - textbox: 00:05:41\r\n    - row \"Increment Decrement Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"6\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Einmusik Clear\":\r\n        - textbox: Einmusik\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Bead (Original Mix) Clear\":\r\n        - textbox: Bead (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:29:02\":\r\n        - textbox: 00:29:02\r\n      - cell \"00:34:27\":\r\n        - textbox: 00:34:27\r\n      - cell \"00:05:25\":\r\n        - textbox: 00:05:25\r\n    - row \"Increment Decrement Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"7\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Sebastien Leger Clear\":\r\n        - textbox: Sebastien Leger\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"La Danse du Scorpion Clear\":\r\n        - textbox: La Danse du Scorpion\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:34:27\":\r\n        - textbox: 00:34:27\r\n      - cell \"00:40:59\":\r\n        - textbox: 00:40:59\r\n      - cell \"00:06:32\":\r\n        - textbox: 00:06:32\r\n    - row \"Increment Decrement Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"8\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Paul Thomas & Solid Stone Clear\":\r\n        - textbox: Paul Thomas & Solid Stone\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"La Bombo (Solid Stone Remix) Clear\":\r\n        - textbox: La Bombo (Solid Stone Remix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:40:59\":\r\n        - textbox: 00:40:59\r\n      - cell \"00:46:19\":\r\n        - textbox: 00:46:19\r\n      - cell \"00:05:20\":\r\n        - textbox: 00:05:20\r\n    - row \"Increment Decrement GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"9\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"GusGus Clear\":\r\n        - textbox: GusGus\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Crossfade (Maceo Plex Mix) Clear\":\r\n        - textbox: Crossfade (Maceo Plex Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:46:19\":\r\n        - textbox: 00:46:19\r\n      - cell \"00:52:20\":\r\n        - textbox: 00:52:20\r\n      - cell \"00:06:01\":\r\n        - textbox: 00:06:01\r\n    - row \"Increment Decrement Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"10\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Klangkarussell Clear\":\r\n        - textbox: Klangkarussell\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Time (Original Mix) Clear\":\r\n        - textbox: Time (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:52:20\":\r\n        - textbox: 00:52:20\r\n      - cell \"00:56:19\":\r\n        - textbox: 00:56:19\r\n      - cell \"00:03:59\":\r\n        - textbox: 00:03:59\r\n    - row \"Increment Decrement Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"11\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Anysense & Un:said Clear\":\r\n        - textbox: Anysense & Un:said\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Missing Path (Original Mix) Clear\":\r\n        - textbox: Missing Path (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:56:19\":\r\n        - textbox: 00:56:19\r\n      - cell \"01:01:41\":\r\n        - textbox: 01:01:41\r\n      - cell \"00:05:22\":\r\n        - textbox: 00:05:22\r\n    - row \"Increment Decrement Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"12\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Space Food Clear\":\r\n        - textbox: Space Food\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Bombay Clear\":\r\n        - textbox: Bombay\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:01:41\":\r\n        - textbox: 01:01:41\r\n      - cell \"01:06:33\":\r\n        - textbox: 01:06:33\r\n      - cell \"00:04:52\":\r\n        - textbox: 00:04:52\r\n    - row \"Increment Decrement SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"13\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"SHDW & Obscure Shape Clear\":\r\n        - textbox: SHDW & Obscure Shape\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Wächter der Nacht (Original Mix) Clear\":\r\n        - textbox: Wächter der Nacht (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:06:33\":\r\n        - textbox: 01:06:33\r\n      - cell \"01:11:04\":\r\n        - textbox: 01:11:04\r\n      - cell \"00:04:31\":\r\n        - textbox: 00:04:31\r\n    - row \"Increment Decrement HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"14\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"HOSH Clear\":\r\n        - textbox: HOSH\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Karma Clear\":\r\n        - textbox: Karma\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:11:04\":\r\n        - textbox: 01:11:04\r\n      - cell \"01:15:28\":\r\n        - textbox: 01:15:28\r\n      - cell \"00:04:24\":\r\n        - textbox: 00:04:24\r\n    - row \"Increment Decrement Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"15\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Alexey Union Clear\":\r\n        - textbox: Alexey Union\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Olympia (Original Mix) Clear\":\r\n        - textbox: Olympia (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:15:28\":\r\n        - textbox: 01:15:28\r\n      - cell \"01:21:08\":\r\n        - textbox: 01:21:08\r\n      - cell \"00:05:40\":\r\n        - textbox: 00:05:40\r\n    - row \"Increment Decrement Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"16\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Paul Taylor Clear\":\r\n        - textbox: Paul Taylor\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Afterglow Clear\":\r\n        - textbox: Afterglow\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:21:08\":\r\n        - textbox: 01:21:08\r\n      - cell \"01:25:38\":\r\n        - textbox: 01:25:38\r\n      - cell \"00:04:30\":\r\n        - textbox: 00:04:30\r\n    - row \"Increment Decrement Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"17\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Philter Clear\":\r\n        - textbox: Philter\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Stranger Clear\":\r\n        - textbox: Stranger\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:25:38\":\r\n        - textbox: 01:25:38\r\n      - cell \"01:31:52\":\r\n        - textbox: 01:31:52\r\n      - cell \"00:06:14\":\r\n        - textbox: 00:06:14\r\n    - row \"Increment Decrement Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"18\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Skizologic Clear\":\r\n        - textbox: Skizologic\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Hypersphere (Original Mix) Clear\":\r\n        - textbox: Hypersphere (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:31:52\":\r\n        - textbox: 01:31:52\r\n      - cell \"01:36:40\":\r\n        - textbox: 01:36:40\r\n      - cell \"00:04:48\":\r\n        - textbox: 00:04:48\r\n    - row \"Increment Decrement Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"19\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Thomas Schumacher, Caitlin Clear\":\r\n        - textbox: Thomas Schumacher, Caitlin\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"All of You (Remix) Clear\":\r\n        - textbox: All of You (Remix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:36:40\":\r\n        - textbox: 01:36:40\r\n      - cell \"01:42:16\":\r\n        - textbox: 01:42:16\r\n      - cell \"00:05:36\":\r\n        - textbox: 00:05:36\r\n    - row \"Increment Decrement A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"20\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"A. Skomoroh Clear\":\r\n        - textbox: A. Skomoroh\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"White Horse Conquest (Original Mix) Clear\":\r\n        - textbox: White Horse Conquest (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:42:16\":\r\n        - textbox: 01:42:16\r\n      - cell \"01:47:04\":\r\n        - textbox: 01:47:04\r\n      - cell \"00:04:48\":\r\n        - textbox: 00:04:48\r\n    - row \"Increment Decrement Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"21\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Patrik Berg Clear\":\r\n        - textbox: Patrik Berg\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Bright (Original Mix) Clear\":\r\n        - textbox: Bright (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:47:04\":\r\n        - textbox: 01:47:04\r\n      - cell \"01:52:37\":\r\n        - textbox: 01:52:37\r\n      - cell \"00:05:33\":\r\n        - textbox: 00:05:33\r\n    - row \"Increment Decrement Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"22\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Hidden Empire Clear\":\r\n        - textbox: Hidden Empire\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Bengal Clear\":\r\n        - textbox: Bengal\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:52:37\":\r\n        - textbox: 01:52:37\r\n      - cell \"01:58:05\":\r\n        - textbox: 01:58:05\r\n      - cell \"00:05:28\":\r\n        - textbox: 00:05:28\r\n    - row \"Increment Decrement Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"23\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Mario Ochoa Clear\":\r\n        - textbox: Mario Ochoa\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Levitate Clear\":\r\n        - textbox: Levitate\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:58:05\":\r\n        - textbox: 01:58:05\r\n      - cell \"02:03:00\":\r\n        - textbox: 02:03:00\r\n      - cell \"00:04:55\":\r\n        - textbox: 00:04:55\r\n    - row \"Increment Decrement Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"24\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Raul Facio Clear\":\r\n        - textbox: Raul Facio\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Eyes Wide Shut (Original Mix) Clear\":\r\n        - textbox: Eyes Wide Shut (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:03:00\":\r\n        - textbox: 02:03:00\r\n      - cell \"02:08:21\":\r\n        - textbox: 02:08:21\r\n      - cell \"00:05:21\":\r\n        - textbox: 00:05:21\r\n    - row \"Increment Decrement Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"25\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Soolver Clear\":\r\n        - textbox: Soolver\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Regular (Original Mix) Clear\":\r\n        - textbox: Regular (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:08:21\":\r\n        - textbox: 02:08:21\r\n      - cell \"02:14:31\":\r\n        - textbox: 02:14:31\r\n      - cell \"00:06:10\":\r\n        - textbox: 00:06:10\r\n    - row \"Increment Decrement Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"26\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Weska Clear\":\r\n        - textbox: Weska\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"EQ64 (Original Mix) Clear\":\r\n        - textbox: EQ64 (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:14:31\":\r\n        - textbox: 02:14:31\r\n      - cell \"02:18:35\":\r\n        - textbox: 02:18:35\r\n      - cell \"00:04:04\":\r\n        - textbox: 00:04:04\r\n    - row \"Increment Decrement Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"27\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Tempo Giusto Clear\":\r\n        - textbox: Tempo Giusto\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"The Fall (Extended Mix) Clear\":\r\n        - textbox: The Fall (Extended Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:18:35\":\r\n        - textbox: 02:18:35\r\n      - cell \"02:24:12\":\r\n        - textbox: 02:24:12\r\n      - cell \"00:05:37\":\r\n        - textbox: 00:05:37\r\n    - row \"Increment Decrement Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"28\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Vlind & Asteroid & Gary Leroy Clear\":\r\n        - textbox: Vlind & Asteroid & Gary Leroy\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Trinity (Extended Mix) Clear\":\r\n        - textbox: Trinity (Extended Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:24:12\":\r\n        - textbox: 02:24:12\r\n      - cell \"02:29:38\":\r\n        - textbox: 02:29:38\r\n      - cell \"00:05:26\":\r\n        - textbox: 00:05:26\r\n    - row \"Increment Decrement Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"29\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Astral Legacy Clear\":\r\n        - textbox: Astral Legacy\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Vaveyla (Original Mix) Clear\":\r\n        - textbox: Vaveyla (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:29:38\":\r\n        - textbox: 02:29:38\r\n      - cell \"02:32:52\":\r\n        - textbox: 02:32:52\r\n      - cell \"00:03:14\":\r\n        - textbox: 00:03:14\r\n    - row \"Increment Decrement Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"30\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Gerrox Clear\":\r\n        - textbox: Gerrox\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Chakra (Original Mix) Clear\":\r\n        - textbox: Chakra (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:32:52\":\r\n        - textbox: 02:32:52\r\n      - cell \"02:37:00\":\r\n        - textbox: 02:37:00\r\n      - cell \"00:04:08\":\r\n        - textbox: 00:04:08\r\n    - row \"Increment Decrement Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"31\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Charlotte De Witte Clear\":\r\n        - textbox: Charlotte De Witte\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Pattern Clear\":\r\n        - textbox: Pattern\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:37:00\":\r\n        - textbox: 02:37:00\r\n      - cell \"02:41:55\":\r\n        - textbox: 02:41:55\r\n      - cell \"00:04:55\":\r\n        - textbox: 00:04:55\r\n    - row \"Increment Decrement Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"32\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Space Food Clear\":\r\n        - textbox: Space Food\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Amabey Clear\":\r\n        - textbox: Amabey\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:41:55\":\r\n        - textbox: 02:41:55\r\n      - cell \"02:46:55\":\r\n        - textbox: 02:46:55\r\n      - cell \"00:05:00\":\r\n        - textbox: 00:05:00\r\n    - row \"Increment Decrement ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"33\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"ARTBAT Clear\":\r\n        - textbox: ARTBAT\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Papilion (Original Mix) Clear\":\r\n        - textbox: Papilion (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:46:55\":\r\n        - textbox: 02:46:55\r\n      - cell \"02:51:13\":\r\n        - textbox: 02:51:13\r\n      - cell \"00:04:18\":\r\n        - textbox: 00:04:18\r\n    - row \"Increment Decrement PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"34\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"PETER PAHN Clear\":\r\n        - textbox: PETER PAHN\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Enjoy Infinity (Original Mix) Clear\":\r\n        - textbox: Enjoy Infinity (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:51:13\":\r\n        - textbox: 02:51:13\r\n      - cell \"02:56:08\":\r\n        - textbox: 02:56:08\r\n      - cell \"00:04:55\":\r\n        - textbox: 00:04:55\r\n    - row \"Increment Decrement Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"35\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Solitek Clear\":\r\n        - textbox: Solitek\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Instinct (Original Mix) Clear\":\r\n        - textbox: Instinct (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:56:08\":\r\n        - textbox: 02:56:08\r\n      - cell \"03:00:57\":\r\n        - textbox: 03:00:57\r\n      - cell \"00:04:49\":\r\n        - textbox: 00:04:49\r\n    - row \"Increment Decrement Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"36\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Veerus Clear\":\r\n        - textbox: Veerus\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Heavy Clear\":\r\n        - textbox: Heavy\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"03:00:57\":\r\n        - textbox: 03:00:57\r\n      - cell \"03:05:19\":\r\n        - textbox: 03:05:19\r\n      - cell \"00:04:22\":\r\n        - textbox: 00:04:22\r\n    - row \"Increment Decrement Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"37\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Secret Cinema & Reinier Zonneveld Clear\":\r\n        - textbox: Secret Cinema & Reinier Zonneveld\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Pain Thing (Original Mix) Clear\":\r\n        - textbox: Pain Thing (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"03:05:19\":\r\n        - textbox: 03:05:19\r\n      - cell \"03:09:38\":\r\n        - textbox: 03:09:38\r\n      - cell \"00:04:19\":\r\n        - textbox: 00:04:19\r\n    - row \"Increment Decrement Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"38\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Amelie Lens Clear\":\r\n        - textbox: Amelie Lens\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Hypnotized Clear\":\r\n        - textbox: Hypnotized\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"03:09:38\":\r\n        - textbox: 03:09:38\r\n      - cell \"03:13:13\":\r\n        - textbox: 03:13:13\r\n      - cell \"00:03:35\":\r\n        - textbox: 00:03:35\r\n    - row \"Increment Decrement Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"39\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Nikolay Kirov Clear\":\r\n        - textbox: Nikolay Kirov\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Chasing the Sun (Original Mix) Clear\":\r\n        - textbox: Chasing the Sun (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"03:13:13\":\r\n        - textbox: 03:13:13\r\n      - cell:\r\n        - textbox\r\n      - cell:\r\n        - textbox\r\n  - rowgroup:\r\n    - row");
         }
 
         [TestMethod]
@@ -502,33 +466,15 @@ public async Task Import_ShouldImportTracks_WhenUsingSampleInputfile2()
             await Expect(importView.CuesheetTitleInput).ToBeEmptyAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options"":
+    - row ""# Artist Title Begin End Length"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
   - rowgroup:
     - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
       - cell:
@@ -713,33 +659,15 @@ public async Task Import_ShouldImportTracks_WithTraktorOutput()
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Nachap Clear Glass Clear 00:00:00 00:11:56 00:11:56"":
@@ -1698,33 +1626,15 @@ public async Task Open_ShouldImportProject_WhenUsingProjectfile()
             await Expect(detailView.CuesheetTitleInput).ToHaveValueAsync("Sample CD Title");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
@@ -1927,33 +1837,15 @@ public async Task Open_ShouldImportCuesheet_WhenUsingCuesheetfile()
             await Expect(detailView.CuesheetTitleInput).ToHaveValueAsync("Sample CD Title");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
@@ -2156,33 +2048,15 @@ public async Task Import_ShouldImportTracks_WhenUsingText()
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
index 0067adb2..a8ea9840 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
@@ -38,36 +38,36 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoAndRedoAreUsed()
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row:
+    - row ""Increment Decrement 00:00:00"":
+      - cell:
+        - checkbox
+      - cell ""Increment Decrement"":
+        - spinbutton: ""1""
+        - button ""Increment""
+        - button ""Decrement""
+      - cell:
+        - textbox
+        - button
+      - cell:
+        - textbox
+        - button
+      - cell ""00:00:00"":
+        - textbox: 00:00:00
+      - cell:
+        - textbox
+      - cell:
+        - textbox
       - cell
   - rowgroup:
     - row");
@@ -76,33 +76,15 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await bar.RedoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Test Artist 1 Clear Test Title 1 Clear 00:00:00"":
@@ -132,33 +114,15 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await detailView.EditTrackAsync("Mozart", "Eine kleine Nachtmusik");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Mozart Clear Eine kleine Nachtmusik Clear 00:00:00"":
@@ -188,33 +152,15 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Mozart Clear Test Title 1 Clear 00:00:00"":
@@ -254,33 +200,15 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenModalEdit()
             await detailView.EditTracksModalAsync("Test Track Artist 1", "Test Track Title 1", "00:02:23", ["channel audio (4CH)", "Serial copy management system"]);
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox [checked]
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"":
@@ -310,33 +238,15 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox [checked]
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement 00:00:00"":
@@ -364,33 +274,15 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await bar.RedoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox [checked]
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"":
@@ -443,33 +335,15 @@ public async Task UndoRedo_ShouldRestoreCuesheet_WhenUsingImport()
             await Expect(importView.CatalogueNumberInput).ToHaveValueAsync("01 23456 78912 3");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Sort Column options Artist Sort Column options Title Sort Column options Begin Sort Column options End Sort Column options Length Sort Column options Status"":
+    - row ""# Artist Title Begin End Length Status"":
       - columnheader:
         - checkbox
-      - columnheader ""# Sort Column options"":
-        - text: ""#""
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Artist Sort Column options"":
-        - text: Artist
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Title Sort Column options"":
-        - text: Title
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Begin Sort Column options"":
-        - text: Begin
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""End Sort Column options"":
-        - text: End
-        - button ""Sort""
-        - button ""Column options""
-      - columnheader ""Length Sort Column options"":
-        - text: Length
-        - button ""Sort""
-        - button ""Column options""
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
     - row ""Increment Decrement Adriatique Clear X. Clear 00:00:00 00:05:24.2500000 00:05:24.2500000"":

From 2063a96000888e6e7cfec97596b1fb378ec3598f Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 14:54:04 +0100
Subject: [PATCH 007/150] added TODOs

---
 AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs | 6 +-----
 AudioCuesheetEditor/Model/AudioCuesheet/Track.cs    | 7 +------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index b66bbc6c..b11b759c 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -26,11 +26,7 @@ public enum MoveDirection
         Down
     }
 
-    public class TracksAddedRemovedEventArgs(IEnumerable<Track> tracks) : EventArgs
-    {
-        public IEnumerable<Track> Tracks { get; } = tracks;
-    }
-
+    //TODO: Move back to plain POCO
     public class Cuesheet() : Validateable, ITraceable, ICuesheet
     {
         private readonly Lock syncLock = new();
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index a8acfa82..58a32816 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -19,12 +19,7 @@
 
 namespace AudioCuesheetEditor.Model.AudioCuesheet
 {
-    public enum SetFlagMode
-    {
-        Add,
-        Remove
-    }
-
+    //TODO: Move back to plain POCO
     public class Track : Validateable, ITraceable, ITrack
     {
         public static readonly List<String> AllPropertyNames = [nameof(IsLinkedToPreviousTrack), nameof(Position), nameof(Artist), nameof(Title), nameof(Begin), nameof(End), nameof(Flags), nameof(PreGap), nameof(PostGap), nameof(Length)];

From 5afbe89ffb244fb54c5302543cb221756ac4239d Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:07:45 +0100
Subject: [PATCH 008/150] Update DialogManager.cs

---
 AudioCuesheetEditor/Services/UI/DialogManager.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index 6c59f2dd..6f0c533c 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -220,11 +220,8 @@ public async Task ShowLoadingDialogAsync()
 
         public void HideLoadingDialog()
         {
-            if (loadingDialog != null)
-            {
-                loadingDialog.Close();
-                loadingDialog = null;
-            }
+            loadingDialog?.Close();
+            loadingDialog = null;
         }
     }
 }

From 57877228838c96281f0e36d6be4327f1444a0b38 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:28:14 +0100
Subject: [PATCH 009/150] add service for track changes

---
 .../Model/AudioCuesheet/Track.cs              |  7 +---
 AudioCuesheetEditor/Program.cs                |  2 +
 .../Services/AudioCuesheet/ITrackManager.cs   | 35 ++++++++++++++++++
 .../Services/AudioCuesheet/TrackManager.cs    | 37 +++++++++++++++++++
 .../Services/UI/ITraceChangeManager.cs        |  6 +++
 .../Services/UI/TraceChangeManager.cs         | 18 +++++++++
 .../Shared/TrackList/ArtistColumn.razor       |  3 +-
 AudioCuesheetEditor/_Imports.razor            |  1 +
 8 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
 create mode 100644 AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 58a32816..be4fa3be 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -67,11 +67,8 @@ public uint? Position
             get => position;
             set { var previousValue = position; position = value; FireEvents(previousValue, propertyName: nameof(Position)); }
         }
-        public String? Artist 
-        {
-            get => artist;
-            set { var previousValue = artist; artist = value; FireEvents(previousValue, fireRankPropertyValueChanged: false, propertyName: nameof(Artist)); }
-        }
+        public String? Artist { get; set; }
+
         public String? Title 
         {
             get => title;
diff --git a/AudioCuesheetEditor/Program.cs b/AudioCuesheetEditor/Program.cs
index ce09002c..0cf4a823 100644
--- a/AudioCuesheetEditor/Program.cs
+++ b/AudioCuesheetEditor/Program.cs
@@ -19,6 +19,7 @@
 using AudioCuesheetEditor.Extensions;
 using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Services.Audio;
+using AudioCuesheetEditor.Services.AudioCuesheet;
 using AudioCuesheetEditor.Services.IO;
 using AudioCuesheetEditor.Services.UI;
 using AudioCuesheetEditor.Services.Validation;
@@ -62,6 +63,7 @@
 builder.Services.AddScoped<DialogManager>();
 builder.Services.AddScoped<ExportfileGenerator>();
 builder.Services.AddScoped<AutocompleteManager>();
+builder.Services.AddScoped<ITrackManager, TrackManager>();
 
 builder.Services.AddLogging();
 // Read out configuration for loglevel
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
new file mode 100644
index 00000000..f08c1fc6
--- /dev/null
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -0,0 +1,35 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+
+namespace AudioCuesheetEditor.Services.AudioCuesheet
+{
+    /// <summary>
+    /// Manages track interactions
+    /// </summary>
+    public interface ITrackManager
+    {
+        /// <summary>
+        /// Set artist for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="artist"></param>
+        void SetArtist(Track track, String? artist);
+
+        //TODO: Add all functions for editing a track (Title, IsLinkedToPreviousTrack, Position, Begin, End, Length, Flags, PreGap, PostGap)
+        //TODO: Add functions for track methods (CopyValues, Clone, Validate, etc.)
+    }
+}
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
new file mode 100644
index 00000000..ecf1211a
--- /dev/null
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -0,0 +1,37 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Services.UI;
+
+namespace AudioCuesheetEditor.Services.AudioCuesheet
+{
+    /// <inheritdoc/>
+    public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManager
+    {
+        private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+        //TODO: Tests
+        /// <inheritdoc/>
+        public void SetArtist(Track track, string? artist)
+        {
+            var previousValue = track.Artist;
+            if (Equals(artist, previousValue) == false)
+            {
+                track.Artist = artist;
+                _traceChangeManager.AddChange(track, new(previousValue, nameof(Track.Artist)));
+            }
+        }
+    }
+}
diff --git a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
index 96f22035..9628e851 100644
--- a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
@@ -35,6 +35,12 @@ public interface ITraceChangeManager
         public bool CanRedo { get; }
         public bool BulkEdit { get; set; }
         public void TraceChanges(ITraceable traceable);
+        /// <summary>
+        /// Adds a change of a property
+        /// </summary>
+        /// <param name="traceable"></param>
+        /// <param name="traceableChange"></param>
+        void AddChange(ITraceable traceable, TraceableChange traceableChange);
         public void Reset();
         public void Undo();
         public void Redo();
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index 39fc67b5..2a80d37d 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -232,6 +232,24 @@ public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
             }
         }
 
+        public void AddChange(ITraceable traceable, TraceableChange traceableChange)
+        {
+            //TODO: Tests
+            if (BulkEdit == false)
+            {
+                //Single change
+                var changes = new TracedChanges([new(traceable, traceableChange)]);
+                _undoStack.Add(changes);
+                _redoStack.Clear();
+                TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
+            }
+            else
+            {
+                //We are tracing multiple changes
+                _bulkEditTracedChanges?.Add(new TracedChange(traceable, traceableChange));
+            }
+        }
+
         public void RemoveTracedChanges(IEnumerable<ITraceable> traceables)
         {
             _undoStack.RemoveAll(x => x.HasTraceableObject == false);
diff --git a/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor b/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
index 6e949688..c7bf7137 100644
--- a/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
@@ -19,6 +19,7 @@ along with Foobar.  If not, see
 
 @inject AutocompleteManager _autocompleteManager
 @inject ValidationService _validationService
+@inject ITrackManager _trackManager
 
 <MudAutocomplete T="MusicBrainzArtist" SearchFunc="_autocompleteManager.SearchArtistsAsync" ToStringFunc="(MusicBrainzArtist? value) => value?.Name" @bind-Text="_artist"
                  Value="_autocompleteArtist" ValueChanged="ValueChanged" Clearable ShowProgressIndicator Validation="(string? newArtist) => _validationService.Validate(Track, nameof(Track.Artist))" 
@@ -76,7 +77,7 @@ along with Foobar.  If not, see
         try
         {
             await Task.Delay(100, token);
-            Track.Artist = _artist;
+            _trackManager.SetArtist(Track, _artist);
         }
         catch (TaskCanceledException)
         {
diff --git a/AudioCuesheetEditor/_Imports.razor b/AudioCuesheetEditor/_Imports.razor
index 911e475a..330acc5e 100644
--- a/AudioCuesheetEditor/_Imports.razor
+++ b/AudioCuesheetEditor/_Imports.razor
@@ -38,6 +38,7 @@
 @using AudioCuesheetEditor.Services.UI
 @using AudioCuesheetEditor.Services.Validation
 @using AudioCuesheetEditor.Services.Audio
+@using AudioCuesheetEditor.Services.AudioCuesheet
 @using Microsoft.Extensions.Logging
 @using Microsoft.Extensions.Localization
 @using BlazorDownloadFile

From dc68628293b0736bf8e160e41a7e04dcab38d632 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:55:45 +0100
Subject: [PATCH 010/150] Update Track.cs

---
 AudioCuesheetEditor/Model/AudioCuesheet/Track.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index be4fa3be..ce1dea05 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -25,7 +25,6 @@ public class Track : Validateable, ITraceable, ITrack
         public static readonly List<String> AllPropertyNames = [nameof(IsLinkedToPreviousTrack), nameof(Position), nameof(Artist), nameof(Title), nameof(Begin), nameof(End), nameof(Flags), nameof(PreGap), nameof(PostGap), nameof(Length)];
 
         private uint? position;
-        private String? artist;
         private String? title;
         private TimeSpan? begin;
         private TimeSpan? end;

From 0a79150db6317c6f5890bbcd5ee41fe923afbd09 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:56:42 +0100
Subject: [PATCH 011/150] Update Track.cs

---
 .../Model/AudioCuesheet/Track.cs                | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index ce1dea05..efa876b4 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -261,14 +261,15 @@ public void CopyValues(ITrack track, Boolean setCuesheet = true, Boolean setIsLi
             }
             if (setArtist)
             {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Artist))))
-                {
-                    artist = track.Artist;
-                }
-                else
-                {
-                    Artist = track.Artist;
-                }
+                //TODO
+                //if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Artist))))
+                //{
+                //    artist = track.Artist;
+                //}
+                //else
+                //{
+                //    Artist = track.Artist;
+                //}
             }
             if (setTitle)
             {

From 0536cf3cba7302c6b4dc371152e95f5062626868 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 15:58:56 +0100
Subject: [PATCH 012/150] Update DialogManager.cs

---
 AudioCuesheetEditor/Services/UI/DialogManager.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index 6f0c533c..5d1268dd 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -25,7 +25,7 @@ public class DialogManager(IDialogService dialogService, ITraceChangeManager tra
         private readonly IDialogService _dialogService = dialogService;
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
 
-        private IDialogReference? loadingDialog;
+        private IDialogReference? _loadingDialog;
 
         public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
         {
@@ -210,18 +210,18 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
 
         public async Task ShowLoadingDialogAsync()
         {
-            if (loadingDialog == null)
+            if (_loadingDialog == null)
             { 
                 var options = new DialogOptions() { BackdropClick = false, FullWidth = true, MaxWidth = MaxWidth.ExtraSmall, NoHeader = true };
-                loadingDialog = await _dialogService.ShowAsync<LoadingDialog>(null, options);
+                _loadingDialog = await _dialogService.ShowAsync<LoadingDialog>(null, options);
                 await Task.Delay(1);
             }
         }
 
         public void HideLoadingDialog()
         {
-            loadingDialog?.Close();
-            loadingDialog = null;
+            _loadingDialog?.Close();
+            _loadingDialog = null;
         }
     }
 }

From 1ed0988cd6cfab64eccdace00fa1a8d9ea639a5b Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 26 Mar 2026 16:03:47 +0100
Subject: [PATCH 013/150] fix signature

---
 AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs | 2 +-
 AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs     | 5 ++---
 AudioCuesheetEditor/Services/UI/TraceChangeManager.cs      | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index ecf1211a..f8f5c15e 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -30,7 +30,7 @@ public void SetArtist(Track track, string? artist)
             if (Equals(artist, previousValue) == false)
             {
                 track.Artist = artist;
-                _traceChangeManager.AddChange(track, new(previousValue, nameof(Track.Artist)));
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Artist))));
             }
         }
     }
diff --git a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
index 9628e851..f5f2b9fc 100644
--- a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
@@ -38,9 +38,8 @@ public interface ITraceChangeManager
         /// <summary>
         /// Adds a change of a property
         /// </summary>
-        /// <param name="traceable"></param>
-        /// <param name="traceableChange"></param>
-        void AddChange(ITraceable traceable, TraceableChange traceableChange);
+        /// <param name="tracedChange"></param>
+        void AddChange(TracedChange tracedChange);
         public void Reset();
         public void Undo();
         public void Redo();
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index 2a80d37d..a77c8ded 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -232,21 +232,20 @@ public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
             }
         }
 
-        public void AddChange(ITraceable traceable, TraceableChange traceableChange)
+        public void AddChange(TracedChange tracedChange)
         {
             //TODO: Tests
             if (BulkEdit == false)
             {
                 //Single change
-                var changes = new TracedChanges([new(traceable, traceableChange)]);
-                _undoStack.Add(changes);
+                _undoStack.Add(new([tracedChange]));
                 _redoStack.Clear();
                 TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
             }
             else
             {
                 //We are tracing multiple changes
-                _bulkEditTracedChanges?.Add(new TracedChange(traceable, traceableChange));
+                _bulkEditTracedChanges?.Add(tracedChange);
             }
         }
 

From 6b783ea441edcdc8e77d087bddaba32306d92da2 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 27 Mar 2026 09:44:23 +0100
Subject: [PATCH 014/150] add setting of track title

---
 .../Model/AudioCuesheet/Track.cs              | 53 +++++++++----------
 .../Services/AudioCuesheet/ITrackManager.cs   |  8 ++-
 .../Services/AudioCuesheet/TrackManager.cs    | 11 ++++
 .../Shared/TrackList/TitleColumn.razor        |  6 ++-
 4 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index efa876b4..9311cd0d 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -25,7 +25,6 @@ public class Track : Validateable, ITraceable, ITrack
         public static readonly List<String> AllPropertyNames = [nameof(IsLinkedToPreviousTrack), nameof(Position), nameof(Artist), nameof(Title), nameof(Begin), nameof(End), nameof(Flags), nameof(PreGap), nameof(PostGap), nameof(Length)];
 
         private uint? position;
-        private String? title;
         private TimeSpan? begin;
         private TimeSpan? end;
         private TimeSpan? length;
@@ -68,11 +67,7 @@ public uint? Position
         }
         public String? Artist { get; set; }
 
-        public String? Title 
-        {
-            get => title;
-            set { var previousValue = title; title = value; FireEvents(previousValue, fireRankPropertyValueChanged: false, propertyName: nameof(Title)); }
-        }
+        public String? Title { get; set; }
         public TimeSpan? Begin 
         {
             get => begin;
@@ -259,29 +254,29 @@ public void CopyValues(ITrack track, Boolean setCuesheet = true, Boolean setIsLi
                     Position = track.Position;
                 }
             }
-            if (setArtist)
-            {
-                //TODO
-                //if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Artist))))
-                //{
-                //    artist = track.Artist;
-                //}
-                //else
-                //{
-                //    Artist = track.Artist;
-                //}
-            }
-            if (setTitle)
-            {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Title))))
-                {
-                    title = track.Title;
-                }
-                else
-                {
-                    Title = track.Title;
-                }
-            }
+            //TODO
+            //if (setArtist)
+            //{
+            //    if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Artist))))
+            //    {
+            //        artist = track.Artist;
+            //    }
+            //    else
+            //    {
+            //        Artist = track.Artist;
+            //    }
+            //}
+            //if (setTitle)
+            //{
+            //    if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Title))))
+            //    {
+            //        title = track.Title;
+            //    }
+            //    else
+            //    {
+            //        Title = track.Title;
+            //    }
+            //}
             if (setBegin)
             {
                 if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Begin))))
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index f08c1fc6..b942bab2 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -28,8 +28,14 @@ public interface ITrackManager
         /// <param name="track"></param>
         /// <param name="artist"></param>
         void SetArtist(Track track, String? artist);
+        /// <summary>
+        /// Set title for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="title"></param>
+        void SetTitle(Track track, String? title);
 
-        //TODO: Add all functions for editing a track (Title, IsLinkedToPreviousTrack, Position, Begin, End, Length, Flags, PreGap, PostGap)
+        //TODO: Add all functions for editing a track (IsLinkedToPreviousTrack, Position, Begin, End, Length, Flags, PreGap, PostGap)
         //TODO: Add functions for track methods (CopyValues, Clone, Validate, etc.)
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index f8f5c15e..105f4a86 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -33,5 +33,16 @@ public void SetArtist(Track track, string? artist)
                 _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Artist))));
             }
         }
+
+        /// <inheritdoc/>
+        public void SetTitle(Track track, string? title)
+        {
+            var previousValue = track.Title;
+            if (Equals(title, previousValue) == false)
+            {
+                track.Title = title;
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Title))));
+            }
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor b/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
index 68b190ff..618cb2a1 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
@@ -19,6 +19,7 @@ along with Foobar.  If not, see
 
 @inject AutocompleteManager _autocompleteManager
 @inject ValidationService _validationService
+@inject ITrackManager _trackManager
 
 <MudAutocomplete T="MusicBrainzTrack" SearchFunc="(value, token) => _autocompleteManager.SearchTitlesAsync(value, Track.Artist, token)" ToStringFunc="(MusicBrainzTrack? value) => value?.Title"
                  @bind-Text="_title" Value="_autocompleteTrack" ValueChanged="TitleSelected" ResetValueOnEmptyText Clearable ShowProgressIndicator
@@ -81,17 +82,18 @@ along with Foobar.  If not, see
         {
             await Task.Delay(100, token);
             base.TraceChangeManager.BulkEdit = true;
-            Track.Title = _title;
+            _trackManager.SetTitle(Track, _title);
             switch (CurrentViewMode)
             {
                 case ViewMode.DetailView:
                 case ViewMode.ImportView:
                     if ((String.IsNullOrEmpty(Track.Artist)) && (String.IsNullOrEmpty(_autocompleteTrack?.Artist) == false))
                     {
-                        Track.Artist = _autocompleteTrack.Artist;
+                        _trackManager.SetArtist(Track, _autocompleteTrack.Artist);
                     }
                     if ((Track.Length.HasValue == false) && (_autocompleteTrack?.Length.HasValue == true))
                     {
+                        //TODO
                         Track.Length = _autocompleteTrack?.Length;
                     }
                     break;

From 9d490efa19fc4fe028440e033b66cfda596f94af Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 7 Apr 2026 15:53:47 +0200
Subject: [PATCH 015/150] added cloning of tracks

---
 .../Model/AudioCuesheet/Track.cs              | 16 ------
 .../Model/Entity/IValidateable.cs             |  2 -
 .../Services/AudioCuesheet/ITrackManager.cs   | 25 ++++++++-
 .../Services/AudioCuesheet/TrackManager.cs    | 54 +++++++++++++++++++
 .../Services/UI/DialogManager.cs              |  6 ++-
 5 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 9311cd0d..82f98547 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -202,18 +202,6 @@ public Boolean IsLinkedToPreviousTrack
             set { var previousValue = IsLinkedToPreviousTrack; isLinkedToPreviousTrack = value; IsLinkedToPreviousTrackChanged?.Invoke(this, EventArgs.Empty); FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(IsLinkedToPreviousTrack)); }
         }
 
-        /// <summary>
-        /// Performs a deep clone of the current object
-        /// </summary>
-        /// <returns>A deep clone of the current object</returns>
-        public Track Clone()
-        {
-            return new Track(this)
-            {
-                ClonedFrom = this
-            };
-        }
-
         /// <summary>
         /// Copy values from input object to this object
         /// </summary>
@@ -461,10 +449,6 @@ private void FireEvents(object? previousValue, Boolean fireValidateablePropertyC
                 var propertyValue = propertyInfo.GetValue(this);
                 if (Equals(propertyValue, previousValue) == false)
                 {
-                    if (fireValidateablePropertyChanged)
-                    {
-                        OnValidateablePropertyChanged(propertyName);
-                    }
                     if (fireRankPropertyValueChanged)
                     {
                         RankPropertyValueChanged?.Invoke(this, propertyName);
diff --git a/AudioCuesheetEditor/Model/Entity/IValidateable.cs b/AudioCuesheetEditor/Model/Entity/IValidateable.cs
index 4d88ec34..8a848945 100644
--- a/AudioCuesheetEditor/Model/Entity/IValidateable.cs
+++ b/AudioCuesheetEditor/Model/Entity/IValidateable.cs
@@ -28,8 +28,6 @@ public interface IValidateable
         /// <param name="property"></param>
         /// <returns></returns>
         ValidationResult Validate(String property);
-
-        event EventHandler<String>? ValidateablePropertyChanged;
     }
     public enum ValidationStatus
     {
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index b942bab2..d3967fe4 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -34,8 +34,29 @@ public interface ITrackManager
         /// <param name="track"></param>
         /// <param name="title"></param>
         void SetTitle(Track track, String? title);
-
+        /// <summary>
+        /// Copies values from a track to another
+        /// </summary>
+        /// <param name="source"></param>
+        /// <param name="target"></param>
+        /// <param name="setIsLinkedToPreviousTrack"></param>
+        /// <param name="setPosition"></param>
+        /// <param name="setArtist"></param>
+        /// <param name="setTitle"></param>
+        /// <param name="setBegin"></param>
+        /// <param name="setEnd"></param>
+        /// <param name="setLength"></param>
+        /// <param name="setFlags"></param>
+        /// <param name="setPreGap"></param>
+        /// <param name="setPostGap"></param>
+        void CopyValues(Track source, Track target, Boolean setIsLinkedToPreviousTrack = true, Boolean setPosition = true, Boolean setArtist = true, Boolean setTitle = true, Boolean setBegin = true, Boolean setEnd = true, Boolean setLength = false, Boolean setFlags = true, Boolean setPreGap = true, Boolean setPostGap = true);
+        /// <summary>
+        /// Create a clone of a track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <returns></returns>
+        Track Clone(Track track);
         //TODO: Add all functions for editing a track (IsLinkedToPreviousTrack, Position, Begin, End, Length, Flags, PreGap, PostGap)
-        //TODO: Add functions for track methods (CopyValues, Clone, Validate, etc.)
+        //TODO: Add functions for track methods (Validate?, etc.)
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 105f4a86..ace54244 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -22,6 +22,7 @@ namespace AudioCuesheetEditor.Services.AudioCuesheet
     public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManager
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+
         //TODO: Tests
         /// <inheritdoc/>
         public void SetArtist(Track track, string? artist)
@@ -44,5 +45,58 @@ public void SetTitle(Track track, string? title)
                 _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Title))));
             }
         }
+
+        /// <inheritdoc/>
+        public Track Clone(Track track)
+        {
+            var clone = new Track();
+            CopyValues(track, clone);
+            return clone;
+        }
+
+        /// <inheritdoc/>
+        public void CopyValues(Track source, Track target, bool setIsLinkedToPreviousTrack = true, bool setPosition = true, bool setArtist = true, bool setTitle = true, bool setBegin = true, bool setEnd = true, bool setLength = false, bool setFlags = true, bool setPreGap = true, bool setPostGap = true)
+        {
+            if (setIsLinkedToPreviousTrack)
+            {
+                target.IsLinkedToPreviousTrack = source.IsLinkedToPreviousTrack;
+            }
+            if (setPosition)
+            {
+                target.Position = source.Position;
+            }
+            if (setArtist)
+            {
+                target.Artist = source.Artist;
+            }
+            if (setTitle)
+            {
+                target.Title = source.Title;
+            }
+            if (setBegin)
+            {
+                target.Begin = source.Begin;
+            }
+            if (setEnd)
+            {
+                target.End = source.End;
+            }
+            if (setLength)
+            {
+                target.Length = source.Length;
+            }
+            if (setFlags)
+            {
+                target.Flags = source.Flags;
+            }
+            if (setPreGap)
+            {
+                target.PreGap = source.PreGap;
+            }
+            if (setPostGap)
+            {
+                target.PostGap = source.PostGap;
+            }
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index 5d1268dd..031fbf46 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -15,15 +15,17 @@
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.UI;
+using AudioCuesheetEditor.Services.AudioCuesheet;
 using AudioCuesheetEditor.Shared.Dialogs;
 using MudBlazor;
 
 namespace AudioCuesheetEditor.Services.UI
 {
-    public class DialogManager(IDialogService dialogService, ITraceChangeManager traceChangeManager)
+    public class DialogManager(IDialogService dialogService, ITraceChangeManager traceChangeManager, ITrackManager trackManager)
     {
         private readonly IDialogService _dialogService = dialogService;
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+        private readonly ITrackManager _trackManager = trackManager;
 
         private IDialogReference? _loadingDialog;
 
@@ -32,7 +34,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
             _traceChangeManager.BulkEdit = true;
             if (tracks.Count() == 1)
             {
-                var parameters = new DialogParameters<EditTrackModal> { { x => x.EditedTrack, tracks.First().Clone() } };
+                var parameters = new DialogParameters<EditTrackModal> { { x => x.EditedTrack, _trackManager.Clone(tracks.First()) } };
                 var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
                 var dialog = await _dialogService.ShowAsync<EditTrackModal>(null, parameters, options);
                 var result = await dialog.Result;

From b7101d84ed5a400a0cf4b158c3b06f588f77a541 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 7 Apr 2026 15:58:06 +0200
Subject: [PATCH 016/150] Update DialogManager.cs

---
 AudioCuesheetEditor/Services/UI/DialogManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index 031fbf46..40f99481 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -40,7 +40,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                 var result = await dialog.Result;
                 if ((result?.Canceled == false) && (result.Data is Track editedTrack))
                 {
-                    tracks.First().CopyValues(editedTrack, setCuesheet: false);
+                    _trackManager.CopyValues(editedTrack, tracks.First());
                 }
             }
             if (tracks.Count() > 1)
@@ -203,7 +203,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         editMultipleTracksModalResult.EditedTrack.PreGap = preGap;
                         editMultipleTracksModalResult.EditedTrack.PostGap = postGap;
                         //Now copy all values
-                        track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: copyIsLinkedToPreviousTrack, setPosition: copyTrackPosition, setArtist: copyTrackArtist, setTitle: copyTrackTitle, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: copyTrackFlags, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
+                        _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: copyIsLinkedToPreviousTrack, setPosition: copyTrackPosition, setArtist: copyTrackArtist, setTitle: copyTrackTitle, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: copyTrackFlags, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
                     }
                 }
             }

From 0deda678d1fb7551df2bf8fa614d3af0ecd56a3e Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 7 Apr 2026 16:02:55 +0200
Subject: [PATCH 017/150] Update TrackManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index ace54244..a43681ca 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -57,6 +57,7 @@ public Track Clone(Track track)
         /// <inheritdoc/>
         public void CopyValues(Track source, Track target, bool setIsLinkedToPreviousTrack = true, bool setPosition = true, bool setArtist = true, bool setTitle = true, bool setBegin = true, bool setEnd = true, bool setLength = false, bool setFlags = true, bool setPreGap = true, bool setPostGap = true)
         {
+            //TODO: History?
             if (setIsLinkedToPreviousTrack)
             {
                 target.IsLinkedToPreviousTrack = source.IsLinkedToPreviousTrack;

From be70bd2e0de3442a93ce6c20509c532ed12fa960 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 7 Apr 2026 16:02:59 +0200
Subject: [PATCH 018/150] Update ITrackManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index d3967fe4..e6f06874 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -57,6 +57,5 @@ public interface ITrackManager
         /// <returns></returns>
         Track Clone(Track track);
         //TODO: Add all functions for editing a track (IsLinkedToPreviousTrack, Position, Begin, End, Length, Flags, PreGap, PostGap)
-        //TODO: Add functions for track methods (Validate?, etc.)
     }
 }

From 755d705d4d85b0b8833d7c6b7789ceacceb45cf8 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 7 Apr 2026 16:10:40 +0200
Subject: [PATCH 019/150] add setting of flags

---
 .../Model/AudioCuesheet/Track.cs              | 38 ++++++++-----------
 .../Services/AudioCuesheet/ITrackManager.cs   |  6 +++
 .../Services/AudioCuesheet/TrackManager.cs    | 13 ++++++-
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 82f98547..0469152a 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -28,7 +28,6 @@ public class Track : Validateable, ITraceable, ITrack
         private TimeSpan? begin;
         private TimeSpan? end;
         private TimeSpan? length;
-        private List<Flag> flags = [];
         private Boolean isLinkedToPreviousTrack;
         private Cuesheet? cuesheet;
         private TimeSpan? preGap;
@@ -142,16 +141,8 @@ public TimeSpan? Length
             }
         }
         [JsonInclude]
-        public IEnumerable<Flag> Flags
-        {
-            get { return flags.AsReadOnly(); }
-            set
-            {
-                var previousValue = flags;
-                flags = [.. value];
-                FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(Flags));
-            }
-        }
+        public IEnumerable<Flag> Flags { get; set; } = [];
+        
         [JsonIgnore]
         public Cuesheet? Cuesheet 
         {
@@ -291,18 +282,19 @@ public void CopyValues(ITrack track, Boolean setCuesheet = true, Boolean setIsLi
             {
                 Length = track.Length;
             }
-            if (setFlags)
-            {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Flags))))
-                {
-                    flags.Clear();
-                    flags.AddRange(track.Flags);
-                }
-                else
-                {
-                    Flags = track.Flags;
-                }
-            }
+            //TODO
+            //if (setFlags)
+            //{
+            //    if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Flags))))
+            //    {
+            //        flags.Clear();
+            //        flags.AddRange(track.Flags);
+            //    }
+            //    else
+            //    {
+            //        Flags = track.Flags;
+            //    }
+            //}
             if (setPreGap)
             {
                 if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(PreGap))))
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index e6f06874..2503465e 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -35,6 +35,12 @@ public interface ITrackManager
         /// <param name="title"></param>
         void SetTitle(Track track, String? title);
         /// <summary>
+        /// Set flags for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="flags"></param>
+        void SetFlags(Track track, IEnumerable<Flag> flags);
+        /// <summary>
         /// Copies values from a track to another
         /// </summary>
         /// <param name="source"></param>
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index a43681ca..ee593813 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -46,6 +46,17 @@ public void SetTitle(Track track, string? title)
             }
         }
 
+        /// <inheritdoc/>
+        public void SetFlags(Track track, IEnumerable<Flag> flags)
+        {
+            var previousValue = track.Flags;
+            if (Equals(flags, previousValue) == false)
+            {
+                track.Flags = flags;
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Flags))));
+            }
+        }
+
         /// <inheritdoc/>
         public Track Clone(Track track)
         {
@@ -57,7 +68,7 @@ public Track Clone(Track track)
         /// <inheritdoc/>
         public void CopyValues(Track source, Track target, bool setIsLinkedToPreviousTrack = true, bool setPosition = true, bool setArtist = true, bool setTitle = true, bool setBegin = true, bool setEnd = true, bool setLength = false, bool setFlags = true, bool setPreGap = true, bool setPostGap = true)
         {
-            //TODO: History?
+            //TODO: Create change for ITraceChangeManager
             if (setIsLinkedToPreviousTrack)
             {
                 target.IsLinkedToPreviousTrack = source.IsLinkedToPreviousTrack;

From 8ccb6fb57d8f4ed2bb03d248076e8a764872aac4 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 7 Apr 2026 16:25:18 +0200
Subject: [PATCH 020/150] enable setting of properties for track

---
 .../Model/AudioCuesheet/Cuesheet.cs           |  6 +-
 .../Model/AudioCuesheet/Track.cs              | 52 +++-----------
 .../Services/AudioCuesheet/ITrackManager.cs   | 43 ++++++++++-
 .../Services/AudioCuesheet/TrackManager.cs    | 71 ++++++++++++++++++-
 4 files changed, 121 insertions(+), 51 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index b11b759c..accab0aa 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -167,10 +167,6 @@ public IEnumerable<String> IsRecordingPossible
 
         public void AddTrack(Track track)
         {
-            if (track.IsCloned)
-            {
-                throw new ArgumentException("Cloned tracks may not be added!");
-            }
             var previousValue = new List<Track>(tracks);
             track.IsLinkedToPreviousTrackChanged += Track_IsLinkedToPreviousTrackChanged;
             if (IsRecording && RecordingStart.HasValue)
@@ -368,7 +364,7 @@ public override ValidationResult Validate(string property)
                     else
                     {
                         //Check track overlapping
-                        var tracksWithSamePosition = Tracks.Where(x => x.IsCloned == false)
+                        var tracksWithSamePosition = Tracks
                             .GroupBy(x => x.Position)
                             .Where(grp => grp.Count() > 1);
                         if (tracksWithSamePosition.Any())
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 0469152a..29e40ade 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -59,24 +59,14 @@ public Track(ITrack track, Boolean copyCuesheetReference = true) : this()
             CopyValues(track, copyCuesheetReference);
         }
         
-        public uint? Position 
-        {
-            get => position;
-            set { var previousValue = position; position = value; FireEvents(previousValue, propertyName: nameof(Position)); }
-        }
+        public uint? Position { get; set; }
         public String? Artist { get; set; }
-
         public String? Title { get; set; }
-        public TimeSpan? Begin 
-        {
-            get => begin;
-            set { var previousValue = begin; begin = value; FireEvents(previousValue, propertyName: nameof(Begin)); }
-        }
-        public TimeSpan? End 
-        {
-            get => end;
-            set { var previousValue = end; end = value; FireEvents(previousValue,  propertyName: nameof(End)); }
-        }
+        public TimeSpan? Begin { get; set; }        
+        public TimeSpan? End { get; set; }
+
+        //TODO: find a way for AutomaticallyCalculateLength and Length
+
         /// <summary>
         /// If <see cref="Length"/> is set, should it be automatically change begin and end? Defaulting to true, because only during edit dialog this should be set to false. 
         /// If set to false an internal field will be used.
@@ -162,36 +152,14 @@ public Cuesheet? Cuesheet
                 }
             }
         }
-
-        /// <summary>
-        /// Indicates that this track has been cloned from another track and is a transparent proxy
-        /// </summary>
-        [JsonIgnore]
-        public Boolean IsCloned { get { return ClonedFrom != null; } }
-        /// <summary>
-        /// Get the original track that this track has been cloned from. Can be null on original objects
-        /// </summary>
-        public Track? ClonedFrom { get; set; }
         /// <inheritdoc/>
-        public TimeSpan? PreGap 
-        {
-            get => preGap;
-            set { var previousValue = preGap; preGap = value; FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(PreGap)); }
-        }
+        public TimeSpan? PreGap { get; set;  }
         /// <inheritdoc/>
-        public TimeSpan? PostGap 
-        {
-            get => postGap;
-            set { var previousValue = postGap; postGap = value; FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(PostGap)); }
-        }
+        public TimeSpan? PostGap { get; set; }
         /// <summary>
         /// Set that this track is linked to the previous track in cuesheet
         /// </summary>
-        public Boolean IsLinkedToPreviousTrack
-        {
-            get => isLinkedToPreviousTrack;
-            set { var previousValue = IsLinkedToPreviousTrack; isLinkedToPreviousTrack = value; IsLinkedToPreviousTrackChanged?.Invoke(this, EventArgs.Empty); FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(IsLinkedToPreviousTrack)); }
-        }
+        public Boolean IsLinkedToPreviousTrack { get; set; }
 
         /// <summary>
         /// Copy values from input object to this object
@@ -353,7 +321,7 @@ public override ValidationResult Validate(string property)
                         else
                         {
                             // Check correct track position
-                            if ((IsCloned == false) && (Cuesheet != null))
+                            if (Cuesheet != null)
                             {
                                 var positionTrackShouldHave = Cuesheet.Tracks.OrderBy(x => x.Begin ?? TimeSpan.MaxValue).ThenBy(x => x.Position).ToList().IndexOf(this) + 1;
                                 if (positionTrackShouldHave != Position)
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index 2503465e..90259544 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -22,6 +22,12 @@ namespace AudioCuesheetEditor.Services.AudioCuesheet
     /// </summary>
     public interface ITrackManager
     {
+        /// <summary>
+        /// Set position for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="position"></param>
+        void SetPosition(Track track, uint? position);
         /// <summary>
         /// Set artist for track
         /// </summary>
@@ -35,12 +41,48 @@ public interface ITrackManager
         /// <param name="title"></param>
         void SetTitle(Track track, String? title);
         /// <summary>
+        /// Set begin for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="begin"></param>
+        void SetBegin(Track track, TimeSpan? begin);
+        /// <summary>
+        /// Set end for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="end"></param>
+        void SetEnd(Track track, TimeSpan? end);
+        /// <summary>
+        /// Set length for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="length"></param>
+        void SetLength(Track track, TimeSpan? length);
+        /// <summary>
+        /// Set pregap for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="pregap"></param>
+        void SetPregap(Track track, TimeSpan? pregap);
+        /// <summary>
+        /// Set postgap for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="postgap"></param>
+        void SetPostgap(Track track, TimeSpan? postgap);
+        /// <summary>
         /// Set flags for track
         /// </summary>
         /// <param name="track"></param>
         /// <param name="flags"></param>
         void SetFlags(Track track, IEnumerable<Flag> flags);
         /// <summary>
+        /// Set IsLinkedToPreviousTrack for track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <param name="linkedToPreviousTrack"></param>
+        void SetLinkedToPreviousTrack(Track track, Boolean linkedToPreviousTrack);
+        /// <summary>
         /// Copies values from a track to another
         /// </summary>
         /// <param name="source"></param>
@@ -62,6 +104,5 @@ public interface ITrackManager
         /// <param name="track"></param>
         /// <returns></returns>
         Track Clone(Track track);
-        //TODO: Add all functions for editing a track (IsLinkedToPreviousTrack, Position, Begin, End, Length, Flags, PreGap, PostGap)
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index ee593813..7c20ec9a 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -15,6 +15,8 @@
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Services.UI;
+using MetaBrainz.MusicBrainz.Interfaces.Entities;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
@@ -25,6 +27,16 @@ public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManage
 
         //TODO: Tests
         /// <inheritdoc/>
+        public void SetPosition(Track track, uint? position)
+        {
+            var previousValue = track.Position;
+            if (Equals(position, previousValue) == false)
+            {
+                track.Position = position;
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Position))));
+            }
+        }
+        /// <inheritdoc/>
         public void SetArtist(Track track, string? artist)
         {
             var previousValue = track.Artist;
@@ -34,7 +46,6 @@ public void SetArtist(Track track, string? artist)
                 _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Artist))));
             }
         }
-
         /// <inheritdoc/>
         public void SetTitle(Track track, string? title)
         {
@@ -45,7 +56,61 @@ public void SetTitle(Track track, string? title)
                 _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Title))));
             }
         }
-
+        /// <inheritdoc/>
+        public void SetBegin(Track track, TimeSpan? begin)
+        {
+            var previousValue = track.Begin;
+            if (Equals(begin, previousValue) == false)
+            {
+                track.Begin = begin;
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Begin))));
+            }
+        }
+        /// <inheritdoc/>
+        public void SetEnd(Track track, TimeSpan? end)
+        {
+            var previousValue = track.End;
+            if (Equals(end, previousValue) == false)
+            {
+                track.End = end;
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.End))));
+            }
+        }
+        /// <inheritdoc/>
+        public void SetLength(Track track, TimeSpan? length)
+        {
+            throw new NotImplementedException();
+        }
+        /// <inheritdoc/>
+        public void SetPregap(Track track, TimeSpan? pregap)
+        {
+            var previousValue = track.PreGap;
+            if (Equals(pregap, previousValue) == false)
+            {
+                track.PreGap = pregap;
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.PreGap))));
+            }
+        }
+        /// <inheritdoc/>
+        public void SetPostgap(Track track, TimeSpan? postgap)
+        {
+            var previousValue = track.PostGap;
+            if (Equals(postgap, previousValue) == false)
+            {
+                track.PostGap = postgap;
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.PostGap))));
+            }
+        }
+        /// <inheritdoc/>
+        public void SetLinkedToPreviousTrack(Track track, bool linkedToPreviousTrack)
+        {
+            var previousValue = track.IsLinkedToPreviousTrack;
+            if (Equals(linkedToPreviousTrack, previousValue) == false)
+            {
+                track.IsLinkedToPreviousTrack = linkedToPreviousTrack;
+                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.IsLinkedToPreviousTrack))));
+            }
+        }
         /// <inheritdoc/>
         public void SetFlags(Track track, IEnumerable<Flag> flags)
         {
@@ -111,4 +176,4 @@ public void CopyValues(Track source, Track target, bool setIsLinkedToPreviousTra
             }
         }
     }
-}
+}
\ No newline at end of file

From a09a04b8082ddce387f6821e730b241f3a0ac9eb Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 08:11:47 +0200
Subject: [PATCH 021/150] setting of properties generalized

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 111 +------
 .../Model/AudioCuesheet/Track.cs              | 279 +-----------------
 .../Services/AudioCuesheet/ITrackManager.cs   |  67 +----
 .../Services/AudioCuesheet/TrackManager.cs    | 111 ++-----
 .../Services/IO/ImportManager.cs              |   9 +-
 .../Services/UI/DialogManager.cs              |  26 +-
 .../Shared/TrackList/ArtistColumn.razor       |   2 +-
 .../Shared/TrackList/TitleColumn.razor        |   4 +-
 .../Shared/TrackList/TrackList.razor          |   5 +-
 9 files changed, 74 insertions(+), 540 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index accab0aa..5e927059 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -51,16 +51,12 @@ private set
             {
                 foreach (var track in tracks)
                 {
-                    track.RankPropertyValueChanged -= Track_RankPropertyValueChanged;
-                    track.IsLinkedToPreviousTrackChanged -= Track_IsLinkedToPreviousTrackChanged;
                     track.Cuesheet = null;
                 }
                 tracks = [.. value];
                 foreach (var track in tracks)
                 {
                     track.Cuesheet = this;
-                    track.RankPropertyValueChanged += Track_RankPropertyValueChanged;
-                    track.IsLinkedToPreviousTrackChanged += Track_IsLinkedToPreviousTrackChanged;
                 }
             }
         }
@@ -168,17 +164,13 @@ public IEnumerable<String> IsRecordingPossible
         public void AddTrack(Track track)
         {
             var previousValue = new List<Track>(tracks);
-            track.IsLinkedToPreviousTrackChanged += Track_IsLinkedToPreviousTrackChanged;
             if (IsRecording && RecordingStart.HasValue)
             {
                 track.Begin = DateTime.UtcNow - RecordingStart.Value;
             }
-            //Fire the event manually since we don't know if the track is already linked to previous one
-            Track_IsLinkedToPreviousTrackChanged(track, EventArgs.Empty);
             tracks.Add(track);
             track.Cuesheet = this;
             RecalculateTrackProperties(track);
-            track.RankPropertyValueChanged += Track_RankPropertyValueChanged;
             OnTraceablePropertyChanged(previousValue, nameof(Tracks));
         }
 
@@ -194,11 +186,10 @@ public void RemoveTrack(Track track)
                 }
             }
             var previousValue = new List<Track>();
-            tracks.ForEach(x => previousValue.Add(new Track(x)));
+            //TODO
+            //tracks.ForEach(x => previousValue.Add(new Track(x)));
             tracks.Remove(track);
             track.Cuesheet = null;
-            track.RankPropertyValueChanged -= Track_RankPropertyValueChanged;
-            track.IsLinkedToPreviousTrackChanged -= Track_IsLinkedToPreviousTrackChanged;
             //If Tracks are linked, we need to set the linked track again
             if (nextTrack != null)
             {
@@ -227,9 +218,8 @@ public void RemoveTrack(Track track)
         public void RemoveTracks(IReadOnlyCollection<Track> tracksToRemove)
         {
             var previousValue = new List<Track>();
-            tracks.ForEach(x => previousValue.Add(new Track(x)));
-            tracks.ForEach(x => x.RankPropertyValueChanged -= Track_RankPropertyValueChanged);
-            tracks.ForEach(x => x.IsLinkedToPreviousTrackChanged -= Track_IsLinkedToPreviousTrackChanged);
+            //TODO
+            //tracks.ForEach(x => previousValue.Add(new Track(x)));
             var intersection = tracks.Intersect(tracksToRemove);
             tracks = [.. tracks.Except(intersection)];
             foreach (var track in tracks)
@@ -247,8 +237,6 @@ public void RemoveTracks(IReadOnlyCollection<Track> tracksToRemove)
                     }
                 }
             }
-            tracks.ForEach(x => x.RankPropertyValueChanged += Track_RankPropertyValueChanged);
-            tracks.ForEach(x => x.IsLinkedToPreviousTrackChanged += Track_IsLinkedToPreviousTrackChanged);
             RecalculateLastTrackEnd();
             OnTraceablePropertyChanged(previousValue, nameof(Tracks));
         }
@@ -487,97 +475,6 @@ private void RecalculateTrackProperties(Track trackToCalculate)
             }            
         }
 
-        private void Track_RankPropertyValueChanged(object? sender, string e)
-        {
-            if (sender is Track trackRaisedEvent)
-            {
-                var item = KeyValuePair.Create(e, trackRaisedEvent);
-                if (currentlyHandlingLinkedTrackPropertyChange.Contains(item) == false)
-                {
-                    currentlyHandlingLinkedTrackPropertyChange.Add(item);
-                    var linkedPreviousTrack = GetPreviousLinkedTrack(trackRaisedEvent);
-                    //Check if raising track has linked previous track
-                    if (trackRaisedEvent.IsLinkedToPreviousTrack && (linkedPreviousTrack != null))
-                    {
-                        switch (e)
-                        {
-                            case nameof(Track.Position):
-                                if (trackRaisedEvent.Position.HasValue)
-                                {
-                                    linkedPreviousTrack.Position = trackRaisedEvent.Position.Value - 1;
-                                }
-                                break;
-                            case nameof(Track.Begin):
-                                if (trackRaisedEvent.Begin.HasValue)
-                                {
-                                    linkedPreviousTrack.End = trackRaisedEvent.Begin;
-                                }
-                                break;
-                        }
-                    }
-                    //Check if track is linked by next track
-                    var index = tracks.IndexOf(trackRaisedEvent);
-                    if ((index + 1) < tracks.Count)
-                    {
-                        var nextTrack = tracks.ElementAt(index + 1);
-                        if (nextTrack.IsLinkedToPreviousTrack)
-                        {
-                            switch (e)
-                            {
-                                case nameof(Track.Position):
-                                    if (trackRaisedEvent.Position.HasValue)
-                                    {
-                                        nextTrack.Position = trackRaisedEvent.Position.Value + 1;
-                                    }
-                                    break;
-                                case nameof(Track.End):
-                                    nextTrack.Begin = trackRaisedEvent.End;
-                                    break;
-                            }
-                        }
-                    }
-                    currentlyHandlingLinkedTrackPropertyChange.Remove(item);
-                }
-            }
-            else
-            {
-                throw new ArgumentNullException(nameof(sender));
-            }
-        }
-
-        private void Track_IsLinkedToPreviousTrackChanged(object? sender, EventArgs e)
-        {
-            if (sender != null)
-            {
-                Track trackRaisedEvent = (Track)sender;
-                if (trackRaisedEvent.IsLinkedToPreviousTrack)
-                {
-                    //Set values
-                    var index = tracks.IndexOf(trackRaisedEvent);
-                    if (index > 0)
-                    {
-                        var previousTrack = tracks.ElementAt(index - 1);
-                        if ((trackRaisedEvent.Position.HasValue) && (previousTrack.Position.HasValue) && (trackRaisedEvent.Position != previousTrack.Position.Value + 1))
-                        {
-                            trackRaisedEvent.Position = previousTrack.Position.Value + 1;
-                        }
-                        if ((previousTrack.End.HasValue) && (trackRaisedEvent.Begin != previousTrack.End))
-                        {
-                            trackRaisedEvent.Begin = previousTrack.End;
-                        }
-                        if ((previousTrack.End.HasValue == false) && (trackRaisedEvent.Begin.HasValue))
-                        {
-                            previousTrack.End = trackRaisedEvent.Begin;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                throw new ArgumentNullException(nameof(sender));
-            }
-        }
-
         private void OnTraceablePropertyChanged(object? previousValue, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
         {
             TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, propertyName)));
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 29e40ade..a56b81b8 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -19,45 +19,13 @@
 
 namespace AudioCuesheetEditor.Model.AudioCuesheet
 {
-    //TODO: Move back to plain POCO
     public class Track : Validateable, ITraceable, ITrack
     {
         public static readonly List<String> AllPropertyNames = [nameof(IsLinkedToPreviousTrack), nameof(Position), nameof(Artist), nameof(Title), nameof(Begin), nameof(End), nameof(Flags), nameof(PreGap), nameof(PostGap), nameof(Length)];
 
-        private uint? position;
-        private TimeSpan? begin;
-        private TimeSpan? end;
-        private TimeSpan? length;
-        private Boolean isLinkedToPreviousTrack;
-        private Cuesheet? cuesheet;
-        private TimeSpan? preGap;
-        private TimeSpan? postGap;
-
-        /// <summary>
-        /// A property with influence to position of this track in cuesheet has been changed. Name of the property changed is provided in event arguments.
-        /// </summary>
-        //TODO: Check if this event is really needed because of reordering
-        public event EventHandler<String>? RankPropertyValueChanged;
-
-        /// <summary>
-        /// Eventhandler for IsLinkedToPreviousTrack has changed
-        /// </summary>
-        public event EventHandler? IsLinkedToPreviousTrackChanged;
-
         /// <inheritdoc/>
+        //TODO: Remove when ITraceable doesn't have event any more
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
-
-        public Track() { }
-
-        /// <summary>
-        /// Create object with copied values from input
-        /// </summary>
-        /// <param name="track">Object to copy values from</param>
-        /// <param name="copyCuesheetReference">Copy cuesheet reference from track also?</param>
-        public Track(ITrack track, Boolean copyCuesheetReference = true) : this()
-        {
-            CopyValues(track, copyCuesheetReference);
-        }
         
         public uint? Position { get; set; }
         public String? Artist { get; set; }
@@ -65,93 +33,53 @@ public Track(ITrack track, Boolean copyCuesheetReference = true) : this()
         public TimeSpan? Begin { get; set; }        
         public TimeSpan? End { get; set; }
 
-        //TODO: find a way for AutomaticallyCalculateLength and Length
-
-        /// <summary>
-        /// If <see cref="Length"/> is set, should it be automatically change begin and end? Defaulting to true, because only during edit dialog this should be set to false. 
-        /// If set to false an internal field will be used.
-        /// </summary>
-        [JsonIgnore]
-        public Boolean AutomaticallyCalculateLength { get; init; } = true;
         [JsonIgnore]
         public TimeSpan? Length 
         {
             get
             {
-                if (AutomaticallyCalculateLength)
+                if ((Begin.HasValue == true) && (End.HasValue == true) && (Begin.Value <= End.Value))
                 {
-                    if ((Begin.HasValue == true) && (End.HasValue == true) && (Begin.Value <= End.Value))
-                    {
-                        return End - Begin;
-                    }
-                    else
-                    {
-                        return null;
-                    }
+                    return End - Begin;
                 }
                 else
                 {
-                    return length;
+                    return null;
                 }
             }
             set
             {
-                var previousValue = Length;
-                if (AutomaticallyCalculateLength)
+                if ((Begin.HasValue == false) && (End.HasValue == false))
                 {
-                    if ((Begin.HasValue == false) && (End.HasValue == false))
+                    Begin = TimeSpan.Zero;
+                    End = Begin.Value + value;
+                }
+                else
+                {
+                    if ((Begin.HasValue == true) && (End.HasValue == true))
                     {
-                        Begin = TimeSpan.Zero;
                         End = Begin.Value + value;
                     }
                     else
                     {
-                        if ((Begin.HasValue == true) && (End.HasValue == true))
+                        if ((End.HasValue == false) && (Begin.HasValue))
                         {
                             End = Begin.Value + value;
                         }
-                        else
+                        if ((Begin.HasValue == false) && (End.HasValue))
                         {
-                            if ((End.HasValue == false) && (Begin.HasValue))
-                            {
-                                End = Begin.Value + value;
-                            }
-                            if ((Begin.HasValue == false) && (End.HasValue))
-                            {
-                                Begin = End.Value - value;
-                            }
+                            Begin = End.Value - value;
                         }
                     }
                 }
-                else
-                {
-                    length = value;
-                }
-                FireEvents(previousValue, fireRankPropertyValueChanged: false, fireTraceablePropertyChanged: false);
             }
         }
         [JsonInclude]
         public IEnumerable<Flag> Flags { get; set; } = [];
         
         [JsonIgnore]
-        public Cuesheet? Cuesheet 
-        {
-            get => cuesheet;
-            set 
-            {
-                var previousValue = cuesheet;
-                Boolean setValue = true;
-                if (value != null)
-                {
-                    setValue = value.Tracks.Contains(this);
-                }
-                if (setValue)
-                {
-                    cuesheet = value;
-                    FireEvents(previousValue, fireValidateablePropertyChanged: false, fireRankPropertyValueChanged: false, propertyName: nameof(Cuesheet));
-                }
-            }
-        }
+        public Cuesheet? Cuesheet { get; set; }
+        
         /// <inheritdoc/>
         public TimeSpan? PreGap { get; set;  }
         /// <inheritdoc/>
@@ -161,143 +89,6 @@ public Cuesheet? Cuesheet
         /// </summary>
         public Boolean IsLinkedToPreviousTrack { get; set; }
 
-        /// <summary>
-        /// Copy values from input object to this object
-        /// </summary>
-        /// <param name="track">Object to copy values from</param>
-        /// <param name="setCuesheet">Copy Cuesheet reference from track also?</param>
-        /// <param name="setIsLinkedToPreviousTrack">Copy IsLinkedToPreviousTrack from track also?</param>
-        /// <param name="setPosition">Copy Position from track also?</param>
-        /// <param name="setArtist">Copy Artist from track also?</param>
-        /// <param name="setTitle">Copy Title from track also?</param>
-        /// <param name="setBegin">Copy Begin from track also?</param>
-        /// <param name="setEnd">Copy End from track also?</param>
-        /// <param name="setLength">Copy Length from track also?</param>
-        /// <param name="setFlags">Copy Flags from track also?</param>
-        /// <param name="setPreGap">Copy PreGap from track also?</param>
-        /// <param name="setPostGap">Copy PostGap from track also?</param>
-        /// <param name="useInternalSetters">A list of properties, for whom the internal set construct should be used, in order to avoid automatic calculation.</param>
-        public void CopyValues(ITrack track, Boolean setCuesheet = true, Boolean setIsLinkedToPreviousTrack = true, Boolean setPosition = true, Boolean setArtist = true, Boolean setTitle = true, Boolean setBegin = true, Boolean setEnd = true, Boolean setLength = false, Boolean setFlags = true, Boolean setPreGap = true, Boolean setPostGap = true, IEnumerable<String>? useInternalSetters = null)
-        {
-            if (setCuesheet && (track is Track cuesheetTrack))
-            {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Cuesheet))))
-                {
-                    cuesheet = cuesheetTrack.Cuesheet;
-                }
-                else
-                {
-                    Cuesheet = cuesheetTrack.Cuesheet;
-                }
-            }
-            if (setPosition)
-            {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Position))))
-                {
-                    position = track.Position;
-                }
-                else
-                {
-                    Position = track.Position;
-                }
-            }
-            //TODO
-            //if (setArtist)
-            //{
-            //    if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Artist))))
-            //    {
-            //        artist = track.Artist;
-            //    }
-            //    else
-            //    {
-            //        Artist = track.Artist;
-            //    }
-            //}
-            //if (setTitle)
-            //{
-            //    if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Title))))
-            //    {
-            //        title = track.Title;
-            //    }
-            //    else
-            //    {
-            //        Title = track.Title;
-            //    }
-            //}
-            if (setBegin)
-            {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Begin))))
-                {
-                    begin = track.Begin;
-                }
-                else
-                {
-                    Begin = track.Begin;
-                }
-            }
-            if (setEnd)
-            {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(End))))
-                {
-                    end = track.End;
-                }
-                else
-                {
-                    End = track.End;
-                }
-            }
-            if (setLength)
-            {
-                Length = track.Length;
-            }
-            //TODO
-            //if (setFlags)
-            //{
-            //    if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(Flags))))
-            //    {
-            //        flags.Clear();
-            //        flags.AddRange(track.Flags);
-            //    }
-            //    else
-            //    {
-            //        Flags = track.Flags;
-            //    }
-            //}
-            if (setPreGap)
-            {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(PreGap))))
-                {
-                    preGap = track.PreGap;
-                }
-                else
-                {
-                    PreGap = track.PreGap;
-                }
-            }
-            if (setPostGap)
-            {
-                if ((useInternalSetters != null) && (useInternalSetters.Contains(nameof(PostGap))))
-                {
-                    postGap = track.PostGap;
-                }
-                else
-                {
-                    PostGap = track.PostGap;
-                }
-            }
-            if (setIsLinkedToPreviousTrack)
-            {
-                if (useInternalSetters?.Contains(nameof(IsLinkedToPreviousTrack)) == true)
-                {
-                    isLinkedToPreviousTrack = track.IsLinkedToPreviousTrack;
-                }
-                else
-                {
-                    IsLinkedToPreviousTrack = track.IsLinkedToPreviousTrack;
-                }
-            }
-        }
-
         public override ValidationResult Validate(string property)
         {
             ValidationStatus validationStatus = ValidationStatus.NoValidation;
@@ -386,43 +177,5 @@ public override ValidationResult Validate(string property)
             }
             return ValidationResult.Create(validationStatus, validationMessages);
         }
-
-        protected void OnTraceablePropertyChanged(object? previousValue, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
-        {
-            TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, propertyName)));
-        }
-
-        /// <summary>
-        /// Method for checking if fire of events should be done
-        /// </summary>
-        /// <param name="previousValue">Previous value of the property firing events</param>
-        /// <param name="fireValidateablePropertyChanged">Fire OnValidateablePropertyChanged?</param>
-        /// <param name="fireRankPropertyValueChanged">Fire RankPropertyValueChanged?</param>
-        /// <param name="fireTraceablePropertyChanged">Fire OnTraceablePropertyChanged?</param>
-        /// <exception cref="NullReferenceException">If propertyName can not be found, an exception is thrown.</exception>
-        /// <param name="propertyName">Property firing the events</param>
-        private void FireEvents(object? previousValue, Boolean fireValidateablePropertyChanged = true, Boolean fireRankPropertyValueChanged = true, Boolean fireTraceablePropertyChanged = true, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
-        {
-            var propertyInfo = GetType().GetProperty(propertyName);
-            if (propertyInfo != null)
-            {
-                var propertyValue = propertyInfo.GetValue(this);
-                if (Equals(propertyValue, previousValue) == false)
-                {
-                    if (fireRankPropertyValueChanged)
-                    {
-                        RankPropertyValueChanged?.Invoke(this, propertyName);
-                    }
-                    if (fireTraceablePropertyChanged)
-                    {
-                        OnTraceablePropertyChanged(previousValue, propertyName);
-                    }
-                }
-            }
-            else
-            {
-                throw new NullReferenceException(String.Format("Property {0} could not be found!", propertyName));
-            }
-        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index 90259544..5894b493 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -14,6 +14,7 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
+using System.Linq.Expressions;
 
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
@@ -23,65 +24,13 @@ namespace AudioCuesheetEditor.Services.AudioCuesheet
     public interface ITrackManager
     {
         /// <summary>
-        /// Set position for track
+        /// Set property value for track
         /// </summary>
+        /// <typeparam name="TProperty"></typeparam>
         /// <param name="track"></param>
-        /// <param name="position"></param>
-        void SetPosition(Track track, uint? position);
-        /// <summary>
-        /// Set artist for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="artist"></param>
-        void SetArtist(Track track, String? artist);
-        /// <summary>
-        /// Set title for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="title"></param>
-        void SetTitle(Track track, String? title);
-        /// <summary>
-        /// Set begin for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="begin"></param>
-        void SetBegin(Track track, TimeSpan? begin);
-        /// <summary>
-        /// Set end for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="end"></param>
-        void SetEnd(Track track, TimeSpan? end);
-        /// <summary>
-        /// Set length for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="length"></param>
-        void SetLength(Track track, TimeSpan? length);
-        /// <summary>
-        /// Set pregap for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="pregap"></param>
-        void SetPregap(Track track, TimeSpan? pregap);
-        /// <summary>
-        /// Set postgap for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="postgap"></param>
-        void SetPostgap(Track track, TimeSpan? postgap);
-        /// <summary>
-        /// Set flags for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="flags"></param>
-        void SetFlags(Track track, IEnumerable<Flag> flags);
-        /// <summary>
-        /// Set IsLinkedToPreviousTrack for track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <param name="linkedToPreviousTrack"></param>
-        void SetLinkedToPreviousTrack(Track track, Boolean linkedToPreviousTrack);
+        /// <param name="propertyExpression"></param>
+        /// <param name="value"></param>
+        void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value);
         /// <summary>
         /// Copies values from a track to another
         /// </summary>
@@ -97,12 +46,12 @@ public interface ITrackManager
         /// <param name="setFlags"></param>
         /// <param name="setPreGap"></param>
         /// <param name="setPostGap"></param>
-        void CopyValues(Track source, Track target, Boolean setIsLinkedToPreviousTrack = true, Boolean setPosition = true, Boolean setArtist = true, Boolean setTitle = true, Boolean setBegin = true, Boolean setEnd = true, Boolean setLength = false, Boolean setFlags = true, Boolean setPreGap = true, Boolean setPostGap = true);
+        void CopyValues(ITrack source, Track target, Boolean setIsLinkedToPreviousTrack = true, Boolean setPosition = true, Boolean setArtist = true, Boolean setTitle = true, Boolean setBegin = true, Boolean setEnd = true, Boolean setLength = false, Boolean setFlags = true, Boolean setPreGap = true, Boolean setPostGap = true);
         /// <summary>
         /// Create a clone of a track
         /// </summary>
         /// <param name="track"></param>
         /// <returns></returns>
-        Track Clone(Track track);
+        Track Clone(ITrack track);
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 7c20ec9a..89327805 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -15,8 +15,8 @@
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Services.UI;
-using MetaBrainz.MusicBrainz.Interfaces.Entities;
-using static System.Runtime.InteropServices.JavaScript.JSType;
+using System.Linq.Expressions;
+using System.Reflection;
 
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
@@ -26,104 +26,35 @@ public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManage
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
 
         //TODO: Tests
+
         /// <inheritdoc/>
-        public void SetPosition(Track track, uint? position)
-        {
-            var previousValue = track.Position;
-            if (Equals(position, previousValue) == false)
-            {
-                track.Position = position;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Position))));
-            }
-        }
-        /// <inheritdoc/>
-        public void SetArtist(Track track, string? artist)
-        {
-            var previousValue = track.Artist;
-            if (Equals(artist, previousValue) == false)
-            {
-                track.Artist = artist;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Artist))));
-            }
-        }
-        /// <inheritdoc/>
-        public void SetTitle(Track track, string? title)
-        {
-            var previousValue = track.Title;
-            if (Equals(title, previousValue) == false)
-            {
-                track.Title = title;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Title))));
-            }
-        }
-        /// <inheritdoc/>
-        public void SetBegin(Track track, TimeSpan? begin)
-        {
-            var previousValue = track.Begin;
-            if (Equals(begin, previousValue) == false)
-            {
-                track.Begin = begin;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Begin))));
-            }
-        }
-        /// <inheritdoc/>
-        public void SetEnd(Track track, TimeSpan? end)
-        {
-            var previousValue = track.End;
-            if (Equals(end, previousValue) == false)
-            {
-                track.End = end;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.End))));
-            }
-        }
-        /// <inheritdoc/>
-        public void SetLength(Track track, TimeSpan? length)
-        {
-            throw new NotImplementedException();
-        }
-        /// <inheritdoc/>
-        public void SetPregap(Track track, TimeSpan? pregap)
-        {
-            var previousValue = track.PreGap;
-            if (Equals(pregap, previousValue) == false)
-            {
-                track.PreGap = pregap;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.PreGap))));
-            }
-        }
-        /// <inheritdoc/>
-        public void SetPostgap(Track track, TimeSpan? postgap)
+        public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
         {
-            var previousValue = track.PostGap;
-            if (Equals(postgap, previousValue) == false)
+            if (propertyExpression.Body is not MemberExpression memberExpression)
             {
-                track.PostGap = postgap;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.PostGap))));
+                throw new ArgumentException("Expression must be a property");
             }
-        }
-        /// <inheritdoc/>
-        public void SetLinkedToPreviousTrack(Track track, bool linkedToPreviousTrack)
-        {
-            var previousValue = track.IsLinkedToPreviousTrack;
-            if (Equals(linkedToPreviousTrack, previousValue) == false)
+
+            if (memberExpression.Member is not PropertyInfo propertyInfo)
             {
-                track.IsLinkedToPreviousTrack = linkedToPreviousTrack;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.IsLinkedToPreviousTrack))));
+                throw new ArgumentException("Member is not a property");
             }
-        }
-        /// <inheritdoc/>
-        public void SetFlags(Track track, IEnumerable<Flag> flags)
-        {
-            var previousValue = track.Flags;
-            if (Equals(flags, previousValue) == false)
+
+            var previousValue = (TProperty?)propertyInfo.GetValue(track);
+
+            if (Equals(previousValue, value))
             {
-                track.Flags = flags;
-                _traceChangeManager.AddChange(new(track, new(previousValue, nameof(Track.Flags))));
+                return;
             }
+
+            propertyInfo.SetValue(track, value);
+            //TODO: If IsLinkedToPreviousTrack is true set also position, begin and end
+
+            _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
         }
 
         /// <inheritdoc/>
-        public Track Clone(Track track)
+        public Track Clone(ITrack track)
         {
             var clone = new Track();
             CopyValues(track, clone);
@@ -131,7 +62,7 @@ public Track Clone(Track track)
         }
 
         /// <inheritdoc/>
-        public void CopyValues(Track source, Track target, bool setIsLinkedToPreviousTrack = true, bool setPosition = true, bool setArtist = true, bool setTitle = true, bool setBegin = true, bool setEnd = true, bool setLength = false, bool setFlags = true, bool setPreGap = true, bool setPostGap = true)
+        public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTrack = true, bool setPosition = true, bool setArtist = true, bool setTitle = true, bool setBegin = true, bool setEnd = true, bool setLength = false, bool setFlags = true, bool setPreGap = true, bool setPostGap = true)
         {
             //TODO: Create change for ITraceChangeManager
             if (setIsLinkedToPreviousTrack)
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index adeabb5e..fe25be1b 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -18,6 +18,7 @@
 using AudioCuesheetEditor.Model.IO;
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Services.AudioCuesheet;
 using AudioCuesheetEditor.Services.UI;
 using System.Diagnostics;
 
@@ -31,7 +32,7 @@ public enum ImportFileType
         Textfile,
         Audiofile
     }
-    public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService, ILogger<ImportManager> logger)
+    public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService, ITrackManager trackManager, ILogger<ImportManager> logger)
     {
         public event EventHandler<IEnumerable<string>>? UploadFilesFinished;
 
@@ -40,6 +41,7 @@ public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceC
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
         private readonly IFileInputManager _fileInputManager = fileInputManager;
         private readonly ITextImportService _textImportService = textImportService;
+        private readonly ITrackManager _trackManager = trackManager;
 
         public void ImportData(String? data)
         {
@@ -177,7 +179,7 @@ public async Task UploadFilesAsync(IEnumerable<FileUpload> files)
             }
         }
 
-        private static void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
+        private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
         {
             target.IsImporting = true;
             target.Artist = cuesheetToCopy.Artist;
@@ -210,7 +212,8 @@ private static void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
                 {
                     var importTrack = tracks.ElementAt(i);
                     //We don't want to copy the cuesheet reference since we are doing a copy and want to assign the track to this object
-                    var track = new Track(importTrack, false);
+                    var track = _trackManager.Clone(importTrack);
+                    track.Cuesheet = null;
                     if (importTrack is ImportTrack importTrackReference)
                     {
                         if (importTrackReference.StartDateTime != null)
diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index 40f99481..d39c2e2a 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -45,7 +45,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
             }
             if (tracks.Count() > 1)
             {
-                var parameters = new DialogParameters<EditMultipleTracksModal> { { x => x.EditedTrack, new() { AutomaticallyCalculateLength = false } } };
+                var parameters = new DialogParameters<EditMultipleTracksModal> { { x => x.EditedTrack, new() } };
                 var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
                 var dialog = await _dialogService.ShowAsync<EditMultipleTracksModal>(null, parameters, options);
                 var result = await dialog.Result;
@@ -80,14 +80,14 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                                 break;
                             case DynamicEditValue.EnteredValueAdd:
                                 editMultipleTracksModalResult.EditedTrack.Position += track.Position;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackPosition = false;
                                 editMultipleTracksModalResult.EditedTrack.Position = position;
                                 break;
                             case DynamicEditValue.EnteredValueSubstract:
                                 var newValue = track.Position - editMultipleTracksModalResult.EditedTrack.Position;
                                 editMultipleTracksModalResult.EditedTrack.Position = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackPosition = false;
                                 break;
                         }
@@ -102,13 +102,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.Begin + track.Begin;
                                 editMultipleTracksModalResult.EditedTrack.Begin = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: copyTrackBegin, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: copyTrackBegin, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackBegin = false;
                                 break;
                             case DynamicEditValue.EnteredValueSubstract:
                                 newValue = track.Begin - editMultipleTracksModalResult.EditedTrack.Begin;
                                 editMultipleTracksModalResult.EditedTrack.Begin = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: copyTrackBegin, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: copyTrackBegin, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackBegin = false;
                                 break;
                         }
@@ -123,13 +123,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.End + track.End;
                                 editMultipleTracksModalResult.EditedTrack.End = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: copyTrackEnd, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: copyTrackEnd, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackEnd = false;
                                 break;
                             case DynamicEditValue.EnteredValueSubstract:
                                 newValue = track.End - editMultipleTracksModalResult.EditedTrack.End;
                                 editMultipleTracksModalResult.EditedTrack.End = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: copyTrackEnd, setLength: false, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: copyTrackEnd, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackEnd = false;
                                 break;
                         }
@@ -144,13 +144,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.Length + track.Length;
                                 editMultipleTracksModalResult.EditedTrack.Length = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: copyTrackLength, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: copyTrackLength, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackLength = false;
                                 break;
                             case DynamicEditValue.EnteredValueSubstract:
                                 newValue = track.Length - editMultipleTracksModalResult.EditedTrack.Length;
                                 editMultipleTracksModalResult.EditedTrack.Length = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: copyTrackLength, setFlags: false, setPreGap: false, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: copyTrackLength, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackLength = false;
                                 break;
                         }
@@ -165,13 +165,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.PreGap + track.PreGap;
                                 editMultipleTracksModalResult.EditedTrack.PreGap = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: copyTrackPreGap, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: copyTrackPreGap, setPostGap: false);
                                 copyTrackPreGap = false;
                                 break;
                             case DynamicEditValue.EnteredValueSubstract:
                                 newValue = track.PreGap - editMultipleTracksModalResult.EditedTrack.PreGap;
                                 editMultipleTracksModalResult.EditedTrack.PreGap = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: copyTrackPreGap, setPostGap: false, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: copyTrackPreGap, setPostGap: false);
                                 copyTrackPreGap = false;
                                 break;
                         }
@@ -186,13 +186,13 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                             case DynamicEditValue.EnteredValueAdd:
                                 var newValue = editMultipleTracksModalResult.EditedTrack.PostGap + track.PostGap;
                                 editMultipleTracksModalResult.EditedTrack.PostGap = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: copyTrackPostGap, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: copyTrackPostGap);
                                 copyTrackPostGap = false;
                                 break;
                             case DynamicEditValue.EnteredValueSubstract:
                                 newValue = track.PostGap - editMultipleTracksModalResult.EditedTrack.PostGap;
                                 editMultipleTracksModalResult.EditedTrack.PostGap = newValue;
-                                track.CopyValues(editMultipleTracksModalResult.EditedTrack, setCuesheet: false, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: copyTrackPostGap, useInternalSetters: Track.AllPropertyNames);
+                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: false, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: copyTrackPostGap);
                                 copyTrackPostGap = false;
                                 break;
                         }
diff --git a/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor b/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
index c7bf7137..d8f4708d 100644
--- a/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/ArtistColumn.razor
@@ -77,7 +77,7 @@ along with Foobar.  If not, see
         try
         {
             await Task.Delay(100, token);
-            _trackManager.SetArtist(Track, _artist);
+            _trackManager.SetProperty(Track, x => x.Artist, _artist);
         }
         catch (TaskCanceledException)
         {
diff --git a/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor b/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
index 618cb2a1..dad4c99d 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
@@ -82,14 +82,14 @@ along with Foobar.  If not, see
         {
             await Task.Delay(100, token);
             base.TraceChangeManager.BulkEdit = true;
-            _trackManager.SetTitle(Track, _title);
+            _trackManager.SetProperty(Track, x => x.Title, _title);
             switch (CurrentViewMode)
             {
                 case ViewMode.DetailView:
                 case ViewMode.ImportView:
                     if ((String.IsNullOrEmpty(Track.Artist)) && (String.IsNullOrEmpty(_autocompleteTrack?.Artist) == false))
                     {
-                        _trackManager.SetArtist(Track, _autocompleteTrack.Artist);
+                        _trackManager.SetProperty(Track, x => x.Artist, _autocompleteTrack.Artist);
                     }
                     if ((Track.Length.HasValue == false) && (_autocompleteTrack?.Length.HasValue == true))
                     {
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index c90571f6..8457add0 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -26,6 +26,7 @@ along with Foobar.  If not, see
 @inject PlaybackService _playbackService
 @inject IDialogService _dialogService
 @inject ISessionStateContainer _sessionStateContainer
+@inject ITrackManager trackManager
 
 @switch (CurrentViewMode)
 {
@@ -130,7 +131,7 @@ along with Foobar.  If not, see
     }
 </MudMenu>
 
-@code {
+    @code {
     //TODO: Disallow editing of position
     HashSet<Track> selectedTracks = new();
     MudMenu? trackContextMenu;
@@ -234,7 +235,7 @@ along with Foobar.  If not, see
         }
         if (trackThatWillBeCopied != null)
         {
-            var copy = new Track(trackThatWillBeCopied);
+            var copy = trackManager.Clone(trackThatWillBeCopied);
             Cuesheet?.AddTrack(copy);
             TraceChangeManager.TraceChanges(copy);
             await EditTrackModalClicked(copy);

From c0e965a1db647fae1c2915737d4de89899891c01 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 08:13:12 +0200
Subject: [PATCH 022/150] Update TitleColumn.razor

---
 AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor b/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
index dad4c99d..44842526 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TitleColumn.razor
@@ -93,8 +93,7 @@ along with Foobar.  If not, see
                     }
                     if ((Track.Length.HasValue == false) && (_autocompleteTrack?.Length.HasValue == true))
                     {
-                        //TODO
-                        Track.Length = _autocompleteTrack?.Length;
+                        _trackManager.SetProperty(Track, x => x.Length, _autocompleteTrack.Length);
                     }
                     break;
             }

From 6bd6284beda15dae1ae9d13fb8291f500fe9fade Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 08:35:15 +0200
Subject: [PATCH 023/150] Update TrackList.razor

---
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 8457add0..6bb9cda7 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -131,7 +131,7 @@ along with Foobar.  If not, see
     }
 </MudMenu>
 
-    @code {
+@code {
     //TODO: Disallow editing of position
     HashSet<Track> selectedTracks = new();
     MudMenu? trackContextMenu;

From 9718304931487a8a8318f2274ce4d71d8be1ec4c Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 08:50:11 +0200
Subject: [PATCH 024/150] edit begin/end/length

---
 .../Services/UI/ApplicationOptionsTimeSpanParser.cs      | 8 ++++++++
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor     | 9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs b/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
index 6317037b..b06086d2 100644
--- a/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
+++ b/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
@@ -54,6 +54,14 @@ public async Task TimespanTextChanged<T, TProperty>(T entity, Expression<Func<T,
             }
         }
 
+        //TODO: Tests
+        public async Task<TimeSpan?> GetTimespanAsync(String value)
+        {
+            await EnsureInitializedAsync();
+            TimeSpan? result = TimeSpanUtility.ParseTimeSpan(value, applicationOptions?.TimeSpanFormat);
+            return result;
+        }
+
         public string? GetTimespanFormatted(TimeSpan? timeSpan)
         {
             string? formatted = null;
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 6bb9cda7..0e7f32f8 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -26,7 +26,7 @@ along with Foobar.  If not, see
 @inject PlaybackService _playbackService
 @inject IDialogService _dialogService
 @inject ISessionStateContainer _sessionStateContainer
-@inject ITrackManager trackManager
+@inject ITrackManager _trackManager
 
 @switch (CurrentViewMode)
 {
@@ -235,7 +235,7 @@ along with Foobar.  If not, see
         }
         if (trackThatWillBeCopied != null)
         {
-            var copy = trackManager.Clone(trackThatWillBeCopied);
+            var copy = _trackManager.Clone(trackThatWillBeCopied);
             Cuesheet?.AddTrack(copy);
             TraceChangeManager.TraceChanges(copy);
             await EditTrackModalClicked(copy);
@@ -298,9 +298,10 @@ along with Foobar.  If not, see
         }
     }
 
-    async Task TimespanChanged<TProperty>(Track track, System.Linq.Expressions.Expression<Func<Track, TProperty>> expression, String value)
+    async Task TimespanChanged(Track track, System.Linq.Expressions.Expression<Func<Track, TimeSpan?>> expression, String value)
     {
-        await _applicationOptionsTimeSpanParser.TimespanTextChanged<Track, TProperty>(track, expression, value);
+        var timeSpan = await _applicationOptionsTimeSpanParser.GetTimespanAsync(value);
+        _trackManager.SetProperty<TimeSpan?>(track, expression, timeSpan);
         if (form != null)
         {
             await form.ValidateAsync();

From a70dd5a569d2b858706434c89522d2d72c2fa50a Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 11:13:49 +0200
Subject: [PATCH 025/150] Update Track.cs

---
 AudioCuesheetEditor/Model/AudioCuesheet/Track.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index a56b81b8..b6cfcd12 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -21,8 +21,6 @@ namespace AudioCuesheetEditor.Model.AudioCuesheet
 {
     public class Track : Validateable, ITraceable, ITrack
     {
-        public static readonly List<String> AllPropertyNames = [nameof(IsLinkedToPreviousTrack), nameof(Position), nameof(Artist), nameof(Title), nameof(Begin), nameof(End), nameof(Flags), nameof(PreGap), nameof(PostGap), nameof(Length)];
-
         /// <inheritdoc/>
         //TODO: Remove when ITraceable doesn't have event any more
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;

From 68fb197a6736351076123c3c3417c15119542908 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 11:18:03 +0200
Subject: [PATCH 026/150] Update Track.cs

---
 AudioCuesheetEditor/Model/AudioCuesheet/Track.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index b6cfcd12..378a3b90 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -30,7 +30,6 @@ public class Track : Validateable, ITraceable, ITrack
         public String? Title { get; set; }
         public TimeSpan? Begin { get; set; }        
         public TimeSpan? End { get; set; }
-
         [JsonIgnore]
         public TimeSpan? Length 
         {
@@ -74,10 +73,8 @@ public TimeSpan? Length
         }
         [JsonInclude]
         public IEnumerable<Flag> Flags { get; set; } = [];
-        
         [JsonIgnore]
         public Cuesheet? Cuesheet { get; set; }
-        
         /// <inheritdoc/>
         public TimeSpan? PreGap { get; set;  }
         /// <inheritdoc/>

From 386dabd9957a60aa4dffc9149dc264f9fb7070f0 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 12:36:21 +0200
Subject: [PATCH 027/150] add tracking for modal edit

---
 .../Services/AudioCuesheet/ITrackManager.cs   |  2 +-
 .../Services/AudioCuesheet/TrackManager.cs    | 67 ++++++++++---------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index 5894b493..1c0aa37f 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -46,7 +46,7 @@ public interface ITrackManager
         /// <param name="setFlags"></param>
         /// <param name="setPreGap"></param>
         /// <param name="setPostGap"></param>
-        void CopyValues(ITrack source, Track target, Boolean setIsLinkedToPreviousTrack = true, Boolean setPosition = true, Boolean setArtist = true, Boolean setTitle = true, Boolean setBegin = true, Boolean setEnd = true, Boolean setLength = false, Boolean setFlags = true, Boolean setPreGap = true, Boolean setPostGap = true);
+        void CopyValues(ITrack source, Track target, Boolean setIsLinkedToPreviousTrack = true, Boolean setPosition = true, Boolean setArtist = true, Boolean setTitle = true, Boolean setBegin = true, Boolean setEnd = true, Boolean setLength = true, Boolean setFlags = true, Boolean setPreGap = true, Boolean setPostGap = true);
         /// <summary>
         /// Create a clone of a track
         /// </summary>
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 89327805..eb6c05cc 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -30,81 +30,84 @@ public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManage
         /// <inheritdoc/>
         public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
         {
-            if (propertyExpression.Body is not MemberExpression memberExpression)
-            {
-                throw new ArgumentException("Expression must be a property");
-            }
-
-            if (memberExpression.Member is not PropertyInfo propertyInfo)
-            {
-                throw new ArgumentException("Member is not a property");
-            }
-
-            var previousValue = (TProperty?)propertyInfo.GetValue(track);
-
-            if (Equals(previousValue, value))
-            {
-                return;
-            }
-
-            propertyInfo.SetValue(track, value);
             //TODO: If IsLinkedToPreviousTrack is true set also position, begin and end
-
-            _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
+            SetValue(track, propertyExpression, value);
         }
 
         /// <inheritdoc/>
         public Track Clone(ITrack track)
         {
             var clone = new Track();
-            CopyValues(track, clone);
+            CopyValues(track, clone, setIsLinkedToPreviousTrack: true);
             return clone;
         }
 
         /// <inheritdoc/>
-        public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTrack = true, bool setPosition = true, bool setArtist = true, bool setTitle = true, bool setBegin = true, bool setEnd = true, bool setLength = false, bool setFlags = true, bool setPreGap = true, bool setPostGap = true)
+        public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTrack = true, bool setPosition = true, bool setArtist = true, bool setTitle = true, bool setBegin = true, bool setEnd = true, bool setLength = true, bool setFlags = true, bool setPreGap = true, bool setPostGap = true)
         {
-            //TODO: Create change for ITraceChangeManager
             if (setIsLinkedToPreviousTrack)
             {
-                target.IsLinkedToPreviousTrack = source.IsLinkedToPreviousTrack;
+                SetValue(target, x => x.IsLinkedToPreviousTrack, source.IsLinkedToPreviousTrack);
             }
             if (setPosition)
             {
-                target.Position = source.Position;
+                SetValue(target, x => x.Position, source.Position);
             }
             if (setArtist)
             {
-                target.Artist = source.Artist;
+                SetValue(target, x => x.Artist, source.Artist);
             }
             if (setTitle)
             {
-                target.Title = source.Title;
+                SetValue(target, x => x.Title, source.Title);
             }
             if (setBegin)
             {
-                target.Begin = source.Begin;
+                SetValue(target, x => x.Begin, source.Begin);
             }
             if (setEnd)
             {
-                target.End = source.End;
+                SetValue(target, x => x.End, source.End);
             }
             if (setLength)
             {
-                target.Length = source.Length;
+                SetValue(target, x => x.Length, source.Length);
             }
             if (setFlags)
             {
-                target.Flags = source.Flags;
+                SetValue(target, x => x.Flags, source.Flags);
             }
             if (setPreGap)
             {
-                target.PreGap = source.PreGap;
+                SetValue(target, x => x.PreGap, source.PreGap);
             }
             if (setPostGap)
             {
                 target.PostGap = source.PostGap;
             }
         }
+
+        void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
+        {
+            if (propertyExpression.Body is not MemberExpression memberExpression)
+            {
+                throw new ArgumentException("Expression must be a property");
+            }
+
+            if (memberExpression.Member is not PropertyInfo propertyInfo)
+            {
+                throw new ArgumentException("Member is not a property");
+            }
+
+            var previousValue = (TProperty?)propertyInfo.GetValue(track);
+            if (Equals(previousValue, value))
+            {
+                return;
+            }
+
+            propertyInfo.SetValue(track, value);
+
+            _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
+        }
     }
 }
\ No newline at end of file

From 7445d8aff0d96217fba2bc5e7e852d2db59ec7b7 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 12:36:39 +0200
Subject: [PATCH 028/150] Update TrackManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index eb6c05cc..1698811a 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -38,7 +38,7 @@ public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty
         public Track Clone(ITrack track)
         {
             var clone = new Track();
-            CopyValues(track, clone, setIsLinkedToPreviousTrack: true);
+            CopyValues(track, clone);
             return clone;
         }
 

From fcbfcd4acdf5a6cbd09de0549a70f1e559bc851a Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 12:42:06 +0200
Subject: [PATCH 029/150] Update TrackList.razor

---
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 0e7f32f8..88262e28 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -114,7 +114,7 @@ along with Foobar.  If not, see
                     @if (Cuesheet?.Tracks.FirstOrDefault() != context.Item)
                     {
                         <MudTooltip Text="@GetLinkedTrackTooltip(context.Item)">
-                            <MudChip Icon="@GetLinkedTrackIcon(context.Item)" Color="Color.Secondary" OnClick="() => context.Item.IsLinkedToPreviousTrack = !context.Item.IsLinkedToPreviousTrack" />
+                            <MudChip Icon="@GetLinkedTrackIcon(context.Item)" Color="Color.Secondary" OnClick="() => _trackManager.SetProperty(context.Item, x => x.IsLinkedToPreviousTrack, !context.Item.IsLinkedToPreviousTrack)" />
                         </MudTooltip>
                     }
                 </EditTemplate>

From 22c3a63f25ff73b03fbd9d9763a294f92ac01cdb Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 13:39:24 +0200
Subject: [PATCH 030/150] add recalculation of linked properties

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 22 +++++++++++++
 .../Services/AudioCuesheet/TrackManager.cs    | 31 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 5e927059..0824cc1f 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -161,6 +161,28 @@ public IEnumerable<String> IsRecordingPossible
             return previousLinkedTrack;
         }
 
+        /// <summary>
+        /// Get next linked track that is linked to the parameter track
+        /// </summary>
+        /// <param name="track"></param>
+        /// <returns></returns>
+        public Track? GetNextLinkedTrack(Track track)
+        {
+            Track? nextLinkedTrack = null;
+            {
+                var index = tracks.IndexOf(track);
+                if (index + 1 < tracks.Count)
+                {
+                    var nextTrack = tracks.ElementAt(index + 1);
+                    if (nextTrack.IsLinkedToPreviousTrack)
+                    {
+                        nextLinkedTrack = nextTrack;
+                    }
+                }
+            }
+            return nextLinkedTrack;
+        }
+
         public void AddTrack(Track track)
         {
             var previousValue = new List<Track>(tracks);
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 1698811a..5445d649 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -30,8 +30,8 @@ public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManage
         /// <inheritdoc/>
         public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
         {
-            //TODO: If IsLinkedToPreviousTrack is true set also position, begin and end
             SetValue(track, propertyExpression, value);
+            RecalculateLinkedProperties(track);
         }
 
         /// <inheritdoc/>
@@ -109,5 +109,34 @@ void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propert
 
             _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
         }
+
+        static void RecalculateLinkedProperties(Track track)
+        {
+            var previousTrack = track.Cuesheet?.GetPreviousLinkedTrack(track);
+            if (previousTrack != null)
+            {
+                if (track.Position.HasValue && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
+                {
+                    track.Position = previousTrack.Position.Value + 1;
+                }
+                if (previousTrack.End.HasValue && (track.Begin != previousTrack.End))
+                {
+                    track.Begin = previousTrack.End;
+                }
+                if ((previousTrack.End.HasValue == false) && track.Begin.HasValue)
+                {
+                    previousTrack.End = track.Begin;
+                }
+            }
+            var nextTrack = track.Cuesheet?.GetNextLinkedTrack(track);
+            if (nextTrack != null)
+            {
+                if (track.Position.HasValue)
+                {
+                    nextTrack.Position = track.Position.Value + 1;
+                }
+                nextTrack.Begin = track.End;
+            }
+        }
     }
 }
\ No newline at end of file

From cbb82b33a389fef8d681c8b75538465ede1e6660 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 14:34:26 +0200
Subject: [PATCH 031/150] add cuesheet manager

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 66 +++--------------
 AudioCuesheetEditor/Program.cs                |  1 +
 .../Services/Audio/PlaybackService.cs         | 11 +--
 .../Services/AudioCuesheet/CuesheetManager.cs | 70 +++++++++++++++++++
 .../AudioCuesheet/ICuesheetManager.cs         | 43 ++++++++++++
 .../Shared/Cuesheet/CuesheetData.razor        | 29 ++++----
 6 files changed, 142 insertions(+), 78 deletions(-)
 create mode 100644 AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
 create mode 100644 AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 0824cc1f..3855e20e 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -32,16 +32,9 @@ public class Cuesheet() : Validateable, ITraceable, ICuesheet
         private readonly Lock syncLock = new();
 
         private List<Track> tracks = [];
-        private String? artist;
-        private String? title;
-        private Audiofile? audiofile;
-        private CDTextfile? cDTextfile;
-        private String? catalogueNumber;
-        private readonly List<KeyValuePair<String, Track>> currentlyHandlingLinkedTrackPropertyChange = [];
 
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
         public event EventHandler? IsRecordingChanged;
-        public event EventHandler? AudiofileChanged;
 
         [JsonInclude]
         public IReadOnlyCollection<Track> Tracks
@@ -61,59 +54,15 @@ private set
             }
         }
 
-        public String? Artist 
-        {
-            get => artist;
-            set 
-            {
-                var previousValue = artist;
-                artist = value;
-                FireEvents(previousValue, propertyName: nameof(Artist));
-            }
-        }
-        public String? Title 
-        {
-            get => title;
-            set 
-            {
-                var previousValue = title;
-                title = value;
-                FireEvents(previousValue, propertyName: nameof(Title));
-            }
-        }
-        public Audiofile? Audiofile
-        {
-            get => audiofile;
-            set 
-            {
-                var previousValue = audiofile;
-                audiofile = value;
-                FireEvents(previousValue, propertyName: nameof(Audiofile));
-                AudiofileChanged?.Invoke(this, EventArgs.Empty);
-            }
-        }
+        public String? Artist { get; set; }
+        
+        public String? Title { get; set; }
 
-        public CDTextfile? CDTextfile 
-        {
-            get => cDTextfile;
-            set 
-            {
-                var previousValue = cDTextfile;
-                cDTextfile = value;
-                FireEvents(previousValue, fireValidateablePropertyChanged: false, propertyName: nameof(CDTextfile));
-            }
-        }
+        public Audiofile? Audiofile { get; set; }
 
-        public String? Cataloguenumber 
-        {
-            get => catalogueNumber;
-            set
-            {
-                var previousValue = catalogueNumber;
-                catalogueNumber = value;
-                FireEvents(previousValue, propertyName: nameof(Cataloguenumber));
-            }
-        }
+        public CDTextfile? CDTextfile { get; set; }
+
+        public String? Cataloguenumber { get; set; }
 
         [JsonIgnore]
         public bool IsRecording => RecordingStart.HasValue;
@@ -121,6 +70,7 @@ public String? Cataloguenumber
         [JsonIgnore]
         public DateTime? RecordingStart { get; set; }
 
+        //TODO: Move to cuesheetmanager
         [JsonIgnore]
         public IEnumerable<String> IsRecordingPossible
         {
diff --git a/AudioCuesheetEditor/Program.cs b/AudioCuesheetEditor/Program.cs
index 0cf4a823..1c35461a 100644
--- a/AudioCuesheetEditor/Program.cs
+++ b/AudioCuesheetEditor/Program.cs
@@ -64,6 +64,7 @@
 builder.Services.AddScoped<ExportfileGenerator>();
 builder.Services.AddScoped<AutocompleteManager>();
 builder.Services.AddScoped<ITrackManager, TrackManager>();
+builder.Services.AddScoped<ICuesheetManager, CuesheetManager>();
 
 builder.Services.AddLogging();
 // Read out configuration for loglevel
diff --git a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
index b451800e..81d7ac0e 100644
--- a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
+++ b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
@@ -59,7 +59,8 @@ public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)
         {
             _sessionStateContainer = sessionStateContainer;
             cuesheet = _sessionStateContainer.Cuesheet;
-            cuesheet.AudiofileChanged += Cuesheet_AudiofileChanged;
+            //TODO
+            //cuesheet.AudiofileChanged += Cuesheet_AudiofileChanged;
             _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
             _howl = howl;
             _howl.OnPlay += Howl_OnPlay;
@@ -184,7 +185,8 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-                    cuesheet.AudiofileChanged -= Cuesheet_AudiofileChanged;
+                    //TODO
+                    //cuesheet.AudiofileChanged -= Cuesheet_AudiofileChanged;
                     _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
                     _howl.OnPlay -= Howl_OnPlay;
                     _howl.OnPause -= Howl_OnPause;
@@ -246,9 +248,10 @@ private async void UpdateCurrentPosition(object? state)
         private void SessionStateContainer_CuesheetChanged(object? sender, EventArgs e)
         {
             _ = StopAsync();
-            cuesheet.AudiofileChanged -= Cuesheet_AudiofileChanged;
+            //TODO
+            //cuesheet.AudiofileChanged -= Cuesheet_AudiofileChanged;
             cuesheet = _sessionStateContainer.Cuesheet;
-            cuesheet.AudiofileChanged += Cuesheet_AudiofileChanged;
+            //cuesheet.AudiofileChanged += Cuesheet_AudiofileChanged;
         }
 
         private void Cuesheet_AudiofileChanged(object? sender, EventArgs e)
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
new file mode 100644
index 00000000..7edc5aa2
--- /dev/null
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -0,0 +1,70 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Services.UI;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace AudioCuesheetEditor.Services.AudioCuesheet
+{
+    /// <inheritdoc/>
+    public class CuesheetManager(ITraceChangeManager traceChangeManager) : ICuesheetManager
+    {
+        private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+
+        //TODO: Tests
+
+        /// <inheritdoc/>
+        public void SetProperty<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
+        {
+            SetValue(cuesheet, propertyExpression, value);
+        }
+
+        /// <inheritdoc/>
+        public Result StartRecording(Cuesheet cuesheet)
+        {
+            if (cuesheet.IsRecording == true)
+            {
+                //TODO
+            }
+            cuesheet.RecordingStart = DateTime.UtcNow;
+            return Result.Success();
+        }
+
+        void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
+        {
+            if (propertyExpression.Body is not MemberExpression memberExpression)
+            {
+                throw new ArgumentException("Expression must be a property");
+            }
+
+            if (memberExpression.Member is not PropertyInfo propertyInfo)
+            {
+                throw new ArgumentException("Member is not a property");
+            }
+
+            var previousValue = (TProperty?)propertyInfo.GetValue(cuesheet);
+            if (Equals(previousValue, value))
+            {
+                return;
+            }
+
+            propertyInfo.SetValue(cuesheet, value);
+
+            _traceChangeManager.AddChange(new(cuesheet, new(previousValue, propertyInfo.Name)));
+        }
+    }
+}
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
new file mode 100644
index 00000000..de605c29
--- /dev/null
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -0,0 +1,43 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using System.Linq.Expressions;
+
+namespace AudioCuesheetEditor.Services.AudioCuesheet
+{
+    /// <summary>
+    /// Manager for cuesheet interactions
+    /// </summary>
+    public interface ICuesheetManager
+    {
+        /// <summary>
+        /// Set property for cuesheet
+        /// </summary>
+        /// <typeparam name="TProperty"></typeparam>
+        /// <param name="cuesheet"></param>
+        /// <param name="propertyExpression"></param>
+        /// <param name="value"></param>
+        void SetProperty<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
+        /// <summary>
+        /// Starts recording on cuesheet
+        /// </summary>
+        /// <param name="cuesheet"></param>
+        /// <returns></returns>
+        Result StartRecording(Cuesheet cuesheet);
+
+        //TODO: Add all methods from cuesheet here
+    }
+}
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index cc0cf4eb..3b4ef579 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -20,16 +20,16 @@ along with Foobar.  If not, see
 @inject IStringLocalizer<CuesheetData> _localizer
 @inject ValidationService _validationService
 @inject IFileInputManager _fileInputManager
-@inject IBlazorDownloadFileService _blazorDownloadFileService
 @inject IDialogService _dialogService
 @inject ISessionStateContainer _sessionStateContainer
+@inject ICuesheetManager _cuesheetManager
 
 @if (Cuesheet != null)
 {
     <MudForm @ref="form" Model="Cuesheet">
-        <MudTextField @bind-Value="Cuesheet.Artist" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
+        <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetProperty(Cuesheet, x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
                       Placeholder="@_localizer["Enter the cuesheet artist here"]" Variant="Variant.Outlined" />
-        <MudTextField @bind-Value="Cuesheet.Title" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]" 
+        <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetProperty(Cuesheet, x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
                       Placeholder="@_localizer["Enter the cuesheet title here"]" Variant="Variant.Outlined" />
         @switch(CurrentViewMode)
         {
@@ -39,7 +39,7 @@ along with Foobar.  If not, see
                            Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" />
                 <FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile" 
                            Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
-                <MudTextField @ref="catalogueNumberTextField" @bind-Value="catalogueNumber" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
+                <MudTextField @ref="catalogueNumberTextField" Text="@Cuesheet.Cataloguenumber" TextChanged="(newValue) => _cuesheetManager.SetProperty(Cuesheet, x => x.Cataloguenumber, newValue)" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
                               Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined"
                               Mask="@(new PatternMask("00 00000 00000 0"))" OnBlur="CataloguenumberOnBlur" />
                 break;
@@ -111,18 +111,17 @@ along with Foobar.  If not, see
         fileInputAudiofileErrorText = null;
         try 
         {
+            Audiofile? audiofile = null;
             if (browserFile != null)
             {
                 var fileUpload = await _fileInputManager.CreateFileUploadsAsync([browserFile], fileInputAudiofileId);
-                Cuesheet.Audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
-                if (Cuesheet.RecalculateLastTrackEnd())
-                {
-                    TraceChangeManager.MergeLastEditWithEdit(x => x.Changes.All(y => y.TraceableObject == Cuesheet && y.TraceableChange.PropertyName == nameof(Audiofile)));
-                }
+                audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
             }
-            else
+            _cuesheetManager.SetProperty(Cuesheet, x => x.Audiofile, audiofile);
+            //TODO: Include into cuesheetmanager
+            if (Cuesheet.RecalculateLastTrackEnd())
             {
-                Cuesheet.Audiofile = null;
+                TraceChangeManager.MergeLastEditWithEdit(x => x.Changes.All(y => y.TraceableObject == Cuesheet && y.TraceableChange.PropertyName == nameof(Audiofile)));
             }
         }
         catch(ArgumentException ae)
@@ -162,14 +161,12 @@ along with Foobar.  If not, see
         fileInputCDTextfileErrorText = null;
         try
         {
+            CDTextfile? newValue = null;
             if (browserFile != null)
             {
-                Cuesheet.CDTextfile = _fileInputManager.CreateCDTextfile(browserFile.ContentType, browserFile.Name);
-            }
-            else
-            {
-                Cuesheet.CDTextfile = null;
+                newValue = _fileInputManager.CreateCDTextfile(browserFile.ContentType, browserFile.Name);
             }
+            _cuesheetManager.SetProperty(Cuesheet, x => x.CDTextfile, newValue);
         }
         catch (ArgumentException ae)
         {

From 41f043fda8b379de9e79af454c0b7b91ff9f06b7 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:40:49 +0200
Subject: [PATCH 032/150] move recording to manager

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 85 +------------------
 .../Model/AudioCuesheet/Track.cs              |  1 -
 .../Services/AudioCuesheet/CuesheetManager.cs | 27 +++++-
 .../AudioCuesheet/ICuesheetManager.cs         | 16 ++++
 AudioCuesheetEditor/Services/Result.cs        | 10 ++-
 .../Shared/Record/AddTrack.razor              | 30 ++-----
 .../Shared/Record/ControlRecording.razor      | 23 ++---
 7 files changed, 71 insertions(+), 121 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 3855e20e..dbc029c5 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -32,9 +32,8 @@ public class Cuesheet() : Validateable, ITraceable, ICuesheet
         private readonly Lock syncLock = new();
 
         private List<Track> tracks = [];
-
+        //TODO: Remove when ITraceable doesn't have event any more
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
-        public event EventHandler? IsRecordingChanged;
 
         [JsonInclude]
         public IReadOnlyCollection<Track> Tracks
@@ -70,25 +69,6 @@ private set
         [JsonIgnore]
         public DateTime? RecordingStart { get; set; }
 
-        //TODO: Move to cuesheetmanager
-        [JsonIgnore]
-        public IEnumerable<String> IsRecordingPossible
-        {
-            get
-            {
-                var errors = new List<String>();
-                if (IsRecording)
-                {
-                    errors.Add("Record is already running!");
-                }
-                if (Tracks.Count != 0)
-                {
-                    errors.Add("Cuesheet already contains tracks!");
-                }
-                return errors;
-            }
-        }
-
         [JsonIgnore]
         public Boolean IsImporting { get; set; }
 
@@ -143,7 +123,6 @@ public void AddTrack(Track track)
             tracks.Add(track);
             track.Cuesheet = this;
             RecalculateTrackProperties(track);
-            OnTraceablePropertyChanged(previousValue, nameof(Tracks));
         }
 
         public void RemoveTrack(Track track)
@@ -180,7 +159,6 @@ public void RemoveTrack(Track track)
                 }
             }
             RecalculateLastTrackEnd();
-            OnTraceablePropertyChanged(previousValue, nameof(Tracks));
         }
 
         /// <summary>
@@ -210,7 +188,6 @@ public void RemoveTracks(IReadOnlyCollection<Track> tracksToRemove)
                 }
             }
             RecalculateLastTrackEnd();
-            OnTraceablePropertyChanged(previousValue, nameof(Tracks));
         }
         public Boolean MoveTracksPossible(IEnumerable<Track> tracksToMove, MoveDirection moveDirection)
         {
@@ -270,32 +247,9 @@ public void MoveTracks(IEnumerable<Track> tracksToMove, MoveDirection moveDirect
                         }
                     }
                 }
-
-                OnTraceablePropertyChanged(previousValue, nameof(Tracks));
-            }
-        }
-
-        public void StartRecording()
-        {
-            if (IsRecordingPossible.Any() == false)
-            {
-                RecordingStart = DateTime.UtcNow;
-                IsRecordingChanged?.Invoke(this, EventArgs.Empty);
             }
         }
 
-        public void StopRecording()
-        {
-            //Set end of last track
-            var lastTrack = Tracks.LastOrDefault();
-            if ((lastTrack != null) && (RecordingStart.HasValue))
-            {
-                lastTrack.End = DateTime.UtcNow - RecordingStart.Value;
-            }
-            RecordingStart = null;
-            IsRecordingChanged?.Invoke(this, EventArgs.Empty);
-        }
-
         public Boolean RecalculateLastTrackEnd()
         {
             //Try to recalculate length by recalculating last track
@@ -447,11 +401,6 @@ private void RecalculateTrackProperties(Track trackToCalculate)
             }            
         }
 
-        private void OnTraceablePropertyChanged(object? previousValue, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
-        {
-            TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, propertyName)));
-        }
-
         private void SwitchTracks(Track track1, Track track2)
         {
             var indexTrack1 = tracks.IndexOf(track1);
@@ -497,37 +446,5 @@ private void SwitchTracks(Track track1, Track track2)
                 }
             }
         }
-
-        /// <summary>
-        /// Method for checking if fire of events should be done
-        /// </summary>
-        /// <param name="previousValue">Previous value of the property firing events</param>
-        /// <param name="fireValidateablePropertyChanged">Fire OnValidateablePropertyChanged?</param>
-        /// <param name="fireTraceablePropertyChanged">Fire TraceablePropertyChanged?</param>
-        /// <param name="propertyName">Property firing the event</param>
-        /// <exception cref="NullReferenceException">If propertyName can not be found, an exception is thrown.</exception>
-        private void FireEvents(object? previousValue, Boolean fireValidateablePropertyChanged = true, Boolean fireTraceablePropertyChanged = true, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
-        {
-            var propertyInfo = GetType().GetProperty(propertyName);
-            if (propertyInfo != null)
-            {
-                var propertyValue = propertyInfo.GetValue(this);
-                if (Equals(propertyValue, previousValue) == false)
-                {
-                    if (fireValidateablePropertyChanged)
-                    {
-                        OnValidateablePropertyChanged(propertyName);
-                    }
-                    if (fireTraceablePropertyChanged)
-                    {
-                        OnTraceablePropertyChanged(previousValue, propertyName);
-                    }
-                }
-            }
-            else
-            {
-                throw new NullReferenceException(String.Format("Property {0} could not be found!", propertyName));
-            }
-        }
     }
 }
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 378a3b90..7f557e79 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -21,7 +21,6 @@ namespace AudioCuesheetEditor.Model.AudioCuesheet
 {
     public class Track : Validateable, ITraceable, ITrack
     {
-        /// <inheritdoc/>
         //TODO: Remove when ITraceable doesn't have event any more
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
         
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 7edc5aa2..4ad6a1b4 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -25,6 +25,8 @@ public class CuesheetManager(ITraceChangeManager traceChangeManager) : ICuesheet
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
 
+        public event EventHandler<Cuesheet>? IsRecordingChanged;
+
         //TODO: Tests
 
         /// <inheritdoc/>
@@ -33,17 +35,40 @@ public void SetProperty<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet,
             SetValue(cuesheet, propertyExpression, value);
         }
 
+        /// <inheritdoc/>
+        public Result IsRecordingPossible(Cuesheet cuesheet)
+        {
+            if (cuesheet.Tracks.Count != 0)
+            {
+                return Result.Failure(new Error(ErrorType.NotPossible, "Cuesheet already contains tracks!"));
+            }
+            return Result.Success();
+        }
+
         /// <inheritdoc/>
         public Result StartRecording(Cuesheet cuesheet)
         {
             if (cuesheet.IsRecording == true)
             {
-                //TODO
+                return Result.Failure(new Error(ErrorType.NotPossible, "Record is already running!"));
             }
             cuesheet.RecordingStart = DateTime.UtcNow;
+            IsRecordingChanged?.Invoke(this, cuesheet);
             return Result.Success();
         }
 
+        /// <inheritdoc/>
+        public void StopRecording(Cuesheet cuesheet)
+        {
+            var lastTrack = cuesheet.Tracks.LastOrDefault();
+            if ((lastTrack != null) && cuesheet.RecordingStart.HasValue)
+            {
+                lastTrack.End = DateTime.UtcNow - cuesheet.RecordingStart.Value;
+            }
+            cuesheet.RecordingStart = null;
+            IsRecordingChanged?.Invoke(this, cuesheet);
+        }
+
         void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
             if (propertyExpression.Body is not MemberExpression memberExpression)
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index de605c29..f0400c1e 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -23,6 +23,10 @@ namespace AudioCuesheetEditor.Services.AudioCuesheet
     /// </summary>
     public interface ICuesheetManager
     {
+        /// <summary>
+        /// Event propagated when recording on a cuesheet changes
+        /// </summary>
+        public event EventHandler<Cuesheet>? IsRecordingChanged;
         /// <summary>
         /// Set property for cuesheet
         /// </summary>
@@ -32,11 +36,23 @@ public interface ICuesheetManager
         /// <param name="value"></param>
         void SetProperty<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
         /// <summary>
+        /// Checks if recording for the cuesheet is possible
+        /// </summary>
+        /// <param name="cuesheet"></param>
+        /// <returns></returns>
+        Result IsRecordingPossible(Cuesheet cuesheet);
+        /// <summary>
         /// Starts recording on cuesheet
         /// </summary>
         /// <param name="cuesheet"></param>
         /// <returns></returns>
         Result StartRecording(Cuesheet cuesheet);
+        /// <summary>
+        /// Stop recording on cuesheet
+        /// </summary>
+        /// <param name="cuesheet"></param>
+        /// <returns></returns>
+        void StopRecording(Cuesheet cuesheet);
 
         //TODO: Add all methods from cuesheet here
     }
diff --git a/AudioCuesheetEditor/Services/Result.cs b/AudioCuesheetEditor/Services/Result.cs
index da870084..fac41830 100644
--- a/AudioCuesheetEditor/Services/Result.cs
+++ b/AudioCuesheetEditor/Services/Result.cs
@@ -23,7 +23,15 @@ public enum ErrorType
         /// <summary>
         /// Validation failed with error
         /// </summary>
-        ValidationFailed
+        ValidationFailed,
+        /// <summary>
+        /// Resource already exists
+        /// </summary>
+        AlreadyDone,
+        /// <summary>
+        /// Current action is not possible
+        /// </summary>
+        NotPossible
     }
 
     /// <summary>
diff --git a/AudioCuesheetEditor/Shared/Record/AddTrack.razor b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
index 102317a2..6e32b471 100644
--- a/AudioCuesheetEditor/Shared/Record/AddTrack.razor
+++ b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
@@ -21,6 +21,7 @@ along with Foobar.  If not, see
 @inject AutocompleteManager _autocompleteManager
 @inject ValidationService _validationService
 @inject ISessionStateContainer _sessionStateContainer
+@inject ICuesheetManager _cuesheetManager
 
 <MudCard Outlined>
     <MudCardContent>
@@ -82,29 +83,12 @@ along with Foobar.  If not, see
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
 
-    public Cuesheet? Cuesheet
-    {
-        get
-        {
-            if (CurrentViewMode == ViewMode.ImportView)
-            {
-                return _sessionStateContainer.ImportCuesheet;
-            }
-            return _sessionStateContainer.Cuesheet;
-        }
-    }
+    public Cuesheet Cuesheet => _sessionStateContainer.Cuesheet;
 
-    protected override void OnParametersSet()
+    protected override void OnInitialized()
     {
-        if (Cuesheet != null)
-        {
-            Cuesheet.IsRecordingChanged -= Cuesheet_IsRecordingChanged;
-        }
-        base.OnParametersSet();
-        if (Cuesheet != null)
-        {
-            Cuesheet.IsRecordingChanged += Cuesheet_IsRecordingChanged;
-        }
+        base.OnInitialized();
+        _cuesheetManager.IsRecordingChanged += CuesheetManager_IsRecordingChanged;
     }
 
     protected override async Task OnInitializedAsync()
@@ -123,7 +107,7 @@ along with Foobar.  If not, see
         base.Dispose(disposing);
         if (Cuesheet != null)
         {
-            Cuesheet.IsRecordingChanged -= Cuesheet_IsRecordingChanged;
+            _cuesheetManager.IsRecordingChanged -= CuesheetManager_IsRecordingChanged;
         }
         base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
     }
@@ -160,7 +144,7 @@ along with Foobar.  If not, see
         }
     }
 
-    void Cuesheet_IsRecordingChanged(object? sender, EventArgs args)
+    void CuesheetManager_IsRecordingChanged(object? sender, Cuesheet cuesheet)
     {
         StateHasChanged();
         artistInput?.ClearAsync();
diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
index 0d605db8..0d12891f 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
@@ -21,18 +21,16 @@ along with Foobar.  If not, see
 @inject IDialogService _dialogService
 @inject IBlazorDownloadFileService _blazorDownloadFileService
 @inject ISessionStateContainer _sessionStateContainer
+@inject ICuesheetManager _cuesheetManager
 
 @if (Cuesheet?.IsRecording == false)
 {
-    var recordingPossibleMessages = Cuesheet?.IsRecordingPossible;
-    if (recordingPossibleMessages?.Any() == true)
+    var result = _cuesheetManager.IsRecordingPossible(Cuesheet);
+    if (result.IsSuccess == false)
     {
         <MudAlert Severity="Severity.Warning" Variant="Variant.Filled">
             <MudText Typo="Typo.h4">@_localizer["Record not possible"]</MudText>
-            @foreach (var recordingPossibleMessage in recordingPossibleMessages)
-            {
-                <MudText>@_localizer[recordingPossibleMessage]</MudText>
-            }
+            <MudText>@_localizer[result.Error!.Message]</MudText>
         </MudAlert>
     }
 }
@@ -102,7 +100,7 @@ along with Foobar.  If not, see
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
 
-    public Boolean StartRecordingDisabled => startRecordTimer?.Enabled == true || Cuesheet?.IsRecordingPossible.Any() == true;
+    public Boolean StartRecordingDisabled => startRecordTimer?.Enabled == true || _cuesheetManager.IsRecordingPossible(Cuesheet!).IsSuccess == false;
 
     protected override void OnInitialized()
     {
@@ -125,14 +123,17 @@ along with Foobar.  If not, see
 
     void StartRecording()
     {
-        Cuesheet?.StartRecording();
-        updateGUITimer.Start();
-        Cuesheet!.Audiofile = null;
+        var result = _cuesheetManager.StartRecording(Cuesheet!);
+        if (result.IsSuccess)
+        {
+            updateGUITimer.Start();
+            Cuesheet!.Audiofile = null;
+        }
     }
 
     void StopRecording() 
     {
-        Cuesheet?.StopRecording();
+        _cuesheetManager.StopRecording(Cuesheet!);
     }
 
     async Task DisplayStartCountdownDialog()

From 33c69eb2c0ba8f7d0ad4030bd700ba4354283dc2 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 9 Apr 2026 09:21:31 +0200
Subject: [PATCH 033/150] Update ControlRecording.razor

---
 .../Shared/Record/ControlRecording.razor      | 85 +++++++++----------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
index 0d12891f..148ef6d6 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
@@ -23,28 +23,27 @@ along with Foobar.  If not, see
 @inject ISessionStateContainer _sessionStateContainer
 @inject ICuesheetManager _cuesheetManager
 
-@if (Cuesheet?.IsRecording == false)
+@if (Cuesheet.IsRecording == false)
 {
-    var result = _cuesheetManager.IsRecordingPossible(Cuesheet);
-    if (result.IsSuccess == false)
+    if (String.IsNullOrEmpty(_errorMessage) == false)
     {
         <MudAlert Severity="Severity.Warning" Variant="Variant.Filled">
             <MudText Typo="Typo.h4">@_localizer["Record not possible"]</MudText>
-            <MudText>@_localizer[result.Error!.Message]</MudText>
+            <MudText>@_localizer[_errorMessage]</MudText>
         </MudAlert>
     }
 }
 <MudCard Outlined>
     <MudCardContent>
-        @if (Cuesheet?.IsRecording == true)
+        @if (Cuesheet.IsRecording == true)
         {
             <MudAlert Severity="Severity.Info" Variant="Variant.Filled" ContentAlignment="HorizontalAlignment.Center">@_localizer["Recording!"]</MudAlert>
             <br />
         }
-        @if (startRecordTimer?.Enabled == true)
+        @if (_startRecordTimer?.Enabled == true)
         {
-            <MudAlert Severity="Severity.Warning" Variant="Variant.Filled" ContentAlignment="HorizontalAlignment.Center" ShowCloseIcon CloseIcon="@Icons.Material.Outlined.TimerOff" CloseIconClicked="() => startRecordTimer.Dispose()">
-                @_localizer["Record will start in {0} seconds!", ((startRecordTimer.Interval / 1000) - (DateTime.Now - recordTimerStarted).Seconds)]
+            <MudAlert Severity="Severity.Warning" Variant="Variant.Filled" ContentAlignment="HorizontalAlignment.Center" ShowCloseIcon CloseIcon="@Icons.Material.Outlined.TimerOff" CloseIconClicked="() => _startRecordTimer.Dispose()">
+                @_localizer["Record will start in {0} seconds!", ((_startRecordTimer.Interval / 1000) - (DateTime.Now - _recordTimerStarted).Seconds)]
             </MudAlert>
             <br />
         }
@@ -60,7 +59,7 @@ along with Foobar.  If not, see
                     <MudMenuItem Disabled="StartRecordingDisabled" OnClick="DisplayStartCountdownDialog">@_localizer["Enter countdown timer"]</MudMenuItem>
                 </MudMenu>
             </MudButtonGroup>
-            @if (Cuesheet?.RecordingStart.HasValue == true)
+            @if ((Cuesheet.IsRecording) && (Cuesheet.RecordingStart.HasValue))
             {
                 var recordingTime = DateTime.UtcNow - Cuesheet.RecordingStart;
                 recordingTime = recordingTime.Value.Subtract(new TimeSpan(0, 0, 0, 0, recordingTime.Value.Milliseconds));
@@ -71,69 +70,69 @@ along with Foobar.  If not, see
                 <MudText Typo="Typo.h5">@String.Format("--{0}--{1}--", CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator, CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator)</MudText>
             }
             <MudHidden Breakpoint="Breakpoint.SmAndUp" Invert>
-                <MudButton Color="Color.Warning" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet?.IsRecording == false" OnClick="StopRecording" aria-label="@_localizer["Stop recording"]">@_localizer["Stop recording"]</MudButton>
+                <MudButton Color="Color.Warning" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet.IsRecording == false" OnClick="StopRecording" aria-label="@_localizer["Stop recording"]">@_localizer["Stop recording"]</MudButton>
             </MudHidden>
             <MudHidden Breakpoint="Breakpoint.SmAndUp">
-                <MudIconButton Color="Color.Warning" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet?.IsRecording == false" OnClick="StopRecording" aria-label="@_localizer["Stop recording"]" />
+                <MudIconButton Color="Color.Warning" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet.IsRecording == false" OnClick="StopRecording" aria-label="@_localizer["Stop recording"]" />
             </MudHidden>
         </MudStack>
     </MudCardContent>
 </MudCard>
 
 @code {
-    Timer updateGUITimer = new(500);
-    Timer? startRecordTimer;
-    DateTime recordTimerStarted;
+    Timer _updateGUITimer = new(500);
+    Timer? _startRecordTimer;
+    DateTime _recordTimerStarted;
+    string? _errorMessage = null;
 
-    public Cuesheet? Cuesheet
-    {
-        get
-        {
-            if (CurrentViewMode == ViewMode.ImportView)
-            {
-                return _sessionStateContainer.ImportCuesheet;
-            }
-            return _sessionStateContainer.Cuesheet;
-        }
-    }
+    public Cuesheet Cuesheet => _sessionStateContainer.Cuesheet;
 
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
 
-    public Boolean StartRecordingDisabled => startRecordTimer?.Enabled == true || _cuesheetManager.IsRecordingPossible(Cuesheet!).IsSuccess == false;
+    public Boolean StartRecordingDisabled => _startRecordTimer?.Enabled == true || _cuesheetManager.IsRecordingPossible(Cuesheet).IsSuccess == false;
 
     protected override void OnInitialized()
     {
         base.OnInitialized();
-        updateGUITimer.AutoReset = true;
-        updateGUITimer.Elapsed += delegate
+        _updateGUITimer.AutoReset = true;
+        _updateGUITimer.Elapsed += delegate
         {
             StateHasChanged();
             Boolean startRecordTimeEnabled = false;
-            if (startRecordTimer != null)
+            if (_startRecordTimer != null)
             {
-                startRecordTimeEnabled = startRecordTimer.Enabled;
+                startRecordTimeEnabled = _startRecordTimer.Enabled;
             }
-            if ((startRecordTimeEnabled == false) && (Cuesheet?.IsRecording == false))
+            if ((startRecordTimeEnabled == false) && (Cuesheet.IsRecording == false))
             {
-                updateGUITimer.Stop();
+                _updateGUITimer.Stop();
             }
         };
+        var result = _cuesheetManager.IsRecordingPossible(Cuesheet);
+        if (result.IsSuccess == false)
+        {
+            _errorMessage = result.Error!.Message;
+        }
     }
 
     void StartRecording()
     {
-        var result = _cuesheetManager.StartRecording(Cuesheet!);
+        var result = _cuesheetManager.StartRecording(Cuesheet);
         if (result.IsSuccess)
         {
-            updateGUITimer.Start();
-            Cuesheet!.Audiofile = null;
+            _updateGUITimer.Start();
+            Cuesheet.Audiofile = null;
+        }
+        else
+        {
+            _errorMessage = result.Error!.Message;
         }
     }
 
     void StopRecording() 
     {
-        _cuesheetManager.StopRecording(Cuesheet!);
+        _cuesheetManager.StopRecording(Cuesheet);
     }
 
     async Task DisplayStartCountdownDialog()
@@ -144,16 +143,16 @@ along with Foobar.  If not, see
         var recordCountdownTimer = result?.Data as uint?;
         if ((result?.Canceled == false) && (recordCountdownTimer.HasValue))
         {
-            startRecordTimer = new Timer(recordCountdownTimer.Value * 1000);
-            startRecordTimer.Elapsed += delegate
+            _startRecordTimer = new Timer(recordCountdownTimer.Value * 1000);
+            _startRecordTimer.Elapsed += delegate
             {
                 StartRecording();
-                startRecordTimer.Stop();
-                startRecordTimer.Dispose();
+                _startRecordTimer.Stop();
+                _startRecordTimer.Dispose();
             };
-            startRecordTimer.Start();
-            updateGUITimer.Start();
-            recordTimerStarted = DateTime.Now;
+            _startRecordTimer.Start();
+            _updateGUITimer.Start();
+            _recordTimerStarted = DateTime.Now;
         }
     }
 }

From b159e0cc3729bb1584fe155fff652136ea9b4ed7 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 9 Apr 2026 10:21:29 +0200
Subject: [PATCH 034/150] moved handling of tracks

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 168 ++----------------
 .../Services/AudioCuesheet/CuesheetManager.cs |  55 ++++++
 .../AudioCuesheet/ICuesheetManager.cs         |  27 ++-
 .../Services/AudioCuesheet/TrackManager.cs    |  46 ++---
 .../Services/IO/ImportManager.cs              |   5 +-
 .../Shared/Record/AddTrack.razor              |   4 +-
 .../Shared/TrackList/TrackList.razor          |  13 +-
 7 files changed, 137 insertions(+), 181 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index dbc029c5..1c116a9c 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -36,22 +36,7 @@ public class Cuesheet() : Validateable, ITraceable, ICuesheet
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
 
         [JsonInclude]
-        public IReadOnlyCollection<Track> Tracks
-        {
-            get => tracks.AsReadOnly();
-            private set
-            {
-                foreach (var track in tracks)
-                {
-                    track.Cuesheet = null;
-                }
-                tracks = [.. value];
-                foreach (var track in tracks)
-                {
-                    track.Cuesheet = this;
-                }
-            }
-        }
+        public ICollection<Track> Tracks { get; set; } = [];
 
         public String? Artist { get; set; }
         
@@ -72,123 +57,6 @@ private set
         [JsonIgnore]
         public Boolean IsImporting { get; set; }
 
-        /// <summary>
-        /// Get the previous linked track of a track object
-        /// </summary>
-        /// <param name="track">Track object to get the previous link to</param>
-        /// <returns>Previous linked track or null (if not linked)</returns>
-        public Track? GetPreviousLinkedTrack(Track track)
-        {
-            Track? previousLinkedTrack = null;
-            if (track.IsLinkedToPreviousTrack)
-            {
-                var index = tracks.IndexOf(track);
-                if (index > 0)
-                {
-                    previousLinkedTrack = tracks.ElementAt(index - 1);
-                }
-            }
-            return previousLinkedTrack;
-        }
-
-        /// <summary>
-        /// Get next linked track that is linked to the parameter track
-        /// </summary>
-        /// <param name="track"></param>
-        /// <returns></returns>
-        public Track? GetNextLinkedTrack(Track track)
-        {
-            Track? nextLinkedTrack = null;
-            {
-                var index = tracks.IndexOf(track);
-                if (index + 1 < tracks.Count)
-                {
-                    var nextTrack = tracks.ElementAt(index + 1);
-                    if (nextTrack.IsLinkedToPreviousTrack)
-                    {
-                        nextLinkedTrack = nextTrack;
-                    }
-                }
-            }
-            return nextLinkedTrack;
-        }
-
-        public void AddTrack(Track track)
-        {
-            var previousValue = new List<Track>(tracks);
-            if (IsRecording && RecordingStart.HasValue)
-            {
-                track.Begin = DateTime.UtcNow - RecordingStart.Value;
-            }
-            tracks.Add(track);
-            track.Cuesheet = this;
-            RecalculateTrackProperties(track);
-        }
-
-        public void RemoveTrack(Track track)
-        {
-            var index = tracks.IndexOf(track);
-            Track? nextTrack = null;
-            if ((index + 1) < tracks.Count)
-            {
-                if (tracks.ElementAt(index + 1).IsLinkedToPreviousTrack)
-                {
-                    nextTrack = tracks.ElementAt(index + 1);
-                }
-            }
-            var previousValue = new List<Track>();
-            //TODO
-            //tracks.ForEach(x => previousValue.Add(new Track(x)));
-            tracks.Remove(track);
-            track.Cuesheet = null;
-            //If Tracks are linked, we need to set the linked track again
-            if (nextTrack != null)
-            {
-                index = tracks.IndexOf(nextTrack);
-                if (index > 0)
-                {
-                    var previousTrack = tracks.ElementAt(index - 1);
-                    if (previousTrack.Position.HasValue)
-                    {
-                        nextTrack.Position = previousTrack.Position.Value + 1;
-                    }
-                    if (previousTrack.End.HasValue)
-                    {
-                        nextTrack.Begin = previousTrack.End.Value;
-                    }
-                }
-            }
-            RecalculateLastTrackEnd();
-        }
-
-        /// <summary>
-        /// Remove selected tracks
-        /// </summary>
-        /// <param name="tracksToRemove">Selected tracks to remove (can not be null, only empty)</param>
-        public void RemoveTracks(IReadOnlyCollection<Track> tracksToRemove)
-        {
-            var previousValue = new List<Track>();
-            //TODO
-            //tracks.ForEach(x => previousValue.Add(new Track(x)));
-            var intersection = tracks.Intersect(tracksToRemove);
-            tracks = [.. tracks.Except(intersection)];
-            foreach (var track in tracks)
-            {
-                if (track.IsLinkedToPreviousTrack)
-                {
-                    track.Position = (uint)tracks.IndexOf(track) + 1;
-                }
-                var previousTrack = GetPreviousLinkedTrack(track);
-                if (previousTrack != null)
-                {
-                    if (previousTrack.End.HasValue)
-                    {
-                        track.Begin = previousTrack.End;
-                    }
-                }
-            }
-            RecalculateLastTrackEnd();
-        }
         public Boolean MoveTracksPossible(IEnumerable<Track> tracksToMove, MoveDirection moveDirection)
         {
             lock (syncLock)
@@ -422,27 +290,29 @@ private void SwitchTracks(Track track1, Track track2)
                 {
                     track1.Begin = track2.Begin;
                     (track2.End, track1.End) = (track1.End, track2.End);
-                    if (track2.IsLinkedToPreviousTrack)
-                    {
-                        var previousTrack = GetPreviousLinkedTrack(track2);
-                        if ((previousTrack != null) && (previousTrack.End.HasValue))
-                        {
-                            track2.Begin = previousTrack.End;
-                        }
-                    }
+                    //TODO
+                    //if (track2.IsLinkedToPreviousTrack)
+                    //{
+                    //    var previousTrack = GetPreviousLinkedTrack(track2);
+                    //    if ((previousTrack != null) && (previousTrack.End.HasValue))
+                    //    {
+                    //        track2.Begin = previousTrack.End;
+                    //    }
+                    //}
                 }
                 else
                 {
                     track2.Begin = track1.Begin;
                     (track1.End, track2.End) = (track2.End, track1.End);
-                    if (track1.IsLinkedToPreviousTrack)
-                    {
-                        var previousTrack = GetPreviousLinkedTrack(track1);
-                        if ((previousTrack != null) && (previousTrack.End.HasValue))
-                        {
-                            track1.Begin = previousTrack.End;
-                        }
-                    }
+                    //TODO
+                    //if (track1.IsLinkedToPreviousTrack)
+                    //{
+                    //    var previousTrack = GetPreviousLinkedTrack(track1);
+                    //    if ((previousTrack != null) && (previousTrack.End.HasValue))
+                    //    {
+                    //        track1.Begin = previousTrack.End;
+                    //    }
+                    //}
                 }
             }
         }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 4ad6a1b4..64532303 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -69,6 +69,60 @@ public void StopRecording(Cuesheet cuesheet)
             IsRecordingChanged?.Invoke(this, cuesheet);
         }
 
+        /// <inheritdoc/>
+        public Track? GetPreviousLinkedTrack(Cuesheet cuesheet, Track track)
+        {
+            Track? previousLinkedTrack = null;
+            if (track.IsLinkedToPreviousTrack && track.Position.HasValue)
+            {
+                if (track.Position.Value > 1)
+                {
+                    previousLinkedTrack = cuesheet.Tracks.SingleOrDefault(x => x.Position == track.Position.Value - 1);
+                }
+            }
+            return previousLinkedTrack;
+        }
+
+        /// <inheritdoc/>
+        public Track? GetNextLinkedTrack(Cuesheet cuesheet, Track track)
+        {
+            Track? nextLinkedTrack = null;
+            if (track.Position.HasValue)
+            {
+                nextLinkedTrack = cuesheet.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
+            }
+            return nextLinkedTrack;
+        }
+
+        /// <inheritdoc/>
+        public void AddTrack(Cuesheet cuesheet, Track track)
+        {
+            var newValue = new List<Track>(cuesheet.Tracks)
+            {
+                track
+            };
+            SetValue(cuesheet, x => x.Tracks, newValue);
+            //TODO: calculate track begin when cuesheet is recording
+            //TODO: recalculate track properties like Cuesheet.RecalculateTrackProperties did
+        }
+
+        /// <inheritdoc/>
+        public void RemoveTracks(Cuesheet cuesheet, IEnumerable<Track> tracksToRemove)
+        {
+            var intersection = cuesheet.Tracks.Intersect(tracksToRemove);
+            ICollection<Track> newValue = [.. cuesheet.Tracks.Except(intersection)];
+            SetValue(cuesheet, x => x.Tracks, newValue);
+            //TODO: calculate position and begin of all tracks
+            //TODO: calculate last track end Cuesheet.RecalculateTrackProperties did
+        }
+
+        /// <inheritdoc/>
+        public bool MoveTracksPossible(Cuesheet cuesheet, IEnumerable<Track> tracksToMove, bool moveUp)
+        {
+            //TODO
+            throw new NotImplementedException();
+        }
+
         void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
             if (propertyExpression.Body is not MemberExpression memberExpression)
@@ -91,5 +145,6 @@ void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>
 
             _traceChangeManager.AddChange(new(cuesheet, new(previousValue, propertyInfo.Name)));
         }
+
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index f0400c1e..d91f959e 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -53,7 +53,32 @@ public interface ICuesheetManager
         /// <param name="cuesheet"></param>
         /// <returns></returns>
         void StopRecording(Cuesheet cuesheet);
-
+        /// <summary>
+        /// Get the previous linked track of a track object
+        /// </summary>
+        /// <param name="cuesheet">Cuesheet to get the previous linked track from</param>
+        /// <param name="track">Track object to get the previous link to</param>
+        /// <returns>Previous linked track or null (if not linked)</returns>
+        Track? GetPreviousLinkedTrack(Cuesheet cuesheet, Track track);
+        /// <summary>
+        /// Get next linked track that is linked to the parameter track
+        /// </summary>
+        /// <param name="cuesheet"></param>
+        /// <param name="track"></param>
+        /// <returns></returns>
+        Track? GetNextLinkedTrack(Cuesheet cuesheet, Track track);
+        /// <summary>
+        /// Adds a track to the cuesheet
+        /// </summary>
+        /// <param name="cuesheet"></param>
+        /// <param name="track"></param>
+        void AddTrack(Cuesheet cuesheet, Track track);
+        /// <summary>
+        /// Remove tracks from cuesheet
+        /// </summary>
+        /// <param name="cuesheet"></param>
+        /// <param name="tracksToRemove"></param>
+        void RemoveTracks(Cuesheet cuesheet, IEnumerable<Track> tracksToRemove);
         //TODO: Add all methods from cuesheet here
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 5445d649..b20317a7 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -21,9 +21,10 @@
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
     /// <inheritdoc/>
-    public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManager
+    public class TrackManager(ITraceChangeManager traceChangeManager, ICuesheetManager cuesheetManager) : ITrackManager
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+        private readonly ICuesheetManager _cuesheetManager = cuesheetManager;
 
         //TODO: Tests
 
@@ -110,32 +111,35 @@ void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propert
             _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
         }
 
-        static void RecalculateLinkedProperties(Track track)
+        void RecalculateLinkedProperties(Track track)
         {
-            var previousTrack = track.Cuesheet?.GetPreviousLinkedTrack(track);
-            if (previousTrack != null)
+            if (track.Cuesheet != null)
             {
-                if (track.Position.HasValue && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
+                var previousTrack = _cuesheetManager.GetPreviousLinkedTrack(track.Cuesheet, track);
+                if (previousTrack != null)
                 {
-                    track.Position = previousTrack.Position.Value + 1;
+                    if (track.Position.HasValue && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
+                    {
+                        track.Position = previousTrack.Position.Value + 1;
+                    }
+                    if (previousTrack.End.HasValue && (track.Begin != previousTrack.End))
+                    {
+                        track.Begin = previousTrack.End;
+                    }
+                    if ((previousTrack.End.HasValue == false) && track.Begin.HasValue)
+                    {
+                        previousTrack.End = track.Begin;
+                    }
                 }
-                if (previousTrack.End.HasValue && (track.Begin != previousTrack.End))
+                var nextTrack = _cuesheetManager.GetNextLinkedTrack(track.Cuesheet, track);
+                if (nextTrack != null)
                 {
-                    track.Begin = previousTrack.End;
+                    if (track.Position.HasValue)
+                    {
+                        nextTrack.Position = track.Position.Value + 1;
+                    }
+                    nextTrack.Begin = track.End;
                 }
-                if ((previousTrack.End.HasValue == false) && track.Begin.HasValue)
-                {
-                    previousTrack.End = track.Begin;
-                }
-            }
-            var nextTrack = track.Cuesheet?.GetNextLinkedTrack(track);
-            if (nextTrack != null)
-            {
-                if (track.Position.HasValue)
-                {
-                    nextTrack.Position = track.Position.Value + 1;
-                }
-                nextTrack.Begin = track.End;
             }
         }
     }
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index fe25be1b..b7898c4c 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -32,7 +32,7 @@ public enum ImportFileType
         Textfile,
         Audiofile
     }
-    public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService, ITrackManager trackManager, ILogger<ImportManager> logger)
+    public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService, ITrackManager trackManager, ICuesheetManager cuesheetManager, ILogger<ImportManager> logger)
     {
         public event EventHandler<IEnumerable<string>>? UploadFilesFinished;
 
@@ -42,6 +42,7 @@ public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceC
         private readonly IFileInputManager _fileInputManager = fileInputManager;
         private readonly ITextImportService _textImportService = textImportService;
         private readonly ITrackManager _trackManager = trackManager;
+        private readonly ICuesheetManager _cuesheetManager = cuesheetManager;
 
         public void ImportData(String? data)
         {
@@ -231,7 +232,7 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
                             }
                         }
                     }
-                    target.AddTrack(track);
+                    _cuesheetManager.AddTrack(target, track);
                 }
             }
             else
diff --git a/AudioCuesheetEditor/Shared/Record/AddTrack.razor b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
index 6e32b471..1eaaee03 100644
--- a/AudioCuesheetEditor/Shared/Record/AddTrack.razor
+++ b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
@@ -130,9 +130,9 @@ along with Foobar.  If not, see
 
     async Task AddTrackAsync()
     {
-        if (Cuesheet?.IsRecording == true)
+        if (Cuesheet.IsRecording == true)
         {
-            Cuesheet?.AddTrack(currentRecordingTrack);
+            _cuesheetManager.AddTrack(Cuesheet, currentRecordingTrack);
             currentRecordingTrack = new()
             {
                 IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 88262e28..ecbf8795 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -27,6 +27,7 @@ along with Foobar.  If not, see
 @inject IDialogService _dialogService
 @inject ISessionStateContainer _sessionStateContainer
 @inject ITrackManager _trackManager
+@inject ICuesheetManager _cuesheetManager
 
 @switch (CurrentViewMode)
 {
@@ -63,7 +64,7 @@ along with Foobar.  If not, see
             <SelectColumn Hidden="CurrentViewMode == ViewMode.RecordView" />
             <TemplateColumn Title="@_localizer["Controls"]" Hidden="CurrentViewMode != ViewMode.RecordView">
                 <EditTemplate>
-                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => Cuesheet?.RemoveTrack(context.Item)" />
+                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracks(Cuesheet!, [context.Item])" />
                 </EditTemplate>
             </TemplateColumn>
             <PropertyColumn Property="x => x.Position" Title="#" Editable="CurrentViewMode != ViewMode.RecordView" HeaderStyle="width: 1px;">
@@ -131,7 +132,7 @@ along with Foobar.  If not, see
     }
 </MudMenu>
 
-@code {
+    @code {
     //TODO: Disallow editing of position
     HashSet<Track> selectedTracks = new();
     MudMenu? trackContextMenu;
@@ -177,7 +178,7 @@ along with Foobar.  If not, see
         {
             IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
         };
-        Cuesheet?.AddTrack(newTrack);
+        _cuesheetManager.AddTrack(Cuesheet!, newTrack);
         TraceChangeManager.TraceChanges(newTrack);
     }
 
@@ -188,7 +189,7 @@ along with Foobar.  If not, see
 
     void DeleteSelectedTracksClicked()
     {
-        Cuesheet?.RemoveTracks(selectedTracks.ToList());
+        _cuesheetManager.RemoveTracks(Cuesheet!, selectedTracks);
         selectedTracks.Clear();
     }
 
@@ -202,7 +203,7 @@ along with Foobar.  If not, see
         var result = await dialog.Result;
         if (result?.Canceled == false)
         {
-            Cuesheet?.RemoveTracks(Cuesheet.Tracks);
+            _cuesheetManager.RemoveTracks(Cuesheet!, Cuesheet!.Tracks);
             selectedTracks.Clear();
         }
     }
@@ -236,7 +237,7 @@ along with Foobar.  If not, see
         if (trackThatWillBeCopied != null)
         {
             var copy = _trackManager.Clone(trackThatWillBeCopied);
-            Cuesheet?.AddTrack(copy);
+            _cuesheetManager.AddTrack(Cuesheet!, copy);
             TraceChangeManager.TraceChanges(copy);
             await EditTrackModalClicked(copy);
         }

From da670ff7d93e5d18059de2132ce050cebe18c865 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 9 Apr 2026 11:33:32 +0200
Subject: [PATCH 035/150] only use current cuesheet

---
 .../Services/AudioCuesheet/CuesheetManager.cs | 51 ++++++++++---------
 .../AudioCuesheet/ICuesheetManager.cs         | 21 ++++----
 .../Services/AudioCuesheet/TrackManager.cs    |  4 +-
 .../Services/IO/ImportManager.cs              |  2 +-
 .../Shared/Cuesheet/CuesheetData.razor        | 10 ++--
 .../Shared/Record/AddTrack.razor              |  4 +-
 .../Shared/Record/ControlRecording.razor      |  8 +--
 .../Shared/TrackList/TrackList.razor          | 10 ++--
 8 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 64532303..4537409f 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -21,82 +21,89 @@
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
     /// <inheritdoc/>
-    public class CuesheetManager(ITraceChangeManager traceChangeManager) : ICuesheetManager
+    public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionStateContainer sessionStateContainer) : ICuesheetManager
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+        private readonly ISessionStateContainer _sessionStateContainer = sessionStateContainer;
 
-        public event EventHandler<Cuesheet>? IsRecordingChanged;
+        public event EventHandler? IsRecordingChanged;
 
         //TODO: Tests
 
         /// <inheritdoc/>
-        public void SetProperty<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
+        public void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
-            SetValue(cuesheet, propertyExpression, value);
+            SetValue(_sessionStateContainer.Cuesheet, propertyExpression, value);
         }
 
         /// <inheritdoc/>
-        public Result IsRecordingPossible(Cuesheet cuesheet)
+        public Result IsRecordingPossible
         {
-            if (cuesheet.Tracks.Count != 0)
+            get
             {
-                return Result.Failure(new Error(ErrorType.NotPossible, "Cuesheet already contains tracks!"));
+                if (_sessionStateContainer.Cuesheet.Tracks.Count != 0)
+                {
+                    return Result.Failure(new Error(ErrorType.NotPossible, "Cuesheet already contains tracks!"));
+                }
+                return Result.Success();
             }
-            return Result.Success();
         }
 
         /// <inheritdoc/>
-        public Result StartRecording(Cuesheet cuesheet)
+        public Result StartRecording()
         {
+            var cuesheet = _sessionStateContainer.Cuesheet;
             if (cuesheet.IsRecording == true)
             {
                 return Result.Failure(new Error(ErrorType.NotPossible, "Record is already running!"));
             }
             cuesheet.RecordingStart = DateTime.UtcNow;
-            IsRecordingChanged?.Invoke(this, cuesheet);
+            IsRecordingChanged?.Invoke(this, EventArgs.Empty);
             return Result.Success();
         }
 
         /// <inheritdoc/>
-        public void StopRecording(Cuesheet cuesheet)
+        public void StopRecording()
         {
+            var cuesheet = _sessionStateContainer.Cuesheet;
             var lastTrack = cuesheet.Tracks.LastOrDefault();
             if ((lastTrack != null) && cuesheet.RecordingStart.HasValue)
             {
                 lastTrack.End = DateTime.UtcNow - cuesheet.RecordingStart.Value;
             }
             cuesheet.RecordingStart = null;
-            IsRecordingChanged?.Invoke(this, cuesheet);
+            IsRecordingChanged?.Invoke(this, EventArgs.Empty);
         }
 
         /// <inheritdoc/>
-        public Track? GetPreviousLinkedTrack(Cuesheet cuesheet, Track track)
+        public Track? GetPreviousLinkedTrack(Track track)
         {
             Track? previousLinkedTrack = null;
             if (track.IsLinkedToPreviousTrack && track.Position.HasValue)
             {
                 if (track.Position.Value > 1)
                 {
-                    previousLinkedTrack = cuesheet.Tracks.SingleOrDefault(x => x.Position == track.Position.Value - 1);
+                    previousLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value - 1);
                 }
             }
             return previousLinkedTrack;
         }
 
         /// <inheritdoc/>
-        public Track? GetNextLinkedTrack(Cuesheet cuesheet, Track track)
+        public Track? GetNextLinkedTrack(Track track)
         {
             Track? nextLinkedTrack = null;
             if (track.Position.HasValue)
             {
-                nextLinkedTrack = cuesheet.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
+                nextLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
             }
             return nextLinkedTrack;
         }
 
         /// <inheritdoc/>
-        public void AddTrack(Cuesheet cuesheet, Track track)
+        public void AddTrack(Track track)
         {
+            var cuesheet = _sessionStateContainer.Cuesheet;
             var newValue = new List<Track>(cuesheet.Tracks)
             {
                 track
@@ -107,8 +114,9 @@ public void AddTrack(Cuesheet cuesheet, Track track)
         }
 
         /// <inheritdoc/>
-        public void RemoveTracks(Cuesheet cuesheet, IEnumerable<Track> tracksToRemove)
+        public void RemoveTracks(IEnumerable<Track> tracksToRemove)
         {
+            var cuesheet = _sessionStateContainer.Cuesheet;
             var intersection = cuesheet.Tracks.Intersect(tracksToRemove);
             ICollection<Track> newValue = [.. cuesheet.Tracks.Except(intersection)];
             SetValue(cuesheet, x => x.Tracks, newValue);
@@ -116,13 +124,6 @@ public void RemoveTracks(Cuesheet cuesheet, IEnumerable<Track> tracksToRemove)
             //TODO: calculate last track end Cuesheet.RecalculateTrackProperties did
         }
 
-        /// <inheritdoc/>
-        public bool MoveTracksPossible(Cuesheet cuesheet, IEnumerable<Track> tracksToMove, bool moveUp)
-        {
-            //TODO
-            throw new NotImplementedException();
-        }
-
         void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
             if (propertyExpression.Body is not MemberExpression memberExpression)
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index d91f959e..068a35c4 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -26,7 +26,7 @@ public interface ICuesheetManager
         /// <summary>
         /// Event propagated when recording on a cuesheet changes
         /// </summary>
-        public event EventHandler<Cuesheet>? IsRecordingChanged;
+        public event EventHandler? IsRecordingChanged;
         /// <summary>
         /// Set property for cuesheet
         /// </summary>
@@ -34,51 +34,48 @@ public interface ICuesheetManager
         /// <param name="cuesheet"></param>
         /// <param name="propertyExpression"></param>
         /// <param name="value"></param>
-        void SetProperty<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
+        void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
         /// <summary>
         /// Checks if recording for the cuesheet is possible
         /// </summary>
-        /// <param name="cuesheet"></param>
         /// <returns></returns>
-        Result IsRecordingPossible(Cuesheet cuesheet);
+        Result IsRecordingPossible { get; }
         /// <summary>
         /// Starts recording on cuesheet
         /// </summary>
-        /// <param name="cuesheet"></param>
         /// <returns></returns>
-        Result StartRecording(Cuesheet cuesheet);
+        Result StartRecording();
         /// <summary>
         /// Stop recording on cuesheet
         /// </summary>
-        /// <param name="cuesheet"></param>
         /// <returns></returns>
-        void StopRecording(Cuesheet cuesheet);
+        void StopRecording();
         /// <summary>
         /// Get the previous linked track of a track object
         /// </summary>
         /// <param name="cuesheet">Cuesheet to get the previous linked track from</param>
         /// <param name="track">Track object to get the previous link to</param>
         /// <returns>Previous linked track or null (if not linked)</returns>
-        Track? GetPreviousLinkedTrack(Cuesheet cuesheet, Track track);
+        Track? GetPreviousLinkedTrack(Track track);
         /// <summary>
         /// Get next linked track that is linked to the parameter track
         /// </summary>
         /// <param name="cuesheet"></param>
         /// <param name="track"></param>
         /// <returns></returns>
-        Track? GetNextLinkedTrack(Cuesheet cuesheet, Track track);
+        Track? GetNextLinkedTrack(Track track);
         /// <summary>
         /// Adds a track to the cuesheet
         /// </summary>
         /// <param name="cuesheet"></param>
         /// <param name="track"></param>
-        void AddTrack(Cuesheet cuesheet, Track track);
+        void AddTrack(Track track);
         /// <summary>
         /// Remove tracks from cuesheet
         /// </summary>
         /// <param name="cuesheet"></param>
         /// <param name="tracksToRemove"></param>
-        void RemoveTracks(Cuesheet cuesheet, IEnumerable<Track> tracksToRemove);
+        void RemoveTracks(IEnumerable<Track> tracksToRemove);
         //TODO: Add all methods from cuesheet here
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index b20317a7..f16bd147 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -115,7 +115,7 @@ void RecalculateLinkedProperties(Track track)
         {
             if (track.Cuesheet != null)
             {
-                var previousTrack = _cuesheetManager.GetPreviousLinkedTrack(track.Cuesheet, track);
+                var previousTrack = _cuesheetManager.GetPreviousLinkedTrack(track);
                 if (previousTrack != null)
                 {
                     if (track.Position.HasValue && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
@@ -131,7 +131,7 @@ void RecalculateLinkedProperties(Track track)
                         previousTrack.End = track.Begin;
                     }
                 }
-                var nextTrack = _cuesheetManager.GetNextLinkedTrack(track.Cuesheet, track);
+                var nextTrack = _cuesheetManager.GetNextLinkedTrack(track);
                 if (nextTrack != null)
                 {
                     if (track.Position.HasValue)
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index b7898c4c..595b1847 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -232,7 +232,7 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
                             }
                         }
                     }
-                    _cuesheetManager.AddTrack(target, track);
+                    target.Tracks.Add(track);
                 }
             }
             else
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index 3b4ef579..94eea173 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -27,9 +27,9 @@ along with Foobar.  If not, see
 @if (Cuesheet != null)
 {
     <MudForm @ref="form" Model="Cuesheet">
-        <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetProperty(Cuesheet, x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
+        <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
                       Placeholder="@_localizer["Enter the cuesheet artist here"]" Variant="Variant.Outlined" />
-        <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetProperty(Cuesheet, x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
+        <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
                       Placeholder="@_localizer["Enter the cuesheet title here"]" Variant="Variant.Outlined" />
         @switch(CurrentViewMode)
         {
@@ -39,7 +39,7 @@ along with Foobar.  If not, see
                            Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" />
                 <FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile" 
                            Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
-                <MudTextField @ref="catalogueNumberTextField" Text="@Cuesheet.Cataloguenumber" TextChanged="(newValue) => _cuesheetManager.SetProperty(Cuesheet, x => x.Cataloguenumber, newValue)" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
+                <MudTextField @ref="catalogueNumberTextField" Text="@Cuesheet.Cataloguenumber" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue)" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
                               Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined"
                               Mask="@(new PatternMask("00 00000 00000 0"))" OnBlur="CataloguenumberOnBlur" />
                 break;
@@ -117,7 +117,7 @@ along with Foobar.  If not, see
                 var fileUpload = await _fileInputManager.CreateFileUploadsAsync([browserFile], fileInputAudiofileId);
                 audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
             }
-            _cuesheetManager.SetProperty(Cuesheet, x => x.Audiofile, audiofile);
+            _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
             //TODO: Include into cuesheetmanager
             if (Cuesheet.RecalculateLastTrackEnd())
             {
@@ -166,7 +166,7 @@ along with Foobar.  If not, see
             {
                 newValue = _fileInputManager.CreateCDTextfile(browserFile.ContentType, browserFile.Name);
             }
-            _cuesheetManager.SetProperty(Cuesheet, x => x.CDTextfile, newValue);
+            _cuesheetManager.SetProperty(x => x.CDTextfile, newValue);
         }
         catch (ArgumentException ae)
         {
diff --git a/AudioCuesheetEditor/Shared/Record/AddTrack.razor b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
index 1eaaee03..14ee4278 100644
--- a/AudioCuesheetEditor/Shared/Record/AddTrack.razor
+++ b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
     {
         if (Cuesheet.IsRecording == true)
         {
-            _cuesheetManager.AddTrack(Cuesheet, currentRecordingTrack);
+            _cuesheetManager.AddTrack(currentRecordingTrack);
             currentRecordingTrack = new()
             {
                 IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
@@ -144,7 +144,7 @@ along with Foobar.  If not, see
         }
     }
 
-    void CuesheetManager_IsRecordingChanged(object? sender, Cuesheet cuesheet)
+    void CuesheetManager_IsRecordingChanged(object? sender, EventArgs args)
     {
         StateHasChanged();
         artistInput?.ClearAsync();
diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
index 148ef6d6..4badfa39 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
@@ -90,7 +90,7 @@ along with Foobar.  If not, see
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
 
-    public Boolean StartRecordingDisabled => _startRecordTimer?.Enabled == true || _cuesheetManager.IsRecordingPossible(Cuesheet).IsSuccess == false;
+    public Boolean StartRecordingDisabled => _startRecordTimer?.Enabled == true || _cuesheetManager.IsRecordingPossible.IsSuccess == false;
 
     protected override void OnInitialized()
     {
@@ -109,7 +109,7 @@ along with Foobar.  If not, see
                 _updateGUITimer.Stop();
             }
         };
-        var result = _cuesheetManager.IsRecordingPossible(Cuesheet);
+        var result = _cuesheetManager.IsRecordingPossible;
         if (result.IsSuccess == false)
         {
             _errorMessage = result.Error!.Message;
@@ -118,7 +118,7 @@ along with Foobar.  If not, see
 
     void StartRecording()
     {
-        var result = _cuesheetManager.StartRecording(Cuesheet);
+        var result = _cuesheetManager.StartRecording();
         if (result.IsSuccess)
         {
             _updateGUITimer.Start();
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
 
     void StopRecording() 
     {
-        _cuesheetManager.StopRecording(Cuesheet);
+        _cuesheetManager.StopRecording();
     }
 
     async Task DisplayStartCountdownDialog()
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index ecbf8795..7054a09f 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -64,7 +64,7 @@ along with Foobar.  If not, see
             <SelectColumn Hidden="CurrentViewMode == ViewMode.RecordView" />
             <TemplateColumn Title="@_localizer["Controls"]" Hidden="CurrentViewMode != ViewMode.RecordView">
                 <EditTemplate>
-                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracks(Cuesheet!, [context.Item])" />
+                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracks([context.Item])" />
                 </EditTemplate>
             </TemplateColumn>
             <PropertyColumn Property="x => x.Position" Title="#" Editable="CurrentViewMode != ViewMode.RecordView" HeaderStyle="width: 1px;">
@@ -178,7 +178,7 @@ along with Foobar.  If not, see
         {
             IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
         };
-        _cuesheetManager.AddTrack(Cuesheet!, newTrack);
+        _cuesheetManager.AddTrack(newTrack);
         TraceChangeManager.TraceChanges(newTrack);
     }
 
@@ -189,7 +189,7 @@ along with Foobar.  If not, see
 
     void DeleteSelectedTracksClicked()
     {
-        _cuesheetManager.RemoveTracks(Cuesheet!, selectedTracks);
+        _cuesheetManager.RemoveTracks(selectedTracks);
         selectedTracks.Clear();
     }
 
@@ -203,7 +203,7 @@ along with Foobar.  If not, see
         var result = await dialog.Result;
         if (result?.Canceled == false)
         {
-            _cuesheetManager.RemoveTracks(Cuesheet!, Cuesheet!.Tracks);
+            _cuesheetManager.RemoveTracks(Cuesheet!.Tracks);
             selectedTracks.Clear();
         }
     }
@@ -237,7 +237,7 @@ along with Foobar.  If not, see
         if (trackThatWillBeCopied != null)
         {
             var copy = _trackManager.Clone(trackThatWillBeCopied);
-            _cuesheetManager.AddTrack(Cuesheet!, copy);
+            _cuesheetManager.AddTrack(copy);
             TraceChangeManager.TraceChanges(copy);
             await EditTrackModalClicked(copy);
         }

From 355ea39444fb1534491f6411104f365d500c2e0f Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 9 Apr 2026 11:58:41 +0200
Subject: [PATCH 036/150] calculate moving of tracks

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 40 +++++--------------
 .../Model/AudioCuesheet/ITrack.cs             |  2 +-
 .../Model/AudioCuesheet/Import/ImportTrack.cs |  2 +-
 .../Model/AudioCuesheet/Track.cs              |  2 +-
 .../Services/AudioCuesheet/TrackManager.cs    |  4 +-
 .../Services/UI/DialogManager.cs              |  4 +-
 .../Shared/TrackList/TrackList.razor          | 16 +++++---
 7 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 1c116a9c..9df46e94 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -57,39 +57,17 @@ public class Cuesheet() : Validateable, ITraceable, ICuesheet
         [JsonIgnore]
         public Boolean IsImporting { get; set; }
 
-        public Boolean MoveTracksPossible(IEnumerable<Track> tracksToMove, MoveDirection moveDirection)
-        {
-            lock (syncLock)
-            {
-                var trackIndices = tracksToMove.Select(t => tracks.IndexOf(t)).Where(i => i >= 0).OrderBy(i => i).ToList();
-
-                if (trackIndices.Count == 0)
-                {
-                    return false;
-                }
-
-                if (moveDirection == MoveDirection.Up)
-                {
-                    return trackIndices.First() > 0;
-                }
-                if (moveDirection == MoveDirection.Down)
-                {
-                    return trackIndices.Last() < Tracks.Count - 1;
-                }
-
-                return false;
-            }
-        }
         public void MoveTracks(IEnumerable<Track> tracksToMove, MoveDirection moveDirection)
         {
             //TODO: Move tracks corresponding to its position in cuesheet
             //TODO: Use result pattern
             lock (syncLock)
             {
-                if (!MoveTracksPossible(tracksToMove, moveDirection))
-                {
-                    return;
-                }
+                //TODO
+                //if (!MoveTracksPossible(tracksToMove, moveDirection))
+                //{
+                //    return;
+                //}
                 var trackIndices = tracksToMove.Select(t => tracks.IndexOf(t)).Where(i => i >= 0).OrderBy(i => i).ToList();
 
                 var previousValue = new List<Track>(Tracks);
@@ -237,7 +215,8 @@ private void RecalculateTrackProperties(Track trackToCalculate)
                     }
                     if (trackToCalculate.Position.HasValue == false)
                     {
-                        trackToCalculate.Position = lastTrack.Position + 1;
+                        //TODO
+                        //trackToCalculate.Position = lastTrack.Position + 1;
                     }
                     if (trackToCalculate.Begin.HasValue == false)
                     {
@@ -283,8 +262,9 @@ private void SwitchTracks(Track track1, Track track2)
             if (track1.IsLinkedToPreviousTrack || track2.IsLinkedToPreviousTrack)
             { 
                 //Set values corresponding to their new positions
-                track1.Position = (uint)indexTrack1 + 1;
-                track2.Position = (uint)indexTrack2 + 1;
+                //TODO
+                //track1.Position = (uint)indexTrack1 + 1;
+                //track2.Position = (uint)indexTrack2 + 1;
                 //Set also begin and end
                 if (indexTrack1 < indexTrack2)
                 {
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/ITrack.cs b/AudioCuesheetEditor/Model/AudioCuesheet/ITrack.cs
index 38a27e34..36c36a28 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/ITrack.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/ITrack.cs
@@ -19,7 +19,7 @@ public interface ITrack
     {
         string? Artist { get; set; }
         string? Title { get; set; }
-        uint? Position { get; set; }
+        ushort? Position { get; set; }
         TimeSpan? Begin { get; set; }
         TimeSpan? End { get; set; }
         TimeSpan? Length { get; set; }
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Import/ImportTrack.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Import/ImportTrack.cs
index b73b1025..213453d0 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Import/ImportTrack.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Import/ImportTrack.cs
@@ -20,7 +20,7 @@ public class ImportTrack : ITrack
     {
         public string? Artist { get; set; }
         public string? Title { get; set; }
-        public uint? Position { get; set; }
+        public ushort? Position { get; set; }
         public TimeSpan? Begin { get; set; }
         public TimeSpan? End { get; set; }
         public TimeSpan? Length { get; set; }
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 7f557e79..0993dcfd 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -24,7 +24,7 @@ public class Track : Validateable, ITraceable, ITrack
         //TODO: Remove when ITraceable doesn't have event any more
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
         
-        public uint? Position { get; set; }
+        public ushort? Position { get; set; }
         public String? Artist { get; set; }
         public String? Title { get; set; }
         public TimeSpan? Begin { get; set; }        
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index f16bd147..e53ca7f5 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -120,7 +120,7 @@ void RecalculateLinkedProperties(Track track)
                 {
                     if (track.Position.HasValue && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
                     {
-                        track.Position = previousTrack.Position.Value + 1;
+                        track.Position = (ushort?)(previousTrack.Position + 1);
                     }
                     if (previousTrack.End.HasValue && (track.Begin != previousTrack.End))
                     {
@@ -136,7 +136,7 @@ void RecalculateLinkedProperties(Track track)
                 {
                     if (track.Position.HasValue)
                     {
-                        nextTrack.Position = track.Position.Value + 1;
+                        nextTrack.Position = (ushort?)(track.Position + 1);
                     }
                     nextTrack.Begin = track.End;
                 }
diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index d39c2e2a..87848274 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -79,14 +79,14 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                                 copyTrackPosition = true;
                                 break;
                             case DynamicEditValue.EnteredValueAdd:
-                                editMultipleTracksModalResult.EditedTrack.Position += track.Position;
+                                editMultipleTracksModalResult.EditedTrack.Position = (ushort?)(editMultipleTracksModalResult.EditedTrack.Position + track.Position);
                                 _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackPosition = false;
                                 editMultipleTracksModalResult.EditedTrack.Position = position;
                                 break;
                             case DynamicEditValue.EnteredValueSubstract:
                                 var newValue = track.Position - editMultipleTracksModalResult.EditedTrack.Position;
-                                editMultipleTracksModalResult.EditedTrack.Position = newValue;
+                                editMultipleTracksModalResult.EditedTrack.Position = (ushort?)newValue;
                                 _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
                                 copyTrackPosition = false;
                                 break;
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 7054a09f..f4bd6ddc 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -48,8 +48,8 @@ along with Foobar.  If not, see
             <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="selectedTracks.Count == 0"
                                      DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="selectedTracks.Count == 0"
                                      DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Cuesheet?.Tracks.Any() == false"
-                                     MoveTracksUpDisabled="!(Cuesheet?.MoveTracksPossible(selectedTracks, MoveDirection.Up) == true)" MoveTracksUpClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Up)"
-                                     MoveTracksDownDisabled="!(Cuesheet?.MoveTracksPossible(selectedTracks, MoveDirection.Down) == true)" MoveTracksDownClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Down)"
+                                     MoveTracksUpDisabled="MoveTracksUpDisabled" MoveTracksUpClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Up)"
+                                     MoveTracksDownDisabled="MoveTracksDownDisabled" MoveTracksDownClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Down)"
                                      CopySelectedTracksDisabled="selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
                                      FixedHeader="applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !applicationOptions?.FixedTracksTableHeader)" />
         </div>
@@ -69,8 +69,8 @@ along with Foobar.  If not, see
             </TemplateColumn>
             <PropertyColumn Property="x => x.Position" Title="#" Editable="CurrentViewMode != ViewMode.RecordView" HeaderStyle="width: 1px;">
                 <EditTemplate>
-                    <MudNumericField Validation="(uint? newPosition) => _validationService.Validate(context.Item, nameof(Track.Position))" Value="context.Item.Position"
-                                     ValueChanged="(uint? newPosition) => PositionChanged(context.Item, newPosition)" />
+                    <MudNumericField Validation="() => _validationService.Validate(context.Item, nameof(Track.Position))" Value="context.Item.Position"
+                                     ValueChanged="(ushort? newPosition) => PositionChanged(context.Item, newPosition)" />
                 </EditTemplate>
             </PropertyColumn>
             <PropertyColumn Property="x => x.Artist" Title="@_localizer["Artist"]">
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
     }
 </MudMenu>
 
-    @code {
+@code {
     //TODO: Disallow editing of position
     HashSet<Track> selectedTracks = new();
     MudMenu? trackContextMenu;
@@ -152,6 +152,10 @@ along with Foobar.  If not, see
         }
     }
 
+    Boolean MoveTracksUpDisabled => selectedTracks.Count == 0 || selectedTracks.Min(x => x.Position) <= 1;
+
+    Boolean MoveTracksDownDisabled => selectedTracks.Count == 0 || selectedTracks.Max(x => x.Position) >= Cuesheet?.Tracks.Max(x => x.Position);
+
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
 
@@ -290,7 +294,7 @@ along with Foobar.  If not, see
         }
     }
 
-    async Task PositionChanged(Track track, uint? newPosition)
+    async Task PositionChanged(Track track, ushort? newPosition)
     {
         track.Position = newPosition;
         if (form != null)

From 8a1dc33f0eaaef8d02a3dab0cd8c27bda79558b8 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 9 Apr 2026 13:59:17 +0200
Subject: [PATCH 037/150] added moving of tracks

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 136 ++++++------------
 .../Services/Audio/PlaybackService.cs         |   2 +-
 .../Services/AudioCuesheet/CuesheetManager.cs |   2 +-
 .../Services/IO/ImportManager.cs              |   2 +-
 .../Shared/TrackList/TrackList.razor          | 112 ++++++++++-----
 5 files changed, 124 insertions(+), 130 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 9df46e94..5c031863 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -20,23 +20,15 @@
 
 namespace AudioCuesheetEditor.Model.AudioCuesheet
 {
-    public enum MoveDirection
-    {
-        Up,
-        Down
-    }
-
     //TODO: Move back to plain POCO
     public class Cuesheet() : Validateable, ITraceable, ICuesheet
     {
-        private readonly Lock syncLock = new();
-
         private List<Track> tracks = [];
         //TODO: Remove when ITraceable doesn't have event any more
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
 
         [JsonInclude]
-        public ICollection<Track> Tracks { get; set; } = [];
+        public IEnumerable<Track> Tracks { get; set; } = [];
 
         public String? Artist { get; set; }
         
@@ -57,45 +49,6 @@ public class Cuesheet() : Validateable, ITraceable, ICuesheet
         [JsonIgnore]
         public Boolean IsImporting { get; set; }
 
-        public void MoveTracks(IEnumerable<Track> tracksToMove, MoveDirection moveDirection)
-        {
-            //TODO: Move tracks corresponding to its position in cuesheet
-            //TODO: Use result pattern
-            lock (syncLock)
-            {
-                //TODO
-                //if (!MoveTracksPossible(tracksToMove, moveDirection))
-                //{
-                //    return;
-                //}
-                var trackIndices = tracksToMove.Select(t => tracks.IndexOf(t)).Where(i => i >= 0).OrderBy(i => i).ToList();
-
-                var previousValue = new List<Track>(Tracks);
-
-                if (moveDirection == MoveDirection.Up)
-                {
-                    foreach (var index in trackIndices)
-                    {
-                        if (index > 0)
-                        {
-                            SwitchTracks(tracks[index], tracks[index - 1]);
-                        }
-                    }
-                }
-                else if (moveDirection == MoveDirection.Down)
-                {
-                    for (int i = trackIndices.Count - 1; i >= 0; i--)
-                    {
-                        int index = trackIndices[i];
-                        if (index < Tracks.Count - 1)
-                        {
-                            SwitchTracks(tracks[index], tracks[index + 1]);
-                        }
-                    }
-                }
-            }
-        }
-
         public Boolean RecalculateLastTrackEnd()
         {
             //Try to recalculate length by recalculating last track
@@ -116,7 +69,7 @@ public override ValidationResult Validate(string property)
             {
                 case nameof(Tracks):
                     validationStatus = ValidationStatus.Success;
-                    if (Tracks.Count <= 0)
+                    if (!Tracks.Any())
                     {
                         validationMessages ??= [];
                         validationMessages.Add(new ValidationMessage("{0} has invalid Count ({1})!", nameof(Tracks), 0));
@@ -204,48 +157,49 @@ private void RecalculateTrackProperties(Track trackToCalculate)
             {
                 trackToCalculate.End = Audiofile.Duration;
             }
-            if (Tracks.Count > 1)
-            {
-                var lastTrack = tracks.ElementAt(tracks.IndexOf(trackToCalculate) - 1);
-                if (lastTrack != trackToCalculate)
-                {
-                    if ((Audiofile != null) && (Audiofile.Duration.HasValue) && (lastTrack.End.HasValue) && (lastTrack.End.Value == Audiofile.Duration.Value))
-                    {
-                        lastTrack.End = null;
-                    }
-                    if (trackToCalculate.Position.HasValue == false)
-                    {
-                        //TODO
-                        //trackToCalculate.Position = lastTrack.Position + 1;
-                    }
-                    if (trackToCalculate.Begin.HasValue == false)
-                    {
-                        trackToCalculate.Begin = lastTrack.End;
-                    }
-                    else
-                    {
-                        if (lastTrack.End.HasValue == false)
-                        {
-                            lastTrack.End = trackToCalculate.Begin;
-                        }
-                    }
-                    if (IsRecording)
-                    {
-                        lastTrack.End = trackToCalculate.Begin;
-                    }
-                }
-            }
-            else
-            {
-                if (trackToCalculate.Position.HasValue == false)
-                {
-                    trackToCalculate.Position = 1;
-                }
-                if ((trackToCalculate.Begin.HasValue == false) || (IsRecording))
-                {
-                    trackToCalculate.Begin = TimeSpan.Zero;
-                }
-            }            
+            //TODO
+            //if (Tracks.Count > 1)
+            //{
+            //    var lastTrack = tracks.ElementAt(tracks.IndexOf(trackToCalculate) - 1);
+            //    if (lastTrack != trackToCalculate)
+            //    {
+            //        if ((Audiofile != null) && (Audiofile.Duration.HasValue) && (lastTrack.End.HasValue) && (lastTrack.End.Value == Audiofile.Duration.Value))
+            //        {
+            //            lastTrack.End = null;
+            //        }
+            //        if (trackToCalculate.Position.HasValue == false)
+            //        {
+            //            //TODO
+            //            //trackToCalculate.Position = lastTrack.Position + 1;
+            //        }
+            //        if (trackToCalculate.Begin.HasValue == false)
+            //        {
+            //            trackToCalculate.Begin = lastTrack.End;
+            //        }
+            //        else
+            //        {
+            //            if (lastTrack.End.HasValue == false)
+            //            {
+            //                lastTrack.End = trackToCalculate.Begin;
+            //            }
+            //        }
+            //        if (IsRecording)
+            //        {
+            //            lastTrack.End = trackToCalculate.Begin;
+            //        }
+            //    }
+            //}
+            //else
+            //{
+            //    if (trackToCalculate.Position.HasValue == false)
+            //    {
+            //        trackToCalculate.Position = 1;
+            //    }
+            //    if ((trackToCalculate.Begin.HasValue == false) || (IsRecording))
+            //    {
+            //        trackToCalculate.Begin = TimeSpan.Zero;
+            //    }
+            //}            
         }
 
         private void SwitchTracks(Track track1, Track track2)
diff --git a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
index 81d7ac0e..3fc82af6 100644
--- a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
+++ b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
@@ -53,7 +53,7 @@ private set
         //Refer to Cuesheet (not ImportCuesheet) since playback will always be done on the imported cuesheet
         public Boolean PlaybackPossible => cuesheet.Audiofile != null && cuesheet.Audiofile.PlaybackPossible;
         public Boolean PreviousPossible => (CurrentlyPlayingTrack != null) && cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack) >= 1;
-        public Boolean NextPossible => (CurrentlyPlayingTrack != null) && cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack) < cuesheet.Tracks.Count - 1;
+        public Boolean NextPossible => (CurrentlyPlayingTrack != null) && cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack) < cuesheet.Tracks.Count() - 1;
 
         public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)
         {
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 4537409f..df43b509 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -41,7 +41,7 @@ public Result IsRecordingPossible
         {
             get
             {
-                if (_sessionStateContainer.Cuesheet.Tracks.Count != 0)
+                if (_sessionStateContainer.Cuesheet.Tracks.Any())
                 {
                     return Result.Failure(new Error(ErrorType.NotPossible, "Cuesheet already contains tracks!"));
                 }
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 595b1847..980317b8 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -232,7 +232,7 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
                             }
                         }
                     }
-                    target.Tracks.Add(track);
+                    target.Tracks = target.Tracks.Append(track);
                 }
             }
             else
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index f4bd6ddc..618c48d4 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -45,21 +45,21 @@ along with Foobar.  If not, see
             </MudAlert>
         }
         <div aria-label="@_localizer["Track table controls"]">
-            <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="selectedTracks.Count == 0"
-                                     DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="selectedTracks.Count == 0"
+            <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="_selectedTracks.Count == 0"
+                                     DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Cuesheet?.Tracks.Any() == false"
-                                     MoveTracksUpDisabled="MoveTracksUpDisabled" MoveTracksUpClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Up)"
-                                     MoveTracksDownDisabled="MoveTracksDownDisabled" MoveTracksDownClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Down)"
-                                     CopySelectedTracksDisabled="selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
-                                     FixedHeader="applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !applicationOptions?.FixedTracksTableHeader)" />
+                                     MoveTracksUpDisabled="MoveTracksUpDisabled" MoveTracksUpClicked="MoveTracksUpClicked"
+                                     MoveTracksDownDisabled="MoveTracksDownDisabled" MoveTracksDownClicked="MoveTracksDownClicked"
+                                     CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
+                                     FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !_applicationOptions?.FixedTracksTableHeader)" />
         </div>
         break;
 }
 
-<MudForm @ref="form">
-    <MudDataGrid T="Track" Items="Cuesheet?.Tracks" ReadOnly="false" Bordered MultiSelection SelectOnRowClick="false" @bind-SelectedItems="selectedTracks" EditTrigger="DataGridEditTrigger.OnRowClick"
-                 EditMode="DataGridEditMode.Cell" ColumnResizeMode="ResizeMode.Column" RowContextMenuClick="OpenMenuContent" Height="@(applicationOptions?.FixedTracksTableHeader == true ? "600px" : null)" 
-                 FixedHeader="applicationOptions?.FixedTracksTableHeader == true" Validator="form" Virtualize SortMode="SortMode.None">
+<MudForm @ref="_form">
+    <MudDataGrid T="Track" Items="Cuesheet?.Tracks" ReadOnly="false" Bordered MultiSelection SelectOnRowClick="false" @bind-SelectedItems="_selectedTracks" EditTrigger="DataGridEditTrigger.OnRowClick"
+                 EditMode="DataGridEditMode.Cell" ColumnResizeMode="ResizeMode.Column" RowContextMenuClick="OpenMenuContent" Height="@(_applicationOptions?.FixedTracksTableHeader == true ? "600px" : null)" 
+                 FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" Validator="_form" Virtualize SortMode="SortMode.None">
         <Columns>
             <SelectColumn Hidden="CurrentViewMode == ViewMode.RecordView" />
             <TemplateColumn Title="@_localizer["Controls"]" Hidden="CurrentViewMode != ViewMode.RecordView">
@@ -124,21 +124,21 @@ along with Foobar.  If not, see
     </MudDataGrid>
 </MudForm>
 
-<MudMenu PositionAtCursor @ref="trackContextMenu">
-    @if (contextMenuTrack != null)
+<MudMenu PositionAtCursor @ref="_trackContextMenu">
+    @if (_contextMenuTrack != null)
     {
-        <MudMenuItem Icon="@Icons.Material.Outlined.PlayArrow" Disabled="_playbackService.PlaybackPossible == false" OnClick="() => _playbackService.PlayAsync(contextMenuTrack)">@_localizer["Start playback of this track"]</MudMenuItem>
-        <MudMenuItem Icon="@Icons.Material.Outlined.CopyAll" OnClick="() => CopyTrackClicked(contextMenuTrack)">@_localizer["Duplicate this track"]</MudMenuItem>
+        <MudMenuItem Icon="@Icons.Material.Outlined.PlayArrow" Disabled="_playbackService.PlaybackPossible == false" OnClick="() => _playbackService.PlayAsync(_contextMenuTrack)">@_localizer["Start playback of this track"]</MudMenuItem>
+        <MudMenuItem Icon="@Icons.Material.Outlined.CopyAll" OnClick="() => CopyTrackClicked(_contextMenuTrack)">@_localizer["Duplicate this track"]</MudMenuItem>
     }
 </MudMenu>
 
 @code {
     //TODO: Disallow editing of position
-    HashSet<Track> selectedTracks = new();
-    MudMenu? trackContextMenu;
-    Track? contextMenuTrack;
-    ApplicationOptions? applicationOptions;
-    MudForm? form;
+    HashSet<Track> _selectedTracks = new();
+    MudMenu? _trackContextMenu;
+    Track? _contextMenuTrack;
+    ApplicationOptions? _applicationOptions;
+    MudForm? _form;
 
     public Cuesheet? Cuesheet
     {
@@ -152,9 +152,9 @@ along with Foobar.  If not, see
         }
     }
 
-    Boolean MoveTracksUpDisabled => selectedTracks.Count == 0 || selectedTracks.Min(x => x.Position) <= 1;
+    Boolean MoveTracksUpDisabled => _selectedTracks.Count == 0 || _selectedTracks.Min(x => x.Position) <= 1;
 
-    Boolean MoveTracksDownDisabled => selectedTracks.Count == 0 || selectedTracks.Max(x => x.Position) >= Cuesheet?.Tracks.Max(x => x.Position);
+    Boolean MoveTracksDownDisabled => _selectedTracks.Count == 0 || _selectedTracks.Max(x => x.Position) >= Cuesheet?.Tracks.Max(x => x.Position);
 
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
@@ -170,7 +170,7 @@ along with Foobar.  If not, see
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
-        applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
+        _applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
         base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
         _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
         _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
@@ -180,7 +180,7 @@ along with Foobar.  If not, see
     {
         var newTrack = new Track()
         {
-            IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
+            IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
         };
         _cuesheetManager.AddTrack(newTrack);
         TraceChangeManager.TraceChanges(newTrack);
@@ -188,13 +188,13 @@ along with Foobar.  If not, see
 
     async Task EditSelectedTracksClicked()
     {
-        await _editTrackModalManager.ShowAndHandleModalEditDialogAsync(selectedTracks);
+        await _editTrackModalManager.ShowAndHandleModalEditDialogAsync(_selectedTracks);
     }
 
     void DeleteSelectedTracksClicked()
     {
-        _cuesheetManager.RemoveTracks(selectedTracks);
-        selectedTracks.Clear();
+        _cuesheetManager.RemoveTracks(_selectedTracks);
+        _selectedTracks.Clear();
     }
 
     async Task OnDeleteAllTracksClicked()
@@ -208,7 +208,7 @@ along with Foobar.  If not, see
         if (result?.Canceled == false)
         {
             _cuesheetManager.RemoveTracks(Cuesheet!.Tracks);
-            selectedTracks.Clear();
+            _selectedTracks.Clear();
         }
     }
 
@@ -236,7 +236,7 @@ along with Foobar.  If not, see
         var trackThatWillBeCopied = trackToCopy;
         if (trackThatWillBeCopied == null)
         {
-            trackThatWillBeCopied = selectedTracks.FirstOrDefault();
+            trackThatWillBeCopied = _selectedTracks.FirstOrDefault();
         }
         if (trackThatWillBeCopied != null)
         {
@@ -254,10 +254,10 @@ along with Foobar.  If not, see
 
     async Task OpenMenuContent(DataGridRowClickEventArgs<Track> args)
     {
-        contextMenuTrack = args.Item;
-        if (trackContextMenu != null)
+        _contextMenuTrack = args.Item;
+        if (_trackContextMenu != null)
         {
-            await trackContextMenu.OpenMenuAsync(args.MouseEventArgs);
+            await _trackContextMenu.OpenMenuAsync(args.MouseEventArgs);
         }
     }
 
@@ -289,7 +289,7 @@ along with Foobar.  If not, see
     {
         if (option is ApplicationOptions applicationOption)
         {
-            applicationOptions = applicationOption;
+            _applicationOptions = applicationOption;
             StateHasChanged();
         }
     }
@@ -297,9 +297,9 @@ along with Foobar.  If not, see
     async Task PositionChanged(Track track, ushort? newPosition)
     {
         track.Position = newPosition;
-        if (form != null)
+        if (_form != null)
         {
-            await form.ValidateAsync();
+            await _form.ValidateAsync();
         }
     }
 
@@ -307,9 +307,49 @@ along with Foobar.  If not, see
     {
         var timeSpan = await _applicationOptionsTimeSpanParser.GetTimespanAsync(value);
         _trackManager.SetProperty<TimeSpan?>(track, expression, timeSpan);
-        if (form != null)
+        if (_form != null)
         {
-            await form.ValidateAsync();
+            await _form.ValidateAsync();
+        }
+    }
+
+    void MoveTracksUpClicked()
+    {
+        if (MoveTracksUpDisabled == false)
+        {
+            base.TraceChangeManager.BulkEdit = true;
+            foreach (var selectedTrack in _selectedTracks)
+            {
+                var previousTrack = Cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
+                if (previousTrack != null)
+                {
+                    _trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
+                }
+                _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
+                //TODO: switch begin, end and length
+            }
+            _cuesheetManager.SetProperty(x => x.Tracks, Cuesheet?.Tracks.OrderBy(x => x.Position));
+            base.TraceChangeManager.BulkEdit = false;
+        }
+    }
+
+    void MoveTracksDownClicked()
+    {
+        if (MoveTracksDownDisabled == false)
+        {
+            base.TraceChangeManager.BulkEdit = true;
+            foreach (var selectedTrack in _selectedTracks)
+            {
+                var nextTrack = Cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
+                if (nextTrack != null)
+                {
+                    _trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
+                }
+                _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
+                //TODO: switch begin, end and length
+            }
+            _cuesheetManager.SetProperty(x => x.Tracks, Cuesheet?.Tracks.OrderBy(x => x.Position));
+            base.TraceChangeManager.BulkEdit = false;
         }
     }
 

From fcc538c8f8d21296e44bd8be50b1b4d49da9c583 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 9 Apr 2026 13:59:58 +0200
Subject: [PATCH 038/150] Update Cuesheet.cs

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 49 -------------------
 1 file changed, 49 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 5c031863..0c91d28f 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -201,54 +201,5 @@ private void RecalculateTrackProperties(Track trackToCalculate)
             //    }
             //}            
         }
-
-        private void SwitchTracks(Track track1, Track track2)
-        {
-            var indexTrack1 = tracks.IndexOf(track1);
-            var indexTrack2 = tracks.IndexOf(track2);
-            //Switch track positions in array
-            tracks[indexTrack2] = track1;
-            tracks[indexTrack1] = track2;
-            //Set linked tracks correct again
-            indexTrack1 = tracks.IndexOf(track1);
-            indexTrack2 = tracks.IndexOf(track2);
-            //If using linked tracks, we set values correctly
-            if (track1.IsLinkedToPreviousTrack || track2.IsLinkedToPreviousTrack)
-            { 
-                //Set values corresponding to their new positions
-                //TODO
-                //track1.Position = (uint)indexTrack1 + 1;
-                //track2.Position = (uint)indexTrack2 + 1;
-                //Set also begin and end
-                if (indexTrack1 < indexTrack2)
-                {
-                    track1.Begin = track2.Begin;
-                    (track2.End, track1.End) = (track1.End, track2.End);
-                    //TODO
-                    //if (track2.IsLinkedToPreviousTrack)
-                    //{
-                    //    var previousTrack = GetPreviousLinkedTrack(track2);
-                    //    if ((previousTrack != null) && (previousTrack.End.HasValue))
-                    //    {
-                    //        track2.Begin = previousTrack.End;
-                    //    }
-                    //}
-                }
-                else
-                {
-                    track2.Begin = track1.Begin;
-                    (track1.End, track2.End) = (track2.End, track1.End);
-                    //TODO
-                    //if (track1.IsLinkedToPreviousTrack)
-                    //{
-                    //    var previousTrack = GetPreviousLinkedTrack(track1);
-                    //    if ((previousTrack != null) && (previousTrack.End.HasValue))
-                    //    {
-                    //        track1.Begin = previousTrack.End;
-                    //    }
-                    //}
-                }
-            }
-        }
     }
 }

From 5afb231aa3a9aa515ffd60830ba7da8bb571d807 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 10 Apr 2026 09:21:15 +0200
Subject: [PATCH 039/150] Update CuesheetManager.cs

---
 .../Services/AudioCuesheet/CuesheetManager.cs | 44 +++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index df43b509..0b1ce42e 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -104,13 +104,52 @@ public void StopRecording()
         public void AddTrack(Track track)
         {
             var cuesheet = _sessionStateContainer.Cuesheet;
+            track.Cuesheet = cuesheet;
+            // Calculate track properties
+            if (cuesheet.IsRecording && cuesheet.RecordingStart.HasValue)
+            {
+                track.Begin = DateTime.UtcNow - cuesheet.RecordingStart.Value;
+            }
+            if ((track.End.HasValue == false) && (cuesheet.Audiofile?.Duration.HasValue == true))
+            {
+                track.End = cuesheet.Audiofile?.Duration;
+            }
+            if (cuesheet.Tracks.Any() == false)
+            {
+                track.Position = 1;
+                if ((track.Begin.HasValue == false) || cuesheet.IsRecording)
+                {
+                    track.Begin = TimeSpan.Zero;
+                }
+            }
+            else
+            {
+                var trackBeforeNewTrack = cuesheet.Tracks.Last();
+                if (track.Position.HasValue == false)
+                {
+                    track.Position = (ushort?)(trackBeforeNewTrack.Position + 1);
+                }
+                if (track.Begin.HasValue == false)
+                {
+                    track.Begin = trackBeforeNewTrack.End;
+                }
+                else
+                {
+                    if (trackBeforeNewTrack.End.HasValue == false)
+                    {
+                        trackBeforeNewTrack.End = track.Begin;
+                    }
+                }
+                if (cuesheet.IsRecording)
+                {
+                    trackBeforeNewTrack.End = track.Begin;
+                }
+            }
             var newValue = new List<Track>(cuesheet.Tracks)
             {
                 track
             };
             SetValue(cuesheet, x => x.Tracks, newValue);
-            //TODO: calculate track begin when cuesheet is recording
-            //TODO: recalculate track properties like Cuesheet.RecalculateTrackProperties did
         }
 
         /// <inheritdoc/>
@@ -146,6 +185,5 @@ void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>
 
             _traceChangeManager.AddChange(new(cuesheet, new(previousValue, propertyInfo.Name)));
         }
-
     }
 }

From 042a33e907b61ea76fbaf1eee13b0dd7421bdab6 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 10 Apr 2026 09:32:49 +0200
Subject: [PATCH 040/150] cuesheet is POCO again

---
 .../Model/AudioCuesheet/Cuesheet.cs           | 65 -------------------
 .../Services/AudioCuesheet/CuesheetManager.cs |  5 ++
 .../Services/IO/ImportManager.cs              |  4 +-
 .../Services/UI/ITraceChangeManager.cs        |  1 -
 .../Services/UI/TraceChangeManager.cs         | 12 ----
 .../Shared/Cuesheet/CuesheetData.razor        |  9 ++-
 6 files changed, 12 insertions(+), 84 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 0c91d28f..a927b629 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -20,10 +20,8 @@
 
 namespace AudioCuesheetEditor.Model.AudioCuesheet
 {
-    //TODO: Move back to plain POCO
     public class Cuesheet() : Validateable, ITraceable, ICuesheet
     {
-        private List<Track> tracks = [];
         //TODO: Remove when ITraceable doesn't have event any more
         public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
 
@@ -49,18 +47,6 @@ public class Cuesheet() : Validateable, ITraceable, ICuesheet
         [JsonIgnore]
         public Boolean IsImporting { get; set; }
 
-        public Boolean RecalculateLastTrackEnd()
-        {
-            //Try to recalculate length by recalculating last track
-            var lastTrack = tracks.LastOrDefault();
-            if (lastTrack != null)
-            {
-                RecalculateTrackProperties(lastTrack);
-                return true;
-            }
-            return false;
-        }
-
         public override ValidationResult Validate(string property)
         {
             ValidationStatus validationStatus = ValidationStatus.NoValidation;
@@ -150,56 +136,5 @@ public override ValidationResult Validate(string property)
             }
             return ValidationResult.Create(validationStatus, validationMessages);
         }
-
-        private void RecalculateTrackProperties(Track trackToCalculate)
-        {
-            if ((Audiofile?.Duration.HasValue == true) && (trackToCalculate.End.HasValue == false))
-            {
-                trackToCalculate.End = Audiofile.Duration;
-            }
-            //TODO
-            //if (Tracks.Count > 1)
-            //{
-            //    var lastTrack = tracks.ElementAt(tracks.IndexOf(trackToCalculate) - 1);
-            //    if (lastTrack != trackToCalculate)
-            //    {
-            //        if ((Audiofile != null) && (Audiofile.Duration.HasValue) && (lastTrack.End.HasValue) && (lastTrack.End.Value == Audiofile.Duration.Value))
-            //        {
-            //            lastTrack.End = null;
-            //        }
-            //        if (trackToCalculate.Position.HasValue == false)
-            //        {
-            //            //TODO
-            //            //trackToCalculate.Position = lastTrack.Position + 1;
-            //        }
-            //        if (trackToCalculate.Begin.HasValue == false)
-            //        {
-            //            trackToCalculate.Begin = lastTrack.End;
-            //        }
-            //        else
-            //        {
-            //            if (lastTrack.End.HasValue == false)
-            //            {
-            //                lastTrack.End = trackToCalculate.Begin;
-            //            }
-            //        }
-            //        if (IsRecording)
-            //        {
-            //            lastTrack.End = trackToCalculate.Begin;
-            //        }
-            //    }
-            //}
-            //else
-            //{
-            //    if (trackToCalculate.Position.HasValue == false)
-            //    {
-            //        trackToCalculate.Position = 1;
-            //    }
-            //    if ((trackToCalculate.Begin.HasValue == false) || (IsRecording))
-            //    {
-            //        trackToCalculate.Begin = TimeSpan.Zero;
-            //    }
-            //}            
-        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 0b1ce42e..026c5daf 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -14,6 +14,7 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Services.UI;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -125,6 +126,10 @@ public void AddTrack(Track track)
             else
             {
                 var trackBeforeNewTrack = cuesheet.Tracks.Last();
+                if ((cuesheet.Audiofile?.Duration.HasValue == true) && (trackBeforeNewTrack.End.HasValue) && (trackBeforeNewTrack.End == cuesheet.Audiofile.Duration))
+                {
+                    trackBeforeNewTrack.End = null;
+                }
                 if (track.Position.HasValue == false)
                 {
                     track.Position = (ushort?)(trackBeforeNewTrack.Position + 1);
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 980317b8..fafd05a8 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -32,7 +32,7 @@ public enum ImportFileType
         Textfile,
         Audiofile
     }
-    public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService, ITrackManager trackManager, ICuesheetManager cuesheetManager, ILogger<ImportManager> logger)
+    public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService, ITrackManager trackManager, ILogger<ImportManager> logger)
     {
         public event EventHandler<IEnumerable<string>>? UploadFilesFinished;
 
@@ -42,7 +42,6 @@ public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceC
         private readonly IFileInputManager _fileInputManager = fileInputManager;
         private readonly ITextImportService _textImportService = textImportService;
         private readonly ITrackManager _trackManager = trackManager;
-        private readonly ICuesheetManager _cuesheetManager = cuesheetManager;
 
         public void ImportData(String? data)
         {
@@ -212,7 +211,6 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
                 for (int i = 0; i < tracks.Count(); i++)
                 {
                     var importTrack = tracks.ElementAt(i);
-                    //We don't want to copy the cuesheet reference since we are doing a copy and want to assign the track to this object
                     var track = _trackManager.Clone(importTrack);
                     track.Cuesheet = null;
                     if (importTrack is ImportTrack importTrackReference)
diff --git a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
index f5f2b9fc..fd2b5c38 100644
--- a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
@@ -43,7 +43,6 @@ public interface ITraceChangeManager
         public void Reset();
         public void Undo();
         public void Redo();
-        public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit);
         public void RemoveTracedChanges(IEnumerable<ITraceable> traceables);
     }
 }
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index a77c8ded..050d5a8e 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -220,18 +220,6 @@ public bool BulkEdit
             }
         }
 
-        public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
-        {
-            var edit = _undoStack.FirstOrDefault(targetEdit);
-            if ((edit != null) && (_undoStack.Count > 0))
-            {
-                var lastEdits = _undoStack[^1];
-                _undoStack.Remove(lastEdits);
-                edit.Changes.AddRange(lastEdits.Changes);
-                UndoDone?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
         public void AddChange(TracedChange tracedChange)
         {
             //TODO: Tests
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index 94eea173..74a91d61 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -23,6 +23,7 @@ along with Foobar.  If not, see
 @inject IDialogService _dialogService
 @inject ISessionStateContainer _sessionStateContainer
 @inject ICuesheetManager _cuesheetManager
+@inject ITrackManager _trackManager
 
 @if (Cuesheet != null)
 {
@@ -117,12 +118,14 @@ along with Foobar.  If not, see
                 var fileUpload = await _fileInputManager.CreateFileUploadsAsync([browserFile], fileInputAudiofileId);
                 audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
             }
+            base.TraceChangeManager.BulkEdit = true;
             _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
-            //TODO: Include into cuesheetmanager
-            if (Cuesheet.RecalculateLastTrackEnd())
+            var lastTrack = Cuesheet.Tracks.LastOrDefault();
+            if ((lastTrack != null) && (audiofile?.Duration.HasValue == true))
             {
-                TraceChangeManager.MergeLastEditWithEdit(x => x.Changes.All(y => y.TraceableObject == Cuesheet && y.TraceableChange.PropertyName == nameof(Audiofile)));
+                _trackManager.SetProperty(lastTrack, x => x.End, audiofile.Duration);
             }
+            base.TraceChangeManager.BulkEdit = false;
         }
         catch(ArgumentException ae)
         {

From f25e4ad047e92b13b75327c23f7a95e9f358a928 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 10 Apr 2026 09:36:19 +0200
Subject: [PATCH 041/150] remove TODOs

---
 AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs  | 1 -
 AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 026c5daf..0679db17 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -14,7 +14,6 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
-using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Services.UI;
 using System.Linq.Expressions;
 using System.Reflection;
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index 068a35c4..e9e1023e 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -76,6 +76,5 @@ public interface ICuesheetManager
         /// <param name="cuesheet"></param>
         /// <param name="tracksToRemove"></param>
         void RemoveTracks(IEnumerable<Track> tracksToRemove);
-        //TODO: Add all methods from cuesheet here
     }
 }

From 52499868e5a5473f021cb63d5068d1e0f22fd00e Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 10 Apr 2026 09:37:16 +0200
Subject: [PATCH 042/150] Update CuesheetData.razor

---
 AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index 74a91d61..e4f70574 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -120,6 +120,7 @@ along with Foobar.  If not, see
             }
             base.TraceChangeManager.BulkEdit = true;
             _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
+            //TODO: Move this to service (is needed on removing on tracks also)
             var lastTrack = Cuesheet.Tracks.LastOrDefault();
             if ((lastTrack != null) && (audiofile?.Duration.HasValue == true))
             {

From c3005b767c6543fee00e3a2ce9eb60d7fcc4cc91 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 10 Apr 2026 13:30:30 +0200
Subject: [PATCH 043/150] fix playback

---
 .../Model/IO/Audio/Audiofile.cs               |  14 ---
 .../Services/Audio/PlaybackService.cs         | 116 +++++++++---------
 .../Shared/Audio/AudioPlayer.razor            |  10 +-
 .../Shared/TrackList/TrackList.razor          |   2 +-
 4 files changed, 61 insertions(+), 81 deletions(-)

diff --git a/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs b/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs
index ebee7f8d..b6d86c42 100644
--- a/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs
+++ b/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs
@@ -101,19 +101,5 @@ public String? AudioFileType
                 return audioFileType;
             }
         }
-
-        [JsonIgnore]
-        public Boolean PlaybackPossible
-        {
-            get
-            {
-                Boolean playbackPossible = false;
-                if ((String.IsNullOrEmpty(Name) == false) && (String.IsNullOrEmpty(ObjectURL) == false) && (String.IsNullOrEmpty(AudioFileType) == false) && (AudioCodec != null))
-                {
-                    playbackPossible = true;
-                }
-                return playbackPossible;
-            }
-        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
index 3fc82af6..ce1bf9c3 100644
--- a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
+++ b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
@@ -25,42 +25,44 @@ public class PlaybackService : IDisposable
         private readonly ISessionStateContainer _sessionStateContainer;
         private readonly IHowl _howl;
 
-        private int? soundId;
-        private Audiofile? currentlyPlayingAudiofile;
-        private Timer? updateTimer;
-        private bool disposedValue;
-        private readonly Lock timerLock = new();
-        private TimeSpan? currentPosition;
-        private Cuesheet cuesheet;
+        private int? _currentPlayingSoundId;
+        private Audiofile? _currentlyPlayingAudiofile;
+        private Timer? _updateTimer;
+        private bool _disposedValue;
+        private readonly Lock _timerLock = new();
+        private TimeSpan? _currentPosition;
 
         public event Action? CurrentPositionChanged;
 
         public TimeSpan? CurrentPosition
         {
-            get => currentPosition;
+            get => _currentPosition;
             private set
             {
-                if (currentPosition != value)
+                if (_currentPosition != value)
                 {
-                    currentPosition = value;
+                    _currentPosition = value;
                     CurrentPositionChanged?.Invoke();
                 }
             }
         }
-        public Track? CurrentlyPlayingTrack => cuesheet.Tracks.SingleOrDefault(x => x.Begin.HasValue == true && x.End.HasValue == true && x.Begin <= CurrentPosition && x.End > CurrentPosition);
-        public TimeSpan? TotalTime => cuesheet.Audiofile?.Duration;
+        public Track? CurrentlyPlayingTrack => _sessionStateContainer.Cuesheet.Tracks.SingleOrDefault(x => x.Begin.HasValue == true && x.End.HasValue == true && x.Begin <= CurrentPosition && x.End > CurrentPosition);
+        public TimeSpan? TotalTime => _sessionStateContainer.Cuesheet.Audiofile?.Duration;
         public Boolean IsPlaying { get; private set; } = false;
-        //Refer to Cuesheet (not ImportCuesheet) since playback will always be done on the imported cuesheet
-        public Boolean PlaybackPossible => cuesheet.Audiofile != null && cuesheet.Audiofile.PlaybackPossible;
-        public Boolean PreviousPossible => (CurrentlyPlayingTrack != null) && cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack) >= 1;
-        public Boolean NextPossible => (CurrentlyPlayingTrack != null) && cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack) < cuesheet.Tracks.Count() - 1;
+        public Boolean IsPlaybackPossible
+        {
+            get
+            {
+                var audiofile = _sessionStateContainer.Cuesheet.Audiofile;
+                return String.IsNullOrEmpty(audiofile?.ObjectURL) == false && String.IsNullOrEmpty(audiofile?.AudioFileType) == false;
+            }
+        }
+        public Boolean IsPreviousPossible => (CurrentlyPlayingTrack != null) && _sessionStateContainer.Cuesheet.Tracks.FirstOrDefault(x => x.End <= CurrentlyPlayingTrack.Begin) != null;
+        public Boolean IsNextPossible => (CurrentlyPlayingTrack != null) && _sessionStateContainer.Cuesheet.Tracks.FirstOrDefault(x => x.Begin >= CurrentlyPlayingTrack.End) != null;
 
         public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)
         {
             _sessionStateContainer = sessionStateContainer;
-            cuesheet = _sessionStateContainer.Cuesheet;
-            //TODO
-            //cuesheet.AudiofileChanged += Cuesheet_AudiofileChanged;
             _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
             _howl = howl;
             _howl.OnPlay += Howl_OnPlay;
@@ -72,28 +74,28 @@ public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)
         public async Task PlayOrPauseAsync()
         {
             //Reset if the last played audiofile is not the current one
-            if (currentlyPlayingAudiofile != cuesheet.Audiofile)
+            if (_currentlyPlayingAudiofile != _sessionStateContainer.Cuesheet.Audiofile)
             {
-                soundId = null;
+                _currentPlayingSoundId = null;
             }
             //If the current audiofile already started, we just pause
-            if (soundId != null)
+            if (_currentPlayingSoundId != null)
             {
-                await _howl.Pause(soundId.Value);
+                await _howl.Pause(_currentPlayingSoundId.Value);
             }
             else
             {
-                if (PlaybackPossible)
+                if (IsPlaybackPossible)
                 {
                     string[]? sources = null;
                     string[]? formats = null;
-                    if (cuesheet.Audiofile?.ObjectURL != null)
+                    if (_sessionStateContainer.Cuesheet.Audiofile?.ObjectURL != null)
                     {
-                        sources = [cuesheet.Audiofile.ObjectURL];
+                        sources = [_sessionStateContainer.Cuesheet.Audiofile.ObjectURL];
                     }
-                    if (cuesheet.Audiofile?.AudioFileType != null)
+                    if (_sessionStateContainer.Cuesheet.Audiofile?.AudioFileType != null)
                     {
-                        formats = [cuesheet.Audiofile.AudioFileType.ToLower()];
+                        formats = [_sessionStateContainer.Cuesheet.Audiofile.AudioFileType.ToLower()];
                     }
                     var options = new HowlOptions
                     {
@@ -101,8 +103,8 @@ public async Task PlayOrPauseAsync()
                         Formats = formats,
                         Html5 = true
                     };
-                    soundId = await _howl.Play(options);
-                    currentlyPlayingAudiofile = cuesheet.Audiofile;
+                    _currentPlayingSoundId = await _howl.Play(options);
+                    _currentlyPlayingAudiofile = _sessionStateContainer.Cuesheet.Audiofile;
                 }
             }
         }
@@ -115,18 +117,18 @@ public async Task PlayAsync(Track trackToPlay)
                 {
                     await PlayOrPauseAsync();
                 }
-                if (soundId.HasValue)
+                if (_currentPlayingSoundId.HasValue)
                 {
-                    await _howl.Seek(soundId.Value, trackToPlay.Begin.Value);
+                    await _howl.Seek(_currentPlayingSoundId.Value, trackToPlay.Begin.Value);
                 }
             }
         }
 
         public async Task StopAsync()
         {
-            if (soundId != null)
+            if (_currentPlayingSoundId != null)
             {
-                await _howl.Stop(soundId.Value);
+                await _howl.Stop(_currentPlayingSoundId.Value);
             }
         }
 
@@ -134,8 +136,7 @@ public async Task PlayNextTrackAsync()
         {
             if (CurrentlyPlayingTrack != null)
             {
-                var index = cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack);
-                var trackToPlay = cuesheet.Tracks.ElementAtOrDefault(index + 1);
+                var trackToPlay = _sessionStateContainer.Cuesheet.Tracks.FirstOrDefault(x => x.Begin >= CurrentlyPlayingTrack.End);
                 if (trackToPlay != null)
                 {
                     await PlayAsync(trackToPlay);
@@ -147,8 +148,7 @@ public async Task PlayPreviousTrackAsync()
         {
             if (CurrentlyPlayingTrack != null)
             {
-                var index = cuesheet.Tracks.ToList().IndexOf(CurrentlyPlayingTrack);
-                var trackToPlay = cuesheet.Tracks.ElementAtOrDefault(index - 1);
+                var trackToPlay = _sessionStateContainer.Cuesheet.Tracks.LastOrDefault(x => x.End <= CurrentlyPlayingTrack.Begin);
                 if (trackToPlay != null)
                 {
                     await PlayAsync(trackToPlay);
@@ -158,17 +158,17 @@ public async Task PlayPreviousTrackAsync()
 
         public async Task SeekAsync(TimeSpan time)
         {
-            if (soundId.HasValue == false)
+            if (_currentPlayingSoundId.HasValue == false)
             {
                 await PlayOrPauseAsync();
             }
-            if (soundId.HasValue)
+            if (_currentPlayingSoundId.HasValue)
             {
                 if (IsPlaying == false)
                 {
                     await PlayOrPauseAsync();
                 }
-                await _howl.Seek(soundId.Value, time);
+                await _howl.Seek(_currentPlayingSoundId.Value, time);
             }
         }
 
@@ -181,28 +181,27 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            if (!disposedValue)
+            if (!_disposedValue)
             {
                 if (disposing)
                 {
-                    //TODO
-                    //cuesheet.AudiofileChanged -= Cuesheet_AudiofileChanged;
                     _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
                     _howl.OnPlay -= Howl_OnPlay;
                     _howl.OnPause -= Howl_OnPause;
                     _howl.OnEnd -= Howl_OnEnd;
                     _howl.OnStop -= Howl_OnStop;
                 }
-                disposedValue = true;
+                _disposedValue = true;
             }
         }
 
         private void Howl_OnStop(Howler.Blazor.Components.Events.HowlEventArgs obj)
         {
             IsPlaying = false;
-            soundId = null;
+            _currentPlayingSoundId = null;
             StopTimer();
             CurrentPosition = null;
+            _currentlyPlayingAudiofile = _sessionStateContainer.Cuesheet.Audiofile;
         }
 
         private void Howl_OnEnd(Howler.Blazor.Components.Events.HowlEventArgs obj)
@@ -226,35 +225,30 @@ private void Howl_OnPlay(Howler.Blazor.Components.Events.HowlPlayEventArgs obj)
 
         private void StartTimer()
         {
-            updateTimer ??= new Timer(UpdateCurrentPosition, null, 0, 500);
+            _updateTimer ??= new Timer(UpdateCurrentPosition, null, 0, 500);
         }
 
         private void StopTimer()
         {
-            updateTimer?.Dispose();
-            updateTimer = null;
+            _updateTimer?.Dispose();
+            _updateTimer = null;
         }
 
         private async void UpdateCurrentPosition(object? state)
         {
             // Thread-safe access
-            lock (timerLock)
+            lock (_timerLock)
+            {
+                if (_currentPlayingSoundId == null || !IsPlaying) return;
+            }
+            CurrentPosition = await _howl.GetCurrentTime(_currentPlayingSoundId.Value);
+            if (_sessionStateContainer.Cuesheet.Audiofile != _currentlyPlayingAudiofile)
             {
-                if (soundId == null || !IsPlaying) return;
+                await _howl.Stop(_currentPlayingSoundId.Value);
             }
-            CurrentPosition = await _howl.GetCurrentTime(soundId.Value);
         }
 
         private void SessionStateContainer_CuesheetChanged(object? sender, EventArgs e)
-        {
-            _ = StopAsync();
-            //TODO
-            //cuesheet.AudiofileChanged -= Cuesheet_AudiofileChanged;
-            cuesheet = _sessionStateContainer.Cuesheet;
-            //cuesheet.AudiofileChanged += Cuesheet_AudiofileChanged;
-        }
-
-        private void Cuesheet_AudiofileChanged(object? sender, EventArgs e)
         {
             _ = StopAsync();
         }
diff --git a/AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor b/AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor
index 5533938b..122d0742 100644
--- a/AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor
+++ b/AudioCuesheetEditor/Shared/Audio/AudioPlayer.razor
@@ -38,7 +38,7 @@ along with Foobar.  If not, see
             {
                 <MudText>@String.Format("--{0}--{1}--", CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator, CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator)</MudText>
             }
-            <MudSlider T="double" Variant="Variant.Filled" Min="0" Max="100" Disabled="!_playbackService.PlaybackPossible" Value="sliderValue" ValueChanged="OnSliderValueChanged" ValueLabel aria-label="Playback slider">
+            <MudSlider T="double" Variant="Variant.Filled" Min="0" Max="100" Disabled="!_playbackService.IsPlaybackPossible" Value="sliderValue" ValueChanged="OnSliderValueChanged" ValueLabel aria-label="Playback slider">
                 <ValueLabelContent>
                     @GetSliderTimeValue()
                 </ValueLabelContent>
@@ -54,17 +54,17 @@ along with Foobar.  If not, see
         </MudStack>
         <MudStack Row AlignItems="AlignItems.Center" Justify="Justify.Center">
             <MudTooltip Text="@_localizer["Play or pause the current audio"]">
-                <MudIconButton Icon="@(_playbackService.IsPlaying ? Icons.Material.Outlined.Pause : Icons.Material.Outlined.PlayArrow)" Variant="Variant.Filled" Color="Color.Primary" Disabled="!_playbackService.PlaybackPossible" OnClick="OnPlayOrPauseClicked" aria-label="Play" />
+                <MudIconButton Icon="@(_playbackService.IsPlaying ? Icons.Material.Outlined.Pause : Icons.Material.Outlined.PlayArrow)" Variant="Variant.Filled" Color="Color.Primary" Disabled="!_playbackService.IsPlaybackPossible" OnClick="OnPlayOrPauseClicked" aria-label="Play" />
             </MudTooltip>
             <MudButtonGroup OverrideStyles="false">
                 <MudTooltip Text="@_localizer["Jump to previous track"]">
-                    <MudIconButton Icon="@Icons.Material.Outlined.SkipPrevious" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.PreviousPossible" OnClick="PlayPreviousTrackAsync" aria-label="@_localizer["Jump to previous track"]" />
+                    <MudIconButton Icon="@Icons.Material.Outlined.SkipPrevious" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.IsPreviousPossible" OnClick="PlayPreviousTrackAsync" aria-label="@_localizer["Jump to previous track"]" />
                 </MudTooltip>
                 <MudTooltip Text="@_localizer["Stop the current playback"]">
-                    <MudIconButton Icon="@Icons.Material.Outlined.Stop" Variant="Variant.Filled" Color="Color.Primary" OnClick="StopAsync" Disabled="!_playbackService.PlaybackPossible" aria-label="@_localizer["Stop the current playback"]" />
+                    <MudIconButton Icon="@Icons.Material.Outlined.Stop" Variant="Variant.Filled" Color="Color.Primary" OnClick="StopAsync" Disabled="!_playbackService.IsPlaybackPossible" aria-label="@_localizer["Stop the current playback"]" />
                 </MudTooltip>
                 <MudTooltip Text="@_localizer["Jump to next track"]">
-                    <MudIconButton Icon="@Icons.Material.Outlined.SkipNext" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.NextPossible" OnClick="PlayNextTrackAsync" aria-label="@_localizer["Jump to next track"]" />
+                    <MudIconButton Icon="@Icons.Material.Outlined.SkipNext" Variant="Variant.Filled" Color="Color.Tertiary" Disabled="!_playbackService.IsNextPossible" OnClick="PlayNextTrackAsync" aria-label="@_localizer["Jump to next track"]" />
                 </MudTooltip>
             </MudButtonGroup>
         </MudStack>
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 618c48d4..82a419ad 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -127,7 +127,7 @@ along with Foobar.  If not, see
 <MudMenu PositionAtCursor @ref="_trackContextMenu">
     @if (_contextMenuTrack != null)
     {
-        <MudMenuItem Icon="@Icons.Material.Outlined.PlayArrow" Disabled="_playbackService.PlaybackPossible == false" OnClick="() => _playbackService.PlayAsync(_contextMenuTrack)">@_localizer["Start playback of this track"]</MudMenuItem>
+        <MudMenuItem Icon="@Icons.Material.Outlined.PlayArrow" Disabled="_playbackService.IsPlaybackPossible == false" OnClick="() => _playbackService.PlayAsync(_contextMenuTrack)">@_localizer["Start playback of this track"]</MudMenuItem>
         <MudMenuItem Icon="@Icons.Material.Outlined.CopyAll" OnClick="() => CopyTrackClicked(_contextMenuTrack)">@_localizer["Duplicate this track"]</MudMenuItem>
     }
 </MudMenu>

From f6179122d06a1f4fef0de12148fe8dce6687a10d Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 13:51:15 +0200
Subject: [PATCH 044/150] Update CuesheetManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 0679db17..48bd890f 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -106,9 +106,9 @@ public void AddTrack(Track track)
             var cuesheet = _sessionStateContainer.Cuesheet;
             track.Cuesheet = cuesheet;
             // Calculate track properties
-            if (cuesheet.IsRecording && cuesheet.RecordingStart.HasValue)
+            if (cuesheet.IsRecording)
             {
-                track.Begin = DateTime.UtcNow - cuesheet.RecordingStart.Value;
+                track.Begin = DateTime.UtcNow - cuesheet.RecordingStart;
             }
             if ((track.End.HasValue == false) && (cuesheet.Audiofile?.Duration.HasValue == true))
             {

From ffca9ebee168720892ca9dd7669eabf73212f75a Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 13:56:02 +0200
Subject: [PATCH 045/150] move linkedtrack to trackmanager

---
 .../Services/AudioCuesheet/CuesheetManager.cs | 26 +--------------
 .../AudioCuesheet/ICuesheetManager.cs         | 14 --------
 .../Services/AudioCuesheet/ITrackManager.cs   | 14 ++++++++
 .../Services/AudioCuesheet/TrackManager.cs    | 32 ++++++++++++++++---
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 48bd890f..113e585c 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -14,6 +14,7 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Services.UI;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -75,31 +76,6 @@ public void StopRecording()
             IsRecordingChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        /// <inheritdoc/>
-        public Track? GetPreviousLinkedTrack(Track track)
-        {
-            Track? previousLinkedTrack = null;
-            if (track.IsLinkedToPreviousTrack && track.Position.HasValue)
-            {
-                if (track.Position.Value > 1)
-                {
-                    previousLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value - 1);
-                }
-            }
-            return previousLinkedTrack;
-        }
-
-        /// <inheritdoc/>
-        public Track? GetNextLinkedTrack(Track track)
-        {
-            Track? nextLinkedTrack = null;
-            if (track.Position.HasValue)
-            {
-                nextLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
-            }
-            return nextLinkedTrack;
-        }
-
         /// <inheritdoc/>
         public void AddTrack(Track track)
         {
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index e9e1023e..a280ddb8 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -51,20 +51,6 @@ public interface ICuesheetManager
         /// <returns></returns>
         void StopRecording();
         /// <summary>
-        /// Get the previous linked track of a track object
-        /// </summary>
-        /// <param name="cuesheet">Cuesheet to get the previous linked track from</param>
-        /// <param name="track">Track object to get the previous link to</param>
-        /// <returns>Previous linked track or null (if not linked)</returns>
-        Track? GetPreviousLinkedTrack(Track track);
-        /// <summary>
-        /// Get next linked track that is linked to the parameter track
-        /// </summary>
-        /// <param name="cuesheet"></param>
-        /// <param name="track"></param>
-        /// <returns></returns>
-        Track? GetNextLinkedTrack(Track track);
-        /// <summary>
         /// Adds a track to the cuesheet
         /// </summary>
         /// <param name="cuesheet"></param>
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index 1c0aa37f..cc86dfa7 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -53,5 +53,19 @@ public interface ITrackManager
         /// <param name="track"></param>
         /// <returns></returns>
         Track Clone(ITrack track);
+        /// <summary>
+        /// Get the previous linked track of a track object
+        /// </summary>
+        /// <param name="cuesheet">Cuesheet to get the previous linked track from</param>
+        /// <param name="track">Track object to get the previous link to</param>
+        /// <returns>Previous linked track or null (if not linked)</returns>
+        Track? GetPreviousLinkedTrack(Track track);
+        /// <summary>
+        /// Get next linked track that is linked to the parameter track
+        /// </summary>
+        /// <param name="cuesheet"></param>
+        /// <param name="track"></param>
+        /// <returns></returns>
+        Track? GetNextLinkedTrack(Track track);
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index e53ca7f5..0fe08cc3 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -21,10 +21,9 @@
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
     /// <inheritdoc/>
-    public class TrackManager(ITraceChangeManager traceChangeManager, ICuesheetManager cuesheetManager) : ITrackManager
+    public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManager
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
-        private readonly ICuesheetManager _cuesheetManager = cuesheetManager;
 
         //TODO: Tests
 
@@ -88,6 +87,31 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             }
         }
 
+        /// <inheritdoc/>
+        public Track? GetPreviousLinkedTrack(Track track)
+        {
+            Track? previousLinkedTrack = null;
+            if (track.IsLinkedToPreviousTrack && track.Position.HasValue)
+            {
+                if (track.Position.Value > 1)
+                {
+                    previousLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value - 1);
+                }
+            }
+            return previousLinkedTrack;
+        }
+
+        /// <inheritdoc/>
+        public Track? GetNextLinkedTrack(Track track)
+        {
+            Track? nextLinkedTrack = null;
+            if (track.Position.HasValue)
+            {
+                nextLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
+            }
+            return nextLinkedTrack;
+        }
+
         void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
         {
             if (propertyExpression.Body is not MemberExpression memberExpression)
@@ -115,7 +139,7 @@ void RecalculateLinkedProperties(Track track)
         {
             if (track.Cuesheet != null)
             {
-                var previousTrack = _cuesheetManager.GetPreviousLinkedTrack(track);
+                var previousTrack = GetPreviousLinkedTrack(track);
                 if (previousTrack != null)
                 {
                     if (track.Position.HasValue && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
@@ -131,7 +155,7 @@ void RecalculateLinkedProperties(Track track)
                         previousTrack.End = track.Begin;
                     }
                 }
-                var nextTrack = _cuesheetManager.GetNextLinkedTrack(track);
+                var nextTrack = GetNextLinkedTrack(track);
                 if (nextTrack != null)
                 {
                     if (track.Position.HasValue)

From 0860171ea7f69eb0e0c45f643603914af8b29b82 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 14:02:25 +0200
Subject: [PATCH 046/150] moved calculation to manager

---
 .../Services/AudioCuesheet/CuesheetManager.cs  | 18 ++++++++++++------
 .../Shared/Cuesheet/CuesheetData.razor         |  6 ------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 113e585c..a9bc03af 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -14,7 +14,6 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
-using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Services.UI;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -22,10 +21,11 @@
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
     /// <inheritdoc/>
-    public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionStateContainer sessionStateContainer) : ICuesheetManager
+    public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionStateContainer sessionStateContainer, ITrackManager trackManager) : ICuesheetManager
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
         private readonly ISessionStateContainer _sessionStateContainer = sessionStateContainer;
+        private readonly ITrackManager _trackManager = trackManager;
 
         public event EventHandler? IsRecordingChanged;
 
@@ -86,10 +86,7 @@ public void AddTrack(Track track)
             {
                 track.Begin = DateTime.UtcNow - cuesheet.RecordingStart;
             }
-            if ((track.End.HasValue == false) && (cuesheet.Audiofile?.Duration.HasValue == true))
-            {
-                track.End = cuesheet.Audiofile?.Duration;
-            }
+            SetLastTrackEnd();
             if (cuesheet.Tracks.Any() == false)
             {
                 track.Position = 1;
@@ -165,5 +162,14 @@ void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>
 
             _traceChangeManager.AddChange(new(cuesheet, new(previousValue, propertyInfo.Name)));
         }
+
+        void SetLastTrackEnd()
+        {
+            var lastTrack = _sessionStateContainer.Cuesheet.Tracks.LastOrDefault();
+            if ((lastTrack?.End.HasValue == false) && (_sessionStateContainer.Cuesheet.Audiofile?.Duration.HasValue == true))
+            {
+                _trackManager.SetProperty(lastTrack, x => x.End, _sessionStateContainer.Cuesheet.Audiofile.Duration);
+            }
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index e4f70574..67f3e399 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -120,12 +120,6 @@ along with Foobar.  If not, see
             }
             base.TraceChangeManager.BulkEdit = true;
             _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
-            //TODO: Move this to service (is needed on removing on tracks also)
-            var lastTrack = Cuesheet.Tracks.LastOrDefault();
-            if ((lastTrack != null) && (audiofile?.Duration.HasValue == true))
-            {
-                _trackManager.SetProperty(lastTrack, x => x.End, audiofile.Duration);
-            }
             base.TraceChangeManager.BulkEdit = false;
         }
         catch(ArgumentException ae)

From 41b5db52095673e7e71e70303a83b9229f327fce Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 14:05:58 +0200
Subject: [PATCH 047/150] Update TrackManager.cs

---
 .../Services/AudioCuesheet/TrackManager.cs               | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 0fe08cc3..d8209481 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -91,12 +91,9 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
         public Track? GetPreviousLinkedTrack(Track track)
         {
             Track? previousLinkedTrack = null;
-            if (track.IsLinkedToPreviousTrack && track.Position.HasValue)
+            if (track.IsLinkedToPreviousTrack)
             {
-                if (track.Position.Value > 1)
-                {
-                    previousLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value - 1);
-                }
+                previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1);
             }
             return previousLinkedTrack;
         }
@@ -107,7 +104,7 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             Track? nextLinkedTrack = null;
             if (track.Position.HasValue)
             {
-                nextLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
+                nextLinkedTrack = track.Cuesheet?.Tracks.FirstOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
             }
             return nextLinkedTrack;
         }

From 65753cc1d68ae213c35b760dc5a661707122d274 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 15:05:05 +0200
Subject: [PATCH 048/150] Update CuesheetManager.cs

---
 .../Services/AudioCuesheet/CuesheetManager.cs     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index a9bc03af..982fc2ea 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -135,9 +135,20 @@ public void RemoveTracks(IEnumerable<Track> tracksToRemove)
             var cuesheet = _sessionStateContainer.Cuesheet;
             var intersection = cuesheet.Tracks.Intersect(tracksToRemove);
             ICollection<Track> newValue = [.. cuesheet.Tracks.Except(intersection)];
+            //Calculate position and begin of new tracks
+            ushort position = 1;
+            foreach (var track in newValue.OrderBy(x => x.Position))
+            {
+                track.Position = position;
+                position++;
+                var previousTrack = _trackManager.GetPreviousLinkedTrack(track);
+                if (previousTrack?.End.HasValue == true)
+                {
+                    track.Begin = previousTrack.End;
+                }
+            }
             SetValue(cuesheet, x => x.Tracks, newValue);
-            //TODO: calculate position and begin of all tracks
-            //TODO: calculate last track end Cuesheet.RecalculateTrackProperties did
+            SetLastTrackEnd();
         }
 
         void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)

From cf3f9d1d97db2f690d3c522863049c87bbba9ccb Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 15:13:54 +0200
Subject: [PATCH 049/150] make tests compilable

---
 .../Model/AudioCuesheet/CuesheetTests.cs      | 1396 ++++++++---------
 .../Model/AudioCuesheet/TrackTests.cs         |  439 +++---
 .../Model/IO/ProjectfileTests.cs              |  196 +--
 .../Services/IO/CuesheetExportServiceTests.cs |  210 +--
 .../Services/IO/ExportfileGeneratorTests.cs   |  232 +--
 .../Services/IO/ImportManagerTests.cs         |  586 +++----
 .../Services/IO/TextImportServiceTests.cs     |    6 +-
 .../Services/UI/TraceChangeManagerTests.cs    |  424 ++---
 8 files changed, 1741 insertions(+), 1748 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs
index 0db99667..9de1d965 100644
--- a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs
+++ b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs
@@ -18,7 +18,6 @@
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -29,14 +28,7 @@ namespace AudioCuesheetEditor.Tests.Model.AudioCuesheet
     [TestClass()]
     public class CuesheetTests
     {
-        [TestMethod()]
-        public void AddTrackTest()
-        {
-            var cuesheet = new Cuesheet();
-            Assert.IsEmpty(cuesheet.Tracks);
-            cuesheet.AddTrack(new Track());
-            Assert.HasCount(1, cuesheet.Tracks);
-        }
+        //TODO: Move to other tests or delete, since usually the model doesn't get tested
 
         [TestMethod()]
         public void CuesheetTest()
@@ -50,698 +42,698 @@ public void CuesheetTest()
             Assert.AreEqual(ValidationStatus.Success, validationErrorAudioFile.Status);
         }
 
-        [TestMethod()]
-        public void EmptyCuesheetTracksValidationTest()
-        {
-            var cuesheet = new Cuesheet();
-            Assert.IsEmpty(cuesheet.Tracks);
-            var validationErrorTracks = cuesheet.Validate(nameof(Cuesheet.Tracks));
-            Assert.AreEqual(ValidationStatus.Error, validationErrorTracks.Status);
-            cuesheet.AddTrack(new Track());
-            validationErrorTracks = cuesheet.Validate(nameof(Cuesheet.Tracks));
-            Assert.AreEqual(ValidationStatus.Success, validationErrorTracks.Status);
-        }
-
-        [TestMethod()]
-        public void RecordTest()
-        {
-            var cuesheet = new Cuesheet();
-            Assert.IsFalse(cuesheet.IsRecording);
-            Assert.IsNull(cuesheet.RecordingStart);
-            cuesheet.StartRecording();
-            Assert.IsTrue(cuesheet.IsRecording);
-            Assert.IsNotNull(cuesheet.RecordingStart);
-            var track = new Track();
-            Assert.IsNull(track.Begin);
-            Assert.IsNull(track.End);
-            cuesheet.AddTrack(track);
-            Assert.AreEqual(TimeSpan.Zero, track.Begin);
-            Assert.IsNull(track.End);
-            var track2 = new Track();
-            cuesheet.AddTrack(track2);
-            Assert.IsNotNull(track.End);
-            Assert.AreNotEqual(TimeSpan.Zero, track.End);
-            cuesheet = new Cuesheet();
-            cuesheet.StartRecording();
-            track = new Track();
-            cuesheet.AddTrack(track);
-            Assert.AreEqual(TimeSpan.Zero, track.Begin);
-            Assert.IsNull(track.End);
-            Thread.Sleep(3000);
-            track2 = new Track();
-            cuesheet.AddTrack(track2);
-            Assert.IsNotNull(track.End);
-            Assert.AreNotEqual(TimeSpan.Zero, track.End);
-            cuesheet.StopRecording();
-            Assert.IsNotNull(track.End);
-            Assert.AreEqual(track.End, track2.Begin);
-        }
-
-        [TestMethod()]
-        public void TrackRecalculationTest()
-        {
-            var cuesheet = new Cuesheet();
-            var track1 = new Track();
-            var track2 = new Track();
-            var track3 = new Track();
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-            Assert.AreEqual((uint)1, track1.Position);
-            Assert.AreEqual((uint)2, track2.Position);
-            Assert.AreEqual((uint)3, track3.Position);
-            Assert.AreEqual(track1.Begin, TimeSpan.Zero);
-            Assert.IsNull(track1.End);
-            Assert.IsNull(track2.Begin);
-            Assert.IsNull(track2.End);
-            Assert.IsNull(track3.Begin);
-            Assert.IsNull(track3.End);
-            track1.Begin = TimeSpan.Zero;
-            track2.Begin = new TimeSpan(0, 2, 43);
-            Assert.IsNull(track1.End);
-            Assert.IsNull(track2.End);
-            track3.End = new TimeSpan(0, 12, 14);
-            Assert.IsNull(track2.End);
-            Assert.IsNull(track3.Begin);
-            track3.Begin = new TimeSpan(0, 7, 56);
-            Assert.IsNull(track2.End);
-        }
-        [TestMethod()]
-        public void TrackOverlappingTest()
-        {
-            var testHelper = new TestHelper();
-            var cuesheet = new Cuesheet();
-            var track1 = new Track();
-            var track2 = new Track();
-            var track3 = new Track();
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-            Assert.AreEqual((uint)1, track1.Position);
-            Assert.AreEqual((uint)2, track2.Position);
-            Assert.AreEqual((uint)3, track3.Position);
-            var validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-            Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-            track1.Position = 1;
-            track2.Position = 1;
-            track3.Position = 1;
-            track1.End = new TimeSpan(0, 2, 30);
-            track2.Begin = new TimeSpan(0, 2, 0);
-            track2.End = new TimeSpan(0, 5, 30);
-            track3.Begin = new TimeSpan(0, 4, 54);
-            track3.End = new TimeSpan(0, 8, 12);
-            validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-            Assert.AreEqual(7, validationResult.ValidationMessages?.Count);
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track1.Position) && x.Parameter[7].Equals(track1.Begin) && x.Parameter[8].Equals(track1.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track2.Position) && x.Parameter[7].Equals(track2.Begin) && x.Parameter[8].Equals(track2.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track3.Position) && x.Parameter[7].Equals(track3.Begin) && x.Parameter[8].Equals(track3.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track1.Position) && x.Parameter[4].Equals(track1.Begin) && x.Parameter[5].Equals(track1.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track1.Position) && x.Parameter[9].Equals(track1.Begin) && x.Parameter[10].Equals(track1.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-            track2.End = new TimeSpan(0, 5, 15);
-            validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-            track1.Position = 1;
-            track2.Position = 2;
-            track3.Position = 3;
-            validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-            Assert.AreEqual(4, validationResult.ValidationMessages?.Count);
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track1.Position) && x.Parameter[4].Equals(track1.Begin) && x.Parameter[5].Equals(track1.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track1.Position) && x.Parameter[9].Equals(track1.Begin) && x.Parameter[10].Equals(track1.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-            track2.Begin = new TimeSpan(0, 2, 30);
-            track3.Begin = new TimeSpan(0, 5, 15);
-            validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-            Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        }
-
-        [TestMethod()]
-        public void RemoveTrack_ShouldReCalculate_WithPreviouslyAddedTracks()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track() { Artist = "1", Title = "1", IsLinkedToPreviousTrack = true };
-            var track2 = new Track() { Artist = "2", Title = "2", IsLinkedToPreviousTrack = true };
-            var track3 = new Track() { Artist = "3", Title = "3" , IsLinkedToPreviousTrack = true };
-            var track4 = new Track() { Artist = "4", Title = "4" , IsLinkedToPreviousTrack = true };
-            var track5 = new Track() { Artist = "5", Title = "5" , IsLinkedToPreviousTrack = true };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-            cuesheet.AddTrack(track4);
-            cuesheet.AddTrack(track5);
-            track1.End = new TimeSpan(0, 5, 0);
-            track2.End = new TimeSpan(0, 10, 0);
-            track3.End = new TimeSpan(0, 15, 0);
-            track4.End = new TimeSpan(0, 20, 0);
-            track5.End = new TimeSpan(0, 25, 0);
-            // Act
-            cuesheet.RemoveTrack(track2);
-            // Assert
-            Assert.AreEqual((uint)2, track3.Position);
-            Assert.AreEqual((uint)3, track4.Position);
-            Assert.AreEqual((uint)4, track5.Position);
-        }
-
-        [TestMethod()]
-        public void RemoveTracks_ShouldRemoveTracks_WithPreviouslyAddedTracks()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track
-            {
-                Artist = "Track 1",
-                Title = "Track 1",
-                IsLinkedToPreviousTrack = true
-            };
-            cuesheet.AddTrack(track1);
-            var track2 = new Track
-            {
-                Title = "Track 2",
-                Artist = "Track 2",
-                Begin = new TimeSpan(0, 5, 0),
-                IsLinkedToPreviousTrack = true
-            };
-            cuesheet.AddTrack(track2);
-            var track3 = new Track
-            {
-                Artist = "Track 3",
-                Title = "Track 3",
-                Begin = new TimeSpan(0, 10, 0),
-                IsLinkedToPreviousTrack = true
-            };
-            cuesheet.AddTrack(track3);
-            var track4 = new Track
-            {
-                Artist = "Track 4",
-                Title = "Track 4",
-                Begin = new TimeSpan(0, 15, 0),
-                IsLinkedToPreviousTrack = true
-            };
-            cuesheet.AddTrack(track4);
-            var track5 = new Track
-            {
-                Artist = "Track 5",
-                Title = "Track 5",
-                Begin = new TimeSpan(0, 20, 0), IsLinkedToPreviousTrack = true
-            };
-            cuesheet.AddTrack(track5);
-            var list = new List<Track>() { track2, track4 };
-            // Act
-            cuesheet.RemoveTracks(list.AsReadOnly());
-            // Assert
-            Assert.HasCount(3, cuesheet.Tracks);
-            Assert.AreEqual(new TimeSpan(0, 5, 0), track3.Begin);
-            Assert.AreEqual(new TimeSpan(0, 15, 0), track5.Begin);
-            Assert.AreEqual((uint)1, track1.Position);
-            Assert.AreEqual((uint)2, track3.Position);
-            Assert.AreEqual((uint)3, track5.Position);
-        }
-
-        [TestMethod()]
-        public void UnlickedTrackTest()
-        {
-            var cuesheet = new Cuesheet();
-            var track1 = new Track
-            {
-                Position = 1,
-                End = new TimeSpan(0, 3, 23)
-            };
-            var track2 = new Track
-            {
-                Position = 2
-            };
-            var track3 = new Track
-            {
-                Position = 3
-            };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-            Assert.AreEqual(track1.End, track2.Begin);
-            Assert.IsNull(track2.End);
-            Assert.IsNull(track3.Begin);
-            track3.Begin = new TimeSpan(0, 7, 32);
-            Assert.IsNull(track2.End);
-        }
-
-        [TestMethod()]
-        public void TrackPositionChangedTest()
-        {
-            var cuesheet = new Cuesheet();
-            var track1 = new Track
-            {
-                Position = 3,
-                End = new TimeSpan(0, 5, 0)
-            };
-            var track2 = new Track
-            {
-                Position = 2,
-                Begin = track1.End,
-                End = new TimeSpan(0, 7, 30)
-            };
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track1);
-            Assert.AreEqual(track2, cuesheet.Tracks.First());
-            Assert.AreEqual(track1, cuesheet.Tracks.Last());
-            track1.Position = 1;
-            Assert.AreEqual(track2, cuesheet.Tracks.First());
-            Assert.AreEqual(track1, cuesheet.Tracks.Last());
-        }
-
-        [TestMethod()]
-        public void TrackLengthChangedWithIsLinkedToPreivousTest()
-        {
-            var cuesheet = new Cuesheet();
-            var track1 = new Track();
-            var track2 = new Track();
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            track1.IsLinkedToPreviousTrack = true;
-            track2.IsLinkedToPreviousTrack = true;
-            Assert.IsNull(track2.Begin);
-            Assert.IsNotNull(track1.Begin);
-            var editedTrack = new Track() { Begin = TimeSpan.Zero, Length = new TimeSpan(0, 2, 23) };
-            track1.CopyValues(editedTrack);
-            Assert.IsNotNull(track1.End);
-            Assert.AreEqual(track1.End, track2.Begin);
-            Assert.AreEqual(editedTrack.End, track2.Begin);
-        }
-
-        [TestMethod()]
-        public void ValidateTest()
-        {
-            var cuesheet = new Cuesheet();
-            Assert.AreEqual(ValidationStatus.Error, cuesheet.Validate(nameof(Cuesheet.Artist)).Status);
-            cuesheet.Artist = "Testartist";
-            Assert.AreEqual(ValidationStatus.Success, cuesheet.Validate(nameof(Cuesheet.Artist)).Status);
-            Assert.AreEqual(ValidationStatus.Error, cuesheet.Validate(nameof(Cuesheet.Title)).Status);
-            cuesheet.Title = "Testtitle";
-            Assert.AreEqual(ValidationStatus.Success, cuesheet.Validate(nameof(Cuesheet.Title)).Status);
-        }
-
-        [TestMethod()]
-        public void IsLinkedToPreviousTrack_ChangedLastTrackBegin_SetsTrackProperties()
-        {
-            //Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track()
-            {
-                Artist = "Track1 Artist",
-                Title = "Track1 Title"
-            };
-            var track2 = new Track()
-            {
-                Artist = "Track2 Artist",
-                Title = "Track2 Title",
-                End = new TimeSpan(0, 9, 12)
-            };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            track2.Begin = new TimeSpan(0, 4, 23);
-            //Act
-            track2.IsLinkedToPreviousTrack = true;
-            //Assert
-            Assert.AreEqual((uint)2, track2.Position);
-            Assert.AreEqual(track2.Begin, track1.End);
-        }
-
-        [TestMethod()]
-        public void IsRecordingPossible_WhenRecordingIsAlreadyRunning_ReturnsError()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            cuesheet.StartRecording();
-
-            // Act
-            var errors = cuesheet.IsRecordingPossible.ToList();
-
-            // Assert
-            Assert.Contains("Record is already running!", errors);
-        }
-
-        [TestMethod()]
-        public void IsRecordingPossible_WhenCuesheetContainsTracks_ReturnsError()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            cuesheet.AddTrack(new Track());
-
-            // Act
-            var errors = cuesheet.IsRecordingPossible.ToList();
-
-            // Assert
-            Assert.Contains("Cuesheet already contains tracks!", errors);
-        }
-
-        [TestMethod()]
-        public void IsRecordingPossible_WhenNoErrors_ReturnsEmpty()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-
-            // Act
-            var errors = cuesheet.IsRecordingPossible.ToList();
-
-            // Assert
-            Assert.IsEmpty(errors);
-        }
-
-        [TestMethod]
-        public void MoveTracksPossible_ShouldReturnFalse_WhenNoTracksToMove()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var tracksToMove = new List<Track>();
-
-            // Act
-            var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
-
-            // Assert
-            Assert.IsFalse(result);
-        }
-
-        [TestMethod]
-        public void MoveTracksPossible_ShouldReturnFalse_WhenMovingUpAndFirstTrack()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track = new Track();
-            cuesheet.AddTrack(track);
-            var tracksToMove = new List<Track> { track };
-
-            // Act
-            var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
-
-            // Assert
-            Assert.IsFalse(result);
-        }
-
-        [TestMethod]
-        public void MoveTracksPossible_ShouldReturnTrue_WhenMovingUpAndNotFirstTrack()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track();
-            var track2 = new Track();
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            var tracksToMove = new List<Track> { track2 };
-
-            // Act
-            var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
-
-            // Assert
-            Assert.IsTrue(result);
-        }
-
-        [TestMethod]
-        public void MoveTracksPossible_ShouldReturnFalse_WhenMovingDownAndLastTrack()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track();
-            var track2 = new Track();
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            var tracksToMove = new List<Track> { track2 };
-
-            // Act
-            var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Down);
-
-            // Assert
-            Assert.IsFalse(result);
-        }
-
-
-        [TestMethod]
-        public void MoveTracksPossible_ShouldReturnTrue_WhenMovingDownAndNotLastTrack()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track();
-            var track2 = new Track();
-            var track3 = new Track();
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-            var tracksToMove = new List<Track> { track2 };
-
-            // Act
-            var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Down);
-
-            // Assert
-            Assert.IsTrue(result);
-        }
-
-
-        [TestMethod]
-        public void MoveTracks_Up_Success()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track { Position = 1 };
-            var track2 = new Track { Position = 2 };
-            var track3 = new Track { Position = 3 };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-
-            // Act
-            cuesheet.MoveTracks([track2], MoveDirection.Up);
-
-            // Assert
-            Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(0).Position);
-            Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(1).Position);
-            Assert.AreEqual((uint)3, cuesheet.Tracks.ElementAt(2).Position);
-            Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(0));
-            Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(1));
-            Assert.AreEqual(track3, cuesheet.Tracks.ElementAt(2));
-        }
-
-        [TestMethod]
-        public void MoveTracks_Down_Success()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track { Position = 1 };
-            var track2 = new Track { Position = 2 };
-            var track3 = new Track { Position = 3 };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-
-            // Act
-            cuesheet.MoveTracks([track2], MoveDirection.Down);
-
-            // Assert
-            Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
-            Assert.AreEqual((uint)3, cuesheet.Tracks.ElementAt(1).Position);
-            Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(2).Position);
-            Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
-            Assert.AreEqual(track3, cuesheet.Tracks.ElementAt(1));
-            Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(2));
-        }
-
-        [TestMethod]
-        public void MoveTracks_Up_NotPossible()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track { Position = 1 };
-            var track2 = new Track { Position = 2 };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-
-            // Act
-            cuesheet.MoveTracks([track1], MoveDirection.Up);
-
-            // Assert
-            Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
-            Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(1).Position);
-            Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
-            Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(1));
-        }
-
-        [TestMethod]
-        public void MoveTracks_Down_NotPossible()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track { Position = 1 };
-            var track2 = new Track { Position = 2 };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-
-            // Act
-            cuesheet.MoveTracks([track2], MoveDirection.Down);
-
-            // Assert
-            Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
-            Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(1).Position);
-            Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
-            Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(1));
-        }
-
-        [TestMethod]
-        public void StartRecording_WithValidData_ShouldStartRecording()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-
-            // Act
-            cuesheet.StartRecording();
-
-            // Assert
-            Assert.IsTrue(cuesheet.IsRecording);
-            Assert.IsNotNull(cuesheet.RecordingStart);
-        }
-
-        [TestMethod]
-        public void StopRecording_WithRecordingRunning_ShouldStopRecording()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            cuesheet.StartRecording();
-            var track = new Track();
-            cuesheet.AddTrack(track);
-            bool isRecordingChangedEventFired = false;
-            cuesheet.IsRecordingChanged += (sender, args) => isRecordingChangedEventFired = true;
-
-            // Act
-            cuesheet.StopRecording();
-
-            // Assert
-            Assert.IsFalse(cuesheet.IsRecording);
-            Assert.IsNull(cuesheet.RecordingStart);
-            Assert.IsTrue(isRecordingChangedEventFired);
-            Assert.IsNotNull(track.End);
-        }
-
-        [TestMethod]
-        public void StartRecording_ShouldNotStartIfAlreadyRecording()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            cuesheet.StartRecording();
-
-            // Act
-            cuesheet.StartRecording();
-
-            // Assert
-            Assert.IsTrue(cuesheet.IsRecording);
-            Assert.IsNotNull(cuesheet.RecordingStart);
-        }
-
-        [TestMethod]
-        public void StartRecording_WithTrackAlreadyAdded_ShouldNotStartRecording()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            cuesheet.AddTrack(new Track());
-
-            // Act
-            cuesheet.StartRecording();
-
-            // Assert
-            Assert.IsFalse(cuesheet.IsRecording);
-        }
-
-        [TestMethod]
-        public void StartRecording_WithAudiofile_ShouldStartRecording()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet
-            {
-                Audiofile = new Audiofile("test")
-            };
-
-            // Act
-            cuesheet.StartRecording();
-
-            // Assert
-            Assert.IsTrue(cuesheet.IsRecording);
-        }
-
-        [TestMethod]
-        public void RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet
-            {
-                Audiofile = new("Test.mp3", nameof(RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration), new AudioCodec("audio/mpeg", ".mp3", "AudioCodec MP3"), TimeSpan.FromMinutes(5))
-            };
-            var track = new Track { Position = 1, Begin = TimeSpan.Zero };
-            cuesheet.AddTrack(track);
-
-            // Act
-            cuesheet.RecalculateLastTrackEnd();
-
-            // Assert
-            Assert.AreEqual(TimeSpan.FromMinutes(5), track.End);
-        }
-
-        [TestMethod]
-        public void RecalculateLastTrackEnd_MultipleTracks_EndSetCorrectly()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
-            var track2 = new Track { Position = 2, Begin = TimeSpan.FromMinutes(2) };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-
-            // Act
-            cuesheet.RecalculateLastTrackEnd();
-
-            // Assert
-            Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
-            Assert.IsNull(track2.End);
-        }
-
-        [TestMethod]
-        public void RecalculateLastTrackEnd_MultipleTracksWithAudiofile_LastTrackEndSetToAudiofileDuration()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet
-            {
-                Audiofile = new("Test.mp3", nameof(RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration), new AudioCodec("audio/mpeg", ".mp3", "AudioCodec MP3"), TimeSpan.FromMinutes(5))
-            };
-            var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
-            var track2 = new Track { Position = 2, Begin = TimeSpan.FromMinutes(2) };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-
-            // Act
-            cuesheet.RecalculateLastTrackEnd();
-
-            // Assert
-            Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
-            Assert.AreEqual(TimeSpan.FromMinutes(5), track2.End);
-        }
-
-        [TestMethod]
-        public void RecalculateLastTrackEnd_TracksWithLinkedPreviousTrack_PropertiesRecalculatedCorrectly()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet();
-            var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
-            var track2 = new Track { Position = 2, IsLinkedToPreviousTrack = true };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-
-            // Act
-            cuesheet.RecalculateLastTrackEnd();
-
-            // Assert
-            Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
-            Assert.AreEqual(TimeSpan.FromMinutes(2), track2.Begin);
-        }
+        //[TestMethod()]
+        //public void EmptyCuesheetTracksValidationTest()
+        //{
+        //    var cuesheet = new Cuesheet();
+        //    Assert.IsEmpty(cuesheet.Tracks);
+        //    var validationErrorTracks = cuesheet.Validate(nameof(Cuesheet.Tracks));
+        //    Assert.AreEqual(ValidationStatus.Error, validationErrorTracks.Status);
+        //    cuesheet.AddTrack(new Track());
+        //    validationErrorTracks = cuesheet.Validate(nameof(Cuesheet.Tracks));
+        //    Assert.AreEqual(ValidationStatus.Success, validationErrorTracks.Status);
+        //}
+
+        //[TestMethod()]
+        //public void RecordTest()
+        //{
+        //    var cuesheet = new Cuesheet();
+        //    Assert.IsFalse(cuesheet.IsRecording);
+        //    Assert.IsNull(cuesheet.RecordingStart);
+        //    cuesheet.StartRecording();
+        //    Assert.IsTrue(cuesheet.IsRecording);
+        //    Assert.IsNotNull(cuesheet.RecordingStart);
+        //    var track = new Track();
+        //    Assert.IsNull(track.Begin);
+        //    Assert.IsNull(track.End);
+        //    cuesheet.AddTrack(track);
+        //    Assert.AreEqual(TimeSpan.Zero, track.Begin);
+        //    Assert.IsNull(track.End);
+        //    var track2 = new Track();
+        //    cuesheet.AddTrack(track2);
+        //    Assert.IsNotNull(track.End);
+        //    Assert.AreNotEqual(TimeSpan.Zero, track.End);
+        //    cuesheet = new Cuesheet();
+        //    cuesheet.StartRecording();
+        //    track = new Track();
+        //    cuesheet.AddTrack(track);
+        //    Assert.AreEqual(TimeSpan.Zero, track.Begin);
+        //    Assert.IsNull(track.End);
+        //    Thread.Sleep(3000);
+        //    track2 = new Track();
+        //    cuesheet.AddTrack(track2);
+        //    Assert.IsNotNull(track.End);
+        //    Assert.AreNotEqual(TimeSpan.Zero, track.End);
+        //    cuesheet.StopRecording();
+        //    Assert.IsNotNull(track.End);
+        //    Assert.AreEqual(track.End, track2.Begin);
+        //}
+
+        //[TestMethod()]
+        //public void TrackRecalculationTest()
+        //{
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track();
+        //    var track2 = new Track();
+        //    var track3 = new Track();
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+        //    Assert.AreEqual((uint)1, track1.Position);
+        //    Assert.AreEqual((uint)2, track2.Position);
+        //    Assert.AreEqual((uint)3, track3.Position);
+        //    Assert.AreEqual(track1.Begin, TimeSpan.Zero);
+        //    Assert.IsNull(track1.End);
+        //    Assert.IsNull(track2.Begin);
+        //    Assert.IsNull(track2.End);
+        //    Assert.IsNull(track3.Begin);
+        //    Assert.IsNull(track3.End);
+        //    track1.Begin = TimeSpan.Zero;
+        //    track2.Begin = new TimeSpan(0, 2, 43);
+        //    Assert.IsNull(track1.End);
+        //    Assert.IsNull(track2.End);
+        //    track3.End = new TimeSpan(0, 12, 14);
+        //    Assert.IsNull(track2.End);
+        //    Assert.IsNull(track3.Begin);
+        //    track3.Begin = new TimeSpan(0, 7, 56);
+        //    Assert.IsNull(track2.End);
+        //}
+        //[TestMethod()]
+        //public void TrackOverlappingTest()
+        //{
+        //    var testHelper = new TestHelper();
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track();
+        //    var track2 = new Track();
+        //    var track3 = new Track();
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+        //    Assert.AreEqual((uint)1, track1.Position);
+        //    Assert.AreEqual((uint)2, track2.Position);
+        //    Assert.AreEqual((uint)3, track3.Position);
+        //    var validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
+        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
+        //    track1.Position = 1;
+        //    track2.Position = 1;
+        //    track3.Position = 1;
+        //    track1.End = new TimeSpan(0, 2, 30);
+        //    track2.Begin = new TimeSpan(0, 2, 0);
+        //    track2.End = new TimeSpan(0, 5, 30);
+        //    track3.Begin = new TimeSpan(0, 4, 54);
+        //    track3.End = new TimeSpan(0, 8, 12);
+        //    validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
+        //    Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+        //    Assert.AreEqual(7, validationResult.ValidationMessages?.Count);
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track1.Position) && x.Parameter[7].Equals(track1.Begin) && x.Parameter[8].Equals(track1.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track2.Position) && x.Parameter[7].Equals(track2.Begin) && x.Parameter[8].Equals(track2.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track3.Position) && x.Parameter[7].Equals(track3.Begin) && x.Parameter[8].Equals(track3.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track1.Position) && x.Parameter[4].Equals(track1.Begin) && x.Parameter[5].Equals(track1.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track1.Position) && x.Parameter[9].Equals(track1.Begin) && x.Parameter[10].Equals(track1.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
+        //    track2.End = new TimeSpan(0, 5, 15);
+        //    validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
+        //    Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
+        //    track1.Position = 1;
+        //    track2.Position = 2;
+        //    track3.Position = 3;
+        //    validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
+        //    Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+        //    Assert.AreEqual(4, validationResult.ValidationMessages?.Count);
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track1.Position) && x.Parameter[4].Equals(track1.Begin) && x.Parameter[5].Equals(track1.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track1.Position) && x.Parameter[9].Equals(track1.Begin) && x.Parameter[10].Equals(track1.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
+        //    track2.Begin = new TimeSpan(0, 2, 30);
+        //    track3.Begin = new TimeSpan(0, 5, 15);
+        //    validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
+        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
+        //}
+
+        //[TestMethod()]
+        //public void RemoveTrack_ShouldReCalculate_WithPreviouslyAddedTracks()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track() { Artist = "1", Title = "1", IsLinkedToPreviousTrack = true };
+        //    var track2 = new Track() { Artist = "2", Title = "2", IsLinkedToPreviousTrack = true };
+        //    var track3 = new Track() { Artist = "3", Title = "3" , IsLinkedToPreviousTrack = true };
+        //    var track4 = new Track() { Artist = "4", Title = "4" , IsLinkedToPreviousTrack = true };
+        //    var track5 = new Track() { Artist = "5", Title = "5" , IsLinkedToPreviousTrack = true };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+        //    cuesheet.AddTrack(track4);
+        //    cuesheet.AddTrack(track5);
+        //    track1.End = new TimeSpan(0, 5, 0);
+        //    track2.End = new TimeSpan(0, 10, 0);
+        //    track3.End = new TimeSpan(0, 15, 0);
+        //    track4.End = new TimeSpan(0, 20, 0);
+        //    track5.End = new TimeSpan(0, 25, 0);
+        //    // Act
+        //    cuesheet.RemoveTrack(track2);
+        //    // Assert
+        //    Assert.AreEqual((uint)2, track3.Position);
+        //    Assert.AreEqual((uint)3, track4.Position);
+        //    Assert.AreEqual((uint)4, track5.Position);
+        //}
+
+        //[TestMethod()]
+        //public void RemoveTracks_ShouldRemoveTracks_WithPreviouslyAddedTracks()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track
+        //    {
+        //        Artist = "Track 1",
+        //        Title = "Track 1",
+        //        IsLinkedToPreviousTrack = true
+        //    };
+        //    cuesheet.AddTrack(track1);
+        //    var track2 = new Track
+        //    {
+        //        Title = "Track 2",
+        //        Artist = "Track 2",
+        //        Begin = new TimeSpan(0, 5, 0),
+        //        IsLinkedToPreviousTrack = true
+        //    };
+        //    cuesheet.AddTrack(track2);
+        //    var track3 = new Track
+        //    {
+        //        Artist = "Track 3",
+        //        Title = "Track 3",
+        //        Begin = new TimeSpan(0, 10, 0),
+        //        IsLinkedToPreviousTrack = true
+        //    };
+        //    cuesheet.AddTrack(track3);
+        //    var track4 = new Track
+        //    {
+        //        Artist = "Track 4",
+        //        Title = "Track 4",
+        //        Begin = new TimeSpan(0, 15, 0),
+        //        IsLinkedToPreviousTrack = true
+        //    };
+        //    cuesheet.AddTrack(track4);
+        //    var track5 = new Track
+        //    {
+        //        Artist = "Track 5",
+        //        Title = "Track 5",
+        //        Begin = new TimeSpan(0, 20, 0), IsLinkedToPreviousTrack = true
+        //    };
+        //    cuesheet.AddTrack(track5);
+        //    var list = new List<Track>() { track2, track4 };
+        //    // Act
+        //    cuesheet.RemoveTracks(list.AsReadOnly());
+        //    // Assert
+        //    Assert.HasCount(3, cuesheet.Tracks);
+        //    Assert.AreEqual(new TimeSpan(0, 5, 0), track3.Begin);
+        //    Assert.AreEqual(new TimeSpan(0, 15, 0), track5.Begin);
+        //    Assert.AreEqual((uint)1, track1.Position);
+        //    Assert.AreEqual((uint)2, track3.Position);
+        //    Assert.AreEqual((uint)3, track5.Position);
+        //}
+
+        //[TestMethod()]
+        //public void UnlickedTrackTest()
+        //{
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track
+        //    {
+        //        Position = 1,
+        //        End = new TimeSpan(0, 3, 23)
+        //    };
+        //    var track2 = new Track
+        //    {
+        //        Position = 2
+        //    };
+        //    var track3 = new Track
+        //    {
+        //        Position = 3
+        //    };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+        //    Assert.AreEqual(track1.End, track2.Begin);
+        //    Assert.IsNull(track2.End);
+        //    Assert.IsNull(track3.Begin);
+        //    track3.Begin = new TimeSpan(0, 7, 32);
+        //    Assert.IsNull(track2.End);
+        //}
+
+        //[TestMethod()]
+        //public void TrackPositionChangedTest()
+        //{
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track
+        //    {
+        //        Position = 3,
+        //        End = new TimeSpan(0, 5, 0)
+        //    };
+        //    var track2 = new Track
+        //    {
+        //        Position = 2,
+        //        Begin = track1.End,
+        //        End = new TimeSpan(0, 7, 30)
+        //    };
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track1);
+        //    Assert.AreEqual(track2, cuesheet.Tracks.First());
+        //    Assert.AreEqual(track1, cuesheet.Tracks.Last());
+        //    track1.Position = 1;
+        //    Assert.AreEqual(track2, cuesheet.Tracks.First());
+        //    Assert.AreEqual(track1, cuesheet.Tracks.Last());
+        //}
+
+        //[TestMethod()]
+        //public void TrackLengthChangedWithIsLinkedToPreivousTest()
+        //{
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track();
+        //    var track2 = new Track();
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    track1.IsLinkedToPreviousTrack = true;
+        //    track2.IsLinkedToPreviousTrack = true;
+        //    Assert.IsNull(track2.Begin);
+        //    Assert.IsNotNull(track1.Begin);
+        //    var editedTrack = new Track() { Begin = TimeSpan.Zero, Length = new TimeSpan(0, 2, 23) };
+        //    track1.CopyValues(editedTrack);
+        //    Assert.IsNotNull(track1.End);
+        //    Assert.AreEqual(track1.End, track2.Begin);
+        //    Assert.AreEqual(editedTrack.End, track2.Begin);
+        //}
+
+        //[TestMethod()]
+        //public void ValidateTest()
+        //{
+        //    var cuesheet = new Cuesheet();
+        //    Assert.AreEqual(ValidationStatus.Error, cuesheet.Validate(nameof(Cuesheet.Artist)).Status);
+        //    cuesheet.Artist = "Testartist";
+        //    Assert.AreEqual(ValidationStatus.Success, cuesheet.Validate(nameof(Cuesheet.Artist)).Status);
+        //    Assert.AreEqual(ValidationStatus.Error, cuesheet.Validate(nameof(Cuesheet.Title)).Status);
+        //    cuesheet.Title = "Testtitle";
+        //    Assert.AreEqual(ValidationStatus.Success, cuesheet.Validate(nameof(Cuesheet.Title)).Status);
+        //}
+
+        //[TestMethod()]
+        //public void IsLinkedToPreviousTrack_ChangedLastTrackBegin_SetsTrackProperties()
+        //{
+        //    //Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track()
+        //    {
+        //        Artist = "Track1 Artist",
+        //        Title = "Track1 Title"
+        //    };
+        //    var track2 = new Track()
+        //    {
+        //        Artist = "Track2 Artist",
+        //        Title = "Track2 Title",
+        //        End = new TimeSpan(0, 9, 12)
+        //    };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    track2.Begin = new TimeSpan(0, 4, 23);
+        //    //Act
+        //    track2.IsLinkedToPreviousTrack = true;
+        //    //Assert
+        //    Assert.AreEqual((uint)2, track2.Position);
+        //    Assert.AreEqual(track2.Begin, track1.End);
+        //}
+
+        //[TestMethod()]
+        //public void IsRecordingPossible_WhenRecordingIsAlreadyRunning_ReturnsError()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    cuesheet.StartRecording();
+
+        //    // Act
+        //    var errors = cuesheet.IsRecordingPossible.ToList();
+
+        //    // Assert
+        //    Assert.Contains("Record is already running!", errors);
+        //}
+
+        //[TestMethod()]
+        //public void IsRecordingPossible_WhenCuesheetContainsTracks_ReturnsError()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    cuesheet.AddTrack(new Track());
+
+        //    // Act
+        //    var errors = cuesheet.IsRecordingPossible.ToList();
+
+        //    // Assert
+        //    Assert.Contains("Cuesheet already contains tracks!", errors);
+        //}
+
+        //[TestMethod()]
+        //public void IsRecordingPossible_WhenNoErrors_ReturnsEmpty()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+
+        //    // Act
+        //    var errors = cuesheet.IsRecordingPossible.ToList();
+
+        //    // Assert
+        //    Assert.IsEmpty(errors);
+        //}
+
+        //[TestMethod]
+        //public void MoveTracksPossible_ShouldReturnFalse_WhenNoTracksToMove()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var tracksToMove = new List<Track>();
+
+        //    // Act
+        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
+
+        //    // Assert
+        //    Assert.IsFalse(result);
+        //}
+
+        //[TestMethod]
+        //public void MoveTracksPossible_ShouldReturnFalse_WhenMovingUpAndFirstTrack()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track = new Track();
+        //    cuesheet.AddTrack(track);
+        //    var tracksToMove = new List<Track> { track };
+
+        //    // Act
+        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
+
+        //    // Assert
+        //    Assert.IsFalse(result);
+        //}
+
+        //[TestMethod]
+        //public void MoveTracksPossible_ShouldReturnTrue_WhenMovingUpAndNotFirstTrack()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track();
+        //    var track2 = new Track();
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    var tracksToMove = new List<Track> { track2 };
+
+        //    // Act
+        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
+
+        //    // Assert
+        //    Assert.IsTrue(result);
+        //}
+
+        //[TestMethod]
+        //public void MoveTracksPossible_ShouldReturnFalse_WhenMovingDownAndLastTrack()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track();
+        //    var track2 = new Track();
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    var tracksToMove = new List<Track> { track2 };
+
+        //    // Act
+        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Down);
+
+        //    // Assert
+        //    Assert.IsFalse(result);
+        //}
+
+
+        //[TestMethod]
+        //public void MoveTracksPossible_ShouldReturnTrue_WhenMovingDownAndNotLastTrack()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track();
+        //    var track2 = new Track();
+        //    var track3 = new Track();
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+        //    var tracksToMove = new List<Track> { track2 };
+
+        //    // Act
+        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Down);
+
+        //    // Assert
+        //    Assert.IsTrue(result);
+        //}
+
+
+        //[TestMethod]
+        //public void MoveTracks_Up_Success()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track { Position = 1 };
+        //    var track2 = new Track { Position = 2 };
+        //    var track3 = new Track { Position = 3 };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+
+        //    // Act
+        //    cuesheet.MoveTracks([track2], MoveDirection.Up);
+
+        //    // Assert
+        //    Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(0).Position);
+        //    Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(1).Position);
+        //    Assert.AreEqual((uint)3, cuesheet.Tracks.ElementAt(2).Position);
+        //    Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(0));
+        //    Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(1));
+        //    Assert.AreEqual(track3, cuesheet.Tracks.ElementAt(2));
+        //}
+
+        //[TestMethod]
+        //public void MoveTracks_Down_Success()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track { Position = 1 };
+        //    var track2 = new Track { Position = 2 };
+        //    var track3 = new Track { Position = 3 };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+
+        //    // Act
+        //    cuesheet.MoveTracks([track2], MoveDirection.Down);
+
+        //    // Assert
+        //    Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
+        //    Assert.AreEqual((uint)3, cuesheet.Tracks.ElementAt(1).Position);
+        //    Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(2).Position);
+        //    Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
+        //    Assert.AreEqual(track3, cuesheet.Tracks.ElementAt(1));
+        //    Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(2));
+        //}
+
+        //[TestMethod]
+        //public void MoveTracks_Up_NotPossible()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track { Position = 1 };
+        //    var track2 = new Track { Position = 2 };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+
+        //    // Act
+        //    cuesheet.MoveTracks([track1], MoveDirection.Up);
+
+        //    // Assert
+        //    Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
+        //    Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(1).Position);
+        //    Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
+        //    Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(1));
+        //}
+
+        //[TestMethod]
+        //public void MoveTracks_Down_NotPossible()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track { Position = 1 };
+        //    var track2 = new Track { Position = 2 };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+
+        //    // Act
+        //    cuesheet.MoveTracks([track2], MoveDirection.Down);
+
+        //    // Assert
+        //    Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
+        //    Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(1).Position);
+        //    Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
+        //    Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(1));
+        //}
+
+        //[TestMethod]
+        //public void StartRecording_WithValidData_ShouldStartRecording()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+
+        //    // Act
+        //    cuesheet.StartRecording();
+
+        //    // Assert
+        //    Assert.IsTrue(cuesheet.IsRecording);
+        //    Assert.IsNotNull(cuesheet.RecordingStart);
+        //}
+
+        //[TestMethod]
+        //public void StopRecording_WithRecordingRunning_ShouldStopRecording()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    cuesheet.StartRecording();
+        //    var track = new Track();
+        //    cuesheet.AddTrack(track);
+        //    bool isRecordingChangedEventFired = false;
+        //    cuesheet.IsRecordingChanged += (sender, args) => isRecordingChangedEventFired = true;
+
+        //    // Act
+        //    cuesheet.StopRecording();
+
+        //    // Assert
+        //    Assert.IsFalse(cuesheet.IsRecording);
+        //    Assert.IsNull(cuesheet.RecordingStart);
+        //    Assert.IsTrue(isRecordingChangedEventFired);
+        //    Assert.IsNotNull(track.End);
+        //}
+
+        //[TestMethod]
+        //public void StartRecording_ShouldNotStartIfAlreadyRecording()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    cuesheet.StartRecording();
+
+        //    // Act
+        //    cuesheet.StartRecording();
+
+        //    // Assert
+        //    Assert.IsTrue(cuesheet.IsRecording);
+        //    Assert.IsNotNull(cuesheet.RecordingStart);
+        //}
+
+        //[TestMethod]
+        //public void StartRecording_WithTrackAlreadyAdded_ShouldNotStartRecording()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    cuesheet.AddTrack(new Track());
+
+        //    // Act
+        //    cuesheet.StartRecording();
+
+        //    // Assert
+        //    Assert.IsFalse(cuesheet.IsRecording);
+        //}
+
+        //[TestMethod]
+        //public void StartRecording_WithAudiofile_ShouldStartRecording()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet
+        //    {
+        //        Audiofile = new Audiofile("test")
+        //    };
+
+        //    // Act
+        //    cuesheet.StartRecording();
+
+        //    // Assert
+        //    Assert.IsTrue(cuesheet.IsRecording);
+        //}
+
+        //[TestMethod]
+        //public void RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet
+        //    {
+        //        Audiofile = new("Test.mp3", nameof(RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration), new AudioCodec("audio/mpeg", ".mp3", "AudioCodec MP3"), TimeSpan.FromMinutes(5))
+        //    };
+        //    var track = new Track { Position = 1, Begin = TimeSpan.Zero };
+        //    cuesheet.AddTrack(track);
+
+        //    // Act
+        //    cuesheet.RecalculateLastTrackEnd();
+
+        //    // Assert
+        //    Assert.AreEqual(TimeSpan.FromMinutes(5), track.End);
+        //}
+
+        //[TestMethod]
+        //public void RecalculateLastTrackEnd_MultipleTracks_EndSetCorrectly()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
+        //    var track2 = new Track { Position = 2, Begin = TimeSpan.FromMinutes(2) };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+
+        //    // Act
+        //    cuesheet.RecalculateLastTrackEnd();
+
+        //    // Assert
+        //    Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
+        //    Assert.IsNull(track2.End);
+        //}
+
+        //[TestMethod]
+        //public void RecalculateLastTrackEnd_MultipleTracksWithAudiofile_LastTrackEndSetToAudiofileDuration()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet
+        //    {
+        //        Audiofile = new("Test.mp3", nameof(RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration), new AudioCodec("audio/mpeg", ".mp3", "AudioCodec MP3"), TimeSpan.FromMinutes(5))
+        //    };
+        //    var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
+        //    var track2 = new Track { Position = 2, Begin = TimeSpan.FromMinutes(2) };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+
+        //    // Act
+        //    cuesheet.RecalculateLastTrackEnd();
+
+        //    // Assert
+        //    Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
+        //    Assert.AreEqual(TimeSpan.FromMinutes(5), track2.End);
+        //}
+
+        //[TestMethod]
+        //public void RecalculateLastTrackEnd_TracksWithLinkedPreviousTrack_PropertiesRecalculatedCorrectly()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
+        //    var track2 = new Track { Position = 2, IsLinkedToPreviousTrack = true };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+
+        //    // Act
+        //    cuesheet.RecalculateLastTrackEnd();
+
+        //    // Assert
+        //    Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
+        //    Assert.AreEqual(TimeSpan.FromMinutes(2), track2.Begin);
+        //}
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs
index fe4c93ca..bbfe003b 100644
--- a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs
+++ b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs
@@ -26,232 +26,233 @@ namespace AudioCuesheetEditor.Tests.Model.AudioCuesheet
     [TestClass()]
     public class TrackTests
     {
-        [TestMethod()]
-        public void TrackTest()
-        {
-            //Tests for Length
-            var track = new Track();
-            Assert.IsNull(track.Length);
-            track.Length = new TimeSpan(0, 2, 30);
-            Assert.IsNotNull(track.Length);
-            Assert.IsNotNull(track.Begin);
-            Assert.IsNotNull(track.End);
-            Assert.AreEqual(TimeSpan.Zero, track.Begin);
-            Assert.AreEqual(new TimeSpan(0, 2, 30), track.End);
-            Assert.AreEqual(new TimeSpan(0, 2, 30), track.Length);
-            track.Begin = new TimeSpan(0, 25, 0);
-            Assert.IsNull(track.Length);
-            track.Length = new TimeSpan(0, 3, 30);
-            Assert.IsNotNull(track.Length);
-            Assert.AreEqual(new TimeSpan(0, 3, 30), track.Length);
-            Assert.AreEqual(new TimeSpan(0, 28, 30), track.End);
-            track.Begin = null;
-            Assert.IsNull(track.Length);
-            track.Length = new TimeSpan(0, 5, 15);
-            Assert.AreEqual(new TimeSpan(0, 28, 30), track.End);
-            Assert.AreEqual(new TimeSpan(0, 5, 15), track.Length);
-            Assert.AreEqual(new TimeSpan(0, 23, 15), track.Begin);
-        }
+        //TODO
+        //[TestMethod()]
+        //public void TrackTest()
+        //{
+        //    //Tests for Length
+        //    var track = new Track();
+        //    Assert.IsNull(track.Length);
+        //    track.Length = new TimeSpan(0, 2, 30);
+        //    Assert.IsNotNull(track.Length);
+        //    Assert.IsNotNull(track.Begin);
+        //    Assert.IsNotNull(track.End);
+        //    Assert.AreEqual(TimeSpan.Zero, track.Begin);
+        //    Assert.AreEqual(new TimeSpan(0, 2, 30), track.End);
+        //    Assert.AreEqual(new TimeSpan(0, 2, 30), track.Length);
+        //    track.Begin = new TimeSpan(0, 25, 0);
+        //    Assert.IsNull(track.Length);
+        //    track.Length = new TimeSpan(0, 3, 30);
+        //    Assert.IsNotNull(track.Length);
+        //    Assert.AreEqual(new TimeSpan(0, 3, 30), track.Length);
+        //    Assert.AreEqual(new TimeSpan(0, 28, 30), track.End);
+        //    track.Begin = null;
+        //    Assert.IsNull(track.Length);
+        //    track.Length = new TimeSpan(0, 5, 15);
+        //    Assert.AreEqual(new TimeSpan(0, 28, 30), track.End);
+        //    Assert.AreEqual(new TimeSpan(0, 5, 15), track.Length);
+        //    Assert.AreEqual(new TimeSpan(0, 23, 15), track.Begin);
+        //}
 
-        [TestMethod()]
-        public void SetLengthTest()
-        {
-            var track = new Track();
-            Assert.IsNull(track.Length);
-            Assert.IsNull(track.Begin);
-            Assert.IsNull(track.End);
-            track.Begin = new TimeSpan(0, 2, 43);
-            track.End = new TimeSpan(0, 5, 23);
-            Assert.IsNotNull(track.Length);
-            track.Length = new TimeSpan(0, 2, 0);
-            Assert.AreEqual(new TimeSpan(0, 4, 43), track.End);
-        }
+        //[TestMethod()]
+        //public void SetLengthTest()
+        //{
+        //    var track = new Track();
+        //    Assert.IsNull(track.Length);
+        //    Assert.IsNull(track.Begin);
+        //    Assert.IsNull(track.End);
+        //    track.Begin = new TimeSpan(0, 2, 43);
+        //    track.End = new TimeSpan(0, 5, 23);
+        //    Assert.IsNotNull(track.Length);
+        //    track.Length = new TimeSpan(0, 2, 0);
+        //    Assert.AreEqual(new TimeSpan(0, 4, 43), track.End);
+        //}
 
-        [TestMethod()]
-        public void LinkTrackTest()
-        {
-            //Test LinkedPreviousTrack
-            var track = new Track
-            {
-                Begin = TimeSpan.Zero,
-                Position = 1,
-                End = new TimeSpan(0, 3, 23)
-            };
-            Assert.IsFalse(track.IsLinkedToPreviousTrack);
-            var track2 = new Track
-            {
-                Begin = track.End,
-                End = new TimeSpan(0, 5, 45),
-                Position = 2
-            };
-            Assert.IsFalse(track2.IsLinkedToPreviousTrack);
-            bool eventFired = false;
-            track2.IsLinkedToPreviousTrackChanged += delegate
-            {
-                eventFired = true;
-            };
-            track2.IsLinkedToPreviousTrack = true;
-            Assert.IsTrue(eventFired);
-        }
+        //[TestMethod()]
+        //public void LinkTrackTest()
+        //{
+        //    //Test LinkedPreviousTrack
+        //    var track = new Track
+        //    {
+        //        Begin = TimeSpan.Zero,
+        //        Position = 1,
+        //        End = new TimeSpan(0, 3, 23)
+        //    };
+        //    Assert.IsFalse(track.IsLinkedToPreviousTrack);
+        //    var track2 = new Track
+        //    {
+        //        Begin = track.End,
+        //        End = new TimeSpan(0, 5, 45),
+        //        Position = 2
+        //    };
+        //    Assert.IsFalse(track2.IsLinkedToPreviousTrack);
+        //    bool eventFired = false;
+        //    track2.IsLinkedToPreviousTrackChanged += delegate
+        //    {
+        //        eventFired = true;
+        //    };
+        //    track2.IsLinkedToPreviousTrack = true;
+        //    Assert.IsTrue(eventFired);
+        //}
 
-        [TestMethod()]
-        public void CheckPositionInCuesheetTest()
-        {
-            var cuesheet = new Cuesheet();
-            var track1 = new Track
-            {
-                Position = 3,
-                End = new TimeSpan(0, 5, 0)
-            };
-            var track2 = new Track
-            {
-                Position = 2,
-                Begin = track1.End,
-                End = new TimeSpan(0, 8, 23)
-            };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            var validationResult = track1.Validate(nameof(Track.Position));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
-                && x.Parameter != null && x.Parameter[0].Equals(track1.Position) && x.Parameter[3].Equals(track1.Begin) && x.Parameter[4].Equals(track1.End) && x.Parameter[5].Equals(1)));
-            track1.Position = 1;
-            validationResult = track1.Validate(nameof(Track.Position));
-            Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-            validationResult = track2.Validate(nameof(Track.Position));
-            Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-            track1.Position = 3;
-            track2.Position = 5;
-            validationResult = track1.Validate(nameof(Track.Position));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
-                && x.Parameter != null && x.Parameter[0].Equals(track1.Position) && x.Parameter[3].Equals(track1.Begin) && x.Parameter[4].Equals(track1.End) && x.Parameter[5].Equals(1)));
-            validationResult = track2.Validate(nameof(Track.Position));
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
-                && x.Parameter != null && x.Parameter[0].Equals(track2.Position) && x.Parameter[3].Equals(track2.Begin) && x.Parameter[4].Equals(track2.End) && x.Parameter[5].Equals(2)));
-            cuesheet = new Cuesheet();
-            track1 = new Track()
-            {
-                Artist = "Testartist 1",
-                Title = "Testtitle 1"
-            };
-            cuesheet.AddTrack(track1);
-            track2 = new Track()
-            {
-                Artist = "Testartist 2",
-                Title = "Testtitle 2"
-            };
-            cuesheet.AddTrack(track2);
-            Assert.IsNotNull(track1.Begin);
-            Assert.IsNull(track1.End);
-            Assert.IsNull(track2.Begin);
-            Assert.IsNull(track2.End);
-            validationResult = track1.Validate(nameof(Track.Position));
-            Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-            validationResult = track2.Validate(nameof(Track.Position));
-            Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        }
+        //[TestMethod()]
+        //public void CheckPositionInCuesheetTest()
+        //{
+        //    var cuesheet = new Cuesheet();
+        //    var track1 = new Track
+        //    {
+        //        Position = 3,
+        //        End = new TimeSpan(0, 5, 0)
+        //    };
+        //    var track2 = new Track
+        //    {
+        //        Position = 2,
+        //        Begin = track1.End,
+        //        End = new TimeSpan(0, 8, 23)
+        //    };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    var validationResult = track1.Validate(nameof(Track.Position));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
+        //        && x.Parameter != null && x.Parameter[0].Equals(track1.Position) && x.Parameter[3].Equals(track1.Begin) && x.Parameter[4].Equals(track1.End) && x.Parameter[5].Equals(1)));
+        //    track1.Position = 1;
+        //    validationResult = track1.Validate(nameof(Track.Position));
+        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
+        //    validationResult = track2.Validate(nameof(Track.Position));
+        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
+        //    track1.Position = 3;
+        //    track2.Position = 5;
+        //    validationResult = track1.Validate(nameof(Track.Position));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
+        //        && x.Parameter != null && x.Parameter[0].Equals(track1.Position) && x.Parameter[3].Equals(track1.Begin) && x.Parameter[4].Equals(track1.End) && x.Parameter[5].Equals(1)));
+        //    validationResult = track2.Validate(nameof(Track.Position));
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
+        //        && x.Parameter != null && x.Parameter[0].Equals(track2.Position) && x.Parameter[3].Equals(track2.Begin) && x.Parameter[4].Equals(track2.End) && x.Parameter[5].Equals(2)));
+        //    cuesheet = new Cuesheet();
+        //    track1 = new Track()
+        //    {
+        //        Artist = "Testartist 1",
+        //        Title = "Testtitle 1"
+        //    };
+        //    cuesheet.AddTrack(track1);
+        //    track2 = new Track()
+        //    {
+        //        Artist = "Testartist 2",
+        //        Title = "Testtitle 2"
+        //    };
+        //    cuesheet.AddTrack(track2);
+        //    Assert.IsNotNull(track1.Begin);
+        //    Assert.IsNull(track1.End);
+        //    Assert.IsNull(track2.Begin);
+        //    Assert.IsNull(track2.End);
+        //    validationResult = track1.Validate(nameof(Track.Position));
+        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
+        //    validationResult = track2.Validate(nameof(Track.Position));
+        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
+        //}
 
-        [TestMethod()]
-        public void CopyValuesTest()
-        {
-            var sourceTrack = new Track();
-            var destinyTrack = new Track();
-            Assert.AreNotEqual(sourceTrack, destinyTrack);
-            sourceTrack.Cuesheet = new Cuesheet();
-            sourceTrack.IsLinkedToPreviousTrack = true;
-            sourceTrack.Position = 23;
-            sourceTrack.Artist = "Testartist";
-            sourceTrack.Title = "Testtitle";
-            sourceTrack.Begin = new TimeSpan(0, 2, 10);
-            sourceTrack.End = new TimeSpan(0, 5, 32);
-            sourceTrack.PreGap = new TimeSpan(0, 0, 10);
-            sourceTrack.PostGap = new TimeSpan(0, 0, 12);
-            Assert.IsNull(destinyTrack.Cuesheet);
-            destinyTrack.CopyValues(sourceTrack);
-            Assert.AreEqual(sourceTrack.IsLinkedToPreviousTrack, destinyTrack.IsLinkedToPreviousTrack);
-            Assert.AreEqual(sourceTrack.Cuesheet, destinyTrack.Cuesheet);
-            Assert.AreEqual(sourceTrack.Position, destinyTrack.Position);
-            Assert.AreEqual(sourceTrack.Artist, destinyTrack.Artist);
-            Assert.AreEqual(sourceTrack.Title, destinyTrack.Title);
-            Assert.AreEqual(sourceTrack.Begin, destinyTrack.Begin);
-            Assert.AreEqual(sourceTrack.End, destinyTrack.End);
-            Assert.AreEqual(sourceTrack.PreGap, destinyTrack.PreGap);
-            Assert.AreEqual(sourceTrack.PostGap, destinyTrack.PostGap);
-            var destinationTracks = new List<Track>() { new(), new(), new() };
-            destinationTracks.ForEach(x => x.CopyValues(sourceTrack, useInternalSetters: Track.AllPropertyNames));
-            Assert.IsTrue(destinationTracks.All(x => x.IsLinkedToPreviousTrack == sourceTrack.IsLinkedToPreviousTrack));
-            Assert.IsTrue(destinationTracks.All(x => x.Cuesheet == sourceTrack.Cuesheet));
-            Assert.IsTrue(destinationTracks.All(x => x.Position == sourceTrack.Position));
-            Assert.IsTrue(destinationTracks.All(x => x.Artist == sourceTrack.Artist));
-            Assert.IsTrue(destinationTracks.All(x => x.Title == sourceTrack.Title));
-            Assert.IsTrue(destinationTracks.All(x => x.Begin == sourceTrack.Begin));
-            Assert.IsTrue(destinationTracks.All(x => x.End == sourceTrack.End));
-            Assert.IsTrue(destinationTracks.All(x => x.PreGap == sourceTrack.PreGap));
-            Assert.IsTrue(destinationTracks.All(x => x.PostGap == sourceTrack.PostGap));
-        }
+        //[TestMethod()]
+        //public void CopyValuesTest()
+        //{
+        //    var sourceTrack = new Track();
+        //    var destinyTrack = new Track();
+        //    Assert.AreNotEqual(sourceTrack, destinyTrack);
+        //    sourceTrack.Cuesheet = new Cuesheet();
+        //    sourceTrack.IsLinkedToPreviousTrack = true;
+        //    sourceTrack.Position = 23;
+        //    sourceTrack.Artist = "Testartist";
+        //    sourceTrack.Title = "Testtitle";
+        //    sourceTrack.Begin = new TimeSpan(0, 2, 10);
+        //    sourceTrack.End = new TimeSpan(0, 5, 32);
+        //    sourceTrack.PreGap = new TimeSpan(0, 0, 10);
+        //    sourceTrack.PostGap = new TimeSpan(0, 0, 12);
+        //    Assert.IsNull(destinyTrack.Cuesheet);
+        //    destinyTrack.CopyValues(sourceTrack);
+        //    Assert.AreEqual(sourceTrack.IsLinkedToPreviousTrack, destinyTrack.IsLinkedToPreviousTrack);
+        //    Assert.AreEqual(sourceTrack.Cuesheet, destinyTrack.Cuesheet);
+        //    Assert.AreEqual(sourceTrack.Position, destinyTrack.Position);
+        //    Assert.AreEqual(sourceTrack.Artist, destinyTrack.Artist);
+        //    Assert.AreEqual(sourceTrack.Title, destinyTrack.Title);
+        //    Assert.AreEqual(sourceTrack.Begin, destinyTrack.Begin);
+        //    Assert.AreEqual(sourceTrack.End, destinyTrack.End);
+        //    Assert.AreEqual(sourceTrack.PreGap, destinyTrack.PreGap);
+        //    Assert.AreEqual(sourceTrack.PostGap, destinyTrack.PostGap);
+        //    var destinationTracks = new List<Track>() { new(), new(), new() };
+        //    destinationTracks.ForEach(x => x.CopyValues(sourceTrack, useInternalSetters: Track.AllPropertyNames));
+        //    Assert.IsTrue(destinationTracks.All(x => x.IsLinkedToPreviousTrack == sourceTrack.IsLinkedToPreviousTrack));
+        //    Assert.IsTrue(destinationTracks.All(x => x.Cuesheet == sourceTrack.Cuesheet));
+        //    Assert.IsTrue(destinationTracks.All(x => x.Position == sourceTrack.Position));
+        //    Assert.IsTrue(destinationTracks.All(x => x.Artist == sourceTrack.Artist));
+        //    Assert.IsTrue(destinationTracks.All(x => x.Title == sourceTrack.Title));
+        //    Assert.IsTrue(destinationTracks.All(x => x.Begin == sourceTrack.Begin));
+        //    Assert.IsTrue(destinationTracks.All(x => x.End == sourceTrack.End));
+        //    Assert.IsTrue(destinationTracks.All(x => x.PreGap == sourceTrack.PreGap));
+        //    Assert.IsTrue(destinationTracks.All(x => x.PostGap == sourceTrack.PostGap));
+        //}
 
-        [TestMethod()]
-        public void CloneTest()
-        {
-            var track = new Track()
-            {
-                Begin = TimeSpan.Zero,
-                Artist = "Testartist",
-                Title = "Testttitle"
-            };
-            var cuesheet = new Cuesheet();
-            cuesheet.AddTrack(track);
-            var validationResult = track.Validate();
-            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-            Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Parameter != null && x.Parameter.Contains(nameof(Track.End))));
-            var clone = track.Clone();
-            clone.End = new TimeSpan(0, 2, 32);
-            validationResult = clone.Validate();
-            Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-            Assert.IsNull(track.End);
-        }
+        //[TestMethod()]
+        //public void CloneTest()
+        //{
+        //    var track = new Track()
+        //    {
+        //        Begin = TimeSpan.Zero,
+        //        Artist = "Testartist",
+        //        Title = "Testttitle"
+        //    };
+        //    var cuesheet = new Cuesheet();
+        //    cuesheet.AddTrack(track);
+        //    var validationResult = track.Validate();
+        //    Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Parameter != null && x.Parameter.Contains(nameof(Track.End))));
+        //    var clone = track.Clone();
+        //    clone.End = new TimeSpan(0, 2, 32);
+        //    validationResult = clone.Validate();
+        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
+        //    Assert.IsNull(track.End);
+        //}
 
-        [TestMethod()]
-        public void SetCuesheetTest()
-        {
-            var track = new Track();
-            Assert.IsNull(track.Cuesheet);
-            var cuesheet = new Cuesheet();
-            cuesheet.AddTrack(track);
-            Assert.AreEqual(cuesheet, track.Cuesheet);
-            track.Cuesheet = new Cuesheet();
-            Assert.AreEqual(cuesheet, track.Cuesheet);
-            track.Cuesheet = null;
-            Assert.IsNull(track.Cuesheet);
-        }
+        //[TestMethod()]
+        //public void SetCuesheetTest()
+        //{
+        //    var track = new Track();
+        //    Assert.IsNull(track.Cuesheet);
+        //    var cuesheet = new Cuesheet();
+        //    cuesheet.AddTrack(track);
+        //    Assert.AreEqual(cuesheet, track.Cuesheet);
+        //    track.Cuesheet = new Cuesheet();
+        //    Assert.AreEqual(cuesheet, track.Cuesheet);
+        //    track.Cuesheet = null;
+        //    Assert.IsNull(track.Cuesheet);
+        //}
 
-        [TestMethod()]
-        public void Validate_InvalidEnd_ReturnsValidationStatusError()
-        {
-            // Arrange
-            var track = new Track
-            {
-                Begin = new TimeSpan(0, 2, 32),
-                End = new TimeSpan(0, 1, 15)
-            };
-            // Act
-            var endValidationResult = track.Validate(nameof(Track.End));
-            // Assert
-            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
-        }
+        //[TestMethod()]
+        //public void Validate_InvalidEnd_ReturnsValidationStatusError()
+        //{
+        //    // Arrange
+        //    var track = new Track
+        //    {
+        //        Begin = new TimeSpan(0, 2, 32),
+        //        End = new TimeSpan(0, 1, 15)
+        //    };
+        //    // Act
+        //    var endValidationResult = track.Validate(nameof(Track.End));
+        //    // Assert
+        //    Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        //}
 
-        [TestMethod()]
-        public void Validate_InvalidBegin_ReturnsValidationStatusError()
-        {
-            // Arrange
-            var track = new Track
-            {
-                Begin = new TimeSpan(0, 4, 53),
-                End = new TimeSpan(0, 3, 15)
-            };
-            // Act
-            var endValidationResult = track.Validate(nameof(Track.Begin));
-            // Assert
-            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
-        }
+        //[TestMethod()]
+        //public void Validate_InvalidBegin_ReturnsValidationStatusError()
+        //{
+        //    // Arrange
+        //    var track = new Track
+        //    {
+        //        Begin = new TimeSpan(0, 4, 53),
+        //        End = new TimeSpan(0, 3, 15)
+        //    };
+        //    // Act
+        //    var endValidationResult = track.Validate(nameof(Track.Begin));
+        //    // Assert
+        //    Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        //}
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs b/AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs
index 37848f93..a86648bc 100644
--- a/AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs
+++ b/AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs
@@ -28,105 +28,105 @@ namespace AudioCuesheetEditor.Tests.Model.IO
     [TestClass()]
     public class ProjectfileTests
     {
-        [TestMethod()]
-        public void GenerateFile_WithoutSections_GeneratesOneFile()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet
-            {
-                Artist = "CuesheetArtist",
-                Title = "CuesheetTitle",
-                Audiofile = new Audiofile("AudioFile.mp3"),
-                CDTextfile = new CDTextfile("CDTextfile.cdt"),
-                Cataloguenumber = "A123"
-            };
-            var begin = TimeSpan.Zero;
-            for (int i = 1; i <= 10; i++)
-            {
-                var track = new Track
-                {
-                    Position = (uint)i,
-                    Artist = string.Format("Artist {0}", i),
-                    Title = string.Format("Title {0}", i),
-                    Begin = begin
-                };
-                var rand = new Random();
-                var flagsToAdd = rand.Next(1, 3);
-                var flags = new List<Flag>();
-                for (int x = 0; x < flagsToAdd; x++)
-                {
-                    flags.Add(Flag.AvailableFlags.ElementAt(x));
-                }
-                track.Flags = flags;
-                begin = begin.Add(new TimeSpan(0, i, i));
-                track.End = begin;
-                cuesheet.AddTrack(track);
-            }
-            // Act
-            var projectFile = new Projectfile(cuesheet);
-            // Assert
-            var generatedFile = projectFile.GenerateFile();
-            Assert.IsNotNull(generatedFile);
-            var fileName = Path.GetTempFileName();
-            File.WriteAllBytes(fileName, generatedFile);
-            var fileContent = File.ReadAllLines(fileName);
-            var json = JsonSerializer.Serialize(cuesheet, Projectfile.Options);
-            Assert.AreEqual(json, fileContent.FirstOrDefault());
-            File.Delete(fileName);
-        }
+        //TODO
+        //[TestMethod()]
+        //public void GenerateFile_WithoutSections_GeneratesOneFile()
+        //{
+        //    // Arrange
+        //    var cuesheet = new Cuesheet
+        //    {
+        //        Artist = "CuesheetArtist",
+        //        Title = "CuesheetTitle",
+        //        Audiofile = new Audiofile("AudioFile.mp3"),
+        //        CDTextfile = new CDTextfile("CDTextfile.cdt"),
+        //        Cataloguenumber = "A123"
+        //    };
+        //    var begin = TimeSpan.Zero;
+        //    for (int i = 1; i <= 10; i++)
+        //    {
+        //        var track = new Track
+        //        {
+        //            Position = (uint)i,
+        //            Artist = string.Format("Artist {0}", i),
+        //            Title = string.Format("Title {0}", i),
+        //            Begin = begin
+        //        };
+        //        var rand = new Random();
+        //        var flagsToAdd = rand.Next(1, 3);
+        //        var flags = new List<Flag>();
+        //        for (int x = 0; x < flagsToAdd; x++)
+        //        {
+        //            flags.Add(Flag.AvailableFlags.ElementAt(x));
+        //        }
+        //        track.Flags = flags;
+        //        begin = begin.Add(new TimeSpan(0, i, i));
+        //        track.End = begin;
+        //        cuesheet.AddTrack(track);
+        //    }
+        //    // Act
+        //    var projectFile = new Projectfile(cuesheet);
+        //    // Assert
+        //    var generatedFile = projectFile.GenerateFile();
+        //    Assert.IsNotNull(generatedFile);
+        //    var fileName = Path.GetTempFileName();
+        //    File.WriteAllBytes(fileName, generatedFile);
+        //    var fileContent = File.ReadAllLines(fileName);
+        //    var json = JsonSerializer.Serialize(cuesheet, Projectfile.Options);
+        //    Assert.AreEqual(json, fileContent.FirstOrDefault());
+        //    File.Delete(fileName);
+        //}
 
-        [TestMethod()]
-        public void ImportFile_ValidProjectfile_ShouldImportFile()
-        {
-            // Arrange
-            var fileContent = "{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Cataloguenumber\":\"A123\",\"Audiofile\":{\"Name\":\"AudioFile.mp3\"},\"Tracks\":[{\"Position\":1,\"Artist\":\"Artist 1\",\"Title\":\"Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:01:01\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":2,\"Artist\":\"Artist 2\",\"Title\":\"Title 2\",\"Begin\":\"00:01:01\",\"End\":\"00:03:03\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":3,\"Artist\":\"Artist 3\",\"Title\":\"Title 3\",\"Begin\":\"00:03:03\",\"End\":\"00:06:06\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":4,\"Artist\":\"Artist 4\",\"Title\":\"Title 4\",\"Begin\":\"00:06:06\",\"End\":\"00:10:10\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":5,\"Artist\":\"Artist 5\",\"Title\":\"Title 5\",\"Begin\":\"00:10:10\",\"End\":\"00:15:15\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":6,\"Artist\":\"Artist 6\",\"Title\":\"Title 6\",\"Begin\":\"00:15:15\",\"End\":\"00:21:21\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":7,\"Artist\":\"Artist 7\",\"Title\":\"Title 7\",\"Begin\":\"00:21:21\",\"End\":\"00:28:28\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":8,\"Artist\":\"Artist 8\",\"Title\":\"Title 8\",\"Begin\":\"00:28:28\",\"End\":\"00:36:36\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":9,\"Artist\":\"Artist 9\",\"Title\":\"Title 9\",\"Begin\":\"00:36:36\",\"End\":\"00:45:45\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":10,\"Artist\":\"Artist 10\",\"Title\":\"Title 10\",\"Begin\":\"00:45:45\",\"End\":\"00:55:55\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true}],\"CDTextfile\":{\"Name\":\"CDTextfile.cdt\"}}";
-            // Act
-            var cuesheet = Projectfile.ImportFile(fileContent);
-            // Assert
-            Assert.IsNotNull(cuesheet);
-            Assert.IsTrue(cuesheet.Tracks.All(x => x.Cuesheet == cuesheet));
-            Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
-            Assert.AreEqual("CuesheetTitle", cuesheet.Title);
-            Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
-            Assert.AreEqual("A123", cuesheet.Cataloguenumber);
-            Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
-            Assert.HasCount(10, cuesheet.Tracks);
-            Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
-            Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
-            Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
-            Assert.AreEqual(new TimeSpan(0, 55, 55), cuesheet.Tracks.Last().End);
-            Assert.IsTrue(ReferenceEquals(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1))));
-            Assert.AreEqual(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1)));
-            Assert.AreEqual((uint)10, cuesheet.Tracks.Last().Position);
-        }
+        //[TestMethod()]
+        //public void ImportFile_ValidProjectfile_ShouldImportFile()
+        //{
+        //    // Arrange
+        //    var fileContent = "{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Cataloguenumber\":\"A123\",\"Audiofile\":{\"Name\":\"AudioFile.mp3\"},\"Tracks\":[{\"Position\":1,\"Artist\":\"Artist 1\",\"Title\":\"Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:01:01\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":2,\"Artist\":\"Artist 2\",\"Title\":\"Title 2\",\"Begin\":\"00:01:01\",\"End\":\"00:03:03\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":3,\"Artist\":\"Artist 3\",\"Title\":\"Title 3\",\"Begin\":\"00:03:03\",\"End\":\"00:06:06\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":4,\"Artist\":\"Artist 4\",\"Title\":\"Title 4\",\"Begin\":\"00:06:06\",\"End\":\"00:10:10\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":5,\"Artist\":\"Artist 5\",\"Title\":\"Title 5\",\"Begin\":\"00:10:10\",\"End\":\"00:15:15\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":6,\"Artist\":\"Artist 6\",\"Title\":\"Title 6\",\"Begin\":\"00:15:15\",\"End\":\"00:21:21\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":7,\"Artist\":\"Artist 7\",\"Title\":\"Title 7\",\"Begin\":\"00:21:21\",\"End\":\"00:28:28\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":8,\"Artist\":\"Artist 8\",\"Title\":\"Title 8\",\"Begin\":\"00:28:28\",\"End\":\"00:36:36\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":9,\"Artist\":\"Artist 9\",\"Title\":\"Title 9\",\"Begin\":\"00:36:36\",\"End\":\"00:45:45\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":10,\"Artist\":\"Artist 10\",\"Title\":\"Title 10\",\"Begin\":\"00:45:45\",\"End\":\"00:55:55\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true}],\"CDTextfile\":{\"Name\":\"CDTextfile.cdt\"}}";
+        //    // Act
+        //    var cuesheet = Projectfile.ImportFile(fileContent);
+        //    // Assert
+        //    Assert.IsNotNull(cuesheet);
+        //    Assert.IsTrue(cuesheet.Tracks.All(x => x.Cuesheet == cuesheet));
+        //    Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
+        //    Assert.AreEqual("CuesheetTitle", cuesheet.Title);
+        //    Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
+        //    Assert.AreEqual("A123", cuesheet.Cataloguenumber);
+        //    Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
+        //    Assert.HasCount(10, cuesheet.Tracks);
+        //    Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
+        //    Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
+        //    Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
+        //    Assert.AreEqual(new TimeSpan(0, 55, 55), cuesheet.Tracks.Last().End);
+        //    Assert.IsTrue(ReferenceEquals(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1))));
+        //    Assert.AreEqual(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1)));
+        //    Assert.AreEqual((uint)10, cuesheet.Tracks.Last().Position);
+        //}
 
-        [TestMethod()]
-        public void ImportFile_ValidProjectfileWithSections_ShouldImportFile()
-        {
-            //Arrange
-            var fileContent = "{\"Tracks\":[{\"Position\":1,\"Artist\":\"Artist 1\",\"Title\":\"Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:01:01\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":2,\"Artist\":\"Artist 2\",\"Title\":\"Title 2\",\"Begin\":\"00:01:01\",\"End\":\"00:03:03\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":3,\"Artist\":\"Artist 3\",\"Title\":\"Title 3\",\"Begin\":\"00:03:03\",\"End\":\"00:06:06\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":4,\"Artist\":\"Artist 4\",\"Title\":\"Title 4\",\"Begin\":\"00:06:06\",\"End\":\"00:10:10\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":5,\"Artist\":\"Artist 5\",\"Title\":\"Title 5\",\"Begin\":\"00:10:10\",\"End\":\"00:15:15\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":6,\"Artist\":\"Artist 6\",\"Title\":\"Title 6\",\"Begin\":\"00:15:15\",\"End\":\"00:21:21\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":7,\"Artist\":\"Artist 7\",\"Title\":\"Title 7\",\"Begin\":\"00:21:21\",\"End\":\"00:28:28\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":8,\"Artist\":\"Artist 8\",\"Title\":\"Title 8\",\"Begin\":\"00:28:28\",\"End\":\"00:36:36\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":9,\"Artist\":\"Artist 9\",\"Title\":\"Title 9\",\"Begin\":\"00:36:36\",\"End\":\"00:45:45\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":10,\"Artist\":\"Artist 10\",\"Title\":\"Title 10\",\"Begin\":\"00:45:45\",\"End\":\"00:55:55\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true}],\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Audiofile\":{\"Name\":\"AudioFile.mp3\"},\"CDTextfile\":{\"Name\":\"CDTextfile.cdt\"},\"Cataloguenumber\":\"A123\",\"Sections\":[{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Begin\":\"00:30:00\"},{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Begin\":\"01:00:00\"}]}";
-            // Act
-            var cuesheet = Projectfile.ImportFile(fileContent);
-            // Assert
-            Assert.IsNotNull(cuesheet);
-            Assert.IsTrue(cuesheet.Tracks.All(x => x.Cuesheet == cuesheet));
-            Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
-            Assert.AreEqual("CuesheetTitle", cuesheet.Title);
-            Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
-            Assert.AreEqual("A123", cuesheet.Cataloguenumber);
-            Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
-            Assert.HasCount(10, cuesheet.Tracks);
-            Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
-            Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
-            Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
-            Assert.AreEqual(new TimeSpan(0, 55, 55), cuesheet.Tracks.Last().End);
-            Assert.IsTrue(ReferenceEquals(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1))));
-            Assert.AreEqual(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1)));
-            Assert.AreEqual((uint)10, cuesheet.Tracks.Last().Position);
-            //TODOD
-            //Assert.HasCount(2, cuesheet.Sections);
-            //Assert.AreEqual(new TimeSpan(0, 30, 0), cuesheet.Sections.First().Begin);
-            //Assert.AreEqual(new TimeSpan(1, 0, 0), cuesheet.Sections.Last().Begin);
-        }
+        //[TestMethod()]
+        //public void ImportFile_ValidProjectfileWithSections_ShouldImportFile()
+        //{
+        //    //Arrange
+        //    var fileContent = "{\"Tracks\":[{\"Position\":1,\"Artist\":\"Artist 1\",\"Title\":\"Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:01:01\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":2,\"Artist\":\"Artist 2\",\"Title\":\"Title 2\",\"Begin\":\"00:01:01\",\"End\":\"00:03:03\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":3,\"Artist\":\"Artist 3\",\"Title\":\"Title 3\",\"Begin\":\"00:03:03\",\"End\":\"00:06:06\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":4,\"Artist\":\"Artist 4\",\"Title\":\"Title 4\",\"Begin\":\"00:06:06\",\"End\":\"00:10:10\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":5,\"Artist\":\"Artist 5\",\"Title\":\"Title 5\",\"Begin\":\"00:10:10\",\"End\":\"00:15:15\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":6,\"Artist\":\"Artist 6\",\"Title\":\"Title 6\",\"Begin\":\"00:15:15\",\"End\":\"00:21:21\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":7,\"Artist\":\"Artist 7\",\"Title\":\"Title 7\",\"Begin\":\"00:21:21\",\"End\":\"00:28:28\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":8,\"Artist\":\"Artist 8\",\"Title\":\"Title 8\",\"Begin\":\"00:28:28\",\"End\":\"00:36:36\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":9,\"Artist\":\"Artist 9\",\"Title\":\"Title 9\",\"Begin\":\"00:36:36\",\"End\":\"00:45:45\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":10,\"Artist\":\"Artist 10\",\"Title\":\"Title 10\",\"Begin\":\"00:45:45\",\"End\":\"00:55:55\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true}],\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Audiofile\":{\"Name\":\"AudioFile.mp3\"},\"CDTextfile\":{\"Name\":\"CDTextfile.cdt\"},\"Cataloguenumber\":\"A123\",\"Sections\":[{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Begin\":\"00:30:00\"},{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Begin\":\"01:00:00\"}]}";
+        //    // Act
+        //    var cuesheet = Projectfile.ImportFile(fileContent);
+        //    // Assert
+        //    Assert.IsNotNull(cuesheet);
+        //    Assert.IsTrue(cuesheet.Tracks.All(x => x.Cuesheet == cuesheet));
+        //    Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
+        //    Assert.AreEqual("CuesheetTitle", cuesheet.Title);
+        //    Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
+        //    Assert.AreEqual("A123", cuesheet.Cataloguenumber);
+        //    Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
+        //    Assert.HasCount(10, cuesheet.Tracks);
+        //    Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
+        //    Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
+        //    Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
+        //    Assert.AreEqual(new TimeSpan(0, 55, 55), cuesheet.Tracks.Last().End);
+        //    Assert.IsTrue(ReferenceEquals(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1))));
+        //    Assert.AreEqual(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1)));
+        //    Assert.AreEqual((uint)10, cuesheet.Tracks.Last().Position);
+        //    Assert.HasCount(2, cuesheet.Sections);
+        //    Assert.AreEqual(new TimeSpan(0, 30, 0), cuesheet.Sections.First().Begin);
+        //    Assert.AreEqual(new TimeSpan(1, 0, 0), cuesheet.Sections.Last().Begin);
+        //}
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs b/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
index bcfd701d..25cc5126 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
@@ -54,110 +54,110 @@ public void CanGenerateExportfile_InvalidExtension_ReturnsValidationMessage()
             Assert.IsFalse(result.IsSuccess);
             Assert.IsTrue(result.Error?.Message.Contains("File extension is not"));
         }
-
-        [TestMethod]
-        public void CanGenerateExportfiles_ValidExtension_ReturnsSuccess()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet()
-            {
-                Artist = "Test Artist",
-                Title = "Test Title",
-                Audiofile = new Audiofile("Audio.mp3")
-            };
-            cuesheet.AddTrack(new Track()
-            {
-                Position = 1,
-                Begin = TimeSpan.Zero,
-                End = new TimeSpan(0, 3, 43)
-            });
-            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
-
-            // Act
-            var result = _cuesheetExportService.CanGenerateExportfile("test.cue");
-
-            // Assert
-            Assert.IsTrue(result.IsSuccess);
-        }
-
-        [TestMethod]
-        public void GenerateExportfiles_WithoutSections_ReturnsExportFile()
-        {
-            // Arrange
-            var filename = "Test valid Filename.cue";
-            var cuesheet = new Cuesheet()
-            {
-                Artist = "Test artist cuesheet",
-                Title = "Test title cuesheet",
-                Audiofile = new Audiofile("Test audiofile.mp3")
-            };
-            cuesheet.AddTrack(new Track()
-            {
-                Artist = "Test artist 1",
-                Title = "Test title 1",
-                Begin = TimeSpan.Zero,
-                End = new TimeSpan(0, 4, 12),
-                Position = 1
-            });
-            cuesheet.AddTrack(new Track()
-            {
-                Artist = "Test artist 2",
-                Title = "Test title 2",
-                End = new TimeSpan(0, 8, 32),
-                Position = 2
-            });
-            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
-
-            // Act
-            var result = _cuesheetExportService.GenerateExportfile(filename);
-
-            // Assert
-            Assert.IsTrue(result.IsSuccess);
-            Assert.AreEqual(filename, result.Value!.Name);
-            var content = result.Value!.Content;
-            Assert.IsNotNull(content);
-            Assert.AreEqual(@"TITLE ""Test title cuesheet""
-PERFORMER ""Test artist cuesheet""
-FILE ""Test audiofile.mp3"" MP3
-	TRACK 01 AUDIO
-		TITLE ""Test title 1""
-		PERFORMER ""Test artist 1""
-		INDEX 01 00:00:00
-	TRACK 02 AUDIO
-		TITLE ""Test title 2""
-		PERFORMER ""Test artist 2""
-		INDEX 01 04:12:00
-", content);
-        }
-
-        [TestMethod]
-        public void GenerateExportfiles_WithInvalidTracks_ReturnsFailure()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet()
-            {
-                Artist = "Test Artist",
-                Title = "Test Title",
-                Audiofile = new Audiofile("Audio.mp3")
-            };
-            var track1 = new Track()
-            {
-                Position = 1,
-                Begin = TimeSpan.Zero,
-            };
-            var track2 = new Track()
-            {
-                Position = 2,
-            };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
-
-            // Act
-            var result = _cuesheetExportService.GenerateExportfile("test.cue");
-
-            // Assert
-            Assert.IsFalse(result.IsSuccess);
-        }
+        //TODO
+//        [TestMethod]
+//        public void CanGenerateExportfiles_ValidExtension_ReturnsSuccess()
+//        {
+//            // Arrange
+//            var cuesheet = new Cuesheet()
+//            {
+//                Artist = "Test Artist",
+//                Title = "Test Title",
+//                Audiofile = new Audiofile("Audio.mp3")
+//            };
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Position = 1,
+//                Begin = TimeSpan.Zero,
+//                End = new TimeSpan(0, 3, 43)
+//            });
+//            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
+
+//            // Act
+//            var result = _cuesheetExportService.CanGenerateExportfile("test.cue");
+
+//            // Assert
+//            Assert.IsTrue(result.IsSuccess);
+//        }
+
+//        [TestMethod]
+//        public void GenerateExportfiles_WithoutSections_ReturnsExportFile()
+//        {
+//            // Arrange
+//            var filename = "Test valid Filename.cue";
+//            var cuesheet = new Cuesheet()
+//            {
+//                Artist = "Test artist cuesheet",
+//                Title = "Test title cuesheet",
+//                Audiofile = new Audiofile("Test audiofile.mp3")
+//            };
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Artist = "Test artist 1",
+//                Title = "Test title 1",
+//                Begin = TimeSpan.Zero,
+//                End = new TimeSpan(0, 4, 12),
+//                Position = 1
+//            });
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Artist = "Test artist 2",
+//                Title = "Test title 2",
+//                End = new TimeSpan(0, 8, 32),
+//                Position = 2
+//            });
+//            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
+
+//            // Act
+//            var result = _cuesheetExportService.GenerateExportfile(filename);
+
+//            // Assert
+//            Assert.IsTrue(result.IsSuccess);
+//            Assert.AreEqual(filename, result.Value!.Name);
+//            var content = result.Value!.Content;
+//            Assert.IsNotNull(content);
+//            Assert.AreEqual(@"TITLE ""Test title cuesheet""
+//PERFORMER ""Test artist cuesheet""
+//FILE ""Test audiofile.mp3"" MP3
+//	TRACK 01 AUDIO
+//		TITLE ""Test title 1""
+//		PERFORMER ""Test artist 1""
+//		INDEX 01 00:00:00
+//	TRACK 02 AUDIO
+//		TITLE ""Test title 2""
+//		PERFORMER ""Test artist 2""
+//		INDEX 01 04:12:00
+//", content);
+//        }
+
+//        [TestMethod]
+//        public void GenerateExportfiles_WithInvalidTracks_ReturnsFailure()
+//        {
+//            // Arrange
+//            var cuesheet = new Cuesheet()
+//            {
+//                Artist = "Test Artist",
+//                Title = "Test Title",
+//                Audiofile = new Audiofile("Audio.mp3")
+//            };
+//            var track1 = new Track()
+//            {
+//                Position = 1,
+//                Begin = TimeSpan.Zero,
+//            };
+//            var track2 = new Track()
+//            {
+//                Position = 2,
+//            };
+//            cuesheet.AddTrack(track1);
+//            cuesheet.AddTrack(track2);
+//            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
+
+//            // Act
+//            var result = _cuesheetExportService.GenerateExportfile("test.cue");
+
+//            // Assert
+//            Assert.IsFalse(result.IsSuccess);
+//        }
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs b/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
index 2b57cc83..06e89a65 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
@@ -38,129 +38,129 @@ public ExportfileGeneratorTests()
             var mockLocalizer = new Mock<IStringLocalizer<ValidationMessage>>();
             _exportfileGenerator = new ExportfileGenerator(_mockSessionStateContainer.Object, mockLocalizer.Object);
         }
+        //TODO
+//        [TestMethod]
+//        public void GenerateExportFile_ShouldGenerateExportfile_WithoutSections()
+//        {
+//            // Arrange
+//            var exportProfile = new Exportprofile
+//            {
+//                Name = "TestProfile",
+//                SchemeHead = "%Cuesheet.Artist% - %Cuesheet.Title%",
+//                SchemeTracks = "%Track.Position% %Track.Artist% - %Track.Title%",
+//                Filename = "TestExport.txt"
+//            };
+//            var cuesheet = new Cuesheet()
+//            {
+//                Artist = "Test artist cuesheet",
+//                Title = "Test title cuesheet",
+//                Audiofile = new Audiofile("Test audiofile.mp3")
+//            };
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Artist = "Test artist 1",
+//                Title = "Test title 1",
+//                Begin = TimeSpan.Zero,
+//                End = new TimeSpan(0, 4, 12),
+//                Position = 1
+//            });
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Artist = "Test artist 2",
+//                Title = "Test title 2",
+//                End = new TimeSpan(0, 8, 32),
+//                Position = 2
+//            });
+//            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
 
-        [TestMethod]
-        public void GenerateExportFile_ShouldGenerateExportfile_WithoutSections()
-        {
-            // Arrange
-            var exportProfile = new Exportprofile
-            {
-                Name = "TestProfile",
-                SchemeHead = "%Cuesheet.Artist% - %Cuesheet.Title%",
-                SchemeTracks = "%Track.Position% %Track.Artist% - %Track.Title%",
-                Filename = "TestExport.txt"
-            };
-            var cuesheet = new Cuesheet()
-            {
-                Artist = "Test artist cuesheet",
-                Title = "Test title cuesheet",
-                Audiofile = new Audiofile("Test audiofile.mp3")
-            };
-            cuesheet.AddTrack(new Track()
-            {
-                Artist = "Test artist 1",
-                Title = "Test title 1",
-                Begin = TimeSpan.Zero,
-                End = new TimeSpan(0, 4, 12),
-                Position = 1
-            });
-            cuesheet.AddTrack(new Track()
-            {
-                Artist = "Test artist 2",
-                Title = "Test title 2",
-                End = new TimeSpan(0, 8, 32),
-                Position = 2
-            });
-            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+//            // Act
+//            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
+//            // Assert
+//            Assert.IsTrue(result.IsSuccess);
+//            Assert.AreEqual(exportProfile.Filename, result.Value!.Name);
+//            var content = result.Value!.Content;
+//            Assert.IsNotNull(content);
+//            Assert.AreEqual(@"Test artist cuesheet - Test title cuesheet
+//1 Test artist 1 - Test title 1
+//2 Test artist 2 - Test title 2
 
-            // Act
-            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
-            // Assert
-            Assert.IsTrue(result.IsSuccess);
-            Assert.AreEqual(exportProfile.Filename, result.Value!.Name);
-            var content = result.Value!.Content;
-            Assert.IsNotNull(content);
-            Assert.AreEqual(@"Test artist cuesheet - Test title cuesheet
-1 Test artist 1 - Test title 1
-2 Test artist 2 - Test title 2
+//", content);
+//        }
 
-", content);
-        }
+//        [TestMethod]
+//        public void GenerateExportFile_ShouldHandleEmptyProfile()
+//        {
+//            // Arrange
+//            var exportProfile = new Exportprofile();
+//            var cuesheet = new Cuesheet()
+//            {
+//                Artist = "Test artist cuesheet",
+//                Title = "Test title cuesheet",
+//                Audiofile = new Audiofile("Test audiofile.mp3")
+//            };
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Artist = "Test artist 1",
+//                Title = "Test title 1",
+//                Begin = TimeSpan.Zero,
+//                End = new TimeSpan(0, 4, 12),
+//                Position = 1
+//            });
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Artist = "Test artist 2",
+//                Title = "Test title 2",
+//                End = new TimeSpan(0, 8, 32),
+//                Position = 2
+//            });
+//            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
 
-        [TestMethod]
-        public void GenerateExportFile_ShouldHandleEmptyProfile()
-        {
-            // Arrange
-            var exportProfile = new Exportprofile();
-            var cuesheet = new Cuesheet()
-            {
-                Artist = "Test artist cuesheet",
-                Title = "Test title cuesheet",
-                Audiofile = new Audiofile("Test audiofile.mp3")
-            };
-            cuesheet.AddTrack(new Track()
-            {
-                Artist = "Test artist 1",
-                Title = "Test title 1",
-                Begin = TimeSpan.Zero,
-                End = new TimeSpan(0, 4, 12),
-                Position = 1
-            });
-            cuesheet.AddTrack(new Track()
-            {
-                Artist = "Test artist 2",
-                Title = "Test title 2",
-                End = new TimeSpan(0, 8, 32),
-                Position = 2
-            });
-            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+//            // Act
+//            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
 
-            // Act
-            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
+//            // Assert
+//            Assert.IsTrue(result.IsSuccess);
+//            Assert.AreEqual(Exportprofile.DefaultFileName, result.Value!.Name);
+//            Assert.IsNotNull(result.Value!.Content);
+//        }
 
-            // Assert
-            Assert.IsTrue(result.IsSuccess);
-            Assert.AreEqual(Exportprofile.DefaultFileName, result.Value!.Name);
-            Assert.IsNotNull(result.Value!.Content);
-        }
+//        [TestMethod]
+//        public void GenerateExportFile_ReturnsEmpty_WithInvalidTracks()
+//        {
+//            // Arrange
+//            var exportProfile = new Exportprofile
+//            {
+//                Name = "TestProfile",
+//                SchemeHead = "%Cuesheet.Artist% - %Cuesheet.Title%",
+//                SchemeTracks = "%Track.Position% %Track.Artist% - %Track.Title%",
+//                Filename = "TestExport.txt"
+//            };
+//            var cuesheet = new Cuesheet()
+//            {
+//                Artist = "Test artist cuesheet",
+//                Title = "Test title cuesheet",
+//                Audiofile = new Audiofile("Test audiofile.mp3")
+//            };
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Artist = "Test artist 1",
+//                Title = "Test title 1",
+//                Begin = TimeSpan.Zero,
+//                Position = 1
+//            });
+//            cuesheet.AddTrack(new Track()
+//            {
+//                Artist = "Test artist 2",
+//                Title = "Test title 2",
+//                Position = 2
+//            });
+//            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
 
-        [TestMethod]
-        public void GenerateExportFile_ReturnsEmpty_WithInvalidTracks()
-        {
-            // Arrange
-            var exportProfile = new Exportprofile
-            {
-                Name = "TestProfile",
-                SchemeHead = "%Cuesheet.Artist% - %Cuesheet.Title%",
-                SchemeTracks = "%Track.Position% %Track.Artist% - %Track.Title%",
-                Filename = "TestExport.txt"
-            };
-            var cuesheet = new Cuesheet()
-            {
-                Artist = "Test artist cuesheet",
-                Title = "Test title cuesheet",
-                Audiofile = new Audiofile("Test audiofile.mp3")
-            };
-            cuesheet.AddTrack(new Track()
-            {
-                Artist = "Test artist 1",
-                Title = "Test title 1",
-                Begin = TimeSpan.Zero,
-                Position = 1
-            });
-            cuesheet.AddTrack(new Track()
-            {
-                Artist = "Test artist 2",
-                Title = "Test title 2",
-                Position = 2
-            });
-            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-
-            // Act
-            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
+//            // Act
+//            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
 
-            // Assert
-            Assert.IsFalse(result.IsSuccess);
-        }
+//            // Assert
+//            Assert.IsFalse(result.IsSuccess);
+//        }
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs b/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
index 875a900b..2786533a 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
@@ -44,320 +44,320 @@ public class ImportManagerTests
         private readonly Mock<ITraceChangeManager> _traceChangeManagerMock;
         private readonly Mock<IFileInputManager> _fileInputManagerMock;
         private readonly Mock<ITextImportService> _textImportServiceMock;
+        //TODO
+        //public ImportManagerTests()
+        //{
+        //    _traceChangeManagerMock = new();
+        //    _sessionStateContainerMock = new();
+        //    _fileInputManagerMock = new();
+        //    _textImportServiceMock = new();
+        //    var loggerMock = new Mock<ILogger<ImportManager>>();
+        //    _service = new ImportManager(_sessionStateContainerMock.Object, _traceChangeManagerMock.Object, _fileInputManagerMock.Object, _textImportServiceMock.Object, loggerMock.Object);
+        //}
 
-        public ImportManagerTests()
-        {
-            _traceChangeManagerMock = new();
-            _sessionStateContainerMock = new();
-            _fileInputManagerMock = new();
-            _textImportServiceMock = new();
-            var loggerMock = new Mock<ILogger<ImportManager>>();
-            _service = new ImportManager(_sessionStateContainerMock.Object, _traceChangeManagerMock.Object, _fileInputManagerMock.Object, _textImportServiceMock.Object, loggerMock.Object);
-        }
+        //[TestMethod()]
+        //public async Task AnalyseImportfile_WithTextfile_SetsImportCuesheet()
+        //{
+        //    // Arrange
+        //    var fileContent = "This is just a test";
+        //    var importCuesheet = new ImportCuesheet()
+        //    {
+        //        Artist = "Test Cuesheet Artist",
+        //        Title = "Test Cuesheet Title",
+        //        Audiofile = "Test Cuesheet Audiofile",
+        //        Cataloguenumber = "Test Cuesheet Cataloguenumber",
+        //        CDTextfile = "Test Cuesheet CDTextfile"
+        //    };
+        //    importCuesheet.Tracks.Add(new()
+        //    {
+        //        Artist = "Test Track Artist 1",
+        //        Title = "Test Track Title 1",
+        //        Begin = new TimeSpan(0, 3, 20),
+        //        End = new TimeSpan(0, 7, 43),
+        //        Flags = [Flag.DCP],
+        //        Position = 1,
+        //        PreGap = new TimeSpan(0, 0, 2),
+        //        PostGap = new TimeSpan(0, 0, 4)
+        //    });
+        //    var importFile = new Importfile()
+        //    {
+        //        FileContent = fileContent,
+        //        FileType = ImportFileType.Textfile,
+        //        AnalyzedCuesheet = importCuesheet
+        //    };
+        //    _textImportServiceMock.Setup(x => x.AnalyseAsync(fileContent)).ReturnsAsync(importFile);
+        //    _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(importFile);
+        //    Cuesheet? sessionStateContainerImportCuesheet = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.ImportCuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cs => sessionStateContainerImportCuesheet = cs);
+        //    _sessionStateContainerMock.SetupGet(x => x.ImportCuesheet).Returns(() => sessionStateContainerImportCuesheet);
+        //    IImportfile? sessionStateContainerImportfile = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+        //    // Act
+        //    await _service.AnalyseImportfile();
+        //    // Assert
+        //    Assert.AreEqual(importFile, sessionStateContainerImportfile);
+        //    Assert.IsNotNull(sessionStateContainerImportCuesheet);
+        //    Assert.AreEqual(importCuesheet.Artist, sessionStateContainerImportCuesheet.Artist);
+        //    Assert.AreEqual(importCuesheet.Title, sessionStateContainerImportCuesheet.Title);
+        //    Assert.IsNotNull(sessionStateContainerImportCuesheet.Audiofile);
+        //    Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerImportCuesheet.Audiofile.Name);
+        //    Assert.AreEqual(importCuesheet.Cataloguenumber, sessionStateContainerImportCuesheet.Cataloguenumber);
+        //    Assert.IsNotNull(sessionStateContainerImportCuesheet.CDTextfile);
+        //    Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerImportCuesheet.CDTextfile.Name);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerImportCuesheet.Tracks.First().Artist);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerImportCuesheet.Tracks.First().Title);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerImportCuesheet.Tracks.First().Begin);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerImportCuesheet.Tracks.First().End);
+        //    CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerImportCuesheet.Tracks.First().Flags.ToList());
+        //    Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerImportCuesheet.Tracks.First().Position);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerImportCuesheet.Tracks.First().PreGap);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerImportCuesheet.Tracks.First().PostGap);
+        //    _traceChangeManagerMock.Verify(x => x.TraceChanges(It.IsAny<Cuesheet>()));
+        //    _traceChangeManagerMock.Verify(x => x.TraceChanges(It.IsAny<Track>()));
+        //}
 
-        [TestMethod()]
-        public async Task AnalyseImportfile_WithTextfile_SetsImportCuesheet()
-        {
-            // Arrange
-            var fileContent = "This is just a test";
-            var importCuesheet = new ImportCuesheet()
-            {
-                Artist = "Test Cuesheet Artist",
-                Title = "Test Cuesheet Title",
-                Audiofile = "Test Cuesheet Audiofile",
-                Cataloguenumber = "Test Cuesheet Cataloguenumber",
-                CDTextfile = "Test Cuesheet CDTextfile"
-            };
-            importCuesheet.Tracks.Add(new()
-            {
-                Artist = "Test Track Artist 1",
-                Title = "Test Track Title 1",
-                Begin = new TimeSpan(0, 3, 20),
-                End = new TimeSpan(0, 7, 43),
-                Flags = [Flag.DCP],
-                Position = 1,
-                PreGap = new TimeSpan(0, 0, 2),
-                PostGap = new TimeSpan(0, 0, 4)
-            });
-            var importFile = new Importfile()
-            {
-                FileContent = fileContent,
-                FileType = ImportFileType.Textfile,
-                AnalyzedCuesheet = importCuesheet
-            };
-            _textImportServiceMock.Setup(x => x.AnalyseAsync(fileContent)).ReturnsAsync(importFile);
-            _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(importFile);
-            Cuesheet? sessionStateContainerImportCuesheet = null;
-            _sessionStateContainerMock.SetupSet(x => x.ImportCuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cs => sessionStateContainerImportCuesheet = cs);
-            _sessionStateContainerMock.SetupGet(x => x.ImportCuesheet).Returns(() => sessionStateContainerImportCuesheet);
-            IImportfile? sessionStateContainerImportfile = null;
-            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-            // Act
-            await _service.AnalyseImportfile();
-            // Assert
-            Assert.AreEqual(importFile, sessionStateContainerImportfile);
-            Assert.IsNotNull(sessionStateContainerImportCuesheet);
-            Assert.AreEqual(importCuesheet.Artist, sessionStateContainerImportCuesheet.Artist);
-            Assert.AreEqual(importCuesheet.Title, sessionStateContainerImportCuesheet.Title);
-            Assert.IsNotNull(sessionStateContainerImportCuesheet.Audiofile);
-            Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerImportCuesheet.Audiofile.Name);
-            Assert.AreEqual(importCuesheet.Cataloguenumber, sessionStateContainerImportCuesheet.Cataloguenumber);
-            Assert.IsNotNull(sessionStateContainerImportCuesheet.CDTextfile);
-            Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerImportCuesheet.CDTextfile.Name);
-            Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerImportCuesheet.Tracks.First().Artist);
-            Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerImportCuesheet.Tracks.First().Title);
-            Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerImportCuesheet.Tracks.First().Begin);
-            Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerImportCuesheet.Tracks.First().End);
-            CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerImportCuesheet.Tracks.First().Flags.ToList());
-            Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerImportCuesheet.Tracks.First().Position);
-            Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerImportCuesheet.Tracks.First().PreGap);
-            Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerImportCuesheet.Tracks.First().PostGap);
-            _traceChangeManagerMock.Verify(x => x.TraceChanges(It.IsAny<Cuesheet>()));
-            _traceChangeManagerMock.Verify(x => x.TraceChanges(It.IsAny<Track>()));
-        }
+        //[TestMethod()]
+        //public async Task AnalyseImportfile_WithoutAnalysedCuesheet_DoesNothing()
+        //{
+        //    // Arrange
+        //    var fileContent = "This is just a test";
+        //    var importFile = new Importfile()
+        //    {
+        //        FileContent = fileContent,
+        //        FileType = ImportFileType.Textfile,
+        //    };
+        //    _textImportServiceMock.Setup(x => x.AnalyseAsync(fileContent)).ReturnsAsync(importFile);
+        //    _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(importFile);
+        //    Cuesheet? sessionStateContainerImportCuesheet = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.ImportCuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cs => sessionStateContainerImportCuesheet = cs);
+        //    IImportfile? sessionStateContainerImportfile = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+        //    // Act
+        //    await _service.AnalyseImportfile();
+        //    // Assert
+        //    Assert.AreEqual(importFile, sessionStateContainerImportfile);
+        //    Assert.IsNull(sessionStateContainerImportCuesheet);
+        //}
 
-        [TestMethod()]
-        public async Task AnalyseImportfile_WithoutAnalysedCuesheet_DoesNothing()
-        {
-            // Arrange
-            var fileContent = "This is just a test";
-            var importFile = new Importfile()
-            {
-                FileContent = fileContent,
-                FileType = ImportFileType.Textfile,
-            };
-            _textImportServiceMock.Setup(x => x.AnalyseAsync(fileContent)).ReturnsAsync(importFile);
-            _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(importFile);
-            Cuesheet? sessionStateContainerImportCuesheet = null;
-            _sessionStateContainerMock.SetupSet(x => x.ImportCuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cs => sessionStateContainerImportCuesheet = cs);
-            IImportfile? sessionStateContainerImportfile = null;
-            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-            // Act
-            await _service.AnalyseImportfile();
-            // Assert
-            Assert.AreEqual(importFile, sessionStateContainerImportfile);
-            Assert.IsNull(sessionStateContainerImportCuesheet);
-        }
+        //[TestMethod()]
+        //public async Task AnalyseImportfile_ExistingCuesheet_OverwritesCuesheet()
+        //{
+        //    // Arrange
+        //    var sessionStateContainerCuesheet = new Cuesheet()
+        //    {
+        //        Artist = "Test Cuesheet Artist",
+        //        Title = "Test Cuesheet Title",
+        //        Cataloguenumber = "Test Cuesheet Cataloguenumber"
+        //    };
+        //    sessionStateContainerCuesheet.AddTrack(new()
+        //    {
+        //        Artist = "Test Track Artist 1",
+        //        Title = "Test Track Title 1",
+        //        Begin = new TimeSpan(0, 3, 20),
+        //        End = new TimeSpan(0, 7, 43),
+        //        Flags = [Flag.DCP],
+        //        Position = 1,
+        //        PreGap = new TimeSpan(0, 0, 2),
+        //        PostGap = new TimeSpan(0, 0, 4)
+        //    });
+        //    var importCuesheet = new ImportCuesheet()
+        //    {
+        //        Artist = "Test ImportCuesheet Artist",
+        //        Title = "Test ImportCuesheet Title",
+        //        Audiofile = "Test ImportCuesheet Audiofile",
+        //        Cataloguenumber = "Test ImportCuesheet Cataloguenumber",
+        //        CDTextfile = "Test ImportCuesheet CDTextfile"
+        //    };
+        //    importCuesheet.Tracks.Add(new()
+        //    {
+        //        Artist = "Test ImportCuesheet Track Artist 1",
+        //        Title = "Test ImportCuesheet Track Title 1",
+        //        Begin = new TimeSpan(0, 0, 10),
+        //        End = new TimeSpan(0, 5, 23),
+        //        Flags = [Flag.SCMS],
+        //        Position = 1,
+        //        PreGap = new TimeSpan(0, 0, 4),
+        //        PostGap = new TimeSpan(0, 0, 6)
+        //    });
+        //    var sessionStateContainerImportFile = new Importfile()
+        //    {
+        //        FileContent = "Some file content!",
+        //        FileType = ImportFileType.Cuesheet,
+        //        AnalyzedCuesheet = importCuesheet
+        //    };
 
-        [TestMethod()]
-        public async Task AnalyseImportfile_ExistingCuesheet_OverwritesCuesheet()
-        {
-            // Arrange
-            var sessionStateContainerCuesheet = new Cuesheet()
-            {
-                Artist = "Test Cuesheet Artist",
-                Title = "Test Cuesheet Title",
-                Cataloguenumber = "Test Cuesheet Cataloguenumber"
-            };
-            sessionStateContainerCuesheet.AddTrack(new()
-            {
-                Artist = "Test Track Artist 1",
-                Title = "Test Track Title 1",
-                Begin = new TimeSpan(0, 3, 20),
-                End = new TimeSpan(0, 7, 43),
-                Flags = [Flag.DCP],
-                Position = 1,
-                PreGap = new TimeSpan(0, 0, 2),
-                PostGap = new TimeSpan(0, 0, 4)
-            });
-            var importCuesheet = new ImportCuesheet()
-            {
-                Artist = "Test ImportCuesheet Artist",
-                Title = "Test ImportCuesheet Title",
-                Audiofile = "Test ImportCuesheet Audiofile",
-                Cataloguenumber = "Test ImportCuesheet Cataloguenumber",
-                CDTextfile = "Test ImportCuesheet CDTextfile"
-            };
-            importCuesheet.Tracks.Add(new()
-            {
-                Artist = "Test ImportCuesheet Track Artist 1",
-                Title = "Test ImportCuesheet Track Title 1",
-                Begin = new TimeSpan(0, 0, 10),
-                End = new TimeSpan(0, 5, 23),
-                Flags = [Flag.SCMS],
-                Position = 1,
-                PreGap = new TimeSpan(0, 0, 4),
-                PostGap = new TimeSpan(0, 0, 6)
-            });
-            var sessionStateContainerImportFile = new Importfile()
-            {
-                FileContent = "Some file content!",
-                FileType = ImportFileType.Cuesheet,
-                AnalyzedCuesheet = importCuesheet
-            };
+        //    _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
+        //    _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
+        //    _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(() => sessionStateContainerImportFile);
 
-            _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
-            _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
-            _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(() => sessionStateContainerImportFile);
+        //    // Act
+        //    await _service.AnalyseImportfile();
+        //    // Assert
+        //    Assert.AreEqual(importCuesheet.Artist, sessionStateContainerCuesheet.Artist);
+        //    Assert.AreEqual(importCuesheet.Title, sessionStateContainerCuesheet.Title);
+        //    Assert.IsNotNull(sessionStateContainerCuesheet.Audiofile);
+        //    Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerCuesheet.Audiofile.Name);
+        //    Assert.IsNotNull(sessionStateContainerCuesheet.CDTextfile);
+        //    Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerCuesheet.CDTextfile.Name);
+        //    Assert.HasCount(importCuesheet.Tracks.Count, sessionStateContainerCuesheet.Tracks);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
+        //    CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerCuesheet.Tracks.First().Flags.ToList());
+        //    Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerCuesheet.Tracks.First().Position);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerCuesheet.Tracks.First().PostGap);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerCuesheet.Tracks.First().PreGap);
+        //    Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
+        //}
 
-            // Act
-            await _service.AnalyseImportfile();
-            // Assert
-            Assert.AreEqual(importCuesheet.Artist, sessionStateContainerCuesheet.Artist);
-            Assert.AreEqual(importCuesheet.Title, sessionStateContainerCuesheet.Title);
-            Assert.IsNotNull(sessionStateContainerCuesheet.Audiofile);
-            Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerCuesheet.Audiofile.Name);
-            Assert.IsNotNull(sessionStateContainerCuesheet.CDTextfile);
-            Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerCuesheet.CDTextfile.Name);
-            Assert.HasCount(importCuesheet.Tracks.Count, sessionStateContainerCuesheet.Tracks);
-            Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
-            Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
-            Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
-            CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerCuesheet.Tracks.First().Flags.ToList());
-            Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerCuesheet.Tracks.First().Position);
-            Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerCuesheet.Tracks.First().PostGap);
-            Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerCuesheet.Tracks.First().PreGap);
-            Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
-        }
+        //[TestMethod]
+        //public async Task UploadFilesAsync_ProjectFile_ImportsCorrectly()
+        //{
+        //    // Arrange
+        //    var fileContent = "This is the content";
+        //    var file = new FileUpload("test.projectfile", "text/plain", fileContent);
+        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(true);
+        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
+        //    _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
 
-        [TestMethod]
-        public async Task UploadFilesAsync_ProjectFile_ImportsCorrectly()
-        {
-            // Arrange
-            var fileContent = "This is the content";
-            var file = new FileUpload("test.projectfile", "text/plain", fileContent);
-            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(true);
-            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
-            _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
+        //    IImportfile? sessionStateContainerImportfile = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+        //    // Act
+        //    await _service.UploadFilesAsync([file]);
 
-            IImportfile? sessionStateContainerImportfile = null;
-            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-            // Act
-            await _service.UploadFilesAsync([file]);
+        //    // Assert
+        //    Assert.IsNotNull(sessionStateContainerImportfile);
+        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
+        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
+        //    Assert.AreEqual(ImportFileType.ProjectFile, sessionStateContainerImportfile.FileType);
+        //}
 
-            // Assert
-            Assert.IsNotNull(sessionStateContainerImportfile);
-            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
-            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
-            Assert.AreEqual(ImportFileType.ProjectFile, sessionStateContainerImportfile.FileType);
-        }
+        //[TestMethod]
+        //public async Task UploadFilesAsync_CuesheetFile_ImportsCorrectly()
+        //{
+        //    // Arrange
+        //    var fileContent = "Cuesheet file content";
+        //    var file = new FileUpload("test.cue", "text/plain", fileContent);
 
-        [TestMethod]
-        public async Task UploadFilesAsync_CuesheetFile_ImportsCorrectly()
-        {
-            // Arrange
-            var fileContent = "Cuesheet file content";
-            var file = new FileUpload("test.cue", "text/plain", fileContent);
+        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
+        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(true);
+        //    _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
 
-            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
-            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(true);
-            _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
+        //    IImportfile? sessionStateContainerImportfile = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+        //    // Act
+        //    await _service.UploadFilesAsync([file]);
 
-            IImportfile? sessionStateContainerImportfile = null;
-            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-            // Act
-            await _service.UploadFilesAsync([file]);
+        //    // Assert
+        //    Assert.IsNotNull(sessionStateContainerImportfile);
+        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
+        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
+        //    Assert.AreEqual(ImportFileType.Cuesheet, sessionStateContainerImportfile.FileType);
+        //}
 
-            // Assert
-            Assert.IsNotNull(sessionStateContainerImportfile);
-            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
-            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
-            Assert.AreEqual(ImportFileType.Cuesheet, sessionStateContainerImportfile.FileType);
-        }
+        //[TestMethod]
+        //public async Task UploadFilesAsync_TextFile_ImportsCorrectly()
+        //{
+        //    // Arrange
+        //    var fileContent = "TextFileContent";
+        //    var file = new FileUpload("test.txt", "text/plain", fileContent);
 
-        [TestMethod]
-        public async Task UploadFilesAsync_TextFile_ImportsCorrectly()
-        {
-            // Arrange
-            var fileContent = "TextFileContent";
-            var file = new FileUpload("test.txt", "text/plain", fileContent);
+        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
+        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
+        //    _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(true);
 
-            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
-            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
-            _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(true);
+        //    IImportfile? sessionStateContainerImportfile = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+        //    // Act
+        //    await _service.UploadFilesAsync([file]);
 
-            IImportfile? sessionStateContainerImportfile = null;
-            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-            // Act
-            await _service.UploadFilesAsync([file]);
+        //    // Assert
+        //    Assert.IsNotNull(sessionStateContainerImportfile);
+        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
+        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
+        //    Assert.AreEqual(ImportFileType.Textfile, sessionStateContainerImportfile.FileType);
+        //}
 
-            // Assert
-            Assert.IsNotNull(sessionStateContainerImportfile);
-            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
-            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
-            Assert.AreEqual(ImportFileType.Textfile, sessionStateContainerImportfile.FileType);
-        }
+        //[TestMethod]
+        //public async Task UploadFilesAsync_WithAudiofile_ImportsCorrectly()
+        //{
+        //    // Arrange
+        //    var file = new FileUpload("test.mp3", "audio/mpeg");
 
-        [TestMethod]
-        public async Task UploadFilesAsync_WithAudiofile_ImportsCorrectly()
-        {
-            // Arrange
-            var file = new FileUpload("test.mp3", "audio/mpeg");
+        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
+        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
+        //    _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
+        //    _fileInputManagerMock.Setup(f => f.IsValidAudiofile(file.ContentType, file.Name)).Returns(true);
+        //    _fileInputManagerMock.Setup(f => f.CreateAudiofileAsync(It.IsAny<FileUpload>())).ReturnsAsync(new Audiofile(file.Name));
 
-            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
-            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
-            _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
-            _fileInputManagerMock.Setup(f => f.IsValidAudiofile(file.ContentType, file.Name)).Returns(true);
-            _fileInputManagerMock.Setup(f => f.CreateAudiofileAsync(It.IsAny<FileUpload>())).ReturnsAsync(new Audiofile(file.Name));
+        //    IImportfile? sessionStateContainerImportfile = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+        //    Audiofile? sessionStateContainerImportAudiofile = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.ImportAudiofile = It.IsAny<Audiofile>()).Callback<Audiofile>(x => sessionStateContainerImportAudiofile = x);
+        //    // Act
+        //    await _service.UploadFilesAsync([file]);
 
-            IImportfile? sessionStateContainerImportfile = null;
-            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-            Audiofile? sessionStateContainerImportAudiofile = null;
-            _sessionStateContainerMock.SetupSet(x => x.ImportAudiofile = It.IsAny<Audiofile>()).Callback<Audiofile>(x => sessionStateContainerImportAudiofile = x);
-            // Act
-            await _service.UploadFilesAsync([file]);
+        //    // Assert
+        //    Assert.IsNull(sessionStateContainerImportfile);
+        //    Assert.IsNotNull(sessionStateContainerImportAudiofile);
+        //}
 
-            // Assert
-            Assert.IsNull(sessionStateContainerImportfile);
-            Assert.IsNotNull(sessionStateContainerImportAudiofile);
-        }
+        //[TestMethod]
+        //public void ImportCuesheet_WithImportCuesheetAvailable_ImportsCuesheetData()
+        //{
+        //    // Arrange
+        //    var sessionStateContainerImportCuesheet = new Cuesheet()
+        //    {
+        //        Artist = "Artist 123",
+        //        Title = "Title 456"
+        //    };
+        //    sessionStateContainerImportCuesheet.AddTrack(new()
+        //    {
+        //        Artist = "Track Artist 1",
+        //        Title = "Track Title 1",
+        //        End = new TimeSpan(0, 4, 23),
+        //    });
+        //    sessionStateContainerImportCuesheet.AddTrack(new()
+        //    {
+        //        Artist = "Track Artist 2",
+        //        Title = "Track Title 2",
+        //        End = new TimeSpan(0, 8, 54),
+        //    });
+        //    _sessionStateContainerMock.SetupGet(x => x.ImportCuesheet).Returns(sessionStateContainerImportCuesheet);
+        //    Cuesheet sessionStateContainerCuesheet = new();
+        //    _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
+        //    _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
+        //    // Act
+        //    _service.ImportCuesheet();
+        //    // Assert
+        //    Assert.IsNotNull(sessionStateContainerCuesheet);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Artist, sessionStateContainerCuesheet.Artist);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Title, sessionStateContainerCuesheet.Title);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Artist, sessionStateContainerCuesheet.Tracks.Last().Artist);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Title, sessionStateContainerCuesheet.Tracks.Last().Title);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Begin, sessionStateContainerCuesheet.Tracks.Last().Begin);
+        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().End, sessionStateContainerCuesheet.Tracks.Last().End);
+        //    _traceChangeManagerMock.Verify(x => x.RemoveTracedChanges(It.IsAny<IEnumerable<ITraceable>>()));
+        //}
 
-        [TestMethod]
-        public void ImportCuesheet_WithImportCuesheetAvailable_ImportsCuesheetData()
-        {
-            // Arrange
-            var sessionStateContainerImportCuesheet = new Cuesheet()
-            {
-                Artist = "Artist 123",
-                Title = "Title 456"
-            };
-            sessionStateContainerImportCuesheet.AddTrack(new()
-            {
-                Artist = "Track Artist 1",
-                Title = "Track Title 1",
-                End = new TimeSpan(0, 4, 23),
-            });
-            sessionStateContainerImportCuesheet.AddTrack(new()
-            {
-                Artist = "Track Artist 2",
-                Title = "Track Title 2",
-                End = new TimeSpan(0, 8, 54),
-            });
-            _sessionStateContainerMock.SetupGet(x => x.ImportCuesheet).Returns(sessionStateContainerImportCuesheet);
-            Cuesheet sessionStateContainerCuesheet = new();
-            _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
-            _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
-            // Act
-            _service.ImportCuesheet();
-            // Assert
-            Assert.IsNotNull(sessionStateContainerCuesheet);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Artist, sessionStateContainerCuesheet.Artist);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Title, sessionStateContainerCuesheet.Title);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Artist, sessionStateContainerCuesheet.Tracks.Last().Artist);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Title, sessionStateContainerCuesheet.Tracks.Last().Title);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Begin, sessionStateContainerCuesheet.Tracks.Last().Begin);
-            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().End, sessionStateContainerCuesheet.Tracks.Last().End);
-            _traceChangeManagerMock.Verify(x => x.RemoveTracedChanges(It.IsAny<IEnumerable<ITraceable>>()));
-        }
-
-        [TestMethod]
-        public void ImportData_ValidData_SetsImportfile()
-        {
-            // Arrange
-            var importData = nameof(ImportData_ValidData_SetsImportfile);
-            IImportfile? sessionStateContainerImportfile = null;
-            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-            // Act
-            _service.ImportData(importData);
-            // Assert
-            Assert.IsNotNull(sessionStateContainerImportfile);
-            Assert.AreEqual(importData, sessionStateContainerImportfile.FileContent);
-            Assert.AreEqual(importData, sessionStateContainerImportfile.FileContentRecognized);
-            Assert.AreEqual(ImportFileType.Textfile, sessionStateContainerImportfile.FileType);
-        }
+        //[TestMethod]
+        //public void ImportData_ValidData_SetsImportfile()
+        //{
+        //    // Arrange
+        //    var importData = nameof(ImportData_ValidData_SetsImportfile);
+        //    IImportfile? sessionStateContainerImportfile = null;
+        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+        //    // Act
+        //    _service.ImportData(importData);
+        //    // Assert
+        //    Assert.IsNotNull(sessionStateContainerImportfile);
+        //    Assert.AreEqual(importData, sessionStateContainerImportfile.FileContent);
+        //    Assert.AreEqual(importData, sessionStateContainerImportfile.FileContentRecognized);
+        //    Assert.AreEqual(ImportFileType.Textfile, sessionStateContainerImportfile.FileType);
+        //}
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs b/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
index 637db7bc..b57778ba 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
@@ -141,7 +141,7 @@ public async Task AnalyseAsync_InputfileWithExtraSeperator_CreatesValidCuesheetA
             Assert.AreEqual("CuesheetTitle", importfile.AnalyzedCuesheet.Title);
             Assert.AreEqual("c:\\tmp\\TestTextFile.cdt", importfile.AnalyzedCuesheet.CDTextfile);
             Assert.HasCount(8, importfile.AnalyzedCuesheet.Tracks);
-            Assert.AreEqual((uint)6, importfile.AnalyzedCuesheet.Tracks.ElementAt(5).Position);
+            Assert.AreEqual((ushort)6, importfile.AnalyzedCuesheet.Tracks.ElementAt(5).Position);
             Assert.AreEqual("Sample Artist 1", importfile.AnalyzedCuesheet.Tracks.ElementAt(0).Artist);
             Assert.AreEqual("Sample Title 1", importfile.AnalyzedCuesheet.Tracks.ElementAt(0).Title);
             Assert.AreEqual(new TimeSpan(0, 5, 0), importfile.AnalyzedCuesheet.Tracks.ElementAt(0).End);
@@ -183,7 +183,7 @@ public async Task AnalyseAsync_InputfileWithSimplifiedScheme_CreatesValidCueshee
             Assert.AreEqual("CuesheetTitle", importFile.AnalyzedCuesheet.Title);
             Assert.AreEqual("c:\\tmp\\TestTextFile.cdt", importFile.AnalyzedCuesheet.CDTextfile);
             Assert.HasCount(8, importFile.AnalyzedCuesheet.Tracks);
-            Assert.AreEqual((uint)6, importFile.AnalyzedCuesheet.Tracks.ElementAt(5).Position);
+            Assert.AreEqual((ushort)6, importFile.AnalyzedCuesheet.Tracks.ElementAt(5).Position);
             Assert.AreEqual("Sample Artist 1", importFile.AnalyzedCuesheet.Tracks.ElementAt(0).Artist);
             Assert.AreEqual("Sample Title 1", importFile.AnalyzedCuesheet.Tracks.ElementAt(0).Title);
             Assert.AreEqual(new TimeSpan(0, 5, 0), importFile.AnalyzedCuesheet.Tracks.ElementAt(0).End);
@@ -279,7 +279,7 @@ public async Task AnalyseAsync_CuesheetWithTextfileAndCatalogueNumber_CreatesVal
             Assert.AreEqual("c:\\tmp\\TestTextFile.cdt", importFile.AnalyzedCuesheet.CDTextfile);
             Assert.AreEqual("A83412346734", importFile.AnalyzedCuesheet.Cataloguenumber);
             Assert.HasCount(8, importFile.AnalyzedCuesheet.Tracks);
-            Assert.AreEqual((uint)6, importFile.AnalyzedCuesheet.Tracks.ElementAt(5).Position);
+            Assert.AreEqual((ushort)6, importFile.AnalyzedCuesheet.Tracks.ElementAt(5).Position);
             Assert.AreEqual("Sample Artist 1", importFile.AnalyzedCuesheet.Tracks.ElementAt(0).Artist);
             Assert.AreEqual("Sample Title 1", importFile.AnalyzedCuesheet.Tracks.ElementAt(0).Title);
             Assert.AreEqual(new TimeSpan(0, 5, 0), importFile.AnalyzedCuesheet.Tracks.ElementAt(0).End);
diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 195cbcb3..9d14f014 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -138,222 +138,222 @@ public void UndoRedoCombinationTest()
             manager.Redo();
             Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
         }
+        //TODO
+        //[TestMethod()]
+        //public void TrackListTest()
+        //{
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var cuesheet = new Cuesheet();
+        //    manager.TraceChanges(cuesheet);
+        //    Assert.IsFalse(manager.CanUndo);
+        //    cuesheet.AddTrack(new Track());
+        //    Assert.IsTrue(manager.CanUndo);
+        //    manager.Undo();
+        //    Assert.IsEmpty(cuesheet.Tracks);
+        //    Assert.IsTrue(manager.CanRedo);
+        //    manager.Redo();
+        //    Assert.HasCount(1, cuesheet.Tracks);
+        //    Assert.IsFalse(manager.CanRedo);
+        //}
 
-        [TestMethod()]
-        public void TrackListTest()
-        {
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var cuesheet = new Cuesheet();
-            manager.TraceChanges(cuesheet);
-            Assert.IsFalse(manager.CanUndo);
-            cuesheet.AddTrack(new Track());
-            Assert.IsTrue(manager.CanUndo);
-            manager.Undo();
-            Assert.IsEmpty(cuesheet.Tracks);
-            Assert.IsTrue(manager.CanRedo);
-            manager.Redo();
-            Assert.HasCount(1, cuesheet.Tracks);
-            Assert.IsFalse(manager.CanRedo);
-        }
-
-        [TestMethod()]
-        public void RemoveTracksTest()
-        {
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var cuesheet = new Cuesheet();
-            manager.TraceChanges(cuesheet);
-            var track1 = new Track()
-            {
-                Artist = "Track 1 Artist",
-                Title = "Track 1 Title",
-                End = new TimeSpan(0, 2, 30)
-            };
-            var track2 = new Track()
-            {
-                Artist = "Track 2 Artist",
-                Title = "Track 2 Title",
-                End = new TimeSpan(0, 4, 20)
-            };
-            var track3 = new Track()
-            {
-                Artist = "Track 3 Artist",
-                Title = "Track 3 Title",
-                End = new TimeSpan(0, 7, 12)
-            };
-            var track4 = new Track()
-            {
-                Artist = "Track 4 Artist",
-                Title = "Track 4 Title",
-                End = new TimeSpan(0, 9, 12)
-            };
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-            cuesheet.AddTrack(track4);
-            Assert.AreEqual(ValidationStatus.Success, track1.Validate().Status);
-            Assert.AreEqual(ValidationStatus.Success, track2.Validate().Status);
-            Assert.AreEqual(ValidationStatus.Success, track3.Validate().Status);
-            Assert.AreEqual(ValidationStatus.Success, track4.Validate().Status);
-            var tracksToRemove = new List<Track>
-            {
-                track2,
-                track4
-            };
-            cuesheet.RemoveTracks(tracksToRemove);
-            Assert.IsTrue(manager.CanUndo);
-            manager.Undo();
-            Assert.HasCount(4, cuesheet.Tracks);
-            //We need to set object references back to cue sheet tracks since TraceChangeManager creates new objects
-            track1 = cuesheet.Tracks.ElementAt(0);
-            track2 = cuesheet.Tracks.ElementAt(1);
-            track3 = cuesheet.Tracks.ElementAt(2);
-            track4 = cuesheet.Tracks.ElementAt(3);
-            Assert.AreEqual(ValidationStatus.Success, track1.Validate().Status);
-            Assert.AreEqual(ValidationStatus.Success, track2.Validate().Status);
-            Assert.AreEqual(ValidationStatus.Success, track3.Validate().Status);
-            Assert.AreEqual(ValidationStatus.Success, track4.Validate().Status);
-        }
+        //[TestMethod()]
+        //public void RemoveTracksTest()
+        //{
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var cuesheet = new Cuesheet();
+        //    manager.TraceChanges(cuesheet);
+        //    var track1 = new Track()
+        //    {
+        //        Artist = "Track 1 Artist",
+        //        Title = "Track 1 Title",
+        //        End = new TimeSpan(0, 2, 30)
+        //    };
+        //    var track2 = new Track()
+        //    {
+        //        Artist = "Track 2 Artist",
+        //        Title = "Track 2 Title",
+        //        End = new TimeSpan(0, 4, 20)
+        //    };
+        //    var track3 = new Track()
+        //    {
+        //        Artist = "Track 3 Artist",
+        //        Title = "Track 3 Title",
+        //        End = new TimeSpan(0, 7, 12)
+        //    };
+        //    var track4 = new Track()
+        //    {
+        //        Artist = "Track 4 Artist",
+        //        Title = "Track 4 Title",
+        //        End = new TimeSpan(0, 9, 12)
+        //    };
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+        //    cuesheet.AddTrack(track4);
+        //    Assert.AreEqual(ValidationStatus.Success, track1.Validate().Status);
+        //    Assert.AreEqual(ValidationStatus.Success, track2.Validate().Status);
+        //    Assert.AreEqual(ValidationStatus.Success, track3.Validate().Status);
+        //    Assert.AreEqual(ValidationStatus.Success, track4.Validate().Status);
+        //    var tracksToRemove = new List<Track>
+        //    {
+        //        track2,
+        //        track4
+        //    };
+        //    cuesheet.RemoveTracks(tracksToRemove);
+        //    Assert.IsTrue(manager.CanUndo);
+        //    manager.Undo();
+        //    Assert.HasCount(4, cuesheet.Tracks);
+        //    //We need to set object references back to cue sheet tracks since TraceChangeManager creates new objects
+        //    track1 = cuesheet.Tracks.ElementAt(0);
+        //    track2 = cuesheet.Tracks.ElementAt(1);
+        //    track3 = cuesheet.Tracks.ElementAt(2);
+        //    track4 = cuesheet.Tracks.ElementAt(3);
+        //    Assert.AreEqual(ValidationStatus.Success, track1.Validate().Status);
+        //    Assert.AreEqual(ValidationStatus.Success, track2.Validate().Status);
+        //    Assert.AreEqual(ValidationStatus.Success, track3.Validate().Status);
+        //    Assert.AreEqual(ValidationStatus.Success, track4.Validate().Status);
+        //}
 
-        [TestMethod()]
-        public void ResetTest()
-        {
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            Assert.IsFalse(manager.CanUndo);
-            Assert.IsFalse(manager.CanRedo);
-            var cuesheet = new Cuesheet();
-            manager.TraceChanges(cuesheet);
-            var track1 = new Track()
-            {
-                Artist = "Track 1 Artist",
-                Title = "Track 1 Title",
-                End = new TimeSpan(0, 2, 30)
-            };
-            cuesheet.AddTrack(track1);
-            Assert.IsTrue(manager.CanUndo);
-            manager.Reset();
-            Assert.IsFalse(manager.CanUndo);
-            Assert.IsFalse(manager.CanRedo);
-        }
+        //[TestMethod()]
+        //public void ResetTest()
+        //{
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    Assert.IsFalse(manager.CanUndo);
+        //    Assert.IsFalse(manager.CanRedo);
+        //    var cuesheet = new Cuesheet();
+        //    manager.TraceChanges(cuesheet);
+        //    var track1 = new Track()
+        //    {
+        //        Artist = "Track 1 Artist",
+        //        Title = "Track 1 Title",
+        //        End = new TimeSpan(0, 2, 30)
+        //    };
+        //    cuesheet.AddTrack(track1);
+        //    Assert.IsTrue(manager.CanUndo);
+        //    manager.Reset();
+        //    Assert.IsFalse(manager.CanUndo);
+        //    Assert.IsFalse(manager.CanRedo);
+        //}
 
-        [TestMethod()]
-        public void BulkEditTracksTest()
-        {
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var cuesheet = new Cuesheet();
-            manager.TraceChanges(cuesheet);
-            var tracedObjectHistoryChangedFired = false;
-            manager.TracedObjectHistoryChanged += delegate
-            {
-                tracedObjectHistoryChangedFired = true;
-            };
-            var track1 = new Track();
-            var track2 = new Track();
-            var track3 = new Track();
-            var track4 = new Track();
-            manager.TraceChanges(track1);
-            manager.TraceChanges(track2);
-            manager.TraceChanges(track3);
-            manager.TraceChanges(track4);
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-            cuesheet.AddTrack(track4);
-            track1.IsLinkedToPreviousTrack = true;
-            track2.IsLinkedToPreviousTrack = true;
-            track3.IsLinkedToPreviousTrack = true;
-            track4.IsLinkedToPreviousTrack = true;
-            var editedTrack = new Track() { Artist = "Test", Title = "Testtitle", Length = new TimeSpan(0, 2, 0) };
-            manager.BulkEdit = true;
-            track1.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-            track2.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-            track3.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-            track4.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-            manager.BulkEdit = false;
-            Assert.IsTrue(manager.CanUndo);
-            Assert.AreEqual(editedTrack.Length, track1.End);
-            Assert.AreEqual(track1.End, track2.Begin);
-            Assert.AreEqual(track2.End, track3.Begin);
-            Assert.AreEqual(track3.End, track4.Begin);
-            Assert.IsNotNull(track4.End);
-            Assert.AreEqual(editedTrack.Artist, track1.Artist);
-            Assert.AreEqual(editedTrack.Artist, track2.Artist);
-            Assert.AreEqual(editedTrack.Artist, track3.Artist);
-            Assert.AreEqual(editedTrack.Artist, track4.Artist);
-            Assert.AreEqual(editedTrack.Title, track1.Title);
-            Assert.AreEqual(editedTrack.Title, track2.Title);
-            Assert.AreEqual(editedTrack.Title, track3.Title);
-            Assert.AreEqual(editedTrack.Title, track4.Title);
-            Assert.IsTrue(tracedObjectHistoryChangedFired);
-            manager.Undo();
-            Assert.IsNull(track1.End);
-            Assert.IsNull(track2.End);
-            Assert.IsNull(track3.End);
-            Assert.IsNull(track4.End);
-            Assert.IsNull(track1.Artist);
-            Assert.IsNull(track2.Artist);
-            Assert.IsNull(track3.Artist);
-            Assert.IsNull(track4.Artist);
-            Assert.IsNull(track1.Title);
-            Assert.IsNull(track2.Title);
-            Assert.IsNull(track3.Title);
-            Assert.IsNull(track4.Title);
-        }
+        //[TestMethod()]
+        //public void BulkEditTracksTest()
+        //{
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var cuesheet = new Cuesheet();
+        //    manager.TraceChanges(cuesheet);
+        //    var tracedObjectHistoryChangedFired = false;
+        //    manager.TracedObjectHistoryChanged += delegate
+        //    {
+        //        tracedObjectHistoryChangedFired = true;
+        //    };
+        //    var track1 = new Track();
+        //    var track2 = new Track();
+        //    var track3 = new Track();
+        //    var track4 = new Track();
+        //    manager.TraceChanges(track1);
+        //    manager.TraceChanges(track2);
+        //    manager.TraceChanges(track3);
+        //    manager.TraceChanges(track4);
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+        //    cuesheet.AddTrack(track4);
+        //    track1.IsLinkedToPreviousTrack = true;
+        //    track2.IsLinkedToPreviousTrack = true;
+        //    track3.IsLinkedToPreviousTrack = true;
+        //    track4.IsLinkedToPreviousTrack = true;
+        //    var editedTrack = new Track() { Artist = "Test", Title = "Testtitle", Length = new TimeSpan(0, 2, 0) };
+        //    manager.BulkEdit = true;
+        //    track1.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
+        //    track2.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
+        //    track3.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
+        //    track4.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
+        //    manager.BulkEdit = false;
+        //    Assert.IsTrue(manager.CanUndo);
+        //    Assert.AreEqual(editedTrack.Length, track1.End);
+        //    Assert.AreEqual(track1.End, track2.Begin);
+        //    Assert.AreEqual(track2.End, track3.Begin);
+        //    Assert.AreEqual(track3.End, track4.Begin);
+        //    Assert.IsNotNull(track4.End);
+        //    Assert.AreEqual(editedTrack.Artist, track1.Artist);
+        //    Assert.AreEqual(editedTrack.Artist, track2.Artist);
+        //    Assert.AreEqual(editedTrack.Artist, track3.Artist);
+        //    Assert.AreEqual(editedTrack.Artist, track4.Artist);
+        //    Assert.AreEqual(editedTrack.Title, track1.Title);
+        //    Assert.AreEqual(editedTrack.Title, track2.Title);
+        //    Assert.AreEqual(editedTrack.Title, track3.Title);
+        //    Assert.AreEqual(editedTrack.Title, track4.Title);
+        //    Assert.IsTrue(tracedObjectHistoryChangedFired);
+        //    manager.Undo();
+        //    Assert.IsNull(track1.End);
+        //    Assert.IsNull(track2.End);
+        //    Assert.IsNull(track3.End);
+        //    Assert.IsNull(track4.End);
+        //    Assert.IsNull(track1.Artist);
+        //    Assert.IsNull(track2.Artist);
+        //    Assert.IsNull(track3.Artist);
+        //    Assert.IsNull(track4.Artist);
+        //    Assert.IsNull(track1.Title);
+        //    Assert.IsNull(track2.Title);
+        //    Assert.IsNull(track3.Title);
+        //    Assert.IsNull(track4.Title);
+        //}
 
-        [TestMethod()]
-        public void BulkEditTracksLengthTest()
-        {
-            //We do an edit on 4 tracks to set the length, undo, redo and again undo.
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var cuesheet = new Cuesheet();
-            manager.TraceChanges(cuesheet);
-            var track1 = new Track();
-            var track2 = new Track();
-            var track3 = new Track();
-            var track4 = new Track();
-            manager.TraceChanges(track1);
-            manager.TraceChanges(track2);
-            manager.TraceChanges(track3);
-            manager.TraceChanges(track4);
-            cuesheet.AddTrack(track1);
-            cuesheet.AddTrack(track2);
-            cuesheet.AddTrack(track3);
-            cuesheet.AddTrack(track4);
-            track1.IsLinkedToPreviousTrack = true;
-            track2.IsLinkedToPreviousTrack = true;
-            track3.IsLinkedToPreviousTrack = true;
-            track4.IsLinkedToPreviousTrack = true;
-            var editedTrack = new Track() { Length = new TimeSpan(0, 2, 0) };
-            manager.BulkEdit = true;
-            track1.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-            track2.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-            track3.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-            track4.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-            manager.BulkEdit = false;
-            Assert.IsTrue(manager.CanUndo);
-            Assert.AreEqual(editedTrack.Length, track1.End);
-            Assert.AreEqual(track1.End, track2.Begin);
-            Assert.AreEqual(track2.End, track3.Begin);
-            Assert.AreEqual(track3.End, track4.Begin);
-            Assert.IsNotNull(track4.End);
-            manager.Undo();
-            Assert.IsNull(track1.End);
-            Assert.IsNull(track2.End);
-            Assert.IsNull(track3.End);
-            Assert.IsNull(track4.End);
-            Assert.IsTrue(manager.CanRedo);
-            manager.Redo();
-            Assert.AreEqual(editedTrack.Length, track1.End);
-            Assert.AreEqual(track1.End, track2.Begin);
-            Assert.AreEqual(track2.End, track3.Begin);
-            Assert.AreEqual(track3.End, track4.Begin);
-            Assert.IsNotNull(track4.End);
-            Assert.IsTrue(manager.CanUndo);
-            manager.Undo();
-            Assert.IsNull(track1.End);
-            Assert.IsNull(track2.End);
-            Assert.IsNull(track3.End);
-            Assert.IsNull(track4.End);
-        }
+        //[TestMethod()]
+        //public void BulkEditTracksLengthTest()
+        //{
+        //    //We do an edit on 4 tracks to set the length, undo, redo and again undo.
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var cuesheet = new Cuesheet();
+        //    manager.TraceChanges(cuesheet);
+        //    var track1 = new Track();
+        //    var track2 = new Track();
+        //    var track3 = new Track();
+        //    var track4 = new Track();
+        //    manager.TraceChanges(track1);
+        //    manager.TraceChanges(track2);
+        //    manager.TraceChanges(track3);
+        //    manager.TraceChanges(track4);
+        //    cuesheet.AddTrack(track1);
+        //    cuesheet.AddTrack(track2);
+        //    cuesheet.AddTrack(track3);
+        //    cuesheet.AddTrack(track4);
+        //    track1.IsLinkedToPreviousTrack = true;
+        //    track2.IsLinkedToPreviousTrack = true;
+        //    track3.IsLinkedToPreviousTrack = true;
+        //    track4.IsLinkedToPreviousTrack = true;
+        //    var editedTrack = new Track() { Length = new TimeSpan(0, 2, 0) };
+        //    manager.BulkEdit = true;
+        //    track1.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
+        //    track2.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
+        //    track3.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
+        //    track4.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
+        //    manager.BulkEdit = false;
+        //    Assert.IsTrue(manager.CanUndo);
+        //    Assert.AreEqual(editedTrack.Length, track1.End);
+        //    Assert.AreEqual(track1.End, track2.Begin);
+        //    Assert.AreEqual(track2.End, track3.Begin);
+        //    Assert.AreEqual(track3.End, track4.Begin);
+        //    Assert.IsNotNull(track4.End);
+        //    manager.Undo();
+        //    Assert.IsNull(track1.End);
+        //    Assert.IsNull(track2.End);
+        //    Assert.IsNull(track3.End);
+        //    Assert.IsNull(track4.End);
+        //    Assert.IsTrue(manager.CanRedo);
+        //    manager.Redo();
+        //    Assert.AreEqual(editedTrack.Length, track1.End);
+        //    Assert.AreEqual(track1.End, track2.Begin);
+        //    Assert.AreEqual(track2.End, track3.Begin);
+        //    Assert.AreEqual(track3.End, track4.Begin);
+        //    Assert.IsNotNull(track4.End);
+        //    Assert.IsTrue(manager.CanUndo);
+        //    manager.Undo();
+        //    Assert.IsNull(track1.End);
+        //    Assert.IsNull(track2.End);
+        //    Assert.IsNull(track3.End);
+        //    Assert.IsNull(track4.End);
+        //}
         
         [TestMethod()]
         public void RemoveTracedChanges_RemovesChanges_WhenChangesAvailable()

From 244a4c7f14b90474449d7db4514c5b0776de861a Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 15:23:24 +0200
Subject: [PATCH 050/150] add tests

---
 .../ApplicationOptionsTimeSpanParserTests.cs  | 63 +++++++++++++++++++
 .../UI/ApplicationOptionsTimeSpanParser.cs    |  1 -
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs b/AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs
index b7e8ef56..a8205c0f 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/ApplicationOptionsTimeSpanParserTests.cs
@@ -16,6 +16,7 @@
 using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.Options;
+using AudioCuesheetEditor.Model.Utility;
 using AudioCuesheetEditor.Services.UI;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -109,5 +110,67 @@ public void GetTimespanFormatted_InvalidFormat_FallbackToDefault()
             // Assert
             Assert.AreEqual("01:30:27.2001030", result);
         }
+
+        [TestMethod()]
+        public async Task GetTimespanAsync_CustomValidFormat_ReturnsTimeSpanAsync()
+        {
+            // Arrange
+            var options = new ApplicationOptions()
+            {
+                TimeSpanFormat = new()
+                {
+                    Scheme = $"{TimeSpanFormat.Hours}-{TimeSpanFormat.Minutes}-{TimeSpanFormat.Seconds}"
+                }
+            };
+            var mockOptionsProvider = new Mock<ILocalStorageOptionsProvider>();
+            mockOptionsProvider
+                .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
+                .ReturnsAsync(options);
+            var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
+            // Act
+            var result = await parser.GetTimespanAsync("23-45-56");
+            // Assert
+            Assert.IsNotNull(result);
+            Assert.AreEqual(new TimeSpan(23, 45, 56), result);
+        }
+
+        [TestMethod()]
+        public async Task GetTimespanAsync_CustomInvalidFormat_ReturnsNullAsync()
+        {
+            // Arrange
+            var options = new ApplicationOptions()
+            {
+                TimeSpanFormat = new()
+                {
+                    Scheme = $"INVALID_FORMAT"
+                }
+            };
+            var mockOptionsProvider = new Mock<ILocalStorageOptionsProvider>();
+            mockOptionsProvider
+                .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
+                .ReturnsAsync(options);
+            var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
+            // Act
+            var result = await parser.GetTimespanAsync("23-45-56");
+            // Assert
+            Assert.IsNull(result);
+        }
+
+        [TestMethod()]
+        public async Task GetTimespanAsync_DefaultFormat_ReturnsTimeSpanAsync()
+        {
+            // Arrange
+            var options = new ApplicationOptions();
+            var mockOptionsProvider = new Mock<ILocalStorageOptionsProvider>();
+            mockOptionsProvider
+                .Setup(p => p.GetOptionsAsync<ApplicationOptions>())
+                .ReturnsAsync(options);
+            var parser = new ApplicationOptionsTimeSpanParser(mockOptionsProvider.Object);
+            // Act
+            var result = await parser.GetTimespanAsync("23:45:56");
+            // Assert
+            Assert.IsNotNull(result);
+            Assert.AreEqual(new TimeSpan(23, 45, 56), result);
+        }
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs b/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
index b06086d2..d23c44ac 100644
--- a/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
+++ b/AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs
@@ -54,7 +54,6 @@ public async Task TimespanTextChanged<T, TProperty>(T entity, Expression<Func<T,
             }
         }
 
-        //TODO: Tests
         public async Task<TimeSpan?> GetTimespanAsync(String value)
         {
             await EnsureInitializedAsync();

From 7f0c4590760be9eb2dabf1bdd9ce05e44a8e783e Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 15:24:56 +0200
Subject: [PATCH 051/150] Update TraceChangeManagerTests.cs

---
 .../Services/UI/TraceChangeManagerTests.cs                     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 9d14f014..bd888327 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -14,13 +14,10 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
-using AudioCuesheetEditor.Model.Entity;
 using AudioCuesheetEditor.Services.UI;
 using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace AudioCuesheetEditor.Tests.Services.UI
 {

From 2b61216c70ab3bf30eca73d327cc16057758d081 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 16:33:10 +0200
Subject: [PATCH 052/150] remove ITraceable

---
 .../Services/UI/SessionStateContainerTests.cs |  68 ++--
 .../Services/UI/TraceChangeManagerTests.cs    | 313 +++++++++---------
 .../Model/AudioCuesheet/Cuesheet.cs           |   6 +-
 .../Model/AudioCuesheet/Track.cs              |   6 +-
 .../UI/{ITraceable.cs => TraceableChange.cs}  |  16 -
 AudioCuesheetEditor/Model/UI/TracedChange.cs  |  39 +++
 AudioCuesheetEditor/Model/UI/TracedChanges.cs |  23 ++
 .../Services/IO/ImportManager.cs              |  11 +-
 .../Services/UI/ITraceChangeManager.cs        |   3 +-
 .../Services/UI/SessionStateContainer.cs      |   9 +-
 .../Services/UI/TraceChangeManager.cs         |  98 +-----
 .../Shared/TrackList/TrackList.razor          |   2 -
 12 files changed, 271 insertions(+), 323 deletions(-)
 rename AudioCuesheetEditor/Model/UI/{ITraceable.cs => TraceableChange.cs} (67%)
 create mode 100644 AudioCuesheetEditor/Model/UI/TracedChange.cs
 create mode 100644 AudioCuesheetEditor/Model/UI/TracedChanges.cs

diff --git a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
index 41606bdf..c7f7e310 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
@@ -33,40 +33,40 @@ public SessionStateContainerTests()
             traceChangeManagerMock = new Mock<ITraceChangeManager>();
             sessionStateContainer = new SessionStateContainer(traceChangeManagerMock.Object);
         }
-
-        [TestMethod]
-        public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
-        {
-            // Arrange
-            var newCuesheet = new Cuesheet();
-            bool eventTriggered = false;
-            bool traceablePropertyChangedFired = false;
-            sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
-            sessionStateContainer.TraceablePropertyChanged += (sender, args) => traceablePropertyChangedFired = true;
-
-            // Act
-            sessionStateContainer.Cuesheet = newCuesheet;
-
-            // Assert
-            Assert.IsTrue(eventTriggered);
-            Assert.IsTrue(traceablePropertyChangedFired);
-            traceChangeManagerMock.Verify(m => m.TraceChanges(newCuesheet), Times.Once);
-        }
-
-        [TestMethod]
-        public void ImportCuesheet_SetNewValue_ShouldTriggerImportCuesheetChangedEvent()
-        {
-            // Arrange
-            var newImportCuesheet = new Cuesheet();
-            bool eventTriggered = false;
-            sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
-
-            // Act
-            sessionStateContainer.ImportCuesheet = newImportCuesheet;
-
-            // Assert
-            Assert.IsTrue(eventTriggered);
-        }
+        //TODO
+        //[TestMethod]
+        //public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
+        //{
+        //    // Arrange
+        //    var newCuesheet = new Cuesheet();
+        //    bool eventTriggered = false;
+        //    bool traceablePropertyChangedFired = false;
+        //    sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
+        //    sessionStateContainer.TraceablePropertyChanged += (sender, args) => traceablePropertyChangedFired = true;
+
+        //    // Act
+        //    sessionStateContainer.Cuesheet = newCuesheet;
+
+        //    // Assert
+        //    Assert.IsTrue(eventTriggered);
+        //    Assert.IsTrue(traceablePropertyChangedFired);
+        //    traceChangeManagerMock.Verify(m => m.TraceChanges(newCuesheet), Times.Once);
+        //}
+
+        //[TestMethod]
+        //public void ImportCuesheet_SetNewValue_ShouldTriggerImportCuesheetChangedEvent()
+        //{
+        //    // Arrange
+        //    var newImportCuesheet = new Cuesheet();
+        //    bool eventTriggered = false;
+        //    sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
+
+        //    // Act
+        //    sessionStateContainer.ImportCuesheet = newImportCuesheet;
+
+        //    // Assert
+        //    Assert.IsTrue(eventTriggered);
+        //}
 
         [TestMethod]
         public void ImportAudiofile_SetNewValue_ShouldUpdateImportCuesheetAndTriggerEvent()
diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index bd888327..13436ff9 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -24,118 +24,119 @@ namespace AudioCuesheetEditor.Tests.Services.UI
     [TestClass()]
     public class TraceChangeManagerTests
     {
+        //TODO
         private static T CallInItsOwnScope<T>(Func<T> getter)
         {
             return getter();
         }
 
-        [TestMethod()]
-        public void TraceChangesTest()
-        {
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var callResult = CallInItsOwnScope(() =>
-            {
-                var track = new Track();
-                manager.TraceChanges(track);
-                var track2 = new Track();
-                manager.TraceChanges(track2);
-                track2.Title = "Title 2";
-                track.Artist = "Artist 1";
-                track = null;
-                GC.Collect();
-                return track2;
-            });
-            GC.Collect();
-            Assert.IsTrue(manager.CanUndo);
-            manager.Undo();
-            Assert.IsNull(callResult.Title);
-            Assert.IsFalse(manager.CanUndo);
-        }
+        //[TestMethod()]
+        //public void TraceChangesTest()
+        //{
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var callResult = CallInItsOwnScope(() =>
+        //    {
+        //        var track = new Track();
+        //        manager.TraceChanges(track);
+        //        var track2 = new Track();
+        //        manager.TraceChanges(track2);
+        //        track2.Title = "Title 2";
+        //        track.Artist = "Artist 1";
+        //        track = null;
+        //        GC.Collect();
+        //        return track2;
+        //    });
+        //    GC.Collect();
+        //    Assert.IsTrue(manager.CanUndo);
+        //    manager.Undo();
+        //    Assert.IsNull(callResult.Title);
+        //    Assert.IsFalse(manager.CanUndo);
+        //}
 
-        [TestMethod()]
-        public void UndoTest()
-        {
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var track = new Track();
-            manager.TraceChanges(track);
-            Assert.IsFalse(manager.CanUndo);
-            manager.Undo();
-            track.Position = 3;
-            Assert.IsTrue(manager.CanUndo);
-            track.Artist = "Artist";
-            track.End = new TimeSpan(0, 3, 23);
-            manager.Undo();
-            Assert.IsTrue(manager.CanRedo);
-            Assert.IsNull(track.End);
-            var track2 = new Track();
-            manager.TraceChanges(track2);
-            track2.Position = 5;
-            Assert.IsFalse(manager.CanRedo);
-            track2.Artist = "Artist 2";
-            track2.Title = "Title 2";
-            track2.Length = new TimeSpan(0, 4, 12);
-            Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
-            manager.Undo();
-            Assert.IsNull(track2.Length);
-        }
+        //[TestMethod()]
+        //public void UndoTest()
+        //{
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var track = new Track();
+        //    manager.TraceChanges(track);
+        //    Assert.IsFalse(manager.CanUndo);
+        //    manager.Undo();
+        //    track.Position = 3;
+        //    Assert.IsTrue(manager.CanUndo);
+        //    track.Artist = "Artist";
+        //    track.End = new TimeSpan(0, 3, 23);
+        //    manager.Undo();
+        //    Assert.IsTrue(manager.CanRedo);
+        //    Assert.IsNull(track.End);
+        //    var track2 = new Track();
+        //    manager.TraceChanges(track2);
+        //    track2.Position = 5;
+        //    Assert.IsFalse(manager.CanRedo);
+        //    track2.Artist = "Artist 2";
+        //    track2.Title = "Title 2";
+        //    track2.Length = new TimeSpan(0, 4, 12);
+        //    Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
+        //    manager.Undo();
+        //    Assert.IsNull(track2.Length);
+        //}
 
-        [TestMethod()]
-        public void RedoTest()
-        {
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var track = new Track();
-            manager.TraceChanges(track);
-            Assert.IsFalse(manager.CanUndo);
-            track.Position = 3;
-            Assert.IsTrue(manager.CanUndo);
-            track.Artist = "Artist";
-            track.End = new TimeSpan(0, 3, 23);
-            Assert.IsFalse(manager.CanRedo);
-            manager.Redo();
-            manager.Undo();
-            Assert.IsTrue(manager.CanRedo);
-            Assert.IsNull(track.End);
-            manager.Redo();
-            Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
-            var track2 = new Track();
-            manager.TraceChanges(track2);
-            track2.Position = 5;
-            Assert.IsFalse(manager.CanRedo);
-            track2.Artist = "Artist 2";
-            track2.Title = "Title 2";
-            track2.Length = new TimeSpan(0, 4, 12);
-            Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
-            manager.Undo();
-            Assert.IsNull(track2.Length);
-            manager.Redo();
-            Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
-        }
+        //[TestMethod()]
+        //public void RedoTest()
+        //{
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var track = new Track();
+        //    manager.TraceChanges(track);
+        //    Assert.IsFalse(manager.CanUndo);
+        //    track.Position = 3;
+        //    Assert.IsTrue(manager.CanUndo);
+        //    track.Artist = "Artist";
+        //    track.End = new TimeSpan(0, 3, 23);
+        //    Assert.IsFalse(manager.CanRedo);
+        //    manager.Redo();
+        //    manager.Undo();
+        //    Assert.IsTrue(manager.CanRedo);
+        //    Assert.IsNull(track.End);
+        //    manager.Redo();
+        //    Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
+        //    var track2 = new Track();
+        //    manager.TraceChanges(track2);
+        //    track2.Position = 5;
+        //    Assert.IsFalse(manager.CanRedo);
+        //    track2.Artist = "Artist 2";
+        //    track2.Title = "Title 2";
+        //    track2.Length = new TimeSpan(0, 4, 12);
+        //    Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
+        //    manager.Undo();
+        //    Assert.IsNull(track2.Length);
+        //    manager.Redo();
+        //    Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
+        //}
+
+        //[TestMethod()]
+        //public void UndoRedoCombinationTest()
+        //{
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var track = new Track();
+        //    manager.TraceChanges(track);
+        //    Assert.IsFalse(manager.CanUndo);
+        //    track.Position = 3;
+        //    Assert.IsTrue(manager.CanUndo);
+        //    track.Artist = "Artist";
+        //    track.End = new TimeSpan(0, 3, 23);
+        //    Assert.IsFalse(manager.CanRedo);
+        //    manager.Redo();
+        //    manager.Undo();
+        //    Assert.IsTrue(manager.CanRedo);
+        //    Assert.IsNull(track.End);
+        //    manager.Redo();
+        //    Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
+        //    Assert.IsTrue(manager.CanUndo);
+        //    manager.Undo();
+        //    Assert.IsNull(track.End);
+        //    manager.Redo();
+        //    Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
+        //}
 
-        [TestMethod()]
-        public void UndoRedoCombinationTest()
-        {
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var track = new Track();
-            manager.TraceChanges(track);
-            Assert.IsFalse(manager.CanUndo);
-            track.Position = 3;
-            Assert.IsTrue(manager.CanUndo);
-            track.Artist = "Artist";
-            track.End = new TimeSpan(0, 3, 23);
-            Assert.IsFalse(manager.CanRedo);
-            manager.Redo();
-            manager.Undo();
-            Assert.IsTrue(manager.CanRedo);
-            Assert.IsNull(track.End);
-            manager.Redo();
-            Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
-            Assert.IsTrue(manager.CanUndo);
-            manager.Undo();
-            Assert.IsNull(track.End);
-            manager.Redo();
-            Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
-        }
-        //TODO
         //[TestMethod()]
         //public void TrackListTest()
         //{
@@ -352,58 +353,58 @@ public void UndoRedoCombinationTest()
         //    Assert.IsNull(track4.End);
         //}
         
-        [TestMethod()]
-        public void RemoveTracedChanges_RemovesChanges_WhenChangesAvailable()
-        {
-            // Arrange
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var cuesheet1 = new Cuesheet();
-            var cuesheet2 = new Cuesheet();
-            manager.TraceChanges(cuesheet1);
-            manager.TraceChanges(cuesheet2);
-            cuesheet1.Artist = "Test Artist Cuesheet 1";
-            cuesheet1.Title = "Test Title Cuesheet 1";
-            cuesheet2.CDTextfile = new("CD Testfile.cdt");
-            cuesheet2.Title = "Test Title Cuesheet 2";
-            var tracedObjectHistoryChangedFired = false;
-            manager.TracedObjectHistoryChanged += delegate
-            {
-                tracedObjectHistoryChangedFired = true;
-            };
-            // Act
-            manager.RemoveTracedChanges([cuesheet1]);
-            // Assert
-            Assert.IsTrue(tracedObjectHistoryChangedFired);
-            Assert.IsTrue(manager.CanUndo);
-            manager.Undo();
-            manager.Undo();
-            Assert.IsFalse(manager.CanUndo);
-        }
+        //[TestMethod()]
+        //public void RemoveTracedChanges_RemovesChanges_WhenChangesAvailable()
+        //{
+        //    // Arrange
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var cuesheet1 = new Cuesheet();
+        //    var cuesheet2 = new Cuesheet();
+        //    manager.TraceChanges(cuesheet1);
+        //    manager.TraceChanges(cuesheet2);
+        //    cuesheet1.Artist = "Test Artist Cuesheet 1";
+        //    cuesheet1.Title = "Test Title Cuesheet 1";
+        //    cuesheet2.CDTextfile = new("CD Testfile.cdt");
+        //    cuesheet2.Title = "Test Title Cuesheet 2";
+        //    var tracedObjectHistoryChangedFired = false;
+        //    manager.TracedObjectHistoryChanged += delegate
+        //    {
+        //        tracedObjectHistoryChangedFired = true;
+        //    };
+        //    // Act
+        //    manager.RemoveTracedChanges([cuesheet1]);
+        //    // Assert
+        //    Assert.IsTrue(tracedObjectHistoryChangedFired);
+        //    Assert.IsTrue(manager.CanUndo);
+        //    manager.Undo();
+        //    manager.Undo();
+        //    Assert.IsFalse(manager.CanUndo);
+        //}
 
-        [TestMethod()]
-        public void RemoveTracedChanges_RemovesNoChanges_WhenNoChangesAvailable()
-        {
-            // Arrange
-            var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-            var cuesheet1 = new Cuesheet();
-            var cuesheet2 = new Cuesheet();
-            manager.TraceChanges(cuesheet1);
-            manager.TraceChanges(cuesheet2);
-            cuesheet2.CDTextfile = new("CD Testfile.cdt");
-            cuesheet2.Title = "Test Title Cuesheet 2";
-            var tracedObjectHistoryChangedFired = false;
-            manager.TracedObjectHistoryChanged += delegate
-            {
-                tracedObjectHistoryChangedFired = true;
-            };
-            // Act
-            manager.RemoveTracedChanges([cuesheet1]);
-            // Assert
-            Assert.IsTrue(tracedObjectHistoryChangedFired);
-            Assert.IsTrue(manager.CanUndo);
-            manager.Undo();
-            manager.Undo();
-            Assert.IsFalse(manager.CanUndo);
-        }
+        //[TestMethod()]
+        //public void RemoveTracedChanges_RemovesNoChanges_WhenNoChangesAvailable()
+        //{
+        //    // Arrange
+        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+        //    var cuesheet1 = new Cuesheet();
+        //    var cuesheet2 = new Cuesheet();
+        //    manager.TraceChanges(cuesheet1);
+        //    manager.TraceChanges(cuesheet2);
+        //    cuesheet2.CDTextfile = new("CD Testfile.cdt");
+        //    cuesheet2.Title = "Test Title Cuesheet 2";
+        //    var tracedObjectHistoryChangedFired = false;
+        //    manager.TracedObjectHistoryChanged += delegate
+        //    {
+        //        tracedObjectHistoryChangedFired = true;
+        //    };
+        //    // Act
+        //    manager.RemoveTracedChanges([cuesheet1]);
+        //    // Assert
+        //    Assert.IsTrue(tracedObjectHistoryChangedFired);
+        //    Assert.IsTrue(manager.CanUndo);
+        //    manager.Undo();
+        //    manager.Undo();
+        //    Assert.IsFalse(manager.CanUndo);
+        //}
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index a927b629..090d4ac4 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -15,16 +15,12 @@
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.Entity;
 using AudioCuesheetEditor.Model.IO.Audio;
-using AudioCuesheetEditor.Model.UI;
 using System.Text.Json.Serialization;
 
 namespace AudioCuesheetEditor.Model.AudioCuesheet
 {
-    public class Cuesheet() : Validateable, ITraceable, ICuesheet
+    public class Cuesheet() : Validateable, ICuesheet
     {
-        //TODO: Remove when ITraceable doesn't have event any more
-        public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
-
         [JsonInclude]
         public IEnumerable<Track> Tracks { get; set; } = [];
 
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index 0993dcfd..f97b1647 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -14,16 +14,12 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.Entity;
-using AudioCuesheetEditor.Model.UI;
 using System.Text.Json.Serialization;
 
 namespace AudioCuesheetEditor.Model.AudioCuesheet
 {
-    public class Track : Validateable, ITraceable, ITrack
+    public class Track : Validateable, ITrack
     {
-        //TODO: Remove when ITraceable doesn't have event any more
-        public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
-        
         public ushort? Position { get; set; }
         public String? Artist { get; set; }
         public String? Title { get; set; }
diff --git a/AudioCuesheetEditor/Model/UI/ITraceable.cs b/AudioCuesheetEditor/Model/UI/TraceableChange.cs
similarity index 67%
rename from AudioCuesheetEditor/Model/UI/ITraceable.cs
rename to AudioCuesheetEditor/Model/UI/TraceableChange.cs
index 7db690eb..e5dfa0ba 100644
--- a/AudioCuesheetEditor/Model/UI/ITraceable.cs
+++ b/AudioCuesheetEditor/Model/UI/TraceableChange.cs
@@ -30,20 +30,4 @@ public TraceableChange(object? previousValue, string propertyName)
         public object? PreviousValue { get; }
         public string PropertyName { get; }
     }
-
-    public class TraceablePropertiesChangedEventArgs(TraceableChange traceableChange) : EventArgs
-    {
-        public TraceableChange TraceableChange { get; } = traceableChange;
-    }
-
-    /// <summary>
-    /// Interface for undo/redoable actions
-    /// </summary>
-    public interface ITraceable
-    {
-        /// <summary>
-        /// A property of this object has been changed and therefore needs to be traced by the TraceChangeManager.
-        /// </summary>
-        public event EventHandler<TraceablePropertiesChangedEventArgs> TraceablePropertyChanged;
-    }
 }
diff --git a/AudioCuesheetEditor/Model/UI/TracedChange.cs b/AudioCuesheetEditor/Model/UI/TracedChange.cs
new file mode 100644
index 00000000..fb4eb9a9
--- /dev/null
+++ b/AudioCuesheetEditor/Model/UI/TracedChange.cs
@@ -0,0 +1,39 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+namespace AudioCuesheetEditor.Model.UI
+{
+    /// <summary>
+    /// Class for tracing changes on an object
+    /// </summary>
+    public class TracedChange(object traceableObject, TraceableChange traceableChange)
+    {
+        private readonly WeakReference<object> _tracedObject = new(traceableObject, false);
+
+        public object? TraceableObject
+        {
+            get
+            {
+                if (_tracedObject.TryGetTarget(out var traceable))
+                {
+                    return traceable;
+                }
+                return null;
+            }
+        }
+
+        public TraceableChange TraceableChange { get; } = traceableChange;
+    }
+}
diff --git a/AudioCuesheetEditor/Model/UI/TracedChanges.cs b/AudioCuesheetEditor/Model/UI/TracedChanges.cs
new file mode 100644
index 00000000..00ce7c1d
--- /dev/null
+++ b/AudioCuesheetEditor/Model/UI/TracedChanges.cs
@@ -0,0 +1,23 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+namespace AudioCuesheetEditor.Model.UI
+{
+    public class TracedChanges(IEnumerable<TracedChange> changes)
+    {
+        public List<TracedChange> Changes { get; } = [.. changes];
+        public bool HasTraceableObject { get { return Changes.Any(x => x.TraceableObject != null); } }
+    }
+}
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index fafd05a8..25f7981b 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -244,11 +244,12 @@ private void StartTracing()
         {
             if (_sessionStateContainer.ImportCuesheet != null)
             {
-                _traceChangeManager.TraceChanges(_sessionStateContainer.ImportCuesheet);
-                foreach (var track in _sessionStateContainer.ImportCuesheet.Tracks)
-                {
-                    _traceChangeManager.TraceChanges(track);
-                }
+                //TODO
+                //_traceChangeManager.TraceChanges(_sessionStateContainer.ImportCuesheet);
+                //foreach (var track in _sessionStateContainer.ImportCuesheet.Tracks)
+                //{
+                //    _traceChangeManager.TraceChanges(track);
+                //}
             }
         }
 
diff --git a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
index fd2b5c38..4aec1c11 100644
--- a/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/ITraceChangeManager.cs
@@ -34,7 +34,6 @@ public interface ITraceChangeManager
         /// </summary>
         public bool CanRedo { get; }
         public bool BulkEdit { get; set; }
-        public void TraceChanges(ITraceable traceable);
         /// <summary>
         /// Adds a change of a property
         /// </summary>
@@ -43,6 +42,6 @@ public interface ITraceChangeManager
         public void Reset();
         public void Undo();
         public void Redo();
-        public void RemoveTracedChanges(IEnumerable<ITraceable> traceables);
+        public void RemoveTracedChanges(IEnumerable<object> traceables);
     }
 }
diff --git a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
index b1a7b0df..f8f1b928 100644
--- a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
@@ -20,11 +20,10 @@
 
 namespace AudioCuesheetEditor.Services.UI
 {
-    public class SessionStateContainer : ISessionStateContainer, ITraceable
+    public class SessionStateContainer : ISessionStateContainer
     {
         public event EventHandler? CuesheetChanged;
         public event EventHandler? ImportCuesheetChanged;
-        public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
 
         private readonly ITraceChangeManager _traceChangeManager;
         private Cuesheet cuesheet;
@@ -36,7 +35,6 @@ public SessionStateContainer(ITraceChangeManager traceChangeManager)
             _traceChangeManager = traceChangeManager;
             cuesheet = new Cuesheet();
             SetCuesheetReference(cuesheet);
-            _traceChangeManager.TraceChanges(this);
         }
         public Cuesheet Cuesheet 
         {
@@ -90,8 +88,9 @@ private void SetCuesheetReference(Cuesheet value)
         {
             var previousValue = Cuesheet;
             cuesheet = value;
-            _traceChangeManager.TraceChanges(Cuesheet);
-            TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, nameof(Cuesheet))));
+            //TODO
+            //_traceChangeManager.TraceChanges(Cuesheet);
+            //TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, nameof(Cuesheet))));
             CuesheetChanged?.Invoke(this, EventArgs.Empty);
         }
     }
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index 050d5a8e..e82d97ed 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -17,34 +17,6 @@
 
 namespace AudioCuesheetEditor.Services.UI
 {
-    /// <summary>
-    /// Class for tracing changes on an object
-    /// </summary>
-    public class TracedChange(ITraceable traceableObject, TraceableChange traceableChange)
-    {
-        private readonly WeakReference<ITraceable> _tracedObject = new(traceableObject, false);
-
-        public ITraceable? TraceableObject
-        {
-            get
-            {
-                if (_tracedObject.TryGetTarget(out var traceable))
-                {
-                    return traceable;
-                }
-                return null;
-            }
-        }
-
-        public TraceableChange TraceableChange { get; } = traceableChange;
-    }
-
-    public class TracedChanges(IEnumerable<TracedChange> changes)
-    {
-        public List<TracedChange> Changes { get; } = [.. changes];
-        public bool HasTraceableObject { get { return Changes.Any(x => x.TraceableObject != null); } }
-    }
-
     /// <inheritdoc />
     public class TraceChangeManager(ILogger<TraceChangeManager> logger) : ITraceChangeManager
     {
@@ -59,22 +31,16 @@ public class TraceChangeManager(ILogger<TraceChangeManager> logger) : ITraceChan
         public event EventHandler? UndoDone;
         public event EventHandler? RedoDone;
 
-        public bool CurrentlyHandlingRedoOrUndoChanges { get; private set; } = false;
         /// <inheritdoc />
         public bool CanUndo => _undoStack.Count > 0;
 
         /// <inheritdoc />
         public bool CanRedo => _redoStack.Count > 0;
 
-        public void TraceChanges(ITraceable traceable)
-        {
-            traceable.TraceablePropertyChanged += Traceable_TraceablePropertyChanged;
-        }
-
         public void Reset()
         {
-            Reset(_redoStack);
-            Reset(_undoStack);
+            _redoStack.Clear();
+            _undoStack.Clear();
         }
 
         public void Undo()
@@ -82,7 +48,6 @@ public void Undo()
             _logger.LogDebug("Undo called");
             if (CanUndo)
             {
-                CurrentlyHandlingRedoOrUndoChanges = true; 
                 TracedChanges? changes = null;
                 while (_undoStack.Count > 0 && changes == null)
                 {
@@ -111,7 +76,7 @@ public void Undo()
                             if (propertyInfo != null)
                             {
                                 var currentValue = propertyInfo.GetValue(tracedObject);
-                                redoChanges.Add(new TracedChange(tracedObject, new TraceableChange(currentValue, traceAbleChange.PropertyName)));
+                                redoChanges.Add(new TracedChange(tracedObject, new(currentValue, traceAbleChange.PropertyName)));
                                 if (_logger.IsEnabled(LogLevel.Debug))
                                 {
                                     _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
@@ -131,7 +96,6 @@ public void Undo()
                     //Push the old value to redo stack
                     _redoStack.Add(new TracedChanges(redoChanges));
                 }
-                CurrentlyHandlingRedoOrUndoChanges = false;
                 UndoDone?.Invoke(this, EventArgs.Empty);
             }
         }
@@ -141,7 +105,6 @@ public void Redo()
             _logger.LogDebug("Redo called");
             if (CanRedo)
             {
-                CurrentlyHandlingRedoOrUndoChanges = true;
                 TracedChanges? changes = null;
                 while (_redoStack.Count > 0 && changes == null)
                 {
@@ -170,7 +133,7 @@ public void Redo()
                             if (propertyInfo != null)
                             {
                                 var currentValue = propertyInfo.GetValue(tracedObject);
-                                undoChanges.Add(new TracedChange(tracedObject, new TraceableChange(currentValue, traceAbleChange.PropertyName)));
+                                undoChanges.Add(new TracedChange(tracedObject, new(currentValue, traceAbleChange.PropertyName)));
                                 if (_logger.IsEnabled(LogLevel.Debug))
                                 {
                                     _logger.LogDebug("Setting {PropertyName} on {tracedObject} from {currentValue} to {PreviousValue}", traceAbleChange.PropertyName, tracedObject, currentValue, traceAbleChange.PreviousValue);
@@ -190,7 +153,6 @@ public void Redo()
                     //Push the old value to redo stack
                     _undoStack.Add(new TracedChanges(undoChanges));
                 }
-                CurrentlyHandlingRedoOrUndoChanges = false;
                 RedoDone?.Invoke(this, EventArgs.Empty);
             }
         }
@@ -237,7 +199,7 @@ public void AddChange(TracedChange tracedChange)
             }
         }
 
-        public void RemoveTracedChanges(IEnumerable<ITraceable> traceables)
+        public void RemoveTracedChanges(IEnumerable<object> traceables)
         {
             _undoStack.RemoveAll(x => x.HasTraceableObject == false);
             _undoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
@@ -245,55 +207,5 @@ public void RemoveTracedChanges(IEnumerable<ITraceable> traceables)
             _redoStack.RemoveAll(x => x.Changes.Any(y => traceables.Contains(y.TraceableObject)));
             TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
         }
-
-        private void Reset(List<TracedChanges> stack)
-        {
-            while (stack.Count > 0)
-            {
-                var tracedChange = stack[^1];
-                stack.Remove(tracedChange);
-                foreach (var change in tracedChange.Changes)
-                {
-                    change.TraceableObject?.TraceablePropertyChanged -= Traceable_TraceablePropertyChanged;
-                }
-            }
-            stack.Clear();
-        }
-
-        private void Traceable_TraceablePropertyChanged(object? sender, TraceablePropertiesChangedEventArgs e)
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-            {
-                _logger.LogDebug("Traceable_TraceablePropertyChanged called with {sender}, {PropertyName}, {PreviousValue}", sender, e.TraceableChange.PropertyName, e.TraceableChange.PreviousValue);
-                _logger.LogDebug("CurrentlyHandlingRedoOrUndoChanges = {CurrentlyHandlingRedoOrUndoChanges}", CurrentlyHandlingRedoOrUndoChanges);
-            }
-            if (CurrentlyHandlingRedoOrUndoChanges == false)
-            {
-                if (sender != null)
-                {
-                    if (_logger.IsEnabled(LogLevel.Debug))
-                    {
-                        _logger.LogDebug("BulkEdit = {BulkEdit}", BulkEdit);
-                    }
-                    if (BulkEdit == false)
-                    {
-                        //Single change
-                        var changes = new TracedChanges([new((ITraceable)sender, e.TraceableChange)]);
-                        _undoStack.Add(changes);
-                        _redoStack.Clear();
-                        TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
-                    }
-                    else
-                    {
-                        //We are tracing multiple changes
-                        _bulkEditTracedChanges?.Add(new TracedChange((ITraceable)sender, e.TraceableChange));
-                    }
-                }
-                else
-                {
-                    throw new ArgumentNullException(nameof(sender));
-                }
-            }
-        }
     }
 }
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 82a419ad..631bc250 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -183,7 +183,6 @@ along with Foobar.  If not, see
             IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
         };
         _cuesheetManager.AddTrack(newTrack);
-        TraceChangeManager.TraceChanges(newTrack);
     }
 
     async Task EditSelectedTracksClicked()
@@ -242,7 +241,6 @@ along with Foobar.  If not, see
         {
             var copy = _trackManager.Clone(trackThatWillBeCopied);
             _cuesheetManager.AddTrack(copy);
-            TraceChangeManager.TraceChanges(copy);
             await EditTrackModalClicked(copy);
         }
     }

From 2d093cfe3cda01bac03a95474768712a26ea0600 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 16:42:05 +0200
Subject: [PATCH 053/150] add tests

---
 .../Services/UI/TraceChangeManagerTests.cs    | 50 +++++++++++++++++++
 .../Services/UI/TraceChangeManager.cs         |  1 -
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 13436ff9..fcb0c39d 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -24,7 +24,57 @@ namespace AudioCuesheetEditor.Tests.Services.UI
     [TestClass()]
     public class TraceChangeManagerTests
     {
+        private readonly TraceChangeManager _traceChangeManager = new(TestHelper.CreateLogger<TraceChangeManager>());
         //TODO
+
+        [TestMethod()]
+        public void AddChange_SingleChange_EnablesUndo()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet
+            {
+                Artist = "Test Artist 1"
+            };
+            var tracedObjectHistoryChangedFired = false;
+            _traceChangeManager.TracedObjectHistoryChanged += delegate
+            {
+                tracedObjectHistoryChangedFired = true;
+            };
+            // Act
+            _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Artist))));
+            // Assert
+            Assert.IsTrue(_traceChangeManager.CanUndo);
+            Assert.IsFalse(_traceChangeManager.CanRedo);
+            Assert.IsTrue(tracedObjectHistoryChangedFired);
+        }
+
+        [TestMethod()]
+        public void AddChange_BulkChange_EnablesUndo()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet
+            {
+                Artist = "Test Artist 1",
+                Title = "Test Title 1",
+                Cataloguenumber = "1234567890"
+            };
+            var tracedObjectHistoryChangedFired = false;
+            _traceChangeManager.TracedObjectHistoryChanged += delegate
+            {
+                tracedObjectHistoryChangedFired = true;
+            };
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Artist))));
+            _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Title))));
+            _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Cataloguenumber))));
+            // Act
+            _traceChangeManager.BulkEdit = false;
+            // Assert
+            Assert.IsTrue(_traceChangeManager.CanUndo);
+            Assert.IsFalse(_traceChangeManager.CanRedo);
+            Assert.IsTrue(tracedObjectHistoryChangedFired);
+        }
+
         private static T CallInItsOwnScope<T>(Func<T> getter)
         {
             return getter();
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index e82d97ed..aa4a97db 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -184,7 +184,6 @@ public bool BulkEdit
 
         public void AddChange(TracedChange tracedChange)
         {
-            //TODO: Tests
             if (BulkEdit == false)
             {
                 //Single change

From e5b9c1431c414bb7fc5971532a5616327b17f964 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 14 Apr 2026 16:53:38 +0200
Subject: [PATCH 054/150] Update TraceChangeManagerTests.cs

---
 .../Services/UI/TraceChangeManagerTests.cs    | 185 ++++++++++--------
 1 file changed, 101 insertions(+), 84 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index fcb0c39d..1419c6fb 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -17,7 +17,6 @@
 using AudioCuesheetEditor.Services.UI;
 using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
 
 namespace AudioCuesheetEditor.Tests.Services.UI
 {
@@ -25,7 +24,6 @@ namespace AudioCuesheetEditor.Tests.Services.UI
     public class TraceChangeManagerTests
     {
         private readonly TraceChangeManager _traceChangeManager = new(TestHelper.CreateLogger<TraceChangeManager>());
-        //TODO
 
         [TestMethod()]
         public void AddChange_SingleChange_EnablesUndo()
@@ -75,92 +73,111 @@ public void AddChange_BulkChange_EnablesUndo()
             Assert.IsTrue(tracedObjectHistoryChangedFired);
         }
 
-        private static T CallInItsOwnScope<T>(Func<T> getter)
+        [TestMethod()]
+        public void Undo_SingleChange_UndoesChange()
         {
-            return getter();
+            // Arrange
+            var track = new Track
+            {
+                Position = 3
+            };
+            var undoDoneEventFired = false;
+            _traceChangeManager.UndoDone += delegate
+            {
+                undoDoneEventFired = true;
+            };
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Position))));
+            // Act
+            _traceChangeManager.Undo();
+            // Assert
+            Assert.IsNull(track.Position);
+            Assert.IsTrue(undoDoneEventFired);
+            Assert.IsFalse(_traceChangeManager.CanUndo);
+            Assert.IsTrue(_traceChangeManager.CanRedo);
         }
 
-        //[TestMethod()]
-        //public void TraceChangesTest()
-        //{
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var callResult = CallInItsOwnScope(() =>
-        //    {
-        //        var track = new Track();
-        //        manager.TraceChanges(track);
-        //        var track2 = new Track();
-        //        manager.TraceChanges(track2);
-        //        track2.Title = "Title 2";
-        //        track.Artist = "Artist 1";
-        //        track = null;
-        //        GC.Collect();
-        //        return track2;
-        //    });
-        //    GC.Collect();
-        //    Assert.IsTrue(manager.CanUndo);
-        //    manager.Undo();
-        //    Assert.IsNull(callResult.Title);
-        //    Assert.IsFalse(manager.CanUndo);
-        //}
+        [TestMethod()]
+        public void Undo_BulkChange_UndoesChanges()
+        {
+            // Arrange
+            var track = new Track
+            {
+                Position = 3,
+                Artist = "Artist"
+            };
+            var undoDoneEventFired = false;
+            _traceChangeManager.UndoDone += delegate
+            {
+                undoDoneEventFired = true;
+            };
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Position))));
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Artist))));
+            _traceChangeManager.BulkEdit = false;
+            // Act
+            _traceChangeManager.Undo();
+            // Assert
+            Assert.IsNull(track.Position);
+            Assert.IsNull(track.Artist);
+            Assert.IsTrue(undoDoneEventFired);
+            Assert.IsFalse(_traceChangeManager.CanUndo);
+            Assert.IsTrue(_traceChangeManager.CanRedo);
+        }
 
-        //[TestMethod()]
-        //public void UndoTest()
-        //{
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var track = new Track();
-        //    manager.TraceChanges(track);
-        //    Assert.IsFalse(manager.CanUndo);
-        //    manager.Undo();
-        //    track.Position = 3;
-        //    Assert.IsTrue(manager.CanUndo);
-        //    track.Artist = "Artist";
-        //    track.End = new TimeSpan(0, 3, 23);
-        //    manager.Undo();
-        //    Assert.IsTrue(manager.CanRedo);
-        //    Assert.IsNull(track.End);
-        //    var track2 = new Track();
-        //    manager.TraceChanges(track2);
-        //    track2.Position = 5;
-        //    Assert.IsFalse(manager.CanRedo);
-        //    track2.Artist = "Artist 2";
-        //    track2.Title = "Title 2";
-        //    track2.Length = new TimeSpan(0, 4, 12);
-        //    Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
-        //    manager.Undo();
-        //    Assert.IsNull(track2.Length);
-        //}
+        [TestMethod()]
+        public void Redo_SingleChange_UndoesChange()
+        {
+            // Arrange
+            var track = new Track
+            {
+                Position = 3
+            };
+            var redoDoneEventFired = false;
+            _traceChangeManager.RedoDone += delegate
+            {
+                redoDoneEventFired = true;
+            };
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Position))));
+            _traceChangeManager.Undo();
+            // Act
+            _traceChangeManager.Redo();
+            // Assert
+            Assert.AreEqual((ushort)3, track.Position);
+            Assert.IsTrue(redoDoneEventFired);
+            Assert.IsTrue(_traceChangeManager.CanUndo);
+            Assert.IsFalse(_traceChangeManager.CanRedo);
+        }
 
-        //[TestMethod()]
-        //public void RedoTest()
-        //{
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var track = new Track();
-        //    manager.TraceChanges(track);
-        //    Assert.IsFalse(manager.CanUndo);
-        //    track.Position = 3;
-        //    Assert.IsTrue(manager.CanUndo);
-        //    track.Artist = "Artist";
-        //    track.End = new TimeSpan(0, 3, 23);
-        //    Assert.IsFalse(manager.CanRedo);
-        //    manager.Redo();
-        //    manager.Undo();
-        //    Assert.IsTrue(manager.CanRedo);
-        //    Assert.IsNull(track.End);
-        //    manager.Redo();
-        //    Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
-        //    var track2 = new Track();
-        //    manager.TraceChanges(track2);
-        //    track2.Position = 5;
-        //    Assert.IsFalse(manager.CanRedo);
-        //    track2.Artist = "Artist 2";
-        //    track2.Title = "Title 2";
-        //    track2.Length = new TimeSpan(0, 4, 12);
-        //    Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
-        //    manager.Undo();
-        //    Assert.IsNull(track2.Length);
-        //    manager.Redo();
-        //    Assert.AreEqual(new TimeSpan(0, 4, 12), track2.Length);
-        //}
+        [TestMethod()]
+        public void Redo_BulkChange_UndoesChanges()
+        {
+            // Arrange
+            var track = new Track
+            {
+                Position = 3,
+                Artist = "Artist"
+            };
+            var redoDoneEventFired = false;
+            _traceChangeManager.RedoDone += delegate
+            {
+                redoDoneEventFired = true;
+            };
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Position))));
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Artist))));
+            _traceChangeManager.BulkEdit = false;
+            _traceChangeManager.Undo();
+            // Act
+            _traceChangeManager.Redo();
+            // Assert
+            Assert.AreEqual((ushort)3, track.Position);
+            Assert.AreEqual("Artist", track.Artist);
+            Assert.IsTrue(redoDoneEventFired);
+            Assert.IsTrue(_traceChangeManager.CanUndo);
+            Assert.IsFalse(_traceChangeManager.CanRedo);
+        }
+
+        //TODO
 
         //[TestMethod()]
         //public void UndoRedoCombinationTest()
@@ -402,7 +419,7 @@ private static T CallInItsOwnScope<T>(Func<T> getter)
         //    Assert.IsNull(track3.End);
         //    Assert.IsNull(track4.End);
         //}
-        
+
         //[TestMethod()]
         //public void RemoveTracedChanges_RemovesChanges_WhenChangesAvailable()
         //{

From 82258e6dc8ce34367b14e671edd4b9f8597d68c1 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 09:12:39 +0200
Subject: [PATCH 055/150] Update TraceChangeManagerTests.cs

---
 .../Services/UI/TraceChangeManagerTests.cs    | 426 ++++++------------
 1 file changed, 134 insertions(+), 292 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 1419c6fb..000bf410 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -17,6 +17,8 @@
 using AudioCuesheetEditor.Services.UI;
 using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Linq;
 
 namespace AudioCuesheetEditor.Tests.Services.UI
 {
@@ -177,301 +179,141 @@ public void Redo_BulkChange_UndoesChanges()
             Assert.IsFalse(_traceChangeManager.CanRedo);
         }
 
-        //TODO
-
-        //[TestMethod()]
-        //public void UndoRedoCombinationTest()
-        //{
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var track = new Track();
-        //    manager.TraceChanges(track);
-        //    Assert.IsFalse(manager.CanUndo);
-        //    track.Position = 3;
-        //    Assert.IsTrue(manager.CanUndo);
-        //    track.Artist = "Artist";
-        //    track.End = new TimeSpan(0, 3, 23);
-        //    Assert.IsFalse(manager.CanRedo);
-        //    manager.Redo();
-        //    manager.Undo();
-        //    Assert.IsTrue(manager.CanRedo);
-        //    Assert.IsNull(track.End);
-        //    manager.Redo();
-        //    Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
-        //    Assert.IsTrue(manager.CanUndo);
-        //    manager.Undo();
-        //    Assert.IsNull(track.End);
-        //    manager.Redo();
-        //    Assert.AreEqual(new TimeSpan(0, 3, 23), track.End);
-        //}
-
-        //[TestMethod()]
-        //public void TrackListTest()
-        //{
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var cuesheet = new Cuesheet();
-        //    manager.TraceChanges(cuesheet);
-        //    Assert.IsFalse(manager.CanUndo);
-        //    cuesheet.AddTrack(new Track());
-        //    Assert.IsTrue(manager.CanUndo);
-        //    manager.Undo();
-        //    Assert.IsEmpty(cuesheet.Tracks);
-        //    Assert.IsTrue(manager.CanRedo);
-        //    manager.Redo();
-        //    Assert.HasCount(1, cuesheet.Tracks);
-        //    Assert.IsFalse(manager.CanRedo);
-        //}
-
-        //[TestMethod()]
-        //public void RemoveTracksTest()
-        //{
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var cuesheet = new Cuesheet();
-        //    manager.TraceChanges(cuesheet);
-        //    var track1 = new Track()
-        //    {
-        //        Artist = "Track 1 Artist",
-        //        Title = "Track 1 Title",
-        //        End = new TimeSpan(0, 2, 30)
-        //    };
-        //    var track2 = new Track()
-        //    {
-        //        Artist = "Track 2 Artist",
-        //        Title = "Track 2 Title",
-        //        End = new TimeSpan(0, 4, 20)
-        //    };
-        //    var track3 = new Track()
-        //    {
-        //        Artist = "Track 3 Artist",
-        //        Title = "Track 3 Title",
-        //        End = new TimeSpan(0, 7, 12)
-        //    };
-        //    var track4 = new Track()
-        //    {
-        //        Artist = "Track 4 Artist",
-        //        Title = "Track 4 Title",
-        //        End = new TimeSpan(0, 9, 12)
-        //    };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-        //    cuesheet.AddTrack(track4);
-        //    Assert.AreEqual(ValidationStatus.Success, track1.Validate().Status);
-        //    Assert.AreEqual(ValidationStatus.Success, track2.Validate().Status);
-        //    Assert.AreEqual(ValidationStatus.Success, track3.Validate().Status);
-        //    Assert.AreEqual(ValidationStatus.Success, track4.Validate().Status);
-        //    var tracksToRemove = new List<Track>
-        //    {
-        //        track2,
-        //        track4
-        //    };
-        //    cuesheet.RemoveTracks(tracksToRemove);
-        //    Assert.IsTrue(manager.CanUndo);
-        //    manager.Undo();
-        //    Assert.HasCount(4, cuesheet.Tracks);
-        //    //We need to set object references back to cue sheet tracks since TraceChangeManager creates new objects
-        //    track1 = cuesheet.Tracks.ElementAt(0);
-        //    track2 = cuesheet.Tracks.ElementAt(1);
-        //    track3 = cuesheet.Tracks.ElementAt(2);
-        //    track4 = cuesheet.Tracks.ElementAt(3);
-        //    Assert.AreEqual(ValidationStatus.Success, track1.Validate().Status);
-        //    Assert.AreEqual(ValidationStatus.Success, track2.Validate().Status);
-        //    Assert.AreEqual(ValidationStatus.Success, track3.Validate().Status);
-        //    Assert.AreEqual(ValidationStatus.Success, track4.Validate().Status);
-        //}
-
-        //[TestMethod()]
-        //public void ResetTest()
-        //{
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    Assert.IsFalse(manager.CanUndo);
-        //    Assert.IsFalse(manager.CanRedo);
-        //    var cuesheet = new Cuesheet();
-        //    manager.TraceChanges(cuesheet);
-        //    var track1 = new Track()
-        //    {
-        //        Artist = "Track 1 Artist",
-        //        Title = "Track 1 Title",
-        //        End = new TimeSpan(0, 2, 30)
-        //    };
-        //    cuesheet.AddTrack(track1);
-        //    Assert.IsTrue(manager.CanUndo);
-        //    manager.Reset();
-        //    Assert.IsFalse(manager.CanUndo);
-        //    Assert.IsFalse(manager.CanRedo);
-        //}
+        [TestMethod]
+        public void Undo_ObjectReferences_UndoesChanges()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [new()]
+            };
+            var undoDoneEventFired = false;
+            _traceChangeManager.UndoDone += delegate
+            {
+                undoDoneEventFired = true;
+            };
+            _traceChangeManager.AddChange(new(cuesheet, new(Enumerable.Empty<Track>(), nameof(Cuesheet.Tracks))));
+            // Act
+            _traceChangeManager.Undo();
+            // Assert
+            Assert.IsEmpty(cuesheet.Tracks);
+            Assert.IsFalse(_traceChangeManager.CanUndo);
+            Assert.IsTrue(_traceChangeManager.CanRedo);
+            Assert.IsTrue(undoDoneEventFired);
+        }
 
-        //[TestMethod()]
-        //public void BulkEditTracksTest()
-        //{
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var cuesheet = new Cuesheet();
-        //    manager.TraceChanges(cuesheet);
-        //    var tracedObjectHistoryChangedFired = false;
-        //    manager.TracedObjectHistoryChanged += delegate
-        //    {
-        //        tracedObjectHistoryChangedFired = true;
-        //    };
-        //    var track1 = new Track();
-        //    var track2 = new Track();
-        //    var track3 = new Track();
-        //    var track4 = new Track();
-        //    manager.TraceChanges(track1);
-        //    manager.TraceChanges(track2);
-        //    manager.TraceChanges(track3);
-        //    manager.TraceChanges(track4);
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-        //    cuesheet.AddTrack(track4);
-        //    track1.IsLinkedToPreviousTrack = true;
-        //    track2.IsLinkedToPreviousTrack = true;
-        //    track3.IsLinkedToPreviousTrack = true;
-        //    track4.IsLinkedToPreviousTrack = true;
-        //    var editedTrack = new Track() { Artist = "Test", Title = "Testtitle", Length = new TimeSpan(0, 2, 0) };
-        //    manager.BulkEdit = true;
-        //    track1.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-        //    track2.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-        //    track3.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-        //    track4.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-        //    manager.BulkEdit = false;
-        //    Assert.IsTrue(manager.CanUndo);
-        //    Assert.AreEqual(editedTrack.Length, track1.End);
-        //    Assert.AreEqual(track1.End, track2.Begin);
-        //    Assert.AreEqual(track2.End, track3.Begin);
-        //    Assert.AreEqual(track3.End, track4.Begin);
-        //    Assert.IsNotNull(track4.End);
-        //    Assert.AreEqual(editedTrack.Artist, track1.Artist);
-        //    Assert.AreEqual(editedTrack.Artist, track2.Artist);
-        //    Assert.AreEqual(editedTrack.Artist, track3.Artist);
-        //    Assert.AreEqual(editedTrack.Artist, track4.Artist);
-        //    Assert.AreEqual(editedTrack.Title, track1.Title);
-        //    Assert.AreEqual(editedTrack.Title, track2.Title);
-        //    Assert.AreEqual(editedTrack.Title, track3.Title);
-        //    Assert.AreEqual(editedTrack.Title, track4.Title);
-        //    Assert.IsTrue(tracedObjectHistoryChangedFired);
-        //    manager.Undo();
-        //    Assert.IsNull(track1.End);
-        //    Assert.IsNull(track2.End);
-        //    Assert.IsNull(track3.End);
-        //    Assert.IsNull(track4.End);
-        //    Assert.IsNull(track1.Artist);
-        //    Assert.IsNull(track2.Artist);
-        //    Assert.IsNull(track3.Artist);
-        //    Assert.IsNull(track4.Artist);
-        //    Assert.IsNull(track1.Title);
-        //    Assert.IsNull(track2.Title);
-        //    Assert.IsNull(track3.Title);
-        //    Assert.IsNull(track4.Title);
-        //}
+        [TestMethod]
+        public void Redo_ObjectReferences_UndoesChanges()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [new()]
+            };
+            var redoDoneEventFired = false;
+            _traceChangeManager.RedoDone += delegate
+            {
+                redoDoneEventFired = true;
+            };
+            _traceChangeManager.AddChange(new(cuesheet, new(Enumerable.Empty<Track>(), nameof(Cuesheet.Tracks))));
+            _traceChangeManager.Undo();
+            // Act
+            _traceChangeManager.Redo();
+            // Assert
+            Assert.HasCount(1, cuesheet.Tracks);
+            Assert.IsTrue(_traceChangeManager.CanUndo);
+            Assert.IsFalse(_traceChangeManager.CanRedo);
+            Assert.IsTrue(redoDoneEventFired);
+        }
 
-        //[TestMethod()]
-        //public void BulkEditTracksLengthTest()
-        //{
-        //    //We do an edit on 4 tracks to set the length, undo, redo and again undo.
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var cuesheet = new Cuesheet();
-        //    manager.TraceChanges(cuesheet);
-        //    var track1 = new Track();
-        //    var track2 = new Track();
-        //    var track3 = new Track();
-        //    var track4 = new Track();
-        //    manager.TraceChanges(track1);
-        //    manager.TraceChanges(track2);
-        //    manager.TraceChanges(track3);
-        //    manager.TraceChanges(track4);
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-        //    cuesheet.AddTrack(track4);
-        //    track1.IsLinkedToPreviousTrack = true;
-        //    track2.IsLinkedToPreviousTrack = true;
-        //    track3.IsLinkedToPreviousTrack = true;
-        //    track4.IsLinkedToPreviousTrack = true;
-        //    var editedTrack = new Track() { Length = new TimeSpan(0, 2, 0) };
-        //    manager.BulkEdit = true;
-        //    track1.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-        //    track2.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-        //    track3.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-        //    track4.CopyValues(editedTrack, false, setIsLinkedToPreviousTrack: false, setBegin: false, setEnd: false, setLength: true);
-        //    manager.BulkEdit = false;
-        //    Assert.IsTrue(manager.CanUndo);
-        //    Assert.AreEqual(editedTrack.Length, track1.End);
-        //    Assert.AreEqual(track1.End, track2.Begin);
-        //    Assert.AreEqual(track2.End, track3.Begin);
-        //    Assert.AreEqual(track3.End, track4.Begin);
-        //    Assert.IsNotNull(track4.End);
-        //    manager.Undo();
-        //    Assert.IsNull(track1.End);
-        //    Assert.IsNull(track2.End);
-        //    Assert.IsNull(track3.End);
-        //    Assert.IsNull(track4.End);
-        //    Assert.IsTrue(manager.CanRedo);
-        //    manager.Redo();
-        //    Assert.AreEqual(editedTrack.Length, track1.End);
-        //    Assert.AreEqual(track1.End, track2.Begin);
-        //    Assert.AreEqual(track2.End, track3.Begin);
-        //    Assert.AreEqual(track3.End, track4.Begin);
-        //    Assert.IsNotNull(track4.End);
-        //    Assert.IsTrue(manager.CanUndo);
-        //    manager.Undo();
-        //    Assert.IsNull(track1.End);
-        //    Assert.IsNull(track2.End);
-        //    Assert.IsNull(track3.End);
-        //    Assert.IsNull(track4.End);
-        //}
+        [TestMethod]
+        public void Reset_HasChanges_ResetsAllChanges()
+        {
+            // Arrange
+            var track = new Track()
+            {
+                Artist = "Track 1 Artist",
+                Title = "Track 1 Title",
+                End = new TimeSpan(0, 2, 30)
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track]
+            };
+            _traceChangeManager.AddChange(new(cuesheet, new(Enumerable.Empty<Track>(), nameof(Cuesheet.Tracks))));
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.End))));
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Title))));
+            _traceChangeManager.AddChange(new(track, new(null, nameof(Track.Artist))));
+            _traceChangeManager.Undo();
+            // Act
+            _traceChangeManager.Reset();
+            // Assert
+            Assert.IsFalse(_traceChangeManager.CanUndo);
+            Assert.IsFalse(_traceChangeManager.CanRedo);
+        }
 
-        //[TestMethod()]
-        //public void RemoveTracedChanges_RemovesChanges_WhenChangesAvailable()
-        //{
-        //    // Arrange
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var cuesheet1 = new Cuesheet();
-        //    var cuesheet2 = new Cuesheet();
-        //    manager.TraceChanges(cuesheet1);
-        //    manager.TraceChanges(cuesheet2);
-        //    cuesheet1.Artist = "Test Artist Cuesheet 1";
-        //    cuesheet1.Title = "Test Title Cuesheet 1";
-        //    cuesheet2.CDTextfile = new("CD Testfile.cdt");
-        //    cuesheet2.Title = "Test Title Cuesheet 2";
-        //    var tracedObjectHistoryChangedFired = false;
-        //    manager.TracedObjectHistoryChanged += delegate
-        //    {
-        //        tracedObjectHistoryChangedFired = true;
-        //    };
-        //    // Act
-        //    manager.RemoveTracedChanges([cuesheet1]);
-        //    // Assert
-        //    Assert.IsTrue(tracedObjectHistoryChangedFired);
-        //    Assert.IsTrue(manager.CanUndo);
-        //    manager.Undo();
-        //    manager.Undo();
-        //    Assert.IsFalse(manager.CanUndo);
-        //}
+        [TestMethod()]
+        public void RemoveTracedChanges_RemovesChanges_WhenChangesAvailable()
+        {
+            // Arrange
+            var cuesheet1 = new Cuesheet()
+            {
+                Artist = "Test Artist Cuesheet 1",
+                Title = "Test Title Cuesheet 1"
+            };
+            var cuesheet2 = new Cuesheet()
+            {
+                CDTextfile = new("CD Testfile.cdt"),
+                Title = "Test Title Cuesheet 2"
+            };
+            _traceChangeManager.AddChange(new(cuesheet1, new(null, nameof(Cuesheet.Artist))));
+            _traceChangeManager.AddChange(new(cuesheet1, new(null, nameof(Cuesheet.Title))));
+            _traceChangeManager.AddChange(new(cuesheet2, new(null, nameof(Cuesheet.CDTextfile))));
+            _traceChangeManager.AddChange(new(cuesheet2, new(null, nameof(Cuesheet.Title))));
+            var tracedObjectHistoryChangedFired = false;
+            _traceChangeManager.TracedObjectHistoryChanged += delegate
+            {
+                tracedObjectHistoryChangedFired = true;
+            };
+            // Act
+            _traceChangeManager.RemoveTracedChanges([cuesheet1]);
+            // Assert
+            Assert.IsTrue(tracedObjectHistoryChangedFired);
+            Assert.IsTrue(_traceChangeManager.CanUndo);
+            _traceChangeManager.Undo();
+            _traceChangeManager.Undo();
+            Assert.IsFalse(_traceChangeManager.CanUndo);
+            Assert.IsNull(cuesheet2.CDTextfile);
+            Assert.IsNull(cuesheet2.Title);
+        }
 
-        //[TestMethod()]
-        //public void RemoveTracedChanges_RemovesNoChanges_WhenNoChangesAvailable()
-        //{
-        //    // Arrange
-        //    var manager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
-        //    var cuesheet1 = new Cuesheet();
-        //    var cuesheet2 = new Cuesheet();
-        //    manager.TraceChanges(cuesheet1);
-        //    manager.TraceChanges(cuesheet2);
-        //    cuesheet2.CDTextfile = new("CD Testfile.cdt");
-        //    cuesheet2.Title = "Test Title Cuesheet 2";
-        //    var tracedObjectHistoryChangedFired = false;
-        //    manager.TracedObjectHistoryChanged += delegate
-        //    {
-        //        tracedObjectHistoryChangedFired = true;
-        //    };
-        //    // Act
-        //    manager.RemoveTracedChanges([cuesheet1]);
-        //    // Assert
-        //    Assert.IsTrue(tracedObjectHistoryChangedFired);
-        //    Assert.IsTrue(manager.CanUndo);
-        //    manager.Undo();
-        //    manager.Undo();
-        //    Assert.IsFalse(manager.CanUndo);
-        //}
+        [TestMethod()]
+        public void RemoveTracedChanges_RemovesNoChanges_WhenNoChangesAvailable()
+        {
+            // Arrange
+            var cuesheet1 = new Cuesheet();
+            var cuesheet2 = new Cuesheet()
+            {
+                CDTextfile = new("CD Testfile.cdt"),
+                Title = "Test Title Cuesheet 2"
+            };
+            _traceChangeManager.AddChange(new(cuesheet2, new(null, nameof(Cuesheet.CDTextfile))));
+            _traceChangeManager.AddChange(new(cuesheet2, new(null, nameof(Cuesheet.Title))));
+            var tracedObjectHistoryChangedFired = false;
+            _traceChangeManager.TracedObjectHistoryChanged += delegate
+            {
+                tracedObjectHistoryChangedFired = true;
+            };
+            // Act
+            _traceChangeManager.RemoveTracedChanges([cuesheet1]);
+            // Assert
+            Assert.IsTrue(tracedObjectHistoryChangedFired);
+            Assert.IsTrue(_traceChangeManager.CanUndo);
+            _traceChangeManager.Undo();
+            _traceChangeManager.Undo();
+            Assert.IsFalse(_traceChangeManager.CanUndo);
+            Assert.IsNull(cuesheet2.CDTextfile);
+            Assert.IsNull(cuesheet2.Title);
+        }
     }
 }
\ No newline at end of file

From 131447acd693668b78840dffb2a9ccab72633013 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 09:29:22 +0200
Subject: [PATCH 056/150] fix sessionstate container

---
 .../Services/UI/SessionStateContainerTests.cs | 92 +++++++++----------
 .../Services/UI/SessionStateContainer.cs      | 17 +---
 2 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
index c7f7e310..1dd86caf 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
@@ -16,6 +16,7 @@
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.UI;
 using AudioCuesheetEditor.Services.UI;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -25,48 +26,45 @@ namespace AudioCuesheetEditor.Tests.Services.UI
     [TestClass]
     public class SessionStateContainerTests
     {
-        private readonly Mock<ITraceChangeManager> traceChangeManagerMock;
-        private readonly SessionStateContainer sessionStateContainer;
+        private readonly Mock<ITraceChangeManager> _traceChangeManagerMock;
+        private readonly SessionStateContainer _sessionStateContainer;
 
         public SessionStateContainerTests()
         {
-            traceChangeManagerMock = new Mock<ITraceChangeManager>();
-            sessionStateContainer = new SessionStateContainer(traceChangeManagerMock.Object);
+            _traceChangeManagerMock = new Mock<ITraceChangeManager>();
+            _sessionStateContainer = new SessionStateContainer(_traceChangeManagerMock.Object);
+        }
+        
+        [TestMethod]
+        public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
+        {
+            // Arrange
+            var newCuesheet = new Cuesheet();
+            bool eventTriggered = false;
+            _sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
+
+            // Act
+            _sessionStateContainer.Cuesheet = newCuesheet;
+
+            // Assert
+            Assert.IsTrue(eventTriggered);
+            _traceChangeManagerMock.Verify(m => m.AddChange(It.Is<TracedChange>(x => x.TraceableObject == _sessionStateContainer && x.TraceableChange.PropertyName == nameof(SessionStateContainer.Cuesheet))), Times.Once);
+        }
+
+        [TestMethod]
+        public void ImportCuesheet_SetNewValue_ShouldTriggerImportCuesheetChangedEvent()
+        {
+            // Arrange
+            var newImportCuesheet = new Cuesheet();
+            bool eventTriggered = false;
+            _sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
+
+            // Act
+            _sessionStateContainer.ImportCuesheet = newImportCuesheet;
+
+            // Assert
+            Assert.IsTrue(eventTriggered);
         }
-        //TODO
-        //[TestMethod]
-        //public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
-        //{
-        //    // Arrange
-        //    var newCuesheet = new Cuesheet();
-        //    bool eventTriggered = false;
-        //    bool traceablePropertyChangedFired = false;
-        //    sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
-        //    sessionStateContainer.TraceablePropertyChanged += (sender, args) => traceablePropertyChangedFired = true;
-
-        //    // Act
-        //    sessionStateContainer.Cuesheet = newCuesheet;
-
-        //    // Assert
-        //    Assert.IsTrue(eventTriggered);
-        //    Assert.IsTrue(traceablePropertyChangedFired);
-        //    traceChangeManagerMock.Verify(m => m.TraceChanges(newCuesheet), Times.Once);
-        //}
-
-        //[TestMethod]
-        //public void ImportCuesheet_SetNewValue_ShouldTriggerImportCuesheetChangedEvent()
-        //{
-        //    // Arrange
-        //    var newImportCuesheet = new Cuesheet();
-        //    bool eventTriggered = false;
-        //    sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
-
-        //    // Act
-        //    sessionStateContainer.ImportCuesheet = newImportCuesheet;
-
-        //    // Assert
-        //    Assert.IsTrue(eventTriggered);
-        //}
 
         [TestMethod]
         public void ImportAudiofile_SetNewValue_ShouldUpdateImportCuesheetAndTriggerEvent()
@@ -74,12 +72,12 @@ public void ImportAudiofile_SetNewValue_ShouldUpdateImportCuesheetAndTriggerEven
             // Arrange
             var importCuesheet = new Cuesheet();
             var audioFile = new Audiofile("Test audio file.mp3");
-            sessionStateContainer.ImportCuesheet = importCuesheet;
+            _sessionStateContainer.ImportCuesheet = importCuesheet;
             bool eventTriggered = false;
-            sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
+            _sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
 
             // Act
-            sessionStateContainer.ImportAudiofile = audioFile;
+            _sessionStateContainer.ImportAudiofile = audioFile;
 
             // Assert
             Assert.AreEqual(audioFile, importCuesheet.Audiofile);
@@ -90,16 +88,16 @@ public void ImportAudiofile_SetNewValue_ShouldUpdateImportCuesheetAndTriggerEven
         public void ResetImport_ShouldClearImportProperties()
         {
             // Arrange
-            sessionStateContainer.Importfile = Mock.Of<IImportfile>();
-            sessionStateContainer.ImportCuesheet = new Cuesheet();
+            _sessionStateContainer.Importfile = Mock.Of<IImportfile>();
+            _sessionStateContainer.ImportCuesheet = new Cuesheet();
 
             // Act
-            sessionStateContainer.ResetImport();
+            _sessionStateContainer.ResetImport();
 
             // Assert
-            Assert.IsNull(sessionStateContainer.Importfile);
-            Assert.IsNull(sessionStateContainer.ImportAudiofile);
-            Assert.IsNull(sessionStateContainer.ImportCuesheet);
+            Assert.IsNull(_sessionStateContainer.Importfile);
+            Assert.IsNull(_sessionStateContainer.ImportAudiofile);
+            Assert.IsNull(_sessionStateContainer.ImportCuesheet);
         }
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
index f8f1b928..11e6c204 100644
--- a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
@@ -16,26 +16,19 @@
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
-using AudioCuesheetEditor.Model.UI;
 
 namespace AudioCuesheetEditor.Services.UI
 {
-    public class SessionStateContainer : ISessionStateContainer
+    public class SessionStateContainer(ITraceChangeManager traceChangeManager) : ISessionStateContainer
     {
         public event EventHandler? CuesheetChanged;
         public event EventHandler? ImportCuesheetChanged;
 
-        private readonly ITraceChangeManager _traceChangeManager;
-        private Cuesheet cuesheet;
+        private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
+        private Cuesheet cuesheet = new();
         private Cuesheet? importCuesheet;
         private Audiofile? importAudiofile;
 
-        public SessionStateContainer(ITraceChangeManager traceChangeManager)
-        {
-            _traceChangeManager = traceChangeManager;
-            cuesheet = new Cuesheet();
-            SetCuesheetReference(cuesheet);
-        }
         public Cuesheet Cuesheet 
         {
             get { return cuesheet; }
@@ -88,9 +81,7 @@ private void SetCuesheetReference(Cuesheet value)
         {
             var previousValue = Cuesheet;
             cuesheet = value;
-            //TODO
-            //_traceChangeManager.TraceChanges(Cuesheet);
-            //TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, nameof(Cuesheet))));
+            _traceChangeManager.AddChange(new(this, new(previousValue, nameof(Cuesheet))));
             CuesheetChanged?.Invoke(this, EventArgs.Empty);
         }
     }

From b1a93c7f8f27529f2a78bde3a62195a177cfc169 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 10:10:04 +0200
Subject: [PATCH 057/150] Update ImportManager.cs

---
 AudioCuesheetEditor/Services/IO/ImportManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 25f7981b..fbb3a695 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -100,7 +100,7 @@ public async Task AnalyseImportfile()
             stopwatch.Stop();
             if (_logger.IsEnabled(LogLevel.Debug))
             {
-                _logger.LogDebug("ImportTextAsync duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+                _logger.LogDebug("AnalyseImportfile duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
             }
         }
         

From a06ed7038ff119d3711ed48420f28d59a2331a47 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 10:26:41 +0200
Subject: [PATCH 058/150] Update TraceChangeManager.cs

---
 AudioCuesheetEditor/Services/UI/TraceChangeManager.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index aa4a97db..adfe7f33 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -184,6 +184,10 @@ public bool BulkEdit
 
         public void AddChange(TracedChange tracedChange)
         {
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("AddChange: {tracedChange.TraceableObject}, {tracedChange.TraceableChange.PropertyName}, {tracedChange.TraceableChange.PreviousValue}", tracedChange.TraceableObject, tracedChange.TraceableChange.PropertyName, tracedChange.TraceableChange.PreviousValue);
+            }
             if (BulkEdit == false)
             {
                 //Single change

From a967a39875258568c3eae6112400bbe145a98d0b Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 10:35:18 +0200
Subject: [PATCH 059/150] fix import

---
 .../Services/AudioCuesheet/TrackManager.cs    | 28 ++++++++++---------
 .../Services/IO/ImportManager.cs              | 14 ----------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index d8209481..bfe84f15 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -47,43 +47,43 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
         {
             if (setIsLinkedToPreviousTrack)
             {
-                SetValue(target, x => x.IsLinkedToPreviousTrack, source.IsLinkedToPreviousTrack);
+                SetValue(target, x => x.IsLinkedToPreviousTrack, source.IsLinkedToPreviousTrack, false);
             }
             if (setPosition)
             {
-                SetValue(target, x => x.Position, source.Position);
+                SetValue(target, x => x.Position, source.Position, false);
             }
             if (setArtist)
             {
-                SetValue(target, x => x.Artist, source.Artist);
+                SetValue(target, x => x.Artist, source.Artist, false);
             }
             if (setTitle)
             {
-                SetValue(target, x => x.Title, source.Title);
+                SetValue(target, x => x.Title, source.Title, false);
             }
             if (setBegin)
             {
-                SetValue(target, x => x.Begin, source.Begin);
+                SetValue(target, x => x.Begin, source.Begin, false );
             }
             if (setEnd)
             {
-                SetValue(target, x => x.End, source.End);
+                SetValue(target, x => x.End, source.End, false);
             }
             if (setLength)
             {
-                SetValue(target, x => x.Length, source.Length);
+                SetValue(target, x => x.Length, source.Length, false);
             }
             if (setFlags)
             {
-                SetValue(target, x => x.Flags, source.Flags);
+                SetValue(target, x => x.Flags, source.Flags, false);
             }
             if (setPreGap)
             {
-                SetValue(target, x => x.PreGap, source.PreGap);
+                SetValue(target, x => x.PreGap, source.PreGap, false);
             }
             if (setPostGap)
             {
-                target.PostGap = source.PostGap;
+                SetValue(target, x=> x.PostGap, source.PostGap, false);
             }
         }
 
@@ -109,7 +109,7 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             return nextLinkedTrack;
         }
 
-        void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
+        void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value, Boolean signalTraceChangeManager = true)
         {
             if (propertyExpression.Body is not MemberExpression memberExpression)
             {
@@ -128,8 +128,10 @@ void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propert
             }
 
             propertyInfo.SetValue(track, value);
-
-            _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
+            if (signalTraceChangeManager)
+            {
+                _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
+            }
         }
 
         void RecalculateLinkedProperties(Track track)
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index fbb3a695..1ba29479 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -87,7 +87,6 @@ public async Task AnalyseImportfile()
                         var importCuesheet = new Cuesheet();
                         CopyCuesheet(importCuesheet, _sessionStateContainer.Importfile.AnalyzedCuesheet);
                         _sessionStateContainer.ImportCuesheet = importCuesheet;
-                        StartTracing();
                         break;
                     case ImportFileType.Cuesheet:
                         _traceChangeManager.BulkEdit = true;
@@ -240,19 +239,6 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
             target.IsImporting = false;
         }
 
-        private void StartTracing()
-        {
-            if (_sessionStateContainer.ImportCuesheet != null)
-            {
-                //TODO
-                //_traceChangeManager.TraceChanges(_sessionStateContainer.ImportCuesheet);
-                //foreach (var track in _sessionStateContainer.ImportCuesheet.Tracks)
-                //{
-                //    _traceChangeManager.TraceChanges(track);
-                //}
-            }
-        }
-
         private void ResetTracing()
         {
             if (_sessionStateContainer.ImportCuesheet != null)

From 0fc60aba48db0ef6cb9daa5dfdeb9be245caf054 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 10:43:08 +0200
Subject: [PATCH 060/150] remove unnescescarry property

---
 AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs | 3 ---
 AudioCuesheetEditor/Services/IO/ImportManager.cs    | 2 --
 2 files changed, 5 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
index 090d4ac4..501f90cf 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -40,9 +40,6 @@ public class Cuesheet() : Validateable, ICuesheet
         [JsonIgnore]
         public DateTime? RecordingStart { get; set; }
 
-        [JsonIgnore]
-        public Boolean IsImporting { get; set; }
-
         public override ValidationResult Validate(string property)
         {
             ValidationStatus validationStatus = ValidationStatus.NoValidation;
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 1ba29479..70656fef 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -180,7 +180,6 @@ public async Task UploadFilesAsync(IEnumerable<FileUpload> files)
 
         private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
         {
-            target.IsImporting = true;
             target.Artist = cuesheetToCopy.Artist;
             target.Title = cuesheetToCopy.Title;
             target.Cataloguenumber = cuesheetToCopy.Cataloguenumber;
@@ -236,7 +235,6 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
             {
                 throw new NullReferenceException();
             }
-            target.IsImporting = false;
         }
 
         private void ResetTracing()

From aafc69ae637c173a682a7b491f4638734a7e3e35 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 11:22:46 +0200
Subject: [PATCH 061/150] fix projectfile

---
 .../Model/IO/ProjectfileTests.cs              | 168 +++++++-----------
 AudioCuesheetEditor/Model/IO/Projectfile.cs   |  10 +-
 2 files changed, 78 insertions(+), 100 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs b/AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs
index a86648bc..335266f1 100644
--- a/AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs
+++ b/AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs
@@ -28,105 +28,75 @@ namespace AudioCuesheetEditor.Tests.Model.IO
     [TestClass()]
     public class ProjectfileTests
     {
-        //TODO
-        //[TestMethod()]
-        //public void GenerateFile_WithoutSections_GeneratesOneFile()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet
-        //    {
-        //        Artist = "CuesheetArtist",
-        //        Title = "CuesheetTitle",
-        //        Audiofile = new Audiofile("AudioFile.mp3"),
-        //        CDTextfile = new CDTextfile("CDTextfile.cdt"),
-        //        Cataloguenumber = "A123"
-        //    };
-        //    var begin = TimeSpan.Zero;
-        //    for (int i = 1; i <= 10; i++)
-        //    {
-        //        var track = new Track
-        //        {
-        //            Position = (uint)i,
-        //            Artist = string.Format("Artist {0}", i),
-        //            Title = string.Format("Title {0}", i),
-        //            Begin = begin
-        //        };
-        //        var rand = new Random();
-        //        var flagsToAdd = rand.Next(1, 3);
-        //        var flags = new List<Flag>();
-        //        for (int x = 0; x < flagsToAdd; x++)
-        //        {
-        //            flags.Add(Flag.AvailableFlags.ElementAt(x));
-        //        }
-        //        track.Flags = flags;
-        //        begin = begin.Add(new TimeSpan(0, i, i));
-        //        track.End = begin;
-        //        cuesheet.AddTrack(track);
-        //    }
-        //    // Act
-        //    var projectFile = new Projectfile(cuesheet);
-        //    // Assert
-        //    var generatedFile = projectFile.GenerateFile();
-        //    Assert.IsNotNull(generatedFile);
-        //    var fileName = Path.GetTempFileName();
-        //    File.WriteAllBytes(fileName, generatedFile);
-        //    var fileContent = File.ReadAllLines(fileName);
-        //    var json = JsonSerializer.Serialize(cuesheet, Projectfile.Options);
-        //    Assert.AreEqual(json, fileContent.FirstOrDefault());
-        //    File.Delete(fileName);
-        //}
+        [TestMethod()]
+        public void GenerateFile_WithoutSections_GeneratesOneFile()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet
+            {
+                Artist = "CuesheetArtist",
+                Title = "CuesheetTitle",
+                Audiofile = new Audiofile("AudioFile.mp3"),
+                CDTextfile = new CDTextfile("CDTextfile.cdt"),
+                Cataloguenumber = "A123"
+            };
+            var begin = TimeSpan.Zero;
+            for (ushort i = 1; i <= 10; i++)
+            {
+                var track = new Track
+                {
+                    Position = i,
+                    Artist = string.Format("Artist {0}", i),
+                    Title = string.Format("Title {0}", i),
+                    Begin = begin
+                };
+                var rand = new Random();
+                var flagsToAdd = rand.Next(1, 3);
+                var flags = new List<Flag>();
+                for (int x = 0; x < flagsToAdd; x++)
+                {
+                    flags.Add(Flag.AvailableFlags.ElementAt(x));
+                }
+                track.Flags = flags;
+                begin = begin.Add(new TimeSpan(0, i, i));
+                track.End = begin;
+                cuesheet.Tracks = cuesheet.Tracks.Append(track);
+            }
+            // Act
+            var projectFile = new Projectfile(cuesheet);
+            // Assert
+            var generatedFile = projectFile.GenerateFile();
+            Assert.IsNotNull(generatedFile);
+            var fileName = Path.GetTempFileName();
+            File.WriteAllBytes(fileName, generatedFile);
+            var fileContent = File.ReadAllLines(fileName);
+            var json = JsonSerializer.Serialize(cuesheet, Projectfile.Options);
+            Assert.AreEqual(json, fileContent.FirstOrDefault());
+            File.Delete(fileName);
+        }
 
-        //[TestMethod()]
-        //public void ImportFile_ValidProjectfile_ShouldImportFile()
-        //{
-        //    // Arrange
-        //    var fileContent = "{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Cataloguenumber\":\"A123\",\"Audiofile\":{\"Name\":\"AudioFile.mp3\"},\"Tracks\":[{\"Position\":1,\"Artist\":\"Artist 1\",\"Title\":\"Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:01:01\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":2,\"Artist\":\"Artist 2\",\"Title\":\"Title 2\",\"Begin\":\"00:01:01\",\"End\":\"00:03:03\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":3,\"Artist\":\"Artist 3\",\"Title\":\"Title 3\",\"Begin\":\"00:03:03\",\"End\":\"00:06:06\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":4,\"Artist\":\"Artist 4\",\"Title\":\"Title 4\",\"Begin\":\"00:06:06\",\"End\":\"00:10:10\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":5,\"Artist\":\"Artist 5\",\"Title\":\"Title 5\",\"Begin\":\"00:10:10\",\"End\":\"00:15:15\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":6,\"Artist\":\"Artist 6\",\"Title\":\"Title 6\",\"Begin\":\"00:15:15\",\"End\":\"00:21:21\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":7,\"Artist\":\"Artist 7\",\"Title\":\"Title 7\",\"Begin\":\"00:21:21\",\"End\":\"00:28:28\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":8,\"Artist\":\"Artist 8\",\"Title\":\"Title 8\",\"Begin\":\"00:28:28\",\"End\":\"00:36:36\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":9,\"Artist\":\"Artist 9\",\"Title\":\"Title 9\",\"Begin\":\"00:36:36\",\"End\":\"00:45:45\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":10,\"Artist\":\"Artist 10\",\"Title\":\"Title 10\",\"Begin\":\"00:45:45\",\"End\":\"00:55:55\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true}],\"CDTextfile\":{\"Name\":\"CDTextfile.cdt\"}}";
-        //    // Act
-        //    var cuesheet = Projectfile.ImportFile(fileContent);
-        //    // Assert
-        //    Assert.IsNotNull(cuesheet);
-        //    Assert.IsTrue(cuesheet.Tracks.All(x => x.Cuesheet == cuesheet));
-        //    Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
-        //    Assert.AreEqual("CuesheetTitle", cuesheet.Title);
-        //    Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
-        //    Assert.AreEqual("A123", cuesheet.Cataloguenumber);
-        //    Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
-        //    Assert.HasCount(10, cuesheet.Tracks);
-        //    Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
-        //    Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
-        //    Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
-        //    Assert.AreEqual(new TimeSpan(0, 55, 55), cuesheet.Tracks.Last().End);
-        //    Assert.IsTrue(ReferenceEquals(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1))));
-        //    Assert.AreEqual(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1)));
-        //    Assert.AreEqual((uint)10, cuesheet.Tracks.Last().Position);
-        //}
-
-        //[TestMethod()]
-        //public void ImportFile_ValidProjectfileWithSections_ShouldImportFile()
-        //{
-        //    //Arrange
-        //    var fileContent = "{\"Tracks\":[{\"Position\":1,\"Artist\":\"Artist 1\",\"Title\":\"Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:01:01\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":2,\"Artist\":\"Artist 2\",\"Title\":\"Title 2\",\"Begin\":\"00:01:01\",\"End\":\"00:03:03\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":3,\"Artist\":\"Artist 3\",\"Title\":\"Title 3\",\"Begin\":\"00:03:03\",\"End\":\"00:06:06\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":4,\"Artist\":\"Artist 4\",\"Title\":\"Title 4\",\"Begin\":\"00:06:06\",\"End\":\"00:10:10\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":5,\"Artist\":\"Artist 5\",\"Title\":\"Title 5\",\"Begin\":\"00:10:10\",\"End\":\"00:15:15\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":6,\"Artist\":\"Artist 6\",\"Title\":\"Title 6\",\"Begin\":\"00:15:15\",\"End\":\"00:21:21\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":7,\"Artist\":\"Artist 7\",\"Title\":\"Title 7\",\"Begin\":\"00:21:21\",\"End\":\"00:28:28\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":8,\"Artist\":\"Artist 8\",\"Title\":\"Title 8\",\"Begin\":\"00:28:28\",\"End\":\"00:36:36\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":9,\"Artist\":\"Artist 9\",\"Title\":\"Title 9\",\"Begin\":\"00:36:36\",\"End\":\"00:45:45\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":10,\"Artist\":\"Artist 10\",\"Title\":\"Title 10\",\"Begin\":\"00:45:45\",\"End\":\"00:55:55\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true}],\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Audiofile\":{\"Name\":\"AudioFile.mp3\"},\"CDTextfile\":{\"Name\":\"CDTextfile.cdt\"},\"Cataloguenumber\":\"A123\",\"Sections\":[{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Begin\":\"00:30:00\"},{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Begin\":\"01:00:00\"}]}";
-        //    // Act
-        //    var cuesheet = Projectfile.ImportFile(fileContent);
-        //    // Assert
-        //    Assert.IsNotNull(cuesheet);
-        //    Assert.IsTrue(cuesheet.Tracks.All(x => x.Cuesheet == cuesheet));
-        //    Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
-        //    Assert.AreEqual("CuesheetTitle", cuesheet.Title);
-        //    Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
-        //    Assert.AreEqual("A123", cuesheet.Cataloguenumber);
-        //    Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
-        //    Assert.HasCount(10, cuesheet.Tracks);
-        //    Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
-        //    Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
-        //    Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
-        //    Assert.AreEqual(new TimeSpan(0, 55, 55), cuesheet.Tracks.Last().End);
-        //    Assert.IsTrue(ReferenceEquals(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1))));
-        //    Assert.AreEqual(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1)));
-        //    Assert.AreEqual((uint)10, cuesheet.Tracks.Last().Position);
-        //    Assert.HasCount(2, cuesheet.Sections);
-        //    Assert.AreEqual(new TimeSpan(0, 30, 0), cuesheet.Sections.First().Begin);
-        //    Assert.AreEqual(new TimeSpan(1, 0, 0), cuesheet.Sections.Last().Begin);
-        //}
+        [TestMethod()]
+        public void ImportFile_ValidProjectfile_ShouldImportFile()
+        {
+            // Arrange
+            var fileContent = "{\"Artist\":\"CuesheetArtist\",\"Title\":\"CuesheetTitle\",\"Cataloguenumber\":\"A123\",\"Audiofile\":{\"Name\":\"AudioFile.mp3\"},\"Tracks\":[{\"Position\":1,\"Artist\":\"Artist 1\",\"Title\":\"Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:01:01\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":2,\"Artist\":\"Artist 2\",\"Title\":\"Title 2\",\"Begin\":\"00:01:01\",\"End\":\"00:03:03\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":3,\"Artist\":\"Artist 3\",\"Title\":\"Title 3\",\"Begin\":\"00:03:03\",\"End\":\"00:06:06\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":4,\"Artist\":\"Artist 4\",\"Title\":\"Title 4\",\"Begin\":\"00:06:06\",\"End\":\"00:10:10\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":5,\"Artist\":\"Artist 5\",\"Title\":\"Title 5\",\"Begin\":\"00:10:10\",\"End\":\"00:15:15\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":6,\"Artist\":\"Artist 6\",\"Title\":\"Title 6\",\"Begin\":\"00:15:15\",\"End\":\"00:21:21\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":7,\"Artist\":\"Artist 7\",\"Title\":\"Title 7\",\"Begin\":\"00:21:21\",\"End\":\"00:28:28\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":8,\"Artist\":\"Artist 8\",\"Title\":\"Title 8\",\"Begin\":\"00:28:28\",\"End\":\"00:36:36\",\"Flags\":[\"4CH\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":9,\"Artist\":\"Artist 9\",\"Title\":\"Title 9\",\"Begin\":\"00:36:36\",\"End\":\"00:45:45\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true},{\"Position\":10,\"Artist\":\"Artist 10\",\"Title\":\"Title 10\",\"Begin\":\"00:45:45\",\"End\":\"00:55:55\",\"Flags\":[\"4CH\",\"DCP\"],\"IsLinkedToPreviousTrack\":true}],\"CDTextfile\":{\"Name\":\"CDTextfile.cdt\"}}";
+            // Act
+            var cuesheet = Projectfile.ImportFile(fileContent);
+            // Assert
+            Assert.IsNotNull(cuesheet);
+            Assert.IsTrue(cuesheet.Tracks.All(x => x.Cuesheet == cuesheet));
+            Assert.IsTrue(cuesheet.Tracks.All(x => x.IsLinkedToPreviousTrack));
+            Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
+            Assert.AreEqual("CuesheetTitle", cuesheet.Title);
+            Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
+            Assert.AreEqual("A123", cuesheet.Cataloguenumber);
+            Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
+            Assert.HasCount(10, cuesheet.Tracks);
+            Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
+            Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
+            Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
+            Assert.AreEqual(new TimeSpan(0, 55, 55), cuesheet.Tracks.Last().End);
+            Assert.AreEqual((ushort)10, cuesheet.Tracks.Last().Position);
+        }
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Model/IO/Projectfile.cs b/AudioCuesheetEditor/Model/IO/Projectfile.cs
index c6d2617e..a1e187bc 100644
--- a/AudioCuesheetEditor/Model/IO/Projectfile.cs
+++ b/AudioCuesheetEditor/Model/IO/Projectfile.cs
@@ -36,7 +36,15 @@ public class Projectfile(Cuesheet cuesheet)
 
         public static Cuesheet? ImportFile(string fileContent)
         {
-            return JsonSerializer.Deserialize<Cuesheet>(fileContent, Options);
+            var cuesheet = JsonSerializer.Deserialize<Cuesheet>(fileContent, Options);
+            if (cuesheet != null)
+            {
+                foreach (var track in cuesheet.Tracks)
+                {
+                    track.Cuesheet = cuesheet;
+                }
+            }
+            return cuesheet;
         }
 
         public Cuesheet Cuesheet { get; private set; } = cuesheet;

From 34c20d48566382611df9beb4a8f8a5e16d85315f Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 13:07:51 +0200
Subject: [PATCH 062/150] Update CuesheetExportServiceTests.cs

---
 .../Services/IO/CuesheetExportServiceTests.cs | 214 +++++++++---------
 1 file changed, 109 insertions(+), 105 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs b/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
index 25cc5126..d8145486 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
@@ -54,110 +54,114 @@ public void CanGenerateExportfile_InvalidExtension_ReturnsValidationMessage()
             Assert.IsFalse(result.IsSuccess);
             Assert.IsTrue(result.Error?.Message.Contains("File extension is not"));
         }
-        //TODO
-//        [TestMethod]
-//        public void CanGenerateExportfiles_ValidExtension_ReturnsSuccess()
-//        {
-//            // Arrange
-//            var cuesheet = new Cuesheet()
-//            {
-//                Artist = "Test Artist",
-//                Title = "Test Title",
-//                Audiofile = new Audiofile("Audio.mp3")
-//            };
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Position = 1,
-//                Begin = TimeSpan.Zero,
-//                End = new TimeSpan(0, 3, 43)
-//            });
-//            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
-
-//            // Act
-//            var result = _cuesheetExportService.CanGenerateExportfile("test.cue");
-
-//            // Assert
-//            Assert.IsTrue(result.IsSuccess);
-//        }
-
-//        [TestMethod]
-//        public void GenerateExportfiles_WithoutSections_ReturnsExportFile()
-//        {
-//            // Arrange
-//            var filename = "Test valid Filename.cue";
-//            var cuesheet = new Cuesheet()
-//            {
-//                Artist = "Test artist cuesheet",
-//                Title = "Test title cuesheet",
-//                Audiofile = new Audiofile("Test audiofile.mp3")
-//            };
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Artist = "Test artist 1",
-//                Title = "Test title 1",
-//                Begin = TimeSpan.Zero,
-//                End = new TimeSpan(0, 4, 12),
-//                Position = 1
-//            });
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Artist = "Test artist 2",
-//                Title = "Test title 2",
-//                End = new TimeSpan(0, 8, 32),
-//                Position = 2
-//            });
-//            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
-
-//            // Act
-//            var result = _cuesheetExportService.GenerateExportfile(filename);
-
-//            // Assert
-//            Assert.IsTrue(result.IsSuccess);
-//            Assert.AreEqual(filename, result.Value!.Name);
-//            var content = result.Value!.Content;
-//            Assert.IsNotNull(content);
-//            Assert.AreEqual(@"TITLE ""Test title cuesheet""
-//PERFORMER ""Test artist cuesheet""
-//FILE ""Test audiofile.mp3"" MP3
-//	TRACK 01 AUDIO
-//		TITLE ""Test title 1""
-//		PERFORMER ""Test artist 1""
-//		INDEX 01 00:00:00
-//	TRACK 02 AUDIO
-//		TITLE ""Test title 2""
-//		PERFORMER ""Test artist 2""
-//		INDEX 01 04:12:00
-//", content);
-//        }
-
-//        [TestMethod]
-//        public void GenerateExportfiles_WithInvalidTracks_ReturnsFailure()
-//        {
-//            // Arrange
-//            var cuesheet = new Cuesheet()
-//            {
-//                Artist = "Test Artist",
-//                Title = "Test Title",
-//                Audiofile = new Audiofile("Audio.mp3")
-//            };
-//            var track1 = new Track()
-//            {
-//                Position = 1,
-//                Begin = TimeSpan.Zero,
-//            };
-//            var track2 = new Track()
-//            {
-//                Position = 2,
-//            };
-//            cuesheet.AddTrack(track1);
-//            cuesheet.AddTrack(track2);
-//            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
-
-//            // Act
-//            var result = _cuesheetExportService.GenerateExportfile("test.cue");
-
-//            // Assert
-//            Assert.IsFalse(result.IsSuccess);
-//        }
+
+        [TestMethod]
+        public void CanGenerateExportfiles_ValidExtension_ReturnsSuccess()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Artist = "Test Artist",
+                Title = "Test Title",
+                Audiofile = new Audiofile("Audio.mp3"),
+                Tracks = [
+                    new()
+                    {
+                        Position = 1,
+                        Begin = TimeSpan.Zero,
+                        End = new TimeSpan(0, 3, 43)
+                    }
+                ]
+            };
+            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
+
+            // Act
+            var result = _cuesheetExportService.CanGenerateExportfile("test.cue");
+
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+        }
+
+        [TestMethod]
+        public void GenerateExportfiles_WithoutSections_ReturnsExportFile()
+        {
+            // Arrange
+            var filename = "Test valid Filename.cue";
+            var cuesheet = new Cuesheet()
+            {
+                Artist = "Test artist cuesheet",
+                Title = "Test title cuesheet",
+                Audiofile = new Audiofile("Test audiofile.mp3"),
+                Tracks = [
+                    new ()
+                    {
+                        Artist = "Test artist 1",
+                        Title = "Test title 1",
+                        Begin = TimeSpan.Zero,
+                        End = new TimeSpan(0, 4, 12),
+                        Position = 1
+                    },
+                    new ()
+                    {
+                        Artist = "Test artist 2",
+                        Title = "Test title 2",
+                        End = new TimeSpan(0, 8, 32),
+                        Position = 2
+                    }
+                ]
+            };
+            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
+
+            // Act
+            var result = _cuesheetExportService.GenerateExportfile(filename);
+
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+            Assert.AreEqual(filename, result.Value!.Name);
+            var content = result.Value!.Content;
+            Assert.IsNotNull(content);
+            Assert.AreEqual(@"TITLE ""Test title cuesheet""
+PERFORMER ""Test artist cuesheet""
+FILE ""Test audiofile.mp3"" MP3
+	TRACK 01 AUDIO
+		TITLE ""Test title 1""
+		PERFORMER ""Test artist 1""
+		INDEX 01 00:00:00
+	TRACK 02 AUDIO
+		TITLE ""Test title 2""
+		PERFORMER ""Test artist 2""
+		INDEX 01 04:12:00
+", content);
+        }
+
+        [TestMethod]
+        public void GenerateExportfiles_WithInvalidTracks_ReturnsFailure()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Artist = "Test Artist",
+                Title = "Test Title",
+                Audiofile = new Audiofile("Audio.mp3"),
+                Tracks = [
+                    new()
+                    {
+                        Position = 1,
+                        Begin = TimeSpan.Zero,
+                    },
+                    new()
+                    {
+                        Position = 2,
+                    }
+                ]
+            };
+            _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
+
+            // Act
+            var result = _cuesheetExportService.GenerateExportfile("test.cue");
+
+            // Assert
+            Assert.IsFalse(result.IsSuccess);
+        }
     }
 }
\ No newline at end of file

From e885da8a4e697a347e3714cc5cf73fca2fe1473a Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 13:14:35 +0200
Subject: [PATCH 063/150] Update TrackList.razor

---
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 631bc250..74181d1c 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
     }
 </MudMenu>
 
-@code {
+    @code {
     //TODO: Disallow editing of position
     HashSet<Track> _selectedTracks = new();
     MudMenu? _trackContextMenu;
@@ -240,6 +240,9 @@ along with Foobar.  If not, see
         if (trackThatWillBeCopied != null)
         {
             var copy = _trackManager.Clone(trackThatWillBeCopied);
+            copy.Position = (ushort?)(trackThatWillBeCopied.Position + 1);
+            copy.Begin = trackThatWillBeCopied.End;
+            copy.End = null;
             _cuesheetManager.AddTrack(copy);
             await EditTrackModalClicked(copy);
         }

From e0ca3512e9f5bda552f34900ca0f1ae0239c5e2b Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 13:14:43 +0200
Subject: [PATCH 064/150] Update TrackList.razor

---
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 74181d1c..40d57af3 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
     }
 </MudMenu>
 
-    @code {
+@code {
     //TODO: Disallow editing of position
     HashSet<Track> _selectedTracks = new();
     MudMenu? _trackContextMenu;

From 9740ee5b03abe1144f2e64d68d2b725062ccbbd2 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 15 Apr 2026 16:27:09 +0200
Subject: [PATCH 065/150] add cuesheetmanager tests

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 393 ++++++++++++++++++
 .../Services/AudioCuesheet/CuesheetManager.cs |  34 +-
 2 files changed, 413 insertions(+), 14 deletions(-)
 create mode 100644 AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
new file mode 100644
index 00000000..fa814536
--- /dev/null
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -0,0 +1,393 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Model.IO.Audio;
+using AudioCuesheetEditor.Model.UI;
+using AudioCuesheetEditor.Services.AudioCuesheet;
+using AudioCuesheetEditor.Services.UI;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace AudioCuesheetEditor.Tests.Services.AudioCuesheet
+{
+    [TestClass]
+    public class CuesheetManagerTests
+    {
+        private readonly CuesheetManager _cuesheetManager;
+        private readonly Mock<ITraceChangeManager> _traceChangeManager;
+        private readonly Mock<ISessionStateContainer> _sessionStateContainer;
+        private readonly Mock<ITrackManager> _trackManager;
+
+        public CuesheetManagerTests()
+        {
+            _traceChangeManager = new();
+            _sessionStateContainer = new();
+            _trackManager = new();
+            _cuesheetManager = new(_traceChangeManager.Object, _sessionStateContainer.Object, _trackManager.Object);
+        }
+
+        [TestMethod]
+        public void SetProperty_NewValue_ChangesPropertyAndSetsTracedChange()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet();
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            // Act
+            _cuesheetManager.SetProperty(x => x.Artist, "Artist");
+            // Assert
+            Assert.AreEqual("Artist", cuesheet.Artist);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Artist))), Times.Once);
+        }
+
+        [TestMethod]
+        public void SetProperty_EqualValue_ChangesPropertyAndSetsTracedChange()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Artist = "Artist"
+            };
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            // Act
+            _cuesheetManager.SetProperty(x => x.Artist, cuesheet.Artist);
+            // Assert
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Artist))), Times.Never);
+        }
+
+        [TestMethod]
+        public void IsRecordingPossible_WithoutTracks_ReturnsSuccess()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet();
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            // Act
+            var result = _cuesheetManager.IsRecordingPossible;
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+        }
+
+        [TestMethod]
+        public void IsRecordingPossible_WithTracks_ReturnsFailure()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [
+                    new()
+                ]
+            };
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            // Act
+            var result = _cuesheetManager.IsRecordingPossible;
+            // Assert
+            Assert.IsFalse(result.IsSuccess);
+            Assert.AreEqual("Cuesheet already contains tracks!", result.Error!.Message);
+        }
+
+        [TestMethod]
+        public void StartRecording_RecordingPossible_ReturnsSuccess()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet();
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var isRecordingChanged = false;
+            _cuesheetManager.IsRecordingChanged += delegate
+            {
+                isRecordingChanged = true;
+            };
+            // Act
+            var result = _cuesheetManager.StartRecording();
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+            Assert.IsTrue(isRecordingChanged);
+            Assert.IsNotNull(cuesheet.RecordingStart);
+        }
+
+        [TestMethod]
+        public void StartRecording_RecordingNotPossible_ReturnsFailure()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                RecordingStart = DateTime.UtcNow.AddDays(-1)
+            };
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var isRecordingChanged = false;
+            _cuesheetManager.IsRecordingChanged += delegate
+            {
+                isRecordingChanged = true;
+            };
+            // Act
+            var result = _cuesheetManager.StartRecording();
+            // Assert
+            Assert.IsFalse(result.IsSuccess);
+            Assert.IsFalse(isRecordingChanged);
+            Assert.AreEqual("Record is already running!", result.Error!.Message);
+        }
+
+        [TestMethod]
+        public void StopRecording_WithActiveRecording_StopsRecordAndSetsTrackDetails()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                RecordingStart = DateTime.UtcNow.AddDays(-1),
+                Tracks = [
+                    new() {
+                        Position = 1,
+                        Begin = TimeSpan.Zero,
+                        End = new TimeSpan(0, 3, 12)
+                    },
+                    new() {
+                        Position = 2,
+                        Begin = new TimeSpan(0, 3, 12)
+                    }
+                ]
+            };
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var isRecordingChanged = false;
+            _cuesheetManager.IsRecordingChanged += delegate
+            {
+                isRecordingChanged = true;
+            };
+            // Act
+            _cuesheetManager.StopRecording();
+            // Assert
+            Assert.IsFalse(cuesheet.IsRecording);
+            Assert.IsNull(cuesheet.RecordingStart);
+            Assert.IsTrue(isRecordingChanged);
+            Assert.IsNotNull(cuesheet.Tracks.Last().End);
+        }
+
+        [TestMethod]
+        public void StopRecording_WithoutActiveRecording_ChangesNothing()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [
+                    new() {
+                        Position = 1,
+                        Begin = TimeSpan.Zero,
+                        End = new TimeSpan(0, 3, 12)
+                    },
+                    new() {
+                        Position = 2,
+                        Begin = new TimeSpan(0, 3, 12)
+                    }
+                ]
+            };
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var isRecordingChanged = false;
+            _cuesheetManager.IsRecordingChanged += delegate
+            {
+                isRecordingChanged = true;
+            };
+            // Act
+            _cuesheetManager.StopRecording();
+            // Assert
+            Assert.IsFalse(isRecordingChanged);
+            Assert.IsNull(cuesheet.Tracks.Last().End);
+        }
+
+        [TestMethod]
+        public void AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties()
+        {
+            // Arrange
+            var duration = new TimeSpan(0, 27, 56);
+            var cuesheet = new Cuesheet()
+            {
+                Audiofile = new("Audio.mp3", nameof(AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties), Audiofile.AudioCodecs.First(), duration)
+            };
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var track = new Track();
+            _trackManager.Setup(x => x.SetProperty(track, x => x.End, It.IsAny<TimeSpan>())).Callback<Track, Expression<Func<Track, TimeSpan?>>, TimeSpan?>((t, propExpression, value) =>
+            {
+                var memberExpression = propExpression.Body as MemberExpression;
+                if (memberExpression?.Member is PropertyInfo propInfo)
+                {
+                    propInfo.SetValue(t, value);
+                }
+            });
+            // Act
+            _cuesheetManager.AddTrack(track);
+            // Assert
+            Assert.HasCount(1, cuesheet.Tracks);
+            Assert.AreEqual((ushort)1, cuesheet.Tracks.First().Position);
+            Assert.AreEqual(TimeSpan.Zero, cuesheet.Tracks.First().Begin);
+            Assert.AreEqual(duration, cuesheet.Tracks.First().End);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == Enumerable.Empty<Track>() && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
+        }
+
+        [TestMethod]
+        public void AddTrack_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackProperties()
+        {
+            // Arrange
+            var duration = new TimeSpan(0, 27, 56);
+            var tracks = new List<Track>
+            {
+                new()
+                {
+                    Position = 1,
+                    Begin = TimeSpan.Zero,
+                    End = new TimeSpan(3, 12, 0)
+                }
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = tracks,
+                Audiofile = new("Audio.mp3", nameof(AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties), Audiofile.AudioCodecs.First(), duration)
+            };
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var track = new Track();
+            _trackManager.Setup(x => x.SetProperty(track, x => x.End, It.IsAny<TimeSpan>())).Callback<Track, Expression<Func<Track, TimeSpan?>>, TimeSpan?>((t, propExpression, value) =>
+            {
+                var memberExpression = propExpression.Body as MemberExpression;
+                if (memberExpression?.Member is PropertyInfo propInfo)
+                {
+                    propInfo.SetValue(t, value);
+                }
+            });
+            // Act
+            _cuesheetManager.AddTrack(track);
+            // Assert
+            Assert.HasCount(2, cuesheet.Tracks);
+            Assert.AreEqual((ushort)2, cuesheet.Tracks.Last().Position);
+            Assert.AreEqual(cuesheet.Tracks.First().End, cuesheet.Tracks.Last().Begin);
+            Assert.AreEqual(duration, cuesheet.Tracks.Last().End);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == tracks && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
+        }
+
+        [TestMethod]
+        public void AddTrack_DuringRecording_AddsNewTrackWithCalulatedTrackProperties()
+        {
+            // Arrange
+            var tracks = new List<Track>
+            {
+                new()
+                {
+                    Position = 1,
+                    Begin = TimeSpan.Zero
+                }
+            };
+            var cuesheet = new Cuesheet()
+            {
+                RecordingStart = DateTime.UtcNow,
+                Tracks = tracks
+            };
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var track = new Track();
+            // Act
+            _cuesheetManager.AddTrack(track);
+            // Assert
+            Assert.HasCount(2, cuesheet.Tracks);
+            Assert.AreEqual((ushort)2, cuesheet.Tracks.Last().Position);
+            Assert.IsNotNull(cuesheet.Tracks.First().End);
+            Assert.IsNotNull(cuesheet.Tracks.Last().Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == tracks && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
+        }
+
+        [TestMethod]
+        public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackProperties()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12),
+                IsLinkedToPreviousTrack = true
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = new TimeSpan(0, 3, 12),
+                End = new TimeSpan(0, 7, 34),
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = new TimeSpan(0, 7, 34),
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var track4 = new Track()
+            {
+                Position = 4,
+                Begin = new TimeSpan(0, 10, 4),
+                End = new TimeSpan(0, 14, 54),
+                IsLinkedToPreviousTrack = true
+            };
+            var track5 = new Track()
+            {
+                Position = 5,
+                Begin = new TimeSpan(0, 14, 54),
+                IsLinkedToPreviousTrack = true
+            };
+            var previousValue = new List<Track>() { track1, track2, track3, track4, track5 };
+            var duration = new TimeSpan(0, 19, 38);
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = previousValue,
+                Audiofile = new("Audio.mp3", nameof(RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackProperties), Audiofile.AudioCodecs.First(), duration)
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            track4.Cuesheet = cuesheet;
+            track5.Cuesheet = cuesheet;
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            _trackManager.Setup(x => x.GetPreviousLinkedTrack(It.IsAny<Track>())).Returns(delegate(Track track)
+            {
+                Track? previousLinkedTrack = null;
+                if (track.IsLinkedToPreviousTrack)
+                {
+                    previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1);
+                }
+                return previousLinkedTrack;
+            });
+            _trackManager.Setup(x => x.SetProperty(It.IsAny<Track>(), x => x.End, It.IsAny<TimeSpan>())).Callback<Track, Expression<Func<Track, TimeSpan?>>, TimeSpan?>((track, propExpression, value) =>
+            {
+                var memberExpression = propExpression.Body as MemberExpression;
+                if (memberExpression?.Member is PropertyInfo propInfo)
+                {
+                    propInfo.SetValue(track, value);
+                }
+            });
+            // Act
+            _cuesheetManager.RemoveTracks([track2, track4]);
+            // Assert
+            Assert.HasCount(3, cuesheet.Tracks);
+            Assert.IsTrue(cuesheet.Tracks.Contains(track1));
+            Assert.IsTrue(cuesheet.Tracks.Contains(track3));
+            Assert.IsTrue(cuesheet.Tracks.Contains(track5));
+            Assert.AreEqual((ushort)1, track1.Position);
+            Assert.AreEqual(TimeSpan.Zero, track1.Begin);
+            Assert.AreEqual(track1.End, track3.Begin);
+            Assert.AreEqual((ushort)2, track3.Position);
+            Assert.AreEqual(track5.Begin, track3.End);
+            Assert.AreEqual((ushort)3, track5.Position);
+            Assert.AreEqual(duration, track5.End);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == previousValue && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
+        }
+    }
+}
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 982fc2ea..5ccef4c8 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -29,8 +29,6 @@ public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionSta
 
         public event EventHandler? IsRecordingChanged;
 
-        //TODO: Tests
-
         /// <inheritdoc/>
         public void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
@@ -53,27 +51,35 @@ public Result IsRecordingPossible
         /// <inheritdoc/>
         public Result StartRecording()
         {
-            var cuesheet = _sessionStateContainer.Cuesheet;
-            if (cuesheet.IsRecording == true)
+            var isRecordingPossibleResult = IsRecordingPossible;
+            if (isRecordingPossibleResult.IsSuccess)
             {
-                return Result.Failure(new Error(ErrorType.NotPossible, "Record is already running!"));
+                var cuesheet = _sessionStateContainer.Cuesheet;
+                if (cuesheet.IsRecording == true)
+                {
+                    return Result.Failure(new Error(ErrorType.NotPossible, "Record is already running!"));
+                }
+                cuesheet.RecordingStart = DateTime.UtcNow;
+                IsRecordingChanged?.Invoke(this, EventArgs.Empty);
+                return Result.Success();
             }
-            cuesheet.RecordingStart = DateTime.UtcNow;
-            IsRecordingChanged?.Invoke(this, EventArgs.Empty);
-            return Result.Success();
+            return isRecordingPossibleResult;
         }
 
         /// <inheritdoc/>
         public void StopRecording()
         {
             var cuesheet = _sessionStateContainer.Cuesheet;
-            var lastTrack = cuesheet.Tracks.LastOrDefault();
-            if ((lastTrack != null) && cuesheet.RecordingStart.HasValue)
+            if (cuesheet.IsRecording == true)
             {
-                lastTrack.End = DateTime.UtcNow - cuesheet.RecordingStart.Value;
+                var lastTrack = cuesheet.Tracks.LastOrDefault();
+                if ((lastTrack != null) && cuesheet.RecordingStart.HasValue)
+                {
+                    lastTrack.End = DateTime.UtcNow - cuesheet.RecordingStart.Value;
+                }
+                cuesheet.RecordingStart = null;
+                IsRecordingChanged?.Invoke(this, EventArgs.Empty);
             }
-            cuesheet.RecordingStart = null;
-            IsRecordingChanged?.Invoke(this, EventArgs.Empty);
         }
 
         /// <inheritdoc/>
@@ -86,7 +92,6 @@ public void AddTrack(Track track)
             {
                 track.Begin = DateTime.UtcNow - cuesheet.RecordingStart;
             }
-            SetLastTrackEnd();
             if (cuesheet.Tracks.Any() == false)
             {
                 track.Position = 1;
@@ -127,6 +132,7 @@ public void AddTrack(Track track)
                 track
             };
             SetValue(cuesheet, x => x.Tracks, newValue);
+            SetLastTrackEnd();
         }
 
         /// <inheritdoc/>

From c2aec682e23dc6c87bb65621a78300242bb84b31 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 09:02:28 +0200
Subject: [PATCH 066/150] Update CuesheetManagerTests.cs

---
 .../Services/AudioCuesheet/CuesheetManagerTests.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index fa814536..9b15c035 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -58,7 +58,7 @@ public void SetProperty_NewValue_ChangesPropertyAndSetsTracedChange()
         }
 
         [TestMethod]
-        public void SetProperty_EqualValue_ChangesPropertyAndSetsTracedChange()
+        public void SetProperty_EqualValue_DoesntChangeProperty()
         {
             // Arrange
             var cuesheet = new Cuesheet()

From dd2d1df33dd83f8c66b6bded16e595a9992e90c4 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 10:49:05 +0200
Subject: [PATCH 067/150] add trackmanager tests

---
 .../AudioCuesheet/TrackManagerTests.cs        | 354 ++++++++++++++++++
 .../Services/AudioCuesheet/TrackManager.cs    |   4 +-
 2 files changed, 355 insertions(+), 3 deletions(-)
 create mode 100644 AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
new file mode 100644
index 00000000..391558a1
--- /dev/null
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -0,0 +1,354 @@
+//This file is part of AudioCuesheetEditor.
+
+//AudioCuesheetEditor is free software: you can redistribute it and/or modify
+//it under the terms of the GNU General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+
+//AudioCuesheetEditor is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+//You should have received a copy of the GNU General Public License
+//along with Foobar.  If not, see
+//<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Model.AudioCuesheet.Import;
+using AudioCuesheetEditor.Model.UI;
+using AudioCuesheetEditor.Services.AudioCuesheet;
+using AudioCuesheetEditor.Services.UI;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AudioCuesheetEditor.Tests.Services.AudioCuesheet
+{
+    [TestClass]
+    public class TrackManagerTests
+    {
+        private readonly TrackManager _trackManager;
+        private readonly Mock<ITraceChangeManager> _traceChangeManager;
+
+        public TrackManagerTests()
+        {
+            _traceChangeManager = new Mock<ITraceChangeManager>();
+            _trackManager = new(_traceChangeManager.Object);
+        }
+
+        [TestMethod]
+        public void SetProperty_NewValue_ChangesPropertyAndSetsTracedChange()
+        {
+            // Arrange
+            var track = new Track();
+            var artist = "Artist 1";
+            // Act
+            _trackManager.SetProperty(track, x => x.Artist, artist);
+            // Assert
+            Assert.AreEqual(artist, track.Artist);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Artist))), Times.Once);
+        }
+
+        [TestMethod]
+        public void SetProperty_EqualValue_DoesntChangeProperty()
+        {
+            // Arrange
+            var artist = "Artist 1";
+            var track = new Track()
+            {
+                Artist = artist,
+                Position = 2
+            };
+            // Act
+            _trackManager.SetProperty(track, x => x.Artist, artist);
+            // Assert
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Artist))), Times.Never);
+        }
+
+        [TestMethod]
+        public void SetProperty_CuesheetAvailable_CalculatesLinkedProperties()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [
+                    new() 
+                    {
+                        IsLinkedToPreviousTrack = true,
+                        Position = 1,
+                        Begin = TimeSpan.Zero
+                    }
+                ]
+            };
+            var track = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Cuesheet = cuesheet,
+                Begin = new TimeSpan(0, 4, 56)
+            };
+            cuesheet.Tracks = cuesheet.Tracks.Append(track);
+            var artist = "Artist 1";
+            // Act
+            _trackManager.SetProperty(track, x => x.Artist, artist);
+            // Assert
+            Assert.AreEqual(artist, track.Artist);
+            Assert.AreEqual((ushort)2, track.Position);
+            Assert.AreEqual(track.Begin, cuesheet.Tracks.Single(x => x.Position == 1).End);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Artist))), Times.Once);
+        }
+
+        [TestMethod]
+        public void Clone_ImportTrack_ReturnsTrackClone()
+        {
+            // Arrange
+            var importTrack = new ImportTrack()
+            {
+                Artist = "Artist 1",
+                Title = "Title 1",
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 2, 54),
+                IsLinkedToPreviousTrack = true,
+                Position = 1,
+                PostGap = new TimeSpan(0, 0, 2),
+                PreGap = new TimeSpan(0, 0, 4),
+                Flags = [Flag.FourCH, Flag.DCP],
+                StartDateTime = new DateTime(2024, 2, 28, 19, 23, 54)
+            };
+            // Act
+            var track = _trackManager.Clone(importTrack);
+            // Assert
+            Assert.AreEqual(importTrack.Artist, track.Artist);
+            Assert.AreEqual(importTrack.Title, track.Title);
+            Assert.AreEqual(importTrack.Begin, track.Begin);
+            Assert.AreEqual(importTrack.End, track.End);
+            Assert.AreEqual(importTrack.IsLinkedToPreviousTrack, track.IsLinkedToPreviousTrack);
+            Assert.AreEqual(importTrack.Position, track.Position);
+            Assert.AreEqual(importTrack.PostGap, track.PostGap);
+            Assert.AreEqual(importTrack.PreGap, track.PreGap);
+            Assert.AreEqual(importTrack.Flags, track.Flags);
+            Assert.AreEqual(importTrack.Length, track.Length);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track)), Times.Never);
+        }
+
+        [TestMethod]
+        public void CopyValues_AllDefaultValues_CopiesAllValues()
+        {
+            // Arrange
+            var source = new Track()
+            {
+                Artist = "Artist 1",
+                Title = "Title 1",
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 2, 54),
+                IsLinkedToPreviousTrack = true,
+                Position = 1,
+                PostGap = new TimeSpan(0, 0, 2),
+                PreGap = new TimeSpan(0, 0, 4),
+                Flags = [Flag.FourCH, Flag.DCP]
+            };
+            var target = new Track();
+            // Act
+            _trackManager.CopyValues(source, target);
+            // Assert
+            Assert.AreEqual(source.Artist, target.Artist);
+            Assert.AreEqual(source.Title, target.Title);
+            Assert.AreEqual(source.Begin, target.Begin);
+            Assert.AreEqual(source.End, target.End);
+            Assert.AreEqual(source.IsLinkedToPreviousTrack, target.IsLinkedToPreviousTrack);
+            Assert.AreEqual(source.Position, target.Position);
+            Assert.AreEqual(source.PostGap, target.PostGap);
+            Assert.AreEqual(source.PreGap, target.PreGap);
+            Assert.AreEqual(source.Flags, target.Flags);
+            Assert.AreEqual(source.Length, target.Length);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == target)), Times.Never);
+        }
+
+        [TestMethod]
+        public void CopyValues_ValuesSet_CopiesOnlySetValues()
+        {
+            // Arrange
+            var source = new Track()
+            {
+                Artist = "Artist 1",
+                Title = "Title 1",
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 2, 54),
+                IsLinkedToPreviousTrack = true,
+                Position = 1,
+                PostGap = new TimeSpan(0, 0, 2),
+                PreGap = new TimeSpan(0, 0, 4),
+                Flags = [Flag.FourCH, Flag.DCP]
+            };
+            var target = new Track();
+            // Act
+            _trackManager.CopyValues(source, target, setBegin: false, setPreGap: false, setPostGap:false);
+            // Assert
+            Assert.AreEqual(source.Artist, target.Artist);
+            Assert.AreEqual(source.Title, target.Title);
+            Assert.AreNotEqual(source.Begin, target.Begin);
+            Assert.AreEqual(source.End, target.End);
+            Assert.AreEqual(source.IsLinkedToPreviousTrack, target.IsLinkedToPreviousTrack);
+            Assert.AreEqual(source.Position, target.Position);
+            Assert.AreNotEqual(source.PostGap, target.PostGap);
+            Assert.AreEqual(source.PreGap, target.PreGap);
+            Assert.AreNotEqual(source.Flags, target.Flags);
+            Assert.AreEqual(source.Length, target.Length);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == target)), Times.Never);
+        }
+
+        [TestMethod]
+        public void GetPreviousLinkedTrack_LinkedTracks_ReturnsTrack()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 2
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetPreviousLinkedTrack(track2);
+            // Assert
+            Assert.IsNotNull(linkedTrack);
+            Assert.AreEqual(track1, linkedTrack);
+        }
+
+        [TestMethod]
+        public void GetPreviousLinkedTrack_NotLinkedTracks_ReturnsNull()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                Position = 2
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetPreviousLinkedTrack(track2);
+            // Assert
+            Assert.IsNull(linkedTrack);
+        }
+
+        [TestMethod]
+        public void GetPreviousLinkedTrack_WithoutPosition_ReturnsNull()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetPreviousLinkedTrack(track2);
+            // Assert
+            Assert.IsNull(linkedTrack);
+        }
+
+        [TestMethod]
+        public void GetNextLinkedTrack_LinkedTracks_ReturnsTrack()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 2
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetNextLinkedTrack(track1);
+            // Assert
+            Assert.IsNotNull(linkedTrack);
+            Assert.AreEqual(track2, linkedTrack);
+        }
+
+        [TestMethod]
+        public void GetNextLinkedTrack_NotLinkedTracks_ReturnsNull()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                Position = 2
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetNextLinkedTrack(track1);
+            // Assert
+            Assert.IsNull(linkedTrack);
+        }
+
+        [TestMethod]
+        public void GetNextLinkedTrack_WithoutPosition_ReturnsNull()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                IsLinkedToPreviousTrack = true
+            };
+            var track2 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 2
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetNextLinkedTrack(track1);
+            // Assert
+            Assert.IsNull(linkedTrack);
+        }
+    }
+}
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index bfe84f15..8b2443f7 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -25,8 +25,6 @@ public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManage
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
 
-        //TODO: Tests
-
         /// <inheritdoc/>
         public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
         {
@@ -93,7 +91,7 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             Track? previousLinkedTrack = null;
             if (track.IsLinkedToPreviousTrack)
             {
-                previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1);
+                previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
             }
             return previousLinkedTrack;
         }

From 13428bf9f41a0fb1427638780be97a0ee80bef0d Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 10:49:13 +0200
Subject: [PATCH 068/150] Update TrackManagerTests.cs

---
 .../Services/AudioCuesheet/TrackManagerTests.cs                 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index 391558a1..ca6ce3ec 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -21,9 +21,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace AudioCuesheetEditor.Tests.Services.AudioCuesheet
 {

From 8cf8cc15996d2dc22389ceb1640753bcaa0fda48 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 11:06:29 +0200
Subject: [PATCH 069/150] Update TrackTests.cs

---
 .../Model/AudioCuesheet/TrackTests.cs         | 301 +++++-------------
 1 file changed, 74 insertions(+), 227 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs
index bbfe003b..d29aa2d1 100644
--- a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs
+++ b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs
@@ -15,244 +15,91 @@
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.Entity;
-using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace AudioCuesheetEditor.Tests.Model.AudioCuesheet
 {
     [TestClass()]
     public class TrackTests
     {
-        //TODO
-        //[TestMethod()]
-        //public void TrackTest()
-        //{
-        //    //Tests for Length
-        //    var track = new Track();
-        //    Assert.IsNull(track.Length);
-        //    track.Length = new TimeSpan(0, 2, 30);
-        //    Assert.IsNotNull(track.Length);
-        //    Assert.IsNotNull(track.Begin);
-        //    Assert.IsNotNull(track.End);
-        //    Assert.AreEqual(TimeSpan.Zero, track.Begin);
-        //    Assert.AreEqual(new TimeSpan(0, 2, 30), track.End);
-        //    Assert.AreEqual(new TimeSpan(0, 2, 30), track.Length);
-        //    track.Begin = new TimeSpan(0, 25, 0);
-        //    Assert.IsNull(track.Length);
-        //    track.Length = new TimeSpan(0, 3, 30);
-        //    Assert.IsNotNull(track.Length);
-        //    Assert.AreEqual(new TimeSpan(0, 3, 30), track.Length);
-        //    Assert.AreEqual(new TimeSpan(0, 28, 30), track.End);
-        //    track.Begin = null;
-        //    Assert.IsNull(track.Length);
-        //    track.Length = new TimeSpan(0, 5, 15);
-        //    Assert.AreEqual(new TimeSpan(0, 28, 30), track.End);
-        //    Assert.AreEqual(new TimeSpan(0, 5, 15), track.Length);
-        //    Assert.AreEqual(new TimeSpan(0, 23, 15), track.Begin);
-        //}
+        [TestMethod()]
+        public void Validate_PositionNull_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track = new Track();
+            // Act
+            var endValidationResult = track.Validate(nameof(Track.Position));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        }
 
-        //[TestMethod()]
-        //public void SetLengthTest()
-        //{
-        //    var track = new Track();
-        //    Assert.IsNull(track.Length);
-        //    Assert.IsNull(track.Begin);
-        //    Assert.IsNull(track.End);
-        //    track.Begin = new TimeSpan(0, 2, 43);
-        //    track.End = new TimeSpan(0, 5, 23);
-        //    Assert.IsNotNull(track.Length);
-        //    track.Length = new TimeSpan(0, 2, 0);
-        //    Assert.AreEqual(new TimeSpan(0, 4, 43), track.End);
-        //}
+        [TestMethod()]
+        public void Validate_Position0_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track = new Track()
+            {
+                Position = 0
+            };
+            // Act
+            var endValidationResult = track.Validate(nameof(Track.Position));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        }
 
-        //[TestMethod()]
-        //public void LinkTrackTest()
-        //{
-        //    //Test LinkedPreviousTrack
-        //    var track = new Track
-        //    {
-        //        Begin = TimeSpan.Zero,
-        //        Position = 1,
-        //        End = new TimeSpan(0, 3, 23)
-        //    };
-        //    Assert.IsFalse(track.IsLinkedToPreviousTrack);
-        //    var track2 = new Track
-        //    {
-        //        Begin = track.End,
-        //        End = new TimeSpan(0, 5, 45),
-        //        Position = 2
-        //    };
-        //    Assert.IsFalse(track2.IsLinkedToPreviousTrack);
-        //    bool eventFired = false;
-        //    track2.IsLinkedToPreviousTrackChanged += delegate
-        //    {
-        //        eventFired = true;
-        //    };
-        //    track2.IsLinkedToPreviousTrack = true;
-        //    Assert.IsTrue(eventFired);
-        //}
+        [TestMethod()]
+        public void Validate_PositionOvverlapping_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1
+            };
+            var track = new Track()
+            {
+                Position = 1
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track]
+            };
+            track1.Cuesheet = cuesheet;
+            track.Cuesheet = cuesheet;
+            // Act
+            var endValidationResult = track.Validate(nameof(Track.Position));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        }
 
-        //[TestMethod()]
-        //public void CheckPositionInCuesheetTest()
-        //{
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track
-        //    {
-        //        Position = 3,
-        //        End = new TimeSpan(0, 5, 0)
-        //    };
-        //    var track2 = new Track
-        //    {
-        //        Position = 2,
-        //        Begin = track1.End,
-        //        End = new TimeSpan(0, 8, 23)
-        //    };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    var validationResult = track1.Validate(nameof(Track.Position));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
-        //        && x.Parameter != null && x.Parameter[0].Equals(track1.Position) && x.Parameter[3].Equals(track1.Begin) && x.Parameter[4].Equals(track1.End) && x.Parameter[5].Equals(1)));
-        //    track1.Position = 1;
-        //    validationResult = track1.Validate(nameof(Track.Position));
-        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        //    validationResult = track2.Validate(nameof(Track.Position));
-        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        //    track1.Position = 3;
-        //    track2.Position = 5;
-        //    validationResult = track1.Validate(nameof(Track.Position));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
-        //        && x.Parameter != null && x.Parameter[0].Equals(track1.Position) && x.Parameter[3].Equals(track1.Begin) && x.Parameter[4].Equals(track1.End) && x.Parameter[5].Equals(1)));
-        //    validationResult = track2.Validate(nameof(Track.Position));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "Track({0},{1},{2},{3},{4}) does not have the correct position '{5}'!"
-        //        && x.Parameter != null && x.Parameter[0].Equals(track2.Position) && x.Parameter[3].Equals(track2.Begin) && x.Parameter[4].Equals(track2.End) && x.Parameter[5].Equals(2)));
-        //    cuesheet = new Cuesheet();
-        //    track1 = new Track()
-        //    {
-        //        Artist = "Testartist 1",
-        //        Title = "Testtitle 1"
-        //    };
-        //    cuesheet.AddTrack(track1);
-        //    track2 = new Track()
-        //    {
-        //        Artist = "Testartist 2",
-        //        Title = "Testtitle 2"
-        //    };
-        //    cuesheet.AddTrack(track2);
-        //    Assert.IsNotNull(track1.Begin);
-        //    Assert.IsNull(track1.End);
-        //    Assert.IsNull(track2.Begin);
-        //    Assert.IsNull(track2.End);
-        //    validationResult = track1.Validate(nameof(Track.Position));
-        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        //    validationResult = track2.Validate(nameof(Track.Position));
-        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        //}
+        [TestMethod()]
+        public void Validate_InvalidEnd_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track = new Track
+            {
+                Begin = new TimeSpan(0, 2, 32),
+                End = new TimeSpan(0, 1, 15)
+            };
+            // Act
+            var endValidationResult = track.Validate(nameof(Track.End));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        }
 
-        //[TestMethod()]
-        //public void CopyValuesTest()
-        //{
-        //    var sourceTrack = new Track();
-        //    var destinyTrack = new Track();
-        //    Assert.AreNotEqual(sourceTrack, destinyTrack);
-        //    sourceTrack.Cuesheet = new Cuesheet();
-        //    sourceTrack.IsLinkedToPreviousTrack = true;
-        //    sourceTrack.Position = 23;
-        //    sourceTrack.Artist = "Testartist";
-        //    sourceTrack.Title = "Testtitle";
-        //    sourceTrack.Begin = new TimeSpan(0, 2, 10);
-        //    sourceTrack.End = new TimeSpan(0, 5, 32);
-        //    sourceTrack.PreGap = new TimeSpan(0, 0, 10);
-        //    sourceTrack.PostGap = new TimeSpan(0, 0, 12);
-        //    Assert.IsNull(destinyTrack.Cuesheet);
-        //    destinyTrack.CopyValues(sourceTrack);
-        //    Assert.AreEqual(sourceTrack.IsLinkedToPreviousTrack, destinyTrack.IsLinkedToPreviousTrack);
-        //    Assert.AreEqual(sourceTrack.Cuesheet, destinyTrack.Cuesheet);
-        //    Assert.AreEqual(sourceTrack.Position, destinyTrack.Position);
-        //    Assert.AreEqual(sourceTrack.Artist, destinyTrack.Artist);
-        //    Assert.AreEqual(sourceTrack.Title, destinyTrack.Title);
-        //    Assert.AreEqual(sourceTrack.Begin, destinyTrack.Begin);
-        //    Assert.AreEqual(sourceTrack.End, destinyTrack.End);
-        //    Assert.AreEqual(sourceTrack.PreGap, destinyTrack.PreGap);
-        //    Assert.AreEqual(sourceTrack.PostGap, destinyTrack.PostGap);
-        //    var destinationTracks = new List<Track>() { new(), new(), new() };
-        //    destinationTracks.ForEach(x => x.CopyValues(sourceTrack, useInternalSetters: Track.AllPropertyNames));
-        //    Assert.IsTrue(destinationTracks.All(x => x.IsLinkedToPreviousTrack == sourceTrack.IsLinkedToPreviousTrack));
-        //    Assert.IsTrue(destinationTracks.All(x => x.Cuesheet == sourceTrack.Cuesheet));
-        //    Assert.IsTrue(destinationTracks.All(x => x.Position == sourceTrack.Position));
-        //    Assert.IsTrue(destinationTracks.All(x => x.Artist == sourceTrack.Artist));
-        //    Assert.IsTrue(destinationTracks.All(x => x.Title == sourceTrack.Title));
-        //    Assert.IsTrue(destinationTracks.All(x => x.Begin == sourceTrack.Begin));
-        //    Assert.IsTrue(destinationTracks.All(x => x.End == sourceTrack.End));
-        //    Assert.IsTrue(destinationTracks.All(x => x.PreGap == sourceTrack.PreGap));
-        //    Assert.IsTrue(destinationTracks.All(x => x.PostGap == sourceTrack.PostGap));
-        //}
-
-        //[TestMethod()]
-        //public void CloneTest()
-        //{
-        //    var track = new Track()
-        //    {
-        //        Begin = TimeSpan.Zero,
-        //        Artist = "Testartist",
-        //        Title = "Testttitle"
-        //    };
-        //    var cuesheet = new Cuesheet();
-        //    cuesheet.AddTrack(track);
-        //    var validationResult = track.Validate();
-        //    Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Parameter != null && x.Parameter.Contains(nameof(Track.End))));
-        //    var clone = track.Clone();
-        //    clone.End = new TimeSpan(0, 2, 32);
-        //    validationResult = clone.Validate();
-        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        //    Assert.IsNull(track.End);
-        //}
-
-        //[TestMethod()]
-        //public void SetCuesheetTest()
-        //{
-        //    var track = new Track();
-        //    Assert.IsNull(track.Cuesheet);
-        //    var cuesheet = new Cuesheet();
-        //    cuesheet.AddTrack(track);
-        //    Assert.AreEqual(cuesheet, track.Cuesheet);
-        //    track.Cuesheet = new Cuesheet();
-        //    Assert.AreEqual(cuesheet, track.Cuesheet);
-        //    track.Cuesheet = null;
-        //    Assert.IsNull(track.Cuesheet);
-        //}
-
-        //[TestMethod()]
-        //public void Validate_InvalidEnd_ReturnsValidationStatusError()
-        //{
-        //    // Arrange
-        //    var track = new Track
-        //    {
-        //        Begin = new TimeSpan(0, 2, 32),
-        //        End = new TimeSpan(0, 1, 15)
-        //    };
-        //    // Act
-        //    var endValidationResult = track.Validate(nameof(Track.End));
-        //    // Assert
-        //    Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
-        //}
-
-        //[TestMethod()]
-        //public void Validate_InvalidBegin_ReturnsValidationStatusError()
-        //{
-        //    // Arrange
-        //    var track = new Track
-        //    {
-        //        Begin = new TimeSpan(0, 4, 53),
-        //        End = new TimeSpan(0, 3, 15)
-        //    };
-        //    // Act
-        //    var endValidationResult = track.Validate(nameof(Track.Begin));
-        //    // Assert
-        //    Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
-        //}
+        [TestMethod()]
+        public void Validate_InvalidBegin_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track = new Track
+            {
+                Begin = new TimeSpan(0, 4, 53),
+                End = new TimeSpan(0, 3, 15)
+            };
+            // Act
+            var endValidationResult = track.Validate(nameof(Track.Begin));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        }
     }
 }
\ No newline at end of file

From 6b85dac114967224a6d6e7935fb454fecb30d467 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 11:30:45 +0200
Subject: [PATCH 070/150] Update CuesheetTests.cs

---
 .../Model/AudioCuesheet/CuesheetTests.cs      | 824 +++---------------
 1 file changed, 123 insertions(+), 701 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs
index 9de1d965..6487ec33 100644
--- a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs
+++ b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs
@@ -15,725 +15,147 @@
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.Entity;
-using AudioCuesheetEditor.Model.IO.Audio;
-using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 
 namespace AudioCuesheetEditor.Tests.Model.AudioCuesheet
 {
     [TestClass()]
     public class CuesheetTests
     {
-        //TODO: Move to other tests or delete, since usually the model doesn't get tested
-
-        [TestMethod()]
-        public void CuesheetTest()
+        [TestMethod]
+        public void Validate_AudiofileNull_ReturnsValidationStatusError()
         {
+            // Arrange
             var cuesheet = new Cuesheet();
-            Assert.IsNull(cuesheet.Audiofile);
-            var validationErrorAudioFile = cuesheet.Validate(nameof(Cuesheet.Audiofile));
-            Assert.AreEqual(ValidationStatus.Error, validationErrorAudioFile.Status);
-            cuesheet.Audiofile = new Audiofile("AudioFile01.ogg");
-            validationErrorAudioFile = cuesheet.Validate(nameof(Cuesheet.Audiofile));
-            Assert.AreEqual(ValidationStatus.Success, validationErrorAudioFile.Status);
+            // Act
+            var validationResult = cuesheet.Validate(nameof(Cuesheet.Audiofile));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
         }
 
-        //[TestMethod()]
-        //public void EmptyCuesheetTracksValidationTest()
-        //{
-        //    var cuesheet = new Cuesheet();
-        //    Assert.IsEmpty(cuesheet.Tracks);
-        //    var validationErrorTracks = cuesheet.Validate(nameof(Cuesheet.Tracks));
-        //    Assert.AreEqual(ValidationStatus.Error, validationErrorTracks.Status);
-        //    cuesheet.AddTrack(new Track());
-        //    validationErrorTracks = cuesheet.Validate(nameof(Cuesheet.Tracks));
-        //    Assert.AreEqual(ValidationStatus.Success, validationErrorTracks.Status);
-        //}
-
-        //[TestMethod()]
-        //public void RecordTest()
-        //{
-        //    var cuesheet = new Cuesheet();
-        //    Assert.IsFalse(cuesheet.IsRecording);
-        //    Assert.IsNull(cuesheet.RecordingStart);
-        //    cuesheet.StartRecording();
-        //    Assert.IsTrue(cuesheet.IsRecording);
-        //    Assert.IsNotNull(cuesheet.RecordingStart);
-        //    var track = new Track();
-        //    Assert.IsNull(track.Begin);
-        //    Assert.IsNull(track.End);
-        //    cuesheet.AddTrack(track);
-        //    Assert.AreEqual(TimeSpan.Zero, track.Begin);
-        //    Assert.IsNull(track.End);
-        //    var track2 = new Track();
-        //    cuesheet.AddTrack(track2);
-        //    Assert.IsNotNull(track.End);
-        //    Assert.AreNotEqual(TimeSpan.Zero, track.End);
-        //    cuesheet = new Cuesheet();
-        //    cuesheet.StartRecording();
-        //    track = new Track();
-        //    cuesheet.AddTrack(track);
-        //    Assert.AreEqual(TimeSpan.Zero, track.Begin);
-        //    Assert.IsNull(track.End);
-        //    Thread.Sleep(3000);
-        //    track2 = new Track();
-        //    cuesheet.AddTrack(track2);
-        //    Assert.IsNotNull(track.End);
-        //    Assert.AreNotEqual(TimeSpan.Zero, track.End);
-        //    cuesheet.StopRecording();
-        //    Assert.IsNotNull(track.End);
-        //    Assert.AreEqual(track.End, track2.Begin);
-        //}
-
-        //[TestMethod()]
-        //public void TrackRecalculationTest()
-        //{
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track();
-        //    var track2 = new Track();
-        //    var track3 = new Track();
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-        //    Assert.AreEqual((uint)1, track1.Position);
-        //    Assert.AreEqual((uint)2, track2.Position);
-        //    Assert.AreEqual((uint)3, track3.Position);
-        //    Assert.AreEqual(track1.Begin, TimeSpan.Zero);
-        //    Assert.IsNull(track1.End);
-        //    Assert.IsNull(track2.Begin);
-        //    Assert.IsNull(track2.End);
-        //    Assert.IsNull(track3.Begin);
-        //    Assert.IsNull(track3.End);
-        //    track1.Begin = TimeSpan.Zero;
-        //    track2.Begin = new TimeSpan(0, 2, 43);
-        //    Assert.IsNull(track1.End);
-        //    Assert.IsNull(track2.End);
-        //    track3.End = new TimeSpan(0, 12, 14);
-        //    Assert.IsNull(track2.End);
-        //    Assert.IsNull(track3.Begin);
-        //    track3.Begin = new TimeSpan(0, 7, 56);
-        //    Assert.IsNull(track2.End);
-        //}
-        //[TestMethod()]
-        //public void TrackOverlappingTest()
-        //{
-        //    var testHelper = new TestHelper();
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track();
-        //    var track2 = new Track();
-        //    var track3 = new Track();
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-        //    Assert.AreEqual((uint)1, track1.Position);
-        //    Assert.AreEqual((uint)2, track2.Position);
-        //    Assert.AreEqual((uint)3, track3.Position);
-        //    var validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        //    track1.Position = 1;
-        //    track2.Position = 1;
-        //    track3.Position = 1;
-        //    track1.End = new TimeSpan(0, 2, 30);
-        //    track2.Begin = new TimeSpan(0, 2, 0);
-        //    track2.End = new TimeSpan(0, 5, 30);
-        //    track3.Begin = new TimeSpan(0, 4, 54);
-        //    track3.End = new TimeSpan(0, 8, 12);
-        //    validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-        //    Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-        //    Assert.AreEqual(7, validationResult.ValidationMessages?.Count);
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track1.Position) && x.Parameter[7].Equals(track1.Begin) && x.Parameter[8].Equals(track1.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track2.Position) && x.Parameter[7].Equals(track2.Begin) && x.Parameter[8].Equals(track2.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!" && x.Parameter != null && x.Parameter[2].Equals(track3.Position) && x.Parameter[7].Equals(track3.Begin) && x.Parameter[8].Equals(track3.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track1.Position) && x.Parameter[4].Equals(track1.Begin) && x.Parameter[5].Equals(track1.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track1.Position) && x.Parameter[9].Equals(track1.Begin) && x.Parameter[10].Equals(track1.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-        //    track2.End = new TimeSpan(0, 5, 15);
-        //    validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-        //    Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-        //    track1.Position = 1;
-        //    track2.Position = 2;
-        //    track3.Position = 3;
-        //    validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-        //    Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-        //    Assert.AreEqual(4, validationResult.ValidationMessages?.Count);
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track1.Position) && x.Parameter[4].Equals(track1.Begin) && x.Parameter[5].Equals(track1.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track1.Position) && x.Parameter[9].Equals(track1.Begin) && x.Parameter[10].Equals(track1.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track2.Position) && x.Parameter[4].Equals(track2.Begin) && x.Parameter[5].Equals(track2.End) && x.Parameter[6].Equals(track3.Position) && x.Parameter[9].Equals(track3.Begin) && x.Parameter[10].Equals(track3.End)));
-        //    Assert.IsTrue(validationResult.ValidationMessages?.Any(x => x.Message == "{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!" && x.Parameter != null && x.Parameter[1].Equals(track3.Position) && x.Parameter[4].Equals(track3.Begin) && x.Parameter[5].Equals(track3.End) && x.Parameter[6].Equals(track2.Position) && x.Parameter[9].Equals(track2.Begin) && x.Parameter[10].Equals(track2.End)));
-        //    track2.Begin = new TimeSpan(0, 2, 30);
-        //    track3.Begin = new TimeSpan(0, 5, 15);
-        //    validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
-        //    Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-        //}
-
-        //[TestMethod()]
-        //public void RemoveTrack_ShouldReCalculate_WithPreviouslyAddedTracks()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track() { Artist = "1", Title = "1", IsLinkedToPreviousTrack = true };
-        //    var track2 = new Track() { Artist = "2", Title = "2", IsLinkedToPreviousTrack = true };
-        //    var track3 = new Track() { Artist = "3", Title = "3" , IsLinkedToPreviousTrack = true };
-        //    var track4 = new Track() { Artist = "4", Title = "4" , IsLinkedToPreviousTrack = true };
-        //    var track5 = new Track() { Artist = "5", Title = "5" , IsLinkedToPreviousTrack = true };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-        //    cuesheet.AddTrack(track4);
-        //    cuesheet.AddTrack(track5);
-        //    track1.End = new TimeSpan(0, 5, 0);
-        //    track2.End = new TimeSpan(0, 10, 0);
-        //    track3.End = new TimeSpan(0, 15, 0);
-        //    track4.End = new TimeSpan(0, 20, 0);
-        //    track5.End = new TimeSpan(0, 25, 0);
-        //    // Act
-        //    cuesheet.RemoveTrack(track2);
-        //    // Assert
-        //    Assert.AreEqual((uint)2, track3.Position);
-        //    Assert.AreEqual((uint)3, track4.Position);
-        //    Assert.AreEqual((uint)4, track5.Position);
-        //}
-
-        //[TestMethod()]
-        //public void RemoveTracks_ShouldRemoveTracks_WithPreviouslyAddedTracks()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track
-        //    {
-        //        Artist = "Track 1",
-        //        Title = "Track 1",
-        //        IsLinkedToPreviousTrack = true
-        //    };
-        //    cuesheet.AddTrack(track1);
-        //    var track2 = new Track
-        //    {
-        //        Title = "Track 2",
-        //        Artist = "Track 2",
-        //        Begin = new TimeSpan(0, 5, 0),
-        //        IsLinkedToPreviousTrack = true
-        //    };
-        //    cuesheet.AddTrack(track2);
-        //    var track3 = new Track
-        //    {
-        //        Artist = "Track 3",
-        //        Title = "Track 3",
-        //        Begin = new TimeSpan(0, 10, 0),
-        //        IsLinkedToPreviousTrack = true
-        //    };
-        //    cuesheet.AddTrack(track3);
-        //    var track4 = new Track
-        //    {
-        //        Artist = "Track 4",
-        //        Title = "Track 4",
-        //        Begin = new TimeSpan(0, 15, 0),
-        //        IsLinkedToPreviousTrack = true
-        //    };
-        //    cuesheet.AddTrack(track4);
-        //    var track5 = new Track
-        //    {
-        //        Artist = "Track 5",
-        //        Title = "Track 5",
-        //        Begin = new TimeSpan(0, 20, 0), IsLinkedToPreviousTrack = true
-        //    };
-        //    cuesheet.AddTrack(track5);
-        //    var list = new List<Track>() { track2, track4 };
-        //    // Act
-        //    cuesheet.RemoveTracks(list.AsReadOnly());
-        //    // Assert
-        //    Assert.HasCount(3, cuesheet.Tracks);
-        //    Assert.AreEqual(new TimeSpan(0, 5, 0), track3.Begin);
-        //    Assert.AreEqual(new TimeSpan(0, 15, 0), track5.Begin);
-        //    Assert.AreEqual((uint)1, track1.Position);
-        //    Assert.AreEqual((uint)2, track3.Position);
-        //    Assert.AreEqual((uint)3, track5.Position);
-        //}
-
-        //[TestMethod()]
-        //public void UnlickedTrackTest()
-        //{
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track
-        //    {
-        //        Position = 1,
-        //        End = new TimeSpan(0, 3, 23)
-        //    };
-        //    var track2 = new Track
-        //    {
-        //        Position = 2
-        //    };
-        //    var track3 = new Track
-        //    {
-        //        Position = 3
-        //    };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-        //    Assert.AreEqual(track1.End, track2.Begin);
-        //    Assert.IsNull(track2.End);
-        //    Assert.IsNull(track3.Begin);
-        //    track3.Begin = new TimeSpan(0, 7, 32);
-        //    Assert.IsNull(track2.End);
-        //}
-
-        //[TestMethod()]
-        //public void TrackPositionChangedTest()
-        //{
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track
-        //    {
-        //        Position = 3,
-        //        End = new TimeSpan(0, 5, 0)
-        //    };
-        //    var track2 = new Track
-        //    {
-        //        Position = 2,
-        //        Begin = track1.End,
-        //        End = new TimeSpan(0, 7, 30)
-        //    };
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track1);
-        //    Assert.AreEqual(track2, cuesheet.Tracks.First());
-        //    Assert.AreEqual(track1, cuesheet.Tracks.Last());
-        //    track1.Position = 1;
-        //    Assert.AreEqual(track2, cuesheet.Tracks.First());
-        //    Assert.AreEqual(track1, cuesheet.Tracks.Last());
-        //}
-
-        //[TestMethod()]
-        //public void TrackLengthChangedWithIsLinkedToPreivousTest()
-        //{
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track();
-        //    var track2 = new Track();
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    track1.IsLinkedToPreviousTrack = true;
-        //    track2.IsLinkedToPreviousTrack = true;
-        //    Assert.IsNull(track2.Begin);
-        //    Assert.IsNotNull(track1.Begin);
-        //    var editedTrack = new Track() { Begin = TimeSpan.Zero, Length = new TimeSpan(0, 2, 23) };
-        //    track1.CopyValues(editedTrack);
-        //    Assert.IsNotNull(track1.End);
-        //    Assert.AreEqual(track1.End, track2.Begin);
-        //    Assert.AreEqual(editedTrack.End, track2.Begin);
-        //}
-
-        //[TestMethod()]
-        //public void ValidateTest()
-        //{
-        //    var cuesheet = new Cuesheet();
-        //    Assert.AreEqual(ValidationStatus.Error, cuesheet.Validate(nameof(Cuesheet.Artist)).Status);
-        //    cuesheet.Artist = "Testartist";
-        //    Assert.AreEqual(ValidationStatus.Success, cuesheet.Validate(nameof(Cuesheet.Artist)).Status);
-        //    Assert.AreEqual(ValidationStatus.Error, cuesheet.Validate(nameof(Cuesheet.Title)).Status);
-        //    cuesheet.Title = "Testtitle";
-        //    Assert.AreEqual(ValidationStatus.Success, cuesheet.Validate(nameof(Cuesheet.Title)).Status);
-        //}
-
-        //[TestMethod()]
-        //public void IsLinkedToPreviousTrack_ChangedLastTrackBegin_SetsTrackProperties()
-        //{
-        //    //Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track()
-        //    {
-        //        Artist = "Track1 Artist",
-        //        Title = "Track1 Title"
-        //    };
-        //    var track2 = new Track()
-        //    {
-        //        Artist = "Track2 Artist",
-        //        Title = "Track2 Title",
-        //        End = new TimeSpan(0, 9, 12)
-        //    };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    track2.Begin = new TimeSpan(0, 4, 23);
-        //    //Act
-        //    track2.IsLinkedToPreviousTrack = true;
-        //    //Assert
-        //    Assert.AreEqual((uint)2, track2.Position);
-        //    Assert.AreEqual(track2.Begin, track1.End);
-        //}
-
-        //[TestMethod()]
-        //public void IsRecordingPossible_WhenRecordingIsAlreadyRunning_ReturnsError()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    cuesheet.StartRecording();
-
-        //    // Act
-        //    var errors = cuesheet.IsRecordingPossible.ToList();
-
-        //    // Assert
-        //    Assert.Contains("Record is already running!", errors);
-        //}
-
-        //[TestMethod()]
-        //public void IsRecordingPossible_WhenCuesheetContainsTracks_ReturnsError()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    cuesheet.AddTrack(new Track());
-
-        //    // Act
-        //    var errors = cuesheet.IsRecordingPossible.ToList();
-
-        //    // Assert
-        //    Assert.Contains("Cuesheet already contains tracks!", errors);
-        //}
-
-        //[TestMethod()]
-        //public void IsRecordingPossible_WhenNoErrors_ReturnsEmpty()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-
-        //    // Act
-        //    var errors = cuesheet.IsRecordingPossible.ToList();
-
-        //    // Assert
-        //    Assert.IsEmpty(errors);
-        //}
-
-        //[TestMethod]
-        //public void MoveTracksPossible_ShouldReturnFalse_WhenNoTracksToMove()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var tracksToMove = new List<Track>();
-
-        //    // Act
-        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
-
-        //    // Assert
-        //    Assert.IsFalse(result);
-        //}
-
-        //[TestMethod]
-        //public void MoveTracksPossible_ShouldReturnFalse_WhenMovingUpAndFirstTrack()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track = new Track();
-        //    cuesheet.AddTrack(track);
-        //    var tracksToMove = new List<Track> { track };
-
-        //    // Act
-        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
-
-        //    // Assert
-        //    Assert.IsFalse(result);
-        //}
-
-        //[TestMethod]
-        //public void MoveTracksPossible_ShouldReturnTrue_WhenMovingUpAndNotFirstTrack()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track();
-        //    var track2 = new Track();
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    var tracksToMove = new List<Track> { track2 };
-
-        //    // Act
-        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Up);
-
-        //    // Assert
-        //    Assert.IsTrue(result);
-        //}
-
-        //[TestMethod]
-        //public void MoveTracksPossible_ShouldReturnFalse_WhenMovingDownAndLastTrack()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track();
-        //    var track2 = new Track();
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    var tracksToMove = new List<Track> { track2 };
-
-        //    // Act
-        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Down);
-
-        //    // Assert
-        //    Assert.IsFalse(result);
-        //}
-
-
-        //[TestMethod]
-        //public void MoveTracksPossible_ShouldReturnTrue_WhenMovingDownAndNotLastTrack()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track();
-        //    var track2 = new Track();
-        //    var track3 = new Track();
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-        //    var tracksToMove = new List<Track> { track2 };
-
-        //    // Act
-        //    var result = cuesheet.MoveTracksPossible(tracksToMove, MoveDirection.Down);
-
-        //    // Assert
-        //    Assert.IsTrue(result);
-        //}
-
-
-        //[TestMethod]
-        //public void MoveTracks_Up_Success()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track { Position = 1 };
-        //    var track2 = new Track { Position = 2 };
-        //    var track3 = new Track { Position = 3 };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-
-        //    // Act
-        //    cuesheet.MoveTracks([track2], MoveDirection.Up);
-
-        //    // Assert
-        //    Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(0).Position);
-        //    Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(1).Position);
-        //    Assert.AreEqual((uint)3, cuesheet.Tracks.ElementAt(2).Position);
-        //    Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(0));
-        //    Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(1));
-        //    Assert.AreEqual(track3, cuesheet.Tracks.ElementAt(2));
-        //}
-
-        //[TestMethod]
-        //public void MoveTracks_Down_Success()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track { Position = 1 };
-        //    var track2 = new Track { Position = 2 };
-        //    var track3 = new Track { Position = 3 };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-        //    cuesheet.AddTrack(track3);
-
-        //    // Act
-        //    cuesheet.MoveTracks([track2], MoveDirection.Down);
-
-        //    // Assert
-        //    Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
-        //    Assert.AreEqual((uint)3, cuesheet.Tracks.ElementAt(1).Position);
-        //    Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(2).Position);
-        //    Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
-        //    Assert.AreEqual(track3, cuesheet.Tracks.ElementAt(1));
-        //    Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(2));
-        //}
-
-        //[TestMethod]
-        //public void MoveTracks_Up_NotPossible()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track { Position = 1 };
-        //    var track2 = new Track { Position = 2 };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-
-        //    // Act
-        //    cuesheet.MoveTracks([track1], MoveDirection.Up);
-
-        //    // Assert
-        //    Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
-        //    Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(1).Position);
-        //    Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
-        //    Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(1));
-        //}
-
-        //[TestMethod]
-        //public void MoveTracks_Down_NotPossible()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track { Position = 1 };
-        //    var track2 = new Track { Position = 2 };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-
-        //    // Act
-        //    cuesheet.MoveTracks([track2], MoveDirection.Down);
-
-        //    // Assert
-        //    Assert.AreEqual((uint)1, cuesheet.Tracks.ElementAt(0).Position);
-        //    Assert.AreEqual((uint)2, cuesheet.Tracks.ElementAt(1).Position);
-        //    Assert.AreEqual(track1, cuesheet.Tracks.ElementAt(0));
-        //    Assert.AreEqual(track2, cuesheet.Tracks.ElementAt(1));
-        //}
-
-        //[TestMethod]
-        //public void StartRecording_WithValidData_ShouldStartRecording()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-
-        //    // Act
-        //    cuesheet.StartRecording();
-
-        //    // Assert
-        //    Assert.IsTrue(cuesheet.IsRecording);
-        //    Assert.IsNotNull(cuesheet.RecordingStart);
-        //}
-
-        //[TestMethod]
-        //public void StopRecording_WithRecordingRunning_ShouldStopRecording()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    cuesheet.StartRecording();
-        //    var track = new Track();
-        //    cuesheet.AddTrack(track);
-        //    bool isRecordingChangedEventFired = false;
-        //    cuesheet.IsRecordingChanged += (sender, args) => isRecordingChangedEventFired = true;
-
-        //    // Act
-        //    cuesheet.StopRecording();
-
-        //    // Assert
-        //    Assert.IsFalse(cuesheet.IsRecording);
-        //    Assert.IsNull(cuesheet.RecordingStart);
-        //    Assert.IsTrue(isRecordingChangedEventFired);
-        //    Assert.IsNotNull(track.End);
-        //}
-
-        //[TestMethod]
-        //public void StartRecording_ShouldNotStartIfAlreadyRecording()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    cuesheet.StartRecording();
-
-        //    // Act
-        //    cuesheet.StartRecording();
-
-        //    // Assert
-        //    Assert.IsTrue(cuesheet.IsRecording);
-        //    Assert.IsNotNull(cuesheet.RecordingStart);
-        //}
-
-        //[TestMethod]
-        //public void StartRecording_WithTrackAlreadyAdded_ShouldNotStartRecording()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    cuesheet.AddTrack(new Track());
-
-        //    // Act
-        //    cuesheet.StartRecording();
-
-        //    // Assert
-        //    Assert.IsFalse(cuesheet.IsRecording);
-        //}
-
-        //[TestMethod]
-        //public void StartRecording_WithAudiofile_ShouldStartRecording()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet
-        //    {
-        //        Audiofile = new Audiofile("test")
-        //    };
-
-        //    // Act
-        //    cuesheet.StartRecording();
-
-        //    // Assert
-        //    Assert.IsTrue(cuesheet.IsRecording);
-        //}
-
-        //[TestMethod]
-        //public void RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet
-        //    {
-        //        Audiofile = new("Test.mp3", nameof(RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration), new AudioCodec("audio/mpeg", ".mp3", "AudioCodec MP3"), TimeSpan.FromMinutes(5))
-        //    };
-        //    var track = new Track { Position = 1, Begin = TimeSpan.Zero };
-        //    cuesheet.AddTrack(track);
-
-        //    // Act
-        //    cuesheet.RecalculateLastTrackEnd();
-
-        //    // Assert
-        //    Assert.AreEqual(TimeSpan.FromMinutes(5), track.End);
-        //}
-
-        //[TestMethod]
-        //public void RecalculateLastTrackEnd_MultipleTracks_EndSetCorrectly()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
-        //    var track2 = new Track { Position = 2, Begin = TimeSpan.FromMinutes(2) };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
-
-        //    // Act
-        //    cuesheet.RecalculateLastTrackEnd();
-
-        //    // Assert
-        //    Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
-        //    Assert.IsNull(track2.End);
-        //}
+        [TestMethod]
+        public void Validate_ArtistNull_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet();
+            // Act
+            var validationResult = cuesheet.Validate(nameof(Cuesheet.Artist));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+        }
 
-        //[TestMethod]
-        //public void RecalculateLastTrackEnd_MultipleTracksWithAudiofile_LastTrackEndSetToAudiofileDuration()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet
-        //    {
-        //        Audiofile = new("Test.mp3", nameof(RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration), new AudioCodec("audio/mpeg", ".mp3", "AudioCodec MP3"), TimeSpan.FromMinutes(5))
-        //    };
-        //    var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
-        //    var track2 = new Track { Position = 2, Begin = TimeSpan.FromMinutes(2) };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
+        [TestMethod]
+        public void Validate_TitleNull_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet();
+            // Act
+            var validationResult = cuesheet.Validate(nameof(Cuesheet.Title));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+        }
 
-        //    // Act
-        //    cuesheet.RecalculateLastTrackEnd();
+        [TestMethod]
+        public void Validate_CataloguenumberWithLetters_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Cataloguenumber = nameof(Validate_CataloguenumberWithLetters_ReturnsValidationStatusError)
+            };
+            // Act
+            var validationResult = cuesheet.Validate(nameof(Cuesheet.Cataloguenumber));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+            Assert.AreEqual("{0} must only contain numbers!", validationResult.ValidationMessages.First().Message);
+            Assert.AreEqual(nameof(Cuesheet.Cataloguenumber), validationResult.ValidationMessages.First().Parameter?.First().ToString());
+        }
 
-        //    // Assert
-        //    Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
-        //    Assert.AreEqual(TimeSpan.FromMinutes(5), track2.End);
-        //}
+        [TestMethod]
+        public void Validate_CataloguenumberLengthUnequal13_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet()
+            {
+                Cataloguenumber = "012345678"
+            };
+            // Act
+            var validationResult = cuesheet.Validate(nameof(Cuesheet.Cataloguenumber));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+            Assert.AreEqual("{0} has an invalid length. Allowed length is {1}!", validationResult.ValidationMessages.First().Message);
+            Assert.AreEqual(nameof(Cuesheet.Cataloguenumber), validationResult.ValidationMessages.First().Parameter?.First().ToString());
+            Assert.AreEqual(13, validationResult.ValidationMessages.First().Parameter?.Last());
+        }
 
-        //[TestMethod]
-        //public void RecalculateLastTrackEnd_TracksWithLinkedPreviousTrack_PropertiesRecalculatedCorrectly()
-        //{
-        //    // Arrange
-        //    var cuesheet = new Cuesheet();
-        //    var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
-        //    var track2 = new Track { Position = 2, IsLinkedToPreviousTrack = true };
-        //    cuesheet.AddTrack(track1);
-        //    cuesheet.AddTrack(track2);
+        [TestMethod]
+        public void Validate_TracksEmpty_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet();
+            // Act
+            var validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+            Assert.AreEqual("{0} has invalid Count ({1})!", validationResult.ValidationMessages.First().Message);
+            Assert.AreEqual(nameof(Cuesheet.Tracks), validationResult.ValidationMessages.First().Parameter?.First().ToString());
+            Assert.AreEqual(0, validationResult.ValidationMessages.First().Parameter?.Last());
+        }
 
-        //    // Act
-        //    cuesheet.RecalculateLastTrackEnd();
+        [TestMethod]
+        public void Validate_TracksWithSamePosition_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                Position = 1
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+            Assert.AreEqual("{0} {1} '{2}' is used also by {3}({4},{5},{6},{7},{8}). Positions must be unique!", validationResult.ValidationMessages.First().Message);
+        }
 
-        //    // Assert
-        //    Assert.AreEqual(TimeSpan.FromMinutes(2), track1.End);
-        //    Assert.AreEqual(TimeSpan.FromMinutes(2), track2.Begin);
-        //}
+        [TestMethod]
+        public void Validate_TracksOverlapping_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 45)
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = new TimeSpan(0, 3, 42),
+                End = new TimeSpan(0, 6, 32)
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var validationResult = cuesheet.Validate(nameof(Cuesheet.Tracks));
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
+            Assert.AreEqual("{0}({1},{2},{3},{4},{5}) is overlapping with {0}({6},{7},{8},{9},{10}). Please make shure the timeinterval is only used once!", validationResult.ValidationMessages.First().Message);
+        }
     }
 }
\ No newline at end of file

From 7b7d732f185a138b03bbfc7cf6e6b989d9d21898 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 11:34:48 +0200
Subject: [PATCH 071/150] Update ExportfileGeneratorTests.cs

---
 .../Services/IO/ExportfileGeneratorTests.cs   | 241 +++++++++---------
 1 file changed, 125 insertions(+), 116 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs b/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
index 06e89a65..7c4066ea 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
@@ -38,129 +38,138 @@ public ExportfileGeneratorTests()
             var mockLocalizer = new Mock<IStringLocalizer<ValidationMessage>>();
             _exportfileGenerator = new ExportfileGenerator(_mockSessionStateContainer.Object, mockLocalizer.Object);
         }
-        //TODO
-//        [TestMethod]
-//        public void GenerateExportFile_ShouldGenerateExportfile_WithoutSections()
-//        {
-//            // Arrange
-//            var exportProfile = new Exportprofile
-//            {
-//                Name = "TestProfile",
-//                SchemeHead = "%Cuesheet.Artist% - %Cuesheet.Title%",
-//                SchemeTracks = "%Track.Position% %Track.Artist% - %Track.Title%",
-//                Filename = "TestExport.txt"
-//            };
-//            var cuesheet = new Cuesheet()
-//            {
-//                Artist = "Test artist cuesheet",
-//                Title = "Test title cuesheet",
-//                Audiofile = new Audiofile("Test audiofile.mp3")
-//            };
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Artist = "Test artist 1",
-//                Title = "Test title 1",
-//                Begin = TimeSpan.Zero,
-//                End = new TimeSpan(0, 4, 12),
-//                Position = 1
-//            });
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Artist = "Test artist 2",
-//                Title = "Test title 2",
-//                End = new TimeSpan(0, 8, 32),
-//                Position = 2
-//            });
-//            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+        
+        [TestMethod]
+        public void GenerateExportFile_ShouldGenerateExportfile_WithoutSections()
+        {
+            // Arrange
+            var exportProfile = new Exportprofile
+            {
+                Name = "TestProfile",
+                SchemeHead = "%Cuesheet.Artist% - %Cuesheet.Title%",
+                SchemeTracks = "%Track.Position% %Track.Artist% - %Track.Title%",
+                Filename = "TestExport.txt"
+            };
+            var track1 = new Track()
+            {
+                Artist = "Test artist 1",
+                Title = "Test title 1",
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 4, 12),
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                Artist = "Test artist 2",
+                Title = "Test title 2",
+                End = new TimeSpan(0, 8, 32),
+                Position = 2
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Artist = "Test artist cuesheet",
+                Title = "Test title cuesheet",
+                Audiofile = new Audiofile("Test audiofile.mp3"),
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
 
-//            // Act
-//            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
-//            // Assert
-//            Assert.IsTrue(result.IsSuccess);
-//            Assert.AreEqual(exportProfile.Filename, result.Value!.Name);
-//            var content = result.Value!.Content;
-//            Assert.IsNotNull(content);
-//            Assert.AreEqual(@"Test artist cuesheet - Test title cuesheet
-//1 Test artist 1 - Test title 1
-//2 Test artist 2 - Test title 2
+            // Act
+            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+            Assert.AreEqual(exportProfile.Filename, result.Value!.Name);
+            var content = result.Value!.Content;
+            Assert.IsNotNull(content);
+            Assert.AreEqual(@"Test artist cuesheet - Test title cuesheet
+1 Test artist 1 - Test title 1
+2 Test artist 2 - Test title 2
 
-//", content);
-//        }
+", content);
+        }
 
-//        [TestMethod]
-//        public void GenerateExportFile_ShouldHandleEmptyProfile()
-//        {
-//            // Arrange
-//            var exportProfile = new Exportprofile();
-//            var cuesheet = new Cuesheet()
-//            {
-//                Artist = "Test artist cuesheet",
-//                Title = "Test title cuesheet",
-//                Audiofile = new Audiofile("Test audiofile.mp3")
-//            };
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Artist = "Test artist 1",
-//                Title = "Test title 1",
-//                Begin = TimeSpan.Zero,
-//                End = new TimeSpan(0, 4, 12),
-//                Position = 1
-//            });
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Artist = "Test artist 2",
-//                Title = "Test title 2",
-//                End = new TimeSpan(0, 8, 32),
-//                Position = 2
-//            });
-//            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+        [TestMethod]
+        public void GenerateExportFile_ShouldHandleEmptyProfile()
+        {
+            // Arrange
+            var exportProfile = new Exportprofile();
+            var track1 = new Track()
+            {
+                Artist = "Test artist 1",
+                Title = "Test title 1",
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 4, 12),
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                Artist = "Test artist 2",
+                Title = "Test title 2",
+                End = new TimeSpan(0, 8, 32),
+                Position = 2
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Artist = "Test artist cuesheet",
+                Title = "Test title cuesheet",
+                Audiofile = new Audiofile("Test audiofile.mp3"),
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
 
-//            // Act
-//            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
+            // Act
+            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
 
-//            // Assert
-//            Assert.IsTrue(result.IsSuccess);
-//            Assert.AreEqual(Exportprofile.DefaultFileName, result.Value!.Name);
-//            Assert.IsNotNull(result.Value!.Content);
-//        }
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+            Assert.AreEqual(Exportprofile.DefaultFileName, result.Value!.Name);
+            Assert.IsNotNull(result.Value!.Content);
+        }
 
-//        [TestMethod]
-//        public void GenerateExportFile_ReturnsEmpty_WithInvalidTracks()
-//        {
-//            // Arrange
-//            var exportProfile = new Exportprofile
-//            {
-//                Name = "TestProfile",
-//                SchemeHead = "%Cuesheet.Artist% - %Cuesheet.Title%",
-//                SchemeTracks = "%Track.Position% %Track.Artist% - %Track.Title%",
-//                Filename = "TestExport.txt"
-//            };
-//            var cuesheet = new Cuesheet()
-//            {
-//                Artist = "Test artist cuesheet",
-//                Title = "Test title cuesheet",
-//                Audiofile = new Audiofile("Test audiofile.mp3")
-//            };
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Artist = "Test artist 1",
-//                Title = "Test title 1",
-//                Begin = TimeSpan.Zero,
-//                Position = 1
-//            });
-//            cuesheet.AddTrack(new Track()
-//            {
-//                Artist = "Test artist 2",
-//                Title = "Test title 2",
-//                Position = 2
-//            });
-//            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+        [TestMethod]
+        public void GenerateExportFile_ReturnsEmpty_WithInvalidTracks()
+        {
+            // Arrange
+            var exportProfile = new Exportprofile
+            {
+                Name = "TestProfile",
+                SchemeHead = "%Cuesheet.Artist% - %Cuesheet.Title%",
+                SchemeTracks = "%Track.Position% %Track.Artist% - %Track.Title%",
+                Filename = "TestExport.txt"
+            };
+            var track1 = new Track()
+            {
+                Artist = "Test artist 1",
+                Title = "Test title 1",
+                Begin = TimeSpan.Zero,
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                Artist = "Test artist 2",
+                Title = "Test title 2",
+                Position = 2
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Artist = "Test artist cuesheet",
+                Title = "Test title cuesheet",
+                Audiofile = new Audiofile("Test audiofile.mp3"),
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            _mockSessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
 
-//            // Act
-//            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
+            // Act
+            var result = _exportfileGenerator.GenerateExportfile(exportProfile);
 
-//            // Assert
-//            Assert.IsFalse(result.IsSuccess);
-//        }
+            // Assert
+            Assert.IsFalse(result.IsSuccess);
+        }
     }
 }
\ No newline at end of file

From 7a5321084612b30eef12dc797ff93e102c959753 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 12:00:02 +0200
Subject: [PATCH 072/150] Update ImportManagerTests.cs

---
 .../Services/IO/ImportManagerTests.cs         | 596 +++++++++---------
 1 file changed, 298 insertions(+), 298 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs b/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
index 2786533a..144a900e 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
@@ -19,19 +19,15 @@
 using AudioCuesheetEditor.Model.IO;
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
-using AudioCuesheetEditor.Model.UI;
+using AudioCuesheetEditor.Services.AudioCuesheet;
 using AudioCuesheetEditor.Services.IO;
 using AudioCuesheetEditor.Services.UI;
-using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace AudioCuesheetEditor.Tests.Services.IO
@@ -44,320 +40,324 @@ public class ImportManagerTests
         private readonly Mock<ITraceChangeManager> _traceChangeManagerMock;
         private readonly Mock<IFileInputManager> _fileInputManagerMock;
         private readonly Mock<ITextImportService> _textImportServiceMock;
-        //TODO
-        //public ImportManagerTests()
-        //{
-        //    _traceChangeManagerMock = new();
-        //    _sessionStateContainerMock = new();
-        //    _fileInputManagerMock = new();
-        //    _textImportServiceMock = new();
-        //    var loggerMock = new Mock<ILogger<ImportManager>>();
-        //    _service = new ImportManager(_sessionStateContainerMock.Object, _traceChangeManagerMock.Object, _fileInputManagerMock.Object, _textImportServiceMock.Object, loggerMock.Object);
-        //}
+        private readonly Mock<ITrackManager> _trackManagerMock;
+        public ImportManagerTests()
+        {
+            _traceChangeManagerMock = new();
+            _sessionStateContainerMock = new();
+            _fileInputManagerMock = new();
+            _textImportServiceMock = new();
+            _trackManagerMock = new();
+            var loggerMock = new Mock<ILogger<ImportManager>>();
+            _service = new ImportManager(_sessionStateContainerMock.Object, _traceChangeManagerMock.Object, _fileInputManagerMock.Object, _textImportServiceMock.Object, _trackManagerMock.Object, loggerMock.Object);
+        }
 
-        //[TestMethod()]
-        //public async Task AnalyseImportfile_WithTextfile_SetsImportCuesheet()
-        //{
-        //    // Arrange
-        //    var fileContent = "This is just a test";
-        //    var importCuesheet = new ImportCuesheet()
-        //    {
-        //        Artist = "Test Cuesheet Artist",
-        //        Title = "Test Cuesheet Title",
-        //        Audiofile = "Test Cuesheet Audiofile",
-        //        Cataloguenumber = "Test Cuesheet Cataloguenumber",
-        //        CDTextfile = "Test Cuesheet CDTextfile"
-        //    };
-        //    importCuesheet.Tracks.Add(new()
-        //    {
-        //        Artist = "Test Track Artist 1",
-        //        Title = "Test Track Title 1",
-        //        Begin = new TimeSpan(0, 3, 20),
-        //        End = new TimeSpan(0, 7, 43),
-        //        Flags = [Flag.DCP],
-        //        Position = 1,
-        //        PreGap = new TimeSpan(0, 0, 2),
-        //        PostGap = new TimeSpan(0, 0, 4)
-        //    });
-        //    var importFile = new Importfile()
-        //    {
-        //        FileContent = fileContent,
-        //        FileType = ImportFileType.Textfile,
-        //        AnalyzedCuesheet = importCuesheet
-        //    };
-        //    _textImportServiceMock.Setup(x => x.AnalyseAsync(fileContent)).ReturnsAsync(importFile);
-        //    _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(importFile);
-        //    Cuesheet? sessionStateContainerImportCuesheet = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.ImportCuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cs => sessionStateContainerImportCuesheet = cs);
-        //    _sessionStateContainerMock.SetupGet(x => x.ImportCuesheet).Returns(() => sessionStateContainerImportCuesheet);
-        //    IImportfile? sessionStateContainerImportfile = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-        //    // Act
-        //    await _service.AnalyseImportfile();
-        //    // Assert
-        //    Assert.AreEqual(importFile, sessionStateContainerImportfile);
-        //    Assert.IsNotNull(sessionStateContainerImportCuesheet);
-        //    Assert.AreEqual(importCuesheet.Artist, sessionStateContainerImportCuesheet.Artist);
-        //    Assert.AreEqual(importCuesheet.Title, sessionStateContainerImportCuesheet.Title);
-        //    Assert.IsNotNull(sessionStateContainerImportCuesheet.Audiofile);
-        //    Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerImportCuesheet.Audiofile.Name);
-        //    Assert.AreEqual(importCuesheet.Cataloguenumber, sessionStateContainerImportCuesheet.Cataloguenumber);
-        //    Assert.IsNotNull(sessionStateContainerImportCuesheet.CDTextfile);
-        //    Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerImportCuesheet.CDTextfile.Name);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerImportCuesheet.Tracks.First().Artist);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerImportCuesheet.Tracks.First().Title);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerImportCuesheet.Tracks.First().Begin);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerImportCuesheet.Tracks.First().End);
-        //    CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerImportCuesheet.Tracks.First().Flags.ToList());
-        //    Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerImportCuesheet.Tracks.First().Position);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerImportCuesheet.Tracks.First().PreGap);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerImportCuesheet.Tracks.First().PostGap);
-        //    _traceChangeManagerMock.Verify(x => x.TraceChanges(It.IsAny<Cuesheet>()));
-        //    _traceChangeManagerMock.Verify(x => x.TraceChanges(It.IsAny<Track>()));
-        //}
+        [TestMethod()]
+        public async Task AnalyseImportfile_WithTextfile_SetsImportCuesheet()
+        {
+            // Arrange
+            var fileContent = "This is just a test";
+            var importCuesheet = new ImportCuesheet()
+            {
+                Artist = "Test Cuesheet Artist",
+                Title = "Test Cuesheet Title",
+                Audiofile = "Test Cuesheet Audiofile",
+                Cataloguenumber = "Test Cuesheet Cataloguenumber",
+                CDTextfile = "Test Cuesheet CDTextfile"
+            };
+            importCuesheet.Tracks.Add(new()
+            {
+                Artist = "Test Track Artist 1",
+                Title = "Test Track Title 1",
+                Begin = new TimeSpan(0, 3, 20),
+                End = new TimeSpan(0, 7, 43),
+                Flags = [Flag.DCP],
+                Position = 1,
+                PreGap = new TimeSpan(0, 0, 2),
+                PostGap = new TimeSpan(0, 0, 4)
+            });
+            var importFile = new Importfile()
+            {
+                FileContent = fileContent,
+                FileType = ImportFileType.Textfile,
+                AnalyzedCuesheet = importCuesheet
+            };
+            _textImportServiceMock.Setup(x => x.AnalyseAsync(fileContent)).ReturnsAsync(importFile);
+            _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(importFile);
+            Cuesheet? sessionStateContainerImportCuesheet = null;
+            _sessionStateContainerMock.SetupSet(x => x.ImportCuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cs => sessionStateContainerImportCuesheet = cs);
+            _sessionStateContainerMock.SetupGet(x => x.ImportCuesheet).Returns(() => sessionStateContainerImportCuesheet);
+            IImportfile? sessionStateContainerImportfile = null;
+            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+            // Act
+            await _service.AnalyseImportfile();
+            // Assert
+            Assert.AreEqual(importFile, sessionStateContainerImportfile);
+            Assert.IsNotNull(sessionStateContainerImportCuesheet);
+            Assert.AreEqual(importCuesheet.Artist, sessionStateContainerImportCuesheet.Artist);
+            Assert.AreEqual(importCuesheet.Title, sessionStateContainerImportCuesheet.Title);
+            Assert.IsNotNull(sessionStateContainerImportCuesheet.Audiofile);
+            Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerImportCuesheet.Audiofile.Name);
+            Assert.AreEqual(importCuesheet.Cataloguenumber, sessionStateContainerImportCuesheet.Cataloguenumber);
+            Assert.IsNotNull(sessionStateContainerImportCuesheet.CDTextfile);
+            Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerImportCuesheet.CDTextfile.Name);
+            Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerImportCuesheet.Tracks.First().Artist);
+            Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerImportCuesheet.Tracks.First().Title);
+            Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerImportCuesheet.Tracks.First().Begin);
+            Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerImportCuesheet.Tracks.First().End);
+            CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerImportCuesheet.Tracks.First().Flags.ToList());
+            Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerImportCuesheet.Tracks.First().Position);
+            Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerImportCuesheet.Tracks.First().PreGap);
+            Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerImportCuesheet.Tracks.First().PostGap);
+        }
 
-        //[TestMethod()]
-        //public async Task AnalyseImportfile_WithoutAnalysedCuesheet_DoesNothing()
-        //{
-        //    // Arrange
-        //    var fileContent = "This is just a test";
-        //    var importFile = new Importfile()
-        //    {
-        //        FileContent = fileContent,
-        //        FileType = ImportFileType.Textfile,
-        //    };
-        //    _textImportServiceMock.Setup(x => x.AnalyseAsync(fileContent)).ReturnsAsync(importFile);
-        //    _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(importFile);
-        //    Cuesheet? sessionStateContainerImportCuesheet = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.ImportCuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cs => sessionStateContainerImportCuesheet = cs);
-        //    IImportfile? sessionStateContainerImportfile = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-        //    // Act
-        //    await _service.AnalyseImportfile();
-        //    // Assert
-        //    Assert.AreEqual(importFile, sessionStateContainerImportfile);
-        //    Assert.IsNull(sessionStateContainerImportCuesheet);
-        //}
+        [TestMethod()]
+        public async Task AnalyseImportfile_WithoutAnalysedCuesheet_DoesNothing()
+        {
+            // Arrange
+            var fileContent = "This is just a test";
+            var importFile = new Importfile()
+            {
+                FileContent = fileContent,
+                FileType = ImportFileType.Textfile,
+            };
+            _textImportServiceMock.Setup(x => x.AnalyseAsync(fileContent)).ReturnsAsync(importFile);
+            _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(importFile);
+            Cuesheet? sessionStateContainerImportCuesheet = null;
+            _sessionStateContainerMock.SetupSet(x => x.ImportCuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cs => sessionStateContainerImportCuesheet = cs);
+            IImportfile? sessionStateContainerImportfile = null;
+            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+            // Act
+            await _service.AnalyseImportfile();
+            // Assert
+            Assert.AreEqual(importFile, sessionStateContainerImportfile);
+            Assert.IsNull(sessionStateContainerImportCuesheet);
+        }
 
-        //[TestMethod()]
-        //public async Task AnalyseImportfile_ExistingCuesheet_OverwritesCuesheet()
-        //{
-        //    // Arrange
-        //    var sessionStateContainerCuesheet = new Cuesheet()
-        //    {
-        //        Artist = "Test Cuesheet Artist",
-        //        Title = "Test Cuesheet Title",
-        //        Cataloguenumber = "Test Cuesheet Cataloguenumber"
-        //    };
-        //    sessionStateContainerCuesheet.AddTrack(new()
-        //    {
-        //        Artist = "Test Track Artist 1",
-        //        Title = "Test Track Title 1",
-        //        Begin = new TimeSpan(0, 3, 20),
-        //        End = new TimeSpan(0, 7, 43),
-        //        Flags = [Flag.DCP],
-        //        Position = 1,
-        //        PreGap = new TimeSpan(0, 0, 2),
-        //        PostGap = new TimeSpan(0, 0, 4)
-        //    });
-        //    var importCuesheet = new ImportCuesheet()
-        //    {
-        //        Artist = "Test ImportCuesheet Artist",
-        //        Title = "Test ImportCuesheet Title",
-        //        Audiofile = "Test ImportCuesheet Audiofile",
-        //        Cataloguenumber = "Test ImportCuesheet Cataloguenumber",
-        //        CDTextfile = "Test ImportCuesheet CDTextfile"
-        //    };
-        //    importCuesheet.Tracks.Add(new()
-        //    {
-        //        Artist = "Test ImportCuesheet Track Artist 1",
-        //        Title = "Test ImportCuesheet Track Title 1",
-        //        Begin = new TimeSpan(0, 0, 10),
-        //        End = new TimeSpan(0, 5, 23),
-        //        Flags = [Flag.SCMS],
-        //        Position = 1,
-        //        PreGap = new TimeSpan(0, 0, 4),
-        //        PostGap = new TimeSpan(0, 0, 6)
-        //    });
-        //    var sessionStateContainerImportFile = new Importfile()
-        //    {
-        //        FileContent = "Some file content!",
-        //        FileType = ImportFileType.Cuesheet,
-        //        AnalyzedCuesheet = importCuesheet
-        //    };
+        [TestMethod()]
+        public async Task AnalyseImportfile_ExistingCuesheet_OverwritesCuesheet()
+        {
+            // Arrange
+            var track = new Track()
+            {
+                Artist = "Test Track Artist 1",
+                Title = "Test Track Title 1",
+                Begin = new TimeSpan(0, 3, 20),
+                End = new TimeSpan(0, 7, 43),
+                Flags = [Flag.DCP],
+                Position = 1,
+                PreGap = new TimeSpan(0, 0, 2),
+                PostGap = new TimeSpan(0, 0, 4)
+            };
+            var sessionStateContainerCuesheet = new Cuesheet()
+            {
+                Artist = "Test Cuesheet Artist",
+                Title = "Test Cuesheet Title",
+                Cataloguenumber = "Test Cuesheet Cataloguenumber",
+                Tracks = [track]
+            };
+            track.Cuesheet = sessionStateContainerCuesheet;
+            var importCuesheet = new ImportCuesheet()
+            {
+                Artist = "Test ImportCuesheet Artist",
+                Title = "Test ImportCuesheet Title",
+                Audiofile = "Test ImportCuesheet Audiofile",
+                Cataloguenumber = "Test ImportCuesheet Cataloguenumber",
+                CDTextfile = "Test ImportCuesheet CDTextfile"
+            };
+            importCuesheet.Tracks.Add(new()
+            {
+                Artist = "Test ImportCuesheet Track Artist 1",
+                Title = "Test ImportCuesheet Track Title 1",
+                Begin = new TimeSpan(0, 0, 10),
+                End = new TimeSpan(0, 5, 23),
+                Flags = [Flag.SCMS],
+                Position = 1,
+                PreGap = new TimeSpan(0, 0, 4),
+                PostGap = new TimeSpan(0, 0, 6)
+            });
+            var sessionStateContainerImportFile = new Importfile()
+            {
+                FileContent = "Some file content!",
+                FileType = ImportFileType.Cuesheet,
+                AnalyzedCuesheet = importCuesheet
+            };
 
-        //    _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
-        //    _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
-        //    _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(() => sessionStateContainerImportFile);
+            _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
+            _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
+            _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(() => sessionStateContainerImportFile);
 
-        //    // Act
-        //    await _service.AnalyseImportfile();
-        //    // Assert
-        //    Assert.AreEqual(importCuesheet.Artist, sessionStateContainerCuesheet.Artist);
-        //    Assert.AreEqual(importCuesheet.Title, sessionStateContainerCuesheet.Title);
-        //    Assert.IsNotNull(sessionStateContainerCuesheet.Audiofile);
-        //    Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerCuesheet.Audiofile.Name);
-        //    Assert.IsNotNull(sessionStateContainerCuesheet.CDTextfile);
-        //    Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerCuesheet.CDTextfile.Name);
-        //    Assert.HasCount(importCuesheet.Tracks.Count, sessionStateContainerCuesheet.Tracks);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
-        //    CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerCuesheet.Tracks.First().Flags.ToList());
-        //    Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerCuesheet.Tracks.First().Position);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerCuesheet.Tracks.First().PostGap);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerCuesheet.Tracks.First().PreGap);
-        //    Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
-        //}
+            // Act
+            await _service.AnalyseImportfile();
+            // Assert
+            Assert.AreEqual(importCuesheet.Artist, sessionStateContainerCuesheet.Artist);
+            Assert.AreEqual(importCuesheet.Title, sessionStateContainerCuesheet.Title);
+            Assert.IsNotNull(sessionStateContainerCuesheet.Audiofile);
+            Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerCuesheet.Audiofile.Name);
+            Assert.IsNotNull(sessionStateContainerCuesheet.CDTextfile);
+            Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerCuesheet.CDTextfile.Name);
+            Assert.HasCount(importCuesheet.Tracks.Count, sessionStateContainerCuesheet.Tracks);
+            Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
+            Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
+            Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
+            CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerCuesheet.Tracks.First().Flags.ToList());
+            Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerCuesheet.Tracks.First().Position);
+            Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerCuesheet.Tracks.First().PostGap);
+            Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerCuesheet.Tracks.First().PreGap);
+            Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
+        }
 
-        //[TestMethod]
-        //public async Task UploadFilesAsync_ProjectFile_ImportsCorrectly()
-        //{
-        //    // Arrange
-        //    var fileContent = "This is the content";
-        //    var file = new FileUpload("test.projectfile", "text/plain", fileContent);
-        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(true);
-        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
-        //    _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
+        [TestMethod]
+        public async Task UploadFilesAsync_ProjectFile_ImportsCorrectly()
+        {
+            // Arrange
+            var fileContent = "This is the content";
+            var file = new FileUpload("test.projectfile", "text/plain", fileContent);
+            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(true);
+            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
+            _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
 
-        //    IImportfile? sessionStateContainerImportfile = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-        //    // Act
-        //    await _service.UploadFilesAsync([file]);
+            IImportfile? sessionStateContainerImportfile = null;
+            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+            // Act
+            await _service.UploadFilesAsync([file]);
 
-        //    // Assert
-        //    Assert.IsNotNull(sessionStateContainerImportfile);
-        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
-        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
-        //    Assert.AreEqual(ImportFileType.ProjectFile, sessionStateContainerImportfile.FileType);
-        //}
+            // Assert
+            Assert.IsNotNull(sessionStateContainerImportfile);
+            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
+            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
+            Assert.AreEqual(ImportFileType.ProjectFile, sessionStateContainerImportfile.FileType);
+        }
 
-        //[TestMethod]
-        //public async Task UploadFilesAsync_CuesheetFile_ImportsCorrectly()
-        //{
-        //    // Arrange
-        //    var fileContent = "Cuesheet file content";
-        //    var file = new FileUpload("test.cue", "text/plain", fileContent);
+        [TestMethod]
+        public async Task UploadFilesAsync_CuesheetFile_ImportsCorrectly()
+        {
+            // Arrange
+            var fileContent = "Cuesheet file content";
+            var file = new FileUpload("test.cue", "text/plain", fileContent);
 
-        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
-        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(true);
-        //    _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
+            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
+            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(true);
+            _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
 
-        //    IImportfile? sessionStateContainerImportfile = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-        //    // Act
-        //    await _service.UploadFilesAsync([file]);
+            IImportfile? sessionStateContainerImportfile = null;
+            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+            // Act
+            await _service.UploadFilesAsync([file]);
 
-        //    // Assert
-        //    Assert.IsNotNull(sessionStateContainerImportfile);
-        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
-        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
-        //    Assert.AreEqual(ImportFileType.Cuesheet, sessionStateContainerImportfile.FileType);
-        //}
+            // Assert
+            Assert.IsNotNull(sessionStateContainerImportfile);
+            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
+            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
+            Assert.AreEqual(ImportFileType.Cuesheet, sessionStateContainerImportfile.FileType);
+        }
 
-        //[TestMethod]
-        //public async Task UploadFilesAsync_TextFile_ImportsCorrectly()
-        //{
-        //    // Arrange
-        //    var fileContent = "TextFileContent";
-        //    var file = new FileUpload("test.txt", "text/plain", fileContent);
+        [TestMethod]
+        public async Task UploadFilesAsync_TextFile_ImportsCorrectly()
+        {
+            // Arrange
+            var fileContent = "TextFileContent";
+            var file = new FileUpload("test.txt", "text/plain", fileContent);
 
-        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
-        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
-        //    _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(true);
+            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
+            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
+            _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(true);
 
-        //    IImportfile? sessionStateContainerImportfile = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-        //    // Act
-        //    await _service.UploadFilesAsync([file]);
+            IImportfile? sessionStateContainerImportfile = null;
+            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+            // Act
+            await _service.UploadFilesAsync([file]);
 
-        //    // Assert
-        //    Assert.IsNotNull(sessionStateContainerImportfile);
-        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
-        //    Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
-        //    Assert.AreEqual(ImportFileType.Textfile, sessionStateContainerImportfile.FileType);
-        //}
+            // Assert
+            Assert.IsNotNull(sessionStateContainerImportfile);
+            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContent);
+            Assert.AreEqual(fileContent, sessionStateContainerImportfile.FileContentRecognized);
+            Assert.AreEqual(ImportFileType.Textfile, sessionStateContainerImportfile.FileType);
+        }
 
-        //[TestMethod]
-        //public async Task UploadFilesAsync_WithAudiofile_ImportsCorrectly()
-        //{
-        //    // Arrange
-        //    var file = new FileUpload("test.mp3", "audio/mpeg");
+        [TestMethod]
+        public async Task UploadFilesAsync_WithAudiofile_ImportsCorrectly()
+        {
+            // Arrange
+            var file = new FileUpload("test.mp3", "audio/mpeg");
 
-        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
-        //    _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
-        //    _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
-        //    _fileInputManagerMock.Setup(f => f.IsValidAudiofile(file.ContentType, file.Name)).Returns(true);
-        //    _fileInputManagerMock.Setup(f => f.CreateAudiofileAsync(It.IsAny<FileUpload>())).ReturnsAsync(new Audiofile(file.Name));
+            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Projectfile, It.IsAny<IEnumerable<string>>())).Returns(false);
+            _fileInputManagerMock.Setup(f => f.CheckFileMimeType(file.ContentType, file.Name, FileMimeTypes.Cuesheet, It.IsAny<IEnumerable<string>>())).Returns(false);
+            _fileInputManagerMock.Setup(f => f.IsValidForImportView(file.ContentType, file.Name)).Returns(false);
+            _fileInputManagerMock.Setup(f => f.IsValidAudiofile(file.ContentType, file.Name)).Returns(true);
+            _fileInputManagerMock.Setup(f => f.CreateAudiofileAsync(It.IsAny<FileUpload>())).ReturnsAsync(new Audiofile(file.Name));
 
-        //    IImportfile? sessionStateContainerImportfile = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-        //    Audiofile? sessionStateContainerImportAudiofile = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.ImportAudiofile = It.IsAny<Audiofile>()).Callback<Audiofile>(x => sessionStateContainerImportAudiofile = x);
-        //    // Act
-        //    await _service.UploadFilesAsync([file]);
+            IImportfile? sessionStateContainerImportfile = null;
+            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+            Audiofile? sessionStateContainerImportAudiofile = null;
+            _sessionStateContainerMock.SetupSet(x => x.ImportAudiofile = It.IsAny<Audiofile>()).Callback<Audiofile>(x => sessionStateContainerImportAudiofile = x);
+            // Act
+            await _service.UploadFilesAsync([file]);
 
-        //    // Assert
-        //    Assert.IsNull(sessionStateContainerImportfile);
-        //    Assert.IsNotNull(sessionStateContainerImportAudiofile);
-        //}
+            // Assert
+            Assert.IsNull(sessionStateContainerImportfile);
+            Assert.IsNotNull(sessionStateContainerImportAudiofile);
+        }
 
-        //[TestMethod]
-        //public void ImportCuesheet_WithImportCuesheetAvailable_ImportsCuesheetData()
-        //{
-        //    // Arrange
-        //    var sessionStateContainerImportCuesheet = new Cuesheet()
-        //    {
-        //        Artist = "Artist 123",
-        //        Title = "Title 456"
-        //    };
-        //    sessionStateContainerImportCuesheet.AddTrack(new()
-        //    {
-        //        Artist = "Track Artist 1",
-        //        Title = "Track Title 1",
-        //        End = new TimeSpan(0, 4, 23),
-        //    });
-        //    sessionStateContainerImportCuesheet.AddTrack(new()
-        //    {
-        //        Artist = "Track Artist 2",
-        //        Title = "Track Title 2",
-        //        End = new TimeSpan(0, 8, 54),
-        //    });
-        //    _sessionStateContainerMock.SetupGet(x => x.ImportCuesheet).Returns(sessionStateContainerImportCuesheet);
-        //    Cuesheet sessionStateContainerCuesheet = new();
-        //    _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
-        //    _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
-        //    // Act
-        //    _service.ImportCuesheet();
-        //    // Assert
-        //    Assert.IsNotNull(sessionStateContainerCuesheet);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Artist, sessionStateContainerCuesheet.Artist);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Title, sessionStateContainerCuesheet.Title);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Artist, sessionStateContainerCuesheet.Tracks.Last().Artist);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Title, sessionStateContainerCuesheet.Tracks.Last().Title);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Begin, sessionStateContainerCuesheet.Tracks.Last().Begin);
-        //    Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().End, sessionStateContainerCuesheet.Tracks.Last().End);
-        //    _traceChangeManagerMock.Verify(x => x.RemoveTracedChanges(It.IsAny<IEnumerable<ITraceable>>()));
-        //}
+        [TestMethod]
+        public void ImportCuesheet_WithImportCuesheetAvailable_ImportsCuesheetData()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Artist = "Track Artist 1",
+                Title = "Track Title 1",
+                End = new TimeSpan(0, 4, 23),
+            };
+            var track2 = new Track()
+            {
+                Artist = "Track Artist 2",
+                Title = "Track Title 2",
+                End = new TimeSpan(0, 8, 54),
+            };
+            var sessionStateContainerImportCuesheet = new Cuesheet()
+            {
+                Artist = "Artist 123",
+                Title = "Title 456",
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = sessionStateContainerImportCuesheet;
+            track2.Cuesheet = sessionStateContainerImportCuesheet;
+            _sessionStateContainerMock.SetupGet(x => x.ImportCuesheet).Returns(sessionStateContainerImportCuesheet);
+            Cuesheet sessionStateContainerCuesheet = new();
+            _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
+            _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
+            // Act
+            _service.ImportCuesheet();
+            // Assert
+            Assert.IsNotNull(sessionStateContainerCuesheet);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Artist, sessionStateContainerCuesheet.Artist);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Title, sessionStateContainerCuesheet.Title);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Artist, sessionStateContainerCuesheet.Tracks.Last().Artist);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Title, sessionStateContainerCuesheet.Tracks.Last().Title);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().Begin, sessionStateContainerCuesheet.Tracks.Last().Begin);
+            Assert.AreEqual(sessionStateContainerImportCuesheet.Tracks.Last().End, sessionStateContainerCuesheet.Tracks.Last().End);
+            _traceChangeManagerMock.Verify(x => x.RemoveTracedChanges(It.IsAny<IEnumerable<object>>()));
+        }
 
-        //[TestMethod]
-        //public void ImportData_ValidData_SetsImportfile()
-        //{
-        //    // Arrange
-        //    var importData = nameof(ImportData_ValidData_SetsImportfile);
-        //    IImportfile? sessionStateContainerImportfile = null;
-        //    _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
-        //    // Act
-        //    _service.ImportData(importData);
-        //    // Assert
-        //    Assert.IsNotNull(sessionStateContainerImportfile);
-        //    Assert.AreEqual(importData, sessionStateContainerImportfile.FileContent);
-        //    Assert.AreEqual(importData, sessionStateContainerImportfile.FileContentRecognized);
-        //    Assert.AreEqual(ImportFileType.Textfile, sessionStateContainerImportfile.FileType);
-        //}
+        [TestMethod]
+        public void ImportData_ValidData_SetsImportfile()
+        {
+            // Arrange
+            var importData = nameof(ImportData_ValidData_SetsImportfile);
+            IImportfile? sessionStateContainerImportfile = null;
+            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(x => sessionStateContainerImportfile = x);
+            // Act
+            _service.ImportData(importData);
+            // Assert
+            Assert.IsNotNull(sessionStateContainerImportfile);
+            Assert.AreEqual(importData, sessionStateContainerImportfile.FileContent);
+            Assert.AreEqual(importData, sessionStateContainerImportfile.FileContentRecognized);
+            Assert.AreEqual(ImportFileType.Textfile, sessionStateContainerImportfile.FileType);
+        }
     }
 }
\ No newline at end of file

From 78e4a360dcba11f24f2bf0739941b94790101483 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 14:56:24 +0200
Subject: [PATCH 073/150] fix clone

---
 .../Services/AudioCuesheet/TrackManagerTests.cs            | 1 -
 AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index ca6ce3ec..fd0e9c67 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -127,7 +127,6 @@ public void Clone_ImportTrack_ReturnsTrackClone()
             Assert.AreEqual(importTrack.PostGap, track.PostGap);
             Assert.AreEqual(importTrack.PreGap, track.PreGap);
             Assert.AreEqual(importTrack.Flags, track.Flags);
-            Assert.AreEqual(importTrack.Length, track.Length);
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track)), Times.Never);
         }
 
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 8b2443f7..2eb6e254 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -36,7 +36,12 @@ public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty
         public Track Clone(ITrack track)
         {
             var clone = new Track();
-            CopyValues(track, clone);
+            Boolean setLength = true;
+            if (track.Begin.HasValue && track.End.HasValue)
+            {
+                setLength = false;
+            }
+            CopyValues(track, clone, setLength: setLength);
             return clone;
         }
 

From 191872af81de2a20aea482c6634254a63a32ecb4 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 15:19:11 +0200
Subject: [PATCH 074/150] fix GetNextLinkedTrack

---
 .../AudioCuesheet/TrackManagerTests.cs        | 30 +++++++++++++++++++
 .../Services/AudioCuesheet/TrackManager.cs    |  6 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index fd0e9c67..49e5e2c9 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -347,5 +347,35 @@ public void GetNextLinkedTrack_WithoutPosition_ReturnsNull()
             // Assert
             Assert.IsNull(linkedTrack);
         }
+
+        [TestMethod]
+        public void GetNextLinkedTrack_WithBegin_ReturnsTrack()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 8, 32)
+            };
+            var track2 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 2,
+                Begin = track1.End,
+                End = new TimeSpan(0, 13, 54)
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetNextLinkedTrack(track1);
+            // Assert
+            Assert.IsNotNull(linkedTrack);
+            Assert.AreEqual(track2, linkedTrack);
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 2eb6e254..578702d3 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -107,7 +107,11 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             Track? nextLinkedTrack = null;
             if (track.Position.HasValue)
             {
-                nextLinkedTrack = track.Cuesheet?.Tracks.FirstOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
+                nextLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
+            }
+            if (track.End.HasValue)
+            {
+                nextLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.Begin).LastOrDefault(x => x.Begin <= track.End && x.IsLinkedToPreviousTrack == true);
             }
             return nextLinkedTrack;
         }

From 6111e68297d7525199630194c91d6a1b6672bf9d Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 15:28:46 +0200
Subject: [PATCH 075/150] fix GetPreviousLinkedTrack

---
 .../AudioCuesheet/TrackManagerTests.cs        | 34 +++++++++++++++++--
 .../Services/AudioCuesheet/TrackManager.cs    | 14 ++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index 49e5e2c9..d5e53b0d 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -77,7 +77,8 @@ public void SetProperty_CuesheetAvailable_CalculatesLinkedProperties()
                     {
                         IsLinkedToPreviousTrack = true,
                         Position = 1,
-                        Begin = TimeSpan.Zero
+                        Begin = TimeSpan.Zero,
+                        End = new TimeSpan(0, 4, 56)
                     }
                 ]
             };
@@ -85,7 +86,7 @@ public void SetProperty_CuesheetAvailable_CalculatesLinkedProperties()
             {
                 IsLinkedToPreviousTrack = true,
                 Cuesheet = cuesheet,
-                Begin = new TimeSpan(0, 4, 56)
+                Begin = cuesheet.Tracks.Single().End
             };
             cuesheet.Tracks = cuesheet.Tracks.Append(track);
             var artist = "Artist 1";
@@ -272,6 +273,35 @@ public void GetPreviousLinkedTrack_WithoutPosition_ReturnsNull()
             Assert.IsNull(linkedTrack);
         }
 
+        [TestMethod]
+        public void GetPreviousLinkedTrack_WithBegin_ReturnsTrack()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 6, 37)
+            };
+            var track2 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Begin = track1.End
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetPreviousLinkedTrack(track2);
+            // Assert
+            Assert.IsNotNull(linkedTrack);
+            Assert.AreEqual(track1, linkedTrack);
+        }
+
         [TestMethod]
         public void GetNextLinkedTrack_LinkedTracks_ReturnsTrack()
         {
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 578702d3..76ea349e 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -96,7 +96,17 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             Track? previousLinkedTrack = null;
             if (track.IsLinkedToPreviousTrack)
             {
-                previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
+                if (track.Position.HasValue)
+                {
+                    previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
+                }
+                else
+                {
+                    if (track.Begin.HasValue)
+                    {
+                        previousLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.End).LastOrDefault(x => x.End <= track.Begin);
+                    }
+                }
             }
             return previousLinkedTrack;
         }
@@ -148,7 +158,7 @@ void RecalculateLinkedProperties(Track track)
                 var previousTrack = GetPreviousLinkedTrack(track);
                 if (previousTrack != null)
                 {
-                    if (track.Position.HasValue && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
+                    if (track.Position.HasValue == false && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
                     {
                         track.Position = (ushort?)(previousTrack.Position + 1);
                     }

From ddbbf9cdf2336fa5e59b3df18b1a4fefff58e8ff Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 15:32:06 +0200
Subject: [PATCH 076/150] Update TrackManagerTests.cs

---
 .../Services/AudioCuesheet/TrackManagerTests.cs               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index d5e53b0d..ed38113e 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -182,7 +182,7 @@ public void CopyValues_ValuesSet_CopiesOnlySetValues()
             };
             var target = new Track();
             // Act
-            _trackManager.CopyValues(source, target, setBegin: false, setPreGap: false, setPostGap:false);
+            _trackManager.CopyValues(source, target, setBegin: false, setPostGap:false, setLength: false, setFlags: false);
             // Assert
             Assert.AreEqual(source.Artist, target.Artist);
             Assert.AreEqual(source.Title, target.Title);
@@ -193,7 +193,7 @@ public void CopyValues_ValuesSet_CopiesOnlySetValues()
             Assert.AreNotEqual(source.PostGap, target.PostGap);
             Assert.AreEqual(source.PreGap, target.PreGap);
             Assert.AreNotEqual(source.Flags, target.Flags);
-            Assert.AreEqual(source.Length, target.Length);
+            Assert.AreNotEqual(source.Length, target.Length);
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == target)), Times.Never);
         }
 

From 7765283f1c9eb14c9010b98e4743846e6f7017f9 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 16:10:44 +0200
Subject: [PATCH 077/150] Update CuesheetExportServiceTests.cs

---
 .../Services/IO/CuesheetExportServiceTests.cs | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs b/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
index d8145486..13fbd775 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/CuesheetExportServiceTests.cs
@@ -87,29 +87,31 @@ public void GenerateExportfiles_WithoutSections_ReturnsExportFile()
         {
             // Arrange
             var filename = "Test valid Filename.cue";
+            var track1 = new Track()
+            {
+                Artist = "Test artist 1",
+                Title = "Test title 1",
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 4, 12),
+                Position = 1
+            };
+            var track2 = new Track()
+            {
+                Artist = "Test artist 2",
+                Title = "Test title 2",
+                Begin = track1.End,
+                End = new TimeSpan(0, 8, 32),
+                Position = 2
+            };
             var cuesheet = new Cuesheet()
             {
                 Artist = "Test artist cuesheet",
                 Title = "Test title cuesheet",
                 Audiofile = new Audiofile("Test audiofile.mp3"),
-                Tracks = [
-                    new ()
-                    {
-                        Artist = "Test artist 1",
-                        Title = "Test title 1",
-                        Begin = TimeSpan.Zero,
-                        End = new TimeSpan(0, 4, 12),
-                        Position = 1
-                    },
-                    new ()
-                    {
-                        Artist = "Test artist 2",
-                        Title = "Test title 2",
-                        End = new TimeSpan(0, 8, 32),
-                        Position = 2
-                    }
-                ]
+                Tracks = [track1, track2]
             };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
             _sessionStateContainerMock.SetupProperty(x => x.Cuesheet, cuesheet);
 
             // Act

From a9021d530cc403667396b6862cd73c746d5a71f8 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 16:12:16 +0200
Subject: [PATCH 078/150] Update ExportfileGeneratorTests.cs

---
 .../Services/IO/ExportfileGeneratorTests.cs                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs b/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
index 7c4066ea..b3855d30 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/ExportfileGeneratorTests.cs
@@ -62,6 +62,7 @@ public void GenerateExportFile_ShouldGenerateExportfile_WithoutSections()
             {
                 Artist = "Test artist 2",
                 Title = "Test title 2",
+                Begin = track1.End,
                 End = new TimeSpan(0, 8, 32),
                 Position = 2
             };
@@ -107,6 +108,7 @@ public void GenerateExportFile_ShouldHandleEmptyProfile()
             {
                 Artist = "Test artist 2",
                 Title = "Test title 2",
+                Begin = track1.End,
                 End = new TimeSpan(0, 8, 32),
                 Position = 2
             };

From ce9bcd6ae747d7be2a0a6191a88b5d593cac94c0 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 16:28:37 +0200
Subject: [PATCH 079/150] Update TextImportService.cs

---
 AudioCuesheetEditor/Services/IO/TextImportService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor/Services/IO/TextImportService.cs b/AudioCuesheetEditor/Services/IO/TextImportService.cs
index 63245326..c9b9b400 100644
--- a/AudioCuesheetEditor/Services/IO/TextImportService.cs
+++ b/AudioCuesheetEditor/Services/IO/TextImportService.cs
@@ -199,9 +199,9 @@ private static void SetValue(object entity, PropertyInfo property, string value,
             {
                 property.SetValue(entity, TimeSpanUtility.ParseTimeSpan(value, timeSpanFormat));
             }
-            if (property.PropertyType == typeof(uint?))
+            if (property.PropertyType == typeof(ushort?))
             {
-                property.SetValue(entity, Convert.ToUInt32(value));
+                property.SetValue(entity, Convert.ToUInt16(value));
             }
             if (property.PropertyType == typeof(String))
             {

From 60bf994ef3f57e59a855dc9666f0db04a2989254 Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 17 Apr 2026 16:34:42 +0200
Subject: [PATCH 080/150] Update TextImportServiceTests.cs

---
 .../Services/IO/TextImportServiceTests.cs     | 132 ++++++++----------
 1 file changed, 57 insertions(+), 75 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs b/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
index b57778ba..dacc7055 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
@@ -32,6 +32,15 @@ namespace AudioCuesheetEditor.Tests.Services.IO
     [TestClass()]
     public class TextImportServiceTests
     {
+        private readonly Mock<ILocalStorageOptionsProvider> _localStorageOptionsProviderMock;
+        private readonly TextImportService _textImportService;
+
+        public TextImportServiceTests()
+        {
+            _localStorageOptionsProviderMock = new();
+            _textImportService = new (_localStorageOptionsProviderMock.Object);
+        }
+
         [TestMethod()]
         public async Task AnalyseAsync_SampleCuesheet_CreatesValidCuesheetAsync()
         {
@@ -45,20 +54,19 @@ public async Task AnalyseAsync_SampleCuesheet_CreatesValidCuesheetAsync()
 Sample Artist 6 - Sample Title 6				00:31:54
 Sample Artist 7 - Sample Title 7				00:45:54
 Sample Artist 8 - Sample Title 8				01:15:54";
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
+            
             var importOptions = new ImportOptions
             {
                 SelectedImportProfile = ImportOptions.DefaultSelectedImportprofile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(importOptions);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(importOptions);
             var applicationOptions = new ApplicationOptions()
             {
                 DefaultIsLinkedToPreviousTrack = true
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -91,15 +99,13 @@ public async Task AnalyseAsync_InvalidSchemeTracks_CreatesAnalyseExceptionAsync(
                 SchemeCuesheet = @"(?'Cuesheet.Artist'\A.*)[|](?'Cuesheet.Title'\w{1,})\t{1,}(?'Cuesheet.CDTextfile'.{1,})",
                 SchemeTracks = @"(?'Track.Position'.{1,})|(?'Track.Artist'.{1,}) - (?'Track.Title'[a-zA-Z0-9_ ]{1,})\t{1,}(?'Track.End'.{1,})"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             // Act
-            var importfile = await service.AnalyseAsync(fileContent);
+            var importfile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNotNull(importfile.AnalyseException);
         }
@@ -123,17 +129,15 @@ public async Task AnalyseAsync_InputfileWithExtraSeperator_CreatesValidCuesheetA
                 SchemeCuesheet = @"(?'Artist'\A.*)[|](?'Title'\w{1,})\t{1,}(?'CDTextfile'[^\r\n]+)",
                 SchemeTracks = @"(?'Position'\d{1,})[|](?'Artist'.{1,}) - (?'Title'[a-zA-Z0-9_ ]{1,})\t{1,}(?'End'.{1,})"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importfile = await service.AnalyseAsync(fileContent);
+            var importfile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importfile.AnalyseException);
             Assert.IsNotNull(importfile.AnalyzedCuesheet);
@@ -165,17 +169,15 @@ public async Task AnalyseAsync_InputfileWithSimplifiedScheme_CreatesValidCueshee
                 SchemeCuesheet = @"Artist|Title	CDTextfile",
                 SchemeTracks = @"Position|Artist - Title	End"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -217,17 +219,15 @@ public async Task AnalyseAsync_InvalidScheme_CreatesAnalyseExceptionAsync()
                 SchemeCuesheet = @"(?'Cuesheet.Artist'\A.*)[|](?'Cuesheet.Title'\w{1,})\t{1,}(?'Cuesheet.CDTextfile'[a-zA-Z0-9_ .();äöü&:,\\]{1,})\t{1,}(?'Cuesheet.Cataloguenumber'.{1,})",
                 SchemeTracks = @"(?'Track.Position'.{1,})|(?'Track.Artist'.{1,}) - (?'Track.Title'[a-zA-Z0-9_ ]{1,})\t{1,}(?'Track.End'.{1,})"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNotNull(importFile.AnalyseException);
         }
@@ -260,17 +260,15 @@ public async Task AnalyseAsync_CuesheetWithTextfileAndCatalogueNumber_CreatesVal
                 SchemeCuesheet = @"(?'Artist'\A.*)[|](?'Title'\w{1,})\t{1,}(?'CDTextfile'[a-zA-Z0-9_ .();äöü&:,\\]{1,})\t{1,}(?'Cataloguenumber'[^\r\n]+)",
                 SchemeTracks = @"(?'Position'.{1,})[|](?'Artist'.{1,}) - (?'Title'[a-zA-Z0-9_ ]{1,})\t{1,}(?'End'.{1,})"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -302,17 +300,15 @@ public async Task AnalyseAsync_CuesheetTracksOnly_CreatesValidCuesheetAsync()
             {
                 SchemeTracks = $"{nameof(ImportTrack.Artist)} - {nameof(ImportTrack.Title)}\t{nameof(ImportTrack.End)}"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -332,17 +328,15 @@ public async Task AnalyseAsync_CuesheetBug213_CreatesValidCuesheetAsync()
                 SchemeTracks = $"{nameof(ImportTrack.Artist)} - {nameof(ImportTrack.Title)}\t{nameof(ImportTrack.End)}",
                 TimeSpanFormat = new() { Scheme = $"{nameof(TimeSpanFormat.Minutes)}:{nameof(TimeSpanFormat.Seconds)}" }
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -367,17 +361,15 @@ public async Task AnalyseAsync_CuesheetWithFlags_CreatesValidCuesheetAsync()
                 UseRegularExpression = true,
                 SchemeTracks = "(?'Artist'[a-zA-Z0-9_ .();äöü&:,]+) - (?'Title'[a-zA-Z0-9_ .();äöü]+)[\t ]+(?'End'[0-9]{2}:[0-9]{2}:[0-9]{2})(?:[\t ]+(?'Flags'[A-Za-z0-9 ,]+))?(?=[\t ]*(?:\r?\n|$))"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -412,17 +404,15 @@ public async Task AnalyseAsync_CuesheetWithPreGapAndPostGap_CreatesValidCuesheet
                 UseRegularExpression = true,
                 SchemeTracks = "(?'Artist'[a-zA-Z0-9_ .();äöü&:,]{1,}) - (?'Title'[a-zA-Z0-9_ .();äöü]{1,})\t{1,}(?'PreGap'[0-9]{2}[:][0-9]{2}[:][0-9]{2})\t{1,}(?'End'[0-9]{2}[:][0-9]{2}[:][0-9]{2})\t{1,}(?'PostGap'[0-9]{2}[:][0-9]{2}[:][0-9]{2})"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -462,17 +452,15 @@ public async Task AnalyseAsync_SchemeCuesheetOnly_CreatesFileContentRecognizedOn
             {
                 SchemeCuesheet = $"{nameof(ImportCuesheet.Artist)} - {nameof(ImportCuesheet.Title)}\t{nameof(ImportCuesheet.Audiofile)}"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -509,17 +497,15 @@ public async Task AnalyseAsync_CuesheetWithoutTracks_CreatesValidFileContentReco
 Sample Artist 6 - Sample Title 6				00:31:54
 Sample Artist 7 - Sample Title 7				00:45:54
 Sample Artist 8 - Sample Title 8				01:15:54";
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = ImportOptions.DefaultSelectedImportprofile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -544,17 +530,15 @@ public async Task AnalyseAsync_TextfileBug233_CreatesValidFileContentRecognizedA
                 SchemeTracks = $"{nameof(ImportTrack.Artist)} - {nameof(ImportTrack.Title)}\t{nameof(ImportTrack.End)}"
             };
             var fileContent = File.ReadAllText("Resources/Textimport_Bug_#233.txt");
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -581,9 +565,9 @@ public async Task AnalyseAsync_WithRegularExpression_ReturnsCuesheetAsync()
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             var service = new TextImportService(localStorageOptionsProviderMock.Object);
             // Act
             var importFile = await service.AnalyseAsync(fileContent);
@@ -621,9 +605,9 @@ public async Task AnalyseAsync_WithoutRegularExpression_ReturnsCuesheetAsync()
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             var service = new TextImportService(localStorageOptionsProviderMock.Object);
             // Act
             var importFile = await service.AnalyseAsync(fileContent);
@@ -694,9 +678,9 @@ public async Task AnalyseAsync_TextfileWithStartDateTime_CreatesValidCuesheetAsy
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             var service = new TextImportService(localStorageOptionsProviderMock.Object);
             // Act
             var importFile = await service.AnalyseAsync(fileContent);
@@ -726,17 +710,15 @@ public async Task AnalyseAsync_WithCommonDataMatchingMultipleLines_SetsCommonDat
                 SchemeTracks = "Artist - Title\tBegin"
             };
             var fileContent = File.ReadAllText("Resources/Sample_Inputfile.txt");
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
             };
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
-            localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
+            _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);

From 13d704dd7fd769ac5522837bdad1383ed276711e Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 22 Apr 2026 10:44:28 +0200
Subject: [PATCH 081/150] Update TextImportServiceTests.cs

---
 .../Services/IO/TextImportServiceTests.cs            | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs b/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
index dacc7055..684ceb45 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/TextImportServiceTests.cs
@@ -560,7 +560,6 @@ public async Task AnalyseAsync_WithRegularExpression_ReturnsCuesheetAsync()
                 SchemeTracks = "<tr>\\s*<td>\\d+</td>\\s*<td>(?<Artist>.*?)</td>\\s*<td>(?<Title>.*?)</td>\\s*<td>(?<StartDateTime>.*?)</td>\\s*</tr>"
             };
             var fileContent = File.ReadAllText("Resources/Traktor Export.html");
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
@@ -568,9 +567,8 @@ public async Task AnalyseAsync_WithRegularExpression_ReturnsCuesheetAsync()
             _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
             _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.AreEqual(fileContent, importFile.FileContent);
             Assert.IsNull(importFile.AnalyseException);
@@ -600,7 +598,6 @@ public async Task AnalyseAsync_WithoutRegularExpression_ReturnsCuesheetAsync()
                 SchemeTracks = "Artist - Title\tBegin"
             };
             var fileContent = File.ReadAllText("Resources/Textimport with Cuesheetdata.txt");
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
@@ -608,9 +605,8 @@ public async Task AnalyseAsync_WithoutRegularExpression_ReturnsCuesheetAsync()
             _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
             _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);
@@ -673,7 +669,6 @@ public async Task AnalyseAsync_TextfileWithStartDateTime_CreatesValidCuesheetAsy
                 UseRegularExpression = false,
                 SchemeTracks = $"{nameof(ImportTrack.Artist)}~{nameof(ImportTrack.Title)}~{nameof(ImportTrack.StartDateTime)}"
             };
-            var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
             var options = new ImportOptions
             {
                 SelectedImportProfile = profile
@@ -681,9 +676,8 @@ public async Task AnalyseAsync_TextfileWithStartDateTime_CreatesValidCuesheetAsy
             _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ImportOptions>()).ReturnsAsync(options);
             var applicationOptions = new ApplicationOptions();
             _localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(applicationOptions);
-            var service = new TextImportService(localStorageOptionsProviderMock.Object);
             // Act
-            var importFile = await service.AnalyseAsync(fileContent);
+            var importFile = await _textImportService.AnalyseAsync(fileContent);
             // Assert
             Assert.IsNull(importFile.AnalyseException);
             Assert.IsNotNull(importFile.AnalyzedCuesheet);

From 46f14b95bcf0c9901ce9e95d11aa754bc03ce28d Mon Sep 17 00:00:00 2001
From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 22 Apr 2026 11:08:13 +0200
Subject: [PATCH 082/150] fix tests

---
 .../Services/IO/ImportManagerTests.cs         | 82 +++++++++++++++++++
 .../Services/IO/TextImportService.cs          |  4 +-
 2 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs b/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
index 144a900e..a952bdb9 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
@@ -28,6 +28,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace AudioCuesheetEditor.Tests.Services.IO
@@ -48,10 +50,90 @@ public ImportManagerTests()
             _fileInputManagerMock = new();
             _textImportServiceMock = new();
             _trackManagerMock = new();
+            _trackManagerMock.Setup(x => x.CopyValues(It.IsAny<ITrack>(), It.IsAny<Track>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>(), It.IsAny<bool>()))
+                .Callback<ITrack, Track, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool>((source, target, setIsLinkedToPreviousTrack, setPosition, setArtist, setTitle, setBegin, setEnd, setLength, setFlags, setPreGap, setPostGap) =>
+            {
+                if (setIsLinkedToPreviousTrack)
+                {
+                    TrackManager_SetValue(target, x => x.IsLinkedToPreviousTrack, source.IsLinkedToPreviousTrack, false);
+                }
+                if (setPosition)
+                {
+                    TrackManager_SetValue(target, x => x.Position, source.Position, false);
+                }
+                if (setArtist)
+                {
+                    TrackManager_SetValue(target, x => x.Artist, source.Artist, false);
+                }
+                if (setTitle)
+                {
+                    TrackManager_SetValue(target, x => x.Title, source.Title, false);
+                }
+                if (setBegin)
+                {
+                    TrackManager_SetValue(target, x => x.Begin, source.Begin, false);
+                }
+                if (setEnd)
+                {
+                    TrackManager_SetValue(target, x => x.End, source.End, false);
+                }
+                if (setLength)
+                {
+                    TrackManager_SetValue(target, x => x.Length, source.Length, false);
+                }
+                if (setFlags)
+                {
+                    TrackManager_SetValue(target, x => x.Flags, source.Flags, false);
+                }
+                if (setPreGap)
+                {
+                    TrackManager_SetValue(target, x => x.PreGap, source.PreGap, false);
+                }
+                if (setPostGap)
+                {
+                    TrackManager_SetValue(target, x => x.PostGap, source.PostGap, false);
+                }
+            });
+            _trackManagerMock.Setup(x => x.Clone(It.IsAny<ITrack>())).Returns<ITrack>(track =>
+            {
+                var clone = new Track();
+                Boolean setLength = true;
+                if (track.Begin.HasValue && track.End.HasValue)
+                {
+                    setLength = false;
+                }
+                _trackManagerMock.Object.CopyValues(track, clone, setLength: setLength);
+                return clone;
+            });
             var loggerMock = new Mock<ILogger<ImportManager>>();
             _service = new ImportManager(_sessionStateContainerMock.Object, _traceChangeManagerMock.Object, _fileInputManagerMock.Object, _textImportServiceMock.Object, _trackManagerMock.Object, loggerMock.Object);
         }
 
+        void TrackManager_SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value, Boolean signalTraceChangeManager = true)
+        {
+            if (propertyExpression.Body is not MemberExpression memberExpression)
+            {
+                throw new ArgumentException("Expression must be a property");
+            }
+
+            if (memberExpression.Member is not PropertyInfo propertyInfo)
+            {
+                throw new ArgumentException("Member is not a property");
+            }
+
+            var previousValue = (TProperty?)propertyInfo.GetValue(track);
+            if (Equals(previousValue, value))
+            {
+                return;
+            }
+
+            propertyInfo.SetValue(track, value);
+            if (signalTraceChangeManager)
+            {
+                _traceChangeManagerMock.Object.AddChange(new(track, new(previousValue, propertyInfo.Name)));
+            }
+        }
+
         [TestMethod()]
         public async Task AnalyseImportfile_WithTextfile_SetsImportCuesheet()
         {
diff --git a/AudioCuesheetEditor/Services/IO/TextImportService.cs b/AudioCuesheetEditor/Services/IO/TextImportService.cs
index c9b9b400..ab975076 100644
--- a/AudioCuesheetEditor/Services/IO/TextImportService.cs
+++ b/AudioCuesheetEditor/Services/IO/TextImportService.cs
@@ -255,7 +255,7 @@ private static Regex CreateCuesheetRegexPattern(string scheme)
                             nextFieldIdx = pos;
                         }
                     }
-                    string separator = scheme.Substring(idx, nextFieldIdx - idx);
+                    string separator = scheme[idx..nextFieldIdx];
                     parts.Add(separator);
                     idx = nextFieldIdx;
                 }
@@ -324,7 +324,7 @@ private static Regex CreateTrackRegexPattern(string scheme)
                             nextFieldIdx = pos;
                         }
                     }
-                    string separator = scheme.Substring(idx, nextFieldIdx - idx);
+                    string separator = scheme[idx..nextFieldIdx];
                     parts.Add(separator);
                     idx = nextFieldIdx;
                 }

From 07535568d04252dda256f105ea67ec3afb3578b5 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 22 Apr 2026 14:49:31 +0200
Subject: [PATCH 083/150] bugfix getting next track

---
 .../AudioCuesheet/TrackManagerTests.cs        | 21 +++++++++++++++++++
 .../Services/AudioCuesheet/TrackManager.cs    |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index ed38113e..bd32ea83 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -407,5 +407,26 @@ public void GetNextLinkedTrack_WithBegin_ReturnsTrack()
             Assert.IsNotNull(linkedTrack);
             Assert.AreEqual(track2, linkedTrack);
         }
+
+        [TestMethod]
+        public void GetNextLinkedTrack_OnlyOneTrack_ReturnsNull()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 8, 32)
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1]
+            };
+            track1.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetNextLinkedTrack(track1);
+            // Assert
+            Assert.IsNull(linkedTrack);
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 76ea349e..cf058055 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -117,11 +117,11 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             Track? nextLinkedTrack = null;
             if (track.Position.HasValue)
             {
-                nextLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true);
+                nextLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
             }
             if (track.End.HasValue)
             {
-                nextLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.Begin).LastOrDefault(x => x.Begin <= track.End && x.IsLinkedToPreviousTrack == true);
+                nextLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.Begin).LastOrDefault(x => x.Begin <= track.End && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
             }
             return nextLinkedTrack;
         }

From ecdfe1c90ac926590961f1f7315bd6b1bdf02a9c Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 22 Apr 2026 15:52:51 +0200
Subject: [PATCH 084/150] fix tracing during copyvalues

---
 .../AudioCuesheet/TrackManagerTests.cs        |  6 ++---
 .../Services/AudioCuesheet/TrackManager.cs    | 27 +++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index bd32ea83..8a86c897 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -128,7 +128,7 @@ public void Clone_ImportTrack_ReturnsTrackClone()
             Assert.AreEqual(importTrack.PostGap, track.PostGap);
             Assert.AreEqual(importTrack.PreGap, track.PreGap);
             Assert.AreEqual(importTrack.Flags, track.Flags);
-            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track)), Times.Never);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track)), Times.Exactly(9));
         }
 
         [TestMethod]
@@ -161,7 +161,7 @@ public void CopyValues_AllDefaultValues_CopiesAllValues()
             Assert.AreEqual(source.PreGap, target.PreGap);
             Assert.AreEqual(source.Flags, target.Flags);
             Assert.AreEqual(source.Length, target.Length);
-            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == target)), Times.Never);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == target)), Times.Exactly(9));
         }
 
         [TestMethod]
@@ -194,7 +194,7 @@ public void CopyValues_ValuesSet_CopiesOnlySetValues()
             Assert.AreEqual(source.PreGap, target.PreGap);
             Assert.AreNotEqual(source.Flags, target.Flags);
             Assert.AreNotEqual(source.Length, target.Length);
-            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == target)), Times.Never);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == target)), Times.Exactly(6));
         }
 
         [TestMethod]
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index cf058055..820904e9 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -50,43 +50,43 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
         {
             if (setIsLinkedToPreviousTrack)
             {
-                SetValue(target, x => x.IsLinkedToPreviousTrack, source.IsLinkedToPreviousTrack, false);
+                SetValue(target, x => x.IsLinkedToPreviousTrack, source.IsLinkedToPreviousTrack);
             }
             if (setPosition)
             {
-                SetValue(target, x => x.Position, source.Position, false);
+                SetValue(target, x => x.Position, source.Position);
             }
             if (setArtist)
             {
-                SetValue(target, x => x.Artist, source.Artist, false);
+                SetValue(target, x => x.Artist, source.Artist);
             }
             if (setTitle)
             {
-                SetValue(target, x => x.Title, source.Title, false);
+                SetValue(target, x => x.Title, source.Title);
             }
             if (setBegin)
             {
-                SetValue(target, x => x.Begin, source.Begin, false );
+                SetValue(target, x => x.Begin, source.Begin );
             }
             if (setEnd)
             {
-                SetValue(target, x => x.End, source.End, false);
+                SetValue(target, x => x.End, source.End);
             }
             if (setLength)
             {
-                SetValue(target, x => x.Length, source.Length, false);
+                SetValue(target, x => x.Length, source.Length);
             }
             if (setFlags)
             {
-                SetValue(target, x => x.Flags, source.Flags, false);
+                SetValue(target, x => x.Flags, source.Flags);
             }
             if (setPreGap)
             {
-                SetValue(target, x => x.PreGap, source.PreGap, false);
+                SetValue(target, x => x.PreGap, source.PreGap);
             }
             if (setPostGap)
             {
-                SetValue(target, x=> x.PostGap, source.PostGap, false);
+                SetValue(target, x=> x.PostGap, source.PostGap);
             }
         }
 
@@ -126,7 +126,7 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             return nextLinkedTrack;
         }
 
-        void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value, Boolean signalTraceChangeManager = true)
+        void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
         {
             if (propertyExpression.Body is not MemberExpression memberExpression)
             {
@@ -145,10 +145,7 @@ void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propert
             }
 
             propertyInfo.SetValue(track, value);
-            if (signalTraceChangeManager)
-            {
-                _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
-            }
+            _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
         }
 
         void RecalculateLinkedProperties(Track track)

From 35fcde38599232441ab3b87e3e5d78b1abd7d15d Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 22 Apr 2026 16:39:51 +0200
Subject: [PATCH 085/150] fix clone of tracks

---
 .../AudioCuesheet/TrackManagerTests.cs        | 34 ++++++++++++++++++-
 .../Services/AudioCuesheet/TrackManager.cs    | 18 ++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index 8a86c897..0066d1ca 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -128,7 +128,39 @@ public void Clone_ImportTrack_ReturnsTrackClone()
             Assert.AreEqual(importTrack.PostGap, track.PostGap);
             Assert.AreEqual(importTrack.PreGap, track.PreGap);
             Assert.AreEqual(importTrack.Flags, track.Flags);
-            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track)), Times.Exactly(9));
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track)), Times.Never);
+        }
+
+        [TestMethod]
+        public void Clone_ImportTrackWithLength_ReturnsTrackCloneWithLengthSet()
+        {
+            // Arrange
+            var importTrack = new ImportTrack()
+            {
+                Artist = "Artist 1",
+                Title = "Title 1",
+                Begin = TimeSpan.Zero,
+                Length = new TimeSpan(0, 2, 54),
+                IsLinkedToPreviousTrack = true,
+                Position = 1,
+                PostGap = new TimeSpan(0, 0, 2),
+                PreGap = new TimeSpan(0, 0, 4),
+                Flags = [Flag.FourCH, Flag.DCP],
+                StartDateTime = new DateTime(2024, 2, 28, 19, 23, 54)
+            };
+            // Act
+            var track = _trackManager.Clone(importTrack);
+            // Assert
+            Assert.AreEqual(importTrack.Artist, track.Artist);
+            Assert.AreEqual(importTrack.Title, track.Title);
+            Assert.AreEqual(importTrack.Begin, track.Begin);
+            Assert.AreEqual(importTrack.Length, track.End);
+            Assert.AreEqual(importTrack.IsLinkedToPreviousTrack, track.IsLinkedToPreviousTrack);
+            Assert.AreEqual(importTrack.Position, track.Position);
+            Assert.AreEqual(importTrack.PostGap, track.PostGap);
+            Assert.AreEqual(importTrack.PreGap, track.PreGap);
+            Assert.AreEqual(importTrack.Flags, track.Flags);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track)), Times.Never);
         }
 
         [TestMethod]
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 820904e9..8098fbe3 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -35,13 +35,27 @@ public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty
         /// <inheritdoc/>
         public Track Clone(ITrack track)
         {
-            var clone = new Track();
             Boolean setLength = true;
             if (track.Begin.HasValue && track.End.HasValue)
             {
                 setLength = false;
             }
-            CopyValues(track, clone, setLength: setLength);
+            var clone = new Track()
+            {
+                IsLinkedToPreviousTrack = track.IsLinkedToPreviousTrack,
+                Position = track.Position,
+                Artist = track.Artist,
+                Title = track.Title,
+                Begin = track.Begin,
+                End = track.End,
+                Flags = track.Flags,
+                PreGap = track.PreGap,
+                PostGap = track.PostGap
+            };
+            if (setLength)
+            {
+                clone.Length = track.Length;
+            }
             return clone;
         }
 

From 8203439f6d850ff736b7ec748b5ffabb779f18af Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 22 Apr 2026 16:48:29 +0200
Subject: [PATCH 086/150] Update CuesheetData.razor

---
 AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index 67f3e399..b3dc4165 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -40,7 +40,7 @@ along with Foobar.  If not, see
                            Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" />
                 <FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile" 
                            Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
-                <MudTextField @ref="catalogueNumberTextField" Text="@Cuesheet.Cataloguenumber" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue)" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
+                <MudTextField T="string" @ref="catalogueNumberTextField" Value="@Cuesheet.Cataloguenumber" ValueChanged="(string? newValue) => _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue)" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
                               Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined"
                               Mask="@(new PatternMask("00 00000 00000 0"))" OnBlur="CataloguenumberOnBlur" />
                 break;

From f2a030f955efcb78ba8c8d63c9200b4057f5a50a Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 23 Apr 2026 11:38:45 +0200
Subject: [PATCH 087/150] Bugfix bulk edit tracing

---
 .../Services/UI/TraceChangeManagerTests.cs            | 11 +++++++++++
 AudioCuesheetEditor/Services/UI/TraceChangeManager.cs |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 000bf410..61ce008c 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -75,6 +75,17 @@ public void AddChange_BulkChange_EnablesUndo()
             Assert.IsTrue(tracedObjectHistoryChangedFired);
         }
 
+        [TestMethod()]
+        public void BulkEdit_WithoutChange_DoesntAddChange()
+        {
+            // Arrange
+            _traceChangeManager.BulkEdit = true;
+            // Act
+            _traceChangeManager.BulkEdit = false;
+            // Assert
+            Assert.IsFalse(_traceChangeManager.CanUndo);
+        }
+
         [TestMethod()]
         public void Undo_SingleChange_UndoesChange()
         {
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index adfe7f33..090c8508 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -174,8 +174,11 @@ public bool BulkEdit
                 {
                     if (_bulkEditTracedChanges != null)
                     {
-                        _undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
-                        TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
+                        if (_bulkEditTracedChanges.Count != 0)
+                        {
+                            _undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
+                            TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
+                        }
                         _bulkEditTracedChanges = null;
                     }
                 }

From a05b29ca14a35517790f8a5160400a023e5afa0a Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 23 Apr 2026 12:46:52 +0200
Subject: [PATCH 088/150] Update ImportManager.cs

---
 AudioCuesheetEditor/Services/IO/ImportManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 70656fef..ec6e2ce4 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -109,9 +109,9 @@ public void ImportCuesheet()
             ResetTracing();
             if (_sessionStateContainer.ImportCuesheet != null)
             {
-                _traceChangeManager.BulkEdit = true;
-                CopyCuesheet(_sessionStateContainer.Cuesheet, _sessionStateContainer.ImportCuesheet);
-                _traceChangeManager.BulkEdit = false;
+                var newCuesheet = _sessionStateContainer.ImportCuesheet;
+                CopyCuesheet(newCuesheet, _sessionStateContainer.ImportCuesheet);
+                _sessionStateContainer.Cuesheet = newCuesheet;
             }
             _sessionStateContainer.ResetImport();
             stopwatch.Stop();

From 9f1f666351921c42997c02d384406ed5ab44ea74 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 23 Apr 2026 13:49:23 +0200
Subject: [PATCH 089/150] Update AudioCuesheetEditor.csproj

---
 AudioCuesheetEditor/AudioCuesheetEditor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
index 171d7120..81c4b6bf 100644
--- a/AudioCuesheetEditor/AudioCuesheetEditor.csproj
+++ b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -6,7 +6,7 @@
 	<Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<PackageProjectUrl>https://github.com/NeoCoderMatrix86/AudioCuesheetEditor</PackageProjectUrl>
-	<RazorLangVersion>3.0</RazorLangVersion>
+	<RazorLangVersion>Latest</RazorLangVersion>
 	<Version>12.0.0</Version>
 	<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 	<PublishTrimmed>true</PublishTrimmed>

From ea39b80ad983cc2cc79572d47928766a2d325f22 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 23 Apr 2026 13:49:59 +0200
Subject: [PATCH 090/150] reduce Sessionstatecontainer to POCO

---
 .../Services/Audio/PlaybackService.cs         |  7 ---
 .../Services/IO/ImportManager.cs              |  2 +
 .../Services/UI/ISessionStateContainer.cs     |  2 -
 .../Services/UI/SessionStateContainer.cs      | 59 ++-----------------
 .../Shared/Cuesheet/CuesheetData.razor        | 16 +----
 .../Shared/TrackList/TrackList.razor          | 14 -----
 6 files changed, 7 insertions(+), 93 deletions(-)

diff --git a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
index ce1bf9c3..68142028 100644
--- a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
+++ b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
@@ -63,7 +63,6 @@ public Boolean IsPlaybackPossible
         public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)
         {
             _sessionStateContainer = sessionStateContainer;
-            _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
             _howl = howl;
             _howl.OnPlay += Howl_OnPlay;
             _howl.OnPause += Howl_OnPause;
@@ -185,7 +184,6 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-                    _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
                     _howl.OnPlay -= Howl_OnPlay;
                     _howl.OnPause -= Howl_OnPause;
                     _howl.OnEnd -= Howl_OnEnd;
@@ -247,10 +245,5 @@ private async void UpdateCurrentPosition(object? state)
                 await _howl.Stop(_currentPlayingSoundId.Value);
             }
         }
-
-        private void SessionStateContainer_CuesheetChanged(object? sender, EventArgs e)
-        {
-            _ = StopAsync();
-        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index ec6e2ce4..2f81a865 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -111,7 +111,9 @@ public void ImportCuesheet()
             {
                 var newCuesheet = _sessionStateContainer.ImportCuesheet;
                 CopyCuesheet(newCuesheet, _sessionStateContainer.ImportCuesheet);
+                var previousValue = _sessionStateContainer.Cuesheet;
                 _sessionStateContainer.Cuesheet = newCuesheet;
+                _traceChangeManager.AddChange(new Model.UI.TracedChange(_sessionStateContainer, new(previousValue, nameof(SessionStateContainer.Cuesheet))));
             }
             _sessionStateContainer.ResetImport();
             stopwatch.Stop();
diff --git a/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
index 4dcd0aca..2ca754df 100644
--- a/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
@@ -21,8 +21,6 @@ namespace AudioCuesheetEditor.Services.UI
 {
     public interface ISessionStateContainer
     {
-        public event EventHandler? CuesheetChanged;
-        public event EventHandler? ImportCuesheetChanged;
         public Cuesheet Cuesheet { get; set; }
         public Cuesheet? ImportCuesheet { get; set; }
         public Audiofile? ImportAudiofile { get; set; }
diff --git a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
index 11e6c204..8d5de733 100644
--- a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
@@ -19,54 +19,11 @@
 
 namespace AudioCuesheetEditor.Services.UI
 {
-    public class SessionStateContainer(ITraceChangeManager traceChangeManager) : ISessionStateContainer
+    public class SessionStateContainer() : ISessionStateContainer
     {
-        public event EventHandler? CuesheetChanged;
-        public event EventHandler? ImportCuesheetChanged;
-
-        private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
-        private Cuesheet cuesheet = new();
-        private Cuesheet? importCuesheet;
-        private Audiofile? importAudiofile;
-
-        public Cuesheet Cuesheet 
-        {
-            get { return cuesheet; }
-            set { SetCuesheetReference(value); }
-        }
-        public Cuesheet? ImportCuesheet
-        {
-            get { return importCuesheet; }
-            set
-            {
-                var previousValue = importCuesheet;
-                importCuesheet = value;
-                //When there is an audiofile from import, we use this file because it has an object url and gets duration, etc.
-                if (importCuesheet != null && ImportAudiofile != null)
-                {
-                    importCuesheet.Audiofile = ImportAudiofile;
-                }
-                if (Equals(previousValue, importCuesheet) == false)
-                {
-                    ImportCuesheetChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-
-        public Audiofile? ImportAudiofile
-        {
-            get => importAudiofile;
-            set
-            {
-                importAudiofile = value;
-                if (ImportCuesheet != null && ImportAudiofile != null)
-                {
-                    ImportCuesheet.Audiofile = ImportAudiofile;
-                    ImportCuesheetChanged?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-
+        public Cuesheet Cuesheet { get; set; } = new();
+        public Cuesheet? ImportCuesheet { get; set; }
+        public Audiofile? ImportAudiofile { get; set; }
         public IImportfile? Importfile{ get; set; }
         public Boolean ImportIsAnalyzed { get; set; } = false;
 
@@ -76,13 +33,5 @@ public void ResetImport()
             ImportAudiofile = null;
             ImportCuesheet = null;
         }
-
-        private void SetCuesheetReference(Cuesheet value)
-        {
-            var previousValue = Cuesheet;
-            cuesheet = value;
-            _traceChangeManager.AddChange(new(this, new(previousValue, nameof(Cuesheet))));
-            CuesheetChanged?.Invoke(this, EventArgs.Empty);
-        }
     }
 }
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index b3dc4165..e7607acf 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -40,7 +40,7 @@ along with Foobar.  If not, see
                            Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" />
                 <FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile" 
                            Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
-                <MudTextField T="string" @ref="catalogueNumberTextField" Value="@Cuesheet.Cataloguenumber" ValueChanged="(string? newValue) => _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue)" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
+                <MudTextField @ref="catalogueNumberTextField" Value="@Cuesheet.Cataloguenumber" ValueChanged="(string? newValue) => _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue)" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
                               Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined"
                               Mask="@(new PatternMask("00 00000 00000 0"))" OnBlur="CataloguenumberOnBlur" />
                 break;
@@ -78,8 +78,6 @@ along with Foobar.  If not, see
         {
             fileInputAudiofileId = $"Input_Audiofile_{Guid.NewGuid()}";
         }
-        _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
-        _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
         TraceChangeManager.UndoDone += TraceChangeManager_UndoDone;
         TraceChangeManager.RedoDone += TraceChangeManager_RedoDone;
     }
@@ -87,8 +85,6 @@ along with Foobar.  If not, see
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
-        _sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
-        _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
         TraceChangeManager.UndoDone -= TraceChangeManager_UndoDone;
         TraceChangeManager.RedoDone -= TraceChangeManager_RedoDone;
     }
@@ -220,16 +216,6 @@ along with Foobar.  If not, see
         }
     }
 
-    void SessionStateContainer_ImportCuesheetChanged(object? sender, EventArgs args)
-    {
-        StateHasChanged();
-    }
-
-    void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
-    {
-        StateHasChanged();
-    }
-
     void CataloguenumberOnBlur()
     {
         if (Cuesheet != null)
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 40d57af3..67196718 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -163,8 +163,6 @@ along with Foobar.  If not, see
     {
         base.Dispose(disposing);
         base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
-        _sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
-        _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
     }
 
     protected override async Task OnInitializedAsync()
@@ -172,8 +170,6 @@ along with Foobar.  If not, see
         await base.OnInitializedAsync();
         _applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
         base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
-        _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
-        _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
     }
 
     void AddTrackClicked()
@@ -353,14 +349,4 @@ along with Foobar.  If not, see
             base.TraceChangeManager.BulkEdit = false;
         }
     }
-
-    void SessionStateContainer_ImportCuesheetChanged(object? sender, EventArgs args)
-    {
-        StateHasChanged();
-    }
-
-    void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
-    {
-        StateHasChanged();
-    }
 }
\ No newline at end of file

From afcdb8f08460688737256df9652702434a46e315 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 23 Apr 2026 13:56:15 +0200
Subject: [PATCH 091/150] Update SessionStateContainerTests.cs

---
 .../Services/UI/SessionStateContainerTests.cs | 58 +------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
index 1dd86caf..9039fa4e 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
@@ -26,63 +26,7 @@ namespace AudioCuesheetEditor.Tests.Services.UI
     [TestClass]
     public class SessionStateContainerTests
     {
-        private readonly Mock<ITraceChangeManager> _traceChangeManagerMock;
-        private readonly SessionStateContainer _sessionStateContainer;
-
-        public SessionStateContainerTests()
-        {
-            _traceChangeManagerMock = new Mock<ITraceChangeManager>();
-            _sessionStateContainer = new SessionStateContainer(_traceChangeManagerMock.Object);
-        }
-        
-        [TestMethod]
-        public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
-        {
-            // Arrange
-            var newCuesheet = new Cuesheet();
-            bool eventTriggered = false;
-            _sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
-
-            // Act
-            _sessionStateContainer.Cuesheet = newCuesheet;
-
-            // Assert
-            Assert.IsTrue(eventTriggered);
-            _traceChangeManagerMock.Verify(m => m.AddChange(It.Is<TracedChange>(x => x.TraceableObject == _sessionStateContainer && x.TraceableChange.PropertyName == nameof(SessionStateContainer.Cuesheet))), Times.Once);
-        }
-
-        [TestMethod]
-        public void ImportCuesheet_SetNewValue_ShouldTriggerImportCuesheetChangedEvent()
-        {
-            // Arrange
-            var newImportCuesheet = new Cuesheet();
-            bool eventTriggered = false;
-            _sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
-
-            // Act
-            _sessionStateContainer.ImportCuesheet = newImportCuesheet;
-
-            // Assert
-            Assert.IsTrue(eventTriggered);
-        }
-
-        [TestMethod]
-        public void ImportAudiofile_SetNewValue_ShouldUpdateImportCuesheetAndTriggerEvent()
-        {
-            // Arrange
-            var importCuesheet = new Cuesheet();
-            var audioFile = new Audiofile("Test audio file.mp3");
-            _sessionStateContainer.ImportCuesheet = importCuesheet;
-            bool eventTriggered = false;
-            _sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
-
-            // Act
-            _sessionStateContainer.ImportAudiofile = audioFile;
-
-            // Assert
-            Assert.AreEqual(audioFile, importCuesheet.Audiofile);
-            Assert.IsTrue(eventTriggered);
-        }
+        private readonly SessionStateContainer _sessionStateContainer = new();
 
         [TestMethod]
         public void ResetImport_ShouldClearImportProperties()

From 0c37684a00d5e3cf2fede0ff40013bb331854db2 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 23 Apr 2026 16:13:18 +0200
Subject: [PATCH 092/150] Update CuesheetData.razor

---
 .../Shared/Cuesheet/CuesheetData.razor        | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index e7607acf..9991c157 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -27,7 +27,7 @@ along with Foobar.  If not, see
 
 @if (Cuesheet != null)
 {
-    <MudForm @ref="form" Model="Cuesheet">
+    <MudForm @ref="_form" Model="Cuesheet">
         <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
                       Placeholder="@_localizer["Enter the cuesheet artist here"]" Variant="Variant.Outlined" />
         <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
@@ -36,11 +36,11 @@ along with Foobar.  If not, see
         {
             case ViewMode.ImportView:
             case ViewMode.DetailView:
-                <FileInput Id="@fileInputAudiofileId" Label="@_localizer["Audiofile"]" FileName="@Cuesheet.Audiofile?.Name" OnFileSelected="OnAudiofileSelected" Error="@fileInputAudiofileErrorText" 
+                <FileInput Id="@_fileInputAudiofileId" Label="@_localizer["Audiofile"]" FileName="@Cuesheet.Audiofile?.Name" OnFileSelected="OnAudiofileSelected" Error="@_fileInputAudiofileErrorText" 
                            Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" />
                 <FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile" 
-                           Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
-                <MudTextField @ref="catalogueNumberTextField" Value="@Cuesheet.Cataloguenumber" ValueChanged="(string? newValue) => _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue)" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
+                           Error="@_fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
+                <MudTextField @ref="_catalogueNumberTextField" @bind-Value="_catalogueNumber" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
                               Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined"
                               Mask="@(new PatternMask("00 00000 00000 0"))" OnBlur="CataloguenumberOnBlur" />
                 break;
@@ -64,19 +64,19 @@ along with Foobar.  If not, see
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
 
-    string? fileInputAudiofileId;
-    string? fileInputAudiofileErrorText;
-    string? fileInputCDTextfileErrorText;
-    string? catalogueNumber;
-    MudForm? form;
-    MudTextField<string>? catalogueNumberTextField;
+    string? _fileInputAudiofileId;
+    string? _fileInputAudiofileErrorText;
+    string? _fileInputCDTextfileErrorText;
+    string? _catalogueNumber;
+    MudForm? _form;
+    MudTextField<string>? _catalogueNumberTextField;
 
     protected override void OnInitialized()
     {
         base.OnInitialized();
-        if (fileInputAudiofileId == null)
+        if (_fileInputAudiofileId == null)
         {
-            fileInputAudiofileId = $"Input_Audiofile_{Guid.NewGuid()}";
+            _fileInputAudiofileId = $"Input_Audiofile_{Guid.NewGuid()}";
         }
         TraceChangeManager.UndoDone += TraceChangeManager_UndoDone;
         TraceChangeManager.RedoDone += TraceChangeManager_RedoDone;
@@ -92,11 +92,11 @@ along with Foobar.  If not, see
     protected override void OnParametersSet()
     {
         base.OnParametersSet();
-        if (form?.IsTouched == true)
+        if (_form?.IsTouched == true)
         {
             SetAudiofileValidationText();
         }
-        catalogueNumber = Cuesheet?.Cataloguenumber;
+        _catalogueNumber = Cuesheet?.Cataloguenumber;
     }
 
     async Task OnAudiofileSelected(IBrowserFile? browserFile)
@@ -105,13 +105,13 @@ along with Foobar.  If not, see
         {
             return;
         }
-        fileInputAudiofileErrorText = null;
+        _fileInputAudiofileErrorText = null;
         try 
         {
             Audiofile? audiofile = null;
             if (browserFile != null)
             {
-                var fileUpload = await _fileInputManager.CreateFileUploadsAsync([browserFile], fileInputAudiofileId);
+                var fileUpload = await _fileInputManager.CreateFileUploadsAsync([browserFile], _fileInputAudiofileId);
                 audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
             }
             base.TraceChangeManager.BulkEdit = true;
@@ -120,10 +120,10 @@ along with Foobar.  If not, see
         }
         catch(ArgumentException ae)
         {
-            fileInputAudiofileErrorText = ae.Message;
+            _fileInputAudiofileErrorText = ae.Message;
         }
         // Just validate the cuesheet if there is no error already
-        if (fileInputAudiofileErrorText == null)
+        if (_fileInputAudiofileErrorText == null)
         {
             SetAudiofileValidationText();
         }
@@ -138,11 +138,11 @@ along with Foobar.  If not, see
         var validationMessages = _validationService.Validate(Cuesheet, nameof(Cuesheet.Audiofile));
         if (validationMessages.Count() > 0)
         {
-            fileInputAudiofileErrorText = String.Join(Environment.NewLine, validationMessages);
+            _fileInputAudiofileErrorText = String.Join(Environment.NewLine, validationMessages);
         }
         else
         {
-            fileInputAudiofileErrorText = null;
+            _fileInputAudiofileErrorText = null;
         }
     }
 
@@ -152,7 +152,7 @@ along with Foobar.  If not, see
         {
             return;
         }
-        fileInputCDTextfileErrorText = null;
+        _fileInputCDTextfileErrorText = null;
         try
         {
             CDTextfile? newValue = null;
@@ -164,7 +164,7 @@ along with Foobar.  If not, see
         }
         catch (ArgumentException ae)
         {
-            fileInputCDTextfileErrorText = ae.Message;
+            _fileInputCDTextfileErrorText = ae.Message;
         }
     }
 
@@ -218,21 +218,19 @@ along with Foobar.  If not, see
 
     void CataloguenumberOnBlur()
     {
-        if (Cuesheet != null)
-        {
-            Cuesheet.Cataloguenumber = catalogueNumber?.Replace(" ", string.Empty);
-        }
+        var newValue = _catalogueNumber?.Replace(" ", string.Empty);
+        _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue);
     }
 
     void TraceChangeManager_RedoDone(object? sender, EventArgs e)
     {
-        catalogueNumber = Cuesheet?.Cataloguenumber;
-        catalogueNumberTextField?.ResetAsync();
+        _catalogueNumber = Cuesheet?.Cataloguenumber;
+        _catalogueNumberTextField?.ResetAsync();
     }
 
     void TraceChangeManager_UndoDone(object? sender, EventArgs e)
     {
-        catalogueNumber = Cuesheet?.Cataloguenumber;
-        catalogueNumberTextField?.ResetAsync();
+        _catalogueNumber = Cuesheet?.Cataloguenumber;
+        _catalogueNumberTextField?.ResetAsync();
     }
 }

From 1a5734c188f20403688d1ef90e1020ed1e53b404 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 24 Apr 2026 08:56:16 +0200
Subject: [PATCH 093/150] Update ImportManager.cs

---
 AudioCuesheetEditor/Services/IO/ImportManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 2f81a865..824aca6a 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -212,7 +212,6 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
                 {
                     var importTrack = tracks.ElementAt(i);
                     var track = _trackManager.Clone(importTrack);
-                    track.Cuesheet = null;
                     if (importTrack is ImportTrack importTrackReference)
                     {
                         if (importTrackReference.StartDateTime != null)

From c2c816f9c40a7c0fb1112cfd690352c36e37a4a6 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 24 Apr 2026 10:21:37 +0200
Subject: [PATCH 094/150] fix import

---
 .../Model/AudioCuesheet/Track.cs              |  1 +
 .../Services/IO/ImportManager.cs              | 51 ++++++++++++-------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index f97b1647..d3ab37bd 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -25,6 +25,7 @@ public class Track : Validateable, ITrack
         public String? Title { get; set; }
         public TimeSpan? Begin { get; set; }        
         public TimeSpan? End { get; set; }
+        //TODO: Remove, since we want to be a POCO
         [JsonIgnore]
         public TimeSpan? Length 
         {
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 824aca6a..fbca5f6e 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -207,30 +207,47 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
             }
             if (tracks != null)
             {
-                var begin = TimeSpan.Zero;
-                for (int i = 0; i < tracks.Count(); i++)
+                var sortedTracks = tracks
+                    .OrderByDescending(x => x.Position.HasValue)
+                    .ThenBy(x => x.Position)
+                    .ThenByDescending(x => x.Begin.HasValue)
+                    .ThenByDescending(x => x.Begin)
+                    .ThenByDescending(x => x.End.HasValue)
+                    .ThenBy(x => x.End);
+                List<Track> targetTracks = [];
+                TimeSpan? begin = TimeSpan.Zero;
+                ushort position = 1;
+                foreach (var (importTrack, index) in sortedTracks.Select((track, i) => (track, i)))
                 {
-                    var importTrack = tracks.ElementAt(i);
+                    // Copy track
                     var track = _trackManager.Clone(importTrack);
-                    if (importTrack is ImportTrack importTrackReference)
+                    track.Cuesheet = target;
+                    // Special treatment for StartDateTime of ImportTrack
+                    if (importTrack is ImportTrack importTrackReference && importTrackReference.StartDateTime != null)
                     {
-                        if (importTrackReference.StartDateTime != null)
+                        if (index < sortedTracks.Count() - 1)
                         {
-                            if (i < tracks.Count() - 1)
-                            {
-                                var nextTrack = (ImportTrack)tracks.ElementAt(i + 1);
-                                var length = nextTrack.StartDateTime - importTrackReference.StartDateTime;
-                                track.Begin = begin;
-                                track.End = begin + length;
-                                if (track.End.HasValue)
-                                {
-                                    begin = track.End.Value;
-                                }
-                            }
+                            var nextTrack = (ImportTrack)sortedTracks.ElementAt(index + 1);
+                            var length = nextTrack.StartDateTime - importTrackReference.StartDateTime;
+
+                            track.Begin = begin;
+                            track.End = begin + length;
                         }
                     }
-                    target.Tracks = target.Tracks.Append(track);
+                    // Calculate properties
+                    if (track.Position.HasValue == false)
+                    {
+                        track.Position = position;
+                    }
+                    if (track.Begin.HasValue == false)
+                    {
+                        track.Begin = begin;
+                    }
+                    begin = track.End;
+                    position++;
+                    targetTracks.Add(track);
                 }
+                target.Tracks = targetTracks;
             }
             else
             {

From 1b142bedeff3fbac32583f562fd9446021c6e269 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 24 Apr 2026 10:37:05 +0200
Subject: [PATCH 095/150] Update Track.cs

---
 AudioCuesheetEditor/Model/AudioCuesheet/Track.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
index d3ab37bd..1efc32ef 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -25,7 +25,6 @@ public class Track : Validateable, ITrack
         public String? Title { get; set; }
         public TimeSpan? Begin { get; set; }        
         public TimeSpan? End { get; set; }
-        //TODO: Remove, since we want to be a POCO
         [JsonIgnore]
         public TimeSpan? Length 
         {
@@ -44,8 +43,7 @@ public TimeSpan? Length
             {
                 if ((Begin.HasValue == false) && (End.HasValue == false))
                 {
-                    Begin = TimeSpan.Zero;
-                    End = Begin.Value + value;
+                    End = value;
                 }
                 else
                 {

From 7f141aba96f2ad681e9aabd10532cc6aac402701 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 24 Apr 2026 11:02:34 +0200
Subject: [PATCH 096/150] use events on sessionstatecontainer

---
 .../Services/UI/SessionStateContainerTests.cs | 30 +++++++++++++++++++
 .../Services/UI/ISessionStateContainer.cs     |  2 ++
 .../Services/UI/SessionStateContainer.cs      | 26 ++++++++++++++--
 .../Shared/Cuesheet/CuesheetData.razor        | 14 +++++++++
 .../Shared/TrackList/TrackList.razor          | 16 +++++++++-
 5 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
index 9039fa4e..02894def 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
@@ -28,6 +28,36 @@ public class SessionStateContainerTests
     {
         private readonly SessionStateContainer _sessionStateContainer = new();
 
+        [TestMethod]
+        public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
+        {
+            // Arrange
+            var newCuesheet = new Cuesheet();
+            bool eventTriggered = false;
+            _sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
+
+            // Act
+            _sessionStateContainer.Cuesheet = newCuesheet;
+
+            // Assert
+            Assert.IsTrue(eventTriggered);
+        }
+
+        [TestMethod]
+        public void ImportCuesheet_SetNewValue_ShouldTriggerImportCuesheetChangedEvent()
+        {
+            // Arrange
+            var newImportCuesheet = new Cuesheet();
+            bool eventTriggered = false;
+            _sessionStateContainer.ImportCuesheetChanged += (sender, args) => eventTriggered = true;
+
+            // Act
+            _sessionStateContainer.ImportCuesheet = newImportCuesheet;
+
+            // Assert
+            Assert.IsTrue(eventTriggered);
+        }
+
         [TestMethod]
         public void ResetImport_ShouldClearImportProperties()
         {
diff --git a/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
index 2ca754df..4dcd0aca 100644
--- a/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
@@ -21,6 +21,8 @@ namespace AudioCuesheetEditor.Services.UI
 {
     public interface ISessionStateContainer
     {
+        public event EventHandler? CuesheetChanged;
+        public event EventHandler? ImportCuesheetChanged;
         public Cuesheet Cuesheet { get; set; }
         public Cuesheet? ImportCuesheet { get; set; }
         public Audiofile? ImportAudiofile { get; set; }
diff --git a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
index 8d5de733..7015d7ba 100644
--- a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
@@ -21,8 +21,30 @@ namespace AudioCuesheetEditor.Services.UI
 {
     public class SessionStateContainer() : ISessionStateContainer
     {
-        public Cuesheet Cuesheet { get; set; } = new();
-        public Cuesheet? ImportCuesheet { get; set; }
+        private Cuesheet _cuesheet = new();
+        private Cuesheet? _importCuesheet;
+
+        public event EventHandler? CuesheetChanged;
+        public event EventHandler? ImportCuesheetChanged;
+
+        public Cuesheet Cuesheet 
+        {
+            get => _cuesheet;
+            set
+            {
+                _cuesheet = value;
+                CuesheetChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+        public Cuesheet? ImportCuesheet 
+        {
+            get => _importCuesheet;
+            set
+            {
+                _importCuesheet = value;
+                ImportCuesheetChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
         public Audiofile? ImportAudiofile { get; set; }
         public IImportfile? Importfile{ get; set; }
         public Boolean ImportIsAnalyzed { get; set; } = false;
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index 9991c157..47d2058a 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -80,6 +80,8 @@ along with Foobar.  If not, see
         }
         TraceChangeManager.UndoDone += TraceChangeManager_UndoDone;
         TraceChangeManager.RedoDone += TraceChangeManager_RedoDone;
+        _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
+        _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
     }
 
     protected override void Dispose(bool disposing)
@@ -87,6 +89,8 @@ along with Foobar.  If not, see
         base.Dispose(disposing);
         TraceChangeManager.UndoDone -= TraceChangeManager_UndoDone;
         TraceChangeManager.RedoDone -= TraceChangeManager_RedoDone;
+        _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
+        _sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
     }
 
     protected override void OnParametersSet()
@@ -233,4 +237,14 @@ along with Foobar.  If not, see
         _catalogueNumber = Cuesheet?.Cataloguenumber;
         _catalogueNumberTextField?.ResetAsync();
     }
+
+    void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
+    {
+        StateHasChanged();
+    }
+
+    void SessionStateContainer_ImportCuesheetChanged(object? sender, EventArgs args)
+    {
+        StateHasChanged();
+    }
 }
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 67196718..65a69cc8 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
     }
 </MudMenu>
 
-@code {
+    @code {
     //TODO: Disallow editing of position
     HashSet<Track> _selectedTracks = new();
     MudMenu? _trackContextMenu;
@@ -163,6 +163,8 @@ along with Foobar.  If not, see
     {
         base.Dispose(disposing);
         base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
+        _sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
+        _sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
     }
 
     protected override async Task OnInitializedAsync()
@@ -170,6 +172,8 @@ along with Foobar.  If not, see
         await base.OnInitializedAsync();
         _applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
         base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
+        _sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
+        _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
     }
 
     void AddTrackClicked()
@@ -349,4 +353,14 @@ along with Foobar.  If not, see
             base.TraceChangeManager.BulkEdit = false;
         }
     }
+
+    void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
+    {
+        StateHasChanged();
+    }
+
+    void SessionStateContainer_ImportCuesheetChanged(object? sender, EventArgs args)
+    {
+        StateHasChanged();
+    }
 }
\ No newline at end of file

From 1ecb1f5bad999379224bb60593a2bb95a5b610de Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 24 Apr 2026 14:50:34 +0200
Subject: [PATCH 097/150] fix import of cuesheet/project files

---
 AudioCuesheetEditor/Pages/Index.razor            |  4 ++++
 AudioCuesheetEditor/Services/IO/ImportManager.cs | 15 +++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/AudioCuesheetEditor/Pages/Index.razor b/AudioCuesheetEditor/Pages/Index.razor
index 8fe46021..636ff8ca 100644
--- a/AudioCuesheetEditor/Pages/Index.razor
+++ b/AudioCuesheetEditor/Pages/Index.razor
@@ -112,8 +112,12 @@ along with Foobar.  If not, see
                 switch (_sessionStateContainer.Importfile?.FileType)
                 {
                     case ImportFileType.ProjectFile:
+                        await _importManager.AnalyseImportfile();
+                        _sessionStateContainer.ResetImport();
+                        break;
                     case ImportFileType.Cuesheet:
                         await _importManager.AnalyseImportfile();
+                        _importManager.ImportCuesheet();
                         _sessionStateContainer.ResetImport();
                         break;
                     case ImportFileType.Textfile:
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index fbca5f6e..d26f035e 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -18,6 +18,7 @@
 using AudioCuesheetEditor.Model.IO;
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.UI;
 using AudioCuesheetEditor.Services.AudioCuesheet;
 using AudioCuesheetEditor.Services.UI;
 using System.Diagnostics;
@@ -69,7 +70,10 @@ public async Task AnalyseImportfile()
                 switch (_sessionStateContainer.Importfile?.FileType)
                 {
                     case ImportFileType.ProjectFile:
-                        _sessionStateContainer.Cuesheet = Projectfile.ImportFile(fileContent)!;
+                        var importedCuesheet = Projectfile.ImportFile(fileContent);
+                        var previousValue = _sessionStateContainer.Cuesheet;
+                        _sessionStateContainer.Cuesheet = importedCuesheet!;
+                        _traceChangeManager.AddChange(new TracedChange(_sessionStateContainer, new(previousValue, nameof(SessionStateContainer.Cuesheet))));
                         break;
                     case ImportFileType.Textfile:
                         _sessionStateContainer.Importfile = await _textImportService.AnalyseAsync(fileContent);
@@ -83,17 +87,12 @@ public async Task AnalyseImportfile()
             {
                 switch (_sessionStateContainer.Importfile?.FileType)
                 {
+                    case ImportFileType.Cuesheet:
                     case ImportFileType.Textfile:
                         var importCuesheet = new Cuesheet();
                         CopyCuesheet(importCuesheet, _sessionStateContainer.Importfile.AnalyzedCuesheet);
                         _sessionStateContainer.ImportCuesheet = importCuesheet;
                         break;
-                    case ImportFileType.Cuesheet:
-                        _traceChangeManager.BulkEdit = true;
-                        _sessionStateContainer.Cuesheet = new();
-                        CopyCuesheet(_sessionStateContainer.Cuesheet, _sessionStateContainer.Importfile.AnalyzedCuesheet);
-                        _traceChangeManager.BulkEdit = false;
-                        break;
                 }
             }
             stopwatch.Stop();
@@ -113,7 +112,7 @@ public void ImportCuesheet()
                 CopyCuesheet(newCuesheet, _sessionStateContainer.ImportCuesheet);
                 var previousValue = _sessionStateContainer.Cuesheet;
                 _sessionStateContainer.Cuesheet = newCuesheet;
-                _traceChangeManager.AddChange(new Model.UI.TracedChange(_sessionStateContainer, new(previousValue, nameof(SessionStateContainer.Cuesheet))));
+                _traceChangeManager.AddChange(new TracedChange(_sessionStateContainer, new(previousValue, nameof(SessionStateContainer.Cuesheet))));
             }
             _sessionStateContainer.ResetImport();
             stopwatch.Stop();

From c46189ddb11bcd9abb5756854c3b33efd1a0f927 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 24 Apr 2026 15:04:51 +0200
Subject: [PATCH 098/150] Update ImportManagerTests.cs

---
 .../Services/IO/ImportManagerTests.cs         | 110 ++++++++----------
 1 file changed, 50 insertions(+), 60 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs b/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
index a952bdb9..66375390 100644
--- a/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/IO/ImportManagerTests.cs
@@ -217,76 +217,66 @@ public async Task AnalyseImportfile_WithoutAnalysedCuesheet_DoesNothing()
         }
 
         [TestMethod()]
-        public async Task AnalyseImportfile_ExistingCuesheet_OverwritesCuesheet()
+        public async Task AnalyseImportfile_ExistingCuesheet_SetsImportfileCuesheet()
         {
             // Arrange
-            var track = new Track()
+            var fileContent = @"PERFORMER ""Sample CD Artist""
+TITLE ""Sample CD Title""
+FILE ""Sample.mp3"" MP3
+TRACK 01 AUDIO
+	PERFORMER ""Sample Artist 1""
+	TITLE ""Sample Title 1""
+	INDEX 01 00:00:00
+TRACK 02 AUDIO
+	PERFORMER ""Sample Artist 2""
+	TITLE ""Sample Title 2""
+	INDEX 01 05:00:00
+TRACK 03 AUDIO
+	PERFORMER ""Sample Artist 3""
+	TITLE ""Sample Title 3""
+	INDEX 01 09:23:00
+TRACK 04 AUDIO
+	PERFORMER ""Sample Artist 4""
+	TITLE ""Sample Title 4""
+	INDEX 01 15:54:00
+TRACK 05 AUDIO
+	PERFORMER ""Sample Artist 5""
+	TITLE ""Sample Title 5""
+	INDEX 01 20:13:00
+TRACK 06 AUDIO
+	PERFORMER ""Sample Artist 6""
+	TITLE ""Sample Title 6""
+	INDEX 01 24:54:00
+TRACK 07 AUDIO
+	PERFORMER ""Sample Artist 7""
+	TITLE ""Sample Title 7""
+	INDEX 01 31:54:00
+TRACK 08 AUDIO
+	PERFORMER ""Sample Artist 8""
+	TITLE ""Sample Title 8""
+	INDEX 01 45:54:00
+";
+            IImportfile sessionStateContainerImportFile = new Importfile()
             {
-                Artist = "Test Track Artist 1",
-                Title = "Test Track Title 1",
-                Begin = new TimeSpan(0, 3, 20),
-                End = new TimeSpan(0, 7, 43),
-                Flags = [Flag.DCP],
-                Position = 1,
-                PreGap = new TimeSpan(0, 0, 2),
-                PostGap = new TimeSpan(0, 0, 4)
-            };
-            var sessionStateContainerCuesheet = new Cuesheet()
-            {
-                Artist = "Test Cuesheet Artist",
-                Title = "Test Cuesheet Title",
-                Cataloguenumber = "Test Cuesheet Cataloguenumber",
-                Tracks = [track]
-            };
-            track.Cuesheet = sessionStateContainerCuesheet;
-            var importCuesheet = new ImportCuesheet()
-            {
-                Artist = "Test ImportCuesheet Artist",
-                Title = "Test ImportCuesheet Title",
-                Audiofile = "Test ImportCuesheet Audiofile",
-                Cataloguenumber = "Test ImportCuesheet Cataloguenumber",
-                CDTextfile = "Test ImportCuesheet CDTextfile"
-            };
-            importCuesheet.Tracks.Add(new()
-            {
-                Artist = "Test ImportCuesheet Track Artist 1",
-                Title = "Test ImportCuesheet Track Title 1",
-                Begin = new TimeSpan(0, 0, 10),
-                End = new TimeSpan(0, 5, 23),
-                Flags = [Flag.SCMS],
-                Position = 1,
-                PreGap = new TimeSpan(0, 0, 4),
-                PostGap = new TimeSpan(0, 0, 6)
-            });
-            var sessionStateContainerImportFile = new Importfile()
-            {
-                FileContent = "Some file content!",
-                FileType = ImportFileType.Cuesheet,
-                AnalyzedCuesheet = importCuesheet
+                FileContent = fileContent,
+                FileType = ImportFileType.Cuesheet
             };
 
-            _sessionStateContainerMock.SetupGet(x => x.Cuesheet).Returns(() => sessionStateContainerCuesheet);
-            _sessionStateContainerMock.SetupSet(x => x.Cuesheet = It.IsAny<Cuesheet>()).Callback<Cuesheet>(cuesheet => sessionStateContainerCuesheet = cuesheet);
             _sessionStateContainerMock.SetupGet(x => x.Importfile).Returns(() => sessionStateContainerImportFile);
+            _sessionStateContainerMock.SetupSet(x => x.Importfile = It.IsAny<IImportfile>()).Callback<IImportfile>(importfile => sessionStateContainerImportFile = importfile);
 
             // Act
             await _service.AnalyseImportfile();
             // Assert
-            Assert.AreEqual(importCuesheet.Artist, sessionStateContainerCuesheet.Artist);
-            Assert.AreEqual(importCuesheet.Title, sessionStateContainerCuesheet.Title);
-            Assert.IsNotNull(sessionStateContainerCuesheet.Audiofile);
-            Assert.AreEqual(importCuesheet.Audiofile, sessionStateContainerCuesheet.Audiofile.Name);
-            Assert.IsNotNull(sessionStateContainerCuesheet.CDTextfile);
-            Assert.AreEqual(importCuesheet.CDTextfile, sessionStateContainerCuesheet.CDTextfile.Name);
-            Assert.HasCount(importCuesheet.Tracks.Count, sessionStateContainerCuesheet.Tracks);
-            Assert.AreEqual(importCuesheet.Tracks.First().Artist, sessionStateContainerCuesheet.Tracks.First().Artist);
-            Assert.AreEqual(importCuesheet.Tracks.First().Begin, sessionStateContainerCuesheet.Tracks.First().Begin);
-            Assert.AreEqual(importCuesheet.Tracks.First().End, sessionStateContainerCuesheet.Tracks.First().End);
-            CollectionAssert.AreEquivalent(importCuesheet.Tracks.First().Flags.ToList(), sessionStateContainerCuesheet.Tracks.First().Flags.ToList());
-            Assert.AreEqual(importCuesheet.Tracks.First().Position, sessionStateContainerCuesheet.Tracks.First().Position);
-            Assert.AreEqual(importCuesheet.Tracks.First().PostGap, sessionStateContainerCuesheet.Tracks.First().PostGap);
-            Assert.AreEqual(importCuesheet.Tracks.First().PreGap, sessionStateContainerCuesheet.Tracks.First().PreGap);
-            Assert.AreEqual(importCuesheet.Tracks.First().Title, sessionStateContainerCuesheet.Tracks.First().Title);
+            Assert.IsNotNull(sessionStateContainerImportFile.AnalyzedCuesheet);
+            Assert.AreEqual("Sample CD Artist", sessionStateContainerImportFile.AnalyzedCuesheet.Artist);
+            Assert.AreEqual("Sample CD Title", sessionStateContainerImportFile.AnalyzedCuesheet.Title);
+            Assert.IsNotNull(sessionStateContainerImportFile.AnalyzedCuesheet.Audiofile);
+            Assert.AreEqual("Sample.mp3", sessionStateContainerImportFile.AnalyzedCuesheet.Audiofile);
+            Assert.HasCount(8, sessionStateContainerImportFile.AnalyzedCuesheet.Tracks);
+            Assert.AreEqual("Sample Artist 1", sessionStateContainerImportFile.AnalyzedCuesheet.Tracks.First().Artist);
+            Assert.AreEqual(TimeSpan.Zero, sessionStateContainerImportFile.AnalyzedCuesheet.Tracks.First().Begin);
+            Assert.AreEqual("Sample Title 1", sessionStateContainerImportFile.AnalyzedCuesheet.Tracks.First().Title);
         }
 
         [TestMethod]

From eacda4de9bcda0d787aaffba9d211834acfe7b9b Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Fri, 24 Apr 2026 15:32:43 +0200
Subject: [PATCH 099/150] Update ImportManager.cs

---
 .../Services/IO/ImportManager.cs              | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index d26f035e..5331d7f3 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -206,13 +206,31 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
             }
             if (tracks != null)
             {
-                var sortedTracks = tracks
-                    .OrderByDescending(x => x.Position.HasValue)
-                    .ThenBy(x => x.Position)
-                    .ThenByDescending(x => x.Begin.HasValue)
-                    .ThenByDescending(x => x.Begin)
-                    .ThenByDescending(x => x.End.HasValue)
-                    .ThenBy(x => x.End);
+                IOrderedEnumerable<ITrack> sortedTracks;
+                if (tracks.All(x => x.Position.HasValue))
+                {
+                    sortedTracks = tracks.OrderBy(x => x.Position);
+                }
+                else
+                {
+                    sortedTracks = tracks.OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position);
+                }
+                if (sortedTracks.All(x => x.Begin.HasValue))
+                {
+                    sortedTracks = sortedTracks.ThenBy(x => x.Begin);
+                }
+                else
+                {
+                    sortedTracks = sortedTracks.ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin);
+                }
+                if (sortedTracks.All(x => x.End.HasValue))
+                {
+                    sortedTracks = sortedTracks.ThenBy(x => x.End);
+                }
+                else
+                {
+                    sortedTracks = sortedTracks.ThenByDescending(x => x.End.HasValue).ThenBy(x => x.End);
+                }
                 List<Track> targetTracks = [];
                 TimeSpan? begin = TimeSpan.Zero;
                 ushort position = 1;

From 2a44a89237ad793f08cea4690f3b30a882379d1d Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 28 Apr 2026 10:19:43 +0200
Subject: [PATCH 100/150] Update ImportManager.cs

---
 .../Services/IO/ImportManager.cs              | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 5331d7f3..1a17a2dc 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -236,20 +236,20 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
                 ushort position = 1;
                 foreach (var (importTrack, index) in sortedTracks.Select((track, i) => (track, i)))
                 {
+                    ITrack? nextTrack = null;
+                    if (index < sortedTracks.Count() - 1)
+                    {
+                        nextTrack = sortedTracks.ElementAt(index + 1);
+                    }
                     // Copy track
                     var track = _trackManager.Clone(importTrack);
                     track.Cuesheet = target;
                     // Special treatment for StartDateTime of ImportTrack
-                    if (importTrack is ImportTrack importTrackReference && importTrackReference.StartDateTime != null)
+                    if (importTrack is ImportTrack importTrackReference && importTrackReference.StartDateTime != null && nextTrack is ImportTrack nextImportTrackReference)
                     {
-                        if (index < sortedTracks.Count() - 1)
-                        {
-                            var nextTrack = (ImportTrack)sortedTracks.ElementAt(index + 1);
-                            var length = nextTrack.StartDateTime - importTrackReference.StartDateTime;
-
-                            track.Begin = begin;
-                            track.End = begin + length;
-                        }
+                        var length = nextImportTrackReference.StartDateTime - importTrackReference.StartDateTime;
+                        track.Begin = begin;
+                        track.End = begin + length;
                     }
                     // Calculate properties
                     if (track.Position.HasValue == false)
@@ -260,6 +260,10 @@ private void CopyCuesheet(Cuesheet target, ICuesheet cuesheetToCopy)
                     {
                         track.Begin = begin;
                     }
+                    if ((track.End.HasValue == false) && (nextTrack?.Begin.HasValue == true))
+                    {
+                        track.End = nextTrack.Begin;
+                    }
                     begin = track.End;
                     position++;
                     targetTracks.Add(track);

From d5526fbf2d9b57544b25946b46516237b8a9b8cb Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 28 Apr 2026 11:53:43 +0200
Subject: [PATCH 101/150] fix tests

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 22 +++++++++++++++++++
 .../Services/AudioCuesheet/CuesheetManager.cs |  6 ++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index 9b15c035..8633d305 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -72,6 +72,28 @@ public void SetProperty_EqualValue_DoesntChangeProperty()
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Artist))), Times.Never);
         }
 
+        [TestMethod]
+        public void SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso()
+        {
+            // Arrange
+            var track = new Track()
+            {
+                Position = 1
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track]
+            };
+            track.Cuesheet = cuesheet;
+            var duration = new TimeSpan(0, 5, 23);
+            var audiofile = new Audiofile("Test.mp3", nameof(SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso), Audiofile.AudioCodecs.First(), duration);
+            // Act
+            _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
+            // Assert
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Audiofile))), Times.Once);
+            Assert.AreEqual(duration, track.End);
+        }
+
         [TestMethod]
         public void IsRecordingPossible_WithoutTracks_ReturnsSuccess()
         {
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 5ccef4c8..24ad3c63 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -182,7 +182,11 @@ void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>
 
         void SetLastTrackEnd()
         {
-            var lastTrack = _sessionStateContainer.Cuesheet.Tracks.LastOrDefault();
+            var lastTrack = _sessionStateContainer.Cuesheet.Tracks
+                .OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position)
+                .ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin)
+                .ThenByDescending(x => x.End.HasValue).ThenBy(x => x.End)
+                .LastOrDefault();
             if ((lastTrack?.End.HasValue == false) && (_sessionStateContainer.Cuesheet.Audiofile?.Duration.HasValue == true))
             {
                 _trackManager.SetProperty(lastTrack, x => x.End, _sessionStateContainer.Cuesheet.Audiofile.Duration);

From 5c8d53319ac14adb5686fbd8da9df229521bbaf9 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 28 Apr 2026 13:18:32 +0200
Subject: [PATCH 102/150] fix cuesheet changes

---
 AudioCuesheetEditor/Pages/Index.razor             | 15 ++-------------
 .../Shared/Record/ControlRecording.razor          |  1 -
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/AudioCuesheetEditor/Pages/Index.razor b/AudioCuesheetEditor/Pages/Index.razor
index 636ff8ca..afcb8a27 100644
--- a/AudioCuesheetEditor/Pages/Index.razor
+++ b/AudioCuesheetEditor/Pages/Index.razor
@@ -25,6 +25,7 @@ along with Foobar.  If not, see
 @inject ISessionStateContainer _sessionStateContainer
 @inject DialogManager _dialogManager
 @inject ISnackbar _snackbar
+@inject ICuesheetManager _cuesheetManager
 
 <CascadingValue Value="currentViewmode">
     <MudTabs Rounded ApplyEffectsToContainer Outlined Color="Color.Success" ActivePanelIndex="(int)currentViewmode" ActivePanelIndexChanged="this.AsNonRenderingEventHandler<int>(ActiveTabIndexChanged)">
@@ -44,18 +45,6 @@ along with Foobar.  If not, see
     ViewOptions? options;
     ViewMode currentViewmode = ViewMode.DetailView;
 
-    public Cuesheet? Cuesheet
-    {
-        get
-        {
-            if (currentViewmode == ViewMode.ImportView)
-            {
-                return _sessionStateContainer.ImportCuesheet;
-            }
-            return _sessionStateContainer.Cuesheet;
-        }
-    }
-
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
@@ -126,7 +115,7 @@ along with Foobar.  If not, see
                 }
                 if ((Cuesheet != null) && (_sessionStateContainer.ImportAudiofile != null))
                 {
-                    Cuesheet.Audiofile = _sessionStateContainer.ImportAudiofile;
+                    _cuesheetManager.SetProperty(x => x.Audiofile, _sessionStateContainer.ImportAudiofile);
                 }
             }
             finally
diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
index 4badfa39..5346ce28 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
@@ -122,7 +122,6 @@ along with Foobar.  If not, see
         if (result.IsSuccess)
         {
             _updateGUITimer.Start();
-            Cuesheet.Audiofile = null;
         }
         else
         {

From ae46f24c06d61ba1bf5d9e5a67da4f0de82366f0 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 28 Apr 2026 13:18:52 +0200
Subject: [PATCH 103/150] Update Index.razor

---
 AudioCuesheetEditor/Pages/Index.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Pages/Index.razor b/AudioCuesheetEditor/Pages/Index.razor
index afcb8a27..445ba103 100644
--- a/AudioCuesheetEditor/Pages/Index.razor
+++ b/AudioCuesheetEditor/Pages/Index.razor
@@ -113,7 +113,7 @@ along with Foobar.  If not, see
                         await LocalStorageOptionsProvider.SaveOptionsValueAsync<ViewOptions>(x => x.ActiveTab, ViewMode.ImportView);
                         break;
                 }
-                if ((Cuesheet != null) && (_sessionStateContainer.ImportAudiofile != null))
+                if (_sessionStateContainer.ImportAudiofile != null)
                 {
                     _cuesheetManager.SetProperty(x => x.Audiofile, _sessionStateContainer.ImportAudiofile);
                 }

From 1441bd1f885aaec3e102ee55d50d94d7a5b27cd9 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 28 Apr 2026 14:37:42 +0200
Subject: [PATCH 104/150] calculate track end when setting audiofile

---
 .../Services/AudioCuesheet/CuesheetManagerTests.cs       | 9 +++++++++
 .../Services/AudioCuesheet/CuesheetManager.cs            | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index 8633d305..0197991c 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -85,6 +85,15 @@ public void SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso()
                 Tracks = [track]
             };
             track.Cuesheet = cuesheet;
+            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            _trackManager.Setup(x => x.SetProperty(track, x => x.End, It.IsAny<TimeSpan>())).Callback<Track, Expression<Func<Track, TimeSpan?>>, TimeSpan?>((t, propExpression, value) =>
+            {
+                var memberExpression = propExpression.Body as MemberExpression;
+                if (memberExpression?.Member is PropertyInfo propInfo)
+                {
+                    propInfo.SetValue(t, value);
+                }
+            });
             var duration = new TimeSpan(0, 5, 23);
             var audiofile = new Audiofile("Test.mp3", nameof(SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso), Audiofile.AudioCodecs.First(), duration);
             // Act
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 24ad3c63..f7c8a623 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -32,7 +32,15 @@ public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionSta
         /// <inheritdoc/>
         public void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
+            _traceChangeManager.BulkEdit = true;
+            var audiofile = _sessionStateContainer.Cuesheet.Audiofile;
             SetValue(_sessionStateContainer.Cuesheet, propertyExpression, value);
+            // If audiofile has been set, we need to calculate last track end
+            if (audiofile != _sessionStateContainer.Cuesheet.Audiofile)
+            {
+                SetLastTrackEnd();
+            }
+            _traceChangeManager.BulkEdit = false;
         }
 
         /// <inheritdoc/>

From aaf9ce48451f455a214eccf120518739f4107a0a Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 28 Apr 2026 15:01:41 +0200
Subject: [PATCH 105/150] Update TrackManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 8098fbe3..b3ec2779 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -128,16 +128,15 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
         /// <inheritdoc/>
         public Track? GetNextLinkedTrack(Track track)
         {
-            Track? nextLinkedTrack = null;
             if (track.Position.HasValue)
             {
-                nextLinkedTrack = track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position == track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
+                return track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position >= track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
             }
             if (track.End.HasValue)
             {
-                nextLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.Begin).LastOrDefault(x => x.Begin <= track.End && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
+                return track.Cuesheet?.Tracks.OrderBy(x => x.Begin).LastOrDefault(x => x.Begin <= track.End && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
             }
-            return nextLinkedTrack;
+            return null;
         }
 
         void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)

From 3ba5ab9fe11bbf7c4cd6b7d792374fa42a0be10d Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 28 Apr 2026 15:04:48 +0200
Subject: [PATCH 106/150] Update CuesheetManager.cs

---
 .../Services/AudioCuesheet/CuesheetManager.cs                | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index f7c8a623..84e5b3da 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -110,6 +110,7 @@ public void AddTrack(Track track)
             }
             else
             {
+                //TODO: All this changes needs to be done with previousvalue for tracechangemanager, because otherwise undo will not work as expected
                 var trackBeforeNewTrack = cuesheet.Tracks.Last();
                 if ((cuesheet.Audiofile?.Duration.HasValue == true) && (trackBeforeNewTrack.End.HasValue) && (trackBeforeNewTrack.End == cuesheet.Audiofile.Duration))
                 {
@@ -139,8 +140,10 @@ public void AddTrack(Track track)
             {
                 track
             };
+            _traceChangeManager.BulkEdit = true;
             SetValue(cuesheet, x => x.Tracks, newValue);
             SetLastTrackEnd();
+            _traceChangeManager.BulkEdit = false;
         }
 
         /// <inheritdoc/>
@@ -161,8 +164,10 @@ public void RemoveTracks(IEnumerable<Track> tracksToRemove)
                     track.Begin = previousTrack.End;
                 }
             }
+            _traceChangeManager.BulkEdit = true;
             SetValue(cuesheet, x => x.Tracks, newValue);
             SetLastTrackEnd();
+            _traceChangeManager.BulkEdit = false;
         }
 
         void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)

From add90420595b37d9eed52948ea89a4c6bafaa984 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 28 Apr 2026 16:28:36 +0200
Subject: [PATCH 107/150] fix track calculation

---
 .../Tests/Desktop/TracingTest.cs              | 109 +++++++++++++++++-
 .../Tests/Smartphone/TracingTestSmartphone.cs | 102 ++++++++++++++++
 .../Services/AudioCuesheet/CuesheetManager.cs |  39 +++----
 3 files changed, 229 insertions(+), 21 deletions(-)

diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
index a8ea9840..a16a4fa0 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
@@ -1242,8 +1242,115 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox
       - cell:
         - button
+  - rowgroup:
+    - row");
+        }
+
+        [TestMethod]
+        public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoWithAudiofile()
+        {
+            var bar = new AppBar(TestPage);
+            var detailView = new DetailView(TestPage);
+            await detailView.GotoAsync();
+            await detailView.AddTrackAsync();
+            await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
+            await detailView.AddTrackAsync();
+            await Expect(bar.UndoButton).ToBeEnabledAsync();
+            await Expect(bar.RedoButton).ToBeDisabledAsync();
+            await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup:
+    - row ""# Artist Title Begin End Length Status"":
+      - columnheader:
+        - checkbox
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
+      - columnheader ""Status""
+  - rowgroup:
+    - row ""Increment Decrement 00:00:00"":
+      - cell:
+        - checkbox
+      - cell ""Increment Decrement"":
+        - spinbutton: ""1""
+        - button ""Increment""
+        - button ""Decrement""
+      - cell:
+        - textbox
+        - button
+      - cell:
+        - textbox
+        - button
+      - cell ""00:00:00"":
+        - textbox: 00:00:00
+      - cell:
+        - textbox
+      - cell:
+        - textbox
+      - cell
+    - row ""Increment Decrement 00:05:48.0608330"":
+      - cell:
+        - checkbox
+      - cell ""Increment Decrement"":
+        - spinbutton: ""2""
+        - button ""Increment""
+        - button ""Decrement""
+      - cell:
+        - textbox
+        - button
+      - cell:
+        - textbox
+        - button
+      - cell:
+        - textbox
+      - cell ""00:05:48.0608330"":
+        - textbox: 00:05:48.0608330
+      - cell:
+        - textbox
+      - cell:
+        - button
+  - rowgroup:
+    - row");
+            await bar.UndoAsync();
+            await Expect(bar.UndoButton).ToBeEnabledAsync();
+            await Expect(bar.RedoButton).ToBeEnabledAsync();
+            await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup:
+    - row ""# Artist Title Begin End Length Status"":
+      - columnheader:
+        - checkbox
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
+      - columnheader ""Status""
+  - rowgroup:
+    - row ""Increment Decrement 00:00:00 00:05:48.0608330 00:05:48.0608330"":
+      - cell:
+        - checkbox
+      - cell ""Increment Decrement"":
+        - spinbutton: ""1""
+        - button ""Increment""
+        - button ""Decrement""
+      - cell:
+        - textbox
+        - button
+      - cell:
+        - textbox
+        - button
+      - cell ""00:00:00"":
+        - textbox: 00:00:00
+      - cell ""00:05:48.0608330"":
+        - textbox: 00:05:48.0608330
+      - cell ""00:05:48.0608330"":
+        - textbox: 00:05:48.0608330
+      - cell
   - rowgroup:
     - row");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
index e0198f87..45acbc0b 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
@@ -1433,5 +1433,107 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Status
         - button");
         }
+
+        [TestMethod]
+        public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoWithAudiofile()
+        {
+            var bar = new AppBar(TestPage);
+            var detailView = new DetailView(TestPage);
+            await detailView.GotoAsync();
+            await detailView.AddTrackAsync();
+            await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
+            await detailView.AddTrackAsync();
+            await Expect(bar.UndoButton).ToBeEnabledAsync();
+            await Expect(bar.RedoButton).ToBeDisabledAsync();
+            await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
+  - rowgroup:
+    - row ""# Increment Decrement Artist Title Begin 00:00:00 End Length Status"":
+      - cell:
+        - checkbox
+      - cell ""# Increment Decrement"":
+        - text: ""#""
+        - spinbutton: ""1""
+        - button ""Increment""
+        - button ""Decrement""
+      - cell ""Artist"":
+        - text: Artist
+        - textbox
+        - button
+      - cell ""Title"":
+        - text: Title
+        - textbox
+        - button
+      - cell ""Begin 00:00:00"":
+        - text: Begin
+        - textbox: 00:00:00
+      - cell ""End"":
+        - text: End
+        - textbox
+      - cell ""Length"":
+        - text: Length
+        - textbox
+      - cell ""Status""
+    - row ""# Increment Decrement Artist Title Begin End 00:05:48.0608330 Length Status"":
+      - cell:
+        - checkbox
+      - cell ""# Increment Decrement"":
+        - text: ""#""
+        - spinbutton: ""2""
+        - button ""Increment""
+        - button ""Decrement""
+      - cell ""Artist"":
+        - text: Artist
+        - textbox
+        - button
+      - cell ""Title"":
+        - text: Title
+        - textbox
+        - button
+      - cell ""Begin"":
+        - text: Begin
+        - textbox
+      - cell ""End 00:05:48.0608330"":
+        - text: End
+        - textbox: 00:05:48.0608330
+      - cell ""Length"":
+        - text: Length
+        - textbox
+      - cell ""Status"":
+        - text: Status
+        - button");
+            await bar.UndoAsync();
+            await Expect(bar.UndoButton).ToBeEnabledAsync();
+            await Expect(bar.RedoButton).ToBeEnabledAsync();
+            await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
+  - rowgroup:
+    - row ""# Increment Decrement Artist Title Begin 00:00:00 End 00:05:48.0608330 Length 00:05:48.0608330 Status"":
+      - cell:
+        - checkbox
+      - cell ""# Increment Decrement"":
+        - text: ""#""
+        - spinbutton: ""1""
+        - button ""Increment""
+        - button ""Decrement""
+      - cell ""Artist"":
+        - text: Artist
+        - textbox
+        - button
+      - cell ""Title"":
+        - text: Title
+        - textbox
+        - button
+      - cell ""Begin 00:00:00"":
+        - text: Begin
+        - textbox: 00:00:00
+      - cell ""End 00:05:48.0608330"":
+        - text: End
+        - textbox: 00:05:48.0608330
+      - cell ""Length 00:05:48.0608330"":
+        - text: Length
+        - textbox: 00:05:48.0608330
+      - cell ""Status""");
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 84e5b3da..cd148412 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -96,51 +96,49 @@ public void AddTrack(Track track)
             var cuesheet = _sessionStateContainer.Cuesheet;
             track.Cuesheet = cuesheet;
             // Calculate track properties
+            _traceChangeManager.BulkEdit = true;
             if (cuesheet.IsRecording)
             {
-                track.Begin = DateTime.UtcNow - cuesheet.RecordingStart;
+                _trackManager.SetProperty(track, x => x.Begin, DateTime.UtcNow - cuesheet.RecordingStart);
             }
             if (cuesheet.Tracks.Any() == false)
             {
-                track.Position = 1;
+                _trackManager.SetProperty(track, x => x.Position, (ushort)(1));
                 if ((track.Begin.HasValue == false) || cuesheet.IsRecording)
                 {
-                    track.Begin = TimeSpan.Zero;
+                    _trackManager.SetProperty(track, x => x.Begin, TimeSpan.Zero);
                 }
             }
             else
             {
-                //TODO: All this changes needs to be done with previousvalue for tracechangemanager, because otherwise undo will not work as expected
-                var trackBeforeNewTrack = cuesheet.Tracks.Last();
-                if ((cuesheet.Audiofile?.Duration.HasValue == true) && (trackBeforeNewTrack.End.HasValue) && (trackBeforeNewTrack.End == cuesheet.Audiofile.Duration))
+                if ((cuesheet.Audiofile?.Duration.HasValue == true) && (LastTrack?.End.HasValue == true) && (LastTrack.End == cuesheet.Audiofile.Duration))
                 {
-                    trackBeforeNewTrack.End = null;
+                    _trackManager.SetProperty(LastTrack, x => x.End, null);
                 }
                 if (track.Position.HasValue == false)
                 {
-                    track.Position = (ushort?)(trackBeforeNewTrack.Position + 1);
+                    _trackManager.SetProperty(track, x => x.Position, (ushort?)(LastTrack?.Position + 1));
                 }
                 if (track.Begin.HasValue == false)
                 {
-                    track.Begin = trackBeforeNewTrack.End;
+                    track.Begin = LastTrack?.End;
                 }
                 else
                 {
-                    if (trackBeforeNewTrack.End.HasValue == false)
+                    if (LastTrack?.End.HasValue == false)
                     {
-                        trackBeforeNewTrack.End = track.Begin;
+                        _trackManager.SetProperty(LastTrack, x => x.End, track.Begin);
                     }
                 }
-                if (cuesheet.IsRecording)
+                if (cuesheet.IsRecording && LastTrack != null)
                 {
-                    trackBeforeNewTrack.End = track.Begin;
+                    _trackManager.SetProperty(LastTrack, x => x.End, track.Begin);
                 }
             }
             var newValue = new List<Track>(cuesheet.Tracks)
             {
                 track
             };
-            _traceChangeManager.BulkEdit = true;
             SetValue(cuesheet, x => x.Tracks, newValue);
             SetLastTrackEnd();
             _traceChangeManager.BulkEdit = false;
@@ -195,15 +193,16 @@ void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>
 
         void SetLastTrackEnd()
         {
-            var lastTrack = _sessionStateContainer.Cuesheet.Tracks
+            if ((LastTrack?.End.HasValue == false) && (_sessionStateContainer.Cuesheet.Audiofile?.Duration.HasValue == true))
+            {
+                _trackManager.SetProperty(LastTrack, x => x.End, _sessionStateContainer.Cuesheet.Audiofile.Duration);
+            }
+        }
+
+        Track? LastTrack => _sessionStateContainer.Cuesheet.Tracks
                 .OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position)
                 .ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin)
                 .ThenByDescending(x => x.End.HasValue).ThenBy(x => x.End)
                 .LastOrDefault();
-            if ((lastTrack?.End.HasValue == false) && (_sessionStateContainer.Cuesheet.Audiofile?.Duration.HasValue == true))
-            {
-                _trackManager.SetProperty(lastTrack, x => x.End, _sessionStateContainer.Cuesheet.Audiofile.Duration);
-            }
-        }
     }
 }

From fd27e20539f2511c0dd5139a565d7cd37c412f94 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 29 Apr 2026 08:48:41 +0200
Subject: [PATCH 108/150] Update CuesheetManagerTests.cs

---
 .../Services/AudioCuesheet/CuesheetManagerTests.cs   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index 0197991c..b53a3b91 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -392,7 +392,17 @@ public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainin
                 Track? previousLinkedTrack = null;
                 if (track.IsLinkedToPreviousTrack)
                 {
-                    previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1);
+                    if (track.Position.HasValue)
+                    {
+                        previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
+                    }
+                    else
+                    {
+                        if (track.Begin.HasValue)
+                        {
+                            previousLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.End).LastOrDefault(x => x.End <= track.Begin);
+                        }
+                    }
                 }
                 return previousLinkedTrack;
             });

From ab5e0fc5718c7f2db0e56e0302ec7ef5cdc025de Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 29 Apr 2026 08:53:17 +0200
Subject: [PATCH 109/150] Update CuesheetManagerTests.cs

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 79 +++++++------------
 1 file changed, 28 insertions(+), 51 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index b53a3b91..a647386e 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -41,6 +41,34 @@ public CuesheetManagerTests()
             _traceChangeManager = new();
             _sessionStateContainer = new();
             _trackManager = new();
+            _trackManager.Setup(x => x.SetProperty(It.IsAny<Track>(),It.IsAny<Expression<Func<Track, It.IsAnyType>>>(),It.IsAny<It.IsAnyType>()))
+            .Callback((Track track, LambdaExpression propExpr, object value) =>
+            {
+                var memberExpression = propExpr.Body as MemberExpression;
+                if (memberExpression?.Member is PropertyInfo propertyInfo)
+                {
+                    propertyInfo.SetValue(track, value);
+                }
+            });
+            _trackManager.Setup(x => x.GetPreviousLinkedTrack(It.IsAny<Track>())).Returns(delegate (Track track)
+            {
+                Track? previousLinkedTrack = null;
+                if (track.IsLinkedToPreviousTrack)
+                {
+                    if (track.Position.HasValue)
+                    {
+                        previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
+                    }
+                    else
+                    {
+                        if (track.Begin.HasValue)
+                        {
+                            previousLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.End).LastOrDefault(x => x.End <= track.Begin);
+                        }
+                    }
+                }
+                return previousLinkedTrack;
+            });
             _cuesheetManager = new(_traceChangeManager.Object, _sessionStateContainer.Object, _trackManager.Object);
         }
 
@@ -86,14 +114,6 @@ public void SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso()
             };
             track.Cuesheet = cuesheet;
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-            _trackManager.Setup(x => x.SetProperty(track, x => x.End, It.IsAny<TimeSpan>())).Callback<Track, Expression<Func<Track, TimeSpan?>>, TimeSpan?>((t, propExpression, value) =>
-            {
-                var memberExpression = propExpression.Body as MemberExpression;
-                if (memberExpression?.Member is PropertyInfo propInfo)
-                {
-                    propInfo.SetValue(t, value);
-                }
-            });
             var duration = new TimeSpan(0, 5, 23);
             var audiofile = new Audiofile("Test.mp3", nameof(SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso), Audiofile.AudioCodecs.First(), duration);
             // Act
@@ -250,14 +270,6 @@ public void AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties()
             };
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
             var track = new Track();
-            _trackManager.Setup(x => x.SetProperty(track, x => x.End, It.IsAny<TimeSpan>())).Callback<Track, Expression<Func<Track, TimeSpan?>>, TimeSpan?>((t, propExpression, value) =>
-            {
-                var memberExpression = propExpression.Body as MemberExpression;
-                if (memberExpression?.Member is PropertyInfo propInfo)
-                {
-                    propInfo.SetValue(t, value);
-                }
-            });
             // Act
             _cuesheetManager.AddTrack(track);
             // Assert
@@ -289,14 +301,6 @@ public void AddTrack_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackPropertie
             };
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
             var track = new Track();
-            _trackManager.Setup(x => x.SetProperty(track, x => x.End, It.IsAny<TimeSpan>())).Callback<Track, Expression<Func<Track, TimeSpan?>>, TimeSpan?>((t, propExpression, value) =>
-            {
-                var memberExpression = propExpression.Body as MemberExpression;
-                if (memberExpression?.Member is PropertyInfo propInfo)
-                {
-                    propInfo.SetValue(t, value);
-                }
-            });
             // Act
             _cuesheetManager.AddTrack(track);
             // Assert
@@ -387,33 +391,6 @@ public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainin
             track4.Cuesheet = cuesheet;
             track5.Cuesheet = cuesheet;
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-            _trackManager.Setup(x => x.GetPreviousLinkedTrack(It.IsAny<Track>())).Returns(delegate(Track track)
-            {
-                Track? previousLinkedTrack = null;
-                if (track.IsLinkedToPreviousTrack)
-                {
-                    if (track.Position.HasValue)
-                    {
-                        previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
-                    }
-                    else
-                    {
-                        if (track.Begin.HasValue)
-                        {
-                            previousLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.End).LastOrDefault(x => x.End <= track.Begin);
-                        }
-                    }
-                }
-                return previousLinkedTrack;
-            });
-            _trackManager.Setup(x => x.SetProperty(It.IsAny<Track>(), x => x.End, It.IsAny<TimeSpan>())).Callback<Track, Expression<Func<Track, TimeSpan?>>, TimeSpan?>((track, propExpression, value) =>
-            {
-                var memberExpression = propExpression.Body as MemberExpression;
-                if (memberExpression?.Member is PropertyInfo propInfo)
-                {
-                    propInfo.SetValue(track, value);
-                }
-            });
             // Act
             _cuesheetManager.RemoveTracks([track2, track4]);
             // Assert

From d644f0f884bcabb03798ec87a8ba9035b89d08f4 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 29 Apr 2026 13:07:03 +0200
Subject: [PATCH 110/150] Update ITrackManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index cc86dfa7..367b7da2 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -56,14 +56,12 @@ public interface ITrackManager
         /// <summary>
         /// Get the previous linked track of a track object
         /// </summary>
-        /// <param name="cuesheet">Cuesheet to get the previous linked track from</param>
         /// <param name="track">Track object to get the previous link to</param>
         /// <returns>Previous linked track or null (if not linked)</returns>
         Track? GetPreviousLinkedTrack(Track track);
         /// <summary>
         /// Get next linked track that is linked to the parameter track
         /// </summary>
-        /// <param name="cuesheet"></param>
         /// <param name="track"></param>
         /// <returns></returns>
         Track? GetNextLinkedTrack(Track track);

From 64c30ae313eda134c0c6205783190d24d9d7ff1c Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 29 Apr 2026 16:19:44 +0200
Subject: [PATCH 111/150] disable editing of position

---
 .../Model/UI/EditMultipleTracksModalResult.cs |  3 +--
 .../Services/UI/DialogManager.cs              | 24 +------------------
 .../Dialogs/EditMultipleTracksModal.razor     | 17 ++-----------
 .../Shared/Dialogs/EditTrackModal.razor       |  2 +-
 4 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs b/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
index 5fcefbd1..3aefd35e 100644
--- a/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
+++ b/AudioCuesheetEditor/Model/UI/EditMultipleTracksModalResult.cs
@@ -24,11 +24,10 @@ public enum DynamicEditValue
         EnteredValueAdd = 2,
         EnteredValueSubstract = 3
     }
-    public class EditMultipleTracksModalResult(Track editedTrack, DynamicEditValue isLinkedToPreviousTrackChanged, DynamicEditValue positionEditMode, DynamicEditValue artistEditMode, DynamicEditValue titleEditMode, DynamicEditValue beginEditMode, DynamicEditValue endEditMode, DynamicEditValue lengthEditMode, DynamicEditValue flagsEditMode, DynamicEditValue pregapEditMode, DynamicEditValue postgapEditMode)
+    public class EditMultipleTracksModalResult(Track editedTrack, DynamicEditValue isLinkedToPreviousTrackChanged, DynamicEditValue artistEditMode, DynamicEditValue titleEditMode, DynamicEditValue beginEditMode, DynamicEditValue endEditMode, DynamicEditValue lengthEditMode, DynamicEditValue flagsEditMode, DynamicEditValue pregapEditMode, DynamicEditValue postgapEditMode)
     {
         public Track EditedTrack { get; } = editedTrack;
         public DynamicEditValue IsLinkedToPreviousTrackEditMode { get; } = isLinkedToPreviousTrackChanged;
-        public DynamicEditValue PositionEditMode { get; } = positionEditMode;
         public DynamicEditValue ArtistEditMode { get; } = artistEditMode;
         public DynamicEditValue TitleEditMode { get; } = titleEditMode;
         public DynamicEditValue BeginEditMode { get; } = beginEditMode;
diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index 87848274..d12cafbc 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -60,7 +60,6 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         var preGap = editMultipleTracksModalResult.EditedTrack.PreGap;
                         var postGap = editMultipleTracksModalResult.EditedTrack.PostGap;
                         Boolean copyIsLinkedToPreviousTrack = editMultipleTracksModalResult.IsLinkedToPreviousTrackEditMode == DynamicEditValue.EnteredValueEquals;
-                        Boolean copyTrackPosition = true;
                         Boolean copyTrackArtist = editMultipleTracksModalResult.ArtistEditMode == DynamicEditValue.EnteredValueEquals;
                         Boolean copyTrackTitle = editMultipleTracksModalResult.TitleEditMode == DynamicEditValue.EnteredValueEquals;
                         Boolean copyTrackBegin = true;
@@ -70,27 +69,6 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         Boolean copyTrackPreGap = true;
                         Boolean copyTrackPostGap = true;
                         //First process dynamic edit, because we need to increase each value separately
-                        switch (editMultipleTracksModalResult.PositionEditMode)
-                        {
-                            case DynamicEditValue.DoNotChange:
-                                copyTrackPosition = false;
-                                break;
-                            case DynamicEditValue.EnteredValueEquals:
-                                copyTrackPosition = true;
-                                break;
-                            case DynamicEditValue.EnteredValueAdd:
-                                editMultipleTracksModalResult.EditedTrack.Position = (ushort?)(editMultipleTracksModalResult.EditedTrack.Position + track.Position);
-                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
-                                copyTrackPosition = false;
-                                editMultipleTracksModalResult.EditedTrack.Position = position;
-                                break;
-                            case DynamicEditValue.EnteredValueSubstract:
-                                var newValue = track.Position - editMultipleTracksModalResult.EditedTrack.Position;
-                                editMultipleTracksModalResult.EditedTrack.Position = (ushort?)newValue;
-                                _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: false, setPosition: copyTrackPosition, setArtist: false, setTitle: false, setBegin: false, setEnd: false, setLength: false, setFlags: false, setPreGap: false, setPostGap: false);
-                                copyTrackPosition = false;
-                                break;
-                        }
                         switch (editMultipleTracksModalResult.BeginEditMode)
                         {
                             case DynamicEditValue.DoNotChange:
@@ -203,7 +181,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                         editMultipleTracksModalResult.EditedTrack.PreGap = preGap;
                         editMultipleTracksModalResult.EditedTrack.PostGap = postGap;
                         //Now copy all values
-                        _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: copyIsLinkedToPreviousTrack, setPosition: copyTrackPosition, setArtist: copyTrackArtist, setTitle: copyTrackTitle, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: copyTrackFlags, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
+                        _trackManager.CopyValues(editMultipleTracksModalResult.EditedTrack, track, setIsLinkedToPreviousTrack: copyIsLinkedToPreviousTrack, setPosition: false, setArtist: copyTrackArtist, setTitle: copyTrackTitle, setBegin: copyTrackBegin, setEnd: copyTrackEnd, setLength: copyTrackLength, setFlags: copyTrackFlags, setPreGap: copyTrackPreGap, setPostGap: copyTrackPostGap);
                     }
                 }
             }
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
index e029d6f8..6995dc3e 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.razor
@@ -40,19 +40,6 @@ along with Foobar.  If not, see
                 </MudItem>
                 <MudItem xs="8" sm="9"><MudSwitch @bind-Value="EditedTrack.IsLinkedToPreviousTrack" Label="@_localizer["Link to previous track"]" Color="Color.Primary" Disabled="editModeTrackIsLinkedToPreviousTrack == DynamicEditValue.DoNotChange" /></MudItem>
                 <MudFlexBreak />
-                <MudItem xs="4" sm="3">
-                    <MudSelect @bind-Value="editModeTrackPosition" Variant="Variant.Outlined" Modal="true">
-                        <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueEquals"><MudIcon Icon="@Icons.Material.Filled.Check" Style="height: 14px;" /></MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueAdd"><MudIcon Icon="@Icons.Material.Filled.Add" Style="height: 14px;" /></MudSelectItem>
-                        <MudSelectItem Value="DynamicEditValue.EnteredValueSubstract"><MudIcon Icon="@Icons.Material.Filled.Remove" Style="height: 14px;" /></MudSelectItem>
-                    </MudSelect>
-                </MudItem>
-                <MudItem xs="8" sm="9">
-                    <MudTextField @bind-Value="EditedTrack.Position" Label="@_localizer["Position"]" Variant="Variant.Outlined" Disabled="editModeTrackPosition == DynamicEditValue.DoNotChange" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(editModeTrackPosition != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Position)))"
-                                  ErrorText="@GetValidationErrorMessage(editModeTrackPosition != DynamicEditValue.DoNotChange, EditedTrack, nameof(Track.Position))" />
-                </MudItem>
-                <MudFlexBreak />
                 <MudItem xs="4" sm="3">
                     <MudSelect @bind-Value="editModeTrackArtist" Variant="Variant.Outlined" Modal="true">
                         <MudSelectItem Value="DynamicEditValue.DoNotChange"><MudIcon Icon="@Icons.Material.Filled.DoDisturb" Style="height: 14px;" /></MudSelectItem>
@@ -212,11 +199,11 @@ along with Foobar.  If not, see
     [EditorRequired]
     public Track EditedTrack { get; set; } = null!;
 
-    DynamicEditValue editModeTrackIsLinkedToPreviousTrack, editModeTrackPosition, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, editModeTrackFlags, editModeTrackPregap, editModeTrackPostgap;
+    DynamicEditValue editModeTrackIsLinkedToPreviousTrack, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, editModeTrackFlags, editModeTrackPregap, editModeTrackPostgap;
 
     void SaveClick()
     {
-        var result = new EditMultipleTracksModalResult(EditedTrack, editModeTrackIsLinkedToPreviousTrack, editModeTrackPosition, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, 
+        var result = new EditMultipleTracksModalResult(EditedTrack, editModeTrackIsLinkedToPreviousTrack, editModeTrackArtist, editModeTrackTitle, editModeTrackBegin, editModeTrackEnd, editModeTrackLength, 
                      editModeTrackFlags, editModeTrackPregap, editModeTrackPostgap);
         MudDialog?.Close(DialogResult.Ok(result));
     }
diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
index 721e7fe9..fb7e76c3 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
@@ -31,7 +31,7 @@ along with Foobar.  If not, see
             <MudSwitch @bind-Value="EditedTrack.IsLinkedToPreviousTrack" Label="@_localizer["Link to previous track"]" Color="Color.Primary" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(EditedTrack, nameof(Track.IsLinkedToPreviousTrack)))"
                        ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.IsLinkedToPreviousTrack))" />
             <MudTextField @bind-Value="EditedTrack.Position" Label="@_localizer["Position"]" Variant="Variant.Outlined" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(EditedTrack, nameof(Track.Position)))"
-                          ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.Position))" />
+                          ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.Position))" ReadOnly />
             @{
                 MusicBrainzArtist? autocompleteArtist = new()
                 {

From 7d88754b3404e72b26e7a8df1fa67e31a8ff27d1 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 29 Apr 2026 16:20:49 +0200
Subject: [PATCH 112/150] Update TrackList.razor

---
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 65a69cc8..31529523 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
     }
 </MudMenu>
 
-    @code {
+@code {
     //TODO: Disallow editing of position
     HashSet<Track> _selectedTracks = new();
     MudMenu? _trackContextMenu;

From dc5af46d109a83a3be2c09fc6c681bea6e9f37e9 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 29 Apr 2026 16:32:06 +0200
Subject: [PATCH 113/150] Disallow editing of position

---
 AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor | 2 +-
 AudioCuesheetEditor/Shared/TrackList/TrackList.razor    | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
index fb7e76c3..e26e5b7c 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditTrackModal.razor
@@ -31,7 +31,7 @@ along with Foobar.  If not, see
             <MudSwitch @bind-Value="EditedTrack.IsLinkedToPreviousTrack" Label="@_localizer["Link to previous track"]" Color="Color.Primary" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(EditedTrack, nameof(Track.IsLinkedToPreviousTrack)))"
                        ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.IsLinkedToPreviousTrack))" />
             <MudTextField @bind-Value="EditedTrack.Position" Label="@_localizer["Position"]" Variant="Variant.Outlined" Error="!String.IsNullOrEmpty(GetValidationErrorMessage(EditedTrack, nameof(Track.Position)))"
-                          ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.Position))" ReadOnly />
+                          ErrorText="@GetValidationErrorMessage(EditedTrack, nameof(Track.Position))" Disabled />
             @{
                 MusicBrainzArtist? autocompleteArtist = new()
                 {
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 31529523..04f47b83 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -67,12 +67,7 @@ along with Foobar.  If not, see
                     <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracks([context.Item])" />
                 </EditTemplate>
             </TemplateColumn>
-            <PropertyColumn Property="x => x.Position" Title="#" Editable="CurrentViewMode != ViewMode.RecordView" HeaderStyle="width: 1px;">
-                <EditTemplate>
-                    <MudNumericField Validation="() => _validationService.Validate(context.Item, nameof(Track.Position))" Value="context.Item.Position"
-                                     ValueChanged="(ushort? newPosition) => PositionChanged(context.Item, newPosition)" />
-                </EditTemplate>
-            </PropertyColumn>
+            <PropertyColumn Property="x => x.Position" Title="#" Editable="false" HeaderStyle="width: 1px;" />
             <PropertyColumn Property="x => x.Artist" Title="@_localizer["Artist"]">
                 <EditTemplate>
                     <ArtistColumn Track="context.Item" />
@@ -133,7 +128,6 @@ along with Foobar.  If not, see
 </MudMenu>
 
 @code {
-    //TODO: Disallow editing of position
     HashSet<Track> _selectedTracks = new();
     MudMenu? _trackContextMenu;
     Track? _contextMenuTrack;

From fee00934d91c403e60d4589734e690949b66dac7 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 30 Apr 2026 10:35:50 +0200
Subject: [PATCH 114/150] refactor moving of tracks

---
 .../Services/AudioCuesheet/CuesheetManager.cs | 67 +++++++++++++++++++
 .../AudioCuesheet/ICuesheetManager.cs         | 23 +++++++
 .../Shared/TrackList/TrackList.razor          | 48 +------------
 3 files changed, 92 insertions(+), 46 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index cd148412..a2dceecf 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -14,6 +14,7 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Services.UI;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -168,6 +169,71 @@ public void RemoveTracks(IEnumerable<Track> tracksToRemove)
             _traceChangeManager.BulkEdit = false;
         }
 
+        /// <inheritdoc/>
+        //TODO: Tests
+        public bool IsMoveTracksUpPossible(HashSet<Track> selectedTracks) => selectedTracks.Count == 0 || selectedTracks.Min(x => x.Position) <= 1;
+
+        /// <inheritdoc/>
+        //TODO: Tests
+        public bool IsMoveTracksDownPossible(HashSet<Track> selectedTracks)
+        {
+            var cuesheet = _sessionStateContainer.Cuesheet;
+            //TODO: set cuesheet to import cuesheet if using import view
+            return selectedTracks.Count == 0 || selectedTracks.Max(x => x.Position) >= cuesheet?.Tracks.Max(x => x.Position);
+        }
+
+        /// <inheritdoc/>
+        //TODO: Tests
+        public Result MoveTracksUp(HashSet<Track> selectedTracks)
+        {
+            if (IsMoveTracksUpPossible(selectedTracks) == false)
+            {
+                return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks up is not possible!"));
+            }
+            _traceChangeManager.BulkEdit = true;
+            var cuesheet = _sessionStateContainer.Cuesheet;
+            //TODO: set cuesheet to import cuesheet if using import view
+            foreach (var selectedTrack in selectedTracks)
+            {
+                var previousTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
+                if (previousTrack != null)
+                {
+                    _trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
+                }
+                _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
+                //TODO: switch begin, end and length
+            }
+            SetProperty(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
+            _traceChangeManager.BulkEdit = false;
+            return Result.Success();
+        }
+
+        /// <inheritdoc/>
+        //TODO: Tests
+        public Result MoveTracksDown(HashSet<Track> selectedTracks)
+        {
+            if (IsMoveTracksDownPossible(selectedTracks) == false)
+            {
+                return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks down is not possible!"));
+            }
+            _traceChangeManager.BulkEdit = true;
+            var cuesheet = _sessionStateContainer.Cuesheet;
+            //TODO: set cuesheet to import cuesheet if using import view
+            foreach (var selectedTrack in selectedTracks)
+            {
+                var nextTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
+                if (nextTrack != null)
+                {
+                    _trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
+                }
+                _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
+                //TODO: switch begin, end and length
+            }
+            SetProperty(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
+            _traceChangeManager.BulkEdit = false;
+            return Result.Success();
+        }
+
         void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
             if (propertyExpression.Body is not MemberExpression memberExpression)
@@ -199,6 +265,7 @@ void SetLastTrackEnd()
             }
         }
 
+
         Track? LastTrack => _sessionStateContainer.Cuesheet.Tracks
                 .OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position)
                 .ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin)
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index a280ddb8..bdee98a6 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -62,5 +62,28 @@ public interface ICuesheetManager
         /// <param name="cuesheet"></param>
         /// <param name="tracksToRemove"></param>
         void RemoveTracks(IEnumerable<Track> tracksToRemove);
+        /// <summary>
+        /// Determines if moving tracks up is possible
+        /// </summary>
+        /// <param name="selectedTracks"></param>
+        /// <returns></returns>
+        Boolean IsMoveTracksUpPossible(HashSet<Track> selectedTracks);
+        /// <summary>
+        /// Determines if moving tracks down is possible
+        /// </summary>
+        /// <param name="selectedTracks"></param>
+        /// <returns></returns>
+        Boolean IsMoveTracksDownPossible(HashSet<Track> selectedTracks);
+        /// <summary>
+        /// Moves selected tracks up
+        /// </summary>
+        /// <param name="selectedTracks"></param>
+        Result MoveTracksUp(HashSet<Track> selectedTracks);
+        /// <summary>
+        /// Moves selected tracks down
+        /// </summary>
+        /// <param name="selectedTracks"></param>
+        /// <returns></returns>
+        Result MoveTracksDown(HashSet<Track> selectedTracks);
     }
 }
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 04f47b83..7508c81a 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -48,8 +48,8 @@ along with Foobar.  If not, see
             <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Cuesheet?.Tracks.Any() == false"
-                                     MoveTracksUpDisabled="MoveTracksUpDisabled" MoveTracksUpClicked="MoveTracksUpClicked"
-                                     MoveTracksDownDisabled="MoveTracksDownDisabled" MoveTracksDownClicked="MoveTracksDownClicked"
+                                     MoveTracksUpDisabled="!_cuesheetManager.IsMoveTracksUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveTracksUp(_selectedTracks)"
+                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveTracksDownPossible(_selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDown(_selectedTracks)"
                                      CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
                                      FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !_applicationOptions?.FixedTracksTableHeader)" />
         </div>
@@ -146,10 +146,6 @@ along with Foobar.  If not, see
         }
     }
 
-    Boolean MoveTracksUpDisabled => _selectedTracks.Count == 0 || _selectedTracks.Min(x => x.Position) <= 1;
-
-    Boolean MoveTracksDownDisabled => _selectedTracks.Count == 0 || _selectedTracks.Max(x => x.Position) >= Cuesheet?.Tracks.Max(x => x.Position);
-
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
 
@@ -308,46 +304,6 @@ along with Foobar.  If not, see
         }
     }
 
-    void MoveTracksUpClicked()
-    {
-        if (MoveTracksUpDisabled == false)
-        {
-            base.TraceChangeManager.BulkEdit = true;
-            foreach (var selectedTrack in _selectedTracks)
-            {
-                var previousTrack = Cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
-                if (previousTrack != null)
-                {
-                    _trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
-                }
-                _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
-                //TODO: switch begin, end and length
-            }
-            _cuesheetManager.SetProperty(x => x.Tracks, Cuesheet?.Tracks.OrderBy(x => x.Position));
-            base.TraceChangeManager.BulkEdit = false;
-        }
-    }
-
-    void MoveTracksDownClicked()
-    {
-        if (MoveTracksDownDisabled == false)
-        {
-            base.TraceChangeManager.BulkEdit = true;
-            foreach (var selectedTrack in _selectedTracks)
-            {
-                var nextTrack = Cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
-                if (nextTrack != null)
-                {
-                    _trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
-                }
-                _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
-                //TODO: switch begin, end and length
-            }
-            _cuesheetManager.SetProperty(x => x.Tracks, Cuesheet?.Tracks.OrderBy(x => x.Position));
-            base.TraceChangeManager.BulkEdit = false;
-        }
-    }
-
     void SessionStateContainer_CuesheetChanged(object? sender, EventArgs args)
     {
         StateHasChanged();

From d8d36fd8da5ce45ebe4507cc8b372207f248ab67 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 30 Apr 2026 10:36:03 +0200
Subject: [PATCH 115/150] fix getnexttrack

---
 .../AudioCuesheet/TrackManagerTests.cs        | 39 +++++++++++++++++++
 .../Services/AudioCuesheet/TrackManager.cs    |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index 0066d1ca..a6e0e146 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -460,5 +460,44 @@ public void GetNextLinkedTrack_OnlyOneTrack_ReturnsNull()
             // Assert
             Assert.IsNull(linkedTrack);
         }
+
+        [TestMethod]
+        public void GetNextLinkedTrack_MultiplePositions_ReturnsTrack()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                IsLinkedToPreviousTrack = true,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 8, 32)
+            };
+            var track2 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 2,
+                Begin = track1.End,
+                End = new TimeSpan(0, 13, 54)
+            };
+            var track3 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Position = 2,
+                Begin = track2.End,
+                End = new TimeSpan(0, 17, 32)
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track1, track2, track3]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetNextLinkedTrack(track1);
+            // Assert
+            Assert.IsNotNull(linkedTrack);
+            Assert.AreEqual(track2, linkedTrack);
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index b3ec2779..48bcb1fb 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -130,7 +130,7 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
         {
             if (track.Position.HasValue)
             {
-                return track.Cuesheet?.Tracks.SingleOrDefault(x => x.Position >= track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
+                return track.Cuesheet?.Tracks.OrderBy(x => x.Begin).FirstOrDefault(x => x.Position >= track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
             }
             if (track.End.HasValue)
             {

From 57552242652811e3e5d26cc87da0a97701aa0ffc Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 30 Apr 2026 10:41:43 +0200
Subject: [PATCH 116/150] Update CuesheetManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index a2dceecf..04f8f14a 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -95,6 +95,7 @@ public void StopRecording()
         public void AddTrack(Track track)
         {
             var cuesheet = _sessionStateContainer.Cuesheet;
+            //TODO: set cuesheet to import cuesheet if using import view
             track.Cuesheet = cuesheet;
             // Calculate track properties
             _traceChangeManager.BulkEdit = true;
@@ -149,6 +150,7 @@ public void AddTrack(Track track)
         public void RemoveTracks(IEnumerable<Track> tracksToRemove)
         {
             var cuesheet = _sessionStateContainer.Cuesheet;
+            //TODO: set cuesheet to import cuesheet if using import view
             var intersection = cuesheet.Tracks.Intersect(tracksToRemove);
             ICollection<Track> newValue = [.. cuesheet.Tracks.Except(intersection)];
             //Calculate position and begin of new tracks
@@ -265,7 +267,6 @@ void SetLastTrackEnd()
             }
         }
 
-
         Track? LastTrack => _sessionStateContainer.Cuesheet.Tracks
                 .OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position)
                 .ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin)

From d5e8501b122a91b3ec6f52daef20370157565852 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 30 Apr 2026 11:25:22 +0200
Subject: [PATCH 117/150] use importcuesheet when importing

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 162 ++++++++++++++++--
 AudioCuesheetEditor/Pages/Index.razor         |   2 +-
 .../Services/AudioCuesheet/CuesheetManager.cs |  74 +++++---
 .../AudioCuesheet/ICuesheetManager.cs         |  10 +-
 .../Shared/Cuesheet/CuesheetData.razor        |  10 +-
 .../Shared/Record/AddTrack.razor              |   2 +-
 .../Shared/TrackList/TrackList.razor          |  18 +-
 7 files changed, 210 insertions(+), 68 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index a647386e..d47f77ad 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -13,8 +13,10 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.IO.Audio;
+using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Model.UI;
 using AudioCuesheetEditor.Services.AudioCuesheet;
 using AudioCuesheetEditor.Services.UI;
@@ -25,6 +27,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Threading.Tasks;
 
 namespace AudioCuesheetEditor.Tests.Services.AudioCuesheet
 {
@@ -35,12 +38,14 @@ public class CuesheetManagerTests
         private readonly Mock<ITraceChangeManager> _traceChangeManager;
         private readonly Mock<ISessionStateContainer> _sessionStateContainer;
         private readonly Mock<ITrackManager> _trackManager;
+        private readonly Mock<ILocalStorageOptionsProvider> _localStorageOptionsProvider;
 
         public CuesheetManagerTests()
         {
             _traceChangeManager = new();
             _sessionStateContainer = new();
             _trackManager = new();
+            _localStorageOptionsProvider = new();
             _trackManager.Setup(x => x.SetProperty(It.IsAny<Track>(),It.IsAny<Expression<Func<Track, It.IsAnyType>>>(),It.IsAny<It.IsAnyType>()))
             .Callback((Track track, LambdaExpression propExpr, object value) =>
             {
@@ -69,24 +74,24 @@ public CuesheetManagerTests()
                 }
                 return previousLinkedTrack;
             });
-            _cuesheetManager = new(_traceChangeManager.Object, _sessionStateContainer.Object, _trackManager.Object);
+            _cuesheetManager = new(_traceChangeManager.Object, _sessionStateContainer.Object, _trackManager.Object, _localStorageOptionsProvider.Object);
         }
 
         [TestMethod]
-        public void SetProperty_NewValue_ChangesPropertyAndSetsTracedChange()
+        public async Task SetPropertyAsync_NewValue_ChangesPropertyAndSetsTracedChangeAsync()
         {
             // Arrange
             var cuesheet = new Cuesheet();
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
             // Act
-            _cuesheetManager.SetProperty(x => x.Artist, "Artist");
+            await _cuesheetManager.SetPropertyAsync(x => x.Artist, "Artist");
             // Assert
             Assert.AreEqual("Artist", cuesheet.Artist);
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Artist))), Times.Once);
         }
 
         [TestMethod]
-        public void SetProperty_EqualValue_DoesntChangeProperty()
+        public async Task SetPropertyAsync_EqualValue_DoesntChangePropertyAsync()
         {
             // Arrange
             var cuesheet = new Cuesheet()
@@ -95,13 +100,13 @@ public void SetProperty_EqualValue_DoesntChangeProperty()
             };
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
             // Act
-            _cuesheetManager.SetProperty(x => x.Artist, cuesheet.Artist);
+            await _cuesheetManager.SetPropertyAsync(x => x.Artist, cuesheet.Artist);
             // Assert
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Artist))), Times.Never);
         }
 
         [TestMethod]
-        public void SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso()
+        public async Task SetPropertyAsync_AudiofileWithDuration_SetsLastTrackEndAlsoAsync()
         {
             // Arrange
             var track = new Track()
@@ -115,9 +120,9 @@ public void SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso()
             track.Cuesheet = cuesheet;
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
             var duration = new TimeSpan(0, 5, 23);
-            var audiofile = new Audiofile("Test.mp3", nameof(SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso), Audiofile.AudioCodecs.First(), duration);
+            var audiofile = new Audiofile("Test.mp3", nameof(SetPropertyAsync_AudiofileWithDuration_SetsLastTrackEndAlsoAsync), Audiofile.AudioCodecs.First(), duration);
             // Act
-            _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
+            await _cuesheetManager.SetPropertyAsync(x => x.Audiofile, audiofile);
             // Assert
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Audiofile))), Times.Once);
             Assert.AreEqual(duration, track.End);
@@ -260,18 +265,23 @@ public void StopRecording_WithoutActiveRecording_ChangesNothing()
         }
 
         [TestMethod]
-        public void AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties()
+        public async Task AddTrackAsync_FirstTrack_AddsNewTrackWithCalulatedTrackPropertiesAsync()
         {
             // Arrange
             var duration = new TimeSpan(0, 27, 56);
             var cuesheet = new Cuesheet()
             {
-                Audiofile = new("Audio.mp3", nameof(AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties), Audiofile.AudioCodecs.First(), duration)
+                Audiofile = new("Audio.mp3", nameof(AddTrackAsync_FirstTrack_AddsNewTrackWithCalulatedTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
             };
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             var track = new Track();
             // Act
-            _cuesheetManager.AddTrack(track);
+            await _cuesheetManager.AddTrackAsync(track);
             // Assert
             Assert.HasCount(1, cuesheet.Tracks);
             Assert.AreEqual((ushort)1, cuesheet.Tracks.First().Position);
@@ -281,7 +291,7 @@ public void AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties()
         }
 
         [TestMethod]
-        public void AddTrack_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackProperties()
+        public async Task AddTrackAsync_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackPropertiesAsync()
         {
             // Arrange
             var duration = new TimeSpan(0, 27, 56);
@@ -297,12 +307,17 @@ public void AddTrack_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackPropertie
             var cuesheet = new Cuesheet()
             {
                 Tracks = tracks,
-                Audiofile = new("Audio.mp3", nameof(AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties), Audiofile.AudioCodecs.First(), duration)
+                Audiofile = new("Audio.mp3", nameof(AddTrackAsync_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
             };
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             var track = new Track();
             // Act
-            _cuesheetManager.AddTrack(track);
+            await _cuesheetManager.AddTrackAsync(track);
             // Assert
             Assert.HasCount(2, cuesheet.Tracks);
             Assert.AreEqual((ushort)2, cuesheet.Tracks.Last().Position);
@@ -312,7 +327,7 @@ public void AddTrack_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackPropertie
         }
 
         [TestMethod]
-        public void AddTrack_DuringRecording_AddsNewTrackWithCalulatedTrackProperties()
+        public async Task AddTrackAsync_DuringRecording_AddsNewTrackWithCalulatedTrackPropertiesAsync()
         {
             // Arrange
             var tracks = new List<Track>
@@ -329,9 +344,14 @@ public void AddTrack_DuringRecording_AddsNewTrackWithCalulatedTrackProperties()
                 Tracks = tracks
             };
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.RecordView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             var track = new Track();
             // Act
-            _cuesheetManager.AddTrack(track);
+            await _cuesheetManager.AddTrackAsync(track);
             // Assert
             Assert.HasCount(2, cuesheet.Tracks);
             Assert.AreEqual((ushort)2, cuesheet.Tracks.Last().Position);
@@ -341,7 +361,33 @@ public void AddTrack_DuringRecording_AddsNewTrackWithCalulatedTrackProperties()
         }
 
         [TestMethod]
-        public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackProperties()
+        public async Task AddTrackAsync_FirstTrackImporting_AddsNewTrackWithCalulatedTrackPropertiesAsync()
+        {
+            // Arrange
+            var duration = new TimeSpan(0, 27, 56);
+            var importCuesheet = new Cuesheet()
+            {
+                Audiofile = new("Audio.mp3", nameof(AddTrackAsync_FirstTrack_AddsNewTrackWithCalulatedTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
+            };
+            _sessionStateContainer.SetupProperty(x => x.ImportCuesheet, importCuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.ImportView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            var track = new Track();
+            // Act
+            await _cuesheetManager.AddTrackAsync(track);
+            // Assert
+            Assert.HasCount(1, importCuesheet.Tracks);
+            Assert.AreEqual((ushort)1, importCuesheet.Tracks.First().Position);
+            Assert.AreEqual(TimeSpan.Zero, importCuesheet.Tracks.First().Begin);
+            Assert.AreEqual(duration, importCuesheet.Tracks.First().End);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == importCuesheet && y.TraceableChange.PreviousValue == Enumerable.Empty<Track>() && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
+        }
+
+        [TestMethod]
+        public async Task RemoveTracksAsync_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackPropertiesAsync()
         {
             // Arrange
             var track1 = new Track()
@@ -383,7 +429,7 @@ public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainin
             var cuesheet = new Cuesheet()
             {
                 Tracks = previousValue,
-                Audiofile = new("Audio.mp3", nameof(RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackProperties), Audiofile.AudioCodecs.First(), duration)
+                Audiofile = new("Audio.mp3", nameof(RemoveTracksAsync_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
             };
             track1.Cuesheet = cuesheet;
             track2.Cuesheet = cuesheet;
@@ -391,8 +437,13 @@ public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainin
             track4.Cuesheet = cuesheet;
             track5.Cuesheet = cuesheet;
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             // Act
-            _cuesheetManager.RemoveTracks([track2, track4]);
+            await _cuesheetManager.RemoveTracksAsync([track2, track4]);
             // Assert
             Assert.HasCount(3, cuesheet.Tracks);
             Assert.IsTrue(cuesheet.Tracks.Contains(track1));
@@ -407,5 +458,78 @@ public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainin
             Assert.AreEqual(duration, track5.End);
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == previousValue && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
         }
+
+        [TestMethod]
+        public async Task RemoveTracksAsync_DuringImport_RemovesTracksAndRecalculatesRemainingTrackPropertiesAsync()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12),
+                IsLinkedToPreviousTrack = true
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = new TimeSpan(0, 3, 12),
+                End = new TimeSpan(0, 7, 34),
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = new TimeSpan(0, 7, 34),
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var track4 = new Track()
+            {
+                Position = 4,
+                Begin = new TimeSpan(0, 10, 4),
+                End = new TimeSpan(0, 14, 54),
+                IsLinkedToPreviousTrack = true
+            };
+            var track5 = new Track()
+            {
+                Position = 5,
+                Begin = new TimeSpan(0, 14, 54),
+                IsLinkedToPreviousTrack = true
+            };
+            var previousValue = new List<Track>() { track1, track2, track3, track4, track5 };
+            var duration = new TimeSpan(0, 19, 38);
+            var importCuesheet = new Cuesheet()
+            {
+                Tracks = previousValue,
+                Audiofile = new("Audio.mp3", nameof(RemoveTracksAsync_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
+            };
+            track1.Cuesheet = importCuesheet;
+            track2.Cuesheet = importCuesheet;
+            track3.Cuesheet = importCuesheet;
+            track4.Cuesheet = importCuesheet;
+            track5.Cuesheet = importCuesheet;
+            _sessionStateContainer.SetupProperty(x => x.ImportCuesheet, importCuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.ImportView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            // Act
+            await _cuesheetManager.RemoveTracksAsync([track2, track4]);
+            // Assert
+            Assert.HasCount(3, importCuesheet.Tracks);
+            Assert.IsTrue(importCuesheet.Tracks.Contains(track1));
+            Assert.IsTrue(importCuesheet.Tracks.Contains(track3));
+            Assert.IsTrue(importCuesheet.Tracks.Contains(track5));
+            Assert.AreEqual((ushort)1, track1.Position);
+            Assert.AreEqual(TimeSpan.Zero, track1.Begin);
+            Assert.AreEqual(track1.End, track3.Begin);
+            Assert.AreEqual((ushort)2, track3.Position);
+            Assert.AreEqual(track5.Begin, track3.End);
+            Assert.AreEqual((ushort)3, track5.Position);
+            Assert.AreEqual(duration, track5.End);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == importCuesheet && y.TraceableChange.PreviousValue == previousValue && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Pages/Index.razor b/AudioCuesheetEditor/Pages/Index.razor
index 445ba103..102c2bfe 100644
--- a/AudioCuesheetEditor/Pages/Index.razor
+++ b/AudioCuesheetEditor/Pages/Index.razor
@@ -115,7 +115,7 @@ along with Foobar.  If not, see
                 }
                 if (_sessionStateContainer.ImportAudiofile != null)
                 {
-                    _cuesheetManager.SetProperty(x => x.Audiofile, _sessionStateContainer.ImportAudiofile);
+                    await _cuesheetManager.SetPropertyAsync(x => x.Audiofile, _sessionStateContainer.ImportAudiofile);
                 }
             }
             finally
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 04f8f14a..0e1062ca 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -13,6 +13,7 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Services.UI;
@@ -22,24 +23,26 @@
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
     /// <inheritdoc/>
-    public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionStateContainer sessionStateContainer, ITrackManager trackManager) : ICuesheetManager
+    public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionStateContainer sessionStateContainer, ITrackManager trackManager, ILocalStorageOptionsProvider localStorageOptionsProvider) : ICuesheetManager
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
         private readonly ISessionStateContainer _sessionStateContainer = sessionStateContainer;
         private readonly ITrackManager _trackManager = trackManager;
+        private readonly ILocalStorageOptionsProvider _localStorageOptionsProvider = localStorageOptionsProvider;
 
         public event EventHandler? IsRecordingChanged;
 
         /// <inheritdoc/>
-        public void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
+        public async Task SetPropertyAsync<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
             _traceChangeManager.BulkEdit = true;
+            //TODO: set cuesheet to import cuesheet if using import view
             var audiofile = _sessionStateContainer.Cuesheet.Audiofile;
             SetValue(_sessionStateContainer.Cuesheet, propertyExpression, value);
             // If audiofile has been set, we need to calculate last track end
             if (audiofile != _sessionStateContainer.Cuesheet.Audiofile)
             {
-                SetLastTrackEnd();
+                await SetLastTrackEndAsync();
             }
             _traceChangeManager.BulkEdit = false;
         }
@@ -92,18 +95,17 @@ public void StopRecording()
         }
 
         /// <inheritdoc/>
-        public void AddTrack(Track track)
+        public async Task AddTrackAsync(Track track)
         {
-            var cuesheet = _sessionStateContainer.Cuesheet;
-            //TODO: set cuesheet to import cuesheet if using import view
+            var cuesheet = await GetCurrentCuesheetAsync();
             track.Cuesheet = cuesheet;
             // Calculate track properties
             _traceChangeManager.BulkEdit = true;
-            if (cuesheet.IsRecording)
+            if (cuesheet?.IsRecording == true)
             {
                 _trackManager.SetProperty(track, x => x.Begin, DateTime.UtcNow - cuesheet.RecordingStart);
             }
-            if (cuesheet.Tracks.Any() == false)
+            if (cuesheet?.Tracks.Any() == false)
             {
                 _trackManager.SetProperty(track, x => x.Position, (ushort)(1));
                 if ((track.Begin.HasValue == false) || cuesheet.IsRecording)
@@ -113,41 +115,42 @@ public void AddTrack(Track track)
             }
             else
             {
-                if ((cuesheet.Audiofile?.Duration.HasValue == true) && (LastTrack?.End.HasValue == true) && (LastTrack.End == cuesheet.Audiofile.Duration))
+                var lastTrack = await GetLastTrackAsync();
+                if ((cuesheet?.Audiofile?.Duration.HasValue == true) && (lastTrack?.End.HasValue == true) && (lastTrack.End == cuesheet.Audiofile.Duration))
                 {
-                    _trackManager.SetProperty(LastTrack, x => x.End, null);
+                    _trackManager.SetProperty(lastTrack, x => x.End, null);
                 }
                 if (track.Position.HasValue == false)
                 {
-                    _trackManager.SetProperty(track, x => x.Position, (ushort?)(LastTrack?.Position + 1));
+                    _trackManager.SetProperty(track, x => x.Position, (ushort?)(lastTrack?.Position + 1));
                 }
                 if (track.Begin.HasValue == false)
                 {
-                    track.Begin = LastTrack?.End;
+                    track.Begin = lastTrack?.End;
                 }
                 else
                 {
-                    if (LastTrack?.End.HasValue == false)
+                    if (lastTrack?.End.HasValue == false)
                     {
-                        _trackManager.SetProperty(LastTrack, x => x.End, track.Begin);
+                        _trackManager.SetProperty(lastTrack, x => x.End, track.Begin);
                     }
                 }
-                if (cuesheet.IsRecording && LastTrack != null)
+                if (cuesheet?.IsRecording == true && lastTrack != null)
                 {
-                    _trackManager.SetProperty(LastTrack, x => x.End, track.Begin);
+                    _trackManager.SetProperty(lastTrack, x => x.End, track.Begin);
                 }
             }
-            var newValue = new List<Track>(cuesheet.Tracks)
+            var newValue = new List<Track>(cuesheet!.Tracks)
             {
                 track
             };
             SetValue(cuesheet, x => x.Tracks, newValue);
-            SetLastTrackEnd();
+            await SetLastTrackEndAsync();
             _traceChangeManager.BulkEdit = false;
         }
 
         /// <inheritdoc/>
-        public void RemoveTracks(IEnumerable<Track> tracksToRemove)
+        public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
         {
             var cuesheet = _sessionStateContainer.Cuesheet;
             //TODO: set cuesheet to import cuesheet if using import view
@@ -167,7 +170,7 @@ public void RemoveTracks(IEnumerable<Track> tracksToRemove)
             }
             _traceChangeManager.BulkEdit = true;
             SetValue(cuesheet, x => x.Tracks, newValue);
-            SetLastTrackEnd();
+            await SetLastTrackEndAsync();
             _traceChangeManager.BulkEdit = false;
         }
 
@@ -186,7 +189,7 @@ public bool IsMoveTracksDownPossible(HashSet<Track> selectedTracks)
 
         /// <inheritdoc/>
         //TODO: Tests
-        public Result MoveTracksUp(HashSet<Track> selectedTracks)
+        public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
         {
             if (IsMoveTracksUpPossible(selectedTracks) == false)
             {
@@ -205,14 +208,14 @@ public Result MoveTracksUp(HashSet<Track> selectedTracks)
                 _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
                 //TODO: switch begin, end and length
             }
-            SetProperty(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
+            await SetPropertyAsync(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
             _traceChangeManager.BulkEdit = false;
             return Result.Success();
         }
 
         /// <inheritdoc/>
         //TODO: Tests
-        public Result MoveTracksDown(HashSet<Track> selectedTracks)
+        public async Task<Result> MoveTracksDownAsync(HashSet<Track> selectedTracks)
         {
             if (IsMoveTracksDownPossible(selectedTracks) == false)
             {
@@ -231,7 +234,7 @@ public Result MoveTracksDown(HashSet<Track> selectedTracks)
                 _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
                 //TODO: switch begin, end and length
             }
-            SetProperty(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
+            await SetPropertyAsync(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
             _traceChangeManager.BulkEdit = false;
             return Result.Success();
         }
@@ -259,18 +262,33 @@ void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>
             _traceChangeManager.AddChange(new(cuesheet, new(previousValue, propertyInfo.Name)));
         }
 
-        void SetLastTrackEnd()
+        async Task SetLastTrackEndAsync()
+        {
+            var lastTrack = await GetLastTrackAsync();
+            if ((lastTrack?.End.HasValue == false) && (_sessionStateContainer.Cuesheet.Audiofile?.Duration.HasValue == true))
+            {
+                _trackManager.SetProperty(lastTrack, x => x.End, _sessionStateContainer.Cuesheet.Audiofile.Duration);
+            }
+        }
+
+        async Task<Cuesheet?> GetCurrentCuesheetAsync()
         {
-            if ((LastTrack?.End.HasValue == false) && (_sessionStateContainer.Cuesheet.Audiofile?.Duration.HasValue == true))
+            var viewOptions = await _localStorageOptionsProvider.GetOptionsAsync<ViewOptions>();
+            if (viewOptions.ActiveTab == ViewMode.ImportView)
             {
-                _trackManager.SetProperty(LastTrack, x => x.End, _sessionStateContainer.Cuesheet.Audiofile.Duration);
+                return _sessionStateContainer.ImportCuesheet;
             }
+            return _sessionStateContainer.Cuesheet;
         }
 
-        Track? LastTrack => _sessionStateContainer.Cuesheet.Tracks
+        async Task<Track?> GetLastTrackAsync()
+        {
+            var cuesheet = await GetCurrentCuesheetAsync();
+            return cuesheet?.Tracks
                 .OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position)
                 .ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin)
                 .ThenByDescending(x => x.End.HasValue).ThenBy(x => x.End)
                 .LastOrDefault();
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index bdee98a6..d68df89f 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -34,7 +34,7 @@ public interface ICuesheetManager
         /// <param name="cuesheet"></param>
         /// <param name="propertyExpression"></param>
         /// <param name="value"></param>
-        void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
+        Task SetPropertyAsync<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
         /// <summary>
         /// Checks if recording for the cuesheet is possible
         /// </summary>
@@ -55,13 +55,13 @@ public interface ICuesheetManager
         /// </summary>
         /// <param name="cuesheet"></param>
         /// <param name="track"></param>
-        void AddTrack(Track track);
+        Task AddTrackAsync(Track track);
         /// <summary>
         /// Remove tracks from cuesheet
         /// </summary>
         /// <param name="cuesheet"></param>
         /// <param name="tracksToRemove"></param>
-        void RemoveTracks(IEnumerable<Track> tracksToRemove);
+        Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove);
         /// <summary>
         /// Determines if moving tracks up is possible
         /// </summary>
@@ -78,12 +78,12 @@ public interface ICuesheetManager
         /// Moves selected tracks up
         /// </summary>
         /// <param name="selectedTracks"></param>
-        Result MoveTracksUp(HashSet<Track> selectedTracks);
+        Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks);
         /// <summary>
         /// Moves selected tracks down
         /// </summary>
         /// <param name="selectedTracks"></param>
         /// <returns></returns>
-        Result MoveTracksDown(HashSet<Track> selectedTracks);
+        Task<Result> MoveTracksDownAsync(HashSet<Track> selectedTracks);
     }
 }
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index 47d2058a..c258140e 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -28,9 +28,9 @@ along with Foobar.  If not, see
 @if (Cuesheet != null)
 {
     <MudForm @ref="_form" Model="Cuesheet">
-        <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
+        <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetPropertyAsync(x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
                       Placeholder="@_localizer["Enter the cuesheet artist here"]" Variant="Variant.Outlined" />
-        <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
+        <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetPropertyAsync(x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
                       Placeholder="@_localizer["Enter the cuesheet title here"]" Variant="Variant.Outlined" />
         @switch(CurrentViewMode)
         {
@@ -119,7 +119,7 @@ along with Foobar.  If not, see
                 audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
             }
             base.TraceChangeManager.BulkEdit = true;
-            _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
+            await _cuesheetManager.SetPropertyAsync(x => x.Audiofile, audiofile);
             base.TraceChangeManager.BulkEdit = false;
         }
         catch(ArgumentException ae)
@@ -164,7 +164,7 @@ along with Foobar.  If not, see
             {
                 newValue = _fileInputManager.CreateCDTextfile(browserFile.ContentType, browserFile.Name);
             }
-            _cuesheetManager.SetProperty(x => x.CDTextfile, newValue);
+            _cuesheetManager.SetPropertyAsync(x => x.CDTextfile, newValue);
         }
         catch (ArgumentException ae)
         {
@@ -223,7 +223,7 @@ along with Foobar.  If not, see
     void CataloguenumberOnBlur()
     {
         var newValue = _catalogueNumber?.Replace(" ", string.Empty);
-        _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue);
+        _cuesheetManager.SetPropertyAsync(x => x.Cataloguenumber, newValue);
     }
 
     void TraceChangeManager_RedoDone(object? sender, EventArgs e)
diff --git a/AudioCuesheetEditor/Shared/Record/AddTrack.razor b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
index 14ee4278..2d8fd91b 100644
--- a/AudioCuesheetEditor/Shared/Record/AddTrack.razor
+++ b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
     {
         if (Cuesheet.IsRecording == true)
         {
-            _cuesheetManager.AddTrack(currentRecordingTrack);
+            await _cuesheetManager.AddTrackAsync(currentRecordingTrack);
             currentRecordingTrack = new()
             {
                 IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 7508c81a..fb6215c0 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -48,8 +48,8 @@ along with Foobar.  If not, see
             <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Cuesheet?.Tracks.Any() == false"
-                                     MoveTracksUpDisabled="!_cuesheetManager.IsMoveTracksUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveTracksUp(_selectedTracks)"
-                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveTracksDownPossible(_selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDown(_selectedTracks)"
+                                     MoveTracksUpDisabled="!_cuesheetManager.IsMoveTracksUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveTracksUpAsync(_selectedTracks)"
+                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveTracksDownPossible(_selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDownAsync(_selectedTracks)"
                                      CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
                                      FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !_applicationOptions?.FixedTracksTableHeader)" />
         </div>
@@ -64,7 +64,7 @@ along with Foobar.  If not, see
             <SelectColumn Hidden="CurrentViewMode == ViewMode.RecordView" />
             <TemplateColumn Title="@_localizer["Controls"]" Hidden="CurrentViewMode != ViewMode.RecordView">
                 <EditTemplate>
-                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracks([context.Item])" />
+                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracksAsync([context.Item])" />
                 </EditTemplate>
             </TemplateColumn>
             <PropertyColumn Property="x => x.Position" Title="#" Editable="false" HeaderStyle="width: 1px;" />
@@ -166,13 +166,13 @@ along with Foobar.  If not, see
         _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
     }
 
-    void AddTrackClicked()
+    async Task AddTrackClicked()
     {
         var newTrack = new Track()
         {
             IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
         };
-        _cuesheetManager.AddTrack(newTrack);
+        await _cuesheetManager.AddTrackAsync(newTrack);
     }
 
     async Task EditSelectedTracksClicked()
@@ -180,9 +180,9 @@ along with Foobar.  If not, see
         await _editTrackModalManager.ShowAndHandleModalEditDialogAsync(_selectedTracks);
     }
 
-    void DeleteSelectedTracksClicked()
+    async Task DeleteSelectedTracksClicked()
     {
-        _cuesheetManager.RemoveTracks(_selectedTracks);
+        await _cuesheetManager.RemoveTracksAsync(_selectedTracks);
         _selectedTracks.Clear();
     }
 
@@ -196,7 +196,7 @@ along with Foobar.  If not, see
         var result = await dialog.Result;
         if (result?.Canceled == false)
         {
-            _cuesheetManager.RemoveTracks(Cuesheet!.Tracks);
+            await _cuesheetManager.RemoveTracksAsync(Cuesheet!.Tracks);
             _selectedTracks.Clear();
         }
     }
@@ -233,7 +233,7 @@ along with Foobar.  If not, see
             copy.Position = (ushort?)(trackThatWillBeCopied.Position + 1);
             copy.Begin = trackThatWillBeCopied.End;
             copy.End = null;
-            _cuesheetManager.AddTrack(copy);
+            await _cuesheetManager.AddTrackAsync(copy);
             await EditTrackModalClicked(copy);
         }
     }

From e33727828b043c88064cc84173f3798581227587 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 30 Apr 2026 13:00:19 +0200
Subject: [PATCH 118/150] Update CuesheetManager.cs

---
 .../Services/AudioCuesheet/CuesheetManager.cs | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 0e1062ca..97eef9f5 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -36,13 +36,13 @@ public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionSta
         public async Task SetPropertyAsync<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
             _traceChangeManager.BulkEdit = true;
-            //TODO: set cuesheet to import cuesheet if using import view
-            var audiofile = _sessionStateContainer.Cuesheet.Audiofile;
-            SetValue(_sessionStateContainer.Cuesheet, propertyExpression, value);
+            var cuesheet = await GetCurrentCuesheetAsync();
+            var audiofile = cuesheet?.Audiofile;
+            SetValue(cuesheet!, propertyExpression, value);
             // If audiofile has been set, we need to calculate last track end
-            if (audiofile != _sessionStateContainer.Cuesheet.Audiofile)
+            if (audiofile != cuesheet?.Audiofile)
             {
-                await SetLastTrackEndAsync();
+                SetLastTrackEnd(cuesheet!);
             }
             _traceChangeManager.BulkEdit = false;
         }
@@ -115,7 +115,7 @@ public async Task AddTrackAsync(Track track)
             }
             else
             {
-                var lastTrack = await GetLastTrackAsync();
+                var lastTrack = GetLastTrack(cuesheet!);
                 if ((cuesheet?.Audiofile?.Duration.HasValue == true) && (lastTrack?.End.HasValue == true) && (lastTrack.End == cuesheet.Audiofile.Duration))
                 {
                     _trackManager.SetProperty(lastTrack, x => x.End, null);
@@ -145,16 +145,15 @@ public async Task AddTrackAsync(Track track)
                 track
             };
             SetValue(cuesheet, x => x.Tracks, newValue);
-            await SetLastTrackEndAsync();
+            SetLastTrackEnd(cuesheet);
             _traceChangeManager.BulkEdit = false;
         }
 
         /// <inheritdoc/>
         public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
         {
-            var cuesheet = _sessionStateContainer.Cuesheet;
-            //TODO: set cuesheet to import cuesheet if using import view
-            var intersection = cuesheet.Tracks.Intersect(tracksToRemove);
+            var cuesheet = await GetCurrentCuesheetAsync();
+            var intersection = cuesheet!.Tracks.Intersect(tracksToRemove);
             ICollection<Track> newValue = [.. cuesheet.Tracks.Except(intersection)];
             //Calculate position and begin of new tracks
             ushort position = 1;
@@ -170,7 +169,7 @@ public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
             }
             _traceChangeManager.BulkEdit = true;
             SetValue(cuesheet, x => x.Tracks, newValue);
-            await SetLastTrackEndAsync();
+            SetLastTrackEnd(cuesheet);
             _traceChangeManager.BulkEdit = false;
         }
 
@@ -262,12 +261,12 @@ void SetValue<TProperty>(Cuesheet cuesheet, Expression<Func<Cuesheet, TProperty>
             _traceChangeManager.AddChange(new(cuesheet, new(previousValue, propertyInfo.Name)));
         }
 
-        async Task SetLastTrackEndAsync()
+        void SetLastTrackEnd(Cuesheet cuesheet)
         {
-            var lastTrack = await GetLastTrackAsync();
-            if ((lastTrack?.End.HasValue == false) && (_sessionStateContainer.Cuesheet.Audiofile?.Duration.HasValue == true))
+            var lastTrack = GetLastTrack(cuesheet);
+            if ((lastTrack?.End.HasValue == false) && (cuesheet.Audiofile?.Duration.HasValue == true))
             {
-                _trackManager.SetProperty(lastTrack, x => x.End, _sessionStateContainer.Cuesheet.Audiofile.Duration);
+                _trackManager.SetProperty(lastTrack, x => x.End, cuesheet.Audiofile.Duration);
             }
         }
 
@@ -281,10 +280,9 @@ async Task SetLastTrackEndAsync()
             return _sessionStateContainer.Cuesheet;
         }
 
-        async Task<Track?> GetLastTrackAsync()
+        static Track? GetLastTrack(Cuesheet cuesheet)
         {
-            var cuesheet = await GetCurrentCuesheetAsync();
-            return cuesheet?.Tracks
+            return cuesheet.Tracks
                 .OrderByDescending(x => x.Position.HasValue).ThenBy(x => x.Position)
                 .ThenByDescending(x => x.Begin.HasValue).ThenBy(x => x.Begin)
                 .ThenByDescending(x => x.End.HasValue).ThenBy(x => x.End)

From fa43b9ce7d2b1b81be2ccadc1a810e2af3f176eb Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 30 Apr 2026 14:24:28 +0200
Subject: [PATCH 119/150] Update CuesheetManagerTests.cs

---
 .../AudioCuesheet/CuesheetManagerTests.cs         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index d47f77ad..4d7ae0cd 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -83,6 +83,11 @@ public async Task SetPropertyAsync_NewValue_ChangesPropertyAndSetsTracedChangeAs
             // Arrange
             var cuesheet = new Cuesheet();
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             // Act
             await _cuesheetManager.SetPropertyAsync(x => x.Artist, "Artist");
             // Assert
@@ -99,6 +104,11 @@ public async Task SetPropertyAsync_EqualValue_DoesntChangePropertyAsync()
                 Artist = "Artist"
             };
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             // Act
             await _cuesheetManager.SetPropertyAsync(x => x.Artist, cuesheet.Artist);
             // Assert
@@ -118,6 +128,11 @@ public async Task SetPropertyAsync_AudiofileWithDuration_SetsLastTrackEndAlsoAsy
                 Tracks = [track]
             };
             track.Cuesheet = cuesheet;
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
             var duration = new TimeSpan(0, 5, 23);
             var audiofile = new Audiofile("Test.mp3", nameof(SetPropertyAsync_AudiofileWithDuration_SetsLastTrackEndAlsoAsync), Audiofile.AudioCodecs.First(), duration);

From 3877e77ce075b62433c4da64f59cadd56c3082d9 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Thu, 30 Apr 2026 15:25:22 +0200
Subject: [PATCH 120/150] fix TODOs

---
 .../Services/AudioCuesheet/CuesheetManager.cs     | 15 ++++++---------
 .../Services/AudioCuesheet/ICuesheetManager.cs    |  2 +-
 .../Shared/TrackList/TrackList.razor              |  5 ++++-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 97eef9f5..45b22071 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -175,14 +175,13 @@ public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
 
         /// <inheritdoc/>
         //TODO: Tests
-        public bool IsMoveTracksUpPossible(HashSet<Track> selectedTracks) => selectedTracks.Count == 0 || selectedTracks.Min(x => x.Position) <= 1;
+        public bool IsMoveTracksUpPossible(HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Min(x => x.Position) >= 2;
 
         /// <inheritdoc/>
         //TODO: Tests
-        public bool IsMoveTracksDownPossible(HashSet<Track> selectedTracks)
+        public async Task<bool> IsMoveTracksDownPossibleAsync(HashSet<Track> selectedTracks)
         {
-            var cuesheet = _sessionStateContainer.Cuesheet;
-            //TODO: set cuesheet to import cuesheet if using import view
+            var cuesheet = await GetCurrentCuesheetAsync();
             return selectedTracks.Count == 0 || selectedTracks.Max(x => x.Position) >= cuesheet?.Tracks.Max(x => x.Position);
         }
 
@@ -195,8 +194,7 @@ public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
                 return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks up is not possible!"));
             }
             _traceChangeManager.BulkEdit = true;
-            var cuesheet = _sessionStateContainer.Cuesheet;
-            //TODO: set cuesheet to import cuesheet if using import view
+            var cuesheet = await GetCurrentCuesheetAsync();
             foreach (var selectedTrack in selectedTracks)
             {
                 var previousTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
@@ -216,13 +214,12 @@ public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
         //TODO: Tests
         public async Task<Result> MoveTracksDownAsync(HashSet<Track> selectedTracks)
         {
-            if (IsMoveTracksDownPossible(selectedTracks) == false)
+            if (await IsMoveTracksDownPossibleAsync(selectedTracks) == false)
             {
                 return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks down is not possible!"));
             }
             _traceChangeManager.BulkEdit = true;
-            var cuesheet = _sessionStateContainer.Cuesheet;
-            //TODO: set cuesheet to import cuesheet if using import view
+            var cuesheet = await GetCurrentCuesheetAsync();
             foreach (var selectedTrack in selectedTracks)
             {
                 var nextTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index d68df89f..71a551fd 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -73,7 +73,7 @@ public interface ICuesheetManager
         /// </summary>
         /// <param name="selectedTracks"></param>
         /// <returns></returns>
-        Boolean IsMoveTracksDownPossible(HashSet<Track> selectedTracks);
+        Task<Boolean> IsMoveTracksDownPossibleAsync(HashSet<Track> selectedTracks);
         /// <summary>
         /// Moves selected tracks up
         /// </summary>
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index fb6215c0..ff7e4851 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -49,7 +49,7 @@ along with Foobar.  If not, see
                                      DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Cuesheet?.Tracks.Any() == false"
                                      MoveTracksUpDisabled="!_cuesheetManager.IsMoveTracksUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveTracksUpAsync(_selectedTracks)"
-                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveTracksDownPossible(_selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDownAsync(_selectedTracks)"
+                                     MoveTracksDownDisabled="_moveTracksDownDisabled" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDownAsync(_selectedTracks)"
                                      CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
                                      FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !_applicationOptions?.FixedTracksTableHeader)" />
         </div>
@@ -133,6 +133,9 @@ along with Foobar.  If not, see
     Track? _contextMenuTrack;
     ApplicationOptions? _applicationOptions;
     MudForm? _form;
+    Boolean _moveTracksDownDisabled = true;
+
+    //TODO: Use _cuesheetManager.IsMoveTracksDownPossibleAsync to calculate _moveTracksDownDisabled
 
     public Cuesheet? Cuesheet
     {

From 2eda67c9fba0830b0936e22fceddaea9378cd269 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 09:08:24 +0200
Subject: [PATCH 121/150] Update CuesheetManager.cs

---
 .../Services/AudioCuesheet/CuesheetManager.cs            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 45b22071..d9cc9352 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -195,15 +195,20 @@ public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
             }
             _traceChangeManager.BulkEdit = true;
             var cuesheet = await GetCurrentCuesheetAsync();
-            foreach (var selectedTrack in selectedTracks)
+            foreach (var selectedTrack in selectedTracks.OrderBy(x => x.Position))
             {
                 var previousTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
+                var newBegin = previousTrack?.Begin;
+                var newEnd = previousTrack?.End;
                 if (previousTrack != null)
                 {
                     _trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
+                    _trackManager.SetProperty(previousTrack, x => x.Begin, selectedTrack.Begin);
+                    _trackManager.SetProperty(previousTrack, x => x.End, selectedTrack.End);
                 }
                 _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
-                //TODO: switch begin, end and length
+                _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
+                _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
             }
             await SetPropertyAsync(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
             _traceChangeManager.BulkEdit = false;

From 871b0d6633c36ee6d1c080d066a100abb62380d7 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 13:40:14 +0200
Subject: [PATCH 122/150] fix bulk edit tracing

---
 .../Services/UI/TraceChangeManagerTests.cs    | 25 +++++++++++++++++++
 .../Services/UI/TraceChangeManager.cs         | 13 ++++------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 61ce008c..98b99a17 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -86,6 +86,31 @@ public void BulkEdit_WithoutChange_DoesntAddChange()
             Assert.IsFalse(_traceChangeManager.CanUndo);
         }
 
+        [TestMethod()]
+        public void BulkEdit_AlreadyEnabledBulkEdit_DoesntDropPreviousEdits()
+        {
+            // Arrange
+            var cuesheet = new Cuesheet
+            {
+                Artist = "Test Artist 1",
+                Title = "Test Title 1",
+                Cataloguenumber = "1234567890"
+            };
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Artist))));
+            _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Title))));
+            _traceChangeManager.AddChange(new(cuesheet, new(null, nameof(Cuesheet.Cataloguenumber))));
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.BulkEdit = false;
+            // Act
+            _traceChangeManager.Undo();
+            // Assert
+            Assert.IsNull(cuesheet.Artist);
+            Assert.IsNull(cuesheet.Title);
+            Assert.IsNull(cuesheet.Cataloguenumber);
+            Assert.IsTrue(_traceChangeManager.CanRedo);
+        }
+
         [TestMethod()]
         public void Undo_SingleChange_UndoesChange()
         {
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index 090c8508..815e01c2 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -168,19 +168,16 @@ public bool BulkEdit
                 }
                 if (value)
                 {
-                    _bulkEditTracedChanges = [];
+                    _bulkEditTracedChanges ??= [];
                 }
                 else
                 {
-                    if (_bulkEditTracedChanges != null)
+                    if (_bulkEditTracedChanges?.Count != 0)
                     {
-                        if (_bulkEditTracedChanges.Count != 0)
-                        {
-                            _undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
-                            TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
-                        }
-                        _bulkEditTracedChanges = null;
+                        _undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
+                        TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
                     }
+                    _bulkEditTracedChanges = null;
                 }
             }
         }

From 2acbb3c85d802d4327dff8dc817bb800b0e5407c Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 14:30:51 +0200
Subject: [PATCH 123/150] fix moving down

---
 .../Services/AudioCuesheet/CuesheetManager.cs | 22 ++++++++++---------
 .../AudioCuesheet/ICuesheetManager.cs         |  3 ++-
 .../Services/UI/TraceChangeManager.cs         |  2 +-
 .../Shared/TrackList/TrackList.razor          |  5 +----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index d9cc9352..af5f3958 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -179,11 +179,7 @@ public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
 
         /// <inheritdoc/>
         //TODO: Tests
-        public async Task<bool> IsMoveTracksDownPossibleAsync(HashSet<Track> selectedTracks)
-        {
-            var cuesheet = await GetCurrentCuesheetAsync();
-            return selectedTracks.Count == 0 || selectedTracks.Max(x => x.Position) >= cuesheet?.Tracks.Max(x => x.Position);
-        }
+        public bool IsMoveTracksDownPossible(Cuesheet cuesheet, HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Max(x => x.Position) < cuesheet?.Tracks.Max(x => x.Position);
 
         /// <inheritdoc/>
         //TODO: Tests
@@ -219,21 +215,27 @@ public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
         //TODO: Tests
         public async Task<Result> MoveTracksDownAsync(HashSet<Track> selectedTracks)
         {
-            if (await IsMoveTracksDownPossibleAsync(selectedTracks) == false)
+            var cuesheet = await GetCurrentCuesheetAsync();
+            if (IsMoveTracksDownPossible(cuesheet!, selectedTracks) == false)
             {
                 return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks down is not possible!"));
             }
             _traceChangeManager.BulkEdit = true;
-            var cuesheet = await GetCurrentCuesheetAsync();
-            foreach (var selectedTrack in selectedTracks)
+            foreach (var selectedTrack in selectedTracks.OrderByDescending(x => x.Position))
             {
                 var nextTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
+                var newBegin = nextTrack?.Begin;
+                var newEnd = nextTrack?.End;
                 if (nextTrack != null)
                 {
                     _trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
+                    _trackManager.SetProperty(nextTrack, x => x.Begin, selectedTrack.Begin);
+                    _trackManager.SetProperty(nextTrack, x => x.End, selectedTrack.End);
                 }
-                _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
-                //TODO: switch begin, end and length
+                var newPosition = (ushort?)(selectedTrack.Position + 1);
+                _trackManager.SetProperty(selectedTrack, x => x.Position, newPosition);
+                _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
+                _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
             }
             await SetPropertyAsync(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
             _traceChangeManager.BulkEdit = false;
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index 71a551fd..675984d4 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -71,9 +71,10 @@ public interface ICuesheetManager
         /// <summary>
         /// Determines if moving tracks down is possible
         /// </summary>
+        /// <param name="cuesheet"></param>
         /// <param name="selectedTracks"></param>
         /// <returns></returns>
-        Task<Boolean> IsMoveTracksDownPossibleAsync(HashSet<Track> selectedTracks);
+        Boolean IsMoveTracksDownPossible(Cuesheet cuesheet, HashSet<Track> selectedTracks);
         /// <summary>
         /// Moves selected tracks up
         /// </summary>
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index 815e01c2..79a53ef1 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -172,7 +172,7 @@ public bool BulkEdit
                 }
                 else
                 {
-                    if (_bulkEditTracedChanges?.Count != 0)
+                    if (_bulkEditTracedChanges?.Count > 0)
                     {
                         _undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
                         TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index ff7e4851..63f079b8 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -49,7 +49,7 @@ along with Foobar.  If not, see
                                      DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Cuesheet?.Tracks.Any() == false"
                                      MoveTracksUpDisabled="!_cuesheetManager.IsMoveTracksUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveTracksUpAsync(_selectedTracks)"
-                                     MoveTracksDownDisabled="_moveTracksDownDisabled" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDownAsync(_selectedTracks)"
+                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveTracksDownPossible(Cuesheet!, _selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDownAsync(_selectedTracks)"
                                      CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
                                      FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !_applicationOptions?.FixedTracksTableHeader)" />
         </div>
@@ -133,9 +133,6 @@ along with Foobar.  If not, see
     Track? _contextMenuTrack;
     ApplicationOptions? _applicationOptions;
     MudForm? _form;
-    Boolean _moveTracksDownDisabled = true;
-
-    //TODO: Use _cuesheetManager.IsMoveTracksDownPossibleAsync to calculate _moveTracksDownDisabled
 
     public Cuesheet? Cuesheet
     {

From 4f7c17cbb99228a6481b9165c9775c94d4e183df Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 14:32:03 +0200
Subject: [PATCH 124/150] Update TrackManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 48bcb1fb..1e818d0e 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -29,6 +29,7 @@ public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManage
         public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
         {
             SetValue(track, propertyExpression, value);
+            //TODO: We need to move recalculation to a seperate method
             RecalculateLinkedProperties(track);
         }
 

From 388e93fd378ad91e4a64a12d186691a37c19d0b6 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 15:09:01 +0200
Subject: [PATCH 125/150] Update AddTrack.razor

---
 .../Shared/Record/AddTrack.razor              | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/AudioCuesheetEditor/Shared/Record/AddTrack.razor b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
index 2d8fd91b..1c585443 100644
--- a/AudioCuesheetEditor/Shared/Record/AddTrack.razor
+++ b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
@@ -29,12 +29,12 @@ along with Foobar.  If not, see
             @{
                 MusicBrainzArtist? autocompleteArtist = new()
                 {
-                    Name = currentRecordingTrack.Artist
+                    Name = _currentRecordingTrack.Artist
                 };
             }
-            <MudAutocomplete @ref="artistInput" T="MusicBrainzArtist" Label="@_localizer["Artist"]" SearchFunc="_autocompleteManager.SearchArtistsAsync" ToStringFunc="(value) => value?.Name" 
-                             @bind-Text="@currentRecordingTrack.Artist" @bind-Value="autocompleteArtist" Clearable ShowProgressIndicator ResetValueOnEmptyText
-                             Error="!String.IsNullOrEmpty(GetValidationErrorMessage(currentRecordingTrack, nameof(Track.Artist)))" ErrorText="@GetValidationErrorMessage(currentRecordingTrack, nameof(Track.Artist))"
+            <MudAutocomplete @ref="_artistInput" T="MusicBrainzArtist" Label="@_localizer["Artist"]" SearchFunc="_autocompleteManager.SearchArtistsAsync" ToStringFunc="(value) => value?.Name" 
+                             @bind-Text="@_currentRecordingTrack.Artist" @bind-Value="autocompleteArtist" Clearable ShowProgressIndicator ResetValueOnEmptyText
+                             Error="!String.IsNullOrEmpty(GetValidationErrorMessage(_currentRecordingTrack, nameof(Track.Artist)))" ErrorText="@GetValidationErrorMessage(_currentRecordingTrack, nameof(Track.Artist))"
                              Disabled="Cuesheet?.IsRecording == false" MaxItems="null" CoerceText="false">
                 <ItemTemplate Context="autocompleteContext">
                     @if (autocompleteContext.Disambiguation != null)
@@ -50,13 +50,13 @@ along with Foobar.  If not, see
             @{
                 MusicBrainzTrack? autocompleteTrack = new()
                 {
-                    Artist = currentRecordingTrack.Artist,
-                    Title = currentRecordingTrack.Title
+                    Artist = _currentRecordingTrack.Artist,
+                    Title = _currentRecordingTrack.Title
                 };
             }
-            <MudAutocomplete @ref="titleInput" T="MusicBrainzTrack" Label="@_localizer["Title"]" SearchFunc="(value, token) => _autocompleteManager.SearchTitlesAsync(value, currentRecordingTrack.Artist, token)" ToStringFunc="(value) => value?.Title"
-                             @bind-Text="currentRecordingTrack.Title" @bind-Value="autocompleteTrack" Clearable ShowProgressIndicator ResetValueOnEmptyText 
-                             Error="!String.IsNullOrEmpty(GetValidationErrorMessage(currentRecordingTrack, nameof(Track.Title)))" ErrorText="@GetValidationErrorMessage(currentRecordingTrack, nameof(Track.Title))" 
+            <MudAutocomplete @ref="_titleInput" T="MusicBrainzTrack" Label="@_localizer["Title"]" SearchFunc="(value, token) => _autocompleteManager.SearchTitlesAsync(value, _currentRecordingTrack.Artist, token)" ToStringFunc="(value) => value?.Title"
+                             @bind-Text="_currentRecordingTrack.Title" @bind-Value="autocompleteTrack" Clearable ShowProgressIndicator ResetValueOnEmptyText 
+                             Error="!String.IsNullOrEmpty(GetValidationErrorMessage(_currentRecordingTrack, nameof(Track.Title)))" ErrorText="@GetValidationErrorMessage(_currentRecordingTrack, nameof(Track.Title))" 
                              Disabled="Cuesheet?.IsRecording == false" MaxItems="null" CoerceText="false">
                 <ItemTemplate Context="autocompleteContext">
                     @if (autocompleteContext.Disambiguation != null)
@@ -85,6 +85,11 @@ along with Foobar.  If not, see
 
     public Cuesheet Cuesheet => _sessionStateContainer.Cuesheet;
 
+    Track _currentRecordingTrack = new();
+    MudAutocomplete<MusicBrainzArtist>? _artistInput;
+    MudAutocomplete<MusicBrainzTrack>? _titleInput;
+    ApplicationOptions? _applicationOptions;
+
     protected override void OnInitialized()
     {
         base.OnInitialized();
@@ -94,11 +99,11 @@ along with Foobar.  If not, see
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
-        applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
+        _applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
         base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
-        currentRecordingTrack = new()
+        _currentRecordingTrack = new()
         {
-            IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
+            IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
         };
     }
 
@@ -112,11 +117,6 @@ along with Foobar.  If not, see
         base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
     }
 
-    Track currentRecordingTrack = new();
-    MudAutocomplete<MusicBrainzArtist>? artistInput;
-    MudAutocomplete<MusicBrainzTrack>? titleInput;
-    ApplicationOptions? applicationOptions;
-
     String? GetValidationErrorMessage(object model, string propertyName)
     {
         String? validationErrorMessage = null;
@@ -132,14 +132,14 @@ along with Foobar.  If not, see
     {
         if (Cuesheet.IsRecording == true)
         {
-            await _cuesheetManager.AddTrackAsync(currentRecordingTrack);
-            currentRecordingTrack = new()
+            await _cuesheetManager.AddTrackAsync(_currentRecordingTrack);
+            _currentRecordingTrack = new()
             {
-                IsLinkedToPreviousTrack = applicationOptions!.DefaultIsLinkedToPreviousTrack
+                IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
             };
-            if (artistInput != null)
+            if (_artistInput != null)
             {
-                await artistInput.FocusAsync();
+                await _artistInput.FocusAsync();
             }
         }
     }
@@ -147,15 +147,15 @@ along with Foobar.  If not, see
     void CuesheetManager_IsRecordingChanged(object? sender, EventArgs args)
     {
         StateHasChanged();
-        artistInput?.ClearAsync();
-        titleInput?.ClearAsync();
+        _artistInput?.ClearAsync();
+        _titleInput?.ClearAsync();
     }
 
     void LocalStorageOptionsProvider_OptionSaved(object? sender, IOptions option)
     {
         if (option is ApplicationOptions applicationOption)
         {
-            applicationOptions = applicationOption;
+            _applicationOptions = applicationOption;
             StateHasChanged();
         }
     }

From 8f79457308b0a0af668e37b8f06cf67014a44b7e Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 15:23:14 +0200
Subject: [PATCH 126/150] Update EditMultipleTracksModal.de.resx

---
 .../Shared/Dialogs/EditMultipleTracksModal.de.resx              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
index b03a5f25..c15b5e68 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
+++ b/AudioCuesheetEditor/Shared/Dialogs/EditMultipleTracksModal.de.resx
@@ -121,7 +121,7 @@
     <value>Künstler</value>
   </data>
   <data name="Begin" xml:space="preserve">
-    <value>Start</value>
+    <value>Beginn</value>
   </data>
   <data name="Change" xml:space="preserve">
     <value>Ändern</value>

From 7575a53daf59e7fa4ee9bd17074806f560f1f80f Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 15:26:32 +0200
Subject: [PATCH 127/150] fix moving of tracks

---
 .../Services/AudioCuesheet/ITrackManager.cs   |  5 ++
 .../Services/AudioCuesheet/TrackManager.cs    | 60 +++++++++----------
 .../Services/UI/DialogManager.cs              |  1 +
 .../Shared/TrackList/TrackList.razor          |  4 ++
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
index 367b7da2..fc631edd 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ITrackManager.cs
@@ -65,5 +65,10 @@ public interface ITrackManager
         /// <param name="track"></param>
         /// <returns></returns>
         Track? GetNextLinkedTrack(Track track);
+        /// <summary>
+        /// Recalculates properties of linked tracks (previous and next track)
+        /// </summary>
+        /// <param name="track"></param>
+        void RecalculateLinkedTracksProperties(Track track);
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 1e818d0e..67759a98 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -29,8 +29,6 @@ public class TrackManager(ITraceChangeManager traceChangeManager) : ITrackManage
         public void SetProperty<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
         {
             SetValue(track, propertyExpression, value);
-            //TODO: We need to move recalculation to a seperate method
-            RecalculateLinkedProperties(track);
         }
 
         /// <inheritdoc/>
@@ -140,29 +138,9 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
             return null;
         }
 
-        void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
-        {
-            if (propertyExpression.Body is not MemberExpression memberExpression)
-            {
-                throw new ArgumentException("Expression must be a property");
-            }
-
-            if (memberExpression.Member is not PropertyInfo propertyInfo)
-            {
-                throw new ArgumentException("Member is not a property");
-            }
-
-            var previousValue = (TProperty?)propertyInfo.GetValue(track);
-            if (Equals(previousValue, value))
-            {
-                return;
-            }
-
-            propertyInfo.SetValue(track, value);
-            _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
-        }
-
-        void RecalculateLinkedProperties(Track track)
+        /// <inheritdoc/>
+        //TODO: Tests
+        public void RecalculateLinkedTracksProperties(Track track)
         {
             if (track.Cuesheet != null)
             {
@@ -171,15 +149,15 @@ void RecalculateLinkedProperties(Track track)
                 {
                     if (track.Position.HasValue == false && previousTrack.Position.HasValue && (track.Position != previousTrack.Position.Value + 1))
                     {
-                        track.Position = (ushort?)(previousTrack.Position + 1);
+                        SetValue(track, x => x.Position, (ushort?)(previousTrack.Position + 1));
                     }
                     if (previousTrack.End.HasValue && (track.Begin != previousTrack.End))
                     {
-                        track.Begin = previousTrack.End;
+                        SetValue(track, x => x.Begin, previousTrack.End);
                     }
                     if ((previousTrack.End.HasValue == false) && track.Begin.HasValue)
                     {
-                        previousTrack.End = track.Begin;
+                        SetValue(previousTrack, x => x.End, track.Begin);
                     }
                 }
                 var nextTrack = GetNextLinkedTrack(track);
@@ -187,11 +165,33 @@ void RecalculateLinkedProperties(Track track)
                 {
                     if (track.Position.HasValue)
                     {
-                        nextTrack.Position = (ushort?)(track.Position + 1);
+                        SetValue(nextTrack, x => x.Position, (ushort?)(track.Position + 1));
                     }
-                    nextTrack.Begin = track.End;
+                    SetValue(nextTrack, x => x.Begin, track.End);
                 }
             }
         }
+
+        void SetValue<TProperty>(Track track, Expression<Func<Track, TProperty>> propertyExpression, TProperty value)
+        {
+            if (propertyExpression.Body is not MemberExpression memberExpression)
+            {
+                throw new ArgumentException("Expression must be a property");
+            }
+
+            if (memberExpression.Member is not PropertyInfo propertyInfo)
+            {
+                throw new ArgumentException("Member is not a property");
+            }
+
+            var previousValue = (TProperty?)propertyInfo.GetValue(track);
+            if (Equals(previousValue, value))
+            {
+                return;
+            }
+
+            propertyInfo.SetValue(track, value);
+            _traceChangeManager.AddChange(new(track, new(previousValue, propertyInfo.Name)));
+        }
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index d12cafbc..16b48a45 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -41,6 +41,7 @@ public async Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks)
                 if ((result?.Canceled == false) && (result.Data is Track editedTrack))
                 {
                     _trackManager.CopyValues(editedTrack, tracks.First());
+                    _trackManager.RecalculateLinkedTracksProperties(tracks.First());
                 }
             }
             if (tracks.Count() > 1)
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 63f079b8..40e0a8e1 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -28,6 +28,7 @@ along with Foobar.  If not, see
 @inject ISessionStateContainer _sessionStateContainer
 @inject ITrackManager _trackManager
 @inject ICuesheetManager _cuesheetManager
+@inject ITraceChangeManager _traceChangeManager
 
 @switch (CurrentViewMode)
 {
@@ -297,7 +298,10 @@ along with Foobar.  If not, see
     async Task TimespanChanged(Track track, System.Linq.Expressions.Expression<Func<Track, TimeSpan?>> expression, String value)
     {
         var timeSpan = await _applicationOptionsTimeSpanParser.GetTimespanAsync(value);
+        _traceChangeManager.BulkEdit = true;
         _trackManager.SetProperty<TimeSpan?>(track, expression, timeSpan);
+        _trackManager.RecalculateLinkedTracksProperties(track);
+        _traceChangeManager.BulkEdit = false;
         if (_form != null)
         {
             await _form.ValidateAsync();

From 7c9dddcd24de83c3f2fe50ef10c01978cd836921 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 15:31:22 +0200
Subject: [PATCH 128/150] add tests

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 114 ++++++++++++++++++
 .../Services/AudioCuesheet/CuesheetManager.cs |   1 -
 2 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index 4d7ae0cd..da95b0e4 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -546,5 +546,119 @@ public async Task RemoveTracksAsync_DuringImport_RemovesTracksAndRecalculatesRem
             Assert.AreEqual(duration, track5.End);
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == importCuesheet && y.TraceableChange.PreviousValue == previousValue && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
         }
+
+        [TestMethod]
+        public void IsMoveTracksUpPossible_TracksAbove_ReturnsTrue()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12),
+                IsLinkedToPreviousTrack = true
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = new TimeSpan(0, 3, 12),
+                End = new TimeSpan(0, 7, 34),
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = new TimeSpan(0, 7, 34),
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track3, track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            // Act
+            var result = _cuesheetManager.IsMoveTracksUpPossible([track2, track3]);
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [TestMethod]
+        public void IsMoveTracksUpPossible_NoTracksAbove_ReturnsFalse()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12),
+                IsLinkedToPreviousTrack = true
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = new TimeSpan(0, 3, 12),
+                End = new TimeSpan(0, 7, 34),
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = new TimeSpan(0, 7, 34),
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track2, track1, track3]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            // Act
+            var result = _cuesheetManager.IsMoveTracksUpPossible([track1, track2]);
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [TestMethod]
+        public void IsMoveTracksUpPossible_EmptyCollection_ReturnsFalse()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12),
+                IsLinkedToPreviousTrack = true
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = new TimeSpan(0, 3, 12),
+                End = new TimeSpan(0, 7, 34),
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = new TimeSpan(0, 7, 34),
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track2, track1, track3]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            // Act
+            var result = _cuesheetManager.IsMoveTracksUpPossible([]);
+            // Assert
+            Assert.IsFalse(result);
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index af5f3958..14ec0225 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -174,7 +174,6 @@ public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
         }
 
         /// <inheritdoc/>
-        //TODO: Tests
         public bool IsMoveTracksUpPossible(HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Min(x => x.Position) >= 2;
 
         /// <inheritdoc/>

From 99f85f62363ae19261973507ed4ce21889d5139b Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 15:57:18 +0200
Subject: [PATCH 129/150] add move down tests

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 82 ++++++++++++++++++-
 .../Services/AudioCuesheet/CuesheetManager.cs |  1 -
 2 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index da95b0e4..001df5fa 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -625,6 +625,54 @@ public void IsMoveTracksUpPossible_NoTracksAbove_ReturnsFalse()
 
         [TestMethod]
         public void IsMoveTracksUpPossible_EmptyCollection_ReturnsFalse()
+        {
+            // Arrange
+            // Act
+            var result = _cuesheetManager.IsMoveTracksUpPossible([]);
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [TestMethod]
+        public void IsMoveTracksDownPossible_TracksBelow_ReturnsTrue()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12),
+                IsLinkedToPreviousTrack = true
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = new TimeSpan(0, 3, 12),
+                End = new TimeSpan(0, 7, 34),
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = new TimeSpan(0, 7, 34),
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track3, track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            // Act
+            var result = _cuesheetManager.IsMoveTracksDownPossible(cuesheet, [track2, track1]);
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [TestMethod]
+        public void IsMoveTracksDownPossible_NoTracksBelow_ReturnsFalse()
         {
             // Arrange
             var track1 = new Track()
@@ -656,7 +704,39 @@ public void IsMoveTracksUpPossible_EmptyCollection_ReturnsFalse()
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
             // Act
-            var result = _cuesheetManager.IsMoveTracksUpPossible([]);
+            var result = _cuesheetManager.IsMoveTracksDownPossible(cuesheet, [track3, track2]);
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [TestMethod]
+        public void IsMoveTracksDownPossible_EmptyCollection_ReturnsFalse()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12),
+                IsLinkedToPreviousTrack = true
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = new TimeSpan(0, 3, 12),
+                End = new TimeSpan(0, 7, 34),
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = new TimeSpan(0, 7, 34),
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet();
+            // Act
+            var result = _cuesheetManager.IsMoveTracksDownPossible(cuesheet, []);
             // Assert
             Assert.IsFalse(result);
         }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 14ec0225..507f0301 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -177,7 +177,6 @@ public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
         public bool IsMoveTracksUpPossible(HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Min(x => x.Position) >= 2;
 
         /// <inheritdoc/>
-        //TODO: Tests
         public bool IsMoveTracksDownPossible(Cuesheet cuesheet, HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Max(x => x.Position) < cuesheet?.Tracks.Max(x => x.Position);
 
         /// <inheritdoc/>

From 2dc17453cf0d4f1a52bdb20fd54f5a2d30ef852b Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 4 May 2026 15:57:54 +0200
Subject: [PATCH 130/150] Update CuesheetManagerTests.cs

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index 001df5fa..e20c0e36 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -713,27 +713,6 @@ public void IsMoveTracksDownPossible_NoTracksBelow_ReturnsFalse()
         public void IsMoveTracksDownPossible_EmptyCollection_ReturnsFalse()
         {
             // Arrange
-            var track1 = new Track()
-            {
-                Position = 1,
-                Begin = TimeSpan.Zero,
-                End = new TimeSpan(0, 3, 12),
-                IsLinkedToPreviousTrack = true
-            };
-            var track2 = new Track()
-            {
-                Position = 2,
-                Begin = new TimeSpan(0, 3, 12),
-                End = new TimeSpan(0, 7, 34),
-                IsLinkedToPreviousTrack = true
-            };
-            var track3 = new Track()
-            {
-                Position = 3,
-                Begin = new TimeSpan(0, 7, 34),
-                End = new TimeSpan(0, 10, 4),
-                IsLinkedToPreviousTrack = true
-            };
             var cuesheet = new Cuesheet();
             // Act
             var result = _cuesheetManager.IsMoveTracksDownPossible(cuesheet, []);

From a3158597d9eed24380781e33329d3f446b108a20 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 5 May 2026 09:54:01 +0200
Subject: [PATCH 131/150] added test for moving tracks up

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 188 +++++++++++++++++-
 .../Services/AudioCuesheet/CuesheetManager.cs |   3 +-
 2 files changed, 182 insertions(+), 9 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index e20c0e36..4fc1bc5c 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -18,6 +18,7 @@
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Model.UI;
+using AudioCuesheetEditor.Services;
 using AudioCuesheetEditor.Services.AudioCuesheet;
 using AudioCuesheetEditor.Services.UI;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -47,14 +48,14 @@ public CuesheetManagerTests()
             _trackManager = new();
             _localStorageOptionsProvider = new();
             _trackManager.Setup(x => x.SetProperty(It.IsAny<Track>(),It.IsAny<Expression<Func<Track, It.IsAnyType>>>(),It.IsAny<It.IsAnyType>()))
-            .Callback((Track track, LambdaExpression propExpr, object value) =>
-            {
-                var memberExpression = propExpr.Body as MemberExpression;
-                if (memberExpression?.Member is PropertyInfo propertyInfo)
+                .Callback((Track track, LambdaExpression propExpr, object value) =>
                 {
-                    propertyInfo.SetValue(track, value);
-                }
-            });
+                    var memberExpression = propExpr.Body as MemberExpression;
+                    if (memberExpression?.Member is PropertyInfo propertyInfo)
+                    {
+                        propertyInfo.SetValue(track, value);
+                    }
+                });
             _trackManager.Setup(x => x.GetPreviousLinkedTrack(It.IsAny<Track>())).Returns(delegate (Track track)
             {
                 Track? previousLinkedTrack = null;
@@ -719,5 +720,178 @@ public void IsMoveTracksDownPossible_EmptyCollection_ReturnsFalse()
             // Assert
             Assert.IsFalse(result);
         }
+
+        [TestMethod]
+        public async Task MoveTracksUpAsync_TracksAbove_MovesTracksUpAsync()
+        {
+            // Arrange
+            var track1End = new TimeSpan(0, 3, 12);
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = track1End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track2End = new TimeSpan(0, 7, 34);
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = track1End,
+                End = track2End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = track2End,
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track3, track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            // Act
+            var result = await _cuesheetManager.MoveTracksUpAsync([track2, track3]);
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+            Assert.AreEqual((ushort?)1, track2.Position);
+            Assert.AreEqual(TimeSpan.Zero, track2.Begin);
+            Assert.AreEqual(track1End, track2.End);
+            Assert.AreEqual((ushort?)2, track3.Position);
+            Assert.AreEqual(track1End, track3.Begin);
+            Assert.AreEqual(track2End, track3.End);
+            Assert.AreEqual((ushort?)3, track1.Position);
+            Assert.AreEqual(track2End, track1.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Once);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
+        }
+
+        [TestMethod]
+        public async Task MoveTracksUpAsync_NoTracksAbove_ReturnsFailure()
+        {
+            // Arrange
+            var track1End = new TimeSpan(0, 3, 12);
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = track1End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track2End = new TimeSpan(0, 7, 34);
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = track1End,
+                End = track2End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = track2End,
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track3, track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            // Act
+            var result = await _cuesheetManager.MoveTracksUpAsync([track2, track1]);
+            // Assert
+            Assert.IsFalse(result.IsSuccess);
+            Assert.AreEqual(ErrorType.NotPossible, result.Error!.Type);
+            Assert.AreEqual((ushort?)1, track1.Position);
+            Assert.AreEqual(TimeSpan.Zero, track1.Begin);
+            Assert.AreEqual(track1End, track1.End);
+            Assert.AreEqual((ushort?)2, track2.Position);
+            Assert.AreEqual(track1End, track2.Begin);
+            Assert.AreEqual(track2End, track2.End);
+            Assert.AreEqual((ushort?)3, track3.Position);
+            Assert.AreEqual(track2End, track3.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Never);
+        }
+
+        [TestMethod]
+        public async Task MoveTracksUpAsync_NoTracksSelected_ReturnsFailure()
+        {
+            // Arrange
+            var track1End = new TimeSpan(0, 3, 12);
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = track1End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track2End = new TimeSpan(0, 7, 34);
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = track1End,
+                End = track2End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = track2End,
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track3, track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            // Act
+            var result = await _cuesheetManager.MoveTracksUpAsync([]);
+            // Assert
+            Assert.IsFalse(result.IsSuccess);
+            Assert.AreEqual(ErrorType.NotPossible, result.Error!.Type);
+            Assert.AreEqual((ushort?)1, track1.Position);
+            Assert.AreEqual(TimeSpan.Zero, track1.Begin);
+            Assert.AreEqual(track1End, track1.End);
+            Assert.AreEqual((ushort?)2, track2.Position);
+            Assert.AreEqual(track1End, track2.Begin);
+            Assert.AreEqual(track2End, track2.End);
+            Assert.AreEqual((ushort?)3, track3.Position);
+            Assert.AreEqual(track2End, track3.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Never);
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 507f0301..569961c5 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -180,7 +180,6 @@ public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
         public bool IsMoveTracksDownPossible(Cuesheet cuesheet, HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Max(x => x.Position) < cuesheet?.Tracks.Max(x => x.Position);
 
         /// <inheritdoc/>
-        //TODO: Tests
         public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
         {
             if (IsMoveTracksUpPossible(selectedTracks) == false)
@@ -204,7 +203,7 @@ public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
                 _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
                 _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
             }
-            await SetPropertyAsync(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
+            SetValue(cuesheet!, x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
             _traceChangeManager.BulkEdit = false;
             return Result.Success();
         }

From 0685fa84e8a2debf413ab98187897df9c4d781f1 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 5 May 2026 09:56:04 +0200
Subject: [PATCH 132/150] Update CuesheetManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 569961c5..7b517f45 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -273,6 +273,7 @@ void SetLastTrackEnd(Cuesheet cuesheet)
 
         async Task<Cuesheet?> GetCurrentCuesheetAsync()
         {
+            //TODO: Use OptionSaved and a local variable for options making shure to have IsMoveTracksDownPossible work without cuesheet reference
             var viewOptions = await _localStorageOptionsProvider.GetOptionsAsync<ViewOptions>();
             if (viewOptions.ActiveTab == ViewMode.ImportView)
             {

From 3d8c0e7369908152bc4ec0dab2e16fe1a6e1960c Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 5 May 2026 14:56:47 +0200
Subject: [PATCH 133/150] add tests for moving tracks down

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 173 ++++++++++++++++++
 .../Services/AudioCuesheet/CuesheetManager.cs |   3 +-
 2 files changed, 174 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index 4fc1bc5c..d0db5645 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -893,5 +893,178 @@ public async Task MoveTracksUpAsync_NoTracksSelected_ReturnsFailure()
             _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Never);
             _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Never);
         }
+
+        [TestMethod]
+        public async Task MoveTracksDownAsync_TracksBelow_ReturnsSucess()
+        {
+            // Arrange
+            var track1End = new TimeSpan(0, 3, 12);
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = track1End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track2End = new TimeSpan(0, 7, 34);
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = track1End,
+                End = track2End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = track2End,
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track3, track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            // Act
+            var result = await _cuesheetManager.MoveTracksDownAsync([track2, track1]);
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+            Assert.AreEqual((ushort?)1, track3.Position);
+            Assert.AreEqual(TimeSpan.Zero, track3.Begin);
+            Assert.AreEqual(track1End, track3.End);
+            Assert.AreEqual((ushort?)2, track1.Position);
+            Assert.AreEqual(track1End, track1.Begin);
+            Assert.AreEqual(track2End, track1.End);
+            Assert.AreEqual((ushort?)3, track2.Position);
+            Assert.AreEqual(track2End, track2.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Once);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Once);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
+        }
+
+        [TestMethod]
+        public async Task MoveTracksDownAsync_NoTracksBelow_ReturnsFailure()
+        {
+            // Arrange
+            var track1End = new TimeSpan(0, 3, 12);
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = track1End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track2End = new TimeSpan(0, 7, 34);
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = track1End,
+                End = track2End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = track2End,
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track3, track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            // Act
+            var result = await _cuesheetManager.MoveTracksDownAsync([track2, track3]);
+            // Assert
+            Assert.IsFalse(result.IsSuccess);
+            Assert.AreEqual(ErrorType.NotPossible, result.Error!.Type);
+            Assert.AreEqual((ushort?)1, track1.Position);
+            Assert.AreEqual(TimeSpan.Zero, track1.Begin);
+            Assert.AreEqual(track1End, track1.End);
+            Assert.AreEqual((ushort?)2, track2.Position);
+            Assert.AreEqual(track1End, track2.Begin);
+            Assert.AreEqual(track2End, track2.End);
+            Assert.AreEqual((ushort?)3, track3.Position);
+            Assert.AreEqual(track2End, track3.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Never);
+        }
+
+        [TestMethod]
+        public async Task MoveTracksDownAsync_NoTracksSelected_ReturnsFailure()
+        {
+            // Arrange
+            var track1End = new TimeSpan(0, 3, 12);
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = track1End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track2End = new TimeSpan(0, 7, 34);
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = track1End,
+                End = track2End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = track2End,
+                End = new TimeSpan(0, 10, 4),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track3, track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.DetailView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            // Act
+            var result = await _cuesheetManager.MoveTracksDownAsync([]);
+            // Assert
+            Assert.IsFalse(result.IsSuccess);
+            Assert.AreEqual(ErrorType.NotPossible, result.Error!.Type);
+            Assert.AreEqual((ushort?)1, track1.Position);
+            Assert.AreEqual(TimeSpan.Zero, track1.Begin);
+            Assert.AreEqual(track1End, track1.End);
+            Assert.AreEqual((ushort?)2, track2.Position);
+            Assert.AreEqual(track1End, track2.Begin);
+            Assert.AreEqual(track2End, track2.End);
+            Assert.AreEqual((ushort?)3, track3.Position);
+            Assert.AreEqual(track2End, track3.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PropertyName == nameof(Cuesheet.Tracks))), Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Never);
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 7b517f45..aa73f775 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -209,7 +209,6 @@ public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
         }
 
         /// <inheritdoc/>
-        //TODO: Tests
         public async Task<Result> MoveTracksDownAsync(HashSet<Track> selectedTracks)
         {
             var cuesheet = await GetCurrentCuesheetAsync();
@@ -234,7 +233,7 @@ public async Task<Result> MoveTracksDownAsync(HashSet<Track> selectedTracks)
                 _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
                 _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
             }
-            await SetPropertyAsync(x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
+            SetValue(cuesheet!, x => x.Tracks, cuesheet?.Tracks.OrderBy(x => x.Position));
             _traceChangeManager.BulkEdit = false;
             return Result.Success();
         }

From 3cc91ad227bc035922d99c8ed5d131704d05a903 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 5 May 2026 15:02:05 +0200
Subject: [PATCH 134/150] Update CuesheetManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index aa73f775..3f2ffa9c 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -100,6 +100,7 @@ public async Task AddTrackAsync(Track track)
             var cuesheet = await GetCurrentCuesheetAsync();
             track.Cuesheet = cuesheet;
             // Calculate track properties
+            //TODO: Refactor this code (maybe use trackmanager)
             _traceChangeManager.BulkEdit = true;
             if (cuesheet?.IsRecording == true)
             {

From 0877c8f7e9120d7d2f8dec566ae38fd04159c8fa Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 6 May 2026 09:17:05 +0200
Subject: [PATCH 135/150] use session state for active cuesheet

---
 AudioCuesheetEditor/Program.cs                |  8 ++-
 .../Services/UI/ISessionStateContainer.cs     | 12 +++-
 .../Services/UI/SessionStateContainer.cs      | 62 ++++++++++++++++++-
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/AudioCuesheetEditor/Program.cs b/AudioCuesheetEditor/Program.cs
index 1c35461a..031766d3 100644
--- a/AudioCuesheetEditor/Program.cs
+++ b/AudioCuesheetEditor/Program.cs
@@ -49,7 +49,13 @@
 builder.Services.AddScoped<ILocalStorageOptionsProvider, LocalStorageOptionsProvider>();
 builder.Services.AddScoped<MusicBrainzDataProvider>();
 
-builder.Services.AddScoped<ISessionStateContainer, SessionStateContainer>();
+builder.Services.AddScoped<ISessionStateContainer>(x =>
+{
+    var localStorageOptionsProvider = x.GetRequiredService<ILocalStorageOptionsProvider>();
+    var sessionStateContainer = new SessionStateContainer(localStorageOptionsProvider);
+    _ = sessionStateContainer.InitializeAsync();
+    return sessionStateContainer;
+});
 builder.Services.AddScoped<ITraceChangeManager, TraceChangeManager>();
 builder.Services.AddScoped<ImportManager>();
 builder.Services.AddScoped<ITextImportService, TextImportService>();
diff --git a/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
index 4dcd0aca..e3f31f3f 100644
--- a/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/ISessionStateContainer.cs
@@ -27,7 +27,17 @@ public interface ISessionStateContainer
         public Cuesheet? ImportCuesheet { get; set; }
         public Audiofile? ImportAudiofile { get; set; }
         public IImportfile? Importfile { get; set; }
-        public void ResetImport();
         public Boolean ImportIsAnalyzed { get; set; }
+        public void ResetImport();
+        /// <summary>
+        /// Initialize this class
+        /// </summary>
+        /// <returns></returns>
+        Task InitializeAsync();
+        /// <summary>
+        /// Get current cuesheet based on current view
+        /// </summary>
+        /// <returns></returns>
+        public Cuesheet? GetActiveCuesheet();
     }
 }
diff --git a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
index 7015d7ba..4c2b0207 100644
--- a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
@@ -13,20 +13,38 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.Options;
 
 namespace AudioCuesheetEditor.Services.UI
 {
-    public class SessionStateContainer() : ISessionStateContainer
+    public class SessionStateContainer : ISessionStateContainer, IDisposable
     {
+        private readonly ILocalStorageOptionsProvider _localStorageOptionsProvider;
+
         private Cuesheet _cuesheet = new();
         private Cuesheet? _importCuesheet;
+        private ViewOptions? _viewOptions;
+        private bool disposedValue;
 
         public event EventHandler? CuesheetChanged;
         public event EventHandler? ImportCuesheetChanged;
 
+        public SessionStateContainer(ILocalStorageOptionsProvider localStorageOptionsProvider)
+        {
+            _localStorageOptionsProvider = localStorageOptionsProvider;
+            _localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
         public Cuesheet Cuesheet 
         {
             get => _cuesheet;
@@ -49,11 +67,53 @@ public Cuesheet? ImportCuesheet
         public IImportfile? Importfile{ get; set; }
         public Boolean ImportIsAnalyzed { get; set; } = false;
 
+        /// <inheritdoc/>
+        public async Task InitializeAsync()
+        {
+            _viewOptions ??= await _localStorageOptionsProvider.GetOptionsAsync<ViewOptions>();
+        }
+
+
         public void ResetImport()
         {
             Importfile = null;
             ImportAudiofile = null;
             ImportCuesheet = null;
         }
+
+        /// <inheritdoc/>
+        //TODO: Tests
+        public Cuesheet? GetActiveCuesheet()
+        {
+            if (_viewOptions == null)
+            {
+                throw new InvalidOperationException("Not initialized!");
+            }
+            if (_viewOptions.ActiveTab == ViewMode.ImportView)
+            {
+                return ImportCuesheet;
+            }
+            return Cuesheet;
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    _localStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
+                }
+                disposedValue = true;
+            }
+        }
+
+        private void LocalStorageOptionsProvider_OptionSaved(object? sender, IOptions options)
+        {
+            if (options is ViewOptions viewOptions)
+            {
+                _viewOptions = viewOptions;
+            }
+        }
     }
 }

From 1f3c8f723c59d74e9794e51c8282bad0d42a141f Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 6 May 2026 09:40:19 +0200
Subject: [PATCH 136/150] fix cuesheetmanager

---
 .../AudioCuesheet/CuesheetManagerTests.cs     | 183 +++++-------------
 .../Services/UI/SessionStateContainerTests.cs |  12 +-
 AudioCuesheetEditor/Pages/Index.razor         |   2 +-
 .../Services/AudioCuesheet/CuesheetManager.cs |  40 ++--
 .../AudioCuesheet/ICuesheetManager.cs         |  16 +-
 .../Shared/Cuesheet/CuesheetData.razor        |  12 +-
 .../Shared/Record/AddTrack.razor              |   2 +-
 .../Shared/TrackList/TrackList.razor          |  18 +-
 8 files changed, 96 insertions(+), 189 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index d0db5645..f3496ee8 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -13,10 +13,8 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
-using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.IO.Audio;
-using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Model.UI;
 using AudioCuesheetEditor.Services;
 using AudioCuesheetEditor.Services.AudioCuesheet;
@@ -28,7 +26,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Threading.Tasks;
 
 namespace AudioCuesheetEditor.Tests.Services.AudioCuesheet
 {
@@ -39,14 +36,12 @@ public class CuesheetManagerTests
         private readonly Mock<ITraceChangeManager> _traceChangeManager;
         private readonly Mock<ISessionStateContainer> _sessionStateContainer;
         private readonly Mock<ITrackManager> _trackManager;
-        private readonly Mock<ILocalStorageOptionsProvider> _localStorageOptionsProvider;
 
         public CuesheetManagerTests()
         {
             _traceChangeManager = new();
             _sessionStateContainer = new();
             _trackManager = new();
-            _localStorageOptionsProvider = new();
             _trackManager.Setup(x => x.SetProperty(It.IsAny<Track>(),It.IsAny<Expression<Func<Track, It.IsAnyType>>>(),It.IsAny<It.IsAnyType>()))
                 .Callback((Track track, LambdaExpression propExpr, object value) =>
                 {
@@ -75,49 +70,39 @@ public CuesheetManagerTests()
                 }
                 return previousLinkedTrack;
             });
-            _cuesheetManager = new(_traceChangeManager.Object, _sessionStateContainer.Object, _trackManager.Object, _localStorageOptionsProvider.Object);
+            _cuesheetManager = new(_traceChangeManager.Object, _sessionStateContainer.Object, _trackManager.Object);
         }
 
         [TestMethod]
-        public async Task SetPropertyAsync_NewValue_ChangesPropertyAndSetsTracedChangeAsync()
+        public void SetProperty_NewValue_ChangesPropertyAndSetsTracedChange()
         {
             // Arrange
             var cuesheet = new Cuesheet();
-            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             // Act
-            await _cuesheetManager.SetPropertyAsync(x => x.Artist, "Artist");
+            _cuesheetManager.SetProperty(x => x.Artist, "Artist");
             // Assert
             Assert.AreEqual("Artist", cuesheet.Artist);
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Artist))), Times.Once);
         }
 
         [TestMethod]
-        public async Task SetPropertyAsync_EqualValue_DoesntChangePropertyAsync()
+        public void SetProperty_EqualValue_DoesntChangeProperty()
         {
             // Arrange
             var cuesheet = new Cuesheet()
             {
                 Artist = "Artist"
             };
-            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             // Act
-            await _cuesheetManager.SetPropertyAsync(x => x.Artist, cuesheet.Artist);
+            _cuesheetManager.SetProperty(x => x.Artist, cuesheet.Artist);
             // Assert
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Artist))), Times.Never);
         }
 
         [TestMethod]
-        public async Task SetPropertyAsync_AudiofileWithDuration_SetsLastTrackEndAlsoAsync()
+        public void SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso()
         {
             // Arrange
             var track = new Track()
@@ -129,16 +114,11 @@ public async Task SetPropertyAsync_AudiofileWithDuration_SetsLastTrackEndAlsoAsy
                 Tracks = [track]
             };
             track.Cuesheet = cuesheet;
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
-            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             var duration = new TimeSpan(0, 5, 23);
-            var audiofile = new Audiofile("Test.mp3", nameof(SetPropertyAsync_AudiofileWithDuration_SetsLastTrackEndAlsoAsync), Audiofile.AudioCodecs.First(), duration);
+            var audiofile = new Audiofile("Test.mp3", nameof(SetProperty_AudiofileWithDuration_SetsLastTrackEndAlso), Audiofile.AudioCodecs.First(), duration);
             // Act
-            await _cuesheetManager.SetPropertyAsync(x => x.Audiofile, audiofile);
+            _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
             // Assert
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Cuesheet.Audiofile))), Times.Once);
             Assert.AreEqual(duration, track.End);
@@ -281,23 +261,18 @@ public void StopRecording_WithoutActiveRecording_ChangesNothing()
         }
 
         [TestMethod]
-        public async Task AddTrackAsync_FirstTrack_AddsNewTrackWithCalulatedTrackPropertiesAsync()
+        public void AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties()
         {
             // Arrange
             var duration = new TimeSpan(0, 27, 56);
             var cuesheet = new Cuesheet()
             {
-                Audiofile = new("Audio.mp3", nameof(AddTrackAsync_FirstTrack_AddsNewTrackWithCalulatedTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
-            };
-            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
+                Audiofile = new("Audio.mp3", nameof(AddTrack_FirstTrack_AddsNewTrackWithCalulatedTrackProperties), Audiofile.AudioCodecs.First(), duration)
             };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             var track = new Track();
             // Act
-            await _cuesheetManager.AddTrackAsync(track);
+            _cuesheetManager.AddTrack(track);
             // Assert
             Assert.HasCount(1, cuesheet.Tracks);
             Assert.AreEqual((ushort)1, cuesheet.Tracks.First().Position);
@@ -307,7 +282,7 @@ public async Task AddTrackAsync_FirstTrack_AddsNewTrackWithCalulatedTrackPropert
         }
 
         [TestMethod]
-        public async Task AddTrackAsync_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackPropertiesAsync()
+        public void AddTrack_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackProperties()
         {
             // Arrange
             var duration = new TimeSpan(0, 27, 56);
@@ -323,17 +298,12 @@ public async Task AddTrackAsync_AddToPreviousTracks_AddsNewTrackWithCalulatedTra
             var cuesheet = new Cuesheet()
             {
                 Tracks = tracks,
-                Audiofile = new("Audio.mp3", nameof(AddTrackAsync_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
-            };
-            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
+                Audiofile = new("Audio.mp3", nameof(AddTrack_AddToPreviousTracks_AddsNewTrackWithCalulatedTrackProperties), Audiofile.AudioCodecs.First(), duration)
             };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             var track = new Track();
             // Act
-            await _cuesheetManager.AddTrackAsync(track);
+            _cuesheetManager.AddTrack(track);
             // Assert
             Assert.HasCount(2, cuesheet.Tracks);
             Assert.AreEqual((ushort)2, cuesheet.Tracks.Last().Position);
@@ -343,7 +313,7 @@ public async Task AddTrackAsync_AddToPreviousTracks_AddsNewTrackWithCalulatedTra
         }
 
         [TestMethod]
-        public async Task AddTrackAsync_DuringRecording_AddsNewTrackWithCalulatedTrackPropertiesAsync()
+        public void AddTrack_DuringRecording_AddsNewTrackWithCalulatedTrackProperties()
         {
             // Arrange
             var tracks = new List<Track>
@@ -359,15 +329,10 @@ public async Task AddTrackAsync_DuringRecording_AddsNewTrackWithCalulatedTrackPr
                 RecordingStart = DateTime.UtcNow,
                 Tracks = tracks
             };
-            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.RecordView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             var track = new Track();
             // Act
-            await _cuesheetManager.AddTrackAsync(track);
+            _cuesheetManager.AddTrack(track);
             // Assert
             Assert.HasCount(2, cuesheet.Tracks);
             Assert.AreEqual((ushort)2, cuesheet.Tracks.Last().Position);
@@ -377,23 +342,18 @@ public async Task AddTrackAsync_DuringRecording_AddsNewTrackWithCalulatedTrackPr
         }
 
         [TestMethod]
-        public async Task AddTrackAsync_FirstTrackImporting_AddsNewTrackWithCalulatedTrackPropertiesAsync()
+        public void AddTrack_FirstTrackImporting_AddsNewTrackWithCalulatedTrackProperties()
         {
             // Arrange
             var duration = new TimeSpan(0, 27, 56);
             var importCuesheet = new Cuesheet()
             {
-                Audiofile = new("Audio.mp3", nameof(AddTrackAsync_FirstTrack_AddsNewTrackWithCalulatedTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
-            };
-            _sessionStateContainer.SetupProperty(x => x.ImportCuesheet, importCuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.ImportView
+                Audiofile = new("Audio.mp3", nameof(AddTrack_FirstTrackImporting_AddsNewTrackWithCalulatedTrackProperties), Audiofile.AudioCodecs.First(), duration)
             };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(importCuesheet);
             var track = new Track();
             // Act
-            await _cuesheetManager.AddTrackAsync(track);
+            _cuesheetManager.AddTrack(track);
             // Assert
             Assert.HasCount(1, importCuesheet.Tracks);
             Assert.AreEqual((ushort)1, importCuesheet.Tracks.First().Position);
@@ -403,7 +363,7 @@ public async Task AddTrackAsync_FirstTrackImporting_AddsNewTrackWithCalulatedTra
         }
 
         [TestMethod]
-        public async Task RemoveTracksAsync_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackPropertiesAsync()
+        public void RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackProperties()
         {
             // Arrange
             var track1 = new Track()
@@ -445,21 +405,16 @@ public async Task RemoveTracksAsync_WithAttachedTracks_RemovesTracksAndRecalcula
             var cuesheet = new Cuesheet()
             {
                 Tracks = previousValue,
-                Audiofile = new("Audio.mp3", nameof(RemoveTracksAsync_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
+                Audiofile = new("Audio.mp3", nameof(RemoveTracks_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackProperties), Audiofile.AudioCodecs.First(), duration)
             };
             track1.Cuesheet = cuesheet;
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
             track4.Cuesheet = cuesheet;
             track5.Cuesheet = cuesheet;
-            _sessionStateContainer.SetupProperty(x => x.Cuesheet, cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             // Act
-            await _cuesheetManager.RemoveTracksAsync([track2, track4]);
+            _cuesheetManager.RemoveTracks([track2, track4]);
             // Assert
             Assert.HasCount(3, cuesheet.Tracks);
             Assert.IsTrue(cuesheet.Tracks.Contains(track1));
@@ -476,7 +431,7 @@ public async Task RemoveTracksAsync_WithAttachedTracks_RemovesTracksAndRecalcula
         }
 
         [TestMethod]
-        public async Task RemoveTracksAsync_DuringImport_RemovesTracksAndRecalculatesRemainingTrackPropertiesAsync()
+        public void RemoveTracks_DuringImport_RemovesTracksAndRecalculatesRemainingTrackProperties()
         {
             // Arrange
             var track1 = new Track()
@@ -518,21 +473,16 @@ public async Task RemoveTracksAsync_DuringImport_RemovesTracksAndRecalculatesRem
             var importCuesheet = new Cuesheet()
             {
                 Tracks = previousValue,
-                Audiofile = new("Audio.mp3", nameof(RemoveTracksAsync_WithAttachedTracks_RemovesTracksAndRecalculatesRemainingTrackPropertiesAsync), Audiofile.AudioCodecs.First(), duration)
+                Audiofile = new("Audio.mp3", nameof(RemoveTracks_DuringImport_RemovesTracksAndRecalculatesRemainingTrackProperties), Audiofile.AudioCodecs.First(), duration)
             };
             track1.Cuesheet = importCuesheet;
             track2.Cuesheet = importCuesheet;
             track3.Cuesheet = importCuesheet;
             track4.Cuesheet = importCuesheet;
             track5.Cuesheet = importCuesheet;
-            _sessionStateContainer.SetupProperty(x => x.ImportCuesheet, importCuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.ImportView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(importCuesheet);
             // Act
-            await _cuesheetManager.RemoveTracksAsync([track2, track4]);
+            _cuesheetManager.RemoveTracks([track2, track4]);
             // Assert
             Assert.HasCount(3, importCuesheet.Tracks);
             Assert.IsTrue(importCuesheet.Tracks.Contains(track1));
@@ -666,8 +616,9 @@ public void IsMoveTracksDownPossible_TracksBelow_ReturnsTrue()
             track1.Cuesheet = cuesheet;
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             // Act
-            var result = _cuesheetManager.IsMoveTracksDownPossible(cuesheet, [track2, track1]);
+            var result = _cuesheetManager.IsMoveTracksDownPossible([track2, track1]);
             // Assert
             Assert.IsTrue(result);
         }
@@ -705,7 +656,7 @@ public void IsMoveTracksDownPossible_NoTracksBelow_ReturnsFalse()
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
             // Act
-            var result = _cuesheetManager.IsMoveTracksDownPossible(cuesheet, [track3, track2]);
+            var result = _cuesheetManager.IsMoveTracksDownPossible([track3, track2]);
             // Assert
             Assert.IsFalse(result);
         }
@@ -716,13 +667,13 @@ public void IsMoveTracksDownPossible_EmptyCollection_ReturnsFalse()
             // Arrange
             var cuesheet = new Cuesheet();
             // Act
-            var result = _cuesheetManager.IsMoveTracksDownPossible(cuesheet, []);
+            var result = _cuesheetManager.IsMoveTracksDownPossible([]);
             // Assert
             Assert.IsFalse(result);
         }
 
         [TestMethod]
-        public async Task MoveTracksUpAsync_TracksAbove_MovesTracksUpAsync()
+        public void MoveTracksUp_TracksAbove_ReturnsSuccess()
         {
             // Arrange
             var track1End = new TimeSpan(0, 3, 12);
@@ -755,14 +706,9 @@ public async Task MoveTracksUpAsync_TracksAbove_MovesTracksUpAsync()
             track1.Cuesheet = cuesheet;
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
-            _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             // Act
-            var result = await _cuesheetManager.MoveTracksUpAsync([track2, track3]);
+            var result = _cuesheetManager.MoveTracksUp([track2, track3]);
             // Assert
             Assert.IsTrue(result.IsSuccess);
             Assert.AreEqual((ushort?)1, track2.Position);
@@ -779,7 +725,7 @@ public async Task MoveTracksUpAsync_TracksAbove_MovesTracksUpAsync()
         }
 
         [TestMethod]
-        public async Task MoveTracksUpAsync_NoTracksAbove_ReturnsFailure()
+        public void MoveTracksUp_NoTracksAbove_ReturnsFailure()
         {
             // Arrange
             var track1End = new TimeSpan(0, 3, 12);
@@ -813,13 +759,8 @@ public async Task MoveTracksUpAsync_NoTracksAbove_ReturnsFailure()
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
             _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             // Act
-            var result = await _cuesheetManager.MoveTracksUpAsync([track2, track1]);
+            var result = _cuesheetManager.MoveTracksUp([track2, track1]);
             // Assert
             Assert.IsFalse(result.IsSuccess);
             Assert.AreEqual(ErrorType.NotPossible, result.Error!.Type);
@@ -837,7 +778,7 @@ public async Task MoveTracksUpAsync_NoTracksAbove_ReturnsFailure()
         }
 
         [TestMethod]
-        public async Task MoveTracksUpAsync_NoTracksSelected_ReturnsFailure()
+        public void MoveTracksUp_NoTracksSelected_ReturnsFailure()
         {
             // Arrange
             var track1End = new TimeSpan(0, 3, 12);
@@ -871,13 +812,8 @@ public async Task MoveTracksUpAsync_NoTracksSelected_ReturnsFailure()
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
             _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             // Act
-            var result = await _cuesheetManager.MoveTracksUpAsync([]);
+            var result = _cuesheetManager.MoveTracksUp([]);
             // Assert
             Assert.IsFalse(result.IsSuccess);
             Assert.AreEqual(ErrorType.NotPossible, result.Error!.Type);
@@ -895,7 +831,7 @@ public async Task MoveTracksUpAsync_NoTracksSelected_ReturnsFailure()
         }
 
         [TestMethod]
-        public async Task MoveTracksDownAsync_TracksBelow_ReturnsSucess()
+        public void MoveTracksDown_TracksBelow_ReturnsSucess()
         {
             // Arrange
             var track1End = new TimeSpan(0, 3, 12);
@@ -928,14 +864,9 @@ public async Task MoveTracksDownAsync_TracksBelow_ReturnsSucess()
             track1.Cuesheet = cuesheet;
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
-            _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            _sessionStateContainer.Setup(x => x.GetActiveCuesheet()).Returns(cuesheet);
             // Act
-            var result = await _cuesheetManager.MoveTracksDownAsync([track2, track1]);
+            var result = _cuesheetManager.MoveTracksDown([track2, track1]);
             // Assert
             Assert.IsTrue(result.IsSuccess);
             Assert.AreEqual((ushort?)1, track3.Position);
@@ -952,7 +883,7 @@ public async Task MoveTracksDownAsync_TracksBelow_ReturnsSucess()
         }
 
         [TestMethod]
-        public async Task MoveTracksDownAsync_NoTracksBelow_ReturnsFailure()
+        public void MoveTracksDown_NoTracksBelow_ReturnsFailure()
         {
             // Arrange
             var track1End = new TimeSpan(0, 3, 12);
@@ -986,13 +917,8 @@ public async Task MoveTracksDownAsync_NoTracksBelow_ReturnsFailure()
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
             _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             // Act
-            var result = await _cuesheetManager.MoveTracksDownAsync([track2, track3]);
+            var result = _cuesheetManager.MoveTracksDown([track2, track3]);
             // Assert
             Assert.IsFalse(result.IsSuccess);
             Assert.AreEqual(ErrorType.NotPossible, result.Error!.Type);
@@ -1010,7 +936,7 @@ public async Task MoveTracksDownAsync_NoTracksBelow_ReturnsFailure()
         }
 
         [TestMethod]
-        public async Task MoveTracksDownAsync_NoTracksSelected_ReturnsFailure()
+        public void MoveTracksDown_NoTracksSelected_ReturnsFailure()
         {
             // Arrange
             var track1End = new TimeSpan(0, 3, 12);
@@ -1044,13 +970,8 @@ public async Task MoveTracksDownAsync_NoTracksSelected_ReturnsFailure()
             track2.Cuesheet = cuesheet;
             track3.Cuesheet = cuesheet;
             _sessionStateContainer.Setup(x => x.Cuesheet).Returns(cuesheet);
-            var viewOptions = new ViewOptions()
-            {
-                ActiveTab = ViewMode.DetailView
-            };
-            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
             // Act
-            var result = await _cuesheetManager.MoveTracksDownAsync([]);
+            var result = _cuesheetManager.MoveTracksDown([]);
             // Assert
             Assert.IsFalse(result.IsSuccess);
             Assert.AreEqual(ErrorType.NotPossible, result.Error!.Type);
diff --git a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
index 02894def..179b6e71 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
@@ -13,10 +13,9 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Model.AudioCuesheet;
-using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
-using AudioCuesheetEditor.Model.UI;
 using AudioCuesheetEditor.Services.UI;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -26,7 +25,14 @@ namespace AudioCuesheetEditor.Tests.Services.UI
     [TestClass]
     public class SessionStateContainerTests
     {
-        private readonly SessionStateContainer _sessionStateContainer = new();
+        private readonly SessionStateContainer _sessionStateContainer;
+        private readonly Mock<ILocalStorageOptionsProvider> _localStorageOptionsProvider;
+
+        public SessionStateContainerTests()
+        {
+            _localStorageOptionsProvider = new();
+            _sessionStateContainer = new(_localStorageOptionsProvider.Object);
+        }
 
         [TestMethod]
         public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
diff --git a/AudioCuesheetEditor/Pages/Index.razor b/AudioCuesheetEditor/Pages/Index.razor
index 102c2bfe..445ba103 100644
--- a/AudioCuesheetEditor/Pages/Index.razor
+++ b/AudioCuesheetEditor/Pages/Index.razor
@@ -115,7 +115,7 @@ along with Foobar.  If not, see
                 }
                 if (_sessionStateContainer.ImportAudiofile != null)
                 {
-                    await _cuesheetManager.SetPropertyAsync(x => x.Audiofile, _sessionStateContainer.ImportAudiofile);
+                    _cuesheetManager.SetProperty(x => x.Audiofile, _sessionStateContainer.ImportAudiofile);
                 }
             }
             finally
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 3f2ffa9c..837fb41b 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -13,9 +13,7 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
-using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Model.AudioCuesheet;
-using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Services.UI;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -23,20 +21,19 @@
 namespace AudioCuesheetEditor.Services.AudioCuesheet
 {
     /// <inheritdoc/>
-    public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionStateContainer sessionStateContainer, ITrackManager trackManager, ILocalStorageOptionsProvider localStorageOptionsProvider) : ICuesheetManager
+    public class CuesheetManager(ITraceChangeManager traceChangeManager, ISessionStateContainer sessionStateContainer, ITrackManager trackManager) : ICuesheetManager
     {
         private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
         private readonly ISessionStateContainer _sessionStateContainer = sessionStateContainer;
         private readonly ITrackManager _trackManager = trackManager;
-        private readonly ILocalStorageOptionsProvider _localStorageOptionsProvider = localStorageOptionsProvider;
 
         public event EventHandler? IsRecordingChanged;
 
         /// <inheritdoc/>
-        public async Task SetPropertyAsync<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
+        public void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value)
         {
             _traceChangeManager.BulkEdit = true;
-            var cuesheet = await GetCurrentCuesheetAsync();
+            var cuesheet = _sessionStateContainer.GetActiveCuesheet();
             var audiofile = cuesheet?.Audiofile;
             SetValue(cuesheet!, propertyExpression, value);
             // If audiofile has been set, we need to calculate last track end
@@ -95,9 +92,9 @@ public void StopRecording()
         }
 
         /// <inheritdoc/>
-        public async Task AddTrackAsync(Track track)
+        public void AddTrack(Track track)
         {
-            var cuesheet = await GetCurrentCuesheetAsync();
+            var cuesheet = _sessionStateContainer.GetActiveCuesheet();
             track.Cuesheet = cuesheet;
             // Calculate track properties
             //TODO: Refactor this code (maybe use trackmanager)
@@ -151,9 +148,9 @@ public async Task AddTrackAsync(Track track)
         }
 
         /// <inheritdoc/>
-        public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
+        public void RemoveTracks(IEnumerable<Track> tracksToRemove)
         {
-            var cuesheet = await GetCurrentCuesheetAsync();
+            var cuesheet = _sessionStateContainer.GetActiveCuesheet();
             var intersection = cuesheet!.Tracks.Intersect(tracksToRemove);
             ICollection<Track> newValue = [.. cuesheet.Tracks.Except(intersection)];
             //Calculate position and begin of new tracks
@@ -178,17 +175,17 @@ public async Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove)
         public bool IsMoveTracksUpPossible(HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Min(x => x.Position) >= 2;
 
         /// <inheritdoc/>
-        public bool IsMoveTracksDownPossible(Cuesheet cuesheet, HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Max(x => x.Position) < cuesheet?.Tracks.Max(x => x.Position);
+        public bool IsMoveTracksDownPossible(HashSet<Track> selectedTracks) => selectedTracks.Count > 0 && selectedTracks.Max(x => x.Position) < _sessionStateContainer.GetActiveCuesheet()?.Tracks.Max(x => x.Position);
 
         /// <inheritdoc/>
-        public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
+        public Result MoveTracksUp(HashSet<Track> selectedTracks)
         {
             if (IsMoveTracksUpPossible(selectedTracks) == false)
             {
                 return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks up is not possible!"));
             }
             _traceChangeManager.BulkEdit = true;
-            var cuesheet = await GetCurrentCuesheetAsync();
+            var cuesheet = _sessionStateContainer.GetActiveCuesheet();
             foreach (var selectedTrack in selectedTracks.OrderBy(x => x.Position))
             {
                 var previousTrack = cuesheet?.Tracks.FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
@@ -210,10 +207,10 @@ public async Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks)
         }
 
         /// <inheritdoc/>
-        public async Task<Result> MoveTracksDownAsync(HashSet<Track> selectedTracks)
+        public Result MoveTracksDown(HashSet<Track> selectedTracks)
         {
-            var cuesheet = await GetCurrentCuesheetAsync();
-            if (IsMoveTracksDownPossible(cuesheet!, selectedTracks) == false)
+            var cuesheet = _sessionStateContainer.GetActiveCuesheet();
+            if (IsMoveTracksDownPossible(selectedTracks) == false)
             {
                 return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks down is not possible!"));
             }
@@ -271,17 +268,6 @@ void SetLastTrackEnd(Cuesheet cuesheet)
             }
         }
 
-        async Task<Cuesheet?> GetCurrentCuesheetAsync()
-        {
-            //TODO: Use OptionSaved and a local variable for options making shure to have IsMoveTracksDownPossible work without cuesheet reference
-            var viewOptions = await _localStorageOptionsProvider.GetOptionsAsync<ViewOptions>();
-            if (viewOptions.ActiveTab == ViewMode.ImportView)
-            {
-                return _sessionStateContainer.ImportCuesheet;
-            }
-            return _sessionStateContainer.Cuesheet;
-        }
-
         static Track? GetLastTrack(Cuesheet cuesheet)
         {
             return cuesheet.Tracks
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index 675984d4..460264ff 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -31,10 +31,9 @@ public interface ICuesheetManager
         /// Set property for cuesheet
         /// </summary>
         /// <typeparam name="TProperty"></typeparam>
-        /// <param name="cuesheet"></param>
         /// <param name="propertyExpression"></param>
         /// <param name="value"></param>
-        Task SetPropertyAsync<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
+        void SetProperty<TProperty>(Expression<Func<Cuesheet, TProperty>> propertyExpression, TProperty value);
         /// <summary>
         /// Checks if recording for the cuesheet is possible
         /// </summary>
@@ -53,15 +52,13 @@ public interface ICuesheetManager
         /// <summary>
         /// Adds a track to the cuesheet
         /// </summary>
-        /// <param name="cuesheet"></param>
         /// <param name="track"></param>
-        Task AddTrackAsync(Track track);
+        void AddTrack(Track track);
         /// <summary>
         /// Remove tracks from cuesheet
         /// </summary>
-        /// <param name="cuesheet"></param>
         /// <param name="tracksToRemove"></param>
-        Task RemoveTracksAsync(IEnumerable<Track> tracksToRemove);
+        void RemoveTracks(IEnumerable<Track> tracksToRemove);
         /// <summary>
         /// Determines if moving tracks up is possible
         /// </summary>
@@ -71,20 +68,19 @@ public interface ICuesheetManager
         /// <summary>
         /// Determines if moving tracks down is possible
         /// </summary>
-        /// <param name="cuesheet"></param>
         /// <param name="selectedTracks"></param>
         /// <returns></returns>
-        Boolean IsMoveTracksDownPossible(Cuesheet cuesheet, HashSet<Track> selectedTracks);
+        Boolean IsMoveTracksDownPossible(HashSet<Track> selectedTracks);
         /// <summary>
         /// Moves selected tracks up
         /// </summary>
         /// <param name="selectedTracks"></param>
-        Task<Result> MoveTracksUpAsync(HashSet<Track> selectedTracks);
+        Result MoveTracksUp(HashSet<Track> selectedTracks);
         /// <summary>
         /// Moves selected tracks down
         /// </summary>
         /// <param name="selectedTracks"></param>
         /// <returns></returns>
-        Task<Result> MoveTracksDownAsync(HashSet<Track> selectedTracks);
+        Result MoveTracksDown(HashSet<Track> selectedTracks);
     }
 }
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index c258140e..6de35334 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -28,9 +28,9 @@ along with Foobar.  If not, see
 @if (Cuesheet != null)
 {
     <MudForm @ref="_form" Model="Cuesheet">
-        <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetPropertyAsync(x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
+        <MudTextField Text="@Cuesheet.Artist" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Artist, newValue)" For="(() => Cuesheet.Artist)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet artist"]" 
                       Placeholder="@_localizer["Enter the cuesheet artist here"]" Variant="Variant.Outlined" />
-        <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetPropertyAsync(x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
+        <MudTextField Text="@Cuesheet.Title" TextChanged="(newValue) => _cuesheetManager.SetProperty(x => x.Title, newValue)" For="(() => Cuesheet.Title)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cuesheet title"]"
                       Placeholder="@_localizer["Enter the cuesheet title here"]" Variant="Variant.Outlined" />
         @switch(CurrentViewMode)
         {
@@ -118,9 +118,7 @@ along with Foobar.  If not, see
                 var fileUpload = await _fileInputManager.CreateFileUploadsAsync([browserFile], _fileInputAudiofileId);
                 audiofile = await _fileInputManager.CreateAudiofileAsync(fileUpload.Single());
             }
-            base.TraceChangeManager.BulkEdit = true;
-            await _cuesheetManager.SetPropertyAsync(x => x.Audiofile, audiofile);
-            base.TraceChangeManager.BulkEdit = false;
+            _cuesheetManager.SetProperty(x => x.Audiofile, audiofile);
         }
         catch(ArgumentException ae)
         {
@@ -164,7 +162,7 @@ along with Foobar.  If not, see
             {
                 newValue = _fileInputManager.CreateCDTextfile(browserFile.ContentType, browserFile.Name);
             }
-            _cuesheetManager.SetPropertyAsync(x => x.CDTextfile, newValue);
+            _cuesheetManager.SetProperty(x => x.CDTextfile, newValue);
         }
         catch (ArgumentException ae)
         {
@@ -223,7 +221,7 @@ along with Foobar.  If not, see
     void CataloguenumberOnBlur()
     {
         var newValue = _catalogueNumber?.Replace(" ", string.Empty);
-        _cuesheetManager.SetPropertyAsync(x => x.Cataloguenumber, newValue);
+        _cuesheetManager.SetProperty(x => x.Cataloguenumber, newValue);
     }
 
     void TraceChangeManager_RedoDone(object? sender, EventArgs e)
diff --git a/AudioCuesheetEditor/Shared/Record/AddTrack.razor b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
index 1c585443..d461b00a 100644
--- a/AudioCuesheetEditor/Shared/Record/AddTrack.razor
+++ b/AudioCuesheetEditor/Shared/Record/AddTrack.razor
@@ -132,7 +132,7 @@ along with Foobar.  If not, see
     {
         if (Cuesheet.IsRecording == true)
         {
-            await _cuesheetManager.AddTrackAsync(_currentRecordingTrack);
+            _cuesheetManager.AddTrack(_currentRecordingTrack);
             _currentRecordingTrack = new()
             {
                 IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 40e0a8e1..ecf47026 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -49,8 +49,8 @@ along with Foobar.  If not, see
             <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Cuesheet?.Tracks.Any() == false"
-                                     MoveTracksUpDisabled="!_cuesheetManager.IsMoveTracksUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveTracksUpAsync(_selectedTracks)"
-                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveTracksDownPossible(Cuesheet!, _selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDownAsync(_selectedTracks)"
+                                     MoveTracksUpDisabled="!_cuesheetManager.IsMoveTracksUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveTracksUp(_selectedTracks)"
+                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveTracksDownPossible(_selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveTracksDown(_selectedTracks)"
                                      CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
                                      FixedHeader="_applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !_applicationOptions?.FixedTracksTableHeader)" />
         </div>
@@ -65,7 +65,7 @@ along with Foobar.  If not, see
             <SelectColumn Hidden="CurrentViewMode == ViewMode.RecordView" />
             <TemplateColumn Title="@_localizer["Controls"]" Hidden="CurrentViewMode != ViewMode.RecordView">
                 <EditTemplate>
-                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracksAsync([context.Item])" />
+                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _cuesheetManager.RemoveTracks([context.Item])" />
                 </EditTemplate>
             </TemplateColumn>
             <PropertyColumn Property="x => x.Position" Title="#" Editable="false" HeaderStyle="width: 1px;" />
@@ -167,13 +167,13 @@ along with Foobar.  If not, see
         _sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
     }
 
-    async Task AddTrackClicked()
+    void AddTrackClicked()
     {
         var newTrack = new Track()
         {
             IsLinkedToPreviousTrack = _applicationOptions!.DefaultIsLinkedToPreviousTrack
         };
-        await _cuesheetManager.AddTrackAsync(newTrack);
+        _cuesheetManager.AddTrack(newTrack);
     }
 
     async Task EditSelectedTracksClicked()
@@ -181,9 +181,9 @@ along with Foobar.  If not, see
         await _editTrackModalManager.ShowAndHandleModalEditDialogAsync(_selectedTracks);
     }
 
-    async Task DeleteSelectedTracksClicked()
+    void DeleteSelectedTracksClicked()
     {
-        await _cuesheetManager.RemoveTracksAsync(_selectedTracks);
+        _cuesheetManager.RemoveTracks(_selectedTracks);
         _selectedTracks.Clear();
     }
 
@@ -197,7 +197,7 @@ along with Foobar.  If not, see
         var result = await dialog.Result;
         if (result?.Canceled == false)
         {
-            await _cuesheetManager.RemoveTracksAsync(Cuesheet!.Tracks);
+            _cuesheetManager.RemoveTracks(Cuesheet!.Tracks);
             _selectedTracks.Clear();
         }
     }
@@ -234,7 +234,7 @@ along with Foobar.  If not, see
             copy.Position = (ushort?)(trackThatWillBeCopied.Position + 1);
             copy.Begin = trackThatWillBeCopied.End;
             copy.End = null;
-            await _cuesheetManager.AddTrackAsync(copy);
+            _cuesheetManager.AddTrack(copy);
             await EditTrackModalClicked(copy);
         }
     }

From e511a37a25c94e00443d81707fee0a460f09d53c Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 6 May 2026 10:03:39 +0200
Subject: [PATCH 137/150] add tests

---
 .../Services/UI/SessionStateContainerTests.cs | 67 +++++++++++++++++++
 .../Services/UI/SessionStateContainer.cs      |  2 -
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
index 179b6e71..6a2cfe22 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs
@@ -16,9 +16,12 @@
 using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Services.UI;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using System;
+using System.Threading.Tasks;
 
 namespace AudioCuesheetEditor.Tests.Services.UI
 {
@@ -79,5 +82,69 @@ public void ResetImport_ShouldClearImportProperties()
             Assert.IsNull(_sessionStateContainer.ImportAudiofile);
             Assert.IsNull(_sessionStateContainer.ImportCuesheet);
         }
+
+        [TestMethod]
+        public async Task InitializeAsync_NotInitialized_ShouldInitializeAsync()
+        {
+            // Arrange
+            var viewOptions = new ViewOptions();
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            // Act
+            await _sessionStateContainer.InitializeAsync();
+            // Assert
+            _localStorageOptionsProvider.Verify(x => x.GetOptionsAsync<ViewOptions>(), Times.Once);
+        }
+
+        [TestMethod]
+        public async Task InitializeAsync_Initialized_ShouldNoptInitializeAsync()
+        {
+            // Arrange
+            var viewOptions = new ViewOptions();
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            await _sessionStateContainer.InitializeAsync();
+            // Act
+            await _sessionStateContainer.InitializeAsync();
+            // Assert
+            _localStorageOptionsProvider.Verify(x => x.GetOptionsAsync<ViewOptions>(), Times.Once);
+        }
+
+        [TestMethod]
+        public async Task GetActiveCuesheet_Initialized_ReturnsDetailViewCuesheeetAsync()
+        {
+            // Arrange
+            var viewOptions = new ViewOptions();
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            await _sessionStateContainer.InitializeAsync();
+            // Act
+            var result = _sessionStateContainer.GetActiveCuesheet();
+            // Assert
+            Assert.AreEqual(_sessionStateContainer.Cuesheet, result);
+        }
+
+        [TestMethod]
+        public async Task GetActiveCuesheet_InitializedWithImportView_ReturnsDetailViewCuesheeetAsync()
+        {
+            // Arrange
+            var viewOptions = new ViewOptions()
+            {
+                ActiveTab = ViewMode.ImportView
+            };
+            _localStorageOptionsProvider.Setup(x => x.GetOptionsAsync<ViewOptions>()).ReturnsAsync(viewOptions);
+            await _sessionStateContainer.InitializeAsync();
+            // Act
+            var result = _sessionStateContainer.GetActiveCuesheet();
+            // Assert
+            Assert.AreEqual(_sessionStateContainer.ImportCuesheet, result);
+        }
+
+        [TestMethod]
+        public void GetActiveCuesheet_NotInitialized_ThrowsException()
+        {
+            // Arrange
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => _sessionStateContainer.GetActiveCuesheet());
+            // Assert
+            Assert.AreEqual("Not initialized!", exception.Message);
+        }
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
index 4c2b0207..f4e00e55 100644
--- a/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
+++ b/AudioCuesheetEditor/Services/UI/SessionStateContainer.cs
@@ -73,7 +73,6 @@ public async Task InitializeAsync()
             _viewOptions ??= await _localStorageOptionsProvider.GetOptionsAsync<ViewOptions>();
         }
 
-
         public void ResetImport()
         {
             Importfile = null;
@@ -82,7 +81,6 @@ public void ResetImport()
         }
 
         /// <inheritdoc/>
-        //TODO: Tests
         public Cuesheet? GetActiveCuesheet()
         {
             if (_viewOptions == null)

From 1501523f81bb8644964c8ce3ea95889dca8ea8e7 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 6 May 2026 10:53:27 +0200
Subject: [PATCH 138/150] Update TrackManagerTests.cs

---
 .../AudioCuesheet/TrackManagerTests.cs        | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index a6e0e146..58274e77 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -66,39 +66,6 @@ public void SetProperty_EqualValue_DoesntChangeProperty()
             _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Artist))), Times.Never);
         }
 
-        [TestMethod]
-        public void SetProperty_CuesheetAvailable_CalculatesLinkedProperties()
-        {
-            // Arrange
-            var cuesheet = new Cuesheet()
-            {
-                Tracks = [
-                    new() 
-                    {
-                        IsLinkedToPreviousTrack = true,
-                        Position = 1,
-                        Begin = TimeSpan.Zero,
-                        End = new TimeSpan(0, 4, 56)
-                    }
-                ]
-            };
-            var track = new Track()
-            {
-                IsLinkedToPreviousTrack = true,
-                Cuesheet = cuesheet,
-                Begin = cuesheet.Tracks.Single().End
-            };
-            cuesheet.Tracks = cuesheet.Tracks.Append(track);
-            var artist = "Artist 1";
-            // Act
-            _trackManager.SetProperty(track, x => x.Artist, artist);
-            // Assert
-            Assert.AreEqual(artist, track.Artist);
-            Assert.AreEqual((ushort)2, track.Position);
-            Assert.AreEqual(track.Begin, cuesheet.Tracks.Single(x => x.Position == 1).End);
-            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Artist))), Times.Once);
-        }
-
         [TestMethod]
         public void Clone_ImportTrack_ReturnsTrackClone()
         {

From 322e2b90466d0d589c9dea57daf84e7fd837314d Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 6 May 2026 11:18:11 +0200
Subject: [PATCH 139/150] add tests

---
 .../AudioCuesheet/TrackManagerTests.cs        | 141 +++++++++++++++++-
 .../Services/AudioCuesheet/TrackManager.cs    |   1 -
 2 files changed, 140 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index 58274e77..f5af3322 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -21,7 +21,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Linq;
 
 namespace AudioCuesheetEditor.Tests.Services.AudioCuesheet
 {
@@ -466,5 +465,145 @@ public void GetNextLinkedTrack_MultiplePositions_ReturnsTrack()
             Assert.IsNotNull(linkedTrack);
             Assert.AreEqual(track2, linkedTrack);
         }
+
+        [TestMethod]
+        public void RecalculateLinkedTracksProperties_TrackHasNoBegin_SetsBegin()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12)
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            _trackManager.RecalculateLinkedTracksProperties(track2);
+            // Assert
+            Assert.AreEqual(track1.End, track2.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track2 && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Begin))), Times.Once);
+        }
+
+        [TestMethod]
+        public void RecalculateLinkedTracksProperties_TrackHasNoPosition_SetsPosition()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12)
+            };
+            var track2 = new Track()
+            {
+                IsLinkedToPreviousTrack = true,
+                Begin = track1.End
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            _trackManager.RecalculateLinkedTracksProperties(track2);
+            // Assert
+            Assert.AreEqual((ushort?)2, track2.Position);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track2 && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Position))), Times.Once);
+        }
+
+        [TestMethod]
+        public void RecalculateLinkedTracksProperties_PreviousTrackHasNoEnd_SetsEnd()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                IsLinkedToPreviousTrack = true,
+                Begin = new TimeSpan(0, 3, 12)
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            _trackManager.RecalculateLinkedTracksProperties(track2);
+            // Assert
+            Assert.AreEqual(track2.Begin, track1.End);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track1 && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.End))), Times.Once);
+        }
+
+        [TestMethod]
+        public void RecalculateLinkedTracksProperties_NextTrackNoPosition_SetsPosition()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12)
+            };
+            var track2 = new Track()
+            {
+                Begin = track1.End,
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            _trackManager.RecalculateLinkedTracksProperties(track1);
+            // Assert
+            Assert.AreEqual((ushort?)2, track2.Position);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track2 && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Position))), Times.Once);
+        }
+
+        [TestMethod]
+        public void RecalculateLinkedTracksProperties_NextTrackNoBegin_SetsBegin()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12)
+            };
+            var track2 = new Track()
+            {
+                Position = 2,
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            _trackManager.RecalculateLinkedTracksProperties(track1);
+            // Assert
+            Assert.AreEqual(track1.End, track2.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == track2 && y.TraceableChange.PreviousValue == null && y.TraceableChange.PropertyName == nameof(Track.Begin))), Times.Once);
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index 67759a98..fe5d8837 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -139,7 +139,6 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
         }
 
         /// <inheritdoc/>
-        //TODO: Tests
         public void RecalculateLinkedTracksProperties(Track track)
         {
             if (track.Cuesheet != null)

From 5edccaae92a2daf684f6814318085acde2b0be1f Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 11 May 2026 10:43:12 +0200
Subject: [PATCH 140/150] fix end2end tests

---
 .../Tests/Desktop/ImportTest.cs               | 1340 +++++++++++------
 .../Tests/Desktop/TracingTest.cs              |  343 ++---
 .../Tests/Smartphone/ImportTestSmartphone.cs  | 1032 ++++---------
 .../Tests/Smartphone/TracingTestSmartphone.cs |  416 ++---
 4 files changed, 1382 insertions(+), 1749 deletions(-)

diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
index 5c1298a8..cb57d372 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
@@ -43,13 +43,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
         - button ""Clear""
@@ -65,13 +62,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""Increment Decrement Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
         - button ""Clear""
@@ -88,13 +82,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
         - button ""Clear""
@@ -111,13 +102,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
         - button ""Clear""
@@ -134,13 +122,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
         - button ""Clear""
@@ -157,13 +142,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
         - button ""Clear""
@@ -180,13 +162,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
         - button ""Clear""
@@ -203,13 +182,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
+    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
         - button ""Clear""
@@ -256,13 +232,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
         - button ""Clear""
@@ -278,13 +251,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""Increment Decrement Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
         - button ""Clear""
@@ -301,13 +271,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
         - button ""Clear""
@@ -324,13 +291,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
         - button ""Clear""
@@ -347,13 +311,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 5 Clear Sample Title Edited 5 Clear 00:20:13 00:24:54 00:04:41"":
+    - row ""5 Sample Artist 5 Clear Sample Title Edited 5 Clear 00:20:13 00:24:54 00:04:41"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
         - button ""Clear""
@@ -370,13 +331,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
         - button ""Clear""
@@ -393,13 +351,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
         - button ""Clear""
@@ -416,13 +371,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
+    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
         - button ""Clear""
@@ -451,7 +403,722 @@ public async Task Import_ShouldImportTracks_WithSpecialTextfile()
             await importView.ImportFileAsync("Textimport-Bug-#54.txt");
             await importView.SwitchImportProfileAsync("Textfile (just track data)");
             await importView.Analyze();
-            await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync("- table:\r\n  - rowgroup:\r\n    - row \"# Artist Title Begin End Length\":\r\n      - columnheader:\r\n        - checkbox\r\n      - columnheader \"#\"\r\n      - columnheader \"Artist\"\r\n      - columnheader \"Title\"\r\n      - columnheader \"Begin\"\r\n      - columnheader \"End\"\r\n      - columnheader \"Length\"\r\n  - rowgroup:\r\n    - row \"Increment Decrement Adriatique Clear X. Clear 00:00:00 00:05:24 00:05:24\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"1\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Adriatique Clear\":\r\n        - textbox: Adriatique\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"X. Clear\":\r\n        - textbox: X.\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:00:00\":\r\n        - textbox: 00:00:00\r\n      - cell \"00:05:24\":\r\n        - textbox: 00:05:24\r\n      - cell \"00:05:24\":\r\n        - textbox: 00:05:24\r\n    - row \"Increment Decrement Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24 00:10:39 00:05:15\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"2\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Third Harmony Clear\":\r\n        - textbox: Third Harmony\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Fears And Dreams (Original Mix) Clear\":\r\n        - textbox: Fears And Dreams (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:05:24\":\r\n        - textbox: 00:05:24\r\n      - cell \"00:10:39\":\r\n        - textbox: 00:10:39\r\n      - cell \"00:05:15\":\r\n        - textbox: 00:05:15\r\n    - row \"Increment Decrement Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"3\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Dele Sosimi Afrobeat Orchestra Clear\":\r\n        - textbox: Dele Sosimi Afrobeat Orchestra\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Too Much Information (Laolu Remix; Edit) Clear\":\r\n        - textbox: Too Much Information (Laolu Remix; Edit)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:10:39\":\r\n        - textbox: 00:10:39\r\n      - cell \"00:17:06\":\r\n        - textbox: 00:17:06\r\n      - cell \"00:06:27\":\r\n        - textbox: 00:06:27\r\n    - row \"Increment Decrement Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"4\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Edem, Govan Clear\":\r\n        - textbox: Edem, Govan\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Ankh (Onetwo MX Remix) Clear\":\r\n        - textbox: Ankh (Onetwo MX Remix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:17:06\":\r\n        - textbox: 00:17:06\r\n      - cell \"00:23:21\":\r\n        - textbox: 00:23:21\r\n      - cell \"00:06:15\":\r\n        - textbox: 00:06:15\r\n    - row \"Increment Decrement Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"5\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Jody Wisternoff Clear\":\r\n        - textbox: Jody Wisternoff\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear\":\r\n        - textbox: For All Time (feat. Hendrik Burkhard) (Extended Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:23:21\":\r\n        - textbox: 00:23:21\r\n      - cell \"00:29:02\":\r\n        - textbox: 00:29:02\r\n      - cell \"00:05:41\":\r\n        - textbox: 00:05:41\r\n    - row \"Increment Decrement Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"6\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Einmusik Clear\":\r\n        - textbox: Einmusik\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Bead (Original Mix) Clear\":\r\n        - textbox: Bead (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:29:02\":\r\n        - textbox: 00:29:02\r\n      - cell \"00:34:27\":\r\n        - textbox: 00:34:27\r\n      - cell \"00:05:25\":\r\n        - textbox: 00:05:25\r\n    - row \"Increment Decrement Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"7\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Sebastien Leger Clear\":\r\n        - textbox: Sebastien Leger\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"La Danse du Scorpion Clear\":\r\n        - textbox: La Danse du Scorpion\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:34:27\":\r\n        - textbox: 00:34:27\r\n      - cell \"00:40:59\":\r\n        - textbox: 00:40:59\r\n      - cell \"00:06:32\":\r\n        - textbox: 00:06:32\r\n    - row \"Increment Decrement Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"8\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Paul Thomas & Solid Stone Clear\":\r\n        - textbox: Paul Thomas & Solid Stone\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"La Bombo (Solid Stone Remix) Clear\":\r\n        - textbox: La Bombo (Solid Stone Remix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:40:59\":\r\n        - textbox: 00:40:59\r\n      - cell \"00:46:19\":\r\n        - textbox: 00:46:19\r\n      - cell \"00:05:20\":\r\n        - textbox: 00:05:20\r\n    - row \"Increment Decrement GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"9\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"GusGus Clear\":\r\n        - textbox: GusGus\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Crossfade (Maceo Plex Mix) Clear\":\r\n        - textbox: Crossfade (Maceo Plex Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:46:19\":\r\n        - textbox: 00:46:19\r\n      - cell \"00:52:20\":\r\n        - textbox: 00:52:20\r\n      - cell \"00:06:01\":\r\n        - textbox: 00:06:01\r\n    - row \"Increment Decrement Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"10\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Klangkarussell Clear\":\r\n        - textbox: Klangkarussell\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Time (Original Mix) Clear\":\r\n        - textbox: Time (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:52:20\":\r\n        - textbox: 00:52:20\r\n      - cell \"00:56:19\":\r\n        - textbox: 00:56:19\r\n      - cell \"00:03:59\":\r\n        - textbox: 00:03:59\r\n    - row \"Increment Decrement Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"11\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Anysense & Un:said Clear\":\r\n        - textbox: Anysense & Un:said\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Missing Path (Original Mix) Clear\":\r\n        - textbox: Missing Path (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"00:56:19\":\r\n        - textbox: 00:56:19\r\n      - cell \"01:01:41\":\r\n        - textbox: 01:01:41\r\n      - cell \"00:05:22\":\r\n        - textbox: 00:05:22\r\n    - row \"Increment Decrement Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"12\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Space Food Clear\":\r\n        - textbox: Space Food\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Bombay Clear\":\r\n        - textbox: Bombay\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:01:41\":\r\n        - textbox: 01:01:41\r\n      - cell \"01:06:33\":\r\n        - textbox: 01:06:33\r\n      - cell \"00:04:52\":\r\n        - textbox: 00:04:52\r\n    - row \"Increment Decrement SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"13\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"SHDW & Obscure Shape Clear\":\r\n        - textbox: SHDW & Obscure Shape\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Wächter der Nacht (Original Mix) Clear\":\r\n        - textbox: Wächter der Nacht (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:06:33\":\r\n        - textbox: 01:06:33\r\n      - cell \"01:11:04\":\r\n        - textbox: 01:11:04\r\n      - cell \"00:04:31\":\r\n        - textbox: 00:04:31\r\n    - row \"Increment Decrement HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"14\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"HOSH Clear\":\r\n        - textbox: HOSH\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Karma Clear\":\r\n        - textbox: Karma\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:11:04\":\r\n        - textbox: 01:11:04\r\n      - cell \"01:15:28\":\r\n        - textbox: 01:15:28\r\n      - cell \"00:04:24\":\r\n        - textbox: 00:04:24\r\n    - row \"Increment Decrement Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"15\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Alexey Union Clear\":\r\n        - textbox: Alexey Union\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Olympia (Original Mix) Clear\":\r\n        - textbox: Olympia (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:15:28\":\r\n        - textbox: 01:15:28\r\n      - cell \"01:21:08\":\r\n        - textbox: 01:21:08\r\n      - cell \"00:05:40\":\r\n        - textbox: 00:05:40\r\n    - row \"Increment Decrement Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"16\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Paul Taylor Clear\":\r\n        - textbox: Paul Taylor\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Afterglow Clear\":\r\n        - textbox: Afterglow\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:21:08\":\r\n        - textbox: 01:21:08\r\n      - cell \"01:25:38\":\r\n        - textbox: 01:25:38\r\n      - cell \"00:04:30\":\r\n        - textbox: 00:04:30\r\n    - row \"Increment Decrement Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"17\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Philter Clear\":\r\n        - textbox: Philter\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Stranger Clear\":\r\n        - textbox: Stranger\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:25:38\":\r\n        - textbox: 01:25:38\r\n      - cell \"01:31:52\":\r\n        - textbox: 01:31:52\r\n      - cell \"00:06:14\":\r\n        - textbox: 00:06:14\r\n    - row \"Increment Decrement Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"18\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Skizologic Clear\":\r\n        - textbox: Skizologic\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Hypersphere (Original Mix) Clear\":\r\n        - textbox: Hypersphere (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:31:52\":\r\n        - textbox: 01:31:52\r\n      - cell \"01:36:40\":\r\n        - textbox: 01:36:40\r\n      - cell \"00:04:48\":\r\n        - textbox: 00:04:48\r\n    - row \"Increment Decrement Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"19\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Thomas Schumacher, Caitlin Clear\":\r\n        - textbox: Thomas Schumacher, Caitlin\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"All of You (Remix) Clear\":\r\n        - textbox: All of You (Remix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:36:40\":\r\n        - textbox: 01:36:40\r\n      - cell \"01:42:16\":\r\n        - textbox: 01:42:16\r\n      - cell \"00:05:36\":\r\n        - textbox: 00:05:36\r\n    - row \"Increment Decrement A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"20\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"A. Skomoroh Clear\":\r\n        - textbox: A. Skomoroh\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"White Horse Conquest (Original Mix) Clear\":\r\n        - textbox: White Horse Conquest (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:42:16\":\r\n        - textbox: 01:42:16\r\n      - cell \"01:47:04\":\r\n        - textbox: 01:47:04\r\n      - cell \"00:04:48\":\r\n        - textbox: 00:04:48\r\n    - row \"Increment Decrement Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"21\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Patrik Berg Clear\":\r\n        - textbox: Patrik Berg\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Bright (Original Mix) Clear\":\r\n        - textbox: Bright (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:47:04\":\r\n        - textbox: 01:47:04\r\n      - cell \"01:52:37\":\r\n        - textbox: 01:52:37\r\n      - cell \"00:05:33\":\r\n        - textbox: 00:05:33\r\n    - row \"Increment Decrement Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"22\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Hidden Empire Clear\":\r\n        - textbox: Hidden Empire\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Bengal Clear\":\r\n        - textbox: Bengal\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:52:37\":\r\n        - textbox: 01:52:37\r\n      - cell \"01:58:05\":\r\n        - textbox: 01:58:05\r\n      - cell \"00:05:28\":\r\n        - textbox: 00:05:28\r\n    - row \"Increment Decrement Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"23\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Mario Ochoa Clear\":\r\n        - textbox: Mario Ochoa\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Levitate Clear\":\r\n        - textbox: Levitate\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"01:58:05\":\r\n        - textbox: 01:58:05\r\n      - cell \"02:03:00\":\r\n        - textbox: 02:03:00\r\n      - cell \"00:04:55\":\r\n        - textbox: 00:04:55\r\n    - row \"Increment Decrement Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"24\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Raul Facio Clear\":\r\n        - textbox: Raul Facio\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Eyes Wide Shut (Original Mix) Clear\":\r\n        - textbox: Eyes Wide Shut (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:03:00\":\r\n        - textbox: 02:03:00\r\n      - cell \"02:08:21\":\r\n        - textbox: 02:08:21\r\n      - cell \"00:05:21\":\r\n        - textbox: 00:05:21\r\n    - row \"Increment Decrement Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"25\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Soolver Clear\":\r\n        - textbox: Soolver\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Regular (Original Mix) Clear\":\r\n        - textbox: Regular (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:08:21\":\r\n        - textbox: 02:08:21\r\n      - cell \"02:14:31\":\r\n        - textbox: 02:14:31\r\n      - cell \"00:06:10\":\r\n        - textbox: 00:06:10\r\n    - row \"Increment Decrement Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"26\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Weska Clear\":\r\n        - textbox: Weska\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"EQ64 (Original Mix) Clear\":\r\n        - textbox: EQ64 (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:14:31\":\r\n        - textbox: 02:14:31\r\n      - cell \"02:18:35\":\r\n        - textbox: 02:18:35\r\n      - cell \"00:04:04\":\r\n        - textbox: 00:04:04\r\n    - row \"Increment Decrement Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"27\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Tempo Giusto Clear\":\r\n        - textbox: Tempo Giusto\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"The Fall (Extended Mix) Clear\":\r\n        - textbox: The Fall (Extended Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:18:35\":\r\n        - textbox: 02:18:35\r\n      - cell \"02:24:12\":\r\n        - textbox: 02:24:12\r\n      - cell \"00:05:37\":\r\n        - textbox: 00:05:37\r\n    - row \"Increment Decrement Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"28\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Vlind & Asteroid & Gary Leroy Clear\":\r\n        - textbox: Vlind & Asteroid & Gary Leroy\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Trinity (Extended Mix) Clear\":\r\n        - textbox: Trinity (Extended Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:24:12\":\r\n        - textbox: 02:24:12\r\n      - cell \"02:29:38\":\r\n        - textbox: 02:29:38\r\n      - cell \"00:05:26\":\r\n        - textbox: 00:05:26\r\n    - row \"Increment Decrement Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"29\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Astral Legacy Clear\":\r\n        - textbox: Astral Legacy\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Vaveyla (Original Mix) Clear\":\r\n        - textbox: Vaveyla (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:29:38\":\r\n        - textbox: 02:29:38\r\n      - cell \"02:32:52\":\r\n        - textbox: 02:32:52\r\n      - cell \"00:03:14\":\r\n        - textbox: 00:03:14\r\n    - row \"Increment Decrement Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"30\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Gerrox Clear\":\r\n        - textbox: Gerrox\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Chakra (Original Mix) Clear\":\r\n        - textbox: Chakra (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:32:52\":\r\n        - textbox: 02:32:52\r\n      - cell \"02:37:00\":\r\n        - textbox: 02:37:00\r\n      - cell \"00:04:08\":\r\n        - textbox: 00:04:08\r\n    - row \"Increment Decrement Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"31\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Charlotte De Witte Clear\":\r\n        - textbox: Charlotte De Witte\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Pattern Clear\":\r\n        - textbox: Pattern\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:37:00\":\r\n        - textbox: 02:37:00\r\n      - cell \"02:41:55\":\r\n        - textbox: 02:41:55\r\n      - cell \"00:04:55\":\r\n        - textbox: 00:04:55\r\n    - row \"Increment Decrement Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"32\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Space Food Clear\":\r\n        - textbox: Space Food\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Amabey Clear\":\r\n        - textbox: Amabey\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:41:55\":\r\n        - textbox: 02:41:55\r\n      - cell \"02:46:55\":\r\n        - textbox: 02:46:55\r\n      - cell \"00:05:00\":\r\n        - textbox: 00:05:00\r\n    - row \"Increment Decrement ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"33\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"ARTBAT Clear\":\r\n        - textbox: ARTBAT\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Papilion (Original Mix) Clear\":\r\n        - textbox: Papilion (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:46:55\":\r\n        - textbox: 02:46:55\r\n      - cell \"02:51:13\":\r\n        - textbox: 02:51:13\r\n      - cell \"00:04:18\":\r\n        - textbox: 00:04:18\r\n    - row \"Increment Decrement PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"34\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"PETER PAHN Clear\":\r\n        - textbox: PETER PAHN\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Enjoy Infinity (Original Mix) Clear\":\r\n        - textbox: Enjoy Infinity (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:51:13\":\r\n        - textbox: 02:51:13\r\n      - cell \"02:56:08\":\r\n        - textbox: 02:56:08\r\n      - cell \"00:04:55\":\r\n        - textbox: 00:04:55\r\n    - row \"Increment Decrement Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"35\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Solitek Clear\":\r\n        - textbox: Solitek\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Instinct (Original Mix) Clear\":\r\n        - textbox: Instinct (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"02:56:08\":\r\n        - textbox: 02:56:08\r\n      - cell \"03:00:57\":\r\n        - textbox: 03:00:57\r\n      - cell \"00:04:49\":\r\n        - textbox: 00:04:49\r\n    - row \"Increment Decrement Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"36\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Veerus Clear\":\r\n        - textbox: Veerus\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Heavy Clear\":\r\n        - textbox: Heavy\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"03:00:57\":\r\n        - textbox: 03:00:57\r\n      - cell \"03:05:19\":\r\n        - textbox: 03:05:19\r\n      - cell \"00:04:22\":\r\n        - textbox: 00:04:22\r\n    - row \"Increment Decrement Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"37\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Secret Cinema & Reinier Zonneveld Clear\":\r\n        - textbox: Secret Cinema & Reinier Zonneveld\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Pain Thing (Original Mix) Clear\":\r\n        - textbox: Pain Thing (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"03:05:19\":\r\n        - textbox: 03:05:19\r\n      - cell \"03:09:38\":\r\n        - textbox: 03:09:38\r\n      - cell \"00:04:19\":\r\n        - textbox: 00:04:19\r\n    - row \"Increment Decrement Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"38\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Amelie Lens Clear\":\r\n        - textbox: Amelie Lens\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Hypnotized Clear\":\r\n        - textbox: Hypnotized\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"03:09:38\":\r\n        - textbox: 03:09:38\r\n      - cell \"03:13:13\":\r\n        - textbox: 03:13:13\r\n      - cell \"00:03:35\":\r\n        - textbox: 00:03:35\r\n    - row \"Increment Decrement Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13\":\r\n      - cell:\r\n        - checkbox\r\n      - cell \"Increment Decrement\":\r\n        - spinbutton: \"39\"\r\n        - button \"Increment\"\r\n        - button \"Decrement\"\r\n      - cell \"Nikolay Kirov Clear\":\r\n        - textbox: Nikolay Kirov\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"Chasing the Sun (Original Mix) Clear\":\r\n        - textbox: Chasing the Sun (Original Mix)\r\n        - button \"Clear\"\r\n        - button\r\n      - cell \"03:13:13\":\r\n        - textbox: 03:13:13\r\n      - cell:\r\n        - textbox\r\n      - cell:\r\n        - textbox\r\n  - rowgroup:\r\n    - row");
+            await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup:
+    - row ""# Artist Title Begin End Length"":
+      - columnheader:
+        - checkbox
+      - columnheader ""#""
+      - columnheader ""Artist""
+      - columnheader ""Title""
+      - columnheader ""Begin""
+      - columnheader ""End""
+      - columnheader ""Length""
+  - rowgroup:
+    - row ""1 Adriatique Clear X. Clear 00:00:00 00:05:24 00:05:24"":
+      - cell:
+        - checkbox
+      - cell ""1""
+      - cell ""Adriatique Clear"":
+        - textbox: Adriatique
+        - button ""Clear""
+        - button
+      - cell ""X. Clear"":
+        - textbox: X.
+        - button ""Clear""
+        - button
+      - cell ""00:00:00"":
+        - textbox: 00:00:00
+      - cell ""00:05:24"":
+        - textbox: 00:05:24
+      - cell ""00:05:24"":
+        - textbox: 00:05:24
+    - row ""2 Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24 00:10:39 00:05:15"":
+      - cell:
+        - checkbox
+      - cell ""2""
+      - cell ""Third Harmony Clear"":
+        - textbox: Third Harmony
+        - button ""Clear""
+        - button
+      - cell ""Fears And Dreams (Original Mix) Clear"":
+        - textbox: Fears And Dreams (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""00:05:24"":
+        - textbox: 00:05:24
+      - cell ""00:10:39"":
+        - textbox: 00:10:39
+      - cell ""00:05:15"":
+        - textbox: 00:05:15
+    - row ""3 Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27"":
+      - cell:
+        - checkbox
+      - cell ""3""
+      - cell ""Dele Sosimi Afrobeat Orchestra Clear"":
+        - textbox: Dele Sosimi Afrobeat Orchestra
+        - button ""Clear""
+        - button
+      - cell ""Too Much Information (Laolu Remix; Edit) Clear"":
+        - textbox: Too Much Information (Laolu Remix; Edit)
+        - button ""Clear""
+        - button
+      - cell ""00:10:39"":
+        - textbox: 00:10:39
+      - cell ""00:17:06"":
+        - textbox: 00:17:06
+      - cell ""00:06:27"":
+        - textbox: 00:06:27
+    - row ""4 Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15"":
+      - cell:
+        - checkbox
+      - cell ""4""
+      - cell ""Edem, Govan Clear"":
+        - textbox: Edem, Govan
+        - button ""Clear""
+        - button
+      - cell ""Ankh (Onetwo MX Remix) Clear"":
+        - textbox: Ankh (Onetwo MX Remix)
+        - button ""Clear""
+        - button
+      - cell ""00:17:06"":
+        - textbox: 00:17:06
+      - cell ""00:23:21"":
+        - textbox: 00:23:21
+      - cell ""00:06:15"":
+        - textbox: 00:06:15
+    - row ""5 Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41"":
+      - cell:
+        - checkbox
+      - cell ""5""
+      - cell ""Jody Wisternoff Clear"":
+        - textbox: Jody Wisternoff
+        - button ""Clear""
+        - button
+      - cell ""For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear"":
+        - textbox: For All Time (feat. Hendrik Burkhard) (Extended Mix)
+        - button ""Clear""
+        - button
+      - cell ""00:23:21"":
+        - textbox: 00:23:21
+      - cell ""00:29:02"":
+        - textbox: 00:29:02
+      - cell ""00:05:41"":
+        - textbox: 00:05:41
+    - row ""6 Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25"":
+      - cell:
+        - checkbox
+      - cell ""6""
+      - cell ""Einmusik Clear"":
+        - textbox: Einmusik
+        - button ""Clear""
+        - button
+      - cell ""Bead (Original Mix) Clear"":
+        - textbox: Bead (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""00:29:02"":
+        - textbox: 00:29:02
+      - cell ""00:34:27"":
+        - textbox: 00:34:27
+      - cell ""00:05:25"":
+        - textbox: 00:05:25
+    - row ""7 Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32"":
+      - cell:
+        - checkbox
+      - cell ""7""
+      - cell ""Sebastien Leger Clear"":
+        - textbox: Sebastien Leger
+        - button ""Clear""
+        - button
+      - cell ""La Danse du Scorpion Clear"":
+        - textbox: La Danse du Scorpion
+        - button ""Clear""
+        - button
+      - cell ""00:34:27"":
+        - textbox: 00:34:27
+      - cell ""00:40:59"":
+        - textbox: 00:40:59
+      - cell ""00:06:32"":
+        - textbox: 00:06:32
+    - row ""8 Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20"":
+      - cell:
+        - checkbox
+      - cell ""8""
+      - cell ""Paul Thomas & Solid Stone Clear"":
+        - textbox: Paul Thomas & Solid Stone
+        - button ""Clear""
+        - button
+      - cell ""La Bombo (Solid Stone Remix) Clear"":
+        - textbox: La Bombo (Solid Stone Remix)
+        - button ""Clear""
+        - button
+      - cell ""00:40:59"":
+        - textbox: 00:40:59
+      - cell ""00:46:19"":
+        - textbox: 00:46:19
+      - cell ""00:05:20"":
+        - textbox: 00:05:20
+    - row ""9 GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01"":
+      - cell:
+        - checkbox
+      - cell ""9""
+      - cell ""GusGus Clear"":
+        - textbox: GusGus
+        - button ""Clear""
+        - button
+      - cell ""Crossfade (Maceo Plex Mix) Clear"":
+        - textbox: Crossfade (Maceo Plex Mix)
+        - button ""Clear""
+        - button
+      - cell ""00:46:19"":
+        - textbox: 00:46:19
+      - cell ""00:52:20"":
+        - textbox: 00:52:20
+      - cell ""00:06:01"":
+        - textbox: 00:06:01
+    - row ""10 Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59"":
+      - cell:
+        - checkbox
+      - cell ""10""
+      - cell ""Klangkarussell Clear"":
+        - textbox: Klangkarussell
+        - button ""Clear""
+        - button
+      - cell ""Time (Original Mix) Clear"":
+        - textbox: Time (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""00:52:20"":
+        - textbox: 00:52:20
+      - cell ""00:56:19"":
+        - textbox: 00:56:19
+      - cell ""00:03:59"":
+        - textbox: 00:03:59
+    - row ""11 Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22"":
+      - cell:
+        - checkbox
+      - cell ""11""
+      - cell ""Anysense & Un:said Clear"":
+        - textbox: Anysense & Un:said
+        - button ""Clear""
+        - button
+      - cell ""Missing Path (Original Mix) Clear"":
+        - textbox: Missing Path (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""00:56:19"":
+        - textbox: 00:56:19
+      - cell ""01:01:41"":
+        - textbox: 01:01:41
+      - cell ""00:05:22"":
+        - textbox: 00:05:22
+    - row ""12 Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52"":
+      - cell:
+        - checkbox
+      - cell ""12""
+      - cell ""Space Food Clear"":
+        - textbox: Space Food
+        - button ""Clear""
+        - button
+      - cell ""Bombay Clear"":
+        - textbox: Bombay
+        - button ""Clear""
+        - button
+      - cell ""01:01:41"":
+        - textbox: 01:01:41
+      - cell ""01:06:33"":
+        - textbox: 01:06:33
+      - cell ""00:04:52"":
+        - textbox: 00:04:52
+    - row ""13 SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31"":
+      - cell:
+        - checkbox
+      - cell ""13""
+      - cell ""SHDW & Obscure Shape Clear"":
+        - textbox: SHDW & Obscure Shape
+        - button ""Clear""
+        - button
+      - cell ""Wächter der Nacht (Original Mix) Clear"":
+        - textbox: Wächter der Nacht (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""01:06:33"":
+        - textbox: 01:06:33
+      - cell ""01:11:04"":
+        - textbox: 01:11:04
+      - cell ""00:04:31"":
+        - textbox: 00:04:31
+    - row ""14 HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24"":
+      - cell:
+        - checkbox
+      - cell ""14""
+      - cell ""HOSH Clear"":
+        - textbox: HOSH
+        - button ""Clear""
+        - button
+      - cell ""Karma Clear"":
+        - textbox: Karma
+        - button ""Clear""
+        - button
+      - cell ""01:11:04"":
+        - textbox: 01:11:04
+      - cell ""01:15:28"":
+        - textbox: 01:15:28
+      - cell ""00:04:24"":
+        - textbox: 00:04:24
+    - row ""15 Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40"":
+      - cell:
+        - checkbox
+      - cell ""15""
+      - cell ""Alexey Union Clear"":
+        - textbox: Alexey Union
+        - button ""Clear""
+        - button
+      - cell ""Olympia (Original Mix) Clear"":
+        - textbox: Olympia (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""01:15:28"":
+        - textbox: 01:15:28
+      - cell ""01:21:08"":
+        - textbox: 01:21:08
+      - cell ""00:05:40"":
+        - textbox: 00:05:40
+    - row ""16 Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30"":
+      - cell:
+        - checkbox
+      - cell ""16""
+      - cell ""Paul Taylor Clear"":
+        - textbox: Paul Taylor
+        - button ""Clear""
+        - button
+      - cell ""Afterglow Clear"":
+        - textbox: Afterglow
+        - button ""Clear""
+        - button
+      - cell ""01:21:08"":
+        - textbox: 01:21:08
+      - cell ""01:25:38"":
+        - textbox: 01:25:38
+      - cell ""00:04:30"":
+        - textbox: 00:04:30
+    - row ""17 Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14"":
+      - cell:
+        - checkbox
+      - cell ""17""
+      - cell ""Philter Clear"":
+        - textbox: Philter
+        - button ""Clear""
+        - button
+      - cell ""Stranger Clear"":
+        - textbox: Stranger
+        - button ""Clear""
+        - button
+      - cell ""01:25:38"":
+        - textbox: 01:25:38
+      - cell ""01:31:52"":
+        - textbox: 01:31:52
+      - cell ""00:06:14"":
+        - textbox: 00:06:14
+    - row ""18 Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48"":
+      - cell:
+        - checkbox
+      - cell ""18""
+      - cell ""Skizologic Clear"":
+        - textbox: Skizologic
+        - button ""Clear""
+        - button
+      - cell ""Hypersphere (Original Mix) Clear"":
+        - textbox: Hypersphere (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""01:31:52"":
+        - textbox: 01:31:52
+      - cell ""01:36:40"":
+        - textbox: 01:36:40
+      - cell ""00:04:48"":
+        - textbox: 00:04:48
+    - row ""19 Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36"":
+      - cell:
+        - checkbox
+      - cell ""19""
+      - cell ""Thomas Schumacher, Caitlin Clear"":
+        - textbox: Thomas Schumacher, Caitlin
+        - button ""Clear""
+        - button
+      - cell ""All of You (Remix) Clear"":
+        - textbox: All of You (Remix)
+        - button ""Clear""
+        - button
+      - cell ""01:36:40"":
+        - textbox: 01:36:40
+      - cell ""01:42:16"":
+        - textbox: 01:42:16
+      - cell ""00:05:36"":
+        - textbox: 00:05:36
+    - row ""20 A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48"":
+      - cell:
+        - checkbox
+      - cell ""20""
+      - cell ""A. Skomoroh Clear"":
+        - textbox: A. Skomoroh
+        - button ""Clear""
+        - button
+      - cell ""White Horse Conquest (Original Mix) Clear"":
+        - textbox: White Horse Conquest (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""01:42:16"":
+        - textbox: 01:42:16
+      - cell ""01:47:04"":
+        - textbox: 01:47:04
+      - cell ""00:04:48"":
+        - textbox: 00:04:48
+    - row ""21 Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33"":
+      - cell:
+        - checkbox
+      - cell ""21""
+      - cell ""Patrik Berg Clear"":
+        - textbox: Patrik Berg
+        - button ""Clear""
+        - button
+      - cell ""Bright (Original Mix) Clear"":
+        - textbox: Bright (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""01:47:04"":
+        - textbox: 01:47:04
+      - cell ""01:52:37"":
+        - textbox: 01:52:37
+      - cell ""00:05:33"":
+        - textbox: 00:05:33
+    - row ""22 Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28"":
+      - cell:
+        - checkbox
+      - cell ""22""
+      - cell ""Hidden Empire Clear"":
+        - textbox: Hidden Empire
+        - button ""Clear""
+        - button
+      - cell ""Bengal Clear"":
+        - textbox: Bengal
+        - button ""Clear""
+        - button
+      - cell ""01:52:37"":
+        - textbox: 01:52:37
+      - cell ""01:58:05"":
+        - textbox: 01:58:05
+      - cell ""00:05:28"":
+        - textbox: 00:05:28
+    - row ""23 Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55"":
+      - cell:
+        - checkbox
+      - cell ""23""
+      - cell ""Mario Ochoa Clear"":
+        - textbox: Mario Ochoa
+        - button ""Clear""
+        - button
+      - cell ""Levitate Clear"":
+        - textbox: Levitate
+        - button ""Clear""
+        - button
+      - cell ""01:58:05"":
+        - textbox: 01:58:05
+      - cell ""02:03:00"":
+        - textbox: 02:03:00
+      - cell ""00:04:55"":
+        - textbox: 00:04:55
+    - row ""24 Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21"":
+      - cell:
+        - checkbox
+      - cell ""24""
+      - cell ""Raul Facio Clear"":
+        - textbox: Raul Facio
+        - button ""Clear""
+        - button
+      - cell ""Eyes Wide Shut (Original Mix) Clear"":
+        - textbox: Eyes Wide Shut (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:03:00"":
+        - textbox: 02:03:00
+      - cell ""02:08:21"":
+        - textbox: 02:08:21
+      - cell ""00:05:21"":
+        - textbox: 00:05:21
+    - row ""25 Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10"":
+      - cell:
+        - checkbox
+      - cell ""25""
+      - cell ""Soolver Clear"":
+        - textbox: Soolver
+        - button ""Clear""
+        - button
+      - cell ""Regular (Original Mix) Clear"":
+        - textbox: Regular (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:08:21"":
+        - textbox: 02:08:21
+      - cell ""02:14:31"":
+        - textbox: 02:14:31
+      - cell ""00:06:10"":
+        - textbox: 00:06:10
+    - row ""26 Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04"":
+      - cell:
+        - checkbox
+      - cell ""26""
+      - cell ""Weska Clear"":
+        - textbox: Weska
+        - button ""Clear""
+        - button
+      - cell ""EQ64 (Original Mix) Clear"":
+        - textbox: EQ64 (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:14:31"":
+        - textbox: 02:14:31
+      - cell ""02:18:35"":
+        - textbox: 02:18:35
+      - cell ""00:04:04"":
+        - textbox: 00:04:04
+    - row ""27 Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37"":
+      - cell:
+        - checkbox
+      - cell ""27""
+      - cell ""Tempo Giusto Clear"":
+        - textbox: Tempo Giusto
+        - button ""Clear""
+        - button
+      - cell ""The Fall (Extended Mix) Clear"":
+        - textbox: The Fall (Extended Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:18:35"":
+        - textbox: 02:18:35
+      - cell ""02:24:12"":
+        - textbox: 02:24:12
+      - cell ""00:05:37"":
+        - textbox: 00:05:37
+    - row ""28 Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26"":
+      - cell:
+        - checkbox
+      - cell ""28""
+      - cell ""Vlind & Asteroid & Gary Leroy Clear"":
+        - textbox: Vlind & Asteroid & Gary Leroy
+        - button ""Clear""
+        - button
+      - cell ""Trinity (Extended Mix) Clear"":
+        - textbox: Trinity (Extended Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:24:12"":
+        - textbox: 02:24:12
+      - cell ""02:29:38"":
+        - textbox: 02:29:38
+      - cell ""00:05:26"":
+        - textbox: 00:05:26
+    - row ""29 Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14"":
+      - cell:
+        - checkbox
+      - cell ""29""
+      - cell ""Astral Legacy Clear"":
+        - textbox: Astral Legacy
+        - button ""Clear""
+        - button
+      - cell ""Vaveyla (Original Mix) Clear"":
+        - textbox: Vaveyla (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:29:38"":
+        - textbox: 02:29:38
+      - cell ""02:32:52"":
+        - textbox: 02:32:52
+      - cell ""00:03:14"":
+        - textbox: 00:03:14
+    - row ""30 Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08"":
+      - cell:
+        - checkbox
+      - cell ""30""
+      - cell ""Gerrox Clear"":
+        - textbox: Gerrox
+        - button ""Clear""
+        - button
+      - cell ""Chakra (Original Mix) Clear"":
+        - textbox: Chakra (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:32:52"":
+        - textbox: 02:32:52
+      - cell ""02:37:00"":
+        - textbox: 02:37:00
+      - cell ""00:04:08"":
+        - textbox: 00:04:08
+    - row ""31 Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55"":
+      - cell:
+        - checkbox
+      - cell ""31""
+      - cell ""Charlotte De Witte Clear"":
+        - textbox: Charlotte De Witte
+        - button ""Clear""
+        - button
+      - cell ""Pattern Clear"":
+        - textbox: Pattern
+        - button ""Clear""
+        - button
+      - cell ""02:37:00"":
+        - textbox: 02:37:00
+      - cell ""02:41:55"":
+        - textbox: 02:41:55
+      - cell ""00:04:55"":
+        - textbox: 00:04:55
+    - row ""32 Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00"":
+      - cell:
+        - checkbox
+      - cell ""32""
+      - cell ""Space Food Clear"":
+        - textbox: Space Food
+        - button ""Clear""
+        - button
+      - cell ""Amabey Clear"":
+        - textbox: Amabey
+        - button ""Clear""
+        - button
+      - cell ""02:41:55"":
+        - textbox: 02:41:55
+      - cell ""02:46:55"":
+        - textbox: 02:46:55
+      - cell ""00:05:00"":
+        - textbox: 00:05:00
+    - row ""33 ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18"":
+      - cell:
+        - checkbox
+      - cell ""33""
+      - cell ""ARTBAT Clear"":
+        - textbox: ARTBAT
+        - button ""Clear""
+        - button
+      - cell ""Papilion (Original Mix) Clear"":
+        - textbox: Papilion (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:46:55"":
+        - textbox: 02:46:55
+      - cell ""02:51:13"":
+        - textbox: 02:51:13
+      - cell ""00:04:18"":
+        - textbox: 00:04:18
+    - row ""34 PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55"":
+      - cell:
+        - checkbox
+      - cell ""34""
+      - cell ""PETER PAHN Clear"":
+        - textbox: PETER PAHN
+        - button ""Clear""
+        - button
+      - cell ""Enjoy Infinity (Original Mix) Clear"":
+        - textbox: Enjoy Infinity (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:51:13"":
+        - textbox: 02:51:13
+      - cell ""02:56:08"":
+        - textbox: 02:56:08
+      - cell ""00:04:55"":
+        - textbox: 00:04:55
+    - row ""35 Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49"":
+      - cell:
+        - checkbox
+      - cell ""35""
+      - cell ""Solitek Clear"":
+        - textbox: Solitek
+        - button ""Clear""
+        - button
+      - cell ""Instinct (Original Mix) Clear"":
+        - textbox: Instinct (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""02:56:08"":
+        - textbox: 02:56:08
+      - cell ""03:00:57"":
+        - textbox: 03:00:57
+      - cell ""00:04:49"":
+        - textbox: 00:04:49
+    - row ""36 Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22"":
+      - cell:
+        - checkbox
+      - cell ""36""
+      - cell ""Veerus Clear"":
+        - textbox: Veerus
+        - button ""Clear""
+        - button
+      - cell ""Heavy Clear"":
+        - textbox: Heavy
+        - button ""Clear""
+        - button
+      - cell ""03:00:57"":
+        - textbox: 03:00:57
+      - cell ""03:05:19"":
+        - textbox: 03:05:19
+      - cell ""00:04:22"":
+        - textbox: 00:04:22
+    - row ""37 Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19"":
+      - cell:
+        - checkbox
+      - cell ""37""
+      - cell ""Secret Cinema & Reinier Zonneveld Clear"":
+        - textbox: Secret Cinema & Reinier Zonneveld
+        - button ""Clear""
+        - button
+      - cell ""Pain Thing (Original Mix) Clear"":
+        - textbox: Pain Thing (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""03:05:19"":
+        - textbox: 03:05:19
+      - cell ""03:09:38"":
+        - textbox: 03:09:38
+      - cell ""00:04:19"":
+        - textbox: 00:04:19
+    - row ""38 Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35"":
+      - cell:
+        - checkbox
+      - cell ""38""
+      - cell ""Amelie Lens Clear"":
+        - textbox: Amelie Lens
+        - button ""Clear""
+        - button
+      - cell ""Hypnotized Clear"":
+        - textbox: Hypnotized
+        - button ""Clear""
+        - button
+      - cell ""03:09:38"":
+        - textbox: 03:09:38
+      - cell ""03:13:13"":
+        - textbox: 03:13:13
+      - cell ""00:03:35"":
+        - textbox: 00:03:35
+    - row ""39 Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13"":
+      - cell:
+        - checkbox
+      - cell ""39""
+      - cell ""Nikolay Kirov Clear"":
+        - textbox: Nikolay Kirov
+        - button ""Clear""
+        - button
+      - cell ""Chasing the Sun (Original Mix) Clear"":
+        - textbox: Chasing the Sun (Original Mix)
+        - button ""Clear""
+        - button
+      - cell ""03:13:13"":
+        - textbox: 03:13:13
+      - cell:
+        - textbox
+      - cell:
+        - textbox
+  - rowgroup:
+    - row");
         }
 
         [TestMethod]
@@ -476,13 +1143,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""End""
       - columnheader ""Length""
   - rowgroup:
-    - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
         - button ""Clear""
@@ -497,13 +1161,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:00
       - cell ""00:05:00"":
         - textbox: 00:05:00
-    - row ""Increment Decrement Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
         - button ""Clear""
@@ -518,13 +1179,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:09:23
       - cell ""00:04:23"":
         - textbox: 00:04:23
-    - row ""Increment Decrement Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
         - button ""Clear""
@@ -539,13 +1197,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:15:54
       - cell ""00:06:31"":
         - textbox: 00:06:31
-    - row ""Increment Decrement Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
         - button ""Clear""
@@ -560,13 +1215,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:20:13
       - cell ""00:04:19"":
         - textbox: 00:04:19
-    - row ""Increment Decrement Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
         - button ""Clear""
@@ -581,13 +1233,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:24:54
       - cell ""00:04:41"":
         - textbox: 00:04:41
-    - row ""Increment Decrement Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
         - button ""Clear""
@@ -602,13 +1251,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:31:54
       - cell ""00:07:00"":
         - textbox: 00:07:00
-    - row ""Increment Decrement Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
         - button ""Clear""
@@ -623,13 +1269,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:45:54
       - cell ""00:14:00"":
         - textbox: 00:14:00
-    - row ""Increment Decrement Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
+    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
         - button ""Clear""
@@ -670,13 +1313,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Nachap Clear Glass Clear 00:00:00 00:11:56 00:11:56"":
+    - row ""1 Nachap Clear Glass Clear 00:00:00 00:11:56 00:11:56"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Nachap Clear"":
         - textbox: Nachap
         - button ""Clear""
@@ -692,13 +1332,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:11:56"":
         - textbox: 00:11:56
       - cell
-    - row ""Increment Decrement Progressive + Melodic DECK Clear 00:11:56 00:13:31 00:01:35"":
+    - row ""2 Progressive + Melodic DECK Clear 00:11:56 00:13:31 00:01:35"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell:
         - textbox
         - button
@@ -714,13 +1351,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:01:35
       - cell:
         - button
-    - row ""Increment Decrement Nomer 21 Clear Depersonalization Clear 00:13:31 00:19:14 00:05:43"":
+    - row ""3 Nomer 21 Clear Depersonalization Clear 00:13:31 00:19:14 00:05:43"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""3""
       - cell ""Nomer 21 Clear"":
         - textbox: Nomer 21
         - button ""Clear""
@@ -737,13 +1371,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:43
       - cell:
         - button
-    - row ""Increment Decrement SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Showing Off Clear 00:19:14 00:24:02 00:04:48"":
+    - row ""4 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Showing Off Clear 00:19:14 00:24:02 00:04:48"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""4""
       - cell ""SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
         - button ""Clear""
@@ -760,13 +1391,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:48
       - cell:
         - button
-    - row ""Increment Decrement Carlo Whale Clear Unconscious Clear 00:24:02 00:29:37 00:05:35"":
+    - row ""5 Carlo Whale Clear Unconscious Clear 00:24:02 00:29:37 00:05:35"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""5""
       - cell ""Carlo Whale Clear"":
         - textbox: Carlo Whale
         - button ""Clear""
@@ -783,13 +1411,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:35
       - cell:
         - button
-    - row ""Increment Decrement Arba Han Clear Timelaps Clear 00:29:37 00:33:13 00:03:36"":
+    - row ""6 Arba Han Clear Timelaps Clear 00:29:37 00:33:13 00:03:36"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""6""
       - cell ""Arba Han Clear"":
         - textbox: Arba Han
         - button ""Clear""
@@ -806,13 +1431,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:36
       - cell:
         - button
-    - row ""Increment Decrement Savill Clear Energy Surrounds Clear 00:33:13 00:40:30 00:07:17"":
+    - row ""7 Savill Clear Energy Surrounds Clear 00:33:13 00:40:30 00:07:17"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""7""
       - cell ""Savill Clear"":
         - textbox: Savill
         - button ""Clear""
@@ -829,13 +1451,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:17
       - cell:
         - button
-    - row ""Increment Decrement Teklix Clear The Tribal Code Clear 00:40:30 00:48:53 00:08:23"":
+    - row ""8 Teklix Clear The Tribal Code Clear 00:40:30 00:48:53 00:08:23"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""8""
       - cell ""Teklix Clear"":
         - textbox: Teklix
         - button ""Clear""
@@ -852,13 +1471,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:23
       - cell:
         - button
-    - row ""Increment Decrement Neuralis Clear I'm Looking for Answers Clear 00:48:53 00:54:34 00:05:41"":
+    - row ""9 Neuralis Clear I'm Looking for Answers Clear 00:48:53 00:54:34 00:05:41"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""9""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""9""
       - cell ""Neuralis Clear"":
         - textbox: Neuralis
         - button ""Clear""
@@ -875,13 +1491,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:41
       - cell:
         - button
-    - row ""Increment Decrement Nopopstar &amp; Arsia Clear Dirty Moves Clear 00:54:34 01:00:24 00:05:50"":
+    - row ""10 Nopopstar &amp; Arsia Clear Dirty Moves Clear 00:54:34 01:00:24 00:05:50"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""10""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""10""
       - cell ""Nopopstar &amp; Arsia Clear"":
         - textbox: Nopopstar &amp; Arsia
         - button ""Clear""
@@ -898,13 +1511,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:50
       - cell:
         - button
-    - row ""Increment Decrement SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Lost (Maze 28 Remix) Clear 01:00:24 01:05:17 00:04:53"":
+    - row ""11 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Lost (Maze 28 Remix) Clear 01:00:24 01:05:17 00:04:53"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""11""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""11""
       - cell ""SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
         - button ""Clear""
@@ -921,13 +1531,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:53
       - cell:
         - button
-    - row ""Increment Decrement SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Lost (Redspace Remix) Clear 01:05:17 01:08:22 00:03:05"":
+    - row ""12 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Lost (Redspace Remix) Clear 01:05:17 01:08:22 00:03:05"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""12""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""12""
       - cell ""SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
         - button ""Clear""
@@ -944,13 +1551,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:05
       - cell:
         - button
-    - row ""Increment Decrement Gadoz Clear 5d Clear 01:08:22 01:16:34 00:08:12"":
+    - row ""13 Gadoz Clear 5d Clear 01:08:22 01:16:34 00:08:12"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""13""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""13""
       - cell ""Gadoz Clear"":
         - textbox: Gadoz
         - button ""Clear""
@@ -967,13 +1571,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:12
       - cell:
         - button
-    - row ""Increment Decrement DJ Danzik Clear Out of Space Clear 01:16:34 01:19:22 00:02:48"":
+    - row ""14 DJ Danzik Clear Out of Space Clear 01:16:34 01:19:22 00:02:48"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""14""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""14""
       - cell ""DJ Danzik Clear"":
         - textbox: DJ Danzik
         - button ""Clear""
@@ -990,13 +1591,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:48
       - cell:
         - button
-    - row ""Increment Decrement Enis Çoban Clear Internet Clear 01:19:22 01:25:14 00:05:52"":
+    - row ""15 Enis Çoban Clear Internet Clear 01:19:22 01:25:14 00:05:52"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""15""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""15""
       - cell ""Enis Çoban Clear"":
         - textbox: Enis Çoban
         - button ""Clear""
@@ -1013,13 +1611,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:52
       - cell:
         - button
-    - row ""Increment Decrement Cold Mind &amp; Alex Yikker Clear Rage Clear 01:25:14 01:31:33 00:06:19"":
+    - row ""16 Cold Mind &amp; Alex Yikker Clear Rage Clear 01:25:14 01:31:33 00:06:19"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""16""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""16""
       - cell ""Cold Mind &amp; Alex Yikker Clear"":
         - textbox: Cold Mind &amp; Alex Yikker
         - button ""Clear""
@@ -1036,13 +1631,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:19
       - cell:
         - button
-    - row ""Increment Decrement Maze 28 Clear Sol (JAHAYA Remix) Clear 01:31:33 01:32:51 00:01:18"":
+    - row ""17 Maze 28 Clear Sol (JAHAYA Remix) Clear 01:31:33 01:32:51 00:01:18"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""17""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""17""
       - cell ""Maze 28 Clear"":
         - textbox: Maze 28
         - button ""Clear""
@@ -1059,13 +1651,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:01:18
       - cell:
         - button
-    - row ""Increment Decrement Alex Grafton Clear Hi Baby Clear 01:32:51 01:42:13 00:09:22"":
+    - row ""18 Alex Grafton Clear Hi Baby Clear 01:32:51 01:42:13 00:09:22"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""18""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""18""
       - cell ""Alex Grafton Clear"":
         - textbox: Alex Grafton
         - button ""Clear""
@@ -1082,13 +1671,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:09:22
       - cell:
         - button
-    - row ""Increment Decrement Che&amp;Mos &amp; Halo Far Clear Daddy Clear 01:42:13 01:45:22 00:03:09"":
+    - row ""19 Che&amp;Mos &amp; Halo Far Clear Daddy Clear 01:42:13 01:45:22 00:03:09"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""19""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""19""
       - cell ""Che&amp;Mos &amp; Halo Far Clear"":
         - textbox: Che&amp;Mos &amp; Halo Far
         - button ""Clear""
@@ -1105,13 +1691,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:09
       - cell:
         - button
-    - row ""Increment Decrement K KARDEN Clear Acid Rain Clear 01:45:22 01:48:40 00:03:18"":
+    - row ""20 K KARDEN Clear Acid Rain Clear 01:45:22 01:48:40 00:03:18"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""20""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""20""
       - cell ""K KARDEN Clear"":
         - textbox: K KARDEN
         - button ""Clear""
@@ -1128,13 +1711,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:18
       - cell:
         - button
-    - row ""Increment Decrement Dobrov &amp; Gar1sson Clear Analogic (Redspace Remix) Clear 01:48:40 01:56:40 00:08:00"":
+    - row ""21 Dobrov &amp; Gar1sson Clear Analogic (Redspace Remix) Clear 01:48:40 01:56:40 00:08:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""21""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""21""
       - cell ""Dobrov &amp; Gar1sson Clear"":
         - textbox: Dobrov &amp; Gar1sson
         - button ""Clear""
@@ -1151,13 +1731,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:00
       - cell:
         - button
-    - row ""Increment Decrement Gazfluz Clear Vargan Clear 01:56:40 02:00:39 00:03:59"":
+    - row ""22 Gazfluz Clear Vargan Clear 01:56:40 02:00:39 00:03:59"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""22""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""22""
       - cell ""Gazfluz Clear"":
         - textbox: Gazfluz
         - button ""Clear""
@@ -1174,13 +1751,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:59
       - cell:
         - button
-    - row ""Increment Decrement SHKAPOV Clear Control Clear 02:00:39 02:06:47 00:06:08"":
+    - row ""23 SHKAPOV Clear Control Clear 02:00:39 02:06:47 00:06:08"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""23""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""23""
       - cell ""SHKAPOV Clear"":
         - textbox: SHKAPOV
         - button ""Clear""
@@ -1197,13 +1771,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:08
       - cell:
         - button
-    - row ""Increment Decrement QazaQ Clear On the Line Clear 02:06:47 02:09:09 00:02:22"":
+    - row ""24 QazaQ Clear On the Line Clear 02:06:47 02:09:09 00:02:22"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""24""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""24""
       - cell ""QazaQ Clear"":
         - textbox: QazaQ
         - button ""Clear""
@@ -1220,13 +1791,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:22
       - cell:
         - button
-    - row ""Increment Decrement Alex Schaufel Clear Elizabeth (Larsun Hesh Remix) Clear 02:09:09 02:14:18 00:05:09"":
+    - row ""25 Alex Schaufel Clear Elizabeth (Larsun Hesh Remix) Clear 02:09:09 02:14:18 00:05:09"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""25""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""25""
       - cell ""Alex Schaufel Clear"":
         - textbox: Alex Schaufel
         - button ""Clear""
@@ -1243,13 +1811,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:09
       - cell:
         - button
-    - row ""Increment Decrement Oiro Clear Just Business Clear 02:14:18 02:19:22 00:05:04"":
+    - row ""26 Oiro Clear Just Business Clear 02:14:18 02:19:22 00:05:04"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""26""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""26""
       - cell ""Oiro Clear"":
         - textbox: Oiro
         - button ""Clear""
@@ -1266,13 +1831,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:04
       - cell:
         - button
-    - row ""Increment Decrement Molex Clear Mind Split (Redspace Remix) Clear 02:19:22 02:27:48 00:08:26"":
+    - row ""27 Molex Clear Mind Split (Redspace Remix) Clear 02:19:22 02:27:48 00:08:26"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""27""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""27""
       - cell ""Molex Clear"":
         - textbox: Molex
         - button ""Clear""
@@ -1289,13 +1851,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:26
       - cell:
         - button
-    - row ""Increment Decrement SOLI Clear Give Me Your Mind Clear 02:27:48 02:33:48 00:06:00"":
+    - row ""28 SOLI Clear Give Me Your Mind Clear 02:27:48 02:33:48 00:06:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""28""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""28""
       - cell ""SOLI Clear"":
         - textbox: SOLI
         - button ""Clear""
@@ -1312,13 +1871,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:00
       - cell:
         - button
-    - row ""Increment Decrement MANDU Clear Jacky Clear 02:33:48 02:39:05 00:05:17"":
+    - row ""29 MANDU Clear Jacky Clear 02:33:48 02:39:05 00:05:17"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""29""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""29""
       - cell ""MANDU Clear"":
         - textbox: MANDU
         - button ""Clear""
@@ -1335,13 +1891,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:17
       - cell:
         - button
-    - row ""Increment Decrement SOLI Clear Spacetoon Clear 02:39:05 02:41:31 00:02:26"":
+    - row ""30 SOLI Clear Spacetoon Clear 02:39:05 02:41:31 00:02:26"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""30""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""30""
       - cell ""SOLI Clear"":
         - textbox: SOLI
         - button ""Clear""
@@ -1358,13 +1911,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:26
       - cell:
         - button
-    - row ""Increment Decrement Sasha Fashion Clear Moqton Clear 02:41:31 02:50:18 00:08:47"":
+    - row ""31 Sasha Fashion Clear Moqton Clear 02:41:31 02:50:18 00:08:47"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""31""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""31""
       - cell ""Sasha Fashion Clear"":
         - textbox: Sasha Fashion
         - button ""Clear""
@@ -1381,13 +1931,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:47
       - cell:
         - button
-    - row ""Increment Decrement NAASA Clear Poison Clear 02:50:18 02:56:45 00:06:27"":
+    - row ""32 NAASA Clear Poison Clear 02:50:18 02:56:45 00:06:27"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""32""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""32""
       - cell ""NAASA Clear"":
         - textbox: NAASA
         - button ""Clear""
@@ -1404,13 +1951,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:27
       - cell:
         - button
-    - row ""Increment Decrement Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Nightlong Clear 02:56:45 02:59:14 00:02:29"":
+    - row ""33 Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Nightlong Clear 02:56:45 02:59:14 00:02:29"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""33""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""33""
       - cell ""Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - textbox: Nopopstar, 2JOHN'S &amp; Eugene Jay
         - button ""Clear""
@@ -1427,13 +1971,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:29
       - cell:
         - button
-    - row ""Increment Decrement Skillz jay Clear Choir Clear 02:59:14 03:05:49 00:06:35"":
+    - row ""34 Skillz jay Clear Choir Clear 02:59:14 03:05:49 00:06:35"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""34""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""34""
       - cell ""Skillz jay Clear"":
         - textbox: Skillz jay
         - button ""Clear""
@@ -1450,13 +1991,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:35
       - cell:
         - button
-    - row ""Increment Decrement Kovax Clear Controller Clear 03:05:49 03:08:31 00:02:42"":
+    - row ""35 Kovax Clear Controller Clear 03:05:49 03:08:31 00:02:42"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""35""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""35""
       - cell ""Kovax Clear"":
         - textbox: Kovax
         - button ""Clear""
@@ -1473,13 +2011,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:42
       - cell:
         - button
-    - row ""Increment Decrement Mumboi Clear Just a Beat Clear 03:08:31 03:15:18 00:06:47"":
+    - row ""36 Mumboi Clear Just a Beat Clear 03:08:31 03:15:18 00:06:47"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""36""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""36""
       - cell ""Mumboi Clear"":
         - textbox: Mumboi
         - button ""Clear""
@@ -1496,13 +2031,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:47
       - cell:
         - button
-    - row ""Increment Decrement Eclept Clear Sprut Clear 03:15:18 03:20:35 00:05:17"":
+    - row ""37 Eclept Clear Sprut Clear 03:15:18 03:20:35 00:05:17"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""37""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""37""
       - cell ""Eclept Clear"":
         - textbox: Eclept
         - button ""Clear""
@@ -1519,13 +2051,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:17
       - cell:
         - button
-    - row ""Increment Decrement Rudensky Clear Dark Escort Clear 03:20:35 03:25:02 00:04:27"":
+    - row ""38 Rudensky Clear Dark Escort Clear 03:20:35 03:25:02 00:04:27"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""38""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""38""
       - cell ""Rudensky Clear"":
         - textbox: Rudensky
         - button ""Clear""
@@ -1542,13 +2071,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:27
       - cell:
         - button
-    - row ""Increment Decrement Alexey Union, Kinky Sound &amp; KOCHETOV Clear Connected Clear 03:25:02 03:32:30 00:07:28"":
+    - row ""39 Alexey Union, Kinky Sound &amp; KOCHETOV Clear Connected Clear 03:25:02 03:32:30 00:07:28"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""39""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""39""
       - cell ""Alexey Union, Kinky Sound &amp; KOCHETOV Clear"":
         - textbox: Alexey Union, Kinky Sound &amp; KOCHETOV
         - button ""Clear""
@@ -1565,13 +2091,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:28
       - cell:
         - button
-    - row ""Increment Decrement ANMA (MD) Clear Space Yoda (Snyl Remix) Clear 03:32:30 03:37:53 00:05:23"":
+    - row ""40 ANMA (MD) Clear Space Yoda (Snyl Remix) Clear 03:32:30 03:37:53 00:05:23"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""40""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""40""
       - cell ""ANMA (MD) Clear"":
         - textbox: ANMA (MD)
         - button ""Clear""
@@ -1588,13 +2111,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:23
       - cell:
         - button
-    - row ""Increment Decrement Inache Clear Andale (MONTA (TN) Remix) Clear 03:37:53"":
+    - row ""41 Inache Clear Andale (MONTA (TN) Remix) Clear 03:37:53"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""41""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""41""
       - cell ""Inache Clear"":
         - textbox: Inache
         - button ""Clear""
@@ -1637,13 +2157,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
         - button ""Clear""
@@ -1659,13 +2176,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""Increment Decrement Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
         - button ""Clear""
@@ -1682,13 +2196,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
         - button ""Clear""
@@ -1705,13 +2216,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
         - button ""Clear""
@@ -1728,13 +2236,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
         - button ""Clear""
@@ -1751,13 +2256,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
         - button ""Clear""
@@ -1774,13 +2276,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
         - button ""Clear""
@@ -1797,13 +2296,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 8 Clear Sample Title 8 Clear 00:45:54"":
+    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
         - button ""Clear""
@@ -1848,13 +2344,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
         - button ""Clear""
@@ -1870,13 +2363,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""Increment Decrement Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
         - button ""Clear""
@@ -1893,13 +2383,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
         - button ""Clear""
@@ -1916,13 +2403,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
         - button ""Clear""
@@ -1939,13 +2423,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
         - button ""Clear""
@@ -1962,13 +2443,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
         - button ""Clear""
@@ -1985,13 +2463,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
         - button ""Clear""
@@ -2008,13 +2483,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 8 Clear Sample Title 8 Clear 00:45:54"":
+    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
         - button ""Clear""
@@ -2059,13 +2531,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
         - button ""Clear""
@@ -2081,13 +2550,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""Increment Decrement Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
         - button ""Clear""
@@ -2104,13 +2570,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
         - button ""Clear""
@@ -2127,13 +2590,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
         - button ""Clear""
@@ -2150,13 +2610,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
         - button ""Clear""
@@ -2173,13 +2630,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
         - button ""Clear""
@@ -2196,13 +2650,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
         - button ""Clear""
@@ -2219,13 +2670,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""Increment Decrement Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
+    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
         - button ""Clear""
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
index a16a4fa0..29c8ccc6 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
@@ -49,13 +49,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement 00:00:00"":
+    - row ""1 00:00:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell:
         - textbox
         - button
@@ -87,13 +84,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Test Artist 1 Clear Test Title 1 Clear 00:00:00"":
+    - row ""1 Test Artist 1 Clear Test Title 1 Clear 00:00:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Test Artist 1 Clear"":
         - textbox: Test Artist 1
         - button ""Clear""
@@ -125,13 +119,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Mozart Clear Eine kleine Nachtmusik Clear 00:00:00"":
+    - row ""1 Mozart Clear Eine kleine Nachtmusik Clear 00:00:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Mozart Clear"":
         - textbox: Mozart
         - button ""Clear""
@@ -163,13 +154,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Mozart Clear Test Title 1 Clear 00:00:00"":
+    - row ""1 Mozart Clear Test Title 1 Clear 00:00:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Mozart Clear"":
         - textbox: Mozart
         - button ""Clear""
@@ -211,13 +199,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"":
+    - row ""1 Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"":
       - cell:
         - checkbox [checked]
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Test Track Artist 1 Clear"":
         - textbox: Test Track Artist 1
         - button ""Clear""
@@ -249,13 +234,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement 00:00:00"":
+    - row ""1 00:00:00"":
       - cell:
         - checkbox [checked]
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell:
         - textbox
         - button
@@ -285,13 +267,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"":
+    - row ""1 Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"":
       - cell:
         - checkbox [checked]
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Test Track Artist 1 Clear"":
         - textbox: Test Track Artist 1
         - button ""Clear""
@@ -346,13 +325,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement Adriatique Clear X. Clear 00:00:00 00:05:24.2500000 00:05:24.2500000"":
+    - row ""1 Adriatique Clear X. Clear 00:00:00 00:05:24.2500000 00:05:24.2500000"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell ""Adriatique Clear"":
         - textbox: Adriatique
         - button ""Clear""
@@ -368,13 +344,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:24.2500000"":
         - textbox: 00:05:24.2500000
       - cell
-    - row ""Increment Decrement Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24.2500000 00:10:39 00:05:14.7500000"":
+    - row ""2 Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24.2500000 00:10:39 00:05:14.7500000"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell ""Third Harmony Clear"":
         - textbox: Third Harmony
         - button ""Clear""
@@ -391,13 +364,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:14.7500000
       - cell:
         - button
-    - row ""Increment Decrement Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27"":
+    - row ""3 Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""3""
       - cell ""Dele Sosimi Afrobeat Orchestra Clear"":
         - textbox: Dele Sosimi Afrobeat Orchestra
         - button ""Clear""
@@ -414,13 +384,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:27
       - cell:
         - button
-    - row ""Increment Decrement Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15"":
+    - row ""4 Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""4""
       - cell ""Edem, Govan Clear"":
         - textbox: Edem, Govan
         - button ""Clear""
@@ -437,13 +404,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:15
       - cell:
         - button
-    - row ""Increment Decrement Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41"":
+    - row ""5 Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""5""
       - cell ""Jody Wisternoff Clear"":
         - textbox: Jody Wisternoff
         - button ""Clear""
@@ -460,13 +424,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:41
       - cell:
         - button
-    - row ""Increment Decrement Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25"":
+    - row ""6 Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""6""
       - cell ""Einmusik Clear"":
         - textbox: Einmusik
         - button ""Clear""
@@ -483,13 +444,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:25
       - cell:
         - button
-    - row ""Increment Decrement Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32"":
+    - row ""7 Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""7""
       - cell ""Sebastien Leger Clear"":
         - textbox: Sebastien Leger
         - button ""Clear""
@@ -506,13 +464,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:32
       - cell:
         - button
-    - row ""Increment Decrement Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20"":
+    - row ""8 Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""8""
       - cell ""Paul Thomas & Solid Stone Clear"":
         - textbox: Paul Thomas & Solid Stone
         - button ""Clear""
@@ -529,13 +484,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:20
       - cell:
         - button
-    - row ""Increment Decrement GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01"":
+    - row ""9 GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""9""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""9""
       - cell ""GusGus Clear"":
         - textbox: GusGus
         - button ""Clear""
@@ -552,13 +504,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:01
       - cell:
         - button
-    - row ""Increment Decrement Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59"":
+    - row ""10 Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""10""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""10""
       - cell ""Klangkarussell Clear"":
         - textbox: Klangkarussell
         - button ""Clear""
@@ -575,13 +524,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:59
       - cell:
         - button
-    - row ""Increment Decrement Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22"":
+    - row ""11 Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""11""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""11""
       - cell ""Anysense & Un:said Clear"":
         - textbox: Anysense & Un:said
         - button ""Clear""
@@ -598,13 +544,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:22
       - cell:
         - button
-    - row ""Increment Decrement Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52"":
+    - row ""12 Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""12""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""12""
       - cell ""Space Food Clear"":
         - textbox: Space Food
         - button ""Clear""
@@ -621,13 +564,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:52
       - cell:
         - button
-    - row ""Increment Decrement SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31"":
+    - row ""13 SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""13""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""13""
       - cell ""SHDW & Obscure Shape Clear"":
         - textbox: SHDW & Obscure Shape
         - button ""Clear""
@@ -644,13 +584,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:31
       - cell:
         - button
-    - row ""Increment Decrement HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24"":
+    - row ""14 HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""14""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""14""
       - cell ""HOSH Clear"":
         - textbox: HOSH
         - button ""Clear""
@@ -667,13 +604,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:24
       - cell:
         - button
-    - row ""Increment Decrement Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40"":
+    - row ""15 Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""15""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""15""
       - cell ""Alexey Union Clear"":
         - textbox: Alexey Union
         - button ""Clear""
@@ -690,13 +624,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:40
       - cell:
         - button
-    - row ""Increment Decrement Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30"":
+    - row ""16 Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""16""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""16""
       - cell ""Paul Taylor Clear"":
         - textbox: Paul Taylor
         - button ""Clear""
@@ -713,13 +644,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:30
       - cell:
         - button
-    - row ""Increment Decrement Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14"":
+    - row ""17 Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""17""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""17""
       - cell ""Philter Clear"":
         - textbox: Philter
         - button ""Clear""
@@ -736,13 +664,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:14
       - cell:
         - button
-    - row ""Increment Decrement Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48"":
+    - row ""18 Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""18""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""18""
       - cell ""Skizologic Clear"":
         - textbox: Skizologic
         - button ""Clear""
@@ -759,13 +684,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:48
       - cell:
         - button
-    - row ""Increment Decrement Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36"":
+    - row ""19 Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""19""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""19""
       - cell ""Thomas Schumacher, Caitlin Clear"":
         - textbox: Thomas Schumacher, Caitlin
         - button ""Clear""
@@ -782,13 +704,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:36
       - cell:
         - button
-    - row ""Increment Decrement A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48"":
+    - row ""20 A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""20""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""20""
       - cell ""A. Skomoroh Clear"":
         - textbox: A. Skomoroh
         - button ""Clear""
@@ -805,13 +724,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:48
       - cell:
         - button
-    - row ""Increment Decrement Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33"":
+    - row ""21 Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""21""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""21""
       - cell ""Patrik Berg Clear"":
         - textbox: Patrik Berg
         - button ""Clear""
@@ -828,13 +744,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:33
       - cell:
         - button
-    - row ""Increment Decrement Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28"":
+    - row ""22 Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""22""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""22""
       - cell ""Hidden Empire Clear"":
         - textbox: Hidden Empire
         - button ""Clear""
@@ -851,13 +764,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:28
       - cell:
         - button
-    - row ""Increment Decrement Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55"":
+    - row ""23 Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""23""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""23""
       - cell ""Mario Ochoa Clear"":
         - textbox: Mario Ochoa
         - button ""Clear""
@@ -874,13 +784,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:55
       - cell:
         - button
-    - row ""Increment Decrement Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21"":
+    - row ""24 Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""24""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""24""
       - cell ""Raul Facio Clear"":
         - textbox: Raul Facio
         - button ""Clear""
@@ -897,13 +804,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:21
       - cell:
         - button
-    - row ""Increment Decrement Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10"":
+    - row ""25 Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""25""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""25""
       - cell ""Soolver Clear"":
         - textbox: Soolver
         - button ""Clear""
@@ -920,13 +824,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:10
       - cell:
         - button
-    - row ""Increment Decrement Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04"":
+    - row ""26 Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""26""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""26""
       - cell ""Weska Clear"":
         - textbox: Weska
         - button ""Clear""
@@ -943,13 +844,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:04
       - cell:
         - button
-    - row ""Increment Decrement Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37"":
+    - row ""27 Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""27""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""27""
       - cell ""Tempo Giusto Clear"":
         - textbox: Tempo Giusto
         - button ""Clear""
@@ -966,13 +864,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:37
       - cell:
         - button
-    - row ""Increment Decrement Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26"":
+    - row ""28 Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""28""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""28""
       - cell ""Vlind & Asteroid & Gary Leroy Clear"":
         - textbox: Vlind & Asteroid & Gary Leroy
         - button ""Clear""
@@ -989,13 +884,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:26
       - cell:
         - button
-    - row ""Increment Decrement Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14"":
+    - row ""29 Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""29""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""29""
       - cell ""Astral Legacy Clear"":
         - textbox: Astral Legacy
         - button ""Clear""
@@ -1012,13 +904,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:14
       - cell:
         - button
-    - row ""Increment Decrement Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08"":
+    - row ""30 Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""30""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""30""
       - cell ""Gerrox Clear"":
         - textbox: Gerrox
         - button ""Clear""
@@ -1035,13 +924,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:08
       - cell:
         - button
-    - row ""Increment Decrement Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55"":
+    - row ""31 Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""31""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""31""
       - cell ""Charlotte De Witte Clear"":
         - textbox: Charlotte De Witte
         - button ""Clear""
@@ -1058,13 +944,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:55
       - cell:
         - button
-    - row ""Increment Decrement Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00"":
+    - row ""32 Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""32""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""32""
       - cell ""Space Food Clear"":
         - textbox: Space Food
         - button ""Clear""
@@ -1081,13 +964,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:00
       - cell:
         - button
-    - row ""Increment Decrement ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18"":
+    - row ""33 ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""33""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""33""
       - cell ""ARTBAT Clear"":
         - textbox: ARTBAT
         - button ""Clear""
@@ -1104,13 +984,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:18
       - cell:
         - button
-    - row ""Increment Decrement PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55"":
+    - row ""34 PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""34""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""34""
       - cell ""PETER PAHN Clear"":
         - textbox: PETER PAHN
         - button ""Clear""
@@ -1127,13 +1004,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:55
       - cell:
         - button
-    - row ""Increment Decrement Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49"":
+    - row ""35 Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""35""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""35""
       - cell ""Solitek Clear"":
         - textbox: Solitek
         - button ""Clear""
@@ -1150,13 +1024,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:49
       - cell:
         - button
-    - row ""Increment Decrement Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22"":
+    - row ""36 Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""36""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""36""
       - cell ""Veerus Clear"":
         - textbox: Veerus
         - button ""Clear""
@@ -1173,13 +1044,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:22
       - cell:
         - button
-    - row ""Increment Decrement Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19"":
+    - row ""37 Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""37""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""37""
       - cell ""Secret Cinema & Reinier Zonneveld Clear"":
         - textbox: Secret Cinema & Reinier Zonneveld
         - button ""Clear""
@@ -1196,13 +1064,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""Increment Decrement Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35"":
+    - row ""38 Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""38""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""38""
       - cell ""Amelie Lens Clear"":
         - textbox: Amelie Lens
         - button ""Clear""
@@ -1219,13 +1084,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:35
       - cell:
         - button
-    - row ""Increment Decrement Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13"":
+    - row ""39 Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""39""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""39""
       - cell ""Nikolay Kirov Clear"":
         - textbox: Nikolay Kirov
         - button ""Clear""
@@ -1270,13 +1132,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement 00:00:00"":
+    - row ""1 00:00:00"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell:
         - textbox
         - button
@@ -1290,13 +1149,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell:
         - textbox
       - cell
-    - row ""Increment Decrement 00:05:48.0608330"":
+    - row ""2 00:05:48.0608330"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""2""
       - cell:
         - textbox
         - button
@@ -1329,13 +1185,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""Increment Decrement 00:00:00 00:05:48.0608330 00:05:48.0608330"":
+    - row ""1 00:00:00 00:05:48.0608330 00:05:48.0608330"":
       - cell:
         - checkbox
-      - cell ""Increment Decrement"":
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""1""
       - cell:
         - textbox
         - button
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTestSmartphone.cs b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTestSmartphone.cs
index 57f346d5..0784dc7b 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTestSmartphone.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTestSmartphone.cs
@@ -33,15 +33,12 @@ public async Task Import_ShouldImportTracks_WhenUsingSampleInputfile()
             await importView.Analyze();
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
+    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
         - textbox: Sample Artist 1
@@ -62,14 +59,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# Increment Decrement Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
+    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
         - textbox: Sample Artist 2
@@ -92,14 +85,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
+    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
         - textbox: Sample Artist 3
@@ -122,14 +111,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
+    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
         - textbox: Sample Artist 4
@@ -152,14 +137,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
+    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
         - textbox: Sample Artist 5
@@ -182,14 +163,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
+    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
         - textbox: Sample Artist 6
@@ -212,14 +189,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
+    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
         - textbox: Sample Artist 7
@@ -242,14 +215,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
+    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
         - textbox: Sample Artist 8
@@ -288,15 +257,12 @@ public async Task Import_ShouldBeEditable_WhenEditingTrack()
             await importView.EditTracksModalAsync("Sample Title Edited 5");
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
+    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
         - textbox: Sample Artist 1
@@ -317,14 +283,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# Increment Decrement Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
+    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
         - textbox: Sample Artist 2
@@ -347,14 +309,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
+    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
         - textbox: Sample Artist 3
@@ -377,14 +335,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
+    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
         - textbox: Sample Artist 4
@@ -407,14 +361,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 5 Clear Title Sample Title Edited 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
+    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title Edited 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
         - textbox: Sample Artist 5
@@ -437,14 +387,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
+    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
         - textbox: Sample Artist 6
@@ -467,14 +413,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
+    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
         - textbox: Sample Artist 7
@@ -497,14 +439,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
+    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
         - textbox: Sample Artist 8
@@ -538,15 +476,12 @@ public async Task Import_ShouldImportTracks_WithSpecialTextfile()
             await importView.SwitchImportProfileAsync("Textfile (just track data)");
             await importView.Analyze();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Adriatique Clear Title X. Clear Begin 00:00:00 End 00:05:24 Length 00:05:24"":
+    - row ""# 1 Artist Adriatique Clear Title X. Clear Begin 00:00:00 End 00:05:24 Length 00:05:24"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Adriatique Clear"":
         - text: Artist
         - textbox: Adriatique
@@ -566,14 +501,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:24"":
         - text: Length
         - textbox: 00:05:24
-    - row ""# Increment Decrement Artist Third Harmony Clear Title Fears And Dreams (Original Mix) Clear Begin 00:05:24 End 00:10:39 Length 00:05:15"":
+    - row ""# 2 Artist Third Harmony Clear Title Fears And Dreams (Original Mix) Clear Begin 00:05:24 End 00:10:39 Length 00:05:15"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist Third Harmony Clear"":
         - text: Artist
         - textbox: Third Harmony
@@ -593,14 +524,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:15"":
         - text: Length
         - textbox: 00:05:15
-    - row ""# Increment Decrement Artist Dele Sosimi Afrobeat Orchestra Clear Title Too Much Information (Laolu Remix; Edit) Clear Begin 00:10:39 End 00:17:06 Length 00:06:27"":
+    - row ""# 3 Artist Dele Sosimi Afrobeat Orchestra Clear Title Too Much Information (Laolu Remix; Edit) Clear Begin 00:10:39 End 00:17:06 Length 00:06:27"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Dele Sosimi Afrobeat Orchestra Clear"":
         - text: Artist
         - textbox: Dele Sosimi Afrobeat Orchestra
@@ -620,14 +547,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:27"":
         - text: Length
         - textbox: 00:06:27
-    - row ""# Increment Decrement Artist Edem, Govan Clear Title Ankh (Onetwo MX Remix) Clear Begin 00:17:06 End 00:23:21 Length 00:06:15"":
+    - row ""# 4 Artist Edem, Govan Clear Title Ankh (Onetwo MX Remix) Clear Begin 00:17:06 End 00:23:21 Length 00:06:15"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist Edem, Govan Clear"":
         - text: Artist
         - textbox: Edem, Govan
@@ -647,14 +570,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:15"":
         - text: Length
         - textbox: 00:06:15
-    - row ""# Increment Decrement Artist Jody Wisternoff Clear Title For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear Begin 00:23:21 End 00:29:02 Length 00:05:41"":
+    - row ""# 5 Artist Jody Wisternoff Clear Title For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear Begin 00:23:21 End 00:29:02 Length 00:05:41"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Jody Wisternoff Clear"":
         - text: Artist
         - textbox: Jody Wisternoff
@@ -674,14 +593,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:41"":
         - text: Length
         - textbox: 00:05:41
-    - row ""# Increment Decrement Artist Einmusik Clear Title Bead (Original Mix) Clear Begin 00:29:02 End 00:34:27 Length 00:05:25"":
+    - row ""# 6 Artist Einmusik Clear Title Bead (Original Mix) Clear Begin 00:29:02 End 00:34:27 Length 00:05:25"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Einmusik Clear"":
         - text: Artist
         - textbox: Einmusik
@@ -701,14 +616,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:25"":
         - text: Length
         - textbox: 00:05:25
-    - row ""# Increment Decrement Artist Sebastien Leger Clear Title La Danse du Scorpion Clear Begin 00:34:27 End 00:40:59 Length 00:06:32"":
+    - row ""# 7 Artist Sebastien Leger Clear Title La Danse du Scorpion Clear Begin 00:34:27 End 00:40:59 Length 00:06:32"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Sebastien Leger Clear"":
         - text: Artist
         - textbox: Sebastien Leger
@@ -728,14 +639,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:32"":
         - text: Length
         - textbox: 00:06:32
-    - row ""# Increment Decrement Artist Paul Thomas & Solid Stone Clear Title La Bombo (Solid Stone Remix) Clear Begin 00:40:59 End 00:46:19 Length 00:05:20"":
+    - row ""# 8 Artist Paul Thomas & Solid Stone Clear Title La Bombo (Solid Stone Remix) Clear Begin 00:40:59 End 00:46:19 Length 00:05:20"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Paul Thomas & Solid Stone Clear"":
         - text: Artist
         - textbox: Paul Thomas & Solid Stone
@@ -755,14 +662,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:20"":
         - text: Length
         - textbox: 00:05:20
-    - row ""# Increment Decrement Artist GusGus Clear Title Crossfade (Maceo Plex Mix) Clear Begin 00:46:19 End 00:52:20 Length 00:06:01"":
+    - row ""# 9 Artist GusGus Clear Title Crossfade (Maceo Plex Mix) Clear Begin 00:46:19 End 00:52:20 Length 00:06:01"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""9""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 9""
       - cell ""Artist GusGus Clear"":
         - text: Artist
         - textbox: GusGus
@@ -782,14 +685,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:01"":
         - text: Length
         - textbox: 00:06:01
-    - row ""# Increment Decrement Artist Klangkarussell Clear Title Time (Original Mix) Clear Begin 00:52:20 End 00:56:19 Length 00:03:59"":
+    - row ""# 10 Artist Klangkarussell Clear Title Time (Original Mix) Clear Begin 00:52:20 End 00:56:19 Length 00:03:59"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""10""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 10""
       - cell ""Artist Klangkarussell Clear"":
         - text: Artist
         - textbox: Klangkarussell
@@ -809,14 +708,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:03:59"":
         - text: Length
         - textbox: 00:03:59
-    - row ""# Increment Decrement Artist Anysense & Un:said Clear Title Missing Path (Original Mix) Clear Begin 00:56:19 End 01:01:41 Length 00:05:22"":
+    - row ""# 11 Artist Anysense & Un:said Clear Title Missing Path (Original Mix) Clear Begin 00:56:19 End 01:01:41 Length 00:05:22"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""11""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 11""
       - cell ""Artist Anysense & Un:said Clear"":
         - text: Artist
         - textbox: Anysense & Un:said
@@ -836,14 +731,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:22"":
         - text: Length
         - textbox: 00:05:22
-    - row ""# Increment Decrement Artist Space Food Clear Title Bombay Clear Begin 01:01:41 End 01:06:33 Length 00:04:52"":
+    - row ""# 12 Artist Space Food Clear Title Bombay Clear Begin 01:01:41 End 01:06:33 Length 00:04:52"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""12""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 12""
       - cell ""Artist Space Food Clear"":
         - text: Artist
         - textbox: Space Food
@@ -863,14 +754,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:52"":
         - text: Length
         - textbox: 00:04:52
-    - row ""# Increment Decrement Artist SHDW & Obscure Shape Clear Title Wächter der Nacht (Original Mix) Clear Begin 01:06:33 End 01:11:04 Length 00:04:31"":
+    - row ""# 13 Artist SHDW & Obscure Shape Clear Title Wächter der Nacht (Original Mix) Clear Begin 01:06:33 End 01:11:04 Length 00:04:31"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""13""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 13""
       - cell ""Artist SHDW & Obscure Shape Clear"":
         - text: Artist
         - textbox: SHDW & Obscure Shape
@@ -890,14 +777,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:31"":
         - text: Length
         - textbox: 00:04:31
-    - row ""# Increment Decrement Artist HOSH Clear Title Karma Clear Begin 01:11:04 End 01:15:28 Length 00:04:24"":
+    - row ""# 14 Artist HOSH Clear Title Karma Clear Begin 01:11:04 End 01:15:28 Length 00:04:24"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""14""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 14""
       - cell ""Artist HOSH Clear"":
         - text: Artist
         - textbox: HOSH
@@ -917,14 +800,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:24"":
         - text: Length
         - textbox: 00:04:24
-    - row ""# Increment Decrement Artist Alexey Union Clear Title Olympia (Original Mix) Clear Begin 01:15:28 End 01:21:08 Length 00:05:40"":
+    - row ""# 15 Artist Alexey Union Clear Title Olympia (Original Mix) Clear Begin 01:15:28 End 01:21:08 Length 00:05:40"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""15""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 15""
       - cell ""Artist Alexey Union Clear"":
         - text: Artist
         - textbox: Alexey Union
@@ -944,14 +823,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:40"":
         - text: Length
         - textbox: 00:05:40
-    - row ""# Increment Decrement Artist Paul Taylor Clear Title Afterglow Clear Begin 01:21:08 End 01:25:38 Length 00:04:30"":
+    - row ""# 16 Artist Paul Taylor Clear Title Afterglow Clear Begin 01:21:08 End 01:25:38 Length 00:04:30"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""16""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 16""
       - cell ""Artist Paul Taylor Clear"":
         - text: Artist
         - textbox: Paul Taylor
@@ -971,14 +846,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:30"":
         - text: Length
         - textbox: 00:04:30
-    - row ""# Increment Decrement Artist Philter Clear Title Stranger Clear Begin 01:25:38 End 01:31:52 Length 00:06:14"":
+    - row ""# 17 Artist Philter Clear Title Stranger Clear Begin 01:25:38 End 01:31:52 Length 00:06:14"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""17""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 17""
       - cell ""Artist Philter Clear"":
         - text: Artist
         - textbox: Philter
@@ -998,14 +869,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:14"":
         - text: Length
         - textbox: 00:06:14
-    - row ""# Increment Decrement Artist Skizologic Clear Title Hypersphere (Original Mix) Clear Begin 01:31:52 End 01:36:40 Length 00:04:48"":
+    - row ""# 18 Artist Skizologic Clear Title Hypersphere (Original Mix) Clear Begin 01:31:52 End 01:36:40 Length 00:04:48"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""18""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 18""
       - cell ""Artist Skizologic Clear"":
         - text: Artist
         - textbox: Skizologic
@@ -1025,14 +892,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:48"":
         - text: Length
         - textbox: 00:04:48
-    - row ""# Increment Decrement Artist Thomas Schumacher, Caitlin Clear Title All of You (Remix) Clear Begin 01:36:40 End 01:42:16 Length 00:05:36"":
+    - row ""# 19 Artist Thomas Schumacher, Caitlin Clear Title All of You (Remix) Clear Begin 01:36:40 End 01:42:16 Length 00:05:36"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""19""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 19""
       - cell ""Artist Thomas Schumacher, Caitlin Clear"":
         - text: Artist
         - textbox: Thomas Schumacher, Caitlin
@@ -1052,14 +915,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:36"":
         - text: Length
         - textbox: 00:05:36
-    - row ""# Increment Decrement Artist A. Skomoroh Clear Title White Horse Conquest (Original Mix) Clear Begin 01:42:16 End 01:47:04 Length 00:04:48"":
+    - row ""# 20 Artist A. Skomoroh Clear Title White Horse Conquest (Original Mix) Clear Begin 01:42:16 End 01:47:04 Length 00:04:48"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""20""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 20""
       - cell ""Artist A. Skomoroh Clear"":
         - text: Artist
         - textbox: A. Skomoroh
@@ -1079,14 +938,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:48"":
         - text: Length
         - textbox: 00:04:48
-    - row ""# Increment Decrement Artist Patrik Berg Clear Title Bright (Original Mix) Clear Begin 01:47:04 End 01:52:37 Length 00:05:33"":
+    - row ""# 21 Artist Patrik Berg Clear Title Bright (Original Mix) Clear Begin 01:47:04 End 01:52:37 Length 00:05:33"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""21""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 21""
       - cell ""Artist Patrik Berg Clear"":
         - text: Artist
         - textbox: Patrik Berg
@@ -1106,14 +961,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:33"":
         - text: Length
         - textbox: 00:05:33
-    - row ""# Increment Decrement Artist Hidden Empire Clear Title Bengal Clear Begin 01:52:37 End 01:58:05 Length 00:05:28"":
+    - row ""# 22 Artist Hidden Empire Clear Title Bengal Clear Begin 01:52:37 End 01:58:05 Length 00:05:28"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""22""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 22""
       - cell ""Artist Hidden Empire Clear"":
         - text: Artist
         - textbox: Hidden Empire
@@ -1133,14 +984,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:28"":
         - text: Length
         - textbox: 00:05:28
-    - row ""# Increment Decrement Artist Mario Ochoa Clear Title Levitate Clear Begin 01:58:05 End 02:03:00 Length 00:04:55"":
+    - row ""# 23 Artist Mario Ochoa Clear Title Levitate Clear Begin 01:58:05 End 02:03:00 Length 00:04:55"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""23""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 23""
       - cell ""Artist Mario Ochoa Clear"":
         - text: Artist
         - textbox: Mario Ochoa
@@ -1160,14 +1007,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:55"":
         - text: Length
         - textbox: 00:04:55
-    - row ""# Increment Decrement Artist Raul Facio Clear Title Eyes Wide Shut (Original Mix) Clear Begin 02:03:00 End 02:08:21 Length 00:05:21"":
+    - row ""# 24 Artist Raul Facio Clear Title Eyes Wide Shut (Original Mix) Clear Begin 02:03:00 End 02:08:21 Length 00:05:21"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""24""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 24""
       - cell ""Artist Raul Facio Clear"":
         - text: Artist
         - textbox: Raul Facio
@@ -1187,14 +1030,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:21"":
         - text: Length
         - textbox: 00:05:21
-    - row ""# Increment Decrement Artist Soolver Clear Title Regular (Original Mix) Clear Begin 02:08:21 End 02:14:31 Length 00:06:10"":
+    - row ""# 25 Artist Soolver Clear Title Regular (Original Mix) Clear Begin 02:08:21 End 02:14:31 Length 00:06:10"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""25""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 25""
       - cell ""Artist Soolver Clear"":
         - text: Artist
         - textbox: Soolver
@@ -1214,14 +1053,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:10"":
         - text: Length
         - textbox: 00:06:10
-    - row ""# Increment Decrement Artist Weska Clear Title EQ64 (Original Mix) Clear Begin 02:14:31 End 02:18:35 Length 00:04:04"":
+    - row ""# 26 Artist Weska Clear Title EQ64 (Original Mix) Clear Begin 02:14:31 End 02:18:35 Length 00:04:04"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""26""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 26""
       - cell ""Artist Weska Clear"":
         - text: Artist
         - textbox: Weska
@@ -1241,14 +1076,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:04"":
         - text: Length
         - textbox: 00:04:04
-    - row ""# Increment Decrement Artist Tempo Giusto Clear Title The Fall (Extended Mix) Clear Begin 02:18:35 End 02:24:12 Length 00:05:37"":
+    - row ""# 27 Artist Tempo Giusto Clear Title The Fall (Extended Mix) Clear Begin 02:18:35 End 02:24:12 Length 00:05:37"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""27""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 27""
       - cell ""Artist Tempo Giusto Clear"":
         - text: Artist
         - textbox: Tempo Giusto
@@ -1268,14 +1099,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:37"":
         - text: Length
         - textbox: 00:05:37
-    - row ""# Increment Decrement Artist Vlind & Asteroid & Gary Leroy Clear Title Trinity (Extended Mix) Clear Begin 02:24:12 End 02:29:38 Length 00:05:26"":
+    - row ""# 28 Artist Vlind & Asteroid & Gary Leroy Clear Title Trinity (Extended Mix) Clear Begin 02:24:12 End 02:29:38 Length 00:05:26"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""28""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 28""
       - cell ""Artist Vlind & Asteroid & Gary Leroy Clear"":
         - text: Artist
         - textbox: Vlind & Asteroid & Gary Leroy
@@ -1295,14 +1122,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:26"":
         - text: Length
         - textbox: 00:05:26
-    - row ""# Increment Decrement Artist Astral Legacy Clear Title Vaveyla (Original Mix) Clear Begin 02:29:38 End 02:32:52 Length 00:03:14"":
+    - row ""# 29 Artist Astral Legacy Clear Title Vaveyla (Original Mix) Clear Begin 02:29:38 End 02:32:52 Length 00:03:14"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""29""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 29""
       - cell ""Artist Astral Legacy Clear"":
         - text: Artist
         - textbox: Astral Legacy
@@ -1322,14 +1145,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:03:14"":
         - text: Length
         - textbox: 00:03:14
-    - row ""# Increment Decrement Artist Gerrox Clear Title Chakra (Original Mix) Clear Begin 02:32:52 End 02:37:00 Length 00:04:08"":
+    - row ""# 30 Artist Gerrox Clear Title Chakra (Original Mix) Clear Begin 02:32:52 End 02:37:00 Length 00:04:08"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""30""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 30""
       - cell ""Artist Gerrox Clear"":
         - text: Artist
         - textbox: Gerrox
@@ -1349,14 +1168,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:08"":
         - text: Length
         - textbox: 00:04:08
-    - row ""# Increment Decrement Artist Charlotte De Witte Clear Title Pattern Clear Begin 02:37:00 End 02:41:55 Length 00:04:55"":
+    - row ""# 31 Artist Charlotte De Witte Clear Title Pattern Clear Begin 02:37:00 End 02:41:55 Length 00:04:55"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""31""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 31""
       - cell ""Artist Charlotte De Witte Clear"":
         - text: Artist
         - textbox: Charlotte De Witte
@@ -1376,14 +1191,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:55"":
         - text: Length
         - textbox: 00:04:55
-    - row ""# Increment Decrement Artist Space Food Clear Title Amabey Clear Begin 02:41:55 End 02:46:55 Length 00:05:00"":
+    - row ""# 32 Artist Space Food Clear Title Amabey Clear Begin 02:41:55 End 02:46:55 Length 00:05:00"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""32""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 32""
       - cell ""Artist Space Food Clear"":
         - text: Artist
         - textbox: Space Food
@@ -1403,14 +1214,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:00"":
         - text: Length
         - textbox: 00:05:00
-    - row ""# Increment Decrement Artist ARTBAT Clear Title Papilion (Original Mix) Clear Begin 02:46:55 End 02:51:13 Length 00:04:18"":
+    - row ""# 33 Artist ARTBAT Clear Title Papilion (Original Mix) Clear Begin 02:46:55 End 02:51:13 Length 00:04:18"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""33""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 33""
       - cell ""Artist ARTBAT Clear"":
         - text: Artist
         - textbox: ARTBAT
@@ -1430,14 +1237,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:18"":
         - text: Length
         - textbox: 00:04:18
-    - row ""# Increment Decrement Artist PETER PAHN Clear Title Enjoy Infinity (Original Mix) Clear Begin 02:51:13 End 02:56:08 Length 00:04:55"":
+    - row ""# 34 Artist PETER PAHN Clear Title Enjoy Infinity (Original Mix) Clear Begin 02:51:13 End 02:56:08 Length 00:04:55"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""34""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 34""
       - cell ""Artist PETER PAHN Clear"":
         - text: Artist
         - textbox: PETER PAHN
@@ -1457,14 +1260,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:55"":
         - text: Length
         - textbox: 00:04:55
-    - row ""# Increment Decrement Artist Solitek Clear Title Instinct (Original Mix) Clear Begin 02:56:08 End 03:00:57 Length 00:04:49"":
+    - row ""# 35 Artist Solitek Clear Title Instinct (Original Mix) Clear Begin 02:56:08 End 03:00:57 Length 00:04:49"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""35""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 35""
       - cell ""Artist Solitek Clear"":
         - text: Artist
         - textbox: Solitek
@@ -1484,14 +1283,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:49"":
         - text: Length
         - textbox: 00:04:49
-    - row ""# Increment Decrement Artist Veerus Clear Title Heavy Clear Begin 03:00:57 End 03:05:19 Length 00:04:22"":
+    - row ""# 36 Artist Veerus Clear Title Heavy Clear Begin 03:00:57 End 03:05:19 Length 00:04:22"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""36""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 36""
       - cell ""Artist Veerus Clear"":
         - text: Artist
         - textbox: Veerus
@@ -1511,14 +1306,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:22"":
         - text: Length
         - textbox: 00:04:22
-    - row ""# Increment Decrement Artist Secret Cinema & Reinier Zonneveld Clear Title Pain Thing (Original Mix) Clear Begin 03:05:19 End 03:09:38 Length 00:04:19"":
+    - row ""# 37 Artist Secret Cinema & Reinier Zonneveld Clear Title Pain Thing (Original Mix) Clear Begin 03:05:19 End 03:09:38 Length 00:04:19"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""37""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 37""
       - cell ""Artist Secret Cinema & Reinier Zonneveld Clear"":
         - text: Artist
         - textbox: Secret Cinema & Reinier Zonneveld
@@ -1538,14 +1329,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:19"":
         - text: Length
         - textbox: 00:04:19
-    - row ""# Increment Decrement Artist Amelie Lens Clear Title Hypnotized Clear Begin 03:09:38 End 03:13:13 Length 00:03:35"":
+    - row ""# 38 Artist Amelie Lens Clear Title Hypnotized Clear Begin 03:09:38 End 03:13:13 Length 00:03:35"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""38""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 38""
       - cell ""Artist Amelie Lens Clear"":
         - text: Artist
         - textbox: Amelie Lens
@@ -1565,14 +1352,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:03:35"":
         - text: Length
         - textbox: 00:03:35
-    - row ""# Increment Decrement Artist Nikolay Kirov Clear Title Chasing the Sun (Original Mix) Clear Begin 03:13:13 End Length"":
+    - row ""# 39 Artist Nikolay Kirov Clear Title Chasing the Sun (Original Mix) Clear Begin 03:13:13 End Length"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""39""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 39""
       - cell ""Artist Nikolay Kirov Clear"":
         - text: Artist
         - textbox: Nikolay Kirov
@@ -1605,15 +1388,12 @@ public async Task Import_ShouldImportTracks_WhenUsingSampleInputfile2()
             await Expect(importView.CuesheetArtistInput).ToBeEmptyAsync();
             await Expect(importView.CuesheetTitleInput).ToBeEmptyAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00"":
+    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
         - textbox: Sample Artist 1
@@ -1633,14 +1413,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:00"":
         - text: Length
         - textbox: 00:05:00
-    - row ""# Increment Decrement Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23"":
+    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
         - textbox: Sample Artist 2
@@ -1660,14 +1436,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:23"":
         - text: Length
         - textbox: 00:04:23
-    - row ""# Increment Decrement Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31"":
+    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
         - textbox: Sample Artist 3
@@ -1687,14 +1459,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:31"":
         - text: Length
         - textbox: 00:06:31
-    - row ""# Increment Decrement Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19"":
+    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
         - textbox: Sample Artist 4
@@ -1714,14 +1482,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:19"":
         - text: Length
         - textbox: 00:04:19
-    - row ""# Increment Decrement Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41"":
+    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
         - textbox: Sample Artist 5
@@ -1741,14 +1505,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:41"":
         - text: Length
         - textbox: 00:04:41
-    - row ""# Increment Decrement Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00"":
+    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
         - textbox: Sample Artist 6
@@ -1768,14 +1528,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:07:00"":
         - text: Length
         - textbox: 00:07:00
-    - row ""# Increment Decrement Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00"":
+    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
         - textbox: Sample Artist 7
@@ -1795,14 +1551,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:14:00"":
         - text: Length
         - textbox: 00:14:00
-    - row ""# Increment Decrement Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00"":
+    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
         - textbox: Sample Artist 8
@@ -1834,15 +1586,12 @@ public async Task Import_ShouldImportTracks_WithTraktorOutput()
             await importView.Analyze();
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Nachap Clear Title Glass Clear Begin 00:00:00 End 00:11:56 Length 00:11:56 Status"":
+    - row ""# 1 Artist Nachap Clear Title Glass Clear Begin 00:00:00 End 00:11:56 Length 00:11:56 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Nachap Clear"":
         - text: Artist
         - textbox: Nachap
@@ -1863,14 +1612,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:11:56
       - cell ""Status""
-    - row ""# Increment Decrement Artist Title Progressive + Melodic DECK Clear Begin 00:11:56 End 00:13:31 Length 00:01:35 Status"":
+    - row ""# 2 Artist Title Progressive + Melodic DECK Clear Begin 00:11:56 End 00:13:31 Length 00:01:35 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist"":
         - text: Artist
         - textbox
@@ -1892,14 +1637,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Nomer 21 Clear Title Depersonalization Clear Begin 00:13:31 End 00:19:14 Length 00:05:43 Status"":
+    - row ""# 3 Artist Nomer 21 Clear Title Depersonalization Clear Begin 00:13:31 End 00:19:14 Length 00:05:43 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Nomer 21 Clear"":
         - text: Artist
         - textbox: Nomer 21
@@ -1922,14 +1663,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Showing Off Clear Begin 00:19:14 End 00:24:02 Length 00:04:48 Status"":
+    - row ""# 4 Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Showing Off Clear Begin 00:19:14 End 00:24:02 Length 00:04:48 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - text: Artist
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
@@ -1952,14 +1689,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Carlo Whale Clear Title Unconscious Clear Begin 00:24:02 End 00:29:37 Length 00:05:35 Status"":
+    - row ""# 5 Artist Carlo Whale Clear Title Unconscious Clear Begin 00:24:02 End 00:29:37 Length 00:05:35 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Carlo Whale Clear"":
         - text: Artist
         - textbox: Carlo Whale
@@ -1982,14 +1715,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Arba Han Clear Title Timelaps Clear Begin 00:29:37 End 00:33:13 Length 00:03:36 Status"":
+    - row ""# 6 Artist Arba Han Clear Title Timelaps Clear Begin 00:29:37 End 00:33:13 Length 00:03:36 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Arba Han Clear"":
         - text: Artist
         - textbox: Arba Han
@@ -2012,14 +1741,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Savill Clear Title Energy Surrounds Clear Begin 00:33:13 End 00:40:30 Length 00:07:17 Status"":
+    - row ""# 7 Artist Savill Clear Title Energy Surrounds Clear Begin 00:33:13 End 00:40:30 Length 00:07:17 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Savill Clear"":
         - text: Artist
         - textbox: Savill
@@ -2042,14 +1767,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Teklix Clear Title The Tribal Code Clear Begin 00:40:30 End 00:48:53 Length 00:08:23 Status"":
+    - row ""# 8 Artist Teklix Clear Title The Tribal Code Clear Begin 00:40:30 End 00:48:53 Length 00:08:23 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Teklix Clear"":
         - text: Artist
         - textbox: Teklix
@@ -2072,14 +1793,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Neuralis Clear Title I'm Looking for Answers Clear Begin 00:48:53 End 00:54:34 Length 00:05:41 Status"":
+    - row ""# 9 Artist Neuralis Clear Title I'm Looking for Answers Clear Begin 00:48:53 End 00:54:34 Length 00:05:41 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""9""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 9""
       - cell ""Artist Neuralis Clear"":
         - text: Artist
         - textbox: Neuralis
@@ -2102,14 +1819,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Nopopstar &amp; Arsia Clear Title Dirty Moves Clear Begin 00:54:34 End 01:00:24 Length 00:05:50 Status"":
+    - row ""# 10 Artist Nopopstar &amp; Arsia Clear Title Dirty Moves Clear Begin 00:54:34 End 01:00:24 Length 00:05:50 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""10""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 10""
       - cell ""Artist Nopopstar &amp; Arsia Clear"":
         - text: Artist
         - textbox: Nopopstar &amp; Arsia
@@ -2132,14 +1845,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Lost (Maze 28 Remix) Clear Begin 01:00:24 End 01:05:17 Length 00:04:53 Status"":
+    - row ""# 11 Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Lost (Maze 28 Remix) Clear Begin 01:00:24 End 01:05:17 Length 00:04:53 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""11""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 11""
       - cell ""Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - text: Artist
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
@@ -2162,14 +1871,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Lost (Redspace Remix) Clear Begin 01:05:17 End 01:08:22 Length 00:03:05 Status"":
+    - row ""# 12 Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Lost (Redspace Remix) Clear Begin 01:05:17 End 01:08:22 Length 00:03:05 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""12""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 12""
       - cell ""Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - text: Artist
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
@@ -2192,14 +1897,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Gadoz Clear Title 5d Clear Begin 01:08:22 End 01:16:34 Length 00:08:12 Status"":
+    - row ""# 13 Artist Gadoz Clear Title 5d Clear Begin 01:08:22 End 01:16:34 Length 00:08:12 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""13""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 13""
       - cell ""Artist Gadoz Clear"":
         - text: Artist
         - textbox: Gadoz
@@ -2222,14 +1923,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist DJ Danzik Clear Title Out of Space Clear Begin 01:16:34 End 01:19:22 Length 00:02:48 Status"":
+    - row ""# 14 Artist DJ Danzik Clear Title Out of Space Clear Begin 01:16:34 End 01:19:22 Length 00:02:48 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""14""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 14""
       - cell ""Artist DJ Danzik Clear"":
         - text: Artist
         - textbox: DJ Danzik
@@ -2252,14 +1949,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Enis Çoban Clear Title Internet Clear Begin 01:19:22 End 01:25:14 Length 00:05:52 Status"":
+    - row ""# 15 Artist Enis Çoban Clear Title Internet Clear Begin 01:19:22 End 01:25:14 Length 00:05:52 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""15""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 15""
       - cell ""Artist Enis Çoban Clear"":
         - text: Artist
         - textbox: Enis Çoban
@@ -2282,14 +1975,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Cold Mind &amp; Alex Yikker Clear Title Rage Clear Begin 01:25:14 End 01:31:33 Length 00:06:19 Status"":
+    - row ""# 16 Artist Cold Mind &amp; Alex Yikker Clear Title Rage Clear Begin 01:25:14 End 01:31:33 Length 00:06:19 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""16""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 16""
       - cell ""Artist Cold Mind &amp; Alex Yikker Clear"":
         - text: Artist
         - textbox: Cold Mind &amp; Alex Yikker
@@ -2312,14 +2001,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Maze 28 Clear Title Sol (JAHAYA Remix) Clear Begin 01:31:33 End 01:32:51 Length 00:01:18 Status"":
+    - row ""# 17 Artist Maze 28 Clear Title Sol (JAHAYA Remix) Clear Begin 01:31:33 End 01:32:51 Length 00:01:18 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""17""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 17""
       - cell ""Artist Maze 28 Clear"":
         - text: Artist
         - textbox: Maze 28
@@ -2342,14 +2027,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Alex Grafton Clear Title Hi Baby Clear Begin 01:32:51 End 01:42:13 Length 00:09:22 Status"":
+    - row ""# 18 Artist Alex Grafton Clear Title Hi Baby Clear Begin 01:32:51 End 01:42:13 Length 00:09:22 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""18""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 18""
       - cell ""Artist Alex Grafton Clear"":
         - text: Artist
         - textbox: Alex Grafton
@@ -2372,14 +2053,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Che&amp;Mos &amp; Halo Far Clear Title Daddy Clear Begin 01:42:13 End 01:45:22 Length 00:03:09 Status"":
+    - row ""# 19 Artist Che&amp;Mos &amp; Halo Far Clear Title Daddy Clear Begin 01:42:13 End 01:45:22 Length 00:03:09 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""19""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 19""
       - cell ""Artist Che&amp;Mos &amp; Halo Far Clear"":
         - text: Artist
         - textbox: Che&amp;Mos &amp; Halo Far
@@ -2402,14 +2079,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist K KARDEN Clear Title Acid Rain Clear Begin 01:45:22 End 01:48:40 Length 00:03:18 Status"":
+    - row ""# 20 Artist K KARDEN Clear Title Acid Rain Clear Begin 01:45:22 End 01:48:40 Length 00:03:18 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""20""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 20""
       - cell ""Artist K KARDEN Clear"":
         - text: Artist
         - textbox: K KARDEN
@@ -2432,14 +2105,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Dobrov &amp; Gar1sson Clear Title Analogic (Redspace Remix) Clear Begin 01:48:40 End 01:56:40 Length 00:08:00 Status"":
+    - row ""# 21 Artist Dobrov &amp; Gar1sson Clear Title Analogic (Redspace Remix) Clear Begin 01:48:40 End 01:56:40 Length 00:08:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""21""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 21""
       - cell ""Artist Dobrov &amp; Gar1sson Clear"":
         - text: Artist
         - textbox: Dobrov &amp; Gar1sson
@@ -2462,14 +2131,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Gazfluz Clear Title Vargan Clear Begin 01:56:40 End 02:00:39 Length 00:03:59 Status"":
+    - row ""# 22 Artist Gazfluz Clear Title Vargan Clear Begin 01:56:40 End 02:00:39 Length 00:03:59 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""22""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 22""
       - cell ""Artist Gazfluz Clear"":
         - text: Artist
         - textbox: Gazfluz
@@ -2492,14 +2157,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist SHKAPOV Clear Title Control Clear Begin 02:00:39 End 02:06:47 Length 00:06:08 Status"":
+    - row ""# 23 Artist SHKAPOV Clear Title Control Clear Begin 02:00:39 End 02:06:47 Length 00:06:08 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""23""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 23""
       - cell ""Artist SHKAPOV Clear"":
         - text: Artist
         - textbox: SHKAPOV
@@ -2522,14 +2183,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist QazaQ Clear Title On the Line Clear Begin 02:06:47 End 02:09:09 Length 00:02:22 Status"":
+    - row ""# 24 Artist QazaQ Clear Title On the Line Clear Begin 02:06:47 End 02:09:09 Length 00:02:22 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""24""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 24""
       - cell ""Artist QazaQ Clear"":
         - text: Artist
         - textbox: QazaQ
@@ -2552,14 +2209,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Alex Schaufel Clear Title Elizabeth (Larsun Hesh Remix) Clear Begin 02:09:09 End 02:14:18 Length 00:05:09 Status"":
+    - row ""# 25 Artist Alex Schaufel Clear Title Elizabeth (Larsun Hesh Remix) Clear Begin 02:09:09 End 02:14:18 Length 00:05:09 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""25""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 25""
       - cell ""Artist Alex Schaufel Clear"":
         - text: Artist
         - textbox: Alex Schaufel
@@ -2582,14 +2235,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Oiro Clear Title Just Business Clear Begin 02:14:18 End 02:19:22 Length 00:05:04 Status"":
+    - row ""# 26 Artist Oiro Clear Title Just Business Clear Begin 02:14:18 End 02:19:22 Length 00:05:04 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""26""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 26""
       - cell ""Artist Oiro Clear"":
         - text: Artist
         - textbox: Oiro
@@ -2612,14 +2261,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Molex Clear Title Mind Split (Redspace Remix) Clear Begin 02:19:22 End 02:27:48 Length 00:08:26 Status"":
+    - row ""# 27 Artist Molex Clear Title Mind Split (Redspace Remix) Clear Begin 02:19:22 End 02:27:48 Length 00:08:26 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""27""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 27""
       - cell ""Artist Molex Clear"":
         - text: Artist
         - textbox: Molex
@@ -2642,14 +2287,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist SOLI Clear Title Give Me Your Mind Clear Begin 02:27:48 End 02:33:48 Length 00:06:00 Status"":
+    - row ""# 28 Artist SOLI Clear Title Give Me Your Mind Clear Begin 02:27:48 End 02:33:48 Length 00:06:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""28""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 28""
       - cell ""Artist SOLI Clear"":
         - text: Artist
         - textbox: SOLI
@@ -2672,14 +2313,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist MANDU Clear Title Jacky Clear Begin 02:33:48 End 02:39:05 Length 00:05:17 Status"":
+    - row ""# 29 Artist MANDU Clear Title Jacky Clear Begin 02:33:48 End 02:39:05 Length 00:05:17 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""29""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 29""
       - cell ""Artist MANDU Clear"":
         - text: Artist
         - textbox: MANDU
@@ -2702,14 +2339,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist SOLI Clear Title Spacetoon Clear Begin 02:39:05 End 02:41:31 Length 00:02:26 Status"":
+    - row ""# 30 Artist SOLI Clear Title Spacetoon Clear Begin 02:39:05 End 02:41:31 Length 00:02:26 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""30""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 30""
       - cell ""Artist SOLI Clear"":
         - text: Artist
         - textbox: SOLI
@@ -2732,14 +2365,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sasha Fashion Clear Title Moqton Clear Begin 02:41:31 End 02:50:18 Length 00:08:47 Status"":
+    - row ""# 31 Artist Sasha Fashion Clear Title Moqton Clear Begin 02:41:31 End 02:50:18 Length 00:08:47 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""31""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 31""
       - cell ""Artist Sasha Fashion Clear"":
         - text: Artist
         - textbox: Sasha Fashion
@@ -2762,14 +2391,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist NAASA Clear Title Poison Clear Begin 02:50:18 End 02:56:45 Length 00:06:27 Status"":
+    - row ""# 32 Artist NAASA Clear Title Poison Clear Begin 02:50:18 End 02:56:45 Length 00:06:27 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""32""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 32""
       - cell ""Artist NAASA Clear"":
         - text: Artist
         - textbox: NAASA
@@ -2792,14 +2417,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Nightlong Clear Begin 02:56:45 End 02:59:14 Length 00:02:29 Status"":
+    - row ""# 33 Artist Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Nightlong Clear Begin 02:56:45 End 02:59:14 Length 00:02:29 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""33""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 33""
       - cell ""Artist Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - text: Artist
         - textbox: Nopopstar, 2JOHN'S &amp; Eugene Jay
@@ -2822,14 +2443,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Skillz jay Clear Title Choir Clear Begin 02:59:14 End 03:05:49 Length 00:06:35 Status"":
+    - row ""# 34 Artist Skillz jay Clear Title Choir Clear Begin 02:59:14 End 03:05:49 Length 00:06:35 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""34""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 34""
       - cell ""Artist Skillz jay Clear"":
         - text: Artist
         - textbox: Skillz jay
@@ -2852,14 +2469,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Kovax Clear Title Controller Clear Begin 03:05:49 End 03:08:31 Length 00:02:42 Status"":
+    - row ""# 35 Artist Kovax Clear Title Controller Clear Begin 03:05:49 End 03:08:31 Length 00:02:42 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""35""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 35""
       - cell ""Artist Kovax Clear"":
         - text: Artist
         - textbox: Kovax
@@ -2882,14 +2495,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Mumboi Clear Title Just a Beat Clear Begin 03:08:31 End 03:15:18 Length 00:06:47 Status"":
+    - row ""# 36 Artist Mumboi Clear Title Just a Beat Clear Begin 03:08:31 End 03:15:18 Length 00:06:47 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""36""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 36""
       - cell ""Artist Mumboi Clear"":
         - text: Artist
         - textbox: Mumboi
@@ -2912,14 +2521,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Eclept Clear Title Sprut Clear Begin 03:15:18 End 03:20:35 Length 00:05:17 Status"":
+    - row ""# 37 Artist Eclept Clear Title Sprut Clear Begin 03:15:18 End 03:20:35 Length 00:05:17 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""37""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 37""
       - cell ""Artist Eclept Clear"":
         - text: Artist
         - textbox: Eclept
@@ -2942,14 +2547,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Rudensky Clear Title Dark Escort Clear Begin 03:20:35 End 03:25:02 Length 00:04:27 Status"":
+    - row ""# 38 Artist Rudensky Clear Title Dark Escort Clear Begin 03:20:35 End 03:25:02 Length 00:04:27 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""38""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 38""
       - cell ""Artist Rudensky Clear"":
         - text: Artist
         - textbox: Rudensky
@@ -2972,14 +2573,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Alexey Union, Kinky Sound &amp; KOCHETOV Clear Title Connected Clear Begin 03:25:02 End 03:32:30 Length 00:07:28 Status"":
+    - row ""# 39 Artist Alexey Union, Kinky Sound &amp; KOCHETOV Clear Title Connected Clear Begin 03:25:02 End 03:32:30 Length 00:07:28 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""39""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 39""
       - cell ""Artist Alexey Union, Kinky Sound &amp; KOCHETOV Clear"":
         - text: Artist
         - textbox: Alexey Union, Kinky Sound &amp; KOCHETOV
@@ -3002,14 +2599,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist ANMA (MD) Clear Title Space Yoda (Snyl Remix) Clear Begin 03:32:30 End 03:37:53 Length 00:05:23 Status"":
+    - row ""# 40 Artist ANMA (MD) Clear Title Space Yoda (Snyl Remix) Clear Begin 03:32:30 End 03:37:53 Length 00:05:23 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""40""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 40""
       - cell ""Artist ANMA (MD) Clear"":
         - text: Artist
         - textbox: ANMA (MD)
@@ -3032,14 +2625,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Inache Clear Title Andale (MONTA (TN) Remix) Clear Begin 03:37:53 End Length Status"":
+    - row ""# 41 Artist Inache Clear Title Andale (MONTA (TN) Remix) Clear Begin 03:37:53 End Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""41""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 41""
       - cell ""Artist Inache Clear"":
         - text: Artist
         - textbox: Inache
@@ -3074,15 +2663,12 @@ public async Task Open_ShouldImportProject_WhenUsingProjectfile()
             await Expect(detailView.CuesheetArtistInput).ToHaveValueAsync("Sample CD Artist");
             await Expect(detailView.CuesheetTitleInput).ToHaveValueAsync("Sample CD Title");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
+    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
         - textbox: Sample Artist 1
@@ -3103,14 +2689,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# Increment Decrement Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
+    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
         - textbox: Sample Artist 2
@@ -3133,14 +2715,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
+    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
         - textbox: Sample Artist 3
@@ -3163,14 +2741,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
+    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
         - textbox: Sample Artist 4
@@ -3193,14 +2767,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
+    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
         - textbox: Sample Artist 5
@@ -3223,14 +2793,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
+    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
         - textbox: Sample Artist 6
@@ -3253,14 +2819,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
+    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
         - textbox: Sample Artist 7
@@ -3283,14 +2845,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End Length Status"":
+    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
         - textbox: Sample Artist 8
@@ -3327,15 +2885,12 @@ public async Task Open_ShouldImportCuesheet_WhenUsingCuesheetfile()
             await Expect(detailView.CuesheetArtistInput).ToHaveValueAsync("Sample CD Artist");
             await Expect(detailView.CuesheetTitleInput).ToHaveValueAsync("Sample CD Title");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
+    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
         - textbox: Sample Artist 1
@@ -3356,14 +2911,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# Increment Decrement Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
+    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
         - textbox: Sample Artist 2
@@ -3386,14 +2937,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
+    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
         - textbox: Sample Artist 3
@@ -3416,14 +2963,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
+    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
         - textbox: Sample Artist 4
@@ -3446,14 +2989,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
+    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
         - textbox: Sample Artist 5
@@ -3476,14 +3015,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
+    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
         - textbox: Sample Artist 6
@@ -3506,14 +3041,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
+    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
         - textbox: Sample Artist 7
@@ -3536,14 +3067,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End Length Status"":
+    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
         - textbox: Sample Artist 8
@@ -3580,15 +3107,12 @@ public async Task Import_ShouldImportTracks_WhenUsingText()
             await importView.Analyze();
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
+    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
         - textbox: Sample Artist 1
@@ -3609,14 +3133,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# Increment Decrement Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
+    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
         - textbox: Sample Artist 2
@@ -3639,14 +3159,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
+    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
         - textbox: Sample Artist 3
@@ -3669,14 +3185,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
+    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
         - textbox: Sample Artist 4
@@ -3699,14 +3211,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
+    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
         - textbox: Sample Artist 5
@@ -3729,14 +3237,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
+    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
         - textbox: Sample Artist 6
@@ -3759,14 +3263,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
+    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
         - textbox: Sample Artist 7
@@ -3789,14 +3289,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
+    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
         - textbox: Sample Artist 8
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
index 45acbc0b..6d880e95 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
@@ -39,22 +39,40 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoAndRedoAreUsed()
             await bar.UndoAsync();
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row:
-      - cell");
+    - row ""# 1 Artist Title Begin 00:00:00 End Length Status"":
+      - cell:
+        - checkbox
+      - cell ""# 1""
+      - cell ""Artist"":
+        - text: Artist
+        - textbox
+        - button
+      - cell ""Title"":
+        - text: Title
+        - textbox
+        - button
+      - cell ""Begin 00:00:00"":
+        - text: Begin
+        - textbox: 00:00:00
+      - cell ""End"":
+        - text: End
+        - textbox
+      - cell ""Length"":
+        - text: Length
+        - textbox
+      - cell ""Status""");
             await Expect(bar.RedoButton).ToBeEnabledAsync();
             await bar.RedoAsync();
             await bar.RedoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Test Artist 1 Clear Title Test Title 1 Clear Begin 00:00:00 End Length Status"":
+    - row ""# 1 Artist Test Artist 1 Clear Title Test Title 1 Clear Begin 00:00:00 End Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Test Artist 1 Clear"":
         - text: Artist
         - textbox: Test Artist 1
@@ -77,15 +95,12 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status""");
             await detailView.EditTrackAsync("Mozart", "Eine kleine Nachtmusik");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Mozart Clear Title Eine kleine Nachtmusik Clear Begin 00:00:00 End Length Status"":
+    - row ""# 1 Artist Mozart Clear Title Eine kleine Nachtmusik Clear Begin 00:00:00 End Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Mozart Clear"":
         - text: Artist
         - textbox: Mozart
@@ -108,15 +123,12 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status""");
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Mozart Clear Title Test Title 1 Clear Begin 00:00:00 End Length Status"":
+    - row ""# 1 Artist Mozart Clear Title Test Title 1 Clear Begin 00:00:00 End Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Mozart Clear"":
         - text: Artist
         - textbox: Mozart
@@ -149,15 +161,12 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenModalEdit()
             await detailView.SelectTracksAsync([1]);
             await detailView.EditTracksModalAsync("Test Track Artist 1", "Test Track Title 1", "00:02:23", ["channel audio (4CH)", "Serial copy management system"]);
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Test Track Artist 1 Clear Title Test Track Title 1 Clear Begin 00:00:00 End 00:02:23 Length 00:02:23 Status"":
+    - row ""# 1 Artist Test Track Artist 1 Clear Title Test Track Title 1 Clear Begin 00:00:00 End 00:02:23 Length 00:02:23 Status"":
       - cell:
         - checkbox [checked]
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Test Track Artist 1 Clear"":
         - text: Artist
         - textbox: Test Track Artist 1
@@ -180,15 +189,12 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status""");
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Title Begin 00:00:00 End Length Status"":
+    - row ""# 1 Artist Title Begin 00:00:00 End Length Status"":
       - cell:
         - checkbox [checked]
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist"":
         - text: Artist
         - textbox
@@ -209,15 +215,12 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status""");
             await bar.RedoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Test Track Artist 1 Clear Title Test Track Title 1 Clear Begin 00:00:00 End 00:02:23 Length 00:02:23 Status"":
+    - row ""# 1 Artist Test Track Artist 1 Clear Title Test Track Title 1 Clear Begin 00:00:00 End 00:02:23 Length 00:02:23 Status"":
       - cell:
         - checkbox [checked]
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Test Track Artist 1 Clear"":
         - text: Artist
         - textbox: Test Track Artist 1
@@ -263,15 +266,12 @@ public async Task UndoRedo_ShouldRestoreCuesheet_WhenUsingImport()
             await Expect(importView.CuesheetTitleInput).ToHaveValueAsync("Rabbit Hole Mix");
             await Expect(importView.CatalogueNumberInput).ToHaveValueAsync("01 23456 78912 3");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
+  - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Adriatique Clear Title X. Clear Begin 00:00:00 End 00:05:24.2500000 Length 00:05:24.2500000 Status"":
+    - row ""# 1 Artist Adriatique Clear Title X. Clear Begin 00:00:00 End 00:05:24.2500000 Length 00:05:24.2500000 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist Adriatique Clear"":
         - text: Artist
         - textbox: Adriatique
@@ -292,14 +292,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:24.2500000
       - cell ""Status""
-    - row ""# Increment Decrement Artist Third Harmony Clear Title Fears And Dreams (Original Mix) Clear Begin 00:05:24.2500000 End 00:10:39 Length 00:05:14.7500000 Status"":
+    - row ""# 2 Artist Third Harmony Clear Title Fears And Dreams (Original Mix) Clear Begin 00:05:24.2500000 End 00:10:39 Length 00:05:14.7500000 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist Third Harmony Clear"":
         - text: Artist
         - textbox: Third Harmony
@@ -322,14 +318,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Dele Sosimi Afrobeat Orchestra Clear Title Too Much Information (Laolu Remix; Edit) Clear Begin 00:10:39 End 00:17:06 Length 00:06:27 Status"":
+    - row ""# 3 Artist Dele Sosimi Afrobeat Orchestra Clear Title Too Much Information (Laolu Remix; Edit) Clear Begin 00:10:39 End 00:17:06 Length 00:06:27 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""3""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 3""
       - cell ""Artist Dele Sosimi Afrobeat Orchestra Clear"":
         - text: Artist
         - textbox: Dele Sosimi Afrobeat Orchestra
@@ -352,14 +344,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Edem, Govan Clear Title Ankh (Onetwo MX Remix) Clear Begin 00:17:06 End 00:23:21 Length 00:06:15 Status"":
+    - row ""# 4 Artist Edem, Govan Clear Title Ankh (Onetwo MX Remix) Clear Begin 00:17:06 End 00:23:21 Length 00:06:15 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""4""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 4""
       - cell ""Artist Edem, Govan Clear"":
         - text: Artist
         - textbox: Edem, Govan
@@ -382,14 +370,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Jody Wisternoff Clear Title For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear Begin 00:23:21 End 00:29:02 Length 00:05:41 Status"":
+    - row ""# 5 Artist Jody Wisternoff Clear Title For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear Begin 00:23:21 End 00:29:02 Length 00:05:41 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""5""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 5""
       - cell ""Artist Jody Wisternoff Clear"":
         - text: Artist
         - textbox: Jody Wisternoff
@@ -412,14 +396,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Einmusik Clear Title Bead (Original Mix) Clear Begin 00:29:02 End 00:34:27 Length 00:05:25 Status"":
+    - row ""# 6 Artist Einmusik Clear Title Bead (Original Mix) Clear Begin 00:29:02 End 00:34:27 Length 00:05:25 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""6""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 6""
       - cell ""Artist Einmusik Clear"":
         - text: Artist
         - textbox: Einmusik
@@ -442,14 +422,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Sebastien Leger Clear Title La Danse du Scorpion Clear Begin 00:34:27 End 00:40:59 Length 00:06:32 Status"":
+    - row ""# 7 Artist Sebastien Leger Clear Title La Danse du Scorpion Clear Begin 00:34:27 End 00:40:59 Length 00:06:32 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""7""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 7""
       - cell ""Artist Sebastien Leger Clear"":
         - text: Artist
         - textbox: Sebastien Leger
@@ -472,14 +448,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Paul Thomas & Solid Stone Clear Title La Bombo (Solid Stone Remix) Clear Begin 00:40:59 End 00:46:19 Length 00:05:20 Status"":
+    - row ""# 8 Artist Paul Thomas & Solid Stone Clear Title La Bombo (Solid Stone Remix) Clear Begin 00:40:59 End 00:46:19 Length 00:05:20 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""8""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 8""
       - cell ""Artist Paul Thomas & Solid Stone Clear"":
         - text: Artist
         - textbox: Paul Thomas & Solid Stone
@@ -502,14 +474,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist GusGus Clear Title Crossfade (Maceo Plex Mix) Clear Begin 00:46:19 End 00:52:20 Length 00:06:01 Status"":
+    - row ""# 9 Artist GusGus Clear Title Crossfade (Maceo Plex Mix) Clear Begin 00:46:19 End 00:52:20 Length 00:06:01 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""9""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 9""
       - cell ""Artist GusGus Clear"":
         - text: Artist
         - textbox: GusGus
@@ -532,14 +500,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Klangkarussell Clear Title Time (Original Mix) Clear Begin 00:52:20 End 00:56:19 Length 00:03:59 Status"":
+    - row ""# 10 Artist Klangkarussell Clear Title Time (Original Mix) Clear Begin 00:52:20 End 00:56:19 Length 00:03:59 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""10""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 10""
       - cell ""Artist Klangkarussell Clear"":
         - text: Artist
         - textbox: Klangkarussell
@@ -562,14 +526,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Anysense & Un:said Clear Title Missing Path (Original Mix) Clear Begin 00:56:19 End 01:01:41 Length 00:05:22 Status"":
+    - row ""# 11 Artist Anysense & Un:said Clear Title Missing Path (Original Mix) Clear Begin 00:56:19 End 01:01:41 Length 00:05:22 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""11""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 11""
       - cell ""Artist Anysense & Un:said Clear"":
         - text: Artist
         - textbox: Anysense & Un:said
@@ -592,14 +552,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Space Food Clear Title Bombay Clear Begin 01:01:41 End 01:06:33 Length 00:04:52 Status"":
+    - row ""# 12 Artist Space Food Clear Title Bombay Clear Begin 01:01:41 End 01:06:33 Length 00:04:52 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""12""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 12""
       - cell ""Artist Space Food Clear"":
         - text: Artist
         - textbox: Space Food
@@ -622,14 +578,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist SHDW & Obscure Shape Clear Title Wächter der Nacht (Original Mix) Clear Begin 01:06:33 End 01:11:04 Length 00:04:31 Status"":
+    - row ""# 13 Artist SHDW & Obscure Shape Clear Title Wächter der Nacht (Original Mix) Clear Begin 01:06:33 End 01:11:04 Length 00:04:31 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""13""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 13""
       - cell ""Artist SHDW & Obscure Shape Clear"":
         - text: Artist
         - textbox: SHDW & Obscure Shape
@@ -652,14 +604,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist HOSH Clear Title Karma Clear Begin 01:11:04 End 01:15:28 Length 00:04:24 Status"":
+    - row ""# 14 Artist HOSH Clear Title Karma Clear Begin 01:11:04 End 01:15:28 Length 00:04:24 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""14""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 14""
       - cell ""Artist HOSH Clear"":
         - text: Artist
         - textbox: HOSH
@@ -682,14 +630,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Alexey Union Clear Title Olympia (Original Mix) Clear Begin 01:15:28 End 01:21:08 Length 00:05:40 Status"":
+    - row ""# 15 Artist Alexey Union Clear Title Olympia (Original Mix) Clear Begin 01:15:28 End 01:21:08 Length 00:05:40 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""15""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 15""
       - cell ""Artist Alexey Union Clear"":
         - text: Artist
         - textbox: Alexey Union
@@ -712,14 +656,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Paul Taylor Clear Title Afterglow Clear Begin 01:21:08 End 01:25:38 Length 00:04:30 Status"":
+    - row ""# 16 Artist Paul Taylor Clear Title Afterglow Clear Begin 01:21:08 End 01:25:38 Length 00:04:30 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""16""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 16""
       - cell ""Artist Paul Taylor Clear"":
         - text: Artist
         - textbox: Paul Taylor
@@ -742,14 +682,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Philter Clear Title Stranger Clear Begin 01:25:38 End 01:31:52 Length 00:06:14 Status"":
+    - row ""# 17 Artist Philter Clear Title Stranger Clear Begin 01:25:38 End 01:31:52 Length 00:06:14 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""17""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 17""
       - cell ""Artist Philter Clear"":
         - text: Artist
         - textbox: Philter
@@ -772,14 +708,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Skizologic Clear Title Hypersphere (Original Mix) Clear Begin 01:31:52 End 01:36:40 Length 00:04:48 Status"":
+    - row ""# 18 Artist Skizologic Clear Title Hypersphere (Original Mix) Clear Begin 01:31:52 End 01:36:40 Length 00:04:48 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""18""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 18""
       - cell ""Artist Skizologic Clear"":
         - text: Artist
         - textbox: Skizologic
@@ -802,14 +734,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Thomas Schumacher, Caitlin Clear Title All of You (Remix) Clear Begin 01:36:40 End 01:42:16 Length 00:05:36 Status"":
+    - row ""# 19 Artist Thomas Schumacher, Caitlin Clear Title All of You (Remix) Clear Begin 01:36:40 End 01:42:16 Length 00:05:36 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""19""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 19""
       - cell ""Artist Thomas Schumacher, Caitlin Clear"":
         - text: Artist
         - textbox: Thomas Schumacher, Caitlin
@@ -832,14 +760,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist A. Skomoroh Clear Title White Horse Conquest (Original Mix) Clear Begin 01:42:16 End 01:47:04 Length 00:04:48 Status"":
+    - row ""# 20 Artist A. Skomoroh Clear Title White Horse Conquest (Original Mix) Clear Begin 01:42:16 End 01:47:04 Length 00:04:48 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""20""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 20""
       - cell ""Artist A. Skomoroh Clear"":
         - text: Artist
         - textbox: A. Skomoroh
@@ -862,14 +786,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Patrik Berg Clear Title Bright (Original Mix) Clear Begin 01:47:04 End 01:52:37 Length 00:05:33 Status"":
+    - row ""# 21 Artist Patrik Berg Clear Title Bright (Original Mix) Clear Begin 01:47:04 End 01:52:37 Length 00:05:33 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""21""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 21""
       - cell ""Artist Patrik Berg Clear"":
         - text: Artist
         - textbox: Patrik Berg
@@ -892,14 +812,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Hidden Empire Clear Title Bengal Clear Begin 01:52:37 End 01:58:05 Length 00:05:28 Status"":
+    - row ""# 22 Artist Hidden Empire Clear Title Bengal Clear Begin 01:52:37 End 01:58:05 Length 00:05:28 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""22""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 22""
       - cell ""Artist Hidden Empire Clear"":
         - text: Artist
         - textbox: Hidden Empire
@@ -922,14 +838,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Mario Ochoa Clear Title Levitate Clear Begin 01:58:05 End 02:03:00 Length 00:04:55 Status"":
+    - row ""# 23 Artist Mario Ochoa Clear Title Levitate Clear Begin 01:58:05 End 02:03:00 Length 00:04:55 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""23""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 23""
       - cell ""Artist Mario Ochoa Clear"":
         - text: Artist
         - textbox: Mario Ochoa
@@ -952,14 +864,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Raul Facio Clear Title Eyes Wide Shut (Original Mix) Clear Begin 02:03:00 End 02:08:21 Length 00:05:21 Status"":
+    - row ""# 24 Artist Raul Facio Clear Title Eyes Wide Shut (Original Mix) Clear Begin 02:03:00 End 02:08:21 Length 00:05:21 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""24""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 24""
       - cell ""Artist Raul Facio Clear"":
         - text: Artist
         - textbox: Raul Facio
@@ -982,14 +890,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Soolver Clear Title Regular (Original Mix) Clear Begin 02:08:21 End 02:14:31 Length 00:06:10 Status"":
+    - row ""# 25 Artist Soolver Clear Title Regular (Original Mix) Clear Begin 02:08:21 End 02:14:31 Length 00:06:10 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""25""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 25""
       - cell ""Artist Soolver Clear"":
         - text: Artist
         - textbox: Soolver
@@ -1012,14 +916,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Weska Clear Title EQ64 (Original Mix) Clear Begin 02:14:31 End 02:18:35 Length 00:04:04 Status"":
+    - row ""# 26 Artist Weska Clear Title EQ64 (Original Mix) Clear Begin 02:14:31 End 02:18:35 Length 00:04:04 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""26""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 26""
       - cell ""Artist Weska Clear"":
         - text: Artist
         - textbox: Weska
@@ -1042,14 +942,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Tempo Giusto Clear Title The Fall (Extended Mix) Clear Begin 02:18:35 End 02:24:12 Length 00:05:37 Status"":
+    - row ""# 27 Artist Tempo Giusto Clear Title The Fall (Extended Mix) Clear Begin 02:18:35 End 02:24:12 Length 00:05:37 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""27""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 27""
       - cell ""Artist Tempo Giusto Clear"":
         - text: Artist
         - textbox: Tempo Giusto
@@ -1072,14 +968,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Vlind & Asteroid & Gary Leroy Clear Title Trinity (Extended Mix) Clear Begin 02:24:12 End 02:29:38 Length 00:05:26 Status"":
+    - row ""# 28 Artist Vlind & Asteroid & Gary Leroy Clear Title Trinity (Extended Mix) Clear Begin 02:24:12 End 02:29:38 Length 00:05:26 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""28""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 28""
       - cell ""Artist Vlind & Asteroid & Gary Leroy Clear"":
         - text: Artist
         - textbox: Vlind & Asteroid & Gary Leroy
@@ -1102,14 +994,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Astral Legacy Clear Title Vaveyla (Original Mix) Clear Begin 02:29:38 End 02:32:52 Length 00:03:14 Status"":
+    - row ""# 29 Artist Astral Legacy Clear Title Vaveyla (Original Mix) Clear Begin 02:29:38 End 02:32:52 Length 00:03:14 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""29""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 29""
       - cell ""Artist Astral Legacy Clear"":
         - text: Artist
         - textbox: Astral Legacy
@@ -1132,14 +1020,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Gerrox Clear Title Chakra (Original Mix) Clear Begin 02:32:52 End 02:37:00 Length 00:04:08 Status"":
+    - row ""# 30 Artist Gerrox Clear Title Chakra (Original Mix) Clear Begin 02:32:52 End 02:37:00 Length 00:04:08 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""30""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 30""
       - cell ""Artist Gerrox Clear"":
         - text: Artist
         - textbox: Gerrox
@@ -1162,14 +1046,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Charlotte De Witte Clear Title Pattern Clear Begin 02:37:00 End 02:41:55 Length 00:04:55 Status"":
+    - row ""# 31 Artist Charlotte De Witte Clear Title Pattern Clear Begin 02:37:00 End 02:41:55 Length 00:04:55 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""31""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 31""
       - cell ""Artist Charlotte De Witte Clear"":
         - text: Artist
         - textbox: Charlotte De Witte
@@ -1192,14 +1072,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Space Food Clear Title Amabey Clear Begin 02:41:55 End 02:46:55 Length 00:05:00 Status"":
+    - row ""# 32 Artist Space Food Clear Title Amabey Clear Begin 02:41:55 End 02:46:55 Length 00:05:00 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""32""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 32""
       - cell ""Artist Space Food Clear"":
         - text: Artist
         - textbox: Space Food
@@ -1222,14 +1098,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist ARTBAT Clear Title Papilion (Original Mix) Clear Begin 02:46:55 End 02:51:13 Length 00:04:18 Status"":
+    - row ""# 33 Artist ARTBAT Clear Title Papilion (Original Mix) Clear Begin 02:46:55 End 02:51:13 Length 00:04:18 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""33""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 33""
       - cell ""Artist ARTBAT Clear"":
         - text: Artist
         - textbox: ARTBAT
@@ -1252,14 +1124,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist PETER PAHN Clear Title Enjoy Infinity (Original Mix) Clear Begin 02:51:13 End 02:56:08 Length 00:04:55 Status"":
+    - row ""# 34 Artist PETER PAHN Clear Title Enjoy Infinity (Original Mix) Clear Begin 02:51:13 End 02:56:08 Length 00:04:55 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""34""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 34""
       - cell ""Artist PETER PAHN Clear"":
         - text: Artist
         - textbox: PETER PAHN
@@ -1282,14 +1150,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Solitek Clear Title Instinct (Original Mix) Clear Begin 02:56:08 End 03:00:57 Length 00:04:49 Status"":
+    - row ""# 35 Artist Solitek Clear Title Instinct (Original Mix) Clear Begin 02:56:08 End 03:00:57 Length 00:04:49 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""35""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 35""
       - cell ""Artist Solitek Clear"":
         - text: Artist
         - textbox: Solitek
@@ -1312,14 +1176,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Veerus Clear Title Heavy Clear Begin 03:00:57 End 03:05:19 Length 00:04:22 Status"":
+    - row ""# 36 Artist Veerus Clear Title Heavy Clear Begin 03:00:57 End 03:05:19 Length 00:04:22 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""36""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 36""
       - cell ""Artist Veerus Clear"":
         - text: Artist
         - textbox: Veerus
@@ -1342,14 +1202,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Secret Cinema & Reinier Zonneveld Clear Title Pain Thing (Original Mix) Clear Begin 03:05:19 End 03:09:38 Length 00:04:19 Status"":
+    - row ""# 37 Artist Secret Cinema & Reinier Zonneveld Clear Title Pain Thing (Original Mix) Clear Begin 03:05:19 End 03:09:38 Length 00:04:19 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""37""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 37""
       - cell ""Artist Secret Cinema & Reinier Zonneveld Clear"":
         - text: Artist
         - textbox: Secret Cinema & Reinier Zonneveld
@@ -1372,14 +1228,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Amelie Lens Clear Title Hypnotized Clear Begin 03:09:38 End 03:13:13 Length 00:03:35 Status"":
+    - row ""# 38 Artist Amelie Lens Clear Title Hypnotized Clear Begin 03:09:38 End 03:13:13 Length 00:03:35 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""38""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 38""
       - cell ""Artist Amelie Lens Clear"":
         - text: Artist
         - textbox: Amelie Lens
@@ -1402,14 +1254,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# Increment Decrement Artist Nikolay Kirov Clear Title Chasing the Sun (Original Mix) Clear Begin 03:13:13 End Length Status"":
+    - row ""# 39 Artist Nikolay Kirov Clear Title Chasing the Sun (Original Mix) Clear Begin 03:13:13 End Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""39""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 39""
       - cell ""Artist Nikolay Kirov Clear"":
         - text: Artist
         - textbox: Nikolay Kirov
@@ -1448,14 +1296,10 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoWithAudiofile()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Title Begin 00:00:00 End Length Status"":
+    - row ""# 1 Artist Title Begin 00:00:00 End Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist"":
         - text: Artist
         - textbox
@@ -1474,14 +1318,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox
       - cell ""Status""
-    - row ""# Increment Decrement Artist Title Begin End 00:05:48.0608330 Length Status"":
+    - row ""# 2 Artist Title Begin End 00:05:48.0608330 Length Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""2""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 2""
       - cell ""Artist"":
         - text: Artist
         - textbox
@@ -1508,14 +1348,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# Increment Decrement Artist Title Begin 00:00:00 End 00:05:48.0608330 Length 00:05:48.0608330 Status"":
+    - row ""# 1 Artist Title Begin 00:00:00 End 00:05:48.0608330 Length 00:05:48.0608330 Status"":
       - cell:
         - checkbox
-      - cell ""# Increment Decrement"":
-        - text: ""#""
-        - spinbutton: ""1""
-        - button ""Increment""
-        - button ""Decrement""
+      - cell ""# 1""
       - cell ""Artist"":
         - text: Artist
         - textbox

From 7b239934833921c14fe6b2e78de6bfc35edbdedc Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 11 May 2026 13:04:38 +0200
Subject: [PATCH 141/150] fix getting next linked track

---
 .../AudioCuesheet/TrackManagerTests.cs        | 28 +++++++++++++++++++
 .../Services/AudioCuesheet/TrackManager.cs    | 27 ++++++++----------
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
index f5af3322..f3fb1c6e 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/TrackManagerTests.cs
@@ -466,6 +466,34 @@ public void GetNextLinkedTrack_MultiplePositions_ReturnsTrack()
             Assert.AreEqual(track2, linkedTrack);
         }
 
+        [TestMethod]
+        public void GetNextLinkedTrack_WithPosition_ReturnsTrack()
+        {
+            // Arrange
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = new TimeSpan(0, 3, 12)
+            };
+            var track2 = new Track()
+            {
+                Begin = track1.End,
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Tracks = [track2, track1]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            // Act
+            var linkedTrack = _trackManager.GetNextLinkedTrack(track1);
+            // Assert
+            Assert.IsNotNull(linkedTrack);
+            Assert.AreEqual(track2, linkedTrack);
+        }
+
         [TestMethod]
         public void RecalculateLinkedTracksProperties_TrackHasNoBegin_SetsBegin()
         {
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
index fe5d8837..cbffeb9b 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/TrackManager.cs
@@ -106,28 +106,25 @@ public void CopyValues(ITrack source, Track target, bool setIsLinkedToPreviousTr
         /// <inheritdoc/>
         public Track? GetPreviousLinkedTrack(Track track)
         {
-            Track? previousLinkedTrack = null;
-            if (track.IsLinkedToPreviousTrack)
+            if (track.IsLinkedToPreviousTrack == false)
             {
-                if (track.Position.HasValue)
-                {
-                    previousLinkedTrack = track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
-                }
-                else
-                {
-                    if (track.Begin.HasValue)
-                    {
-                        previousLinkedTrack = track.Cuesheet?.Tracks.OrderBy(x => x.End).LastOrDefault(x => x.End <= track.Begin);
-                    }
-                }
+                return null;
             }
-            return previousLinkedTrack;
+            if (track.Position.HasValue && (track.Cuesheet?.Tracks.All(x => x.Position.HasValue) == true))
+            {
+                return track.Cuesheet?.Tracks.LastOrDefault(x => x.Position == track.Position - 1 && Equals(x, track) == false);
+            }
+            if (track.Begin.HasValue)
+            {
+                return track.Cuesheet?.Tracks.OrderBy(x => x.End).LastOrDefault(x => x.End <= track.Begin && Equals(x, track) == false);
+            }
+            return null;
         }
 
         /// <inheritdoc/>
         public Track? GetNextLinkedTrack(Track track)
         {
-            if (track.Position.HasValue)
+            if (track.Position.HasValue && (track.Cuesheet?.Tracks.All(x => x.Position.HasValue) == true))
             {
                 return track.Cuesheet?.Tracks.OrderBy(x => x.Begin).FirstOrDefault(x => x.Position >= track.Position.Value + 1 && x.IsLinkedToPreviousTrack == true && Equals(x, track) == false);
             }

From 6bb433b283dd6462aef346f2d83181f03f52dee0 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 11 May 2026 13:35:27 +0200
Subject: [PATCH 142/150] Update CuesheetManager.cs

---
 AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 837fb41b..6f45baa8 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -97,7 +97,6 @@ public void AddTrack(Track track)
             var cuesheet = _sessionStateContainer.GetActiveCuesheet();
             track.Cuesheet = cuesheet;
             // Calculate track properties
-            //TODO: Refactor this code (maybe use trackmanager)
             _traceChangeManager.BulkEdit = true;
             if (cuesheet?.IsRecording == true)
             {
@@ -124,7 +123,7 @@ public void AddTrack(Track track)
                 }
                 if (track.Begin.HasValue == false)
                 {
-                    track.Begin = lastTrack?.End;
+                    _trackManager.SetProperty(track, x => x.Begin, lastTrack?.End);
                 }
                 else
                 {

From b050b5b14ab3c97494bbe69a5bf7f0ccbc21784d Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 11 May 2026 13:48:43 +0200
Subject: [PATCH 143/150] update libraries

---
 .../AudioCuesheetEditor.End2EndTests.csproj      |  4 ++--
 .../AudioCuesheetEditor.Tests.csproj             |  4 ++--
 AudioCuesheetEditor/AudioCuesheetEditor.csproj   | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj b/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
index 85d73e01..27a01318 100644
--- a/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
+++ b/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.58.0" />
-    <PackageReference Include="MSTest" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.59.0" />
+    <PackageReference Include="MSTest" Version="4.2.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj b/AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj
index 0651db7f..79308649 100644
--- a/AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj
+++ b/AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj
@@ -12,11 +12,11 @@
 
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="coverlet.collector" Version="8.0.1">
+    <PackageReference Include="coverlet.collector" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MSTest" Version="4.1.0" />
+    <PackageReference Include="MSTest" Version="4.2.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
index 81c4b6bf..83374e95 100644
--- a/AudioCuesheetEditor/AudioCuesheetEditor.csproj
+++ b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -7,7 +7,7 @@
 	<ImplicitUsings>enable</ImplicitUsings>
 	<PackageProjectUrl>https://github.com/NeoCoderMatrix86/AudioCuesheetEditor</PackageProjectUrl>
 	<RazorLangVersion>Latest</RazorLangVersion>
-	<Version>12.0.0</Version>
+	<Version>12.1.0</Version>
 	<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 	<PublishTrimmed>true</PublishTrimmed>
 	<RunAOTCompilation>true</RunAOTCompilation>
@@ -22,15 +22,15 @@
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
     <PackageReference Include="MetaBrainz.MusicBrainz" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.7" PrivateAssets="all" />
     <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
     <PackageReference Include="Howler.Blazor" Version="0.10.0" />
-    <PackageReference Include="Markdig" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.5" />
-    <PackageReference Include="MudBlazor" Version="9.2.0" />
-    <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.2.0" />
+    <PackageReference Include="Markdig" Version="1.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.7" />
+    <PackageReference Include="MudBlazor" Version="9.4.0" />
+    <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.2.1" />
   </ItemGroup>
   
   <ItemGroup>

From 0b592fa5376ca26aa2ec43b884c492b3d43ae1e8 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 12 May 2026 15:06:31 +0200
Subject: [PATCH 144/150] Update run_tests.yml

---
 .github/workflows/run_tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 03c1fa8f..ea9d17e7 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -55,7 +55,8 @@ jobs:
       shell: bash
 
     - name: Run tests
-      run: dotnet test
+      # TODO run: dotnet test
+      run: dotnet test --filter "Name~Import_ShouldBeEditable_WhenEditingTrack"
 
     - name: Upload traces
       if: always()

From b8bc1d058ddb78ccdfade6a4598aab47e160b0a5 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 12 May 2026 15:52:18 +0200
Subject: [PATCH 145/150] Update run_tests.yml

---
 .github/workflows/run_tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index ea9d17e7..03c1fa8f 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -55,8 +55,7 @@ jobs:
       shell: bash
 
     - name: Run tests
-      # TODO run: dotnet test
-      run: dotnet test --filter "Name~Import_ShouldBeEditable_WhenEditingTrack"
+      run: dotnet test
 
     - name: Upload traces
       if: always()

From 000af485349618a9cbd2deeada0736efd07924f9 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 12 May 2026 16:15:03 +0200
Subject: [PATCH 146/150] Update AudioCuesheetEditor.End2EndTests.csproj

---
 .../AudioCuesheetEditor.End2EndTests.csproj                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj b/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
index 27a01318..85d73e01 100644
--- a/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
+++ b/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.59.0" />
-    <PackageReference Include="MSTest" Version="4.2.2" />
+    <PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.58.0" />
+    <PackageReference Include="MSTest" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

From 7f124327fe5a4fb9376ad6866a151e8d13595225 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 12 May 2026 16:24:57 +0200
Subject: [PATCH 147/150] update libraries

---
 .../AudioCuesheetEditor.End2EndTests.csproj                   | 4 ++--
 AudioCuesheetEditor/AudioCuesheetEditor.csproj                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj b/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
index 85d73e01..27a01318 100644
--- a/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
+++ b/AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.58.0" />
-    <PackageReference Include="MSTest" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.59.0" />
+    <PackageReference Include="MSTest" Version="4.2.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
index 83374e95..3aea3302 100644
--- a/AudioCuesheetEditor/AudioCuesheetEditor.csproj
+++ b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.7" PrivateAssets="all" />
     <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
     <PackageReference Include="Howler.Blazor" Version="0.10.0" />
-    <PackageReference Include="Markdig" Version="1.1.3" />
+    <PackageReference Include="Markdig" Version="1.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.7" />
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.7" />
     <PackageReference Include="MudBlazor" Version="9.4.0" />

From 8b2fbc524176be0f29012b60baa4bf4c4b481622 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Tue, 12 May 2026 16:55:51 +0200
Subject: [PATCH 148/150] fix end 2 end tests

---
 .../Tests/Desktop/ImportTest.cs               | 944 ++++++++++--------
 .../Tests/Desktop/TracingTest.cs              | 415 ++++----
 .../Tests/Smartphone/ImportTestSmartphone.cs  | 896 ++++++++++-------
 .../Tests/Smartphone/TracingTestSmartphone.cs | 355 ++++---
 4 files changed, 1486 insertions(+), 1124 deletions(-)

diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
index cb57d372..e5d9d58e 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs
@@ -32,9 +32,9 @@ public async Task Import_ShouldImportTracks_WhenUsingSampleInputfile()
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -43,9 +43,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
@@ -62,9 +63,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
@@ -82,9 +84,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
@@ -102,9 +105,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
@@ -122,9 +126,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
@@ -142,9 +147,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
@@ -162,9 +168,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
@@ -182,9 +189,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
@@ -221,9 +229,9 @@ public async Task Import_ShouldBeEditable_WhenEditingTrack()
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -232,9 +240,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
@@ -251,9 +260,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
@@ -271,9 +281,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
@@ -291,9 +302,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
@@ -311,9 +323,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""5 Sample Artist 5 Clear Sample Title Edited 5 Clear 00:20:13 00:24:54 00:04:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Sample Artist 5 Clear Sample Title Edited 5 Clear 00:20:13 00:24:54 00:04:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
@@ -331,9 +344,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
@@ -351,9 +365,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
@@ -371,9 +386,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
@@ -405,9 +421,9 @@ public async Task Import_ShouldImportTracks_WithSpecialTextfile()
             await importView.Analyze();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -415,9 +431,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""End""
       - columnheader ""Length""
   - rowgroup:
-    - row ""1 Adriatique Clear X. Clear 00:00:00 00:05:24 00:05:24"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Adriatique Clear X. Clear 00:00:00 00:05:24 00:05:24"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Adriatique Clear"":
         - textbox: Adriatique
@@ -433,9 +450,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:24
       - cell ""00:05:24"":
         - textbox: 00:05:24
-    - row ""2 Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24 00:10:39 00:05:15"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24 00:10:39 00:05:15"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell ""Third Harmony Clear"":
         - textbox: Third Harmony
@@ -451,9 +469,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:10:39
       - cell ""00:05:15"":
         - textbox: 00:05:15
-    - row ""3 Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Dele Sosimi Afrobeat Orchestra Clear"":
         - textbox: Dele Sosimi Afrobeat Orchestra
@@ -469,9 +488,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:17:06
       - cell ""00:06:27"":
         - textbox: 00:06:27
-    - row ""4 Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""Edem, Govan Clear"":
         - textbox: Edem, Govan
@@ -487,9 +507,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:23:21
       - cell ""00:06:15"":
         - textbox: 00:06:15
-    - row ""5 Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Jody Wisternoff Clear"":
         - textbox: Jody Wisternoff
@@ -505,9 +526,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:29:02
       - cell ""00:05:41"":
         - textbox: 00:05:41
-    - row ""6 Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Einmusik Clear"":
         - textbox: Einmusik
@@ -523,9 +545,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:34:27
       - cell ""00:05:25"":
         - textbox: 00:05:25
-    - row ""7 Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Sebastien Leger Clear"":
         - textbox: Sebastien Leger
@@ -541,9 +564,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:40:59
       - cell ""00:06:32"":
         - textbox: 00:06:32
-    - row ""8 Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Paul Thomas & Solid Stone Clear"":
         - textbox: Paul Thomas & Solid Stone
@@ -559,9 +583,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:46:19
       - cell ""00:05:20"":
         - textbox: 00:05:20
-    - row ""9 GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01"":
-      - cell:
-        - checkbox
+    - row ""Select row 9 GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""9""
       - cell ""GusGus Clear"":
         - textbox: GusGus
@@ -577,9 +602,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:52:20
       - cell ""00:06:01"":
         - textbox: 00:06:01
-    - row ""10 Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59"":
-      - cell:
-        - checkbox
+    - row ""Select row 10 Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""10""
       - cell ""Klangkarussell Clear"":
         - textbox: Klangkarussell
@@ -595,9 +621,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:56:19
       - cell ""00:03:59"":
         - textbox: 00:03:59
-    - row ""11 Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22"":
-      - cell:
-        - checkbox
+    - row ""Select row 11 Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""11""
       - cell ""Anysense & Un:said Clear"":
         - textbox: Anysense & Un:said
@@ -613,9 +640,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:01:41
       - cell ""00:05:22"":
         - textbox: 00:05:22
-    - row ""12 Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52"":
-      - cell:
-        - checkbox
+    - row ""Select row 12 Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""12""
       - cell ""Space Food Clear"":
         - textbox: Space Food
@@ -631,9 +659,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:06:33
       - cell ""00:04:52"":
         - textbox: 00:04:52
-    - row ""13 SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31"":
-      - cell:
-        - checkbox
+    - row ""Select row 13 SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""13""
       - cell ""SHDW & Obscure Shape Clear"":
         - textbox: SHDW & Obscure Shape
@@ -649,9 +678,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:11:04
       - cell ""00:04:31"":
         - textbox: 00:04:31
-    - row ""14 HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24"":
-      - cell:
-        - checkbox
+    - row ""Select row 14 HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""14""
       - cell ""HOSH Clear"":
         - textbox: HOSH
@@ -667,9 +697,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:15:28
       - cell ""00:04:24"":
         - textbox: 00:04:24
-    - row ""15 Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40"":
-      - cell:
-        - checkbox
+    - row ""Select row 15 Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""15""
       - cell ""Alexey Union Clear"":
         - textbox: Alexey Union
@@ -685,9 +716,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:21:08
       - cell ""00:05:40"":
         - textbox: 00:05:40
-    - row ""16 Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30"":
-      - cell:
-        - checkbox
+    - row ""Select row 16 Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""16""
       - cell ""Paul Taylor Clear"":
         - textbox: Paul Taylor
@@ -703,9 +735,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:25:38
       - cell ""00:04:30"":
         - textbox: 00:04:30
-    - row ""17 Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14"":
-      - cell:
-        - checkbox
+    - row ""Select row 17 Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""17""
       - cell ""Philter Clear"":
         - textbox: Philter
@@ -721,9 +754,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:31:52
       - cell ""00:06:14"":
         - textbox: 00:06:14
-    - row ""18 Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48"":
-      - cell:
-        - checkbox
+    - row ""Select row 18 Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""18""
       - cell ""Skizologic Clear"":
         - textbox: Skizologic
@@ -739,9 +773,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:36:40
       - cell ""00:04:48"":
         - textbox: 00:04:48
-    - row ""19 Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36"":
-      - cell:
-        - checkbox
+    - row ""Select row 19 Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""19""
       - cell ""Thomas Schumacher, Caitlin Clear"":
         - textbox: Thomas Schumacher, Caitlin
@@ -757,9 +792,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:42:16
       - cell ""00:05:36"":
         - textbox: 00:05:36
-    - row ""20 A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48"":
-      - cell:
-        - checkbox
+    - row ""Select row 20 A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""20""
       - cell ""A. Skomoroh Clear"":
         - textbox: A. Skomoroh
@@ -775,9 +811,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:47:04
       - cell ""00:04:48"":
         - textbox: 00:04:48
-    - row ""21 Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33"":
-      - cell:
-        - checkbox
+    - row ""Select row 21 Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""21""
       - cell ""Patrik Berg Clear"":
         - textbox: Patrik Berg
@@ -793,9 +830,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:52:37
       - cell ""00:05:33"":
         - textbox: 00:05:33
-    - row ""22 Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28"":
-      - cell:
-        - checkbox
+    - row ""Select row 22 Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""22""
       - cell ""Hidden Empire Clear"":
         - textbox: Hidden Empire
@@ -811,9 +849,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 01:58:05
       - cell ""00:05:28"":
         - textbox: 00:05:28
-    - row ""23 Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55"":
-      - cell:
-        - checkbox
+    - row ""Select row 23 Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""23""
       - cell ""Mario Ochoa Clear"":
         - textbox: Mario Ochoa
@@ -829,9 +868,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:03:00
       - cell ""00:04:55"":
         - textbox: 00:04:55
-    - row ""24 Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21"":
-      - cell:
-        - checkbox
+    - row ""Select row 24 Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""24""
       - cell ""Raul Facio Clear"":
         - textbox: Raul Facio
@@ -847,9 +887,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:08:21
       - cell ""00:05:21"":
         - textbox: 00:05:21
-    - row ""25 Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10"":
-      - cell:
-        - checkbox
+    - row ""Select row 25 Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""25""
       - cell ""Soolver Clear"":
         - textbox: Soolver
@@ -865,9 +906,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:14:31
       - cell ""00:06:10"":
         - textbox: 00:06:10
-    - row ""26 Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04"":
-      - cell:
-        - checkbox
+    - row ""Select row 26 Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""26""
       - cell ""Weska Clear"":
         - textbox: Weska
@@ -883,9 +925,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:18:35
       - cell ""00:04:04"":
         - textbox: 00:04:04
-    - row ""27 Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37"":
-      - cell:
-        - checkbox
+    - row ""Select row 27 Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""27""
       - cell ""Tempo Giusto Clear"":
         - textbox: Tempo Giusto
@@ -901,9 +944,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:24:12
       - cell ""00:05:37"":
         - textbox: 00:05:37
-    - row ""28 Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26"":
-      - cell:
-        - checkbox
+    - row ""Select row 28 Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""28""
       - cell ""Vlind & Asteroid & Gary Leroy Clear"":
         - textbox: Vlind & Asteroid & Gary Leroy
@@ -919,9 +963,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:29:38
       - cell ""00:05:26"":
         - textbox: 00:05:26
-    - row ""29 Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14"":
-      - cell:
-        - checkbox
+    - row ""Select row 29 Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""29""
       - cell ""Astral Legacy Clear"":
         - textbox: Astral Legacy
@@ -937,9 +982,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:32:52
       - cell ""00:03:14"":
         - textbox: 00:03:14
-    - row ""30 Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08"":
-      - cell:
-        - checkbox
+    - row ""Select row 30 Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""30""
       - cell ""Gerrox Clear"":
         - textbox: Gerrox
@@ -955,9 +1001,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:37:00
       - cell ""00:04:08"":
         - textbox: 00:04:08
-    - row ""31 Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55"":
-      - cell:
-        - checkbox
+    - row ""Select row 31 Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""31""
       - cell ""Charlotte De Witte Clear"":
         - textbox: Charlotte De Witte
@@ -973,9 +1020,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:41:55
       - cell ""00:04:55"":
         - textbox: 00:04:55
-    - row ""32 Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 32 Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""32""
       - cell ""Space Food Clear"":
         - textbox: Space Food
@@ -991,9 +1039,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:46:55
       - cell ""00:05:00"":
         - textbox: 00:05:00
-    - row ""33 ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18"":
-      - cell:
-        - checkbox
+    - row ""Select row 33 ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""33""
       - cell ""ARTBAT Clear"":
         - textbox: ARTBAT
@@ -1009,9 +1058,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:51:13
       - cell ""00:04:18"":
         - textbox: 00:04:18
-    - row ""34 PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55"":
-      - cell:
-        - checkbox
+    - row ""Select row 34 PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""34""
       - cell ""PETER PAHN Clear"":
         - textbox: PETER PAHN
@@ -1027,9 +1077,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 02:56:08
       - cell ""00:04:55"":
         - textbox: 00:04:55
-    - row ""35 Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49"":
-      - cell:
-        - checkbox
+    - row ""Select row 35 Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""35""
       - cell ""Solitek Clear"":
         - textbox: Solitek
@@ -1045,9 +1096,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 03:00:57
       - cell ""00:04:49"":
         - textbox: 00:04:49
-    - row ""36 Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22"":
-      - cell:
-        - checkbox
+    - row ""Select row 36 Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""36""
       - cell ""Veerus Clear"":
         - textbox: Veerus
@@ -1063,9 +1115,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 03:05:19
       - cell ""00:04:22"":
         - textbox: 00:04:22
-    - row ""37 Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 37 Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""37""
       - cell ""Secret Cinema & Reinier Zonneveld Clear"":
         - textbox: Secret Cinema & Reinier Zonneveld
@@ -1081,9 +1134,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 03:09:38
       - cell ""00:04:19"":
         - textbox: 00:04:19
-    - row ""38 Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35"":
-      - cell:
-        - checkbox
+    - row ""Select row 38 Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""38""
       - cell ""Amelie Lens Clear"":
         - textbox: Amelie Lens
@@ -1099,9 +1153,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 03:13:13
       - cell ""00:03:35"":
         - textbox: 00:03:35
-    - row ""39 Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13"":
-      - cell:
-        - checkbox
+    - row ""Select row 39 Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""39""
       - cell ""Nikolay Kirov Clear"":
         - textbox: Nikolay Kirov
@@ -1133,9 +1188,9 @@ public async Task Import_ShouldImportTracks_WhenUsingSampleInputfile2()
             await Expect(importView.CuesheetTitleInput).ToBeEmptyAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -1143,9 +1198,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""End""
       - columnheader ""Length""
   - rowgroup:
-    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
@@ -1161,9 +1217,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:00
       - cell ""00:05:00"":
         - textbox: 00:05:00
-    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
@@ -1179,9 +1236,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:09:23
       - cell ""00:04:23"":
         - textbox: 00:04:23
-    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
@@ -1197,9 +1255,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:15:54
       - cell ""00:06:31"":
         - textbox: 00:06:31
-    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
@@ -1215,9 +1274,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:20:13
       - cell ""00:04:19"":
         - textbox: 00:04:19
-    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
@@ -1233,9 +1293,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:24:54
       - cell ""00:04:41"":
         - textbox: 00:04:41
-    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
@@ -1251,9 +1312,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:31:54
       - cell ""00:07:00"":
         - textbox: 00:07:00
-    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
@@ -1269,9 +1331,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:45:54
       - cell ""00:14:00"":
         - textbox: 00:14:00
-    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
@@ -1302,9 +1365,9 @@ public async Task Import_ShouldImportTracks_WithTraktorOutput()
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -1313,9 +1376,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Nachap Clear Glass Clear 00:00:00 00:11:56 00:11:56"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Nachap Clear Glass Clear 00:00:00 00:11:56 00:11:56"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Nachap Clear"":
         - textbox: Nachap
@@ -1332,9 +1396,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:11:56"":
         - textbox: 00:11:56
       - cell
-    - row ""2 Progressive + Melodic DECK Clear 00:11:56 00:13:31 00:01:35"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Progressive + Melodic DECK Clear 00:11:56 00:13:31 00:01:35"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell:
         - textbox
@@ -1351,9 +1416,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:01:35
       - cell:
         - button
-    - row ""3 Nomer 21 Clear Depersonalization Clear 00:13:31 00:19:14 00:05:43"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Nomer 21 Clear Depersonalization Clear 00:13:31 00:19:14 00:05:43"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Nomer 21 Clear"":
         - textbox: Nomer 21
@@ -1371,9 +1437,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:43
       - cell:
         - button
-    - row ""4 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Showing Off Clear 00:19:14 00:24:02 00:04:48"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Showing Off Clear 00:19:14 00:24:02 00:04:48"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
@@ -1391,9 +1458,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:48
       - cell:
         - button
-    - row ""5 Carlo Whale Clear Unconscious Clear 00:24:02 00:29:37 00:05:35"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Carlo Whale Clear Unconscious Clear 00:24:02 00:29:37 00:05:35"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Carlo Whale Clear"":
         - textbox: Carlo Whale
@@ -1411,9 +1479,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:35
       - cell:
         - button
-    - row ""6 Arba Han Clear Timelaps Clear 00:29:37 00:33:13 00:03:36"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Arba Han Clear Timelaps Clear 00:29:37 00:33:13 00:03:36"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Arba Han Clear"":
         - textbox: Arba Han
@@ -1431,9 +1500,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:36
       - cell:
         - button
-    - row ""7 Savill Clear Energy Surrounds Clear 00:33:13 00:40:30 00:07:17"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Savill Clear Energy Surrounds Clear 00:33:13 00:40:30 00:07:17"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Savill Clear"":
         - textbox: Savill
@@ -1451,9 +1521,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:17
       - cell:
         - button
-    - row ""8 Teklix Clear The Tribal Code Clear 00:40:30 00:48:53 00:08:23"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Teklix Clear The Tribal Code Clear 00:40:30 00:48:53 00:08:23"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Teklix Clear"":
         - textbox: Teklix
@@ -1471,9 +1542,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:23
       - cell:
         - button
-    - row ""9 Neuralis Clear I'm Looking for Answers Clear 00:48:53 00:54:34 00:05:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 9 Neuralis Clear I'm Looking for Answers Clear 00:48:53 00:54:34 00:05:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""9""
       - cell ""Neuralis Clear"":
         - textbox: Neuralis
@@ -1491,9 +1563,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:41
       - cell:
         - button
-    - row ""10 Nopopstar &amp; Arsia Clear Dirty Moves Clear 00:54:34 01:00:24 00:05:50"":
-      - cell:
-        - checkbox
+    - row ""Select row 10 Nopopstar &amp; Arsia Clear Dirty Moves Clear 00:54:34 01:00:24 00:05:50"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""10""
       - cell ""Nopopstar &amp; Arsia Clear"":
         - textbox: Nopopstar &amp; Arsia
@@ -1511,9 +1584,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:50
       - cell:
         - button
-    - row ""11 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Lost (Maze 28 Remix) Clear 01:00:24 01:05:17 00:04:53"":
-      - cell:
-        - checkbox
+    - row ""Select row 11 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Lost (Maze 28 Remix) Clear 01:00:24 01:05:17 00:04:53"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""11""
       - cell ""SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
@@ -1531,9 +1605,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:53
       - cell:
         - button
-    - row ""12 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Lost (Redspace Remix) Clear 01:05:17 01:08:22 00:03:05"":
-      - cell:
-        - checkbox
+    - row ""Select row 12 SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Lost (Redspace Remix) Clear 01:05:17 01:08:22 00:03:05"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""12""
       - cell ""SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - textbox: SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay
@@ -1551,9 +1626,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:05
       - cell:
         - button
-    - row ""13 Gadoz Clear 5d Clear 01:08:22 01:16:34 00:08:12"":
-      - cell:
-        - checkbox
+    - row ""Select row 13 Gadoz Clear 5d Clear 01:08:22 01:16:34 00:08:12"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""13""
       - cell ""Gadoz Clear"":
         - textbox: Gadoz
@@ -1571,9 +1647,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:12
       - cell:
         - button
-    - row ""14 DJ Danzik Clear Out of Space Clear 01:16:34 01:19:22 00:02:48"":
-      - cell:
-        - checkbox
+    - row ""Select row 14 DJ Danzik Clear Out of Space Clear 01:16:34 01:19:22 00:02:48"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""14""
       - cell ""DJ Danzik Clear"":
         - textbox: DJ Danzik
@@ -1591,9 +1668,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:48
       - cell:
         - button
-    - row ""15 Enis Çoban Clear Internet Clear 01:19:22 01:25:14 00:05:52"":
-      - cell:
-        - checkbox
+    - row ""Select row 15 Enis Çoban Clear Internet Clear 01:19:22 01:25:14 00:05:52"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""15""
       - cell ""Enis Çoban Clear"":
         - textbox: Enis Çoban
@@ -1611,9 +1689,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:52
       - cell:
         - button
-    - row ""16 Cold Mind &amp; Alex Yikker Clear Rage Clear 01:25:14 01:31:33 00:06:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 16 Cold Mind &amp; Alex Yikker Clear Rage Clear 01:25:14 01:31:33 00:06:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""16""
       - cell ""Cold Mind &amp; Alex Yikker Clear"":
         - textbox: Cold Mind &amp; Alex Yikker
@@ -1631,9 +1710,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:19
       - cell:
         - button
-    - row ""17 Maze 28 Clear Sol (JAHAYA Remix) Clear 01:31:33 01:32:51 00:01:18"":
-      - cell:
-        - checkbox
+    - row ""Select row 17 Maze 28 Clear Sol (JAHAYA Remix) Clear 01:31:33 01:32:51 00:01:18"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""17""
       - cell ""Maze 28 Clear"":
         - textbox: Maze 28
@@ -1651,9 +1731,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:01:18
       - cell:
         - button
-    - row ""18 Alex Grafton Clear Hi Baby Clear 01:32:51 01:42:13 00:09:22"":
-      - cell:
-        - checkbox
+    - row ""Select row 18 Alex Grafton Clear Hi Baby Clear 01:32:51 01:42:13 00:09:22"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""18""
       - cell ""Alex Grafton Clear"":
         - textbox: Alex Grafton
@@ -1671,9 +1752,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:09:22
       - cell:
         - button
-    - row ""19 Che&amp;Mos &amp; Halo Far Clear Daddy Clear 01:42:13 01:45:22 00:03:09"":
-      - cell:
-        - checkbox
+    - row ""Select row 19 Che&amp;Mos &amp; Halo Far Clear Daddy Clear 01:42:13 01:45:22 00:03:09"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""19""
       - cell ""Che&amp;Mos &amp; Halo Far Clear"":
         - textbox: Che&amp;Mos &amp; Halo Far
@@ -1691,9 +1773,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:09
       - cell:
         - button
-    - row ""20 K KARDEN Clear Acid Rain Clear 01:45:22 01:48:40 00:03:18"":
-      - cell:
-        - checkbox
+    - row ""Select row 20 K KARDEN Clear Acid Rain Clear 01:45:22 01:48:40 00:03:18"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""20""
       - cell ""K KARDEN Clear"":
         - textbox: K KARDEN
@@ -1711,9 +1794,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:18
       - cell:
         - button
-    - row ""21 Dobrov &amp; Gar1sson Clear Analogic (Redspace Remix) Clear 01:48:40 01:56:40 00:08:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 21 Dobrov &amp; Gar1sson Clear Analogic (Redspace Remix) Clear 01:48:40 01:56:40 00:08:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""21""
       - cell ""Dobrov &amp; Gar1sson Clear"":
         - textbox: Dobrov &amp; Gar1sson
@@ -1731,9 +1815,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:00
       - cell:
         - button
-    - row ""22 Gazfluz Clear Vargan Clear 01:56:40 02:00:39 00:03:59"":
-      - cell:
-        - checkbox
+    - row ""Select row 22 Gazfluz Clear Vargan Clear 01:56:40 02:00:39 00:03:59"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""22""
       - cell ""Gazfluz Clear"":
         - textbox: Gazfluz
@@ -1751,9 +1836,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:59
       - cell:
         - button
-    - row ""23 SHKAPOV Clear Control Clear 02:00:39 02:06:47 00:06:08"":
-      - cell:
-        - checkbox
+    - row ""Select row 23 SHKAPOV Clear Control Clear 02:00:39 02:06:47 00:06:08"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""23""
       - cell ""SHKAPOV Clear"":
         - textbox: SHKAPOV
@@ -1771,9 +1857,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:08
       - cell:
         - button
-    - row ""24 QazaQ Clear On the Line Clear 02:06:47 02:09:09 00:02:22"":
-      - cell:
-        - checkbox
+    - row ""Select row 24 QazaQ Clear On the Line Clear 02:06:47 02:09:09 00:02:22"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""24""
       - cell ""QazaQ Clear"":
         - textbox: QazaQ
@@ -1791,9 +1878,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:22
       - cell:
         - button
-    - row ""25 Alex Schaufel Clear Elizabeth (Larsun Hesh Remix) Clear 02:09:09 02:14:18 00:05:09"":
-      - cell:
-        - checkbox
+    - row ""Select row 25 Alex Schaufel Clear Elizabeth (Larsun Hesh Remix) Clear 02:09:09 02:14:18 00:05:09"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""25""
       - cell ""Alex Schaufel Clear"":
         - textbox: Alex Schaufel
@@ -1811,9 +1899,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:09
       - cell:
         - button
-    - row ""26 Oiro Clear Just Business Clear 02:14:18 02:19:22 00:05:04"":
-      - cell:
-        - checkbox
+    - row ""Select row 26 Oiro Clear Just Business Clear 02:14:18 02:19:22 00:05:04"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""26""
       - cell ""Oiro Clear"":
         - textbox: Oiro
@@ -1831,9 +1920,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:04
       - cell:
         - button
-    - row ""27 Molex Clear Mind Split (Redspace Remix) Clear 02:19:22 02:27:48 00:08:26"":
-      - cell:
-        - checkbox
+    - row ""Select row 27 Molex Clear Mind Split (Redspace Remix) Clear 02:19:22 02:27:48 00:08:26"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""27""
       - cell ""Molex Clear"":
         - textbox: Molex
@@ -1851,9 +1941,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:26
       - cell:
         - button
-    - row ""28 SOLI Clear Give Me Your Mind Clear 02:27:48 02:33:48 00:06:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 28 SOLI Clear Give Me Your Mind Clear 02:27:48 02:33:48 00:06:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""28""
       - cell ""SOLI Clear"":
         - textbox: SOLI
@@ -1871,9 +1962,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:00
       - cell:
         - button
-    - row ""29 MANDU Clear Jacky Clear 02:33:48 02:39:05 00:05:17"":
-      - cell:
-        - checkbox
+    - row ""Select row 29 MANDU Clear Jacky Clear 02:33:48 02:39:05 00:05:17"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""29""
       - cell ""MANDU Clear"":
         - textbox: MANDU
@@ -1891,9 +1983,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:17
       - cell:
         - button
-    - row ""30 SOLI Clear Spacetoon Clear 02:39:05 02:41:31 00:02:26"":
-      - cell:
-        - checkbox
+    - row ""Select row 30 SOLI Clear Spacetoon Clear 02:39:05 02:41:31 00:02:26"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""30""
       - cell ""SOLI Clear"":
         - textbox: SOLI
@@ -1911,9 +2004,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:26
       - cell:
         - button
-    - row ""31 Sasha Fashion Clear Moqton Clear 02:41:31 02:50:18 00:08:47"":
-      - cell:
-        - checkbox
+    - row ""Select row 31 Sasha Fashion Clear Moqton Clear 02:41:31 02:50:18 00:08:47"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""31""
       - cell ""Sasha Fashion Clear"":
         - textbox: Sasha Fashion
@@ -1931,9 +2025,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:08:47
       - cell:
         - button
-    - row ""32 NAASA Clear Poison Clear 02:50:18 02:56:45 00:06:27"":
-      - cell:
-        - checkbox
+    - row ""Select row 32 NAASA Clear Poison Clear 02:50:18 02:56:45 00:06:27"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""32""
       - cell ""NAASA Clear"":
         - textbox: NAASA
@@ -1951,9 +2046,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:27
       - cell:
         - button
-    - row ""33 Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Nightlong Clear 02:56:45 02:59:14 00:02:29"":
-      - cell:
-        - checkbox
+    - row ""Select row 33 Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Nightlong Clear 02:56:45 02:59:14 00:02:29"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""33""
       - cell ""Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - textbox: Nopopstar, 2JOHN'S &amp; Eugene Jay
@@ -1971,9 +2067,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:29
       - cell:
         - button
-    - row ""34 Skillz jay Clear Choir Clear 02:59:14 03:05:49 00:06:35"":
-      - cell:
-        - checkbox
+    - row ""Select row 34 Skillz jay Clear Choir Clear 02:59:14 03:05:49 00:06:35"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""34""
       - cell ""Skillz jay Clear"":
         - textbox: Skillz jay
@@ -1991,9 +2088,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:35
       - cell:
         - button
-    - row ""35 Kovax Clear Controller Clear 03:05:49 03:08:31 00:02:42"":
-      - cell:
-        - checkbox
+    - row ""Select row 35 Kovax Clear Controller Clear 03:05:49 03:08:31 00:02:42"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""35""
       - cell ""Kovax Clear"":
         - textbox: Kovax
@@ -2011,9 +2109,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:02:42
       - cell:
         - button
-    - row ""36 Mumboi Clear Just a Beat Clear 03:08:31 03:15:18 00:06:47"":
-      - cell:
-        - checkbox
+    - row ""Select row 36 Mumboi Clear Just a Beat Clear 03:08:31 03:15:18 00:06:47"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""36""
       - cell ""Mumboi Clear"":
         - textbox: Mumboi
@@ -2031,9 +2130,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:47
       - cell:
         - button
-    - row ""37 Eclept Clear Sprut Clear 03:15:18 03:20:35 00:05:17"":
-      - cell:
-        - checkbox
+    - row ""Select row 37 Eclept Clear Sprut Clear 03:15:18 03:20:35 00:05:17"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""37""
       - cell ""Eclept Clear"":
         - textbox: Eclept
@@ -2051,9 +2151,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:17
       - cell:
         - button
-    - row ""38 Rudensky Clear Dark Escort Clear 03:20:35 03:25:02 00:04:27"":
-      - cell:
-        - checkbox
+    - row ""Select row 38 Rudensky Clear Dark Escort Clear 03:20:35 03:25:02 00:04:27"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""38""
       - cell ""Rudensky Clear"":
         - textbox: Rudensky
@@ -2071,9 +2172,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:27
       - cell:
         - button
-    - row ""39 Alexey Union, Kinky Sound &amp; KOCHETOV Clear Connected Clear 03:25:02 03:32:30 00:07:28"":
-      - cell:
-        - checkbox
+    - row ""Select row 39 Alexey Union, Kinky Sound &amp; KOCHETOV Clear Connected Clear 03:25:02 03:32:30 00:07:28"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""39""
       - cell ""Alexey Union, Kinky Sound &amp; KOCHETOV Clear"":
         - textbox: Alexey Union, Kinky Sound &amp; KOCHETOV
@@ -2091,9 +2193,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:28
       - cell:
         - button
-    - row ""40 ANMA (MD) Clear Space Yoda (Snyl Remix) Clear 03:32:30 03:37:53 00:05:23"":
-      - cell:
-        - checkbox
+    - row ""Select row 40 ANMA (MD) Clear Space Yoda (Snyl Remix) Clear 03:32:30 03:37:53 00:05:23"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""40""
       - cell ""ANMA (MD) Clear"":
         - textbox: ANMA (MD)
@@ -2111,9 +2214,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:23
       - cell:
         - button
-    - row ""41 Inache Clear Andale (MONTA (TN) Remix) Clear 03:37:53"":
-      - cell:
-        - checkbox
+    - row ""Select row 41 Inache Clear Andale (MONTA (TN) Remix) Clear 03:37:53"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""41""
       - cell ""Inache Clear"":
         - textbox: Inache
@@ -2146,9 +2250,9 @@ public async Task Open_ShouldImportProject_WhenUsingProjectfile()
             await Expect(detailView.CuesheetTitleInput).ToHaveValueAsync("Sample CD Title");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -2157,9 +2261,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
@@ -2176,9 +2281,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
@@ -2196,9 +2302,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
@@ -2216,9 +2323,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
@@ -2236,9 +2344,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
@@ -2256,9 +2365,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
@@ -2276,9 +2386,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
@@ -2296,9 +2407,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
@@ -2333,9 +2445,9 @@ public async Task Open_ShouldImportCuesheet_WhenUsingCuesheetfile()
             await Expect(detailView.CuesheetTitleInput).ToHaveValueAsync("Sample CD Title");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -2344,9 +2456,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
@@ -2363,9 +2476,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
@@ -2383,9 +2497,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
@@ -2403,9 +2518,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
@@ -2423,9 +2539,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
@@ -2443,9 +2560,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
@@ -2463,9 +2581,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
@@ -2483,9 +2602,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
@@ -2520,9 +2640,9 @@ public async Task Import_ShouldImportTracks_WhenUsingText()
             await importView.CompleteImportAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -2531,9 +2651,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Sample Artist 1 Clear Sample Title 1 Clear 00:00:00 00:05:00 00:05:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Sample Artist 1 Clear"":
         - textbox: Sample Artist 1
@@ -2550,9 +2671,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:00"":
         - textbox: 00:05:00
       - cell
-    - row ""2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Sample Artist 2 Clear Sample Title 2 Clear 00:05:00 00:09:23 00:04:23"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell ""Sample Artist 2 Clear"":
         - textbox: Sample Artist 2
@@ -2570,9 +2692,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:23
       - cell:
         - button
-    - row ""3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Sample Artist 3 Clear Sample Title 3 Clear 00:09:23 00:15:54 00:06:31"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Sample Artist 3 Clear"":
         - textbox: Sample Artist 3
@@ -2590,9 +2713,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:31
       - cell:
         - button
-    - row ""4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 Sample Artist 4 Clear Sample Title 4 Clear 00:15:54 00:20:13 00:04:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""Sample Artist 4 Clear"":
         - textbox: Sample Artist 4
@@ -2610,9 +2734,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Sample Artist 5 Clear Sample Title 5 Clear 00:20:13 00:24:54 00:04:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Sample Artist 5 Clear"":
         - textbox: Sample Artist 5
@@ -2630,9 +2755,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:41
       - cell:
         - button
-    - row ""6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Sample Artist 6 Clear Sample Title 6 Clear 00:24:54 00:31:54 00:07:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Sample Artist 6 Clear"":
         - textbox: Sample Artist 6
@@ -2650,9 +2776,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:07:00
       - cell:
         - button
-    - row ""7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Sample Artist 7 Clear Sample Title 7 Clear 00:31:54 00:45:54 00:14:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Sample Artist 7 Clear"":
         - textbox: Sample Artist 7
@@ -2670,9 +2797,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:14:00
       - cell:
         - button
-    - row ""8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Sample Artist 8 Clear Sample Title 8 Clear 00:45:54 01:15:54 00:30:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Sample Artist 8 Clear"":
         - textbox: Sample Artist 8
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
index 29c8ccc6..a6c48845 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs
@@ -38,9 +38,9 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoAndRedoAreUsed()
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -49,9 +49,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 00:00:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 00:00:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell:
         - textbox
@@ -73,9 +74,9 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await bar.RedoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -84,9 +85,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Test Artist 1 Clear Test Title 1 Clear 00:00:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Test Artist 1 Clear Test Title 1 Clear 00:00:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Test Artist 1 Clear"":
         - textbox: Test Artist 1
@@ -108,9 +110,9 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await detailView.EditTrackAsync("Mozart", "Eine kleine Nachtmusik");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -119,9 +121,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Mozart Clear Eine kleine Nachtmusik Clear 00:00:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Mozart Clear Eine kleine Nachtmusik Clear 00:00:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Mozart Clear"":
         - textbox: Mozart
@@ -143,9 +146,9 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -154,9 +157,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Mozart Clear Test Title 1 Clear 00:00:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Mozart Clear Test Title 1 Clear 00:00:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Mozart Clear"":
         - textbox: Mozart
@@ -188,9 +192,9 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenModalEdit()
             await detailView.EditTracksModalAsync("Test Track Artist 1", "Test Track Title 1", "00:02:23", ["channel audio (4CH)", "Serial copy management system"]);
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox [checked]
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows"" [checked]
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -199,9 +203,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"":
-      - cell:
-        - checkbox [checked]
+    - row ""Select row 1 Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"" [selected]:
+      - cell ""Select row"":
+        - checkbox ""Select row"" [checked]
+        - text: Select row
       - cell ""1""
       - cell ""Test Track Artist 1 Clear"":
         - textbox: Test Track Artist 1
@@ -223,9 +228,9 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await bar.UndoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox [checked]
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows"" [checked]
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -234,9 +239,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 00:00:00"":
-      - cell:
-        - checkbox [checked]
+    - row ""Select row 1 00:00:00 End has no value! Length has no value!"" [selected]:
+      - cell ""Select row"":
+        - checkbox ""Select row"" [checked]
+        - text: Select row
       - cell ""1""
       - cell:
         - textbox
@@ -246,19 +252,21 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - button
       - cell ""00:00:00"":
         - textbox: 00:00:00
-      - cell:
+      - cell ""End has no value!"":
         - textbox
-      - cell:
+        - text: End has no value!
+      - cell ""Length has no value!"":
         - textbox
+        - text: Length has no value!
       - cell
   - rowgroup:
     - row");
             await bar.RedoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox [checked]
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows"" [checked]
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -267,9 +275,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"":
-      - cell:
-        - checkbox [checked]
+    - row ""Select row 1 Test Track Artist 1 Clear Test Track Title 1 Clear 00:00:00 00:02:23 00:02:23"" [selected]:
+      - cell ""Select row"":
+        - checkbox ""Select row"" [checked]
+        - text: Select row
       - cell ""1""
       - cell ""Test Track Artist 1 Clear"":
         - textbox: Test Track Artist 1
@@ -314,9 +323,9 @@ public async Task UndoRedo_ShouldRestoreCuesheet_WhenUsingImport()
             await Expect(importView.CatalogueNumberInput).ToHaveValueAsync("01 23456 78912 3");
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -325,9 +334,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 Adriatique Clear X. Clear 00:00:00 00:05:24.2500000 00:05:24.2500000"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 Adriatique Clear X. Clear 00:00:00 00:05:24.2500000 00:05:24.2500000"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell ""Adriatique Clear"":
         - textbox: Adriatique
@@ -344,9 +354,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""00:05:24.2500000"":
         - textbox: 00:05:24.2500000
       - cell
-    - row ""2 Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24.2500000 00:10:39 00:05:14.7500000"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 Third Harmony Clear Fears And Dreams (Original Mix) Clear 00:05:24.2500000 00:10:39 00:05:14.7500000"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell ""Third Harmony Clear"":
         - textbox: Third Harmony
@@ -364,9 +375,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:14.7500000
       - cell:
         - button
-    - row ""3 Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27"":
-      - cell:
-        - checkbox
+    - row ""Select row 3 Dele Sosimi Afrobeat Orchestra Clear Too Much Information (Laolu Remix; Edit) Clear 00:10:39 00:17:06 00:06:27"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""3""
       - cell ""Dele Sosimi Afrobeat Orchestra Clear"":
         - textbox: Dele Sosimi Afrobeat Orchestra
@@ -384,9 +396,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:27
       - cell:
         - button
-    - row ""4 Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15"":
-      - cell:
-        - checkbox
+    - row ""Select row 4 Edem, Govan Clear Ankh (Onetwo MX Remix) Clear 00:17:06 00:23:21 00:06:15"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""4""
       - cell ""Edem, Govan Clear"":
         - textbox: Edem, Govan
@@ -404,9 +417,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:15
       - cell:
         - button
-    - row ""5 Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41"":
-      - cell:
-        - checkbox
+    - row ""Select row 5 Jody Wisternoff Clear For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear 00:23:21 00:29:02 00:05:41"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""5""
       - cell ""Jody Wisternoff Clear"":
         - textbox: Jody Wisternoff
@@ -424,9 +438,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:41
       - cell:
         - button
-    - row ""6 Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25"":
-      - cell:
-        - checkbox
+    - row ""Select row 6 Einmusik Clear Bead (Original Mix) Clear 00:29:02 00:34:27 00:05:25"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""6""
       - cell ""Einmusik Clear"":
         - textbox: Einmusik
@@ -444,9 +459,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:25
       - cell:
         - button
-    - row ""7 Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32"":
-      - cell:
-        - checkbox
+    - row ""Select row 7 Sebastien Leger Clear La Danse du Scorpion Clear 00:34:27 00:40:59 00:06:32"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""7""
       - cell ""Sebastien Leger Clear"":
         - textbox: Sebastien Leger
@@ -464,9 +480,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:32
       - cell:
         - button
-    - row ""8 Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20"":
-      - cell:
-        - checkbox
+    - row ""Select row 8 Paul Thomas & Solid Stone Clear La Bombo (Solid Stone Remix) Clear 00:40:59 00:46:19 00:05:20"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""8""
       - cell ""Paul Thomas & Solid Stone Clear"":
         - textbox: Paul Thomas & Solid Stone
@@ -484,9 +501,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:20
       - cell:
         - button
-    - row ""9 GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01"":
-      - cell:
-        - checkbox
+    - row ""Select row 9 GusGus Clear Crossfade (Maceo Plex Mix) Clear 00:46:19 00:52:20 00:06:01"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""9""
       - cell ""GusGus Clear"":
         - textbox: GusGus
@@ -504,9 +522,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:01
       - cell:
         - button
-    - row ""10 Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59"":
-      - cell:
-        - checkbox
+    - row ""Select row 10 Klangkarussell Clear Time (Original Mix) Clear 00:52:20 00:56:19 00:03:59"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""10""
       - cell ""Klangkarussell Clear"":
         - textbox: Klangkarussell
@@ -524,9 +543,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:59
       - cell:
         - button
-    - row ""11 Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22"":
-      - cell:
-        - checkbox
+    - row ""Select row 11 Anysense & Un:said Clear Missing Path (Original Mix) Clear 00:56:19 01:01:41 00:05:22"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""11""
       - cell ""Anysense & Un:said Clear"":
         - textbox: Anysense & Un:said
@@ -544,9 +564,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:22
       - cell:
         - button
-    - row ""12 Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52"":
-      - cell:
-        - checkbox
+    - row ""Select row 12 Space Food Clear Bombay Clear 01:01:41 01:06:33 00:04:52"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""12""
       - cell ""Space Food Clear"":
         - textbox: Space Food
@@ -564,9 +585,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:52
       - cell:
         - button
-    - row ""13 SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31"":
-      - cell:
-        - checkbox
+    - row ""Select row 13 SHDW & Obscure Shape Clear Wächter der Nacht (Original Mix) Clear 01:06:33 01:11:04 00:04:31"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""13""
       - cell ""SHDW & Obscure Shape Clear"":
         - textbox: SHDW & Obscure Shape
@@ -584,9 +606,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:31
       - cell:
         - button
-    - row ""14 HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24"":
-      - cell:
-        - checkbox
+    - row ""Select row 14 HOSH Clear Karma Clear 01:11:04 01:15:28 00:04:24"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""14""
       - cell ""HOSH Clear"":
         - textbox: HOSH
@@ -604,9 +627,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:24
       - cell:
         - button
-    - row ""15 Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40"":
-      - cell:
-        - checkbox
+    - row ""Select row 15 Alexey Union Clear Olympia (Original Mix) Clear 01:15:28 01:21:08 00:05:40"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""15""
       - cell ""Alexey Union Clear"":
         - textbox: Alexey Union
@@ -624,9 +648,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:40
       - cell:
         - button
-    - row ""16 Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30"":
-      - cell:
-        - checkbox
+    - row ""Select row 16 Paul Taylor Clear Afterglow Clear 01:21:08 01:25:38 00:04:30"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""16""
       - cell ""Paul Taylor Clear"":
         - textbox: Paul Taylor
@@ -644,9 +669,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:30
       - cell:
         - button
-    - row ""17 Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14"":
-      - cell:
-        - checkbox
+    - row ""Select row 17 Philter Clear Stranger Clear 01:25:38 01:31:52 00:06:14"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""17""
       - cell ""Philter Clear"":
         - textbox: Philter
@@ -664,9 +690,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:14
       - cell:
         - button
-    - row ""18 Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48"":
-      - cell:
-        - checkbox
+    - row ""Select row 18 Skizologic Clear Hypersphere (Original Mix) Clear 01:31:52 01:36:40 00:04:48"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""18""
       - cell ""Skizologic Clear"":
         - textbox: Skizologic
@@ -684,9 +711,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:48
       - cell:
         - button
-    - row ""19 Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36"":
-      - cell:
-        - checkbox
+    - row ""Select row 19 Thomas Schumacher, Caitlin Clear All of You (Remix) Clear 01:36:40 01:42:16 00:05:36"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""19""
       - cell ""Thomas Schumacher, Caitlin Clear"":
         - textbox: Thomas Schumacher, Caitlin
@@ -704,9 +732,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:36
       - cell:
         - button
-    - row ""20 A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48"":
-      - cell:
-        - checkbox
+    - row ""Select row 20 A. Skomoroh Clear White Horse Conquest (Original Mix) Clear 01:42:16 01:47:04 00:04:48"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""20""
       - cell ""A. Skomoroh Clear"":
         - textbox: A. Skomoroh
@@ -724,9 +753,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:48
       - cell:
         - button
-    - row ""21 Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33"":
-      - cell:
-        - checkbox
+    - row ""Select row 21 Patrik Berg Clear Bright (Original Mix) Clear 01:47:04 01:52:37 00:05:33"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""21""
       - cell ""Patrik Berg Clear"":
         - textbox: Patrik Berg
@@ -744,9 +774,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:33
       - cell:
         - button
-    - row ""22 Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28"":
-      - cell:
-        - checkbox
+    - row ""Select row 22 Hidden Empire Clear Bengal Clear 01:52:37 01:58:05 00:05:28"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""22""
       - cell ""Hidden Empire Clear"":
         - textbox: Hidden Empire
@@ -764,9 +795,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:28
       - cell:
         - button
-    - row ""23 Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55"":
-      - cell:
-        - checkbox
+    - row ""Select row 23 Mario Ochoa Clear Levitate Clear 01:58:05 02:03:00 00:04:55"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""23""
       - cell ""Mario Ochoa Clear"":
         - textbox: Mario Ochoa
@@ -784,9 +816,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:55
       - cell:
         - button
-    - row ""24 Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21"":
-      - cell:
-        - checkbox
+    - row ""Select row 24 Raul Facio Clear Eyes Wide Shut (Original Mix) Clear 02:03:00 02:08:21 00:05:21"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""24""
       - cell ""Raul Facio Clear"":
         - textbox: Raul Facio
@@ -804,9 +837,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:21
       - cell:
         - button
-    - row ""25 Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10"":
-      - cell:
-        - checkbox
+    - row ""Select row 25 Soolver Clear Regular (Original Mix) Clear 02:08:21 02:14:31 00:06:10"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""25""
       - cell ""Soolver Clear"":
         - textbox: Soolver
@@ -824,9 +858,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:06:10
       - cell:
         - button
-    - row ""26 Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04"":
-      - cell:
-        - checkbox
+    - row ""Select row 26 Weska Clear EQ64 (Original Mix) Clear 02:14:31 02:18:35 00:04:04"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""26""
       - cell ""Weska Clear"":
         - textbox: Weska
@@ -844,9 +879,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:04
       - cell:
         - button
-    - row ""27 Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37"":
-      - cell:
-        - checkbox
+    - row ""Select row 27 Tempo Giusto Clear The Fall (Extended Mix) Clear 02:18:35 02:24:12 00:05:37"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""27""
       - cell ""Tempo Giusto Clear"":
         - textbox: Tempo Giusto
@@ -864,9 +900,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:37
       - cell:
         - button
-    - row ""28 Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26"":
-      - cell:
-        - checkbox
+    - row ""Select row 28 Vlind & Asteroid & Gary Leroy Clear Trinity (Extended Mix) Clear 02:24:12 02:29:38 00:05:26"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""28""
       - cell ""Vlind & Asteroid & Gary Leroy Clear"":
         - textbox: Vlind & Asteroid & Gary Leroy
@@ -884,9 +921,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:26
       - cell:
         - button
-    - row ""29 Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14"":
-      - cell:
-        - checkbox
+    - row ""Select row 29 Astral Legacy Clear Vaveyla (Original Mix) Clear 02:29:38 02:32:52 00:03:14"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""29""
       - cell ""Astral Legacy Clear"":
         - textbox: Astral Legacy
@@ -904,9 +942,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:14
       - cell:
         - button
-    - row ""30 Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08"":
-      - cell:
-        - checkbox
+    - row ""Select row 30 Gerrox Clear Chakra (Original Mix) Clear 02:32:52 02:37:00 00:04:08"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""30""
       - cell ""Gerrox Clear"":
         - textbox: Gerrox
@@ -924,9 +963,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:08
       - cell:
         - button
-    - row ""31 Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55"":
-      - cell:
-        - checkbox
+    - row ""Select row 31 Charlotte De Witte Clear Pattern Clear 02:37:00 02:41:55 00:04:55"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""31""
       - cell ""Charlotte De Witte Clear"":
         - textbox: Charlotte De Witte
@@ -944,9 +984,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:55
       - cell:
         - button
-    - row ""32 Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 32 Space Food Clear Amabey Clear 02:41:55 02:46:55 00:05:00"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""32""
       - cell ""Space Food Clear"":
         - textbox: Space Food
@@ -964,9 +1005,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:05:00
       - cell:
         - button
-    - row ""33 ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18"":
-      - cell:
-        - checkbox
+    - row ""Select row 33 ARTBAT Clear Papilion (Original Mix) Clear 02:46:55 02:51:13 00:04:18"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""33""
       - cell ""ARTBAT Clear"":
         - textbox: ARTBAT
@@ -984,9 +1026,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:18
       - cell:
         - button
-    - row ""34 PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55"":
-      - cell:
-        - checkbox
+    - row ""Select row 34 PETER PAHN Clear Enjoy Infinity (Original Mix) Clear 02:51:13 02:56:08 00:04:55"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""34""
       - cell ""PETER PAHN Clear"":
         - textbox: PETER PAHN
@@ -1004,9 +1047,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:55
       - cell:
         - button
-    - row ""35 Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49"":
-      - cell:
-        - checkbox
+    - row ""Select row 35 Solitek Clear Instinct (Original Mix) Clear 02:56:08 03:00:57 00:04:49"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""35""
       - cell ""Solitek Clear"":
         - textbox: Solitek
@@ -1024,9 +1068,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:49
       - cell:
         - button
-    - row ""36 Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22"":
-      - cell:
-        - checkbox
+    - row ""Select row 36 Veerus Clear Heavy Clear 03:00:57 03:05:19 00:04:22"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""36""
       - cell ""Veerus Clear"":
         - textbox: Veerus
@@ -1044,9 +1089,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:22
       - cell:
         - button
-    - row ""37 Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19"":
-      - cell:
-        - checkbox
+    - row ""Select row 37 Secret Cinema & Reinier Zonneveld Clear Pain Thing (Original Mix) Clear 03:05:19 03:09:38 00:04:19"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""37""
       - cell ""Secret Cinema & Reinier Zonneveld Clear"":
         - textbox: Secret Cinema & Reinier Zonneveld
@@ -1064,9 +1110,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:04:19
       - cell:
         - button
-    - row ""38 Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35"":
-      - cell:
-        - checkbox
+    - row ""Select row 38 Amelie Lens Clear Hypnotized Clear 03:09:38 03:13:13 00:03:35"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""38""
       - cell ""Amelie Lens Clear"":
         - textbox: Amelie Lens
@@ -1084,9 +1131,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - textbox: 00:03:35
       - cell:
         - button
-    - row ""39 Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13"":
-      - cell:
-        - checkbox
+    - row ""Select row 39 Nikolay Kirov Clear Chasing the Sun (Original Mix) Clear 03:13:13"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""39""
       - cell ""Nikolay Kirov Clear"":
         - textbox: Nikolay Kirov
@@ -1121,9 +1169,9 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoWithAudiofile()
             await Expect(bar.RedoButton).ToBeDisabledAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -1132,9 +1180,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 00:00:00"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 00:00:00 End has no value! Length has no value!"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell:
         - textbox
@@ -1144,14 +1193,17 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - button
       - cell ""00:00:00"":
         - textbox: 00:00:00
-      - cell:
+      - cell ""End has no value!"":
         - textbox
-      - cell:
+        - text: End has no value!
+      - cell ""Length has no value!"":
         - textbox
+        - text: Length has no value!
       - cell
-    - row ""2 00:05:48.0608330"":
-      - cell:
-        - checkbox
+    - row ""Select row 2 00:05:48.0608330"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""2""
       - cell:
         - textbox
@@ -1174,9 +1226,9 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await Expect(bar.RedoButton).ToBeEnabledAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup:
-    - row ""# Artist Title Begin End Length Status"":
-      - columnheader:
-        - checkbox
+    - 'row ""Select all rows # Artist Title Begin End Length Status""':
+      - columnheader ""Select all rows"":
+        - checkbox ""Select all rows""
       - columnheader ""#""
       - columnheader ""Artist""
       - columnheader ""Title""
@@ -1185,9 +1237,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - columnheader ""Length""
       - columnheader ""Status""
   - rowgroup:
-    - row ""1 00:00:00 00:05:48.0608330 00:05:48.0608330"":
-      - cell:
-        - checkbox
+    - row ""Select row 1 00:00:00 00:05:48.0608330 00:05:48.0608330"":
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""1""
       - cell:
         - textbox
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTestSmartphone.cs b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTestSmartphone.cs
index 0784dc7b..129f49ad 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTestSmartphone.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ImportTestSmartphone.cs
@@ -35,9 +35,10 @@ public async Task Import_ShouldImportTracks_WhenUsingSampleInputfile()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
@@ -59,9 +60,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
@@ -85,9 +87,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
@@ -111,9 +114,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
@@ -137,9 +141,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
@@ -163,9 +168,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
@@ -189,9 +195,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
@@ -215,9 +222,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
@@ -259,9 +267,10 @@ public async Task Import_ShouldBeEditable_WhenEditingTrack()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
@@ -283,9 +292,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
@@ -309,9 +319,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
@@ -335,9 +346,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
@@ -361,9 +373,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title Edited 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Sample Artist 5 Clear Title Sample Title Edited 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
@@ -387,9 +400,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
@@ -413,9 +427,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
@@ -439,9 +454,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
@@ -478,9 +494,10 @@ public async Task Import_ShouldImportTracks_WithSpecialTextfile()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Adriatique Clear Title X. Clear Begin 00:00:00 End 00:05:24 Length 00:05:24"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Adriatique Clear Title X. Clear Begin 00:00:00 End 00:05:24 Length 00:05:24""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Adriatique Clear"":
         - text: Artist
@@ -501,9 +518,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:24"":
         - text: Length
         - textbox: 00:05:24
-    - row ""# 2 Artist Third Harmony Clear Title Fears And Dreams (Original Mix) Clear Begin 00:05:24 End 00:10:39 Length 00:05:15"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Third Harmony Clear Title Fears And Dreams (Original Mix) Clear Begin 00:05:24 End 00:10:39 Length 00:05:15""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist Third Harmony Clear"":
         - text: Artist
@@ -524,9 +542,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:15"":
         - text: Length
         - textbox: 00:05:15
-    - row ""# 3 Artist Dele Sosimi Afrobeat Orchestra Clear Title Too Much Information (Laolu Remix; Edit) Clear Begin 00:10:39 End 00:17:06 Length 00:06:27"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Dele Sosimi Afrobeat Orchestra Clear Title Too Much Information (Laolu Remix; Edit) Clear Begin 00:10:39 End 00:17:06 Length 00:06:27""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Dele Sosimi Afrobeat Orchestra Clear"":
         - text: Artist
@@ -547,9 +566,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:27"":
         - text: Length
         - textbox: 00:06:27
-    - row ""# 4 Artist Edem, Govan Clear Title Ankh (Onetwo MX Remix) Clear Begin 00:17:06 End 00:23:21 Length 00:06:15"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist Edem, Govan Clear Title Ankh (Onetwo MX Remix) Clear Begin 00:17:06 End 00:23:21 Length 00:06:15""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist Edem, Govan Clear"":
         - text: Artist
@@ -570,9 +590,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:15"":
         - text: Length
         - textbox: 00:06:15
-    - row ""# 5 Artist Jody Wisternoff Clear Title For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear Begin 00:23:21 End 00:29:02 Length 00:05:41"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Jody Wisternoff Clear Title For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear Begin 00:23:21 End 00:29:02 Length 00:05:41""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Jody Wisternoff Clear"":
         - text: Artist
@@ -593,9 +614,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:41"":
         - text: Length
         - textbox: 00:05:41
-    - row ""# 6 Artist Einmusik Clear Title Bead (Original Mix) Clear Begin 00:29:02 End 00:34:27 Length 00:05:25"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Einmusik Clear Title Bead (Original Mix) Clear Begin 00:29:02 End 00:34:27 Length 00:05:25""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Einmusik Clear"":
         - text: Artist
@@ -616,9 +638,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:25"":
         - text: Length
         - textbox: 00:05:25
-    - row ""# 7 Artist Sebastien Leger Clear Title La Danse du Scorpion Clear Begin 00:34:27 End 00:40:59 Length 00:06:32"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Sebastien Leger Clear Title La Danse du Scorpion Clear Begin 00:34:27 End 00:40:59 Length 00:06:32""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Sebastien Leger Clear"":
         - text: Artist
@@ -639,9 +662,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:32"":
         - text: Length
         - textbox: 00:06:32
-    - row ""# 8 Artist Paul Thomas & Solid Stone Clear Title La Bombo (Solid Stone Remix) Clear Begin 00:40:59 End 00:46:19 Length 00:05:20"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Paul Thomas & Solid Stone Clear Title La Bombo (Solid Stone Remix) Clear Begin 00:40:59 End 00:46:19 Length 00:05:20""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Paul Thomas & Solid Stone Clear"":
         - text: Artist
@@ -662,9 +686,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:20"":
         - text: Length
         - textbox: 00:05:20
-    - row ""# 9 Artist GusGus Clear Title Crossfade (Maceo Plex Mix) Clear Begin 00:46:19 End 00:52:20 Length 00:06:01"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 9 Artist GusGus Clear Title Crossfade (Maceo Plex Mix) Clear Begin 00:46:19 End 00:52:20 Length 00:06:01""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 9""
       - cell ""Artist GusGus Clear"":
         - text: Artist
@@ -685,9 +710,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:01"":
         - text: Length
         - textbox: 00:06:01
-    - row ""# 10 Artist Klangkarussell Clear Title Time (Original Mix) Clear Begin 00:52:20 End 00:56:19 Length 00:03:59"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 10 Artist Klangkarussell Clear Title Time (Original Mix) Clear Begin 00:52:20 End 00:56:19 Length 00:03:59""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 10""
       - cell ""Artist Klangkarussell Clear"":
         - text: Artist
@@ -708,9 +734,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:03:59"":
         - text: Length
         - textbox: 00:03:59
-    - row ""# 11 Artist Anysense & Un:said Clear Title Missing Path (Original Mix) Clear Begin 00:56:19 End 01:01:41 Length 00:05:22"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 11 Artist Anysense & Un:said Clear Title Missing Path (Original Mix) Clear Begin 00:56:19 End 01:01:41 Length 00:05:22""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 11""
       - cell ""Artist Anysense & Un:said Clear"":
         - text: Artist
@@ -731,9 +758,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:22"":
         - text: Length
         - textbox: 00:05:22
-    - row ""# 12 Artist Space Food Clear Title Bombay Clear Begin 01:01:41 End 01:06:33 Length 00:04:52"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 12 Artist Space Food Clear Title Bombay Clear Begin 01:01:41 End 01:06:33 Length 00:04:52""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 12""
       - cell ""Artist Space Food Clear"":
         - text: Artist
@@ -754,9 +782,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:52"":
         - text: Length
         - textbox: 00:04:52
-    - row ""# 13 Artist SHDW & Obscure Shape Clear Title Wächter der Nacht (Original Mix) Clear Begin 01:06:33 End 01:11:04 Length 00:04:31"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 13 Artist SHDW & Obscure Shape Clear Title Wächter der Nacht (Original Mix) Clear Begin 01:06:33 End 01:11:04 Length 00:04:31""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 13""
       - cell ""Artist SHDW & Obscure Shape Clear"":
         - text: Artist
@@ -777,9 +806,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:31"":
         - text: Length
         - textbox: 00:04:31
-    - row ""# 14 Artist HOSH Clear Title Karma Clear Begin 01:11:04 End 01:15:28 Length 00:04:24"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 14 Artist HOSH Clear Title Karma Clear Begin 01:11:04 End 01:15:28 Length 00:04:24""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 14""
       - cell ""Artist HOSH Clear"":
         - text: Artist
@@ -800,9 +830,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:24"":
         - text: Length
         - textbox: 00:04:24
-    - row ""# 15 Artist Alexey Union Clear Title Olympia (Original Mix) Clear Begin 01:15:28 End 01:21:08 Length 00:05:40"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 15 Artist Alexey Union Clear Title Olympia (Original Mix) Clear Begin 01:15:28 End 01:21:08 Length 00:05:40""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 15""
       - cell ""Artist Alexey Union Clear"":
         - text: Artist
@@ -823,9 +854,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:40"":
         - text: Length
         - textbox: 00:05:40
-    - row ""# 16 Artist Paul Taylor Clear Title Afterglow Clear Begin 01:21:08 End 01:25:38 Length 00:04:30"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 16 Artist Paul Taylor Clear Title Afterglow Clear Begin 01:21:08 End 01:25:38 Length 00:04:30""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 16""
       - cell ""Artist Paul Taylor Clear"":
         - text: Artist
@@ -846,9 +878,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:30"":
         - text: Length
         - textbox: 00:04:30
-    - row ""# 17 Artist Philter Clear Title Stranger Clear Begin 01:25:38 End 01:31:52 Length 00:06:14"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 17 Artist Philter Clear Title Stranger Clear Begin 01:25:38 End 01:31:52 Length 00:06:14""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 17""
       - cell ""Artist Philter Clear"":
         - text: Artist
@@ -869,9 +902,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:14"":
         - text: Length
         - textbox: 00:06:14
-    - row ""# 18 Artist Skizologic Clear Title Hypersphere (Original Mix) Clear Begin 01:31:52 End 01:36:40 Length 00:04:48"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 18 Artist Skizologic Clear Title Hypersphere (Original Mix) Clear Begin 01:31:52 End 01:36:40 Length 00:04:48""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 18""
       - cell ""Artist Skizologic Clear"":
         - text: Artist
@@ -892,9 +926,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:48"":
         - text: Length
         - textbox: 00:04:48
-    - row ""# 19 Artist Thomas Schumacher, Caitlin Clear Title All of You (Remix) Clear Begin 01:36:40 End 01:42:16 Length 00:05:36"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 19 Artist Thomas Schumacher, Caitlin Clear Title All of You (Remix) Clear Begin 01:36:40 End 01:42:16 Length 00:05:36""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 19""
       - cell ""Artist Thomas Schumacher, Caitlin Clear"":
         - text: Artist
@@ -915,9 +950,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:36"":
         - text: Length
         - textbox: 00:05:36
-    - row ""# 20 Artist A. Skomoroh Clear Title White Horse Conquest (Original Mix) Clear Begin 01:42:16 End 01:47:04 Length 00:04:48"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 20 Artist A. Skomoroh Clear Title White Horse Conquest (Original Mix) Clear Begin 01:42:16 End 01:47:04 Length 00:04:48""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 20""
       - cell ""Artist A. Skomoroh Clear"":
         - text: Artist
@@ -938,9 +974,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:48"":
         - text: Length
         - textbox: 00:04:48
-    - row ""# 21 Artist Patrik Berg Clear Title Bright (Original Mix) Clear Begin 01:47:04 End 01:52:37 Length 00:05:33"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 21 Artist Patrik Berg Clear Title Bright (Original Mix) Clear Begin 01:47:04 End 01:52:37 Length 00:05:33""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 21""
       - cell ""Artist Patrik Berg Clear"":
         - text: Artist
@@ -961,9 +998,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:33"":
         - text: Length
         - textbox: 00:05:33
-    - row ""# 22 Artist Hidden Empire Clear Title Bengal Clear Begin 01:52:37 End 01:58:05 Length 00:05:28"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 22 Artist Hidden Empire Clear Title Bengal Clear Begin 01:52:37 End 01:58:05 Length 00:05:28""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 22""
       - cell ""Artist Hidden Empire Clear"":
         - text: Artist
@@ -984,9 +1022,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:28"":
         - text: Length
         - textbox: 00:05:28
-    - row ""# 23 Artist Mario Ochoa Clear Title Levitate Clear Begin 01:58:05 End 02:03:00 Length 00:04:55"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 23 Artist Mario Ochoa Clear Title Levitate Clear Begin 01:58:05 End 02:03:00 Length 00:04:55""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 23""
       - cell ""Artist Mario Ochoa Clear"":
         - text: Artist
@@ -1007,9 +1046,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:55"":
         - text: Length
         - textbox: 00:04:55
-    - row ""# 24 Artist Raul Facio Clear Title Eyes Wide Shut (Original Mix) Clear Begin 02:03:00 End 02:08:21 Length 00:05:21"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 24 Artist Raul Facio Clear Title Eyes Wide Shut (Original Mix) Clear Begin 02:03:00 End 02:08:21 Length 00:05:21""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 24""
       - cell ""Artist Raul Facio Clear"":
         - text: Artist
@@ -1030,9 +1070,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:21"":
         - text: Length
         - textbox: 00:05:21
-    - row ""# 25 Artist Soolver Clear Title Regular (Original Mix) Clear Begin 02:08:21 End 02:14:31 Length 00:06:10"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 25 Artist Soolver Clear Title Regular (Original Mix) Clear Begin 02:08:21 End 02:14:31 Length 00:06:10""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 25""
       - cell ""Artist Soolver Clear"":
         - text: Artist
@@ -1053,9 +1094,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:10"":
         - text: Length
         - textbox: 00:06:10
-    - row ""# 26 Artist Weska Clear Title EQ64 (Original Mix) Clear Begin 02:14:31 End 02:18:35 Length 00:04:04"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 26 Artist Weska Clear Title EQ64 (Original Mix) Clear Begin 02:14:31 End 02:18:35 Length 00:04:04""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 26""
       - cell ""Artist Weska Clear"":
         - text: Artist
@@ -1076,9 +1118,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:04"":
         - text: Length
         - textbox: 00:04:04
-    - row ""# 27 Artist Tempo Giusto Clear Title The Fall (Extended Mix) Clear Begin 02:18:35 End 02:24:12 Length 00:05:37"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 27 Artist Tempo Giusto Clear Title The Fall (Extended Mix) Clear Begin 02:18:35 End 02:24:12 Length 00:05:37""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 27""
       - cell ""Artist Tempo Giusto Clear"":
         - text: Artist
@@ -1099,9 +1142,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:37"":
         - text: Length
         - textbox: 00:05:37
-    - row ""# 28 Artist Vlind & Asteroid & Gary Leroy Clear Title Trinity (Extended Mix) Clear Begin 02:24:12 End 02:29:38 Length 00:05:26"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 28 Artist Vlind & Asteroid & Gary Leroy Clear Title Trinity (Extended Mix) Clear Begin 02:24:12 End 02:29:38 Length 00:05:26""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 28""
       - cell ""Artist Vlind & Asteroid & Gary Leroy Clear"":
         - text: Artist
@@ -1122,9 +1166,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:26"":
         - text: Length
         - textbox: 00:05:26
-    - row ""# 29 Artist Astral Legacy Clear Title Vaveyla (Original Mix) Clear Begin 02:29:38 End 02:32:52 Length 00:03:14"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 29 Artist Astral Legacy Clear Title Vaveyla (Original Mix) Clear Begin 02:29:38 End 02:32:52 Length 00:03:14""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 29""
       - cell ""Artist Astral Legacy Clear"":
         - text: Artist
@@ -1145,9 +1190,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:03:14"":
         - text: Length
         - textbox: 00:03:14
-    - row ""# 30 Artist Gerrox Clear Title Chakra (Original Mix) Clear Begin 02:32:52 End 02:37:00 Length 00:04:08"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 30 Artist Gerrox Clear Title Chakra (Original Mix) Clear Begin 02:32:52 End 02:37:00 Length 00:04:08""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 30""
       - cell ""Artist Gerrox Clear"":
         - text: Artist
@@ -1168,9 +1214,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:08"":
         - text: Length
         - textbox: 00:04:08
-    - row ""# 31 Artist Charlotte De Witte Clear Title Pattern Clear Begin 02:37:00 End 02:41:55 Length 00:04:55"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 31 Artist Charlotte De Witte Clear Title Pattern Clear Begin 02:37:00 End 02:41:55 Length 00:04:55""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 31""
       - cell ""Artist Charlotte De Witte Clear"":
         - text: Artist
@@ -1191,9 +1238,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:55"":
         - text: Length
         - textbox: 00:04:55
-    - row ""# 32 Artist Space Food Clear Title Amabey Clear Begin 02:41:55 End 02:46:55 Length 00:05:00"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 32 Artist Space Food Clear Title Amabey Clear Begin 02:41:55 End 02:46:55 Length 00:05:00""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 32""
       - cell ""Artist Space Food Clear"":
         - text: Artist
@@ -1214,9 +1262,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:00"":
         - text: Length
         - textbox: 00:05:00
-    - row ""# 33 Artist ARTBAT Clear Title Papilion (Original Mix) Clear Begin 02:46:55 End 02:51:13 Length 00:04:18"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 33 Artist ARTBAT Clear Title Papilion (Original Mix) Clear Begin 02:46:55 End 02:51:13 Length 00:04:18""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 33""
       - cell ""Artist ARTBAT Clear"":
         - text: Artist
@@ -1237,9 +1286,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:18"":
         - text: Length
         - textbox: 00:04:18
-    - row ""# 34 Artist PETER PAHN Clear Title Enjoy Infinity (Original Mix) Clear Begin 02:51:13 End 02:56:08 Length 00:04:55"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 34 Artist PETER PAHN Clear Title Enjoy Infinity (Original Mix) Clear Begin 02:51:13 End 02:56:08 Length 00:04:55""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 34""
       - cell ""Artist PETER PAHN Clear"":
         - text: Artist
@@ -1260,9 +1310,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:55"":
         - text: Length
         - textbox: 00:04:55
-    - row ""# 35 Artist Solitek Clear Title Instinct (Original Mix) Clear Begin 02:56:08 End 03:00:57 Length 00:04:49"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 35 Artist Solitek Clear Title Instinct (Original Mix) Clear Begin 02:56:08 End 03:00:57 Length 00:04:49""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 35""
       - cell ""Artist Solitek Clear"":
         - text: Artist
@@ -1283,9 +1334,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:49"":
         - text: Length
         - textbox: 00:04:49
-    - row ""# 36 Artist Veerus Clear Title Heavy Clear Begin 03:00:57 End 03:05:19 Length 00:04:22"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 36 Artist Veerus Clear Title Heavy Clear Begin 03:00:57 End 03:05:19 Length 00:04:22""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 36""
       - cell ""Artist Veerus Clear"":
         - text: Artist
@@ -1306,9 +1358,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:22"":
         - text: Length
         - textbox: 00:04:22
-    - row ""# 37 Artist Secret Cinema & Reinier Zonneveld Clear Title Pain Thing (Original Mix) Clear Begin 03:05:19 End 03:09:38 Length 00:04:19"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 37 Artist Secret Cinema & Reinier Zonneveld Clear Title Pain Thing (Original Mix) Clear Begin 03:05:19 End 03:09:38 Length 00:04:19""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 37""
       - cell ""Artist Secret Cinema & Reinier Zonneveld Clear"":
         - text: Artist
@@ -1329,9 +1382,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:19"":
         - text: Length
         - textbox: 00:04:19
-    - row ""# 38 Artist Amelie Lens Clear Title Hypnotized Clear Begin 03:09:38 End 03:13:13 Length 00:03:35"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 38 Artist Amelie Lens Clear Title Hypnotized Clear Begin 03:09:38 End 03:13:13 Length 00:03:35""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 38""
       - cell ""Artist Amelie Lens Clear"":
         - text: Artist
@@ -1352,9 +1406,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:03:35"":
         - text: Length
         - textbox: 00:03:35
-    - row ""# 39 Artist Nikolay Kirov Clear Title Chasing the Sun (Original Mix) Clear Begin 03:13:13 End Length"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 39 Artist Nikolay Kirov Clear Title Chasing the Sun (Original Mix) Clear Begin 03:13:13 End Length""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 39""
       - cell ""Artist Nikolay Kirov Clear"":
         - text: Artist
@@ -1390,9 +1445,10 @@ public async Task Import_ShouldImportTracks_WhenUsingSampleInputfile2()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
@@ -1413,9 +1469,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:05:00"":
         - text: Length
         - textbox: 00:05:00
-    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
@@ -1436,9 +1493,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:23"":
         - text: Length
         - textbox: 00:04:23
-    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
@@ -1459,9 +1517,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:06:31"":
         - text: Length
         - textbox: 00:06:31
-    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
@@ -1482,9 +1541,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:19"":
         - text: Length
         - textbox: 00:04:19
-    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
@@ -1505,9 +1565,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:04:41"":
         - text: Length
         - textbox: 00:04:41
-    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
@@ -1528,9 +1589,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:07:00"":
         - text: Length
         - textbox: 00:07:00
-    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
@@ -1551,9 +1613,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Length 00:14:00"":
         - text: Length
         - textbox: 00:14:00
-    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
@@ -1588,9 +1651,10 @@ public async Task Import_ShouldImportTracks_WithTraktorOutput()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Nachap Clear Title Glass Clear Begin 00:00:00 End 00:11:56 Length 00:11:56 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Nachap Clear Title Glass Clear Begin 00:00:00 End 00:11:56 Length 00:11:56 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Nachap Clear"":
         - text: Artist
@@ -1612,9 +1676,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:11:56
       - cell ""Status""
-    - row ""# 2 Artist Title Progressive + Melodic DECK Clear Begin 00:11:56 End 00:13:31 Length 00:01:35 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Title Progressive + Melodic DECK Clear Begin 00:11:56 End 00:13:31 Length 00:01:35 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist"":
         - text: Artist
@@ -1637,9 +1702,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 3 Artist Nomer 21 Clear Title Depersonalization Clear Begin 00:13:31 End 00:19:14 Length 00:05:43 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Nomer 21 Clear Title Depersonalization Clear Begin 00:13:31 End 00:19:14 Length 00:05:43 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Nomer 21 Clear"":
         - text: Artist
@@ -1663,9 +1729,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 4 Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Showing Off Clear Begin 00:19:14 End 00:24:02 Length 00:04:48 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist SevenEver, Nopopstar, 2JOHN''S &amp; Eugene Jay Clear Title Showing Off Clear Begin 00:19:14 End 00:24:02 Length 00:04:48 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - text: Artist
@@ -1689,9 +1756,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 5 Artist Carlo Whale Clear Title Unconscious Clear Begin 00:24:02 End 00:29:37 Length 00:05:35 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Carlo Whale Clear Title Unconscious Clear Begin 00:24:02 End 00:29:37 Length 00:05:35 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Carlo Whale Clear"":
         - text: Artist
@@ -1715,9 +1783,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 6 Artist Arba Han Clear Title Timelaps Clear Begin 00:29:37 End 00:33:13 Length 00:03:36 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Arba Han Clear Title Timelaps Clear Begin 00:29:37 End 00:33:13 Length 00:03:36 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Arba Han Clear"":
         - text: Artist
@@ -1741,9 +1810,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 7 Artist Savill Clear Title Energy Surrounds Clear Begin 00:33:13 End 00:40:30 Length 00:07:17 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Savill Clear Title Energy Surrounds Clear Begin 00:33:13 End 00:40:30 Length 00:07:17 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Savill Clear"":
         - text: Artist
@@ -1767,9 +1837,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 8 Artist Teklix Clear Title The Tribal Code Clear Begin 00:40:30 End 00:48:53 Length 00:08:23 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Teklix Clear Title The Tribal Code Clear Begin 00:40:30 End 00:48:53 Length 00:08:23 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Teklix Clear"":
         - text: Artist
@@ -1793,9 +1864,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 9 Artist Neuralis Clear Title I'm Looking for Answers Clear Begin 00:48:53 End 00:54:34 Length 00:05:41 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 9 Artist Neuralis Clear Title I''m Looking for Answers Clear Begin 00:48:53 End 00:54:34 Length 00:05:41 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 9""
       - cell ""Artist Neuralis Clear"":
         - text: Artist
@@ -1819,9 +1891,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 10 Artist Nopopstar &amp; Arsia Clear Title Dirty Moves Clear Begin 00:54:34 End 01:00:24 Length 00:05:50 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 10 Artist Nopopstar &amp; Arsia Clear Title Dirty Moves Clear Begin 00:54:34 End 01:00:24 Length 00:05:50 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 10""
       - cell ""Artist Nopopstar &amp; Arsia Clear"":
         - text: Artist
@@ -1845,9 +1918,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 11 Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Lost (Maze 28 Remix) Clear Begin 01:00:24 End 01:05:17 Length 00:04:53 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 11 Artist SevenEver, Nopopstar, 2JOHN''S &amp; Eugene Jay Clear Title Lost (Maze 28 Remix) Clear Begin 01:00:24 End 01:05:17 Length 00:04:53 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 11""
       - cell ""Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - text: Artist
@@ -1871,9 +1945,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 12 Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Lost (Redspace Remix) Clear Begin 01:05:17 End 01:08:22 Length 00:03:05 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 12 Artist SevenEver, Nopopstar, 2JOHN''S &amp; Eugene Jay Clear Title Lost (Redspace Remix) Clear Begin 01:05:17 End 01:08:22 Length 00:03:05 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 12""
       - cell ""Artist SevenEver, Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - text: Artist
@@ -1897,9 +1972,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 13 Artist Gadoz Clear Title 5d Clear Begin 01:08:22 End 01:16:34 Length 00:08:12 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 13 Artist Gadoz Clear Title 5d Clear Begin 01:08:22 End 01:16:34 Length 00:08:12 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 13""
       - cell ""Artist Gadoz Clear"":
         - text: Artist
@@ -1923,9 +1999,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 14 Artist DJ Danzik Clear Title Out of Space Clear Begin 01:16:34 End 01:19:22 Length 00:02:48 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 14 Artist DJ Danzik Clear Title Out of Space Clear Begin 01:16:34 End 01:19:22 Length 00:02:48 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 14""
       - cell ""Artist DJ Danzik Clear"":
         - text: Artist
@@ -1949,9 +2026,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 15 Artist Enis Çoban Clear Title Internet Clear Begin 01:19:22 End 01:25:14 Length 00:05:52 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 15 Artist Enis Çoban Clear Title Internet Clear Begin 01:19:22 End 01:25:14 Length 00:05:52 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 15""
       - cell ""Artist Enis Çoban Clear"":
         - text: Artist
@@ -1975,9 +2053,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 16 Artist Cold Mind &amp; Alex Yikker Clear Title Rage Clear Begin 01:25:14 End 01:31:33 Length 00:06:19 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 16 Artist Cold Mind &amp; Alex Yikker Clear Title Rage Clear Begin 01:25:14 End 01:31:33 Length 00:06:19 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 16""
       - cell ""Artist Cold Mind &amp; Alex Yikker Clear"":
         - text: Artist
@@ -2001,9 +2080,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 17 Artist Maze 28 Clear Title Sol (JAHAYA Remix) Clear Begin 01:31:33 End 01:32:51 Length 00:01:18 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 17 Artist Maze 28 Clear Title Sol (JAHAYA Remix) Clear Begin 01:31:33 End 01:32:51 Length 00:01:18 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 17""
       - cell ""Artist Maze 28 Clear"":
         - text: Artist
@@ -2027,9 +2107,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 18 Artist Alex Grafton Clear Title Hi Baby Clear Begin 01:32:51 End 01:42:13 Length 00:09:22 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 18 Artist Alex Grafton Clear Title Hi Baby Clear Begin 01:32:51 End 01:42:13 Length 00:09:22 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 18""
       - cell ""Artist Alex Grafton Clear"":
         - text: Artist
@@ -2053,9 +2134,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 19 Artist Che&amp;Mos &amp; Halo Far Clear Title Daddy Clear Begin 01:42:13 End 01:45:22 Length 00:03:09 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 19 Artist Che&amp;Mos &amp; Halo Far Clear Title Daddy Clear Begin 01:42:13 End 01:45:22 Length 00:03:09 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 19""
       - cell ""Artist Che&amp;Mos &amp; Halo Far Clear"":
         - text: Artist
@@ -2079,9 +2161,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 20 Artist K KARDEN Clear Title Acid Rain Clear Begin 01:45:22 End 01:48:40 Length 00:03:18 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 20 Artist K KARDEN Clear Title Acid Rain Clear Begin 01:45:22 End 01:48:40 Length 00:03:18 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 20""
       - cell ""Artist K KARDEN Clear"":
         - text: Artist
@@ -2105,9 +2188,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 21 Artist Dobrov &amp; Gar1sson Clear Title Analogic (Redspace Remix) Clear Begin 01:48:40 End 01:56:40 Length 00:08:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 21 Artist Dobrov &amp; Gar1sson Clear Title Analogic (Redspace Remix) Clear Begin 01:48:40 End 01:56:40 Length 00:08:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 21""
       - cell ""Artist Dobrov &amp; Gar1sson Clear"":
         - text: Artist
@@ -2131,9 +2215,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 22 Artist Gazfluz Clear Title Vargan Clear Begin 01:56:40 End 02:00:39 Length 00:03:59 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 22 Artist Gazfluz Clear Title Vargan Clear Begin 01:56:40 End 02:00:39 Length 00:03:59 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 22""
       - cell ""Artist Gazfluz Clear"":
         - text: Artist
@@ -2157,9 +2242,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 23 Artist SHKAPOV Clear Title Control Clear Begin 02:00:39 End 02:06:47 Length 00:06:08 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 23 Artist SHKAPOV Clear Title Control Clear Begin 02:00:39 End 02:06:47 Length 00:06:08 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 23""
       - cell ""Artist SHKAPOV Clear"":
         - text: Artist
@@ -2183,9 +2269,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 24 Artist QazaQ Clear Title On the Line Clear Begin 02:06:47 End 02:09:09 Length 00:02:22 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 24 Artist QazaQ Clear Title On the Line Clear Begin 02:06:47 End 02:09:09 Length 00:02:22 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 24""
       - cell ""Artist QazaQ Clear"":
         - text: Artist
@@ -2209,9 +2296,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 25 Artist Alex Schaufel Clear Title Elizabeth (Larsun Hesh Remix) Clear Begin 02:09:09 End 02:14:18 Length 00:05:09 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 25 Artist Alex Schaufel Clear Title Elizabeth (Larsun Hesh Remix) Clear Begin 02:09:09 End 02:14:18 Length 00:05:09 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 25""
       - cell ""Artist Alex Schaufel Clear"":
         - text: Artist
@@ -2235,9 +2323,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 26 Artist Oiro Clear Title Just Business Clear Begin 02:14:18 End 02:19:22 Length 00:05:04 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 26 Artist Oiro Clear Title Just Business Clear Begin 02:14:18 End 02:19:22 Length 00:05:04 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 26""
       - cell ""Artist Oiro Clear"":
         - text: Artist
@@ -2261,9 +2350,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 27 Artist Molex Clear Title Mind Split (Redspace Remix) Clear Begin 02:19:22 End 02:27:48 Length 00:08:26 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 27 Artist Molex Clear Title Mind Split (Redspace Remix) Clear Begin 02:19:22 End 02:27:48 Length 00:08:26 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 27""
       - cell ""Artist Molex Clear"":
         - text: Artist
@@ -2287,9 +2377,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 28 Artist SOLI Clear Title Give Me Your Mind Clear Begin 02:27:48 End 02:33:48 Length 00:06:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 28 Artist SOLI Clear Title Give Me Your Mind Clear Begin 02:27:48 End 02:33:48 Length 00:06:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 28""
       - cell ""Artist SOLI Clear"":
         - text: Artist
@@ -2313,9 +2404,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 29 Artist MANDU Clear Title Jacky Clear Begin 02:33:48 End 02:39:05 Length 00:05:17 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 29 Artist MANDU Clear Title Jacky Clear Begin 02:33:48 End 02:39:05 Length 00:05:17 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 29""
       - cell ""Artist MANDU Clear"":
         - text: Artist
@@ -2339,9 +2431,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 30 Artist SOLI Clear Title Spacetoon Clear Begin 02:39:05 End 02:41:31 Length 00:02:26 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 30 Artist SOLI Clear Title Spacetoon Clear Begin 02:39:05 End 02:41:31 Length 00:02:26 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 30""
       - cell ""Artist SOLI Clear"":
         - text: Artist
@@ -2365,9 +2458,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 31 Artist Sasha Fashion Clear Title Moqton Clear Begin 02:41:31 End 02:50:18 Length 00:08:47 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 31 Artist Sasha Fashion Clear Title Moqton Clear Begin 02:41:31 End 02:50:18 Length 00:08:47 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 31""
       - cell ""Artist Sasha Fashion Clear"":
         - text: Artist
@@ -2391,9 +2485,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 32 Artist NAASA Clear Title Poison Clear Begin 02:50:18 End 02:56:45 Length 00:06:27 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 32 Artist NAASA Clear Title Poison Clear Begin 02:50:18 End 02:56:45 Length 00:06:27 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 32""
       - cell ""Artist NAASA Clear"":
         - text: Artist
@@ -2417,9 +2512,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 33 Artist Nopopstar, 2JOHN'S &amp; Eugene Jay Clear Title Nightlong Clear Begin 02:56:45 End 02:59:14 Length 00:02:29 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 33 Artist Nopopstar, 2JOHN''S &amp; Eugene Jay Clear Title Nightlong Clear Begin 02:56:45 End 02:59:14 Length 00:02:29 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 33""
       - cell ""Artist Nopopstar, 2JOHN'S &amp; Eugene Jay Clear"":
         - text: Artist
@@ -2443,9 +2539,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 34 Artist Skillz jay Clear Title Choir Clear Begin 02:59:14 End 03:05:49 Length 00:06:35 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 34 Artist Skillz jay Clear Title Choir Clear Begin 02:59:14 End 03:05:49 Length 00:06:35 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 34""
       - cell ""Artist Skillz jay Clear"":
         - text: Artist
@@ -2469,9 +2566,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 35 Artist Kovax Clear Title Controller Clear Begin 03:05:49 End 03:08:31 Length 00:02:42 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 35 Artist Kovax Clear Title Controller Clear Begin 03:05:49 End 03:08:31 Length 00:02:42 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 35""
       - cell ""Artist Kovax Clear"":
         - text: Artist
@@ -2495,9 +2593,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 36 Artist Mumboi Clear Title Just a Beat Clear Begin 03:08:31 End 03:15:18 Length 00:06:47 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 36 Artist Mumboi Clear Title Just a Beat Clear Begin 03:08:31 End 03:15:18 Length 00:06:47 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 36""
       - cell ""Artist Mumboi Clear"":
         - text: Artist
@@ -2521,9 +2620,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 37 Artist Eclept Clear Title Sprut Clear Begin 03:15:18 End 03:20:35 Length 00:05:17 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 37 Artist Eclept Clear Title Sprut Clear Begin 03:15:18 End 03:20:35 Length 00:05:17 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 37""
       - cell ""Artist Eclept Clear"":
         - text: Artist
@@ -2547,9 +2647,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 38 Artist Rudensky Clear Title Dark Escort Clear Begin 03:20:35 End 03:25:02 Length 00:04:27 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 38 Artist Rudensky Clear Title Dark Escort Clear Begin 03:20:35 End 03:25:02 Length 00:04:27 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 38""
       - cell ""Artist Rudensky Clear"":
         - text: Artist
@@ -2573,9 +2674,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 39 Artist Alexey Union, Kinky Sound &amp; KOCHETOV Clear Title Connected Clear Begin 03:25:02 End 03:32:30 Length 00:07:28 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 39 Artist Alexey Union, Kinky Sound &amp; KOCHETOV Clear Title Connected Clear Begin 03:25:02 End 03:32:30 Length 00:07:28 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 39""
       - cell ""Artist Alexey Union, Kinky Sound &amp; KOCHETOV Clear"":
         - text: Artist
@@ -2599,9 +2701,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 40 Artist ANMA (MD) Clear Title Space Yoda (Snyl Remix) Clear Begin 03:32:30 End 03:37:53 Length 00:05:23 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 40 Artist ANMA (MD) Clear Title Space Yoda (Snyl Remix) Clear Begin 03:32:30 End 03:37:53 Length 00:05:23 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 40""
       - cell ""Artist ANMA (MD) Clear"":
         - text: Artist
@@ -2625,9 +2728,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 41 Artist Inache Clear Title Andale (MONTA (TN) Remix) Clear Begin 03:37:53 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 41 Artist Inache Clear Title Andale (MONTA (TN) Remix) Clear Begin 03:37:53 End Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 41""
       - cell ""Artist Inache Clear"":
         - text: Artist
@@ -2665,9 +2769,10 @@ public async Task Open_ShouldImportProject_WhenUsingProjectfile()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
@@ -2689,9 +2794,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
@@ -2715,9 +2821,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
@@ -2741,9 +2848,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
@@ -2767,9 +2875,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
@@ -2793,9 +2902,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
@@ -2819,9 +2929,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
@@ -2845,9 +2956,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
@@ -2887,9 +2999,10 @@ public async Task Open_ShouldImportCuesheet_WhenUsingCuesheetfile()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
@@ -2911,9 +3024,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
@@ -2937,9 +3051,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
@@ -2963,9 +3078,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
@@ -2989,9 +3105,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
@@ -3015,9 +3132,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
@@ -3041,9 +3159,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
@@ -3067,9 +3186,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
@@ -3109,9 +3229,10 @@ public async Task Import_ShouldImportTracks_WhenUsingText()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Sample Artist 1 Clear Title Sample Title 1 Clear Begin 00:00:00 End 00:05:00 Length 00:05:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Sample Artist 1 Clear"":
         - text: Artist
@@ -3133,9 +3254,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:00
       - cell ""Status""
-    - row ""# 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Sample Artist 2 Clear Title Sample Title 2 Clear Begin 00:05:00 End 00:09:23 Length 00:04:23 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist Sample Artist 2 Clear"":
         - text: Artist
@@ -3159,9 +3281,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Sample Artist 3 Clear Title Sample Title 3 Clear Begin 00:09:23 End 00:15:54 Length 00:06:31 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Sample Artist 3 Clear"":
         - text: Artist
@@ -3185,9 +3308,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist Sample Artist 4 Clear Title Sample Title 4 Clear Begin 00:15:54 End 00:20:13 Length 00:04:19 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist Sample Artist 4 Clear"":
         - text: Artist
@@ -3211,9 +3335,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Sample Artist 5 Clear Title Sample Title 5 Clear Begin 00:20:13 End 00:24:54 Length 00:04:41 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Sample Artist 5 Clear"":
         - text: Artist
@@ -3237,9 +3362,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Sample Artist 6 Clear Title Sample Title 6 Clear Begin 00:24:54 End 00:31:54 Length 00:07:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Sample Artist 6 Clear"":
         - text: Artist
@@ -3263,9 +3389,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Sample Artist 7 Clear Title Sample Title 7 Clear Begin 00:31:54 End 00:45:54 Length 00:14:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Sample Artist 7 Clear"":
         - text: Artist
@@ -3289,9 +3416,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Sample Artist 8 Clear Title Sample Title 8 Clear Begin 00:45:54 End 01:15:54 Length 00:30:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Sample Artist 8 Clear"":
         - text: Artist
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
index 6d880e95..d5ac1b48 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/TracingTestSmartphone.cs
@@ -41,9 +41,10 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoAndRedoAreUsed()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Title Begin 00:00:00 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Title Begin 00:00:00 End Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist"":
         - text: Artist
@@ -69,9 +70,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Test Artist 1 Clear Title Test Title 1 Clear Begin 00:00:00 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Test Artist 1 Clear Title Test Title 1 Clear Begin 00:00:00 End Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Test Artist 1 Clear"":
         - text: Artist
@@ -97,9 +99,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Mozart Clear Title Eine kleine Nachtmusik Clear Begin 00:00:00 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Mozart Clear Title Eine kleine Nachtmusik Clear Begin 00:00:00 End Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Mozart Clear"":
         - text: Artist
@@ -125,9 +128,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Mozart Clear Title Test Title 1 Clear Begin 00:00:00 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Mozart Clear Title Test Title 1 Clear Begin 00:00:00 End Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Mozart Clear"":
         - text: Artist
@@ -163,9 +167,10 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenModalEdit()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Test Track Artist 1 Clear Title Test Track Title 1 Clear Begin 00:00:00 End 00:02:23 Length 00:02:23 Status"":
-      - cell:
-        - checkbox [checked]
+    - 'row ""Select row # 1 Artist Test Track Artist 1 Clear Title Test Track Title 1 Clear Begin 00:00:00 End 00:02:23 Length 00:02:23 Status"" [selected]':
+      - cell ""Select row"":
+        - checkbox ""Select row"" [checked]
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Test Track Artist 1 Clear"":
         - text: Artist
@@ -191,9 +196,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Title Begin 00:00:00 End Length Status"":
-      - cell:
-        - checkbox [checked]
+    - 'row ""Select row # 1 Artist Title Begin 00:00:00 End End has no value! Length Length has no value! Status"" [selected]':
+      - cell ""Select row"":
+        - checkbox ""Select row"" [checked]
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist"":
         - text: Artist
@@ -206,20 +212,23 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Begin 00:00:00"":
         - text: Begin
         - textbox: 00:00:00
-      - cell ""End"":
+      - cell ""End End has no value!"":
         - text: End
         - textbox
-      - cell ""Length"":
+        - text: End has no value!
+      - cell ""Length Length has no value!"":
         - text: Length
         - textbox
+        - text: Length has no value!
       - cell ""Status""");
             await bar.RedoAsync();
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Test Track Artist 1 Clear Title Test Track Title 1 Clear Begin 00:00:00 End 00:02:23 Length 00:02:23 Status"":
-      - cell:
-        - checkbox [checked]
+    - 'row ""Select row # 1 Artist Test Track Artist 1 Clear Title Test Track Title 1 Clear Begin 00:00:00 End 00:02:23 Length 00:02:23 Status"" [selected]':
+      - cell ""Select row"":
+        - checkbox ""Select row"" [checked]
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Test Track Artist 1 Clear"":
         - text: Artist
@@ -268,9 +277,10 @@ public async Task UndoRedo_ShouldRestoreCuesheet_WhenUsingImport()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Adriatique Clear Title X. Clear Begin 00:00:00 End 00:05:24.2500000 Length 00:05:24.2500000 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Adriatique Clear Title X. Clear Begin 00:00:00 End 00:05:24.2500000 Length 00:05:24.2500000 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist Adriatique Clear"":
         - text: Artist
@@ -292,9 +302,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
         - text: Length
         - textbox: 00:05:24.2500000
       - cell ""Status""
-    - row ""# 2 Artist Third Harmony Clear Title Fears And Dreams (Original Mix) Clear Begin 00:05:24.2500000 End 00:10:39 Length 00:05:14.7500000 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Third Harmony Clear Title Fears And Dreams (Original Mix) Clear Begin 00:05:24.2500000 End 00:10:39 Length 00:05:14.7500000 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist Third Harmony Clear"":
         - text: Artist
@@ -318,9 +329,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 3 Artist Dele Sosimi Afrobeat Orchestra Clear Title Too Much Information (Laolu Remix; Edit) Clear Begin 00:10:39 End 00:17:06 Length 00:06:27 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 3 Artist Dele Sosimi Afrobeat Orchestra Clear Title Too Much Information (Laolu Remix; Edit) Clear Begin 00:10:39 End 00:17:06 Length 00:06:27 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 3""
       - cell ""Artist Dele Sosimi Afrobeat Orchestra Clear"":
         - text: Artist
@@ -344,9 +356,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 4 Artist Edem, Govan Clear Title Ankh (Onetwo MX Remix) Clear Begin 00:17:06 End 00:23:21 Length 00:06:15 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 4 Artist Edem, Govan Clear Title Ankh (Onetwo MX Remix) Clear Begin 00:17:06 End 00:23:21 Length 00:06:15 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 4""
       - cell ""Artist Edem, Govan Clear"":
         - text: Artist
@@ -370,9 +383,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 5 Artist Jody Wisternoff Clear Title For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear Begin 00:23:21 End 00:29:02 Length 00:05:41 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 5 Artist Jody Wisternoff Clear Title For All Time (feat. Hendrik Burkhard) (Extended Mix) Clear Begin 00:23:21 End 00:29:02 Length 00:05:41 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 5""
       - cell ""Artist Jody Wisternoff Clear"":
         - text: Artist
@@ -396,9 +410,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 6 Artist Einmusik Clear Title Bead (Original Mix) Clear Begin 00:29:02 End 00:34:27 Length 00:05:25 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 6 Artist Einmusik Clear Title Bead (Original Mix) Clear Begin 00:29:02 End 00:34:27 Length 00:05:25 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 6""
       - cell ""Artist Einmusik Clear"":
         - text: Artist
@@ -422,9 +437,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 7 Artist Sebastien Leger Clear Title La Danse du Scorpion Clear Begin 00:34:27 End 00:40:59 Length 00:06:32 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 7 Artist Sebastien Leger Clear Title La Danse du Scorpion Clear Begin 00:34:27 End 00:40:59 Length 00:06:32 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 7""
       - cell ""Artist Sebastien Leger Clear"":
         - text: Artist
@@ -448,9 +464,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 8 Artist Paul Thomas & Solid Stone Clear Title La Bombo (Solid Stone Remix) Clear Begin 00:40:59 End 00:46:19 Length 00:05:20 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 8 Artist Paul Thomas & Solid Stone Clear Title La Bombo (Solid Stone Remix) Clear Begin 00:40:59 End 00:46:19 Length 00:05:20 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 8""
       - cell ""Artist Paul Thomas & Solid Stone Clear"":
         - text: Artist
@@ -474,9 +491,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 9 Artist GusGus Clear Title Crossfade (Maceo Plex Mix) Clear Begin 00:46:19 End 00:52:20 Length 00:06:01 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 9 Artist GusGus Clear Title Crossfade (Maceo Plex Mix) Clear Begin 00:46:19 End 00:52:20 Length 00:06:01 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 9""
       - cell ""Artist GusGus Clear"":
         - text: Artist
@@ -500,9 +518,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 10 Artist Klangkarussell Clear Title Time (Original Mix) Clear Begin 00:52:20 End 00:56:19 Length 00:03:59 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 10 Artist Klangkarussell Clear Title Time (Original Mix) Clear Begin 00:52:20 End 00:56:19 Length 00:03:59 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 10""
       - cell ""Artist Klangkarussell Clear"":
         - text: Artist
@@ -526,9 +545,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 11 Artist Anysense & Un:said Clear Title Missing Path (Original Mix) Clear Begin 00:56:19 End 01:01:41 Length 00:05:22 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 11 Artist Anysense & Un:said Clear Title Missing Path (Original Mix) Clear Begin 00:56:19 End 01:01:41 Length 00:05:22 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 11""
       - cell ""Artist Anysense & Un:said Clear"":
         - text: Artist
@@ -552,9 +572,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 12 Artist Space Food Clear Title Bombay Clear Begin 01:01:41 End 01:06:33 Length 00:04:52 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 12 Artist Space Food Clear Title Bombay Clear Begin 01:01:41 End 01:06:33 Length 00:04:52 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 12""
       - cell ""Artist Space Food Clear"":
         - text: Artist
@@ -578,9 +599,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 13 Artist SHDW & Obscure Shape Clear Title Wächter der Nacht (Original Mix) Clear Begin 01:06:33 End 01:11:04 Length 00:04:31 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 13 Artist SHDW & Obscure Shape Clear Title Wächter der Nacht (Original Mix) Clear Begin 01:06:33 End 01:11:04 Length 00:04:31 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 13""
       - cell ""Artist SHDW & Obscure Shape Clear"":
         - text: Artist
@@ -604,9 +626,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 14 Artist HOSH Clear Title Karma Clear Begin 01:11:04 End 01:15:28 Length 00:04:24 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 14 Artist HOSH Clear Title Karma Clear Begin 01:11:04 End 01:15:28 Length 00:04:24 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 14""
       - cell ""Artist HOSH Clear"":
         - text: Artist
@@ -630,9 +653,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 15 Artist Alexey Union Clear Title Olympia (Original Mix) Clear Begin 01:15:28 End 01:21:08 Length 00:05:40 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 15 Artist Alexey Union Clear Title Olympia (Original Mix) Clear Begin 01:15:28 End 01:21:08 Length 00:05:40 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 15""
       - cell ""Artist Alexey Union Clear"":
         - text: Artist
@@ -656,9 +680,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 16 Artist Paul Taylor Clear Title Afterglow Clear Begin 01:21:08 End 01:25:38 Length 00:04:30 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 16 Artist Paul Taylor Clear Title Afterglow Clear Begin 01:21:08 End 01:25:38 Length 00:04:30 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 16""
       - cell ""Artist Paul Taylor Clear"":
         - text: Artist
@@ -682,9 +707,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 17 Artist Philter Clear Title Stranger Clear Begin 01:25:38 End 01:31:52 Length 00:06:14 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 17 Artist Philter Clear Title Stranger Clear Begin 01:25:38 End 01:31:52 Length 00:06:14 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 17""
       - cell ""Artist Philter Clear"":
         - text: Artist
@@ -708,9 +734,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 18 Artist Skizologic Clear Title Hypersphere (Original Mix) Clear Begin 01:31:52 End 01:36:40 Length 00:04:48 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 18 Artist Skizologic Clear Title Hypersphere (Original Mix) Clear Begin 01:31:52 End 01:36:40 Length 00:04:48 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 18""
       - cell ""Artist Skizologic Clear"":
         - text: Artist
@@ -734,9 +761,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 19 Artist Thomas Schumacher, Caitlin Clear Title All of You (Remix) Clear Begin 01:36:40 End 01:42:16 Length 00:05:36 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 19 Artist Thomas Schumacher, Caitlin Clear Title All of You (Remix) Clear Begin 01:36:40 End 01:42:16 Length 00:05:36 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 19""
       - cell ""Artist Thomas Schumacher, Caitlin Clear"":
         - text: Artist
@@ -760,9 +788,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 20 Artist A. Skomoroh Clear Title White Horse Conquest (Original Mix) Clear Begin 01:42:16 End 01:47:04 Length 00:04:48 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 20 Artist A. Skomoroh Clear Title White Horse Conquest (Original Mix) Clear Begin 01:42:16 End 01:47:04 Length 00:04:48 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 20""
       - cell ""Artist A. Skomoroh Clear"":
         - text: Artist
@@ -786,9 +815,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 21 Artist Patrik Berg Clear Title Bright (Original Mix) Clear Begin 01:47:04 End 01:52:37 Length 00:05:33 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 21 Artist Patrik Berg Clear Title Bright (Original Mix) Clear Begin 01:47:04 End 01:52:37 Length 00:05:33 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 21""
       - cell ""Artist Patrik Berg Clear"":
         - text: Artist
@@ -812,9 +842,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 22 Artist Hidden Empire Clear Title Bengal Clear Begin 01:52:37 End 01:58:05 Length 00:05:28 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 22 Artist Hidden Empire Clear Title Bengal Clear Begin 01:52:37 End 01:58:05 Length 00:05:28 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 22""
       - cell ""Artist Hidden Empire Clear"":
         - text: Artist
@@ -838,9 +869,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 23 Artist Mario Ochoa Clear Title Levitate Clear Begin 01:58:05 End 02:03:00 Length 00:04:55 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 23 Artist Mario Ochoa Clear Title Levitate Clear Begin 01:58:05 End 02:03:00 Length 00:04:55 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 23""
       - cell ""Artist Mario Ochoa Clear"":
         - text: Artist
@@ -864,9 +896,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 24 Artist Raul Facio Clear Title Eyes Wide Shut (Original Mix) Clear Begin 02:03:00 End 02:08:21 Length 00:05:21 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 24 Artist Raul Facio Clear Title Eyes Wide Shut (Original Mix) Clear Begin 02:03:00 End 02:08:21 Length 00:05:21 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 24""
       - cell ""Artist Raul Facio Clear"":
         - text: Artist
@@ -890,9 +923,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 25 Artist Soolver Clear Title Regular (Original Mix) Clear Begin 02:08:21 End 02:14:31 Length 00:06:10 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 25 Artist Soolver Clear Title Regular (Original Mix) Clear Begin 02:08:21 End 02:14:31 Length 00:06:10 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 25""
       - cell ""Artist Soolver Clear"":
         - text: Artist
@@ -916,9 +950,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 26 Artist Weska Clear Title EQ64 (Original Mix) Clear Begin 02:14:31 End 02:18:35 Length 00:04:04 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 26 Artist Weska Clear Title EQ64 (Original Mix) Clear Begin 02:14:31 End 02:18:35 Length 00:04:04 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 26""
       - cell ""Artist Weska Clear"":
         - text: Artist
@@ -942,9 +977,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 27 Artist Tempo Giusto Clear Title The Fall (Extended Mix) Clear Begin 02:18:35 End 02:24:12 Length 00:05:37 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 27 Artist Tempo Giusto Clear Title The Fall (Extended Mix) Clear Begin 02:18:35 End 02:24:12 Length 00:05:37 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 27""
       - cell ""Artist Tempo Giusto Clear"":
         - text: Artist
@@ -968,9 +1004,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 28 Artist Vlind & Asteroid & Gary Leroy Clear Title Trinity (Extended Mix) Clear Begin 02:24:12 End 02:29:38 Length 00:05:26 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 28 Artist Vlind & Asteroid & Gary Leroy Clear Title Trinity (Extended Mix) Clear Begin 02:24:12 End 02:29:38 Length 00:05:26 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 28""
       - cell ""Artist Vlind & Asteroid & Gary Leroy Clear"":
         - text: Artist
@@ -994,9 +1031,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 29 Artist Astral Legacy Clear Title Vaveyla (Original Mix) Clear Begin 02:29:38 End 02:32:52 Length 00:03:14 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 29 Artist Astral Legacy Clear Title Vaveyla (Original Mix) Clear Begin 02:29:38 End 02:32:52 Length 00:03:14 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 29""
       - cell ""Artist Astral Legacy Clear"":
         - text: Artist
@@ -1020,9 +1058,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 30 Artist Gerrox Clear Title Chakra (Original Mix) Clear Begin 02:32:52 End 02:37:00 Length 00:04:08 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 30 Artist Gerrox Clear Title Chakra (Original Mix) Clear Begin 02:32:52 End 02:37:00 Length 00:04:08 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 30""
       - cell ""Artist Gerrox Clear"":
         - text: Artist
@@ -1046,9 +1085,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 31 Artist Charlotte De Witte Clear Title Pattern Clear Begin 02:37:00 End 02:41:55 Length 00:04:55 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 31 Artist Charlotte De Witte Clear Title Pattern Clear Begin 02:37:00 End 02:41:55 Length 00:04:55 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 31""
       - cell ""Artist Charlotte De Witte Clear"":
         - text: Artist
@@ -1072,9 +1112,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 32 Artist Space Food Clear Title Amabey Clear Begin 02:41:55 End 02:46:55 Length 00:05:00 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 32 Artist Space Food Clear Title Amabey Clear Begin 02:41:55 End 02:46:55 Length 00:05:00 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 32""
       - cell ""Artist Space Food Clear"":
         - text: Artist
@@ -1098,9 +1139,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 33 Artist ARTBAT Clear Title Papilion (Original Mix) Clear Begin 02:46:55 End 02:51:13 Length 00:04:18 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 33 Artist ARTBAT Clear Title Papilion (Original Mix) Clear Begin 02:46:55 End 02:51:13 Length 00:04:18 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 33""
       - cell ""Artist ARTBAT Clear"":
         - text: Artist
@@ -1124,9 +1166,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 34 Artist PETER PAHN Clear Title Enjoy Infinity (Original Mix) Clear Begin 02:51:13 End 02:56:08 Length 00:04:55 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 34 Artist PETER PAHN Clear Title Enjoy Infinity (Original Mix) Clear Begin 02:51:13 End 02:56:08 Length 00:04:55 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 34""
       - cell ""Artist PETER PAHN Clear"":
         - text: Artist
@@ -1150,9 +1193,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 35 Artist Solitek Clear Title Instinct (Original Mix) Clear Begin 02:56:08 End 03:00:57 Length 00:04:49 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 35 Artist Solitek Clear Title Instinct (Original Mix) Clear Begin 02:56:08 End 03:00:57 Length 00:04:49 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 35""
       - cell ""Artist Solitek Clear"":
         - text: Artist
@@ -1176,9 +1220,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 36 Artist Veerus Clear Title Heavy Clear Begin 03:00:57 End 03:05:19 Length 00:04:22 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 36 Artist Veerus Clear Title Heavy Clear Begin 03:00:57 End 03:05:19 Length 00:04:22 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 36""
       - cell ""Artist Veerus Clear"":
         - text: Artist
@@ -1202,9 +1247,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 37 Artist Secret Cinema & Reinier Zonneveld Clear Title Pain Thing (Original Mix) Clear Begin 03:05:19 End 03:09:38 Length 00:04:19 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 37 Artist Secret Cinema & Reinier Zonneveld Clear Title Pain Thing (Original Mix) Clear Begin 03:05:19 End 03:09:38 Length 00:04:19 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 37""
       - cell ""Artist Secret Cinema & Reinier Zonneveld Clear"":
         - text: Artist
@@ -1228,9 +1274,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 38 Artist Amelie Lens Clear Title Hypnotized Clear Begin 03:09:38 End 03:13:13 Length 00:03:35 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 38 Artist Amelie Lens Clear Title Hypnotized Clear Begin 03:09:38 End 03:13:13 Length 00:03:35 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 38""
       - cell ""Artist Amelie Lens Clear"":
         - text: Artist
@@ -1254,9 +1301,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Status"":
         - text: Status
         - button
-    - row ""# 39 Artist Nikolay Kirov Clear Title Chasing the Sun (Original Mix) Clear Begin 03:13:13 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 39 Artist Nikolay Kirov Clear Title Chasing the Sun (Original Mix) Clear Begin 03:13:13 End Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 39""
       - cell ""Artist Nikolay Kirov Clear"":
         - text: Artist
@@ -1296,9 +1344,10 @@ public async Task UndoRedo_ShouldRestoreTrackState_WhenUndoWithAudiofile()
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Title Begin 00:00:00 End Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Title Begin 00:00:00 End End has no value! Length Length has no value! Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist"":
         - text: Artist
@@ -1311,16 +1360,19 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
       - cell ""Begin 00:00:00"":
         - text: Begin
         - textbox: 00:00:00
-      - cell ""End"":
+      - cell ""End End has no value!"":
         - text: End
         - textbox
-      - cell ""Length"":
+        - text: End has no value!
+      - cell ""Length Length has no value!"":
         - text: Length
         - textbox
+        - text: Length has no value!
       - cell ""Status""
-    - row ""# 2 Artist Title Begin End 00:05:48.0608330 Length Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 2 Artist Title Begin End 00:05:48.0608330 Length Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 2""
       - cell ""Artist"":
         - text: Artist
@@ -1348,9 +1400,10 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
             await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- table:
   - rowgroup
   - rowgroup:
-    - row ""# 1 Artist Title Begin 00:00:00 End 00:05:48.0608330 Length 00:05:48.0608330 Status"":
-      - cell:
-        - checkbox
+    - 'row ""Select row # 1 Artist Title Begin 00:00:00 End 00:05:48.0608330 Length 00:05:48.0608330 Status""':
+      - cell ""Select row"":
+        - checkbox ""Select row""
+        - text: Select row
       - cell ""# 1""
       - cell ""Artist"":
         - text: Artist

From cea026770343bc60763017abc5bdc169859e934f Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Wed, 13 May 2026 08:46:13 +0200
Subject: [PATCH 149/150] fix end2end tests

---
 AudioCuesheetEditor.End2EndTests/Tests/Desktop/RecordTest.cs    | 2 +-
 .../Tests/Smartphone/RecordTestSmartphone.cs                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/RecordTest.cs b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/RecordTest.cs
index da4133d1..99e78b87 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Desktop/RecordTest.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Desktop/RecordTest.cs
@@ -39,7 +39,7 @@ public async Task Record_ShouldRecordTracks_WhenTracksAdded()
             await viewModes.SwitchView("Detail view");
             await detailView.SelectTracksAsync([1]);
             await detailView.EditSelectedTracksModalAsync();
-            await Expect(TestPage.GetByRole(AriaRole.Checkbox, new() { Name = "Link to previous track" })).ToBeCheckedAsync();
+            await Expect(TestPage.GetByRole(AriaRole.Switch, new() { Name = "Link to previous track" })).ToBeCheckedAsync();
         }
     }
 }
diff --git a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/RecordTestSmartphone.cs b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/RecordTestSmartphone.cs
index 66a61e4a..1174a2ce 100644
--- a/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/RecordTestSmartphone.cs
+++ b/AudioCuesheetEditor.End2EndTests/Tests/Smartphone/RecordTestSmartphone.cs
@@ -40,7 +40,7 @@ public async Task Record_ShouldRecordTracks_WhenTracksAdded()
             await viewModes.SwitchView("Detail view");
             await detailView.SelectTracksAsync([1]);
             await detailView.EditSelectedTracksModalAsync();
-            await Expect(TestPage.GetByRole(AriaRole.Checkbox, new() { Name = "Link to previous track" })).ToBeCheckedAsync();
+            await Expect(TestPage.GetByRole(AriaRole.Switch, new() { Name = "Link to previous track" })).ToBeCheckedAsync();
         }
     }
 }

From d8f6e73d2a5653969e38e861e4661f281419fad1 Mon Sep 17 00:00:00 2001
From: NeoCodeMatrix86 <40752681+NeoCoderMatrix86@users.noreply.github.com>
Date: Mon, 18 May 2026 15:10:10 +0200
Subject: [PATCH 150/150] Update ViewModeImport.de.resx

---
 AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx b/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx
index 11980259..03a8dac3 100644
--- a/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx
+++ b/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.de.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Analyze" xml:space="preserve">
-    <value>Analysiere</value>
+    <value>Analysieren</value>
   </data>
   <data name="Back" xml:space="preserve">
     <value>Zurück</value>