From e6b7da4c540a3c93ea99e325bd691b07338ab85e Mon Sep 17 00:00:00 2001
From: KaddaOK <kaddaokay@gmail.com>
Date: Sun, 3 Mar 2024 12:09:21 -0700
Subject: [PATCH 1/8] fix rzlrc import-export not removing lines

---
 KaddaOK.Library/RzlrcContentsGenerator.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/KaddaOK.Library/RzlrcContentsGenerator.cs b/KaddaOK.Library/RzlrcContentsGenerator.cs
index 56ae31d..2dc3265 100644
--- a/KaddaOK.Library/RzlrcContentsGenerator.cs
+++ b/KaddaOK.Library/RzlrcContentsGenerator.cs
@@ -183,6 +183,14 @@ public string InterpolateFileContents(List<RzlrcLyric>? originalFileContents,
             }
 
             // ok, everything is still wired up by ref
+            // need to remove any lines that have been deleted
+            var itemsThatExistedBefore = processedResults.Select(s => s.OriginalRzlrcItem).ToList();
+            var itemsThatNeedDeletion = selectedPage.item?.Where(i => !itemsThatExistedBefore.Contains(i));
+            if (itemsThatNeedDeletion.Any())
+            {
+                selectedPage.item = selectedPage.item.Where(i => !itemsThatNeedDeletion.Contains(i)).ToArray();
+            }
+
             foreach (var line in processedResults)
             {
                 LyricItem itemToSet;

From f712f4bbcf0d08a48478450874775411faad2b87 Mon Sep 17 00:00:00 2001
From: KaddaOK <kaddaokay@gmail.com>
Date: Sun, 3 Mar 2024 12:13:59 -0700
Subject: [PATCH 2/8] fixed open-export checkbox placement/enabling

---
 KaddaOK.AvaloniaApp/Views/ExportView.axaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KaddaOK.AvaloniaApp/Views/ExportView.axaml b/KaddaOK.AvaloniaApp/Views/ExportView.axaml
index e512db7..a8b7f6c 100644
--- a/KaddaOK.AvaloniaApp/Views/ExportView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/ExportView.axaml
@@ -536,9 +536,9 @@
                                         </Grid>
                                         
                                     </StackPanel>
-                                    <CheckBox Margin="0,30,0,0" Content="Open the exported result in YTMM" IsChecked="{Binding CurrentProcess.LaunchResult}" />
-                                </StackPanel>
 
+                                </StackPanel>
+                                <CheckBox Margin="0,30,0,0" Content="Open the exported result in YTMM" IsChecked="{Binding CurrentProcess.LaunchResult}" />
                             </StackPanel>
                             <Button
                                 Margin="0,20,0,0"

From 4af3e5c6d9f898f95200daaaba1bd0691e114792 Mon Sep 17 00:00:00 2001
From: KaddaOK <kaddaokay@gmail.com>
Date: Sun, 3 Mar 2024 12:15:42 -0700
Subject: [PATCH 3/8] more sensible defaults for progress bars

---
 KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs b/KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs
index f7d6dac..142358e 100644
--- a/KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs
+++ b/KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs
@@ -474,7 +474,7 @@ public bool InsertProgressBars
             set => SetProperty(ref insertProgressBars, value);
         }
 
-        private decimal progressBarGapLength = 10;
+        private decimal progressBarGapLength = 5;
         public decimal ProgressBarGapLength
         {
             get => progressBarGapLength;
@@ -495,7 +495,7 @@ public int ProgressBarHeight
             set => SetProperty(ref progressBarHeight, value);
         }
 
-        private int progressBarYPosition = 960;
+        private int progressBarYPosition = 540;
         public int ProgressBarYPosition
         {
             get => progressBarYPosition;

From 7d662f5f9f764d1cd9df8f4275d97546e88c9999 Mon Sep 17 00:00:00 2001
From: KaddaOK <kaddaokay@gmail.com>
Date: Sun, 3 Mar 2024 12:19:50 -0700
Subject: [PATCH 4/8] don't enter nothin, don't get nothin

---
 KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
index 4aaa423..f7abe28 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
@@ -615,7 +615,8 @@ private async Task AddNewLine(object? parameter)
                     }
 
                     // show a dialog to enter the words
-                    if (await DialogHost.Show(addingLine, "EditLinesViewDialogHost") is AddingLine newWords)
+                    if (await DialogHost.Show(addingLine, "EditLinesViewDialogHost") is AddingLine newWords
+                        && !string.IsNullOrWhiteSpace(newWords.EnteredText))
                     {
                         // create and add a new line
                         var newLine = new LyricLine

From 56695f542c89d13f7dd1d4669fd058d4f4d6c8f1 Mon Sep 17 00:00:00 2001
From: KaddaOK <kaddaokay@gmail.com>
Date: Sun, 3 Mar 2024 12:28:36 -0700
Subject: [PATCH 5/8] merge syllable with next/previous

---
 .../ViewModels/EditLinesViewModelTests.cs     | 10 +--
 KaddaOK.AvaloniaApp/App.axaml.cs              |  1 +
 KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs |  2 +-
 .../DesignTimeEditLinesViewModel.cs           |  2 +-
 .../ViewModels/EditLinesViewModel.cs          | 28 ++++++-
 KaddaOK.AvaloniaApp/Views/EditLinesView.axaml |  8 ++
 KaddaOK.Library.Tests/WordMergerTests.cs      | 77 +++++++++++++++++++
 KaddaOK.Library/WordMerger.cs                 | 57 ++++++++++++++
 8 files changed, 177 insertions(+), 8 deletions(-)
 create mode 100644 KaddaOK.Library.Tests/WordMergerTests.cs
 create mode 100644 KaddaOK.Library/WordMerger.cs

diff --git a/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs b/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
index 1cf1a79..0970b81 100644
--- a/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
+++ b/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
@@ -33,7 +33,7 @@ public void ShouldMergeLines()
             {
                 var currentProcess = GetNewCurrentProcess();
 
-                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new MinMaxFloatWaveStreamSampler());
+                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler());
 
                 viewModel.MoveLineToPrevious(currentProcess.ChosenLines!.Last());
 
@@ -47,7 +47,7 @@ public void ShouldAddSpaceToPreviousWordWhenMergingLines()
             {
                 var currentProcess = GetNewCurrentProcess();
 
-                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new MinMaxFloatWaveStreamSampler());
+                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler());
 
                 viewModel.MoveLineToPrevious(currentProcess.ChosenLines!.Last());
 
@@ -92,7 +92,7 @@ public void ShouldSetWordText()
                 var currentProcess = GetNewCurrentProcess();
                 var modelWord = currentProcess.ChosenLines![0].Words[4];
                 Assert.Equal("model ", modelWord.Text);
-                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new MinMaxFloatWaveStreamSampler())
+                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
                     {
                         EditingTextOfWord = modelWord
                     };
@@ -107,7 +107,7 @@ public void ShouldSplitCorrectlyOnSpaces()
                 var currentProcess = GetNewCurrentProcess();
                 var modelWord = currentProcess.ChosenLines![0].Words[4];
                 Assert.Equal("model ", modelWord.Text);
-                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new MinMaxFloatWaveStreamSampler())
+                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
                     {
                         EditingTextOfWord = modelWord
                     };
@@ -122,7 +122,7 @@ public void ShouldSplitCorrectlyOnPipes()
                 var currentProcess = GetNewCurrentProcess();
                 var modelWord = currentProcess.ChosenLines![0].Words[4];
                 Assert.Equal("model ", modelWord.Text);
-                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new MinMaxFloatWaveStreamSampler())
+                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
                     {
                         EditingTextOfWord = modelWord
                     };
diff --git a/KaddaOK.AvaloniaApp/App.axaml.cs b/KaddaOK.AvaloniaApp/App.axaml.cs
index 4aae9a0..3eeca92 100644
--- a/KaddaOK.AvaloniaApp/App.axaml.cs
+++ b/KaddaOK.AvaloniaApp/App.axaml.cs
@@ -37,6 +37,7 @@ public override void Initialize()
         services.AddTransient<IKbpImporter, KbpImporter>();
         services.AddTransient<IKbpSerializer, KbpSerializer>();
         services.AddTransient<ILineSplitter, LineSplitter>();
+        services.AddTransient<IWordMerger, WordMerger>();
         services.AddTransient<IMinMaxFloatWaveStreamSampler, MinMaxFloatWaveStreamSampler>();
         services.AddTransient<IResultRanker, ResultRanker>();
         services.AddTransient<IRzlrcContentsGenerator, RzlrcContentsGenerator>();
diff --git a/KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs b/KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs
index 156d763..7bb3ff4 100644
--- a/KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs
+++ b/KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs
@@ -89,7 +89,7 @@ private LyricLine GetFromRzlrcItem(LyricItem rzlrcItem)
         {
             var instructionArray = rzlrcItem.text.Split('<', '>');
 
-            var timeWithDelayRegex = new Regex(@"^(?'time'[0-9\.]+)(?:\+(?'delay'[0-9\.]+))?$");
+            var timeWithDelayRegex = new Regex(@"^(?'time'[0-9]+.?[0-9]*)(?:\+(?'delay'[0-9\.]+))?$");
             var lyricLine = new LyricLine(rzlrcItem)
             {
                 IsSelected = true,
diff --git a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs
index b075348..4b78983 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs
@@ -12,7 +12,7 @@ namespace KaddaOK.AvaloniaApp.ViewModels.DesignTime
 {
     public class DesignTimeEditLinesViewModel : EditLinesViewModel
     {
-        public DesignTimeEditLinesViewModel() : base(DesignTimeKaraokeProcess.Get(), new LineSplitter(), new MinMaxFloatWaveStreamSampler())
+        public DesignTimeEditLinesViewModel() : base(DesignTimeKaraokeProcess.Get(), new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
         {
         }
     }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
index f7abe28..f31f7d3 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
@@ -23,9 +23,10 @@ namespace KaddaOK.AvaloniaApp.ViewModels
     public partial class EditLinesViewModel : TickableBase
     {
         private ILineSplitter Splitter { get; }
+        private IWordMerger WordMerger { get; }
         private CancellationTokenSource AudioPlayingSource { get; }
         private IMinMaxFloatWaveStreamSampler Sampler { get; }
-        public EditLinesViewModel(KaraokeProcess karaokeProcess, ILineSplitter splitter, IMinMaxFloatWaveStreamSampler sampler) : base(karaokeProcess)
+        public EditLinesViewModel(KaraokeProcess karaokeProcess, ILineSplitter splitter, IWordMerger merger, IMinMaxFloatWaveStreamSampler sampler) : base(karaokeProcess)
         {
             FullLengthVocalsDraw = new WaveformDraw
             {
@@ -33,6 +34,7 @@ public EditLinesViewModel(KaraokeProcess karaokeProcess, ILineSplitter splitter,
                 VerticalImage = true
             };
             Splitter = splitter;
+            WordMerger = merger;
             Sampler = sampler;
             UndoStack = new ObservableStack<string?>();
             RedoStack = new ObservableStack<string?>();
@@ -161,6 +163,24 @@ private void NewLineAfter(object? parameter)
             }
         }
 
+        [RelayCommand]
+        private void MergeWithPrev(object? parameter)
+        {
+            if (parameter is LyricWord mergeHere)
+            {
+                MergeWord(mergeHere, true);
+            }
+        }
+
+        [RelayCommand]
+        private void MergeWithNext(object? parameter)
+        {
+            if (parameter is LyricWord mergeHere)
+            {
+                MergeWord(mergeHere, false);
+            }
+        }
+
         private void AddUndoSnapshot()
         {
             if (CurrentProcess?.ChosenLines != null)
@@ -199,6 +219,12 @@ private void NewLineAt(LyricWord newLineHere, bool isBefore)
             Splitter.SplitLineAt(CurrentProcess?.ChosenLines, newLineHere, isBefore);
         }
 
+        private void MergeWord(LyricWord mergeHere, bool isBefore)
+        {
+            AddUndoSnapshot();
+            WordMerger.MergeWord(CurrentProcess?.ChosenLines, mergeHere, isBefore);
+        }
+
         [RelayCommand]
         private void Undo(object? parameter)
         {
diff --git a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
index 6c17abd..7e6620d 100644
--- a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
@@ -54,6 +54,14 @@
                 Header="Split Line After This Syllable"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).NewLineAfterCommand}"
                 CommandParameter="{Binding}" />
+            <MenuItem
+                Header="Merge With Previous Syllable"
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MergeWithPrevCommand}"
+                CommandParameter="{Binding}" />
+            <MenuItem
+                Header="Merge With Next Syllable"
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MergeWithNextCommand}"
+                CommandParameter="{Binding}" />
             <MenuItem
                 Header="Change Syllable Text..."
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).EditWordTextCommand}"
diff --git a/KaddaOK.Library.Tests/WordMergerTests.cs b/KaddaOK.Library.Tests/WordMergerTests.cs
new file mode 100644
index 0000000..0381e0b
--- /dev/null
+++ b/KaddaOK.Library.Tests/WordMergerTests.cs
@@ -0,0 +1,77 @@
+using System.Collections.ObjectModel;
+
+namespace KaddaOK.Library.Tests
+{
+    public class WordMergerTests
+    {
+        public class TestHarness
+        {
+            public WordMerger Merger { get; }
+
+            public TestHarness()
+            {
+                Merger = new WordMerger();
+            }
+
+            public static LyricLine FromWords(int startSecond, params string[] words)
+            {
+                var line = new LyricLine
+                {
+                    Words = new ObservableCollection<LyricWord>()
+                };
+                int currentSecond = startSecond;
+                foreach (var word in words)
+                {
+                    line.Words.Add(new LyricWord
+                    {
+                        StartSecond = currentSecond,
+                        EndSecond = currentSecond + 1,
+                        Text = word + (Array.IndexOf(words, word) == words.Length - 1 ? "" : " ") 
+                    });
+                    currentSecond++;
+                }
+                return line;
+            }
+
+            public ObservableCollection<LyricLine> AllLines = new(
+                new List<LyricLine>
+                {
+                    FromWords(5, "never", "gonna", "give", "you", "up"),
+                    FromWords(15, "never", "gonna", "let", "you", "down"),
+                    FromWords(20, "never", "gonna", "run", "around", "and", "desert", "you"),
+                    FromWords(30, "neffer", "gonna", "make", "you", "cry"),
+                    FromWords(35, "never", "goingta", "say", "goodbye"),
+                    FromWords(40, "never", "gonna", "tell", "a", "lie", "and", "hurt", "you"),
+                });
+        }
+
+        public class MergeWord
+        {
+            [Theory]
+            [InlineData(true, "run ", 2, "never gonnarun around and desert you", 6, 1, "gonnarun ", 21, 23)]
+            [InlineData(false, "around ", 2, "never gonna run aroundand desert you", 6, 3, "aroundand ", 23, 25)]
+            [InlineData(true, "around ", 2, "never gonna runaround and desert you", 6, 2, "runaround ", 22, 24)]
+            [InlineData(false, "desert ", 2, "never gonna run around and desertyou", 6, 5, "desertyou", 25, 27)]
+            [InlineData(true, "neffer ", 3, "neffer gonna make you cry", 5, 0, "neffer ", 30, 31)]
+            [InlineData(true, "goingta ", 4, "nevergoingta say goodbye", 3, 0, "nevergoingta ", 35, 37)]
+            [InlineData(false, "cry ", 3, "neffer gonna make you cry", 5, 4, "cry", 34, 35)]
+            public void ShouldMergeCorrectly(bool before, string matchWordText, int checkLineIndex, string expectedLineText, int expectedWordCount, int checkWordIndex, string expectedWordText, double expectedStart, double expectedEnd)
+            {
+                var harness = new TestHarness();
+
+                var around = harness.AllLines.SelectMany(a => a.Words!).SingleOrDefault(w => w.Text == matchWordText);
+
+                harness.Merger.MergeWord(harness.AllLines, around!, before);
+
+                Assert.Equal(6, harness.AllLines.Count);
+                var existingLine = harness.AllLines[checkLineIndex];
+                Assert.Equal(expectedLineText, existingLine.Text);
+                Assert.Equal(expectedWordCount, existingLine.Words.Count);
+                var newWord = existingLine.Words[checkWordIndex];
+                Assert.Equal(expectedWordText, newWord.Text);
+                Assert.Equal(expectedStart, newWord.StartSecond);
+                Assert.Equal(expectedEnd, newWord.EndSecond);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/KaddaOK.Library/WordMerger.cs b/KaddaOK.Library/WordMerger.cs
new file mode 100644
index 0000000..fb95034
--- /dev/null
+++ b/KaddaOK.Library/WordMerger.cs
@@ -0,0 +1,57 @@
+using System.Collections.ObjectModel;
+
+namespace KaddaOK.Library
+{
+    public interface IWordMerger
+    {
+        void MergeWord(ObservableCollection<LyricLine>? allLines, LyricWord wordToMerge, bool withWordBefore);
+    }
+
+    public class WordMerger : IWordMerger
+    {
+        public void MergeWord(ObservableCollection<LyricLine>? allLines, LyricWord wordToMerge, bool withWordBefore)
+        {
+            var originalLine = allLines?.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToMerge));
+            if (originalLine != null)
+            {
+                var originalLineIndex = allLines!.IndexOf(originalLine);
+                if (originalLine.Words != null)
+                {
+                    var originalWordIndex = originalLine.Words.IndexOf(wordToMerge);
+                    if ((withWordBefore && originalWordIndex < 1)
+                        || (!withWordBefore && originalWordIndex == originalLine.Words.Count - 1))
+                    {
+                        return; // I don't wanna.  TODO: I guess this would move the word to the line in question?
+                    }
+
+                    if (withWordBefore)
+                    {
+                        var prevWordIndex = originalWordIndex - 1;
+                        var prevWord = originalLine.Words[prevWordIndex];
+                        var newWord = new LyricWord
+                        {
+                            StartSecond = prevWord.StartSecond,
+                            EndSecond = wordToMerge.EndSecond,
+                            Text = $"{prevWord.Text.TrimEnd()}{wordToMerge.Text.TrimStart()}"
+                        };
+                        originalLine.Words = new ObservableCollection<LyricWord>(
+                            originalLine.Words.Take(prevWordIndex).Concat(new []{newWord}).Concat(originalLine.Words.Skip(originalWordIndex + 1)));
+                    }
+                    else
+                    {
+                        var nextWordIndex = originalWordIndex + 1;
+                        var nextWord = originalLine.Words[nextWordIndex];
+                        var newWord = new LyricWord
+                        {
+                            StartSecond = wordToMerge.StartSecond,
+                            EndSecond = nextWord.EndSecond,
+                            Text = $"{wordToMerge.Text.TrimEnd()}{nextWord.Text.TrimStart()}"
+                        };
+                        originalLine.Words = new ObservableCollection<LyricWord>(
+                            originalLine.Words.Take(originalWordIndex).Concat(new[] { newWord }).Concat(originalLine.Words.Skip(nextWordIndex + 1)));
+                    }
+                }
+            }
+        }
+    }
+}

From 8d0c6d7d8294839734346283c7b370a6d1e1de89 Mon Sep 17 00:00:00 2001
From: KaddaOK <kaddaokay@gmail.com>
Date: Sun, 3 Mar 2024 15:19:23 -0700
Subject: [PATCH 6/8] allow adding a new line at the beginning

---
 .../ViewModels/EditLinesViewModel.cs          | 74 +++++++++++--------
 KaddaOK.AvaloniaApp/Views/EditLinesView.axaml | 11 ++-
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
index f31f7d3..cdaf8ec 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
@@ -625,45 +625,55 @@ private async Task EditLine(object? parameter)
         [RelayCommand]
         private async Task AddNewLine(object? parameter)
         {
-            if (parameter is LyricLine addLineAfter)
+            LyricLine? addLineAfter;
+            int addLineAfterIndex;
+            if (parameter is LyricLine line)
             {
-                var addLineAfterIndex = CurrentProcess.ChosenLines!.IndexOf(addLineAfter);
+                addLineAfter = line;
+                addLineAfterIndex = CurrentProcess.ChosenLines!.IndexOf(addLineAfter);
+            }
+            else if (parameter?.ToString() == "top")
+            {
+                addLineAfter = null;
+                addLineAfterIndex = -1;
+            }
+            else
+            {
+                return;
+            }
 
-                if (addLineAfterIndex >= 0)
-                {
-                    var addingLine = new AddingLine
-                    {
-                        PreviousLine = addLineAfter
-                    };
-                    if (CurrentProcess.ChosenLines.Count > addLineAfterIndex + 1)
-                    {
-                        addingLine.NextLine = CurrentProcess.ChosenLines[addLineAfterIndex + 1];
-                    }
+            var addingLine = new AddingLine
+            {
+                PreviousLine = addLineAfter
+            };
+            if (CurrentProcess.ChosenLines.Count > addLineAfterIndex + 1)
+            {
+                addingLine.NextLine = CurrentProcess.ChosenLines[addLineAfterIndex + 1];
+            }
 
-                    // show a dialog to enter the words
-                    if (await DialogHost.Show(addingLine, "EditLinesViewDialogHost") is AddingLine newWords
-                        && !string.IsNullOrWhiteSpace(newWords.EnteredText))
-                    {
-                        // create and add a new line
-                        var newLine = new LyricLine
-                        {
-                            IsSelected = true,
-                        };
-                        var enteredText = newWords.EnteredText;
-                        var startTime = newWords.PreviousLine?.EndSecond ?? 0;
-                        var endTime = newWords.NextLine?.StartSecond
-                                      ?? CurrentProcess.VocalsAudioStream!.TotalTime.TotalSeconds;
+            // show a dialog to enter the words
+            if (await DialogHost.Show(addingLine, "EditLinesViewDialogHost") is AddingLine newWords
+                && !string.IsNullOrWhiteSpace(newWords.EnteredText))
+            {
+                // create and add a new line
+                var newLine = new LyricLine
+                {
+                    IsSelected = true,
+                };
+                var enteredText = newWords.EnteredText;
+                var startTime = newWords.PreviousLine?.EndSecond ?? 0;
+                var endTime = newWords.NextLine?.StartSecond
+                              ?? CurrentProcess.VocalsAudioStream!.TotalTime.TotalSeconds;
 
-                        var listOfNewWords = GetLyricWordsAcrossTime(enteredText, startTime, endTime);
-                        newLine.Words = new ObservableCollection<LyricWord>(listOfNewWords);
+                var listOfNewWords = GetLyricWordsAcrossTime(enteredText, startTime, endTime);
+                newLine.Words = new ObservableCollection<LyricWord>(listOfNewWords);
 
-                        CurrentProcess.ChosenLines.Insert(addLineAfterIndex + 1, newLine);
+                CurrentProcess.ChosenLines.Insert(addLineAfterIndex + 1, newLine);
 
-                        // go straight to the edit dialog for it
-                        await EditLine(newLine);
-                    }
-                }
+                // go straight to the edit dialog for it
+                await EditLine(newLine);
             }
+                
         }
 
         private static List<LyricWord> GetLyricWordsAcrossTime(string? enteredText, double startTime, double endTime)
diff --git a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
index 7e6620d..11e602f 100644
--- a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
@@ -134,10 +134,19 @@
                         Undo and Redo are available if you make a mistake.
                         When you're satisfied, you can switch to the Export tab.
                     </TextBlock>
+                    <Button
+                        Content="+"
+                        Padding="0,0,100,0"
+                        Margin="0,0,0,-10"
+                        ToolTip.Tip="Add New Line Here"
+                        Background="Transparent"
+                        Foreground="DarkGray"
+                        ZIndex="0"
+                        Command="{Binding AddNewLineCommand}" CommandParameter="top" />
                     <ItemsRepeater
                         x:Name="SelectionsItems"
                         ItemsSource="{Binding CurrentProcess.ChosenLines}"
-                        Margin="0,10,10,10">
+                        Margin="0,0,10,10">
                         <ItemsRepeater.Styles>
                             <Style Selector="Label">
                                 <Setter

From 8cf46c50d7b7776c306b753e6e74cb468cd1cd68 Mon Sep 17 00:00:00 2001
From: KaddaOK <kaddaokay@gmail.com>
Date: Sun, 10 Mar 2024 17:35:50 -0600
Subject: [PATCH 7/8] keyboard use on edit tab

---
 KaddaOK.AvaloniaApp/App.axaml                 |   1 +
 .../Dialogs/EditLineTimingDialog.axaml        |   5 +-
 .../Dialogs/EditLineTimingDialog.axaml.cs     |  11 +
 .../Dialogs/EditSyllableTextDialog.axaml      |   4 +-
 .../Dialogs/EditSyllableTextDialog.axaml.cs   |  24 +
 .../ObjectEqualityBooleanConverter.cs         |  18 +
 KaddaOK.AvaloniaApp/ObservableStack.cs        |  72 +--
 .../DesignTimeEditLinesViewModel.cs           |   4 +
 .../ViewModels/EditLinesViewModel.cs          | 548 +++++++++++++++---
 KaddaOK.AvaloniaApp/Views/EditLinesView.axaml | 473 ++++++++-------
 .../Views/EditLinesView.axaml.cs              |  49 +-
 KaddaOK.Library/LineSplitter.cs               |   6 +
 KaddaOK.Library/WordMerger.cs                 |  77 ++-
 13 files changed, 904 insertions(+), 388 deletions(-)
 create mode 100644 KaddaOK.AvaloniaApp/ObjectEqualityBooleanConverter.cs

diff --git a/KaddaOK.AvaloniaApp/App.axaml b/KaddaOK.AvaloniaApp/App.axaml
index 38115a2..f484f1a 100644
--- a/KaddaOK.AvaloniaApp/App.axaml
+++ b/KaddaOK.AvaloniaApp/App.axaml
@@ -127,6 +127,7 @@
 	<Application.Resources>
         <local:WaveformToPointConverter x:Key="WaveformToPointConverter" />
         <local:WaveformToLengthConverter x:Key="WaveformToLengthConverter" />
+        <local:ObjectEqualityBooleanConverter x:Key="ObjectEqualityBooleanConverter" />
         <local:RoundingConverter x:Key="RoundingConverter" />
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml
index 8b4394d..0930a9b 100644
--- a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml
@@ -11,7 +11,10 @@
              xmlns:models="clr-namespace:KaddaOK.AvaloniaApp.Models"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="KaddaOK.AvaloniaApp.Controls.Dialogs.EditLineTimingDialog"
-             x:DataType="models:EditingLine">
+             x:DataType="models:EditingLine"
+             Focusable="True"
+			 AttachedToVisualTree="UserControl_AttachedToVisualTree"
+             KeyDown="UserControl_KeyDown">
 	<dialogs:ModalDialogChrome Title="Edit Line Timing">
 		<Grid
 		RowDefinitions="50,85,100,85,90,50"
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml.cs b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml.cs
index e15aa40..3c97544 100644
--- a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml.cs
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml.cs
@@ -37,5 +37,16 @@ private void NewRectanglesItemsControl_PointerReleased(object? sender, PointerRe
         {
             EditLinesViewModel?.EditLineTimingDialogPointerReleased(sender, args);
         }
+
+        private void UserControl_KeyDown(object? sender, Avalonia.Input.KeyEventArgs e)
+        {
+            EditLinesViewModel?.EditLineTimingDialogKeyDown(sender, e);
+            e.Handled = true;
+        }
+
+        private void UserControl_AttachedToVisualTree(object? sender, Avalonia.VisualTreeAttachmentEventArgs e)
+        {
+            this.Focus();
+        }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
index ac4e490..166fb8e 100644
--- a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
@@ -24,11 +24,13 @@
                 and the timing dialog will open automatically for you to check the new distribution.)
             </TextBlock>
             <TextBox
+                AttachedToVisualTree="TextBox_AttachedToVisualTree"
                 Grid.Row="2"
                 Margin="0 8 0 0"
                 HorizontalAlignment="Stretch"
                 x:Name="EditWordTextBox"
-                Text="{Binding Text, Mode=OneWay}" />
+                Text="{Binding Text, Mode=OneWay}"
+                KeyDown="TextBox_KeyDown"/>
             <StackPanel
                 Grid.Row="3"
                 Orientation="Horizontal"
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml.cs b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml.cs
index 0dbb805..2a6abcf 100644
--- a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml.cs
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml.cs
@@ -1,12 +1,36 @@
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+using DialogHostAvalonia;
 
 namespace KaddaOK.AvaloniaApp.Controls.Dialogs
 {
     public partial class EditSyllableTextDialog : UserControl
     {
+        private DialogHost? dialogHost;
+
         public EditSyllableTextDialog()
         {
             InitializeComponent();
         }
+
+        private void TextBox_AttachedToVisualTree(object? sender, Avalonia.VisualTreeAttachmentEventArgs e)
+        {
+            (sender as TextBox)?.Focus();
+            dialogHost = this.FindAncestorOfType<DialogHost>();
+        }
+
+        private void TextBox_KeyDown(object? sender, Avalonia.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                dialogHost?.CloseDialogCommand.Execute(((TextBox)sender).Text);
+            }
+
+            if (e.Key == Key.Escape)
+            {
+                dialogHost?.CloseDialogCommand.Execute(null);
+            }
+        }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/ObjectEqualityBooleanConverter.cs b/KaddaOK.AvaloniaApp/ObjectEqualityBooleanConverter.cs
new file mode 100644
index 0000000..92393be
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/ObjectEqualityBooleanConverter.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Data.Converters;
+
+namespace KaddaOK.AvaloniaApp
+{
+    public class ObjectEqualityBooleanConverter : IMultiValueConverter
+    {
+        public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (values.Count != 2 || values.Any(v => v == null || v.ToString() == "(unset)")) return null;
+
+            return values[0] == values[1];
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/ObservableStack.cs b/KaddaOK.AvaloniaApp/ObservableStack.cs
index 136ca92..afaa414 100644
--- a/KaddaOK.AvaloniaApp/ObservableStack.cs
+++ b/KaddaOK.AvaloniaApp/ObservableStack.cs
@@ -1,77 +1,37 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Linq;
 
 namespace KaddaOK.AvaloniaApp
 {
-    /// <summary>
-    /// Per https://stackoverflow.com/a/56177896/
-    /// </summary>
-    public class ObservableStack<T> : Stack<T>, INotifyCollectionChanged, INotifyPropertyChanged
+    public class ObservableStack<T> : ObservableCollection<T>
     {
-        #region Constructors
+        public T? Peek => Items.LastOrDefault();
 
-        public ObservableStack() : base() { }
-
-        public ObservableStack(IEnumerable<T> collection) : base(collection) { }
-
-        public ObservableStack(int capacity) : base(capacity) { }
-
-        #endregion
-
-        #region Overrides
-
-        public new virtual T? Pop()
+        public T? Pop()
         {
-            var item = base.Pop();
-            OnCollectionChanged(NotifyCollectionChangedAction.Remove, item);
-
-            return item;
-        }
-
-        public new virtual void Push(T? item)
-        {
-            if (item != null)
+            var popIndex = Items.Count - 1;
+            var itemToPop = Items[popIndex];
+            if (itemToPop != null)
             {
-                base.Push(item);
-                OnCollectionChanged(NotifyCollectionChangedAction.Add, item);
+                RemoveAt(popIndex);
             }
-        }
 
-        public new virtual void Clear()
-        {
-            base.Clear();
-            OnCollectionChanged(NotifyCollectionChangedAction.Reset, default);
+            return itemToPop;
         }
 
-        #endregion
-
-        #region CollectionChanged
-
-        public event NotifyCollectionChangedEventHandler? CollectionChanged;
-
-        protected virtual void OnCollectionChanged(NotifyCollectionChangedAction action, T? item)
+        public void Push(T? item)
         {
-            CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(
-                action
-                , item
-                , item == null ? -1 : 0)
-            );
-
-            OnPropertyChanged(nameof(Count));
+            Add(item);
         }
 
-        #endregion
-
-        #region PropertyChanged
-
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        protected virtual void OnPropertyChanged(string proertyName)
+        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(proertyName));
+            base.OnCollectionChanged(e);
+            OnPropertyChanged(new PropertyChangedEventArgs(nameof(Count)));
+            OnPropertyChanged(new PropertyChangedEventArgs(nameof(Peek)));
         }
-
-        #endregion
     }
 }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs
index 4b78983..b231163 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs
@@ -14,6 +14,10 @@ public class DesignTimeEditLinesViewModel : EditLinesViewModel
     {
         public DesignTimeEditLinesViewModel() : base(DesignTimeKaraokeProcess.Get(), new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
         {
+            UndoStack.Add(new ChosenLinesAction("[]", "did this before this view"));
+            UndoStack.Add(new ChosenLinesAction("[]", "and then I did this"));
+            RedoStack.Add(new ChosenLinesAction("[]", "already undid this first"));
+            RedoStack.Add(new ChosenLinesAction("[]", "then undid this"));
         }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
index cdaf8ec..9443932 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
@@ -5,7 +5,6 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -17,15 +16,39 @@
 using NAudio.Wave.SampleProviders;
 using Avalonia.Controls;
 using KaddaOK.AvaloniaApp.Controls;
+using KaddaOK.AvaloniaApp.Views;
+using Avalonia.VisualTree;
 
 namespace KaddaOK.AvaloniaApp.ViewModels
 {
+    public class ChosenLinesAction : ObservableBase
+    {
+        private string? serializedLines;
+        public string? SerializedLines
+        {
+            get => serializedLines;
+            set => SetProperty(ref serializedLines, value);
+        }
+        private string? changeLabel;
+        public string? ChangeLabel
+        {
+            get => changeLabel;
+            set => SetProperty(ref changeLabel, value);
+        }
+
+        public ChosenLinesAction(string? serializedLines, string? changeLabel)
+        {
+            SerializedLines = serializedLines;
+            ChangeLabel = changeLabel;
+        }
+    }
     public partial class EditLinesViewModel : TickableBase
     {
         private ILineSplitter Splitter { get; }
         private IWordMerger WordMerger { get; }
         private CancellationTokenSource AudioPlayingSource { get; }
         private IMinMaxFloatWaveStreamSampler Sampler { get; }
+        public EditLinesView EditLinesView { get; set; } // TODO: are you sure you wanna do this? It's paradigm-breakingly bad practice...
         public EditLinesViewModel(KaraokeProcess karaokeProcess, ILineSplitter splitter, IWordMerger merger, IMinMaxFloatWaveStreamSampler sampler) : base(karaokeProcess)
         {
             FullLengthVocalsDraw = new WaveformDraw
@@ -36,8 +59,8 @@ public EditLinesViewModel(KaraokeProcess karaokeProcess, ILineSplitter splitter,
             Splitter = splitter;
             WordMerger = merger;
             Sampler = sampler;
-            UndoStack = new ObservableStack<string?>();
-            RedoStack = new ObservableStack<string?>();
+            UndoStack = new ObservableStack<ChosenLinesAction>();
+            RedoStack = new ObservableStack<ChosenLinesAction>();
             if ((CurrentProcess!.DetectedLinePossibilities?.Any(lp => lp.HasSelected) ?? false)
                 && (!CurrentProcess.ChosenLines?.Any() ?? false))
             {
@@ -117,6 +140,13 @@ public EditingLine? LineBeingEdited
             set => SetProperty(ref lineBeingEdited, value);
         }
 
+        private LyricWord? cursorWord;
+        public LyricWord? CursorWord
+        {
+            get => cursorWord;
+            set => SetProperty(ref cursorWord, value);
+        }
+
         private bool isRecording;
         public bool IsRecording
         {
@@ -124,15 +154,15 @@ public bool IsRecording
             set => SetProperty(ref isRecording, value);
         }
 
-        private ObservableStack<string?> undoStack = null!;
-        public ObservableStack<string?> UndoStack
+        private ObservableStack<ChosenLinesAction> undoStack = null!;
+        public ObservableStack<ChosenLinesAction> UndoStack
         {
             get => undoStack;
             set => SetProperty(ref undoStack, value);
         }
 
-        private ObservableStack<string?> redoStack = null!;
-        public ObservableStack<string?> RedoStack
+        private ObservableStack<ChosenLinesAction> redoStack = null!;
+        public ObservableStack<ChosenLinesAction> RedoStack
         {
             get => redoStack;
             set => SetProperty(ref redoStack, value);
@@ -181,7 +211,7 @@ private void MergeWithNext(object? parameter)
             }
         }
 
-        private void AddUndoSnapshot()
+        private void AddUndoSnapshot(string changeLabel, bool isRedo = false)
         {
             if (CurrentProcess?.ChosenLines != null)
             {
@@ -190,17 +220,17 @@ private void AddUndoSnapshot()
                     {
                         ReferenceLoopHandling = ReferenceLoopHandling.Ignore
                     });
-                UndoStack.Push(currentChosenLinesString);
+                UndoStack.Push(new ChosenLinesAction(currentChosenLinesString, changeLabel));
 
                 // clear the redo stack because now we've done something different
-                if (RedoStack.Any())
+                if (RedoStack.Any() && !isRedo)
                 {
                     RedoStack.Clear();
                 }
             }
         }
 
-        private void AddRedoSnapshot()
+        private void AddRedoSnapshot(string changeLabel)
         {
             if (CurrentProcess?.ChosenLines != null)
             {
@@ -209,62 +239,123 @@ private void AddRedoSnapshot()
                     {
                         ReferenceLoopHandling = ReferenceLoopHandling.Ignore
                     });
-                RedoStack.Push(currentChosenLinesString);
+                RedoStack.Push(new ChosenLinesAction(currentChosenLinesString, changeLabel));
             }
         }
 
         private void NewLineAt(LyricWord newLineHere, bool isBefore)
         {
-            AddUndoSnapshot();
+            AddUndoSnapshot($"Split line {(isBefore ? "before" : "after")} \"{newLineHere.Text}\"");
             Splitter.SplitLineAt(CurrentProcess?.ChosenLines, newLineHere, isBefore);
+            EditLinesView.Focus();
         }
 
         private void MergeWord(LyricWord mergeHere, bool isBefore)
         {
-            AddUndoSnapshot();
-            WordMerger.MergeWord(CurrentProcess?.ChosenLines, mergeHere, isBefore);
+            AddUndoSnapshot($"Merge \"{mergeHere.Text}\" with {(isBefore ? "previous" : "next")} syllable");
+            var resultingWord = WordMerger.MergeWord(CurrentProcess?.ChosenLines, mergeHere, isBefore);
+            if (resultingWord != null)
+            {
+                CursorWord = resultingWord;
+                EditLinesView.Focus();
+            }
         }
 
         [RelayCommand]
         private void Undo(object? parameter)
         {
-            var restoreChosenLinesString = UndoStack.Pop();
-            if (restoreChosenLinesString != null)
+            var lastCommand = UndoStack.Pop();
+            if (lastCommand?.SerializedLines != null)
             {
-                var restoredChosenLines = JsonConvert.DeserializeObject<List<LyricLine>>(restoreChosenLinesString);
+                var restoredChosenLines = JsonConvert.DeserializeObject<List<LyricLine>>(lastCommand.SerializedLines);
                 if (restoredChosenLines != null)
                 {
-                    AddRedoSnapshot();
+                    AddRedoSnapshot(lastCommand.ChangeLabel);
                     CurrentProcess!.ChosenLines = new ObservableCollection<LyricLine>(restoredChosenLines);
                 }
             }
+
+            // it seems to lose keyboard focus afterwards for some reason...
+            EditLinesView.Focus();
+            // and the word cursor no longer works, unfortunately...
+            CursorWord = null;
         }
 
         [RelayCommand]
         private void Redo(object? parameter)
         {
-            var redoChosenLinesString = RedoStack.Pop();
-            if (redoChosenLinesString != null)
+            var nextCommand = RedoStack.Pop();
+            if (nextCommand.SerializedLines != null)
             {
-                var redoChosenLines = JsonConvert.DeserializeObject<List<LyricLine>>(redoChosenLinesString);
+                var redoChosenLines = JsonConvert.DeserializeObject<List<LyricLine>>(nextCommand.SerializedLines);
                 if (redoChosenLines != null)
                 {
-                    AddUndoSnapshot();
+                    AddUndoSnapshot(nextCommand.ChangeLabel, true);
                     CurrentProcess!.ChosenLines = new ObservableCollection<LyricLine>(redoChosenLines);
                 }
             }
+
+            // it seems to lose keyboard focus afterwards for some reason...
+            EditLinesView.Focus();
+            // and the word cursor no longer works, unfortunately...
+            CursorWord = null;
         }
 
         [RelayCommand]
         private void DeleteWord(object? parameter)
         {
-            if (parameter is LyricWord newLineHere)
+            if (parameter is LyricWord deleteThis)
             {
-                AddUndoSnapshot();
-                Splitter.DeleteWord(CurrentProcess!.ChosenLines!, newLineHere);
+                AddUndoSnapshot($"Delete syllable \"{deleteThis.Text}\"");
+
+                var deletingFromLine = CurrentProcess!.ChosenLines!.SingleOrDefault(l => l.Words != null && l.Words.Contains(deleteThis));
+                var deletedWordIndex = deletingFromLine.Words.IndexOf(deleteThis);
+
+                Splitter.DeleteWord(CurrentProcess!.ChosenLines!, deleteThis);
+
+                // find new focus word
+                var newFocusedWord = deletingFromLine.Words.Count > deletedWordIndex
+                    ? deletingFromLine.Words[deletedWordIndex]
+                    : deletingFromLine.Words.LastOrDefault();
+
+                CursorWord = newFocusedWord;
+
+                EditLinesView.Focus();
             }
         }
 
+        [RelayCommand]
+        private void DeleteEntireLine(object? parameter)
+        {
+            LyricLine deletingLine;
+            if (parameter is LyricWord wordInMovingLine)
+            {
+                deletingLine = CurrentProcess!.ChosenLines!.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordInMovingLine));
+            }
+            else if (parameter is LyricLine line)
+            {
+                deletingLine = line;
+            }
+            else
+            {
+                return;
+            }
+            AddUndoSnapshot($"Delete line \"{deletingLine.Text}\"");
+            var deletedLineIndex = CurrentProcess!.ChosenLines.IndexOf(deletingLine);
+            CurrentProcess!.ChosenLines.Remove(deletingLine);
+
+            // find new focus word
+            var newFocusedLine = CurrentProcess.ChosenLines.Count > deletedLineIndex
+                                ? CurrentProcess.ChosenLines[deletedLineIndex] 
+                                : CurrentProcess.ChosenLines.LastOrDefault();
+            if (newFocusedLine?.Words?.Any() ?? false)
+            {
+                CursorWord = newFocusedLine.Words.First();
+            }
+
+            EditLinesView.Focus();
+        }
+
         [RelayCommand]
         private async Task EditWordText(object? parameter)
         {
@@ -273,6 +364,7 @@ private async Task EditWordText(object? parameter)
                 EditingTextOfWord = editThisWord;
                 if (await DialogHost.Show(this, "EditLinesViewDialogHost") is string newText)
                 {
+                    AddUndoSnapshot($"Change syllable \"{editThisWord.Text}\" to \"{newText}\"");
                     var lineNeedsTiming = ApplyEditWordText(newText);
                     if (lineNeedsTiming != null)
                     {
@@ -319,6 +411,7 @@ public void ApplyLineTimingEdit(object? parameter)
         {
             if (LineBeingEdited != null)
             {
+                AddUndoSnapshot($"Edited timing for \"{LineBeingEdited.OriginalLine.Text}\"");
                 LineBeingEdited.OriginalLine.Words = new ObservableCollection<LyricWord>(LineBeingEdited.NewTiming);
             }
         }
@@ -326,25 +419,37 @@ public void ApplyLineTimingEdit(object? parameter)
         [RelayCommand]
         public void MoveLineToPrevious(object? parameter)
         {
-            if (parameter is LyricLine movingLine)
+            LyricLine movingLine;
+            if (parameter is LyricWord wordInMovingLine)
             {
-                var movingLineIndex = CurrentProcess!.ChosenLines!.IndexOf(movingLine);
-                if (movingLineIndex > 0)
-                {
-                    AddUndoSnapshot();
+                movingLine = CurrentProcess!.ChosenLines!.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordInMovingLine));
+            }
+            else if (parameter is LyricLine line)
+            {
+                movingLine = line;
+            }
+            else
+            {
+                return;
+            }
 
-                    var previousLine = CurrentProcess!.ChosenLines![movingLineIndex - 1];
-                    // add a space to the previous last word if it doesn't have one
-                    var previousLastWord = previousLine.Words!.Last();
-                    if (!previousLastWord.Text?.EndsWith(" ") ?? false)
-                    {
-                        previousLastWord.Text += " ";
-                    }
-                    var newWords = previousLine.Words!.Union(movingLine.Words!);
-                    previousLine.Words = new ObservableCollection<LyricWord>(newWords);
-                    CurrentProcess.ChosenLines.Remove(movingLine);
+            var movingLineIndex = CurrentProcess!.ChosenLines!.IndexOf(movingLine);
+            if (movingLineIndex > 0)
+            {
+                AddUndoSnapshot($"Moved \"{movingLine.Text}\" onto previous line");
+
+                var previousLine = CurrentProcess!.ChosenLines![movingLineIndex - 1];
+                // add a space to the previous last word if it doesn't have one
+                var previousLastWord = previousLine.Words!.Last();
+                if (!previousLastWord.Text?.EndsWith(" ") ?? false)
+                {
+                    previousLastWord.Text += " ";
                 }
+                var newWords = previousLine.Words!.Union(movingLine.Words!);
+                previousLine.Words = new ObservableCollection<LyricWord>(newWords);
+                CurrentProcess.ChosenLines.Remove(movingLine);
             }
+            EditLinesView.Focus();
         }
 
         [RelayCommand]
@@ -668,6 +773,7 @@ private async Task AddNewLine(object? parameter)
                 var listOfNewWords = GetLyricWordsAcrossTime(enteredText, startTime, endTime);
                 newLine.Words = new ObservableCollection<LyricWord>(listOfNewWords);
 
+                AddUndoSnapshot($"Added new line \"{newLine.Text}\"");
                 CurrentProcess.ChosenLines.Insert(addLineAfterIndex + 1, newLine);
 
                 // go straight to the edit dialog for it
@@ -705,84 +811,261 @@ private static List<LyricWord> GetLyricWordsAcrossTime(string? enteredText, doub
 
         public void KeyPressed(KeyEventArgs keyArgs)
         {
-            if (keyArgs.Key == Key.Escape)
+            // TODO: this no longer needs be its own thing
+            HandleWordEditKeys(keyArgs);
+        }
+
+        private void HandleWordEditKeys(KeyEventArgs keyArgs)
+        {
+            switch (keyArgs.Key)
             {
-                switch (modeBeingDragged)
+                case Key.Down:
+                case Key.Right:
+                case Key.Left:
+                case Key.Up:
+                    SwitchWordSelection(keyArgs);
+                    break;
+                case Key.A:
+                    if (CursorWord != null)
+                    {
+                        NewLineAfter(CursorWord);
+                    }
+                    break;
+                case Key.S:
+                    if (CursorWord != null)
+                    {
+                        NewLineBefore(CursorWord);
+                    }
+                    break;
+                case Key.W:
+                    if (CursorWord != null)
+                    {
+                        MergeWithPrev(CursorWord);
+                    }
+                    break;
+                case Key.Q:
+                    if (CursorWord != null)
+                    {
+                        MergeWithNext(CursorWord);
+                    }
+                    break;
+                case Key.E:
+                    if (CursorWord != null)
+                    {
+                        EditWordText(CursorWord);
+                    }
+                    break;
+                case Key.D:
+                    if (CursorWord != null)
+                    {
+                        DeleteWord(CursorWord);
+                    }
+                    break;
+                case Key.Delete:
+                    if (CursorWord != null)
+                    {
+                        DeleteEntireLine(CursorWord);
+                    }
+                    break;
+                case Key.Z:
+                    if (CursorWord != null)
+                    {
+                        MoveLineToPrevious(CursorWord);
+                    }
+                    break;
+            }
+        }
+
+        private void SwitchWordSelection(KeyEventArgs keyArgs)
+        {
+            // this is just gonna change focus and let the handler in the view set it back... wacky I know, but it makes
+            // sense because of what we can and can't control around tabbing and such.
+            // Also, apparently the order in which it finds these isn't reliable, so we'll have to sort it by the order in
+            // memory...
+            var allWordButtonsByPhrases = EditLinesView.GetVisualDescendants().Where(x => x.Name == "PhraseWordsItemsControl")
+                .Select(s => new
                 {
-                    case WordDraggingMode.LeftSide:
-                        wordBeingDragged!.StartSecond = OriginalValue ?? 0;
+                    Buttons = s.GetVisualDescendants().Where(y => y.Name == "LyricWordButton").Select(y => (Button)y).ToList(),
+                    SortOrder = CurrentProcess.ChosenLines.IndexOf(s.DataContext as LyricLine)
+                }).OrderBy(s => s.SortOrder)
+                .Select(s => s.Buttons.OrderBy(x => CurrentProcess.ChosenLines[s.SortOrder].Words.IndexOf(x.CommandParameter as LyricWord)).ToList())
+                .Where(s => s.Count > 0) // I'm not sure why this even happened; virtualization maybe
+                .ToList();
+
+
+            Button? destinationButton = null;
+            if (CursorWord == null)
+            {
+                switch (keyArgs.Key)
+                {
+                    case Key.Down:
+                    case Key.Right:
+                        destinationButton = allWordButtonsByPhrases.FirstOrDefault()?.FirstOrDefault();
                         break;
-                    case WordDraggingMode.RightSide:
-                        wordBeingDragged!.EndSecond = OriginalValue ?? 0;
+                    case Key.Left:
+                        destinationButton = allWordButtonsByPhrases.FirstOrDefault()?.LastOrDefault();
+                        break;
+                    case Key.Up:
+                        destinationButton = allWordButtonsByPhrases.LastOrDefault()?.FirstOrDefault();
                         break;
                 }
-                wordBeingDragged = null;
-                modeBeingDragged = WordDraggingMode.None;
-                keyArgs.Handled = true;
             }
-
-            if (IsRecording)
+            else
             {
-                var positionOffsetSeconds = PlayAudio?.GetPositionTimeSpan().TotalSeconds;
-                if (positionOffsetSeconds == null)
+                var currentPhrase = allWordButtonsByPhrases.SingleOrDefault(phrase => phrase.Any(word => word.CommandParameter == CursorWord));
+                if (currentPhrase != null)
                 {
-                    // TODO: this shouldn't happen; log it
-                    return;
-                }
+                    var currentPhraseIndex = allWordButtonsByPhrases.IndexOf(currentPhrase);
+                    var currentWordButton = currentPhrase.FirstOrDefault(word => word.CommandParameter == CursorWord);
+                    var currentWordIndex = currentPhrase.IndexOf(currentWordButton);
+                    switch (keyArgs.Key)
+                    {
+                        case Key.Down:
+                            if (allWordButtonsByPhrases.Count > currentPhraseIndex + 1)
+                            {
+                                var nextPhrase = allWordButtonsByPhrases[currentPhraseIndex + 1];
+                                var nextWordIndex = nextPhrase.Count > currentWordIndex
+                                    ? currentWordIndex
+                                    : nextPhrase.Count - 1;
+                                destinationButton = nextPhrase[nextWordIndex];
+                            }
 
-                var positionTotalSeconds = Math.Round(positionOffsetSeconds.Value + CurrentLineOffsetSeconds ?? 0, 2);
-                switch (keyArgs.Key)
-                {
-                    case Key.Right:
-                        if (LineBeingEdited!.WordCurrentlyTiming == null)
-                        {
-                            if (LineBeingEdited!.WordTimingQueue!.Count == 0)
+                            break;
+                        case Key.Right:
+                            if (currentWordIndex < currentPhrase.Count - 1)
                             {
-                                // TODO: this shouldn't happen; log it
+                                destinationButton = currentPhrase[currentWordIndex + 1];
                             }
-                            else
+
+                            break;
+                        case Key.Left:
+                            if (currentWordIndex > 0)
                             {
-                                // this is the first word; start it up
-                                StartNextWord(positionTotalSeconds);
+                                destinationButton = currentPhrase[currentWordIndex - 1];
                             }
-                        }
-                        else
+
+                            break;
+                        case Key.Up:
+                            if (currentPhraseIndex > 0)
+                            {
+                                var nextPhrase = allWordButtonsByPhrases[currentPhraseIndex - 1];
+                                var nextWordIndex = nextPhrase.Count > currentWordIndex
+                                    ? currentWordIndex
+                                    : nextPhrase.Count - 1;
+                                destinationButton = nextPhrase[nextWordIndex];
+                            }
+
+                            break;
+                    }
+
+                }
+            }
+
+            destinationButton?.BringIntoView();
+            destinationButton?.Focus();
+
+            /*switch (keyArgs.Key)
+            {
+                case Key.Down:
+                    if (CursorWord == null)
+                    {
+                        CursorWord = CurrentProcess.ChosenLines?.FirstOrDefault()?.Words?.FirstOrDefault();
+                    }
+                    else
+                    {
+                        var originalLine =
+                            CurrentProcess.ChosenLines?.SingleOrDefault(l =>
+                                l.Words != null && l.Words.Contains(CursorWord));
+                        if (originalLine?.Words != null)
                         {
-                            if (LineBeingEdited.WordCurrentlyTiming.IsRunning)
+                            var originalLineIndex = CurrentProcess.ChosenLines.IndexOf(originalLine);
+                            var originalWordIndex = originalLine.Words.IndexOf(CursorWord);
+                            if (CurrentProcess.ChosenLines.Count > originalLineIndex + 1)
                             {
-                                // this word is going right into the next one, so end it here
-                                StopWord(LineBeingEdited.WordCurrentlyTiming, positionTotalSeconds);
+                                var nextLine = CurrentProcess.ChosenLines[originalLineIndex + 1];
+                                var nextWordIndex = nextLine.Words.Count > originalWordIndex
+                                    ? originalWordIndex
+                                    : nextLine.Words.Count - 1;
+                                CursorWord = nextLine.Words[nextWordIndex];
                             }
+                        }
+                    }
 
-                            // if there aren't any more words, stop running
-                            if (LineBeingEdited!.WordTimingQueue!.Count == 0)
+                    break;
+                case Key.Right:
+                    if (CursorWord == null)
+                    {
+                        CursorWord = CurrentProcess.ChosenLines?.FirstOrDefault()?.Words?.FirstOrDefault();
+                    }
+                    else
+                    {
+                        var originalLine =
+                            CurrentProcess.ChosenLines?.SingleOrDefault(l =>
+                                l.Words != null && l.Words.Contains(CursorWord));
+                        if (originalLine?.Words != null)
+                        {
+                            var originalWordIndex = originalLine.Words.IndexOf(CursorWord);
+                            if (originalWordIndex < originalLine.Words.Count - 1)
                             {
-                                Stop(null);
+                                CursorWord = originalLine.Words[originalWordIndex + 1];
                             }
-                            else
+                        }
+                    }
+
+                    break;
+                case Key.Left:
+                    if (CursorWord == null)
+                    {
+                        CursorWord = CurrentProcess.ChosenLines?.FirstOrDefault()?.Words?.LastOrDefault();
+                    }
+                    else
+                    {
+                        var originalLine =
+                            CurrentProcess.ChosenLines?.SingleOrDefault(l =>
+                                l.Words != null && l.Words.Contains(CursorWord));
+                        if (originalLine?.Words != null)
+                        {
+                            var originalWordIndex = originalLine.Words.IndexOf(CursorWord);
+                            if (originalWordIndex > 0)
                             {
-                                // whether the current word was running or not, the next one should start here
-                                StartNextWord(positionTotalSeconds);
+                                CursorWord = originalLine.Words[originalWordIndex - 1];
                             }
                         }
-                        break;
-                    case Key.Down:
-                        if (LineBeingEdited!.WordCurrentlyTiming?.IsRunning ?? false)
+                    }
+
+                    break;
+                case Key.Up:
+                    if (CursorWord == null)
+                    {
+                        CursorWord = CurrentProcess.ChosenLines?.LastOrDefault()?.Words?.FirstOrDefault();
+                    }
+                    else
+                    {
+                        var originalLine =
+                            CurrentProcess.ChosenLines?.SingleOrDefault(l =>
+                                l.Words != null && l.Words.Contains(CursorWord));
+                        if (originalLine?.Words != null)
                         {
-                            // just stop the current word
-                            StopWord(LineBeingEdited.WordCurrentlyTiming, positionTotalSeconds);
-                            // if there aren't any more words, stop running
-                            if (LineBeingEdited!.WordTimingQueue!.Count == 0)
+                            var originalLineIndex = CurrentProcess.ChosenLines.IndexOf(originalLine);
+                            var originalWordIndex = originalLine.Words.IndexOf(CursorWord);
+                            if (originalLineIndex > 0)
                             {
-                                Stop(null);
+                                var nextLine = CurrentProcess.ChosenLines[originalLineIndex - 1];
+                                var nextWordIndex = nextLine.Words.Count > originalWordIndex
+                                    ? originalWordIndex
+                                    : nextLine.Words.Count - 1;
+                                CursorWord = nextLine.Words[nextWordIndex];
                             }
                         }
-                        break;
-                }
-            }
+                    }
+
+                    break;
+                default:
+                    throw new InvalidOperationException($"No case for key {keyArgs.Key} in SwitchWordSelection");
+            } */
         }
 
-        private void StartNextWord([DisallowNull] double? positionTotalSeconds)
+        private void StartNextWord(double? positionTotalSeconds)
         {
             LineBeingEdited!.WordCurrentlyTiming = LineBeingEdited.WordTimingQueue!.Dequeue();
             StartWord(LineBeingEdited.WordCurrentlyTiming!, positionTotalSeconds.Value);
@@ -912,6 +1195,89 @@ public enum WordDraggingMode
         private double? dragWidth = null;
         private double? OriginalValue = null;
 
+        public void EditLineTimingDialogKeyDown(object? sender, KeyEventArgs keyArgs)
+        {
+            if (keyArgs.Key == Key.Escape)
+            {
+                switch (modeBeingDragged)
+                {
+                    case WordDraggingMode.LeftSide:
+                        wordBeingDragged!.StartSecond = OriginalValue ?? 0;
+                        break;
+                    case WordDraggingMode.RightSide:
+                        wordBeingDragged!.EndSecond = OriginalValue ?? 0;
+                        break;
+                }
+                wordBeingDragged = null;
+                modeBeingDragged = WordDraggingMode.None;
+                keyArgs.Handled = true;
+            }
+
+            if (IsRecording)
+            {
+                var positionOffsetSeconds = PlayAudio?.GetPositionTimeSpan().TotalSeconds;
+                if (positionOffsetSeconds == null)
+                {
+                    // TODO: this shouldn't happen; log it
+                    return;
+                }
+
+                var positionTotalSeconds = Math.Round(positionOffsetSeconds.Value + CurrentLineOffsetSeconds ?? 0, 2);
+                switch (keyArgs.Key)
+                {
+                    case Key.Right:
+                        if (LineBeingEdited!.WordCurrentlyTiming == null)
+                        {
+                            if (LineBeingEdited!.WordTimingQueue!.Count == 0)
+                            {
+                                // TODO: this shouldn't happen; log it
+                            }
+                            else
+                            {
+                                // this is the first word; start it up
+                                StartNextWord(positionTotalSeconds);
+                            }
+                        }
+                        else
+                        {
+                            if (LineBeingEdited.WordCurrentlyTiming.IsRunning)
+                            {
+                                // this word is going right into the next one, so end it here
+                                StopWord(LineBeingEdited.WordCurrentlyTiming, positionTotalSeconds);
+                            }
+
+                            // if there aren't any more words, stop running
+                            if (LineBeingEdited!.WordTimingQueue!.Count == 0)
+                            {
+                                Stop(null);
+                            }
+                            else
+                            {
+                                // whether the current word was running or not, the next one should start here
+                                StartNextWord(positionTotalSeconds);
+                            }
+                        }
+
+                        keyArgs.Handled = true;
+                        break;
+                    case Key.Down:
+                        if (LineBeingEdited!.WordCurrentlyTiming?.IsRunning ?? false)
+                        {
+                            // just stop the current word
+                            StopWord(LineBeingEdited.WordCurrentlyTiming, positionTotalSeconds);
+                            // if there aren't any more words, stop running
+                            if (LineBeingEdited!.WordTimingQueue!.Count == 0)
+                            {
+                                Stop(null);
+                            }
+
+                            keyArgs.Handled = true;
+                        }
+                        break;
+                }
+            }
+        }
+
         public void EditLineTimingDialogPointerPressed(object? sender, PointerPressedEventArgs args)
         {
             var control = sender as Control;
diff --git a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
index 11e602f..f8ca18d 100644
--- a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
@@ -17,7 +17,9 @@
     d:DesignHeight="740"
     x:Class="KaddaOK.AvaloniaApp.Views.EditLinesView"
     x:DataType="vm:EditLinesViewModel"
-    KeyDown="EditLinesView_OnKeyDown">
+    Focusable="True"
+    KeyDown="EditLinesView_OnKeyDown"
+    AttachedToVisualTree="EditLinesView_AttachedToVisualTree">
     <Design.DataContext>
         <designTime:DesignTimeEditLinesViewModel />
     </Design.DataContext>
@@ -47,29 +49,46 @@
             x:Key="WordButtonFlyout"
             x:DataType="library:LyricWord">
             <MenuItem
+				AttachedToLogicalTree="MenuItem_AttachedToLogicalTree"
                 Header="Split Line Before This Syllable"
+                HotKey="s" InputGesture="s"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).NewLineBeforeCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Split Line After This Syllable"
+                HotKey="a" InputGesture="a"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).NewLineAfterCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Merge With Previous Syllable"
+                HotKey="w" InputGesture="w"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MergeWithPrevCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Merge With Next Syllable"
+                HotKey="q" InputGesture="q"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MergeWithNextCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Change Syllable Text..."
+                HotKey="e" InputGesture="e"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).EditWordTextCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Delete Syllable"
+                HotKey="d" InputGesture="d"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).DeleteWordCommand}"
                 CommandParameter="{Binding}" />
+            <MenuItem
+                Header="Delete Entire Line"
+                HotKey="delete" InputGesture="delete"
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).DeleteEntireLineCommand}"
+                CommandParameter="{Binding}" />
+            <MenuItem
+                Header="Move All Words to Previous Line"
+                HotKey="z" InputGesture="z"
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MoveLineToPreviousCommand}"
+                CommandParameter="{Binding}" />
         </MenuFlyout>
     </UserControl.Resources>
     <dialogHost:DialogHost
@@ -91,213 +110,271 @@
         </dialogHost:DialogHost.DataTemplates>
         <Grid
             x:Name="EditLinesViewOuterGrid"
-            ColumnDefinitions="*, 100"
-            RowDefinitions="40, *">
-            <StackPanel
-                x:Name="UndoRedoButtons"
-                Orientation="Horizontal"
-                HorizontalAlignment="Right"
-                Grid.Column="1">
-                <StackPanel.Styles>
-                    <Style Selector="Button">
-                        <Setter
-                            Property="Padding"
-                            Value="6,7" />
-                    </Style>
-                </StackPanel.Styles>
-                <Button
-                    Content="Undo"
-                    HorizontalAlignment="Right"
-                    Command="{Binding UndoCommand}"
-                    IsEnabled="{Binding UndoStack.Count}"
-                    HotKey="Ctrl+Z" />
-                <Button
-                    Content="Redo"
-                    HorizontalAlignment="Right"
-                    Command="{Binding RedoCommand}"
-                    IsEnabled="{Binding RedoStack.Count}"
-                    HotKey="Ctrl+Y" />
-            </StackPanel>
-            <ScrollViewer
-                x:Name="SelectionsScrollViewer"
-                Grid.RowSpan="2">
-                <StackPanel>
-                    <TextBlock
-                        TextWrapping="Wrap"
-                        Margin="10"
-                        FontSize="12">
-                        On this screen you can make direct changes to the words and lines.
-                        Click the ⤴ button to make a line part of its preceeding line.
-                        Click a word to create a new line before or after it, change its text, or
-                        delete it.
-                        Click the ⏱ button to re-time a line.
-                        Undo and Redo are available if you make a mistake.
-                        When you're satisfied, you can switch to the Export tab.
-                    </TextBlock>
-                    <Button
-                        Content="+"
-                        Padding="0,0,100,0"
-                        Margin="0,0,0,-10"
-                        ToolTip.Tip="Add New Line Here"
-                        Background="Transparent"
-                        Foreground="DarkGray"
-                        ZIndex="0"
-                        Command="{Binding AddNewLineCommand}" CommandParameter="top" />
-                    <ItemsRepeater
-                        x:Name="SelectionsItems"
-                        ItemsSource="{Binding CurrentProcess.ChosenLines}"
-                        Margin="0,0,10,10">
-                        <ItemsRepeater.Styles>
-                            <Style Selector="Label">
-                                <Setter
-                                    Property="FontFamily"
-                                    Value="Arial" />
-                                <Setter
-                                    Property="VerticalAlignment"
-                                    Value="Top" />
-                                <Setter
-                                    Property="HorizontalAlignment"
-                                    Value="Center" />
-                                <Setter
-                                    Property="FontSize"
-                                    Value="10" />
-                            </Style>
-                            <Style Selector="Button">
-                                <Setter
-                                    Property="Background"
-                                    Value="{StaticResource HasSelectedFill}" />
-                                <Setter
-                                    Property="Padding"
-                                    Value="0,5" />
-                            </Style>
-                        </ItemsRepeater.Styles>
-                        <ItemsRepeater.ItemTemplate>
-                            <DataTemplate x:DataType="library:LyricLine">
-                                <StackPanel>
-                                    <Border
-                                        ZIndex="5"
-                                        BorderBrush="{DynamicResource ListMediumColor}"
-                                        Background="Black"
-                                        BorderThickness="0,0,1,1"
-                                        Margin="13,3,0,0"
-                                        Padding="0,0,0,3"
-                                        CornerRadius="3">
-                                        <Grid
-                                            Classes="lineStack"
-                                            ColumnDefinitions="20,36,*,36,25">
-                                            <Button
-                                                Classes="lineMergeButton"
-                                                Grid.Column="0"
-                                                Content="⤴"
-                                                ToolTip.Tip="Move these words to previous line"
-                                                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MoveLineToPreviousCommand}"
-                                                CommandParameter="{Binding}" />
-                                            <Label
-                                                Classes="startSecond"
-                                                Content="{Binding StartSecond}"
-                                                Grid.Column="1" />
-                                            <ItemsControl
-                                                ItemsSource="{Binding Words}"
-                                                Grid.Column="2">
-												<ItemsControl.ItemsPanel>
-													<ItemsPanelTemplate>
-														<WrapPanel Orientation="Horizontal" />
-                                                    </ItemsPanelTemplate>
-                                                </ItemsControl.ItemsPanel>
-                                                <ItemsControl.ItemTemplate>
-													<DataTemplate>
-                                                        <Button
-                                                            Classes="wordButton"
-                                                            Content="{Binding Text}"
-                                                            Flyout="{StaticResource WordButtonFlyout}"
-                                                            ContextFlyout="{StaticResource WordButtonFlyout}" />
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
-                                            <Label
-                                                Content="{Binding EndSecond}"
-                                                HorizontalAlignment="Right"
-                                                Grid.Column="3" />
-                                            <Button
-                                                Classes="lineEditButton"
-                                                Grid.Column="4"
-                                                Content="⏱"
-                                                ToolTip.Tip="Edit timing"
-                                                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).EditLineCommand}"
-                                                CommandParameter="{Binding}" />
-                                        </Grid>
-                                    </Border>
-                                    <Button
-                                        Content="+"
-                                        Padding="0,0,100,0"
-                                        Margin="0,-10"
-                                        ToolTip.Tip="Add New Line Here"
-                                        Background="Transparent"
-                                        Foreground="DarkGray"
-                                        ZIndex="0"
-                                        Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).AddNewLineCommand}"
-                                        CommandParameter="{Binding}" />
-                                </StackPanel>
+            ColumnDefinitions="*, 100">
+
+			<Grid x:Name="LeftPane"
+                  RowDefinitions="*, Auto">
+				<ScrollViewer
+					x:Name="SelectionsScrollViewer"
+					Grid.Row="0">
+					<StackPanel>
+						<TextBlock
+							TextWrapping="Wrap"
+							Margin="10"
+							FontSize="12">
+							On this screen you can make direct changes to the words and lines.
+							Click the ⤴ button to make a line part of its preceeding line.
+							Click a word to create a new line before or after it, change its text, or
+							delete it.
+							Click the ⏱ button to re-time a line.
+							Undo and Redo are available if you make a mistake.
+							When you're satisfied, you can switch to the Export tab.
+						</TextBlock>
+						<Button
+							Content="+"
+							Padding="0,0,100,0"
+							Margin="0,0,0,-10"
+							ToolTip.Tip="Add New Line Here"
+							Background="Transparent"
+							Foreground="DarkGray"
+							ZIndex="0"
+							Command="{Binding AddNewLineCommand}" CommandParameter="top" />
+						<ItemsRepeater
+							x:Name="PhrasesRepeater"
+							KeyboardNavigation.TabNavigation="Continue"
+							ItemsSource="{Binding CurrentProcess.ChosenLines}"
+							Margin="0,0,10,10">
+							<ItemsRepeater.Styles>
+								<Style Selector="Label">
+									<Setter
+										Property="FontFamily"
+										Value="Arial" />
+									<Setter
+										Property="VerticalAlignment"
+										Value="Top" />
+									<Setter
+										Property="HorizontalAlignment"
+										Value="Center" />
+									<Setter
+										Property="FontSize"
+										Value="10" />
+								</Style>
+								<Style Selector="Button">
+									<Setter
+										Property="Background"
+										Value="{StaticResource HasSelectedFill}" />
+									<Setter
+										Property="Padding"
+										Value="0,5" />
+								</Style>
+								<Style Selector="Button.isCursor">
+									<Setter
+										Property="BorderBrush"
+										Value="Red" />
+								</Style>
+							</ItemsRepeater.Styles>
+							<ItemsRepeater.ItemTemplate>
+								<DataTemplate x:DataType="library:LyricLine">
+									<StackPanel x:Name="PhraseRepeaterStackPanel">
+										<Border x:Name="PhrasesRepeaterPhraseBorder"
+											ZIndex="5"
+											BorderBrush="{DynamicResource ListMediumColor}"
+											Background="Black"
+											BorderThickness="0,0,1,1"
+											Margin="13,3,0,0"
+											Padding="0,0,0,3"
+											CornerRadius="3">
+											<Grid x:Name="PhrasesRepeaterGrid"
+												Classes="lineStack"
+												ColumnDefinitions="20,36,*,36,25">
+												<Button
+													Classes="lineMergeButton"
+													Grid.Column="0"
+													Content="⤴"
+													ToolTip.Tip="Move these words to previous line"
+													Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MoveLineToPreviousCommand}"
+													CommandParameter="{Binding}" />
+												<Label
+													Classes="startSecond"
+													Content="{Binding StartSecond}"
+													Grid.Column="1" />
+												<ItemsControl x:Name="PhraseWordsItemsControl"
+													KeyboardNavigation.TabNavigation="Continue"
+													ItemsSource="{Binding Words}"
+													Grid.Column="2">
+													<ItemsControl.Styles>
+														<Style Selector="ItemsPresenter">
+															<Setter Property="(KeyboardNavigation.TabNavigation)" Value="Continue" />
+														</Style>
+													</ItemsControl.Styles>
+													<ItemsControl.ItemsPanel>
+														<ItemsPanelTemplate>
+															<WrapPanel Orientation="Horizontal" />
+														</ItemsPanelTemplate>
+													</ItemsControl.ItemsPanel>
+													<ItemsControl.ItemTemplate>
+														<DataTemplate>
+															<Button
+																Classes="wordButton"
+																Name="LyricWordButton"
+																IsTabStop="True"
+																GotFocus="WordButton_GotFocus"
+																CommandParameter="{Binding}"
+																Content="{Binding Text}"
+																Flyout="{StaticResource WordButtonFlyout}"
+																ContextFlyout="{StaticResource WordButtonFlyout}">
+																<Classes.isCursor>
+																	<MultiBinding Converter="{StaticResource ObjectEqualityBooleanConverter}">
+																		<Binding Path="." />
+																		<Binding Path="$parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).CursorWord" />
+																	</MultiBinding>
+																</Classes.isCursor>
+															</Button>
+														</DataTemplate>
+													</ItemsControl.ItemTemplate>
+												</ItemsControl>
+												<Label
+													Content="{Binding EndSecond}"
+													HorizontalAlignment="Right"
+													Grid.Column="3" />
+												<Button
+													Classes="lineEditButton"
+													Grid.Column="4"
+													Content="⏱"
+													ToolTip.Tip="Edit timing"
+													Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).EditLineCommand}"
+													CommandParameter="{Binding}" />
+											</Grid>
+										</Border>
+										<Button
+											Content="+"
+											Padding="0,0,100,0"
+											Margin="0,-10"
+											ToolTip.Tip="Add New Line Here"
+											Background="Transparent"
+											Foreground="DarkGray"
+											ZIndex="0"
+											Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).AddNewLineCommand}"
+											CommandParameter="{Binding}" />
+									</StackPanel>
+
 
+								</DataTemplate>
+							</ItemsRepeater.ItemTemplate>
+						</ItemsRepeater>
+					</StackPanel>
 
+				</ScrollViewer>
+                <StackPanel x:Name="UndoHistory" Grid.Row="1" HorizontalAlignment="Right" Margin="0,5,10,10">
+                    <StackPanel.Styles>
+						<Style Selector="TextBlock.HistoryItem">
+							<Setter Property="FontFamily" Value="Arial" />
+							<Setter Property="FontSize" Value="10" />
+							<Setter Property="FontWeight" Value="Bold" />
+							<Setter Property="FontStyle" Value="Italic" />
+                        </Style>
+                    </StackPanel.Styles>
+                    <ItemsControl IsVisible="{Binding RedoStack.Count}" ItemsSource="{Binding RedoStack}">
+						<ItemsControl.Styles>
+							<Style Selector="TextBlock.HistoryItem">
+								<Setter Property="Foreground" Value="Gray" />
+								<Setter Property="Margin" Value="10,0,0,0" />
+                            </Style>
+                        </ItemsControl.Styles>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+									<TextBlock Classes="HistoryItem" Text="Undo:" />
+                                    <TextBlock Classes="HistoryItem" Text="{Binding ChangeLabel}" HorizontalAlignment="Left" />
+                                </StackPanel>
                             </DataTemplate>
-                        </ItemsRepeater.ItemTemplate>
-                    </ItemsRepeater>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+					<TextBlock Classes="HistoryItem" IsVisible="{Binding UndoStack.Count}" Text="{Binding UndoStack.Peek.ChangeLabel}" HorizontalAlignment="Left"/>
                 </StackPanel>
+            </Grid>
+
+
 
-            </ScrollViewer>
-            <Grid
+			<Grid x:Name="RightPane" Grid.Column="1"
+                  RowDefinitions="*, 40">
+				<Grid
                 x:Name="EditLinesWaveMapGrid"
-                Grid.Column="1"
-                Grid.Row="1"
+                Grid.Row="0"
                 SizeChanged="LayoutSizeChanged">
-                <controls:DrawnWaveformControl
-                    CanSelectIfEmpty="False"
-                    Waveform="{Binding FullLengthVocalsDraw}"
-                    WaveFloats="{Binding CurrentProcess.VocalsAudioFloats}"
-                    WaveStream="{Binding CurrentProcess.VocalsAudioStream}"
-                    WaveformFilePath="{Binding CurrentProcess.VocalsAudioFilePath}" />
+					<controls:DrawnWaveformControl
+						CanSelectIfEmpty="False"
+						Waveform="{Binding FullLengthVocalsDraw}"
+						WaveFloats="{Binding CurrentProcess.VocalsAudioFloats}"
+						WaveStream="{Binding CurrentProcess.VocalsAudioStream}"
+						WaveformFilePath="{Binding CurrentProcess.VocalsAudioFilePath}" />
 
-                <ItemsControl
-                    x:Name="LineRectanglesItems"
-                    ItemsSource="{Binding CurrentProcess.ChosenLines}">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <Canvas />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                    <ItemsControl.Styles>
-                        <Style
-                            x:DataType="library:LyricLine"
-                            Selector="ItemsControl > ContentPresenter">
-                            <Setter Property="Canvas.Top">
-                                <Setter.Value>
-                                    <MultiBinding Converter="{StaticResource WaveformToPointConverter}">
-                                        <Binding Path="StartSecond" />
-                                        <Binding Path="$parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).FullLengthVocalsDraw.WaveformLengthSeconds" />
-                                        <Binding Path="$parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).FullLengthVocalsDraw.DesiredImageWidth" />
-                                    </MultiBinding>
-                                </Setter.Value>
-                            </Setter>
+					<ItemsControl
+						x:Name="LineRectanglesItems"
+						ItemsSource="{Binding CurrentProcess.ChosenLines}">
+						<ItemsControl.ItemsPanel>
+							<ItemsPanelTemplate>
+								<Canvas />
+							</ItemsPanelTemplate>
+						</ItemsControl.ItemsPanel>
+						<ItemsControl.Styles>
+							<Style
+								x:DataType="library:LyricLine"
+								Selector="ItemsControl > ContentPresenter">
+								<Setter Property="Canvas.Top">
+									<Setter.Value>
+										<MultiBinding Converter="{StaticResource WaveformToPointConverter}">
+											<Binding Path="StartSecond" />
+											<Binding Path="$parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).FullLengthVocalsDraw.WaveformLengthSeconds" />
+											<Binding Path="$parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).FullLengthVocalsDraw.DesiredImageWidth" />
+										</MultiBinding>
+									</Setter.Value>
+								</Setter>
+								<Setter
+									Property="Canvas.Left"
+									Value="0" />
+							</Style>
+						</ItemsControl.Styles>
+						<ItemsControl.DataTemplates>
+							<DataTemplate x:DataType="library:LyricLine">
+								<controls:OverlayRectangle
+									IsVertical="True"
+									Stroke="{StaticResource HasSelectedStroke}"
+									Fill="{StaticResource HasSelectedFill}"
+									Width="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).FullLengthVocalsDraw.DesiredPeakHeight}"
+									StartSecond="{Binding StartSecond}"
+									EndSecond="{Binding EndSecond}"
+									WaveformDraw="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).FullLengthVocalsDraw}" />
+							</DataTemplate>
+						</ItemsControl.DataTemplates>
+					</ItemsControl>
+
+				</Grid>
+                <StackPanel
+                    x:Name="UndoRedoButtons"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Grid.Row="1">
+                    <StackPanel.Styles>
+                        <Style Selector="Button">
                             <Setter
-                                Property="Canvas.Left"
-                                Value="0" />
+                                Property="Padding"
+                                Value="6,7" />
                         </Style>
-                    </ItemsControl.Styles>
-                    <ItemsControl.DataTemplates>
-                        <DataTemplate x:DataType="library:LyricLine">
-                            <controls:OverlayRectangle
-                                IsVertical="True"
-                                Stroke="{StaticResource HasSelectedStroke}"
-                                Fill="{StaticResource HasSelectedFill}"
-                                Width="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).FullLengthVocalsDraw.DesiredPeakHeight}"
-                                StartSecond="{Binding StartSecond}"
-                                EndSecond="{Binding EndSecond}"
-                                WaveformDraw="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).FullLengthVocalsDraw}" />
-                        </DataTemplate>
-                    </ItemsControl.DataTemplates>
-                </ItemsControl>
-
+                    </StackPanel.Styles>
+                    <Button
+                        Content="Undo"
+                        HorizontalAlignment="Right"
+                        Command="{Binding UndoCommand}"
+                        IsEnabled="{Binding UndoStack.Count}"
+                        HotKey="Ctrl+Z" />
+                    <Button
+                        Content="Redo"
+                        HorizontalAlignment="Right"
+                        Command="{Binding RedoCommand}"
+                        IsEnabled="{Binding RedoStack.Count}"
+                        HotKey="Ctrl+Y" />
+                </StackPanel>
             </Grid>
         </Grid>
     </dialogHost:DialogHost>
diff --git a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml.cs b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml.cs
index 6deb8b8..eb38887 100644
--- a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml.cs
+++ b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml.cs
@@ -1,16 +1,22 @@
+using System.Linq;
+using Avalonia;
 using Avalonia.Controls;
 using DialogHostAvalonia;
 using KaddaOK.AvaloniaApp.ViewModels;
 using Avalonia.Input;
+using Avalonia.LogicalTree;
 using KaddaOK.AvaloniaApp.Models;
 using KaddaOK.AvaloniaApp.ViewModels.DesignTime;
+using KaddaOK.Library;
 using Microsoft.Extensions.DependencyInjection;
+using Avalonia.VisualTree;
 
 namespace KaddaOK.AvaloniaApp.Views
 {
     public partial class EditLinesView : UserControl
     {
         private readonly EditLinesViewModel _viewModel;
+        private ItemsRepeater? _phrasesRepeater;
         public EditLinesView()
         {
             InitializeComponent();
@@ -19,6 +25,7 @@ public EditLinesView()
                 ? new DesignTimeEditLinesViewModel()
                 : App.ServiceProvider.GetRequiredService<EditLinesViewModel>();
             DataContext = _viewModel;
+            _viewModel.EditLinesView = this;
         }
 
         private void LayoutSizeChanged(object? sender, SizeChangedEventArgs args)
@@ -37,6 +44,7 @@ private void EditLinesViewDialog_Closing(object? sender, DialogClosingEventArgs
         {
             if (e.Parameter == null)
             {
+                this.Focus();
                 return;
             }
 
@@ -45,11 +53,50 @@ private void EditLinesViewDialog_Closing(object? sender, DialogClosingEventArgs
             {
                 _viewModel.ApplyLineTimingEdit(e.Parameter);
             }
+
+            this.Focus();
         }
 
         private void EditLinesView_OnKeyDown(object? sender, KeyEventArgs e)
         {
-            _viewModel.KeyPressed(e);
+            if (!this.FindDescendantOfType<DialogHost>()?.IsOpen ?? false) // leave it alone if dialogs are open
+            {
+                _viewModel.KeyPressed(e);
+            }
+        }
+
+        private void EditLinesView_AttachedToVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
+        {
+            this.Focus();
+            _phrasesRepeater = this.FindNameScope().Find<ItemsRepeater>("PhrasesRepeater");
+        }
+
+        private void WordButton_GotFocus(object? sender, GotFocusEventArgs e)
+        {
+            _viewModel.CursorWord = ((Button)sender)?.CommandParameter as LyricWord;
+        }
+
+        private void MenuItem_AttachedToLogicalTree(object? sender, Avalonia.LogicalTree.LogicalTreeAttachmentEventArgs e)
+        {
+            var menuItem = sender as MenuItem;
+            if (menuItem?.InputGesture != null)
+            {
+                var keyBinding = new KeyBinding
+                {
+                    Gesture = menuItem.InputGesture,
+                    Command = menuItem.Command,
+                    CommandParameter = menuItem.CommandParameter
+                };
+                if (!menuItem.KeyBindings.Any())
+                {
+                    menuItem.KeyBindings.Add(keyBinding);
+                }
+                var presenter = menuItem?.FindLogicalAncestorOfType<MenuFlyoutPresenter>();
+                if (presenter != null)
+                {
+                    presenter.KeyBindings.AddRange(menuItem.KeyBindings);
+                }
+            }
         }
     }
 }
diff --git a/KaddaOK.Library/LineSplitter.cs b/KaddaOK.Library/LineSplitter.cs
index 8f5ea09..eb35121 100644
--- a/KaddaOK.Library/LineSplitter.cs
+++ b/KaddaOK.Library/LineSplitter.cs
@@ -19,6 +19,11 @@ public void SplitLineAt(ObservableCollection<LyricLine>? allLines, LyricWord wor
                 if (originalLine.Words != null)
                 {
                     var originalWordIndex = originalLine.Words.IndexOf(wordToSplit);
+                    if (originalWordIndex == 0 && splitBefore)
+                    {
+                        // can't split before this because it's already the first word; do nothing
+                        return;
+                    }
 
                     var newLine = new LyricLine
                     {
@@ -41,6 +46,7 @@ public void DeleteWord(ObservableCollection<LyricLine> allLines, LyricWord wordT
                 var indexOf = originalLine.Words.IndexOf(wordToDelete);
                 if (indexOf > 0)
                 {
+                    // TODO: wait what why? Investigate what the rationale for this trimming was, because it looks wrong as I go by it here rn
                     originalLine.Words[indexOf - 1].Text = originalLine?.Words[indexOf - 1]?.Text?.TrimEnd();
                 }
                 originalLine?.Words.Remove(wordToDelete);
diff --git a/KaddaOK.Library/WordMerger.cs b/KaddaOK.Library/WordMerger.cs
index fb95034..2bcba5e 100644
--- a/KaddaOK.Library/WordMerger.cs
+++ b/KaddaOK.Library/WordMerger.cs
@@ -4,54 +4,51 @@ namespace KaddaOK.Library
 {
     public interface IWordMerger
     {
-        void MergeWord(ObservableCollection<LyricLine>? allLines, LyricWord wordToMerge, bool withWordBefore);
+        LyricWord MergeWord(ObservableCollection<LyricLine>? allLines, LyricWord wordToMerge, bool withWordBefore);
     }
 
     public class WordMerger : IWordMerger
     {
-        public void MergeWord(ObservableCollection<LyricLine>? allLines, LyricWord wordToMerge, bool withWordBefore)
+        public LyricWord? MergeWord(ObservableCollection<LyricLine>? allLines, LyricWord wordToMerge, bool withWordBefore)
         {
             var originalLine = allLines?.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToMerge));
-            if (originalLine != null)
+            if (originalLine == null)
             {
-                var originalLineIndex = allLines!.IndexOf(originalLine);
-                if (originalLine.Words != null)
-                {
-                    var originalWordIndex = originalLine.Words.IndexOf(wordToMerge);
-                    if ((withWordBefore && originalWordIndex < 1)
-                        || (!withWordBefore && originalWordIndex == originalLine.Words.Count - 1))
-                    {
-                        return; // I don't wanna.  TODO: I guess this would move the word to the line in question?
-                    }
-
-                    if (withWordBefore)
-                    {
-                        var prevWordIndex = originalWordIndex - 1;
-                        var prevWord = originalLine.Words[prevWordIndex];
-                        var newWord = new LyricWord
-                        {
-                            StartSecond = prevWord.StartSecond,
-                            EndSecond = wordToMerge.EndSecond,
-                            Text = $"{prevWord.Text.TrimEnd()}{wordToMerge.Text.TrimStart()}"
-                        };
-                        originalLine.Words = new ObservableCollection<LyricWord>(
-                            originalLine.Words.Take(prevWordIndex).Concat(new []{newWord}).Concat(originalLine.Words.Skip(originalWordIndex + 1)));
-                    }
-                    else
-                    {
-                        var nextWordIndex = originalWordIndex + 1;
-                        var nextWord = originalLine.Words[nextWordIndex];
-                        var newWord = new LyricWord
-                        {
-                            StartSecond = wordToMerge.StartSecond,
-                            EndSecond = nextWord.EndSecond,
-                            Text = $"{wordToMerge.Text.TrimEnd()}{nextWord.Text.TrimStart()}"
-                        };
-                        originalLine.Words = new ObservableCollection<LyricWord>(
-                            originalLine.Words.Take(originalWordIndex).Concat(new[] { newWord }).Concat(originalLine.Words.Skip(nextWordIndex + 1)));
-                    }
-                }
+                return null;
             }
+
+            var originalLineIndex = allLines!.IndexOf(originalLine);
+
+            if (originalLine.Words == null)
+            {
+                return null;
+            }
+
+            var originalWordIndex = originalLine.Words.IndexOf(wordToMerge);
+            if ((withWordBefore && originalWordIndex < 1)
+                || (!withWordBefore && originalWordIndex == originalLine.Words.Count - 1))
+            {
+                return null; // I don't wanna.  TODO: I guess this would move the word to the line in question?
+            }
+
+            // either we're merging with the word with the previous index or the next index
+            var firstWordIndex = withWordBefore ? originalWordIndex - 1 : originalWordIndex;
+            var secondWordIndex = withWordBefore ? originalWordIndex : originalWordIndex + 1;
+            var firstWord = originalLine.Words[firstWordIndex];
+            var secondWord = originalLine.Words[secondWordIndex];
+
+            var replacementWord = new LyricWord
+            {
+                StartSecond = firstWord.StartSecond,
+                EndSecond = secondWord.EndSecond,
+                Text = $"{firstWord.Text.TrimEnd()}{secondWord.Text.TrimStart()}"
+            };
+
+            originalLine.Words = new ObservableCollection<LyricWord>(
+                originalLine.Words.Take(firstWordIndex).Concat(new[] { replacementWord })
+                    .Concat(originalLine.Words.Skip(secondWordIndex + 1)));
+
+            return replacementWord;
         }
     }
 }

From 27bc7fd3427fe69630d596dd1d69e1a92bc30ff0 Mon Sep 17 00:00:00 2001
From: Kadda OK <151568451+KaddaOK@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:15:24 -0600
Subject: [PATCH 8/8] 2.0 beta (#9)

Changes from dev 2.0 branch
---
 .github/workflows/publish.yml                 |  22 +-
 .../ViewModels/EditLinesViewModelTests.cs     |  15 +-
 .../KaddaOK.AvaloniaApp.Windows.csproj        |   2 +
 KaddaOK.AvaloniaApp/App.axaml                 |   9 +
 KaddaOK.AvaloniaApp/App.axaml.cs              |   4 +-
 .../Dialogs/EditSyllableTextDialog.axaml      |   5 +-
 .../Dialogs/InsertNewLineDialog.axaml         |   2 +-
 .../Controls/Dialogs/NudgeTimingsDialog.axaml |  59 ++
 .../Dialogs/NudgeTimingsDialog.axaml.cs       |  36 +
 .../Controls/InitialSyncOption.axaml          | 130 ++++
 .../Controls/InitialSyncOption.axaml.cs       |  73 ++
 .../Controls/OverlayRectangle.axaml           | 128 ++--
 .../EnumEqualityBooleanConverter.cs           |  31 +
 .../KaddaOK.AvaloniaApp.csproj                |  13 +-
 KaddaOK.AvaloniaApp/Models/EditingLine.cs     |  41 +-
 KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs  | 143 +++-
 .../Models/ManualTimingLine.cs                |  98 +++
 KaddaOK.AvaloniaApp/ScrollIntoViewBehavior.cs |  25 +
 KaddaOK.AvaloniaApp/Services/KbpImporter.cs   |   2 +-
 KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs |   2 +-
 .../TimingWordHasBeenSetConverters.cs         |  44 ++
 .../TimingWordIsPlayingConverter.cs           |  36 +
 .../ViewModels/AboutViewModel.cs              |   8 +-
 .../ViewModels/AudioViewModel.cs              |  84 +--
 .../DesignTime/DesignTimeKaraokeProcess.cs    |   2 +
 .../DesignTime/DesignTimeLyricsViewModel.cs   |   2 +-
 .../DesignTimeManualAlignViewModel.cs         |  22 +
 .../DesignTime/DesignTimeStartViewModel.cs    |   9 +
 .../ViewModels/EditLinesViewModel.cs          | 381 ++++------
 .../ViewModels/LyricsViewModel.cs             |  67 +-
 .../ViewModels/ManualAlignViewModel.cs        | 670 ++++++++++++++++++
 .../ViewModels/NarrowingViewModel.cs          |   3 +-
 .../ViewModels/RecognizeViewModel.cs          |  72 +-
 .../ViewModels/StartViewModel.cs              | 191 +++++
 KaddaOK.AvaloniaApp/Views/AboutView.axaml     |   9 +-
 KaddaOK.AvaloniaApp/Views/AudioView.axaml     |  39 +-
 KaddaOK.AvaloniaApp/Views/EditLinesView.axaml |  94 ++-
 .../Views/EditLinesView.axaml.cs              | 140 +++-
 KaddaOK.AvaloniaApp/Views/ExportView.axaml    |   3 +
 KaddaOK.AvaloniaApp/Views/LyricsView.axaml    | 125 +++-
 KaddaOK.AvaloniaApp/Views/MainView.axaml      | 138 ++--
 KaddaOK.AvaloniaApp/Views/MainWindow.axaml    |  31 +-
 .../Views/ManualAlignView.axaml               | 462 ++++++++++++
 .../Views/ManualAlignView.axaml.cs            |  87 +++
 KaddaOK.AvaloniaApp/Views/NarrowingView.axaml |   7 +-
 KaddaOK.AvaloniaApp/Views/RecognizeView.axaml |  38 +-
 KaddaOK.AvaloniaApp/Views/StartView.axaml     | 281 ++++++++
 KaddaOK.AvaloniaApp/Views/StartView.axaml.cs  |  29 +
 KaddaOK.AvaloniaApp/Views/TabIndexes.cs       |  21 +
 .../WaveformToPointConverter.cs               |  16 +-
 KaddaOK.Library.Tests/NfaCtmImporterTests.cs  | 165 +++++
 KaddaOK.Library/KnownOriginalLyrics.cs        |  23 +-
 KaddaOK.Library/LineSplitter.cs               |  29 +-
 KaddaOK.Library/LyricLine.cs                  |  26 +-
 KaddaOK.Library/LyricWord.cs                  |  27 +
 KaddaOK.Library/NfaCtmImporter.cs             |  82 ++-
 KaddaOK.Library/RzProjectGenerator.cs         |  30 +-
 KaddaOK.Library/WordMerger.cs                 |  23 +-
 58 files changed, 3599 insertions(+), 757 deletions(-)
 create mode 100644 KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml
 create mode 100644 KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml.cs
 create mode 100644 KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml
 create mode 100644 KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml.cs
 create mode 100644 KaddaOK.AvaloniaApp/EnumEqualityBooleanConverter.cs
 create mode 100644 KaddaOK.AvaloniaApp/Models/ManualTimingLine.cs
 create mode 100644 KaddaOK.AvaloniaApp/ScrollIntoViewBehavior.cs
 create mode 100644 KaddaOK.AvaloniaApp/TimingWordHasBeenSetConverters.cs
 create mode 100644 KaddaOK.AvaloniaApp/TimingWordIsPlayingConverter.cs
 create mode 100644 KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeManualAlignViewModel.cs
 create mode 100644 KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeStartViewModel.cs
 create mode 100644 KaddaOK.AvaloniaApp/ViewModels/ManualAlignViewModel.cs
 create mode 100644 KaddaOK.AvaloniaApp/ViewModels/StartViewModel.cs
 create mode 100644 KaddaOK.AvaloniaApp/Views/ManualAlignView.axaml
 create mode 100644 KaddaOK.AvaloniaApp/Views/ManualAlignView.axaml.cs
 create mode 100644 KaddaOK.AvaloniaApp/Views/StartView.axaml
 create mode 100644 KaddaOK.AvaloniaApp/Views/StartView.axaml.cs
 create mode 100644 KaddaOK.AvaloniaApp/Views/TabIndexes.cs
 create mode 100644 KaddaOK.Library.Tests/NfaCtmImporterTests.cs

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d0f70ca..a78d0cc 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -12,26 +12,30 @@ jobs:
       - name: Set version number
         shell: pwsh
         run: |
-          $version = "0.1.0"
-          echo $version
-          echo "VERSION_NUMBER=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+          $versionNumber = "2.0.0"
+          $versionSuffix = "beta.1"
+          $infoVersion = "$versionNumber-$versionSuffix"
+          echo $infoVersion
+          echo "VERSION_NUMBER=$versionNumber" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+          echo "VERSION_SUFFIX=$versionSuffix" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+          echo "INFO_VERSION=$infoVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
       - uses: actions/checkout@v4
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
       - name: Publish for win-x64
-        run: dotnet publish KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj /p:Version=${{ env.VERSION_NUMBER }}.0 /p:Configuration=Release /p:RuntimeIdentifier=win-x64 /p:PublishSingleFile=true /p:PublishDir=${{ github.workspace }}/publish
+        run: dotnet publish KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj /p:VersionPrefix=${{ env.VERSION_NUMBER }} /p:VersionSuffix=${{ env.VERSION_SUFFIX }} /p:Configuration=Release /p:RuntimeIdentifier=win-x64 /p:PublishSingleFile=true /p:PublishDir=${{ github.workspace }}/publish
       - name: Zip for win-x64
         shell: pwsh
-        run: Compress-Archive -Path ${{ github.workspace }}/publish/* -DestinationPath KaddaOKTools_win-x64_${{ env.VERSION_NUMBER }}.zip
+        run: Compress-Archive -Path ${{ github.workspace }}/publish/* -DestinationPath KaddaOKTools_win-x64_${{ env.INFO_VERSION }}.zip
       - name: Upload win-x64 Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: KaddaOKTools_win-x64_${{ env.VERSION_NUMBER }}
-          path: KaddaOKTools_win-x64_${{ env.VERSION_NUMBER }}.zip
+          name: KaddaOKTools_win-x64_${{ env.INFO_VERSION }}
+          path: KaddaOKTools_win-x64_${{ env.INFO_VERSION }}.zip
       - name: Create Release
         uses: ncipollo/release-action@v1.13.0
         with:
-          artifacts: "KaddaOKTools_win-x64_${{ env.VERSION_NUMBER }}.zip"
-          tag: ${{ env.VERSION_NUMBER }}
+          artifacts: "KaddaOKTools_win-x64_${{ env.INFO_VERSION }}.zip"
+          tag: ${{ env.INFO_VERSION }}
diff --git a/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs b/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
index 0970b81..d0eee17 100644
--- a/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
+++ b/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
@@ -1,7 +1,9 @@
 using System.Collections.ObjectModel;
+using Avalonia.Input;
 using FluentAvalonia.Core;
 using KaddaOK.AvaloniaApp.Models;
 using KaddaOK.AvaloniaApp.ViewModels;
+using KaddaOK.AvaloniaApp.Views;
 using KaddaOK.Library;
 using NAudio.Wave;
 
@@ -26,6 +28,13 @@ private static KaraokeProcess GetNewCurrentProcess() =>
                 }
             };
 
+        public class DummyEditLinesView : IEditLinesView
+        {
+            public bool Focus(NavigationMethod method = NavigationMethod.Unspecified, KeyModifiers keyModifiers = KeyModifiers.None)
+            {
+                return true;
+            }
+        }
         public class MoveLineToPrevious
         {
             [Fact]
@@ -33,7 +42,8 @@ public void ShouldMergeLines()
             {
                 var currentProcess = GetNewCurrentProcess();
 
-                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler());
+                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
+                    { EditLinesView = new DummyEditLinesView() };
 
                 viewModel.MoveLineToPrevious(currentProcess.ChosenLines!.Last());
 
@@ -47,7 +57,8 @@ public void ShouldAddSpaceToPreviousWordWhenMergingLines()
             {
                 var currentProcess = GetNewCurrentProcess();
 
-                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler());
+                var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
+                    { EditLinesView = new DummyEditLinesView()};
 
                 viewModel.MoveLineToPrevious(currentProcess.ChosenLines!.Last());
 
diff --git a/KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj b/KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj
index 0b7a8ef..d70fcf5 100644
--- a/KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj
+++ b/KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj
@@ -12,6 +12,8 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AssemblyName>KaddaOKTools</AssemblyName>
+	<VersionPrefix>0.0.0</VersionPrefix>
+    <VersionSuffix>dev</VersionSuffix>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/KaddaOK.AvaloniaApp/App.axaml b/KaddaOK.AvaloniaApp/App.axaml
index f484f1a..5496234 100644
--- a/KaddaOK.AvaloniaApp/App.axaml
+++ b/KaddaOK.AvaloniaApp/App.axaml
@@ -123,11 +123,20 @@
 			<Setter Property="DialogMargin" Value="0" />
 			<Setter Property="dialogHost:DialogHostStyle.CornerRadius" Value="10" />
 		</Style>
+        <Style Selector="TextBlock.pageTitleHeader">
+            <Setter Property="FontSize" Value="28" />
+            <Setter Property="Margin" Value="0,0,0,10" />
+            <Setter Property="Foreground" Value="{DynamicResource SystemBaseMediumColor}" />
+        </Style>
     </Application.Styles>
 	<Application.Resources>
         <local:WaveformToPointConverter x:Key="WaveformToPointConverter" />
         <local:WaveformToLengthConverter x:Key="WaveformToLengthConverter" />
         <local:ObjectEqualityBooleanConverter x:Key="ObjectEqualityBooleanConverter" />
+        <local:EnumEqualityBooleanConverter x:Key="EnumEqualityBooleanConverter" />
         <local:RoundingConverter x:Key="RoundingConverter" />
+        <local:TimingWordIsPlayingConverter x:Key="TimingWordIsPlayingConverter" />
+        <local:TimingWordStartHasBeenSetConverter x:Key="TimingWordStartHasBeenSetConverter" />
+        <local:TimingWordEndHasBeenSetConverter x:Key="TimingWordEndHasBeenSetConverter" />
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/App.axaml.cs b/KaddaOK.AvaloniaApp/App.axaml.cs
index 3eeca92..34179c5 100644
--- a/KaddaOK.AvaloniaApp/App.axaml.cs
+++ b/KaddaOK.AvaloniaApp/App.axaml.cs
@@ -25,7 +25,7 @@ public override void Initialize()
 
         KaraokeProcess = new KaraokeProcess
         {
-            KaraokeSource = InitialKaraokeSource.AzureSpeechService
+            KaraokeSource = InitialKaraokeSource.NotSelected
         };
 
         services.AddSingleton(KaraokeProcess);
@@ -53,6 +53,8 @@ public override void Initialize()
         services.AddTransient<LyricsViewModel>();
         services.AddTransient<NarrowingViewModel>();
         services.AddTransient<RecognizeViewModel>();
+        services.AddTransient<StartViewModel>();
+        services.AddTransient<ManualAlignViewModel>();
 
         // Build the service provider
         ServiceProvider = services.BuildServiceProvider();
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
index 166fb8e..d8ac381 100644
--- a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
@@ -12,16 +12,17 @@
         <Grid RowDefinitions="*,*,*,*" MaxWidth="500">
             <Label
                 Content="{Binding StartSecond}"
+                IsVisible="{Binding Converter={StaticResource TimingWordStartHasBeenSetConverter}}"
                 HorizontalAlignment="Left" />
             <Label
                 Content="{Binding Text}"
                 HorizontalAlignment="Center" />
             <Label
                 Content="{Binding EndSecond}"
+                IsVisible="{Binding Converter={StaticResource TimingWordEndHasBeenSetConverter}}"
                 HorizontalAlignment="Right" />
 			<TextBlock Grid.Row="1" TextWrapping="Wrap">
-                Enter the new text for this timed syllable. (You may break it up into multiple words or syllables by using space or | characters, 
-                and the timing dialog will open automatically for you to check the new distribution.)
+                Enter the new text for this timed syllable. (You may break it up into multiple words or syllables by using space, /, or | characters.)
             </TextBlock>
             <TextBox
                 AttachedToVisualTree="TextBox_AttachedToVisualTree"
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/InsertNewLineDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/InsertNewLineDialog.axaml
index 73c3e36..014945f 100644
--- a/KaddaOK.AvaloniaApp/Controls/Dialogs/InsertNewLineDialog.axaml
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/InsertNewLineDialog.axaml
@@ -14,7 +14,7 @@
 				Enter the text for the new line.
 			</TextBlock>
 			<TextBlock TextWrapping="Wrap">
-				(To separate syllables, use a | (pipe) character.)
+				(To separate syllables, use a / or | character.)
 			</TextBlock>
 			<Grid ColumnDefinitions="36,*,36" RowDefinitions="*,*,*,*">
 				<Label FontSize="10" Content="{Binding PreviousLine.StartSecond}" />
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml
new file mode 100644
index 0000000..0074a40
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml
@@ -0,0 +1,59 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:dialogs="clr-namespace:KaddaOK.AvaloniaApp.Controls.Dialogs"
+             xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
+             xmlns:library="clr-namespace:KaddaOK.Library;assembly=KaddaOK.Library"
+             xmlns:viewModels="clr-namespace:KaddaOK.AvaloniaApp.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="350"
+             x:Class="KaddaOK.AvaloniaApp.Controls.Dialogs.NudgeTimingsDialog"
+             x:DataType="viewModels:NudgeTimingsViewModel">
+    <dialogs:ModalDialogChrome Title="Nudge All Timings">
+        <Grid RowDefinitions="170,30,100" MaxWidth="500">
+			<StackPanel>
+            <TextBlock TextWrapping="Wrap" Margin="2">
+				Shift all the starts and stops in the entire song by an offset value in seconds.
+			</TextBlock>
+            <TextBlock TextWrapping="Wrap" Margin="2">
+                Positive values will move everything later relative to the music, and should 
+                be applied if the scroll is happening too early. 
+            </TextBlock>
+            <TextBlock TextWrapping="Wrap" Margin="2">
+                Negative values will move everything earlier relative to the music, and should
+                be applied if the scroll isn't happening early enough.  
+			</TextBlock>
+            <TextBlock TextWrapping="Wrap" Margin="2">
+                For instance, to move everything 100ms earlier in the song to give singers more 
+                time to react, enter -0.1 in the input below.
+            </TextBlock>
+            </StackPanel>
+			<Grid Grid.Row="1" ColumnDefinitions="*, 30">
+
+                <NumericUpDown
+                    Increment="0.01"
+                    FormatString="{}{0:#,0.00}"
+                    Value="{Binding NudgeBy}"/>
+				<TextBlock Grid.Column="1" Text="s" Margin="5"/>
+			</Grid>
+
+            <StackPanel
+                Grid.Row="2"
+                Orientation="Horizontal"
+                HorizontalAlignment="Right"
+                Margin="0,10,0,0">
+                <Button
+                    Content="Apply"
+                    Classes="accent"
+                    Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
+                    CommandParameter="{Binding}" />
+
+                <Button
+                    Content="Cancel"
+                    Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}" />
+            </StackPanel>
+
+        </Grid>
+
+    </dialogs:ModalDialogChrome>
+</UserControl>
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml.cs b/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml.cs
new file mode 100644
index 0000000..37f7dcd
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml.cs
@@ -0,0 +1,36 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+using DialogHostAvalonia;
+
+namespace KaddaOK.AvaloniaApp.Controls.Dialogs
+{
+    public partial class NudgeTimingsDialog : UserControl
+    {
+        private DialogHost? dialogHost;
+
+        public NudgeTimingsDialog()
+        {
+            InitializeComponent();
+        }
+
+        private void TextBox_AttachedToVisualTree(object? sender, Avalonia.VisualTreeAttachmentEventArgs e)
+        {
+            (sender as TextBox)?.Focus();
+            dialogHost = this.FindAncestorOfType<DialogHost>();
+        }
+
+        private void TextBox_KeyDown(object? sender, Avalonia.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                dialogHost?.CloseDialogCommand.Execute(((TextBox)sender).Text);
+            }
+
+            if (e.Key == Key.Escape)
+            {
+                dialogHost?.CloseDialogCommand.Execute(null);
+            }
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml b/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml
new file mode 100644
index 0000000..95b476b
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml
@@ -0,0 +1,130 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="clr-namespace:KaddaOK.AvaloniaApp.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="KaddaOK.AvaloniaApp.Controls.InitialSyncOption"
+             x:DataType="local:InitialSyncOption">
+	<UserControl.Styles>
+		<Style Selector="Image.sourceMethodIconImage">
+			<Setter Property="Width" Value="32" />
+		</Style>
+		<Style Selector="ScrollViewer.gettingFile">
+			<Setter
+                Property="Cursor"
+                Value="Wait" />
+		</Style>
+		<Style Selector="ScrollViewer.gettingFile StackPanel">
+			<Setter
+                Property="IsEnabled"
+                Value="False" />
+		</Style>
+		<Style Selector="Label.waveformLabel">
+			<Setter
+                Property="Margin"
+                Value="0,10,0,0" />
+		</Style>
+		<Style Selector="Border.outerWaveformBorder">
+			<Setter
+                Property="Margin"
+                Value="0,2,0,5" />
+			<Setter
+                Property="Background"
+                Value="#FF061424" />
+			<Setter
+                Property="BorderBrush"
+                Value="Gray" />
+			<Setter
+                Property="BorderThickness"
+                Value="1" />
+			<Setter
+                Property="CornerRadius"
+                Value="5" />
+		</Style>
+		<Style Selector="Border.innerWaveformBorder">
+			<Setter
+                Property="Margin"
+                Value="0,5" />
+			<Setter
+                Property="MinHeight"
+                Value="50" />
+		</Style>
+
+		<Style Selector="TextBlock.introText">
+			<Setter
+                Property="Margin"
+                Value="0,0,0,10" />
+			<Setter
+                Property="TextWrapping"
+                Value="Wrap" />
+		</Style>
+		<Style Selector="Border.initialOptionBorder">
+			<Setter Property="Background">
+				<Setter.Value>
+					<LinearGradientBrush StartPoint="50%,0%" EndPoint="50%,100%">
+						<GradientStop Color="#FF385371" Offset="0" />
+						<GradientStop Color="#FF1E3851" Offset="0.5" />
+						<GradientStop Color="#FF112132" Offset="1" />
+					</LinearGradientBrush>
+				</Setter.Value>
+			</Setter>
+			<Setter Property="BorderBrush" Value="#FF5A6A83" />
+			<Setter Property="BorderThickness" Value="0,1,0,0" />
+			<Setter Property="Padding" Value="25, 12" />
+			<Setter Property="CornerRadius" Value="30" />
+			<Setter Property="Margin" Value="0,20,0,0" />
+		</Style>
+		<Style Selector="StackPanel.optionMainLineStackPanel">
+			<Setter Property="VerticalAlignment" Value="Center" />
+		</Style>
+		<Style Selector="StackPanel.optionMainLineStackPanel TextBlock">
+			<Setter Property="VerticalAlignment" Value="Center" />
+			<Setter Property="Margin" Value="10,0" />
+		</Style>
+		<Style Selector="StackPanel.optionMainLineStackPanel Button">
+			<Setter Property="Padding" Value="15,10" />
+			<Setter Property="VerticalAlignment" Value="Center" />
+		</Style>
+		<Style Selector="StackPanel.moreInfoStackPanel">
+			<Setter Property="Margin" Value="5" />
+		</Style>
+		<Style Selector="TextBlock.linkButtonText">
+			<Setter Property="FontFamily" Value="Arial" />
+			<Setter Property="FontStyle" Value="Italic" />
+		</Style>
+		<Style Selector="TextBlock.summarySentence">
+			<Setter Property="Margin" Value="5,10,0,5" />
+		</Style>
+	</UserControl.Styles>
+	<Border Classes="initialOptionBorder">
+		<StackPanel>
+			<Grid ColumnDefinitions="50,*,60">
+				<Image VerticalAlignment="Center" Classes="sourceMethodIconImage" Source="{Binding $parent[local:InitialSyncOption].IconDrawing}" />
+				<TextBlock VerticalAlignment="Center" Margin="10,0" FontWeight="Bold" Grid.Column="1" Text="{Binding $parent[local:InitialSyncOption].OptionTitle}" />
+				<Button VerticalAlignment="Center" Content="GO ->"
+                        Command="{Binding $parent[local:InitialSyncOption].ChooseCommand}"
+                        Grid.Column="2" />
+			</Grid>
+			<StackPanel Orientation="Horizontal" Classes="optionMainLineStackPanel">
+				<TextBlock Classes="summarySentence">
+					<Run Text="{Binding $parent[local:InitialSyncOption].OptionSummary}"/> <InlineUIContainer>
+						<Button Margin="0" Padding="0" Background="Transparent"
+							Command="{Binding $parent[local:InitialSyncOption].ShowMoreInfoCommand}"
+							IsVisible="{Binding !$parent[local:InitialSyncOption].MoreInfoVisible}">
+							<TextBlock Classes="linkButtonText">(more info)</TextBlock>
+						</Button>
+					</InlineUIContainer>
+				</TextBlock>
+			</StackPanel>
+			<StackPanel IsVisible="{Binding $parent[local:InitialSyncOption].MoreInfoVisible}"
+				Classes="moreInfoStackPanel">
+				<ItemsControl ItemsSource="{Binding $parent[local:InitialSyncOption].MoreInfoContent}" />
+				<Button Margin="0" Padding="0" Background="Transparent"
+					Command="{Binding $parent[local:InitialSyncOption].HideMoreInfo}">
+					<TextBlock Classes="linkButtonText">(less info)</TextBlock>
+				</Button>
+			</StackPanel>
+		</StackPanel>
+	</Border>
+</UserControl>
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml.cs b/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml.cs
new file mode 100644
index 0000000..b2eb164
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml.cs
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using CommunityToolkit.Mvvm.Input;
+
+namespace KaddaOK.AvaloniaApp.Controls;
+
+public partial class InitialSyncOption : UserControl
+{
+    public InitialSyncOption()
+    {
+        InitializeComponent();
+        MoreInfoContent = new List<Control>();
+    }
+    
+    public static readonly StyledProperty<ICommand> ChooseCommandProperty = AvaloniaProperty.Register<InitialSyncOption, ICommand>(nameof(ChooseCommand));
+    public static readonly StyledProperty<string> OptionTitleProperty = AvaloniaProperty.Register<InitialSyncOption, string>(nameof(OptionTitle));
+    public static readonly StyledProperty<string> OptionSummaryProperty = AvaloniaProperty.Register<InitialSyncOption, string>(nameof(OptionSummary));
+    public static readonly StyledProperty<IEnumerable<Control>> MoreInfoContentProperty = AvaloniaProperty.Register<InitialSyncOption, IEnumerable<Control>>(nameof(MoreInfoContent));
+    public static readonly StyledProperty<DrawingImage> IconDrawingProperty = AvaloniaProperty.Register<InitialSyncOption, DrawingImage>(nameof(IconDrawing));
+    public static readonly StyledProperty<bool> MoreInfoVisibleProperty = AvaloniaProperty.Register<InitialSyncOption, bool>(nameof(MoreInfoVisible));
+
+    public ICommand ChooseCommand
+    {
+        get => GetValue(ChooseCommandProperty);
+        set => SetValue(ChooseCommandProperty, value);
+    }
+    
+    public string OptionTitle
+    {
+        get => GetValue(OptionTitleProperty);
+        set => SetValue(OptionTitleProperty, value);
+    }
+
+    public string OptionSummary
+    {
+        get => GetValue(OptionSummaryProperty);
+        set => SetValue(OptionSummaryProperty, value);
+    }
+
+    public IEnumerable<Control> MoreInfoContent
+    {
+        get => GetValue(MoreInfoContentProperty);
+        set => SetValue(MoreInfoContentProperty, value);
+    }
+
+    public DrawingImage IconDrawing
+    {
+        get => GetValue(IconDrawingProperty);
+        set => SetValue(IconDrawingProperty, value);
+    }
+
+    // Encapsulated properties and commands
+    public bool MoreInfoVisible
+    {
+        get => GetValue(MoreInfoVisibleProperty);
+        set => SetValue(MoreInfoVisibleProperty, value);
+    }
+
+    [RelayCommand]
+    public void HideMoreInfo(object? parameter)
+    {
+        MoreInfoVisible = false;
+    }
+    [RelayCommand]
+    public void ShowMoreInfo(object? parameter)
+    {
+        MoreInfoVisible = true;
+    }
+}
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Controls/OverlayRectangle.axaml b/KaddaOK.AvaloniaApp/Controls/OverlayRectangle.axaml
index c380215..845d691 100644
--- a/KaddaOK.AvaloniaApp/Controls/OverlayRectangle.axaml
+++ b/KaddaOK.AvaloniaApp/Controls/OverlayRectangle.axaml
@@ -1,22 +1,32 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:KaddaOK.AvaloniaApp.Controls"
-             mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="50"
-             x:Class="KaddaOK.AvaloniaApp.Controls.OverlayRectangle"
-             x:DataType="controls:OverlayRectangle">
-    <UserControl.Styles>
-        <Style Selector="controls|DragHandleLine">
-            <Setter Property="Stroke" Value="Transparent" />
-            <Setter Property="Cursor" Value="SizeWestEast" />
-			<Setter Property="StrokeThickness" Value="5" />
-        </Style>
-    </UserControl.Styles>
-    <UserControl.Template>
-        <ControlTemplate>
+<UserControl
+	xmlns="https://github.com/avaloniaui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:controls="clr-namespace:KaddaOK.AvaloniaApp.Controls"
+	mc:Ignorable="d"
+	d:DesignWidth="100"
+	d:DesignHeight="50"
+	x:Class="KaddaOK.AvaloniaApp.Controls.OverlayRectangle"
+	x:DataType="controls:OverlayRectangle">
+	<UserControl.Styles>
+		<Style Selector="controls|DragHandleLine">
+			<Setter
+				Property="Stroke"
+				Value="Transparent" />
+			<Setter
+				Property="Cursor"
+				Value="SizeWestEast" />
+			<Setter
+				Property="StrokeThickness"
+				Value="5" />
+		</Style>
+	</UserControl.Styles>
+	<UserControl.Template>
+		<ControlTemplate>
 			<Grid>
-				<Rectangle Name="DisplayRectangle"
+				<Rectangle
+					Name="DisplayRectangle"
 					StrokeThickness="{TemplateBinding StrokeThickness}"
 					Stroke="{TemplateBinding Stroke}"
 					Fill="{TemplateBinding Fill}"
@@ -24,29 +34,53 @@
 					Classes.isVertical="{TemplateBinding IsVertical}">
 					<Rectangle.Styles>
 						<Style Selector="Rectangle">
-							<Setter Property="Height" Value="{TemplateBinding Height}" />
+							<Setter
+								Property="Height"
+								Value="{TemplateBinding Height}" />
 							<Setter Property="Width">
 								<Setter.Value>
 									<MultiBinding Converter="{StaticResource WaveformToLengthConverter}">
-										<Binding Path="StartSecond" RelativeSource="{RelativeSource TemplatedParent}" />
-										<Binding Path="EndSecond" RelativeSource="{RelativeSource TemplatedParent}" />
-										<Binding Path="WaveformDraw.WaveformLengthSeconds" RelativeSource="{RelativeSource TemplatedParent}" />
-										<Binding Path="WaveformDraw.DesiredImageWidth" RelativeSource="{RelativeSource TemplatedParent}" />
-										<Binding Path="StartOffsetSecond" RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="StartSecond"
+											RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="EndSecond"
+											RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="WaveformDraw.WaveformLengthSeconds"
+											RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="WaveformDraw.DesiredImageWidth"
+											RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="StartOffsetSecond"
+											RelativeSource="{RelativeSource TemplatedParent}" />
 									</MultiBinding>
 								</Setter.Value>
 							</Setter>
 						</Style>
 						<Style Selector="Rectangle.isVertical">
-							<Setter Property="Width" Value="{TemplateBinding Width}" />
+							<Setter
+								Property="Width"
+								Value="{TemplateBinding Width}" />
 							<Setter Property="Height">
 								<Setter.Value>
 									<MultiBinding Converter="{StaticResource WaveformToLengthConverter}">
-										<Binding Path="StartSecond" RelativeSource="{RelativeSource TemplatedParent}" />
-										<Binding Path="EndSecond" RelativeSource="{RelativeSource TemplatedParent}" />
-										<Binding Path="WaveformDraw.WaveformLengthSeconds" RelativeSource="{RelativeSource TemplatedParent}" />
-										<Binding Path="WaveformDraw.DesiredImageWidth" RelativeSource="{RelativeSource TemplatedParent}" />
-										<Binding Path="StartOffsetSecond" RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="StartSecond"
+											RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="EndSecond"
+											RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="WaveformDraw.WaveformLengthSeconds"
+											RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="WaveformDraw.DesiredImageWidth"
+											RelativeSource="{RelativeSource TemplatedParent}" />
+										<Binding
+											Path="StartOffsetSecond"
+											RelativeSource="{RelativeSource TemplatedParent}" />
 									</MultiBinding>
 								</Setter.Value>
 							</Setter>
@@ -54,23 +88,23 @@
 					</Rectangle.Styles>
 				</Rectangle>
 				<controls:DragHandleLine
-                      Name="LeftBounds"
-                      StartPoint="{Binding #DisplayRectangle.Bounds.TopLeft}" 
-                      EndPoint="{Binding  #DisplayRectangle.Bounds.BottomLeft}"
-                      ContainerTotalSeconds="{Binding WaveformDraw.WaveformLengthSeconds, RelativeSource={RelativeSource TemplatedParent}}"
-                      ContainerWidth="{Binding WaveformDraw.DesiredImageWidth, RelativeSource={RelativeSource TemplatedParent}}"
-                      ContainerOffsetSeconds="{Binding StartOffsetSecond, RelativeSource={RelativeSource TemplatedParent}}"
-                      />
+					IsVisible="{Binding AllowDrag, RelativeSource={RelativeSource TemplatedParent}}"
+					Name="LeftBounds"
+					StartPoint="{Binding #DisplayRectangle.Bounds.TopLeft}"
+					EndPoint="{Binding  #DisplayRectangle.Bounds.BottomLeft}"
+					ContainerTotalSeconds="{Binding WaveformDraw.WaveformLengthSeconds, RelativeSource={RelativeSource TemplatedParent}}"
+					ContainerWidth="{Binding WaveformDraw.DesiredImageWidth, RelativeSource={RelativeSource TemplatedParent}}"
+					ContainerOffsetSeconds="{Binding StartOffsetSecond, RelativeSource={RelativeSource TemplatedParent}}" />
 				<controls:DragHandleLine
-                      Name="RightBounds" 
-                      StartPoint="{Binding #DisplayRectangle.Bounds.TopRight}" 
-                      EndPoint="{Binding  #DisplayRectangle.Bounds.BottomRight}" 
-                      ContainerTotalSeconds="{Binding WaveformDraw.WaveformLengthSeconds, RelativeSource={RelativeSource TemplatedParent}}"
-                      ContainerWidth="{Binding WaveformDraw.DesiredImageWidth, RelativeSource={RelativeSource TemplatedParent}}" 
-                      ContainerOffsetSeconds="{Binding StartOffsetSecond, RelativeSource={RelativeSource TemplatedParent}}"
-                      />
+					IsVisible="{Binding AllowDrag, RelativeSource={RelativeSource TemplatedParent}}"
+					Name="RightBounds"
+					StartPoint="{Binding #DisplayRectangle.Bounds.TopRight}"
+					EndPoint="{Binding  #DisplayRectangle.Bounds.BottomRight}"
+					ContainerTotalSeconds="{Binding WaveformDraw.WaveformLengthSeconds, RelativeSource={RelativeSource TemplatedParent}}"
+					ContainerWidth="{Binding WaveformDraw.DesiredImageWidth, RelativeSource={RelativeSource TemplatedParent}}"
+					ContainerOffsetSeconds="{Binding StartOffsetSecond, RelativeSource={RelativeSource TemplatedParent}}" />
 			</Grid>
-        </ControlTemplate>
-    </UserControl.Template>
+		</ControlTemplate>
+	</UserControl.Template>
 
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/EnumEqualityBooleanConverter.cs b/KaddaOK.AvaloniaApp/EnumEqualityBooleanConverter.cs
new file mode 100644
index 0000000..c474847
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/EnumEqualityBooleanConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Data.Converters;
+using Newtonsoft.Json.Linq;
+
+namespace KaddaOK.AvaloniaApp
+{
+    public class EnumEqualityBooleanConverter : IMultiValueConverter
+    {
+        public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (values.Count != 2 || values.Any(v => v == null || v.ToString() == "(unset)")) return null;
+
+            if (values[0] != values[1] && values[0]?.ToString() == values[1]?.ToString())
+            {
+                if (values[0] is Enum enum1)
+                {
+                    if (values[1] is Enum enum2)
+                    {
+                        return enum1.Equals(enum2);
+                    }
+                }
+            }
+
+            return values[0] == values[1];
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/KaddaOK.AvaloniaApp.csproj b/KaddaOK.AvaloniaApp/KaddaOK.AvaloniaApp.csproj
index d36ca11..0cf71fd 100644
--- a/KaddaOK.AvaloniaApp/KaddaOK.AvaloniaApp.csproj
+++ b/KaddaOK.AvaloniaApp/KaddaOK.AvaloniaApp.csproj
@@ -4,7 +4,8 @@
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <Version>$(VersionPrefix)</Version>
+	<VersionPrefix>0.0.0</VersionPrefix>
+	<VersionSuffix>dev</VersionSuffix>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
@@ -44,6 +45,7 @@
     <PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0.2" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.4" />
+    <PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.0.10.9" />
     <PackageReference Include="AvaloniaColorPicker" Version="1.4.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
 
@@ -59,9 +61,18 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Controls\Dialogs\NudgeTimingsDialog.axaml.cs">
+      <DependentUpon>NudgeTimingsDialog.axaml</DependentUpon>
+    </Compile>
+    <Compile Update="Views\StartView.axaml.cs">
+      <DependentUpon>StartView.axaml</DependentUpon>
+    </Compile>
     <Compile Update="Views\EditLinesView.axaml.cs">
       <DependentUpon>EditLinesView.axaml</DependentUpon>
     </Compile>
+    <Compile Update="Views\ManualAlignView.axaml.cs">
+      <DependentUpon>ManualAlignView.axaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 
 	<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
diff --git a/KaddaOK.AvaloniaApp/Models/EditingLine.cs b/KaddaOK.AvaloniaApp/Models/EditingLine.cs
index 419a2fc..2076f56 100644
--- a/KaddaOK.AvaloniaApp/Models/EditingLine.cs
+++ b/KaddaOK.AvaloniaApp/Models/EditingLine.cs
@@ -53,14 +53,9 @@ public ObservableQueue<TimingWord>? WordTimingQueue
         public EditingLine(LyricLine line)
         {
             OriginalLine = line;
-            NewTiming = new ObservableCollection<TimingWord>(line
-                .Words?
-                .Select(w => new TimingWord
-                {
-                    Text = w.Text,
-                    EndSecond = Math.Round(w.EndSecond, 2),
-                    StartSecond = Math.Round(w.StartSecond, 2)
-                }) ?? Array.Empty<TimingWord>());
+            NewTiming = new ObservableCollection<TimingWord>(
+                line.Words?.Select(TimingWord.FromLyricWord) 
+                ?? Array.Empty<TimingWord>());
         }
     }
 
@@ -86,5 +81,35 @@ public bool IsNext
             get => isNext;
             set => SetProperty(ref isNext, value);
         }
+
+        private bool startHasBeenManuallySet;
+        public bool StartHasBeenManuallySet
+        {
+            get => startHasBeenManuallySet;
+            set => SetProperty(ref startHasBeenManuallySet, value);
+        }
+
+        private bool endHasBeenManuallySet;
+        public bool EndHasBeenManuallySet
+        {
+            get => endHasBeenManuallySet;
+            set => SetProperty(ref endHasBeenManuallySet, value);
+        }
+
+        public static TimingWord FromLyricWord(LyricWord word)
+        {
+            return new TimingWord
+            {
+                Text = word.Text,
+                EndSecond = Math.Round(word.EndSecond, 2),
+                StartSecond = Math.Round(word.StartSecond, 2)
+            };
+        }
+
+        public static List<TimingWord> GetTimingWordsAcrossTime(string? enteredText, double startTime, double endTime)
+        {
+            var lyricWords = LyricWord.GetLyricWordsAcrossTime(enteredText, startTime, endTime);
+            return lyricWords.Select(TimingWord.FromLyricWord).ToList();
+        }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs b/KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs
index 142358e..90a5bd3 100644
--- a/KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs
+++ b/KaddaOK.AvaloniaApp/Models/KaraokeProcess.cs
@@ -11,10 +11,12 @@ namespace KaddaOK.AvaloniaApp.Models
 {
     public enum InitialKaraokeSource
     {
+        NotSelected,
         AzureSpeechService,
         RzlrcImport,
         KbpImport,
-        CtmImport
+        CtmImport,
+        ManualSync
     }
 
     public partial class KaraokeProcess : ObservableBase
@@ -23,16 +25,28 @@ public partial class KaraokeProcess : ObservableBase
         public InitialKaraokeSource KaraokeSource
         {
             get => _karaokeSource;
-            set => SetProperty(ref _karaokeSource, value);
+            set
+            {
+                SetProperty(ref _karaokeSource, value);
+                RaisePropertyChanged(nameof(KaraokeSourceIsSet));
+                RaisePropertyChanged(nameof(RecognizeTabVisible));
+                RaisePropertyChanged(nameof(NarrowTabVisible));
+                RaisePropertyChanged(nameof(ManualAlignTabVisible));
+                RaisePropertyChanged(nameof(LyricsTabVisible));
+                RaisePropertyChanged(nameof(ManualAlignIsEnabled));
+                RaisePropertyChanged(nameof(ReasonManualAlignIsDisabled));
+                RaisePropertyChanged(nameof(EditTabIsEnabled));
+                RaisePropertyChanged(nameof(ReasonEditTabIsDisabled));
+            }
         }
 
-        private string? _existingKaraokeImportFilePath;
-        public string? ExistingKaraokeImportFilePath
+        private string? _importedKaraokeSourceFilePath;
+        public string? ImportedKaraokeSourceFilePath
         {
-            get => _existingKaraokeImportFilePath;
+            get => _importedKaraokeSourceFilePath;
             set
             {
-                if (SetProperty(ref _existingKaraokeImportFilePath, value))
+                if (SetProperty(ref _importedKaraokeSourceFilePath, value))
                 {
                     AudioStepCompletenessChanged();
                 };
@@ -67,12 +81,16 @@ public int? SelectedTabIndex
             set => SetProperty(ref _selectedTabIndex, value);
         }
 
+        public bool KaraokeSourceIsSet => KaraokeSource != InitialKaraokeSource.NotSelected;
+
         #region Audio Step
 
         public void AudioStepCompletenessChanged()
         {
             RaisePropertyChanged(nameof(ReasonAudioStepIsIncomplete));
             RaisePropertyChanged(nameof(AudioStepIsComplete));
+            RaisePropertyChanged(nameof(ReasonManualAlignIsDisabled));
+            RaisePropertyChanged(nameof(ManualAlignIsEnabled));
         }
 
         public bool AudioStepIsComplete => string.IsNullOrWhiteSpace(ReasonAudioStepIsIncomplete);
@@ -183,11 +201,11 @@ public void ClearAudioAndDownstream()
             UnseparatedAudioStream = null;
             InstrumentalAudioFilePath = null;
             InstrumentalAudioStream = null;
-            ExistingKaraokeImportFilePath = null;
+            ImportedKaraokeSourceFilePath = null;
             OriginalImportedKbpFile = null;
             OriginalImportedRzlrcFile = null;
             OriginalImportedRzlrcPage = null;
-            KaraokeSource = InitialKaraokeSource.AzureSpeechService;
+            //KaraokeSource = InitialKaraokeSource.AzureSpeechService;
             ClearLyricsAndDownstream();
         }
 
@@ -195,6 +213,10 @@ public void ClearAudioAndDownstream()
 
         #region Lyrics Step
 
+        public bool LyricsTabVisible => KaraokeSource != InitialKaraokeSource.KbpImport 
+                                        && KaraokeSource != InitialKaraokeSource.RzlrcImport
+                                        && KaraokeSource != InitialKaraokeSource.NotSelected;
+
         private string? _lyricsFilePath;
         public string? LyricsFilePath
         {
@@ -219,6 +241,8 @@ public void LyricsStepCompletenessChanged()
         {
             RaisePropertyChanged(nameof(ReasonLyricsStepIsIncomplete));
             RaisePropertyChanged(nameof(LyricsStepIsComplete));
+            RaisePropertyChanged(nameof(ReasonManualAlignIsDisabled));
+            RaisePropertyChanged(nameof(ManualAlignIsEnabled));
         }
 
         public bool LyricsStepIsComplete => string.IsNullOrWhiteSpace(ReasonLyricsStepIsIncomplete);
@@ -227,9 +251,9 @@ public string? ReasonLyricsStepIsIncomplete
         {
             get
             {
-                if (!KnownOriginalLyrics?.Lyrics?.Any() ?? true)
+                if (!KnownOriginalLyrics?.SeparatorCleansedLines?.Any() ?? true)
                 {
-                    return "Lyrics must be supplied for a quality result.";
+                    return "Lyrics are required for this project type.";
                 }
 
                 return null;
@@ -247,6 +271,8 @@ public void ClearLyricsAndDownstream()
 
         #region Recognize Step
 
+        public bool RecognizeTabVisible => KaraokeSource == InitialKaraokeSource.AzureSpeechService;
+
         private ObservableCollection<LinePossibilities>? detectedLinePossibilities;
         public ObservableCollection<LinePossibilities>? DetectedLinePossibilities
         {
@@ -309,8 +335,101 @@ public void ClearRecognizeAndDownstream()
 
         #endregion
 
+        #region Manual Alignment
+        private ObservableCollection<ManualTimingLine>? manualTimingLines;
+        public ObservableCollection<ManualTimingLine>? ManualTimingLines
+        {
+            get => manualTimingLines;
+            set
+            {
+                if (SetProperty(ref manualTimingLines, value))
+                {
+                    ManualAlignmentCompletenessChanged();
+                };
+            }
+        }
+
+        public int TotalWordsInManualTiming
+        {
+            get
+            {
+                if (!(ManualTimingLines?.Any() ?? false)) return 0;
+
+                return ManualTimingLines.SelectMany(m => m.Words).Count();
+            }
+        }
+
+        public int TimedWordsInManualTiming
+        {
+            get
+            {
+                if (!(ManualTimingLines?.Any() ?? false)) return 0;
+
+                return ManualTimingLines.SelectMany(m => m.Words).Count(m => m.StartHasBeenManuallySet && m.EndHasBeenManuallySet);
+            }
+        }
+
+        private ObservableQueue<TimingWord>? manualTimingQueue;
+        public ObservableQueue<TimingWord>? ManualTimingQueue
+        {
+            get => manualTimingQueue;
+            set => SetProperty(ref manualTimingQueue, value);
+        }
+
+        public bool ManualAlignTabVisible => KaraokeSource == InitialKaraokeSource.ManualSync;
+
+        public bool ManualAlignIsEnabled => string.IsNullOrWhiteSpace(ReasonManualAlignIsDisabled);
+
+        public string? ReasonManualAlignIsDisabled
+        {
+            get
+            {
+                if (KaraokeSource != InitialKaraokeSource.ManualSync)
+                {
+                    return "This is not a manual sync project.";
+                }
+
+                return ReasonAudioStepIsIncomplete ?? ReasonLyricsStepIsIncomplete;
+            }
+        }
+
+        public void ManualAlignmentCompletenessChanged()
+        {
+            RaisePropertyChanged(nameof(TimedWordsInManualTiming));
+            RaisePropertyChanged(nameof(TotalWordsInManualTiming));
+            RaisePropertyChanged(nameof(ReasonManualAlignmentIsIncomplete));
+            RaisePropertyChanged(nameof(ManualAlignmentIsComplete));
+            RaisePropertyChanged(nameof(ReasonEditTabIsDisabled));
+            RaisePropertyChanged(nameof(EditTabIsEnabled));
+        }
+
+        public bool ManualAlignmentIsComplete => string.IsNullOrWhiteSpace(ReasonManualAlignmentIsIncomplete);
+
+        public string? ReasonManualAlignmentIsIncomplete
+        {
+            get
+            {
+                if (ManualTimingLines == null || !ManualTimingLines.Any())
+                {
+                    return "There are no lines of lyrics.";
+                }
+
+                var unprocessedSyllables = TotalWordsInManualTiming - TimedWordsInManualTiming;
+                if (unprocessedSyllables > 0)
+                {
+                    return $"{unprocessedSyllables} syllables have not yet been timed.";
+                }
+
+                return null;
+            }
+        }
+        #endregion
+
+
         #region Narrow Step
 
+        public bool NarrowTabVisible => KaraokeSource == InitialKaraokeSource.AzureSpeechService;
+
         private ObservableCollection<LyricLine>? chosenLines;
         public ObservableCollection<LyricLine>? ChosenLines
         {
@@ -366,6 +485,10 @@ public string? ReasonEditTabIsDisabled
                 {
                     return null;
                 }
+                if (KaraokeSource == InitialKaraokeSource.ManualSync)
+                {
+                    return ReasonManualAlignmentIsIncomplete;
+                }
 
                 return ReasonNarrowingStepIsIncomplete;
             }
diff --git a/KaddaOK.AvaloniaApp/Models/ManualTimingLine.cs b/KaddaOK.AvaloniaApp/Models/ManualTimingLine.cs
new file mode 100644
index 0000000..34103b9
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Models/ManualTimingLine.cs
@@ -0,0 +1,98 @@
+using KaddaOK.Library;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+
+namespace KaddaOK.AvaloniaApp.Models
+{
+    public class ManualTimingLine : ObservableBase, ILyricLine<TimingWord>
+    {
+        public string? Text => string.Concat(Words.Select(w => w.Text));
+
+        private ObservableCollection<TimingWord> words;
+        public ObservableCollection<TimingWord> Words
+        {
+            get => words;
+            set
+            {
+                if (words?.Any() ?? false)
+                {
+                    foreach (var word in words)
+                    {
+                        word.PropertyChanged -= Word_PropertyChanged;
+                    }
+                }
+
+                SetProperty(ref words, value);
+
+                if (words != null)
+                {
+                    foreach (var word in words)
+                    {
+                        word.PropertyChanged += Word_PropertyChanged;
+                    }
+                }
+                RaisePropertyChanged(nameof(ManualStartSecond));
+                RaisePropertyChanged(nameof(ManualEndSecond));
+            }
+        }
+
+        public ManualTimingLine(IEnumerable<TimingWord> words)
+        {
+            Words = new ObservableCollection<TimingWord>(words);
+            foreach (var word in Words)
+            {
+                word.PropertyChanged += Word_PropertyChanged;
+            }
+        }
+
+        public ManualTimingLine()
+        {
+            words = new ObservableCollection<TimingWord>();
+        }
+
+        private void Word_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            RaisePropertyChanged(nameof(ManualStartSecond));
+            RaisePropertyChanged(nameof(ManualEndSecond));
+        }
+
+        public double? ManualStartSecond
+        {
+            get
+            {
+                var manualWords = Words?.Where(w => w.StartHasBeenManuallySet).ToList();
+                if (manualWords?.Any() ?? false)
+                {
+                    return Math.Round(manualWords.Select(w => w.StartSecond).Min(), 2);
+                }
+
+                return null;
+            }
+        }
+
+        public double? ManualEndSecond
+        {
+            get
+            {
+                var manualWords = Words?.Where(w => w.EndHasBeenManuallySet).ToList();
+                if (manualWords?.Any() ?? false)
+                {
+                    return Math.Round(manualWords.Select(w => w.EndSecond).Max(), 2);
+                }
+
+                return null;
+            }
+        }
+
+        public static LyricLine ToLyricLine(ManualTimingLine manualTimingLine)
+        {
+            return new LyricLine
+            {
+                Words = new ObservableCollection<LyricWord>(manualTimingLine.Words)
+            };
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/ScrollIntoViewBehavior.cs b/KaddaOK.AvaloniaApp/ScrollIntoViewBehavior.cs
new file mode 100644
index 0000000..d3e7206
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/ScrollIntoViewBehavior.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.VisualTree;
+using Avalonia.Xaml.Interactivity;
+using CommunityToolkit.Mvvm.Input;
+using KaddaOK.AvaloniaApp.Models;
+
+namespace KaddaOK.AvaloniaApp
+{
+    public class ScrollIntoViewMessage
+    {
+        public TimingWord Item { get; }
+
+        public ScrollIntoViewMessage(TimingWord item)
+        {
+            Item = item;
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/Services/KbpImporter.cs b/KaddaOK.AvaloniaApp/Services/KbpImporter.cs
index 61e9e6a..24b0d59 100644
--- a/KaddaOK.AvaloniaApp/Services/KbpImporter.cs
+++ b/KaddaOK.AvaloniaApp/Services/KbpImporter.cs
@@ -35,7 +35,7 @@ public async Task ImportKbpAsync(KaraokeProcess karaokeProcess, string kbpFilePa
             
             var kbpFile = Serializer.Deserialize(originalContents);
 
-            karaokeProcess.ExistingKaraokeImportFilePath = kbpFilePath;
+            karaokeProcess.ImportedKaraokeSourceFilePath = kbpFilePath;
             karaokeProcess.OriginalImportedKbpFile = kbpFile;
             karaokeProcess.ExportToFilePath = kbpFilePath;
             karaokeProcess.KaraokeSource = InitialKaraokeSource.KbpImport;
diff --git a/KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs b/KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs
index 7bb3ff4..a9f7576 100644
--- a/KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs
+++ b/KaddaOK.AvaloniaApp/Services/RzlrcImporter.cs
@@ -66,7 +66,7 @@ public RzlrcLyrics ImportRzlrc(string rzlrcPath)
 
         public async Task LoadRzlrcPageIntoKaraokeProcessAsync(KaraokeProcess karaokeProcess, RzlrcLyric rzlrcPageToLoad, string originalPath)
         {
-            karaokeProcess.ExistingKaraokeImportFilePath = originalPath;
+            karaokeProcess.ImportedKaraokeSourceFilePath = originalPath;
             karaokeProcess.ExportToFilePath = originalPath;
             karaokeProcess.KaraokeSource = InitialKaraokeSource.RzlrcImport;
             karaokeProcess.BackgroundColor = GetFromBGRUint(rzlrcPageToLoad.BKColor);
diff --git a/KaddaOK.AvaloniaApp/TimingWordHasBeenSetConverters.cs b/KaddaOK.AvaloniaApp/TimingWordHasBeenSetConverters.cs
new file mode 100644
index 0000000..f24eb43
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/TimingWordHasBeenSetConverters.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Data.Converters;
+using KaddaOK.AvaloniaApp.Models;
+using KaddaOK.Library.Ytmm;
+
+namespace KaddaOK.AvaloniaApp
+{
+    public class TimingWordStartHasBeenSetConverter : IValueConverter
+    {
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            var timingWord = value as TimingWord;
+
+            if (timingWord == null) return true;
+
+            return timingWord.StartHasBeenManuallySet;
+        }
+
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class TimingWordEndHasBeenSetConverter : IValueConverter
+    {
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            var timingWord = value as TimingWord;
+
+            if (timingWord == null) return true;
+
+            return timingWord.EndHasBeenManuallySet;
+        }
+
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/TimingWordIsPlayingConverter.cs b/KaddaOK.AvaloniaApp/TimingWordIsPlayingConverter.cs
new file mode 100644
index 0000000..15fa6e6
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/TimingWordIsPlayingConverter.cs
@@ -0,0 +1,36 @@
+using Avalonia.Data.Converters;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KaddaOK.AvaloniaApp
+{
+    internal class TimingWordIsPlayingConverter : IMultiValueConverter
+    {
+        public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+        {
+            bool isRunning = values[0] as bool? ?? false;
+            bool isRecording = values[1] as bool? ?? false;
+            bool isPlaying = values[2] as bool? ?? false;
+            bool startHasBeenManuallySet = values[3] as bool? ?? false;
+            double currentPlaybackPositionSeconds = values[4] as double? ?? 0;
+            double startSecond = values[5] as double? ?? 0;
+            bool endHasBeenManuallySet = values[6] as bool? ?? false;
+            double endSecond = values[7] as double? ?? 0;
+
+            return (isRunning && isRecording) 
+                   || 
+                   (isPlaying && !isRecording 
+                              && startHasBeenManuallySet && currentPlaybackPositionSeconds > startSecond 
+                              && endHasBeenManuallySet && currentPlaybackPositionSeconds < endSecond);
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/ViewModels/AboutViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/AboutViewModel.cs
index b5ae728..c8f770c 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/AboutViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/AboutViewModel.cs
@@ -1,12 +1,8 @@
 using CommunityToolkit.Mvvm.Input;
 using KaddaOK.AvaloniaApp.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using KaddaOK.AvaloniaApp.Models;
+using System.Diagnostics;
 
 namespace KaddaOK.AvaloniaApp.ViewModels
 {
@@ -16,7 +12,7 @@ public AboutViewModel(KaraokeProcess karaokeProcess) : base(karaokeProcess)
         {
         }
 
-        public string? AssemblyVersion => Assembly.GetExecutingAssembly().GetName().Version?.ToString();
+        public string? AssemblyVersion => FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion;
 
         [RelayCommand]
         private void LinkToLantern()
diff --git a/KaddaOK.AvaloniaApp/ViewModels/AudioViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/AudioViewModel.cs
index 67f53cf..406c085 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/AudioViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/AudioViewModel.cs
@@ -8,6 +8,7 @@
 using DialogHostAvalonia;
 using KaddaOK.AvaloniaApp.Models;
 using KaddaOK.AvaloniaApp.Services;
+using KaddaOK.AvaloniaApp.Views;
 using KaddaOK.Library.Ytmm;
 
 namespace KaddaOK.AvaloniaApp.ViewModels
@@ -100,84 +101,21 @@ protected void ClearAll()
         }
 
         [RelayCommand]
-        protected async Task Import()
+        public void GoToNextStep(object? parameter)
         {
-            if (App.MainWindow == null)
-            {
-                throw new InvalidOperationException(
-                    "Couldn't find the reference to MainWindow in order to show a dialog");
-            }
-
-            var options = new FilePickerOpenOptions
-            {
-                AllowMultiple = false,
-                Title = "Select an existing file to import",
-                FileTypeFilter = new FilePickerFileType[] { new ("Karaoke lyrics file")
-                {
-                    Patterns = new[] { "*.rzlrc", "*.kbp" }
-                } }
-            };
-            try
-            {
-                Dispatcher.UIThread.Invoke(() => { GettingFile = true; });
-                var results = await App.MainWindow.StorageProvider.OpenFilePickerAsync(options);
-                var result = results?.FirstOrDefault();
-                if (result != null)
-                {
-                    var previousFilePath = CurrentProcess!.ExistingKaraokeImportFilePath;
-                    var existingKaraokeImportFilePath = result.TryGetLocalPath();
-
-                    if (!string.IsNullOrWhiteSpace(existingKaraokeImportFilePath))
-                    {
-                        var extension = System.IO.Path.GetExtension(existingKaraokeImportFilePath);
-                        switch (extension)
-                        {
-                            case ".rzlrc":
-                                var imported = RzlrcImporter.ImportRzlrc(existingKaraokeImportFilePath);
-
-                                // TODO: if (imported == null || imported.Count == 0) // inform and cancel
-                                RzlrcLyric? selectedLayer = null;
-                                if (imported.Count > 1) // select one
-                                {
-                                    var dialogResult = await DialogHost.Show(imported, "AudioViewDialogHost");
-                                    selectedLayer = dialogResult as RzlrcLyric;
-                                }
-                                CurrentProcess.ClearAudioAndDownstream();
-                                CurrentProcess.OriginalImportedRzlrcFile = imported;
-                                CurrentProcess.OriginalImportedRzlrcPage = selectedLayer ?? imported.First();
-                                await RzlrcImporter.LoadRzlrcPageIntoKaraokeProcessAsync(CurrentProcess, CurrentProcess.OriginalImportedRzlrcPage, existingKaraokeImportFilePath);
-                                break;
-                            case ".kbp":
-                                CurrentProcess.ClearAudioAndDownstream();
-                                await KbpImporter.ImportKbpAsync(CurrentProcess, existingKaraokeImportFilePath);
-                                break;
-                            default:
-                                // TODO: inform better!
-                                throw new InvalidOperationException($"Import of {extension} files not yet supported.");
-                        }
-                    }
-                    CurrentProcess!.SelectedTabIndex = 4;
-                }
-                GettingFile = false;
-            }
-            catch (Exception e)
+            switch (CurrentProcess.KaraokeSource)
             {
-                // The user canceled or something went wrong
-                if (NotificationManager != null)
-                {
-                    NotificationManager.Position = NotificationPosition.BottomRight;
-                    NotificationManager.Show(new Notification("Error", $"An error occurred: {e.Message}", NotificationType.Error, TimeSpan.Zero));
-                }
-                GettingFile = false;
+                case InitialKaraokeSource.CtmImport:
+                case InitialKaraokeSource.KbpImport:
+                case InitialKaraokeSource.RzlrcImport:
+                    CurrentProcess.SelectedTabIndex = (int)TabIndexes.Edit;
+                    break;
+                default:
+                    CurrentProcess.SelectedTabIndex = (int)TabIndexes.Lyrics;
+                    break;
             }
         }
 
-        [RelayCommand]
-        public void GoToNextStep(object? parameter)
-        {
-            CurrentProcess!.SelectedTabIndex = 1;
-        }
-
         [RelayCommand]
         private void LinkToUVR()
         {
diff --git a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeKaraokeProcess.cs b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeKaraokeProcess.cs
index 1106056..1d459ef 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeKaraokeProcess.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeKaraokeProcess.cs
@@ -53,6 +53,8 @@ public static KaraokeProcess Get()
 
                 DetectedLinePossibilities = linePossibilities,
 
+                KaraokeSource = InitialKaraokeSource.AzureSpeechService,
+
                 ChosenLines = new ObservableCollection<LyricLine>(linePossibilities.Select(l => l.Lyrics[0]))
             };
         }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeLyricsViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeLyricsViewModel.cs
index 57904b1..2a923ae 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeLyricsViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeLyricsViewModel.cs
@@ -11,7 +11,7 @@ namespace KaddaOK.AvaloniaApp.ViewModels.DesignTime
 {
     public class DesignTimeLyricsViewModel : LyricsViewModel
     {
-        public DesignTimeLyricsViewModel() : base(DesignTimeKaraokeProcess.Get())
+        public DesignTimeLyricsViewModel() : base(DesignTimeKaraokeProcess.Get(), null!)
         {
             var lyricsPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Assets", "DesignTime", "Example Song - Lyrics.txt");
             var lyrics = File.ReadAllText(lyricsPath);
diff --git a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeManualAlignViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeManualAlignViewModel.cs
new file mode 100644
index 0000000..3ffae5a
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeManualAlignViewModel.cs
@@ -0,0 +1,22 @@
+using NAudio.Wave;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using KaddaOK.AvaloniaApp.Models;
+using KaddaOK.Library;
+using Microsoft.CognitiveServices.Speech;
+using Newtonsoft.Json;
+
+namespace KaddaOK.AvaloniaApp.ViewModels.DesignTime
+{
+    public class DesignTimeManualAlignViewModel : ManualAlignViewModel
+    {
+        public DesignTimeManualAlignViewModel() : base(DesignTimeKaraokeProcess.Get(), new LineSplitter(), new WordMerger())
+        {
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeStartViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeStartViewModel.cs
new file mode 100644
index 0000000..d9dd404
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeStartViewModel.cs
@@ -0,0 +1,9 @@
+namespace KaddaOK.AvaloniaApp.ViewModels.DesignTime
+{
+    public class DesignTimeStartViewModel : StartViewModel
+    {
+        public DesignTimeStartViewModel() : base(DesignTimeKaraokeProcess.Get(), null!, null!)
+        {
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
index 9443932..7224393 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/EditLinesViewModel.cs
@@ -17,7 +17,6 @@
 using Avalonia.Controls;
 using KaddaOK.AvaloniaApp.Controls;
 using KaddaOK.AvaloniaApp.Views;
-using Avalonia.VisualTree;
 
 namespace KaddaOK.AvaloniaApp.ViewModels
 {
@@ -44,11 +43,13 @@ public ChosenLinesAction(string? serializedLines, string? changeLabel)
     }
     public partial class EditLinesViewModel : TickableBase
     {
+        private string dialogHostName = "EditLinesViewDialogHost";
+
         private ILineSplitter Splitter { get; }
         private IWordMerger WordMerger { get; }
         private CancellationTokenSource AudioPlayingSource { get; }
         private IMinMaxFloatWaveStreamSampler Sampler { get; }
-        public EditLinesView EditLinesView { get; set; } // TODO: are you sure you wanna do this? It's paradigm-breakingly bad practice...
+        public IEditLinesView EditLinesView { get; set; } // TODO: are you sure you wanna do this? It's paradigm-breakingly bad practice...
         public EditLinesViewModel(KaraokeProcess karaokeProcess, ILineSplitter splitter, IWordMerger merger, IMinMaxFloatWaveStreamSampler sampler) : base(karaokeProcess)
         {
             FullLengthVocalsDraw = new WaveformDraw
@@ -147,6 +148,13 @@ public LyricWord? CursorWord
             set => SetProperty(ref cursorWord, value);
         }
 
+        private LyricLine? cursorLine;
+        public LyricLine? CursorLine
+        {
+            get => cursorLine;
+            set => SetProperty(ref cursorLine, value);
+        }
+
         private bool isRecording;
         public bool IsRecording
         {
@@ -253,10 +261,11 @@ private void NewLineAt(LyricWord newLineHere, bool isBefore)
         private void MergeWord(LyricWord mergeHere, bool isBefore)
         {
             AddUndoSnapshot($"Merge \"{mergeHere.Text}\" with {(isBefore ? "previous" : "next")} syllable");
-            var resultingWord = WordMerger.MergeWord(CurrentProcess?.ChosenLines, mergeHere, isBefore);
-            if (resultingWord != null)
+            var mergeResult = WordMerger.MergeWord(CurrentProcess?.ChosenLines, mergeHere, isBefore);
+            if (mergeResult.resultingWord != null)
             {
-                CursorWord = resultingWord;
+                CursorLine = mergeResult.resultingLine;
+                CursorWord = mergeResult.resultingWord;
                 EditLinesView.Focus();
             }
         }
@@ -278,6 +287,7 @@ private void Undo(object? parameter)
             // it seems to lose keyboard focus afterwards for some reason...
             EditLinesView.Focus();
             // and the word cursor no longer works, unfortunately...
+            CursorLine = null;
             CursorWord = null;
         }
 
@@ -298,6 +308,7 @@ private void Redo(object? parameter)
             // it seems to lose keyboard focus afterwards for some reason...
             EditLinesView.Focus();
             // and the word cursor no longer works, unfortunately...
+            CursorLine = null;
             CursorWord = null;
         }
 
@@ -318,6 +329,7 @@ private void DeleteWord(object? parameter)
                     ? deletingFromLine.Words[deletedWordIndex]
                     : deletingFromLine.Words.LastOrDefault();
 
+                CursorLine = deletingFromLine;
                 CursorWord = newFocusedWord;
 
                 EditLinesView.Focus();
@@ -350,6 +362,7 @@ private void DeleteEntireLine(object? parameter)
                                 : CurrentProcess.ChosenLines.LastOrDefault();
             if (newFocusedLine?.Words?.Any() ?? false)
             {
+                CursorLine = newFocusedLine;
                 CursorWord = newFocusedLine.Words.First();
             }
 
@@ -362,7 +375,7 @@ private async Task EditWordText(object? parameter)
             if (parameter is LyricWord editThisWord)
             {
                 EditingTextOfWord = editThisWord;
-                if (await DialogHost.Show(this, "EditLinesViewDialogHost") is string newText)
+                if (await DialogHost.Show(this, dialogHostName) is string newText)
                 {
                     AddUndoSnapshot($"Change syllable \"{editThisWord.Text}\" to \"{newText}\"");
                     var lineNeedsTiming = ApplyEditWordText(newText);
@@ -380,8 +393,7 @@ private async Task EditWordText(object? parameter)
             if (!string.IsNullOrWhiteSpace(newText)
                 && EditingTextOfWord != null)
             {
-                var newSyllables =
-                    GetLyricWordsAcrossTime(newText, EditingTextOfWord.StartSecond, EditingTextOfWord.EndSecond);
+                var newSyllables = LyricWord.GetLyricWordsAcrossTime(newText, EditingTextOfWord.StartSecond, EditingTextOfWord.EndSecond);
 
                 EditingTextOfWord.Text = newSyllables[0].Text;
                 EditingTextOfWord.EndSecond = newSyllables[0].EndSecond;
@@ -413,7 +425,11 @@ public void ApplyLineTimingEdit(object? parameter)
             {
                 AddUndoSnapshot($"Edited timing for \"{LineBeingEdited.OriginalLine.Text}\"");
                 LineBeingEdited.OriginalLine.Words = new ObservableCollection<LyricWord>(LineBeingEdited.NewTiming);
+                CursorLine = LineBeingEdited.OriginalLine;
+                CursorWord = LineBeingEdited.OriginalLine.Words.FirstOrDefault();
             }
+
+            EditLinesView.Focus();
         }
 
         [RelayCommand]
@@ -672,7 +688,6 @@ private void Play()
                 PlayAudio.Play();
                 StartTicking();
             }
-
         }
 
         [RelayCommand]
@@ -723,7 +738,7 @@ private async Task EditLine(object? parameter)
             {
                 LineBeingEdited = new EditingLine(editThisLine);
                 await CalculateClipWindowAsync();
-                await DialogHost.Show(LineBeingEdited, "EditLinesViewDialogHost");
+                await DialogHost.Show(LineBeingEdited, dialogHostName);
             }
         }
 
@@ -757,7 +772,7 @@ private async Task AddNewLine(object? parameter)
             }
 
             // show a dialog to enter the words
-            if (await DialogHost.Show(addingLine, "EditLinesViewDialogHost") is AddingLine newWords
+            if (await DialogHost.Show(addingLine, dialogHostName) is AddingLine newWords
                 && !string.IsNullOrWhiteSpace(newWords.EnteredText))
             {
                 // create and add a new line
@@ -770,7 +785,7 @@ private async Task AddNewLine(object? parameter)
                 var endTime = newWords.NextLine?.StartSecond
                               ?? CurrentProcess.VocalsAudioStream!.TotalTime.TotalSeconds;
 
-                var listOfNewWords = GetLyricWordsAcrossTime(enteredText, startTime, endTime);
+                var listOfNewWords = LyricWord.GetLyricWordsAcrossTime(enteredText, startTime, endTime);
                 newLine.Words = new ObservableCollection<LyricWord>(listOfNewWords);
 
                 AddUndoSnapshot($"Added new line \"{newLine.Text}\"");
@@ -782,287 +797,61 @@ private async Task AddNewLine(object? parameter)
                 
         }
 
-        private static List<LyricWord> GetLyricWordsAcrossTime(string? enteredText, double startTime, double endTime)
-        {
-            var fullWords = enteredText?.Split(' ') ?? new[] { enteredText };
-            var syllables = fullWords
-                .SelectMany(f => (f + " ")
-                    .Split('|'))
-                .Where(w => !string.IsNullOrWhiteSpace(w))
-                .ToList();
-            var availableTime = endTime - startTime;
-            var eachSyllableGets = Math.Round(availableTime / (double)syllables.Count, 2);
-            var currentTime = Math.Round(startTime, 2);
-            var listOfNewWords = new List<LyricWord>();
-            for (int i = 0; i < syllables.Count; i++)
-            {
-                var newWord = new LyricWord
-                {
-                    Text = syllables[i],
-                    StartSecond = currentTime
-                };
-                currentTime = Math.Round(currentTime + eachSyllableGets, 2);
-                newWord.EndSecond = currentTime;
-                listOfNewWords.Add(newWord);
-            }
-
-            return listOfNewWords;
-        }
-
-        public void KeyPressed(KeyEventArgs keyArgs)
-        {
-            // TODO: this no longer needs be its own thing
-            HandleWordEditKeys(keyArgs);
-        }
-
-        private void HandleWordEditKeys(KeyEventArgs keyArgs)
+        public bool HandleWordEditKeys(KeyEventArgs keyArgs, bool isFromFlyout)
         {
             switch (keyArgs.Key)
             {
-                case Key.Down:
-                case Key.Right:
-                case Key.Left:
-                case Key.Up:
-                    SwitchWordSelection(keyArgs);
-                    break;
                 case Key.A:
                     if (CursorWord != null)
                     {
                         NewLineAfter(CursorWord);
                     }
-                    break;
+                    return true;
                 case Key.S:
                     if (CursorWord != null)
                     {
                         NewLineBefore(CursorWord);
                     }
-                    break;
+                    return true;
                 case Key.W:
                     if (CursorWord != null)
                     {
                         MergeWithPrev(CursorWord);
                     }
-                    break;
+                    return true;
                 case Key.Q:
                     if (CursorWord != null)
                     {
                         MergeWithNext(CursorWord);
                     }
-                    break;
+                    return true;
                 case Key.E:
                     if (CursorWord != null)
                     {
                         EditWordText(CursorWord);
                     }
-                    break;
+                    return true;
                 case Key.D:
                     if (CursorWord != null)
                     {
                         DeleteWord(CursorWord);
                     }
-                    break;
+                    return true;
                 case Key.Delete:
                     if (CursorWord != null)
                     {
                         DeleteEntireLine(CursorWord);
                     }
-                    break;
+                    return true;
                 case Key.Z:
                     if (CursorWord != null)
                     {
                         MoveLineToPrevious(CursorWord);
                     }
-                    break;
-            }
-        }
-
-        private void SwitchWordSelection(KeyEventArgs keyArgs)
-        {
-            // this is just gonna change focus and let the handler in the view set it back... wacky I know, but it makes
-            // sense because of what we can and can't control around tabbing and such.
-            // Also, apparently the order in which it finds these isn't reliable, so we'll have to sort it by the order in
-            // memory...
-            var allWordButtonsByPhrases = EditLinesView.GetVisualDescendants().Where(x => x.Name == "PhraseWordsItemsControl")
-                .Select(s => new
-                {
-                    Buttons = s.GetVisualDescendants().Where(y => y.Name == "LyricWordButton").Select(y => (Button)y).ToList(),
-                    SortOrder = CurrentProcess.ChosenLines.IndexOf(s.DataContext as LyricLine)
-                }).OrderBy(s => s.SortOrder)
-                .Select(s => s.Buttons.OrderBy(x => CurrentProcess.ChosenLines[s.SortOrder].Words.IndexOf(x.CommandParameter as LyricWord)).ToList())
-                .Where(s => s.Count > 0) // I'm not sure why this even happened; virtualization maybe
-                .ToList();
-
-
-            Button? destinationButton = null;
-            if (CursorWord == null)
-            {
-                switch (keyArgs.Key)
-                {
-                    case Key.Down:
-                    case Key.Right:
-                        destinationButton = allWordButtonsByPhrases.FirstOrDefault()?.FirstOrDefault();
-                        break;
-                    case Key.Left:
-                        destinationButton = allWordButtonsByPhrases.FirstOrDefault()?.LastOrDefault();
-                        break;
-                    case Key.Up:
-                        destinationButton = allWordButtonsByPhrases.LastOrDefault()?.FirstOrDefault();
-                        break;
-                }
-            }
-            else
-            {
-                var currentPhrase = allWordButtonsByPhrases.SingleOrDefault(phrase => phrase.Any(word => word.CommandParameter == CursorWord));
-                if (currentPhrase != null)
-                {
-                    var currentPhraseIndex = allWordButtonsByPhrases.IndexOf(currentPhrase);
-                    var currentWordButton = currentPhrase.FirstOrDefault(word => word.CommandParameter == CursorWord);
-                    var currentWordIndex = currentPhrase.IndexOf(currentWordButton);
-                    switch (keyArgs.Key)
-                    {
-                        case Key.Down:
-                            if (allWordButtonsByPhrases.Count > currentPhraseIndex + 1)
-                            {
-                                var nextPhrase = allWordButtonsByPhrases[currentPhraseIndex + 1];
-                                var nextWordIndex = nextPhrase.Count > currentWordIndex
-                                    ? currentWordIndex
-                                    : nextPhrase.Count - 1;
-                                destinationButton = nextPhrase[nextWordIndex];
-                            }
-
-                            break;
-                        case Key.Right:
-                            if (currentWordIndex < currentPhrase.Count - 1)
-                            {
-                                destinationButton = currentPhrase[currentWordIndex + 1];
-                            }
-
-                            break;
-                        case Key.Left:
-                            if (currentWordIndex > 0)
-                            {
-                                destinationButton = currentPhrase[currentWordIndex - 1];
-                            }
-
-                            break;
-                        case Key.Up:
-                            if (currentPhraseIndex > 0)
-                            {
-                                var nextPhrase = allWordButtonsByPhrases[currentPhraseIndex - 1];
-                                var nextWordIndex = nextPhrase.Count > currentWordIndex
-                                    ? currentWordIndex
-                                    : nextPhrase.Count - 1;
-                                destinationButton = nextPhrase[nextWordIndex];
-                            }
-
-                            break;
-                    }
-
-                }
-            }
-
-            destinationButton?.BringIntoView();
-            destinationButton?.Focus();
-
-            /*switch (keyArgs.Key)
-            {
-                case Key.Down:
-                    if (CursorWord == null)
-                    {
-                        CursorWord = CurrentProcess.ChosenLines?.FirstOrDefault()?.Words?.FirstOrDefault();
-                    }
-                    else
-                    {
-                        var originalLine =
-                            CurrentProcess.ChosenLines?.SingleOrDefault(l =>
-                                l.Words != null && l.Words.Contains(CursorWord));
-                        if (originalLine?.Words != null)
-                        {
-                            var originalLineIndex = CurrentProcess.ChosenLines.IndexOf(originalLine);
-                            var originalWordIndex = originalLine.Words.IndexOf(CursorWord);
-                            if (CurrentProcess.ChosenLines.Count > originalLineIndex + 1)
-                            {
-                                var nextLine = CurrentProcess.ChosenLines[originalLineIndex + 1];
-                                var nextWordIndex = nextLine.Words.Count > originalWordIndex
-                                    ? originalWordIndex
-                                    : nextLine.Words.Count - 1;
-                                CursorWord = nextLine.Words[nextWordIndex];
-                            }
-                        }
-                    }
-
-                    break;
-                case Key.Right:
-                    if (CursorWord == null)
-                    {
-                        CursorWord = CurrentProcess.ChosenLines?.FirstOrDefault()?.Words?.FirstOrDefault();
-                    }
-                    else
-                    {
-                        var originalLine =
-                            CurrentProcess.ChosenLines?.SingleOrDefault(l =>
-                                l.Words != null && l.Words.Contains(CursorWord));
-                        if (originalLine?.Words != null)
-                        {
-                            var originalWordIndex = originalLine.Words.IndexOf(CursorWord);
-                            if (originalWordIndex < originalLine.Words.Count - 1)
-                            {
-                                CursorWord = originalLine.Words[originalWordIndex + 1];
-                            }
-                        }
-                    }
-
-                    break;
-                case Key.Left:
-                    if (CursorWord == null)
-                    {
-                        CursorWord = CurrentProcess.ChosenLines?.FirstOrDefault()?.Words?.LastOrDefault();
-                    }
-                    else
-                    {
-                        var originalLine =
-                            CurrentProcess.ChosenLines?.SingleOrDefault(l =>
-                                l.Words != null && l.Words.Contains(CursorWord));
-                        if (originalLine?.Words != null)
-                        {
-                            var originalWordIndex = originalLine.Words.IndexOf(CursorWord);
-                            if (originalWordIndex > 0)
-                            {
-                                CursorWord = originalLine.Words[originalWordIndex - 1];
-                            }
-                        }
-                    }
-
-                    break;
-                case Key.Up:
-                    if (CursorWord == null)
-                    {
-                        CursorWord = CurrentProcess.ChosenLines?.LastOrDefault()?.Words?.FirstOrDefault();
-                    }
-                    else
-                    {
-                        var originalLine =
-                            CurrentProcess.ChosenLines?.SingleOrDefault(l =>
-                                l.Words != null && l.Words.Contains(CursorWord));
-                        if (originalLine?.Words != null)
-                        {
-                            var originalLineIndex = CurrentProcess.ChosenLines.IndexOf(originalLine);
-                            var originalWordIndex = originalLine.Words.IndexOf(CursorWord);
-                            if (originalLineIndex > 0)
-                            {
-                                var nextLine = CurrentProcess.ChosenLines[originalLineIndex - 1];
-                                var nextWordIndex = nextLine.Words.Count > originalWordIndex
-                                    ? originalWordIndex
-                                    : nextLine.Words.Count - 1;
-                                CursorWord = nextLine.Words[nextWordIndex];
-                            }
-                        }
-                    }
-
-                    break;
+                    return true;
                 default:
-                    throw new InvalidOperationException($"No case for key {keyArgs.Key} in SwitchWordSelection");
-            } */
+                    return false;
+            }
         }
 
         private void StartNextWord(double? positionTotalSeconds)
@@ -1105,6 +894,90 @@ private void WordIsNext(TimingWord word)
             word.HasFinished = false;
         }
 
+        [RelayCommand]
+        private async Task NudgeAllTimings(object? parameter)
+        {
+            var result = await DialogHost.Show(new NudgeTimingsViewModel(), dialogHostName);
+            if (result is NudgeTimingsViewModel appliedModel && appliedModel.NudgeBy != 0)
+            {
+                AddUndoSnapshot($"Nudge all timings by {appliedModel.NudgeBy}s");
+                foreach (var line in CurrentProcess.ChosenLines)
+                {
+                    foreach (var word in line.Words)
+                    {
+                        word.StartSecond += appliedModel.NudgeBy;
+                        word.EndSecond += appliedModel.NudgeBy;
+                        line.RaiseTimingChanged();
+                    }
+                }
+            };
+        }
+
+        [RelayCommand]
+        private async Task UpperCaseAllText(object? parameter)
+        {
+            AddUndoSnapshot($"Change all text to UPPER CASE");
+            foreach (var line in CurrentProcess.ChosenLines)
+            {
+                foreach (var word in line.Words)
+                {
+                    word.Text = word.Text?.ToUpperInvariant();
+                }
+            }
+        }
+
+        [RelayCommand]
+        private async Task LowerCaseAllText(object? parameter)
+        {
+            AddUndoSnapshot($"Change all text to lower case");
+            foreach (var line in CurrentProcess.ChosenLines)
+            {
+                foreach (var word in line.Words)
+                {
+                    word.Text = word.Text?.ToLowerInvariant();
+                }
+            }
+        }
+
+        [RelayCommand]
+        private async Task SentenceCaseAllLines(object? parameter)
+        {
+            AddUndoSnapshot($"Change all text to Sentence case");
+            foreach (var line in CurrentProcess.ChosenLines)
+            {
+                foreach (var word in line.Words)
+                {
+                    word.Text = word.Text?.ToLowerInvariant();
+
+                    if (word.Text is { Length: >= 1 } && line.Words.FirstOrDefault() == word)
+                    {
+                        word.Text = word.Text[0].ToString().ToUpperInvariant() 
+                                    + word.Text.Substring(1);
+                    }
+                }
+            }
+        }
+
+        [RelayCommand]
+        private async Task TitleCaseAllWords(object? parameter)
+        {
+            AddUndoSnapshot($"Change all text to Title Case");
+            foreach (var line in CurrentProcess.ChosenLines)
+            {
+                foreach (var word in line.Words)
+                {
+                    word.Text = word.Text?.ToLowerInvariant();
+                    var wordIndex = line.Words.IndexOf(word);
+                    if (word.Text is { Length: >= 1 }
+                        && (wordIndex == 0 || line.Words[wordIndex-1].Text.EndsWith(" ")))
+                    {
+                        word.Text = word.Text[0].ToString().ToUpperInvariant()
+                                    + word.Text.Substring(1);
+                    }
+                }
+            }
+        }
+
         protected override void Tick()
         {
             if (PlayAudio?.PlaybackState == PlaybackState.Playing)
@@ -1335,4 +1208,14 @@ public void EditLineTimingDialogPointerReleased(object? sender, PointerReleasedE
             modeBeingDragged = WordDraggingMode.None;
         }
     }
+
+    public class NudgeTimingsViewModel : ObservableBase
+    {
+        private double nudgeBy;
+        public double NudgeBy
+        {
+            get => nudgeBy;
+            set => SetProperty(ref nudgeBy, value);
+        }
+    }
 }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/LyricsViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/LyricsViewModel.cs
index 27911b3..7442942 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/LyricsViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/LyricsViewModel.cs
@@ -2,10 +2,13 @@
 using CommunityToolkit.Mvvm.Input;
 using KaddaOK.Library;
 using System;
+using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using KaddaOK.AvaloniaApp.Models;
 using Avalonia.Controls.Notifications;
+using KaddaOK.AvaloniaApp.Views;
 
 namespace KaddaOK.AvaloniaApp.ViewModels
 {
@@ -62,9 +65,9 @@ protected async Task SelectLyricsFile()
                     CurrentProcess!.LyricsFilePath = result.TryGetLocalPath();
                     // TODO: the data here flows a really wacky way, should maybe rethink
                     var knownLyrics = KnownOriginalLyrics.FromFilePath(CurrentProcess!.LyricsFilePath);
-                    if (knownLyrics.Lyrics != null)
+                    if (knownLyrics.UncleansedLines != null)
                     {
-                        LyricEditorText = string.Join(Environment.NewLine, knownLyrics.Lyrics);
+                        LyricEditorText = string.Join(Environment.NewLine, knownLyrics.UncleansedLines);
                     }
                 }
                 GettingFile = false;
@@ -84,11 +87,67 @@ protected async Task SelectLyricsFile()
         [RelayCommand]
         public void GoToNextStep(object? parameter)
         {
-            CurrentProcess!.SelectedTabIndex = 2;
+            switch (CurrentProcess.KaraokeSource)
+            {
+                case InitialKaraokeSource.ManualSync:
+                    SetUpManualAlignment();
+                    CurrentProcess.SelectedTabIndex = (int)TabIndexes.ManualAlign;
+                    break;
+                case InitialKaraokeSource.CtmImport:
+                    DoCtmImport();
+                    CurrentProcess.SelectedTabIndex = (int)TabIndexes.Edit;
+                    break;
+                case InitialKaraokeSource.AzureSpeechService:
+                    CurrentProcess.SelectedTabIndex = (int)TabIndexes.Recognize;
+                    break;
+            }
+        }
+
+        public void SetUpManualAlignment()
+        {
+            // TODO: warn the user if CurrentProcess.ManualTimingLines is not null and any have manual start and end set
+            var maxSeconds = (CurrentProcess.UnseparatedAudioStream ?? CurrentProcess.VocalsAudioStream)?.TotalTime.TotalSeconds;
+            CurrentProcess.ManualTimingLines = new ObservableCollection<ManualTimingLine>
+                (
+                    CurrentProcess.KnownOriginalLyrics?.UncleansedLines?
+                    .Select(l => new ManualTimingLine
+                    (
+                        LyricWord.GetLyricWordsAcrossTime(l, maxSeconds ?? 0, maxSeconds ?? 0)
+                            .Select(TimingWord.FromLyricWord)))
+                    ?? new ManualTimingLine[]{}
+            );
+            CurrentProcess.ManualTimingQueue =
+                new ObservableQueue<TimingWord>(CurrentProcess.ManualTimingLines.SelectMany(t => t.Words));
+            CurrentProcess.ManualTimingQueue.Peek().IsNext = true;
+        }
+
+        public void DoCtmImport()
+        {
+            var ctmFilePath = CurrentProcess.ImportedKaraokeSourceFilePath;
+            if (ctmFilePath == null || !Path.GetExtension(ctmFilePath)
+                    .EndsWith("ctm", StringComparison.InvariantCultureIgnoreCase))
+            {
+                if (NotificationManager != null)
+                {
+                    NotificationManager.Position = NotificationPosition.BottomRight;
+                    NotificationManager.Show(new Notification("Error", "There is no CTM file selected for import!", NotificationType.Error, TimeSpan.Zero));
+                }
+            }
+            var ctmLines = File.ReadAllLines(ctmFilePath).ToList();
+            var lyricLines =
+                NfaCtmImporter.ImportNfaCtmAndLyrics(ctmLines, CurrentProcess.KnownOriginalLyrics?.SeparatorCleansedLines);
+
+            CurrentProcess.ChosenLines =
+                new ObservableCollection<LyricLine>(lyricLines);
+            CurrentProcess.RaiseChosenLinesChanged();
+            CurrentProcess.NarrowingStepCompletenessChanged();
+            CurrentProcess.CanExportFactorsChanged();
         }
 
-        public LyricsViewModel(KaraokeProcess karaokeProcess) : base(karaokeProcess)
+        private readonly INfaCtmImporter NfaCtmImporter;
+        public LyricsViewModel(KaraokeProcess karaokeProcess, INfaCtmImporter nfaCtmImporter) : base(karaokeProcess)
         {
+            NfaCtmImporter = nfaCtmImporter;
         }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/ManualAlignViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/ManualAlignViewModel.cs
new file mode 100644
index 0000000..8143cf4
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/ViewModels/ManualAlignViewModel.cs
@@ -0,0 +1,670 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Threading;
+using CommunityToolkit.Mvvm.Input;
+using KaddaOK.Library;
+using System.Windows.Input;
+using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
+using Avalonia.Input;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.Messaging;
+using DialogHostAvalonia;
+using KaddaOK.AvaloniaApp.Controls;
+using KaddaOK.AvaloniaApp.Models;
+using KaddaOK.AvaloniaApp.Services;
+using KaddaOK.AvaloniaApp.Views;
+using NAudio.Wave;
+using NAudio.Utils;
+using NAudio.Wave.SampleProviders;
+
+namespace KaddaOK.AvaloniaApp.ViewModels
+{
+    public partial class ManualAlignViewModel : TickableBase
+    {
+        private string dialogHostName = "ManualAlignViewDialogHost";
+
+        private CancellationTokenSource AudioPlayingSource { get; }
+
+        private bool isPlaying;
+        public bool IsPlaying
+        {
+            get => isPlaying;
+            set => SetProperty(ref isPlaying, value);
+        }
+
+        private bool isRecording;
+        public bool IsRecording
+        {
+            get => isRecording;
+            set => SetProperty(ref isRecording, value);
+        }
+
+        private bool movingCaret;
+        public bool MovingCaret
+        {
+            get => movingCaret;
+            set => SetProperty(ref movingCaret, value);
+        }
+
+        private double? caretPositionSeconds;
+        public double? CaretPositionSeconds
+        {
+            get => caretPositionSeconds;
+            set => SetProperty(ref caretPositionSeconds, value);
+        }
+
+        private string caretPositionText;
+        public string CaretPositionText
+        {
+            get => caretPositionText;
+            set => SetProperty(ref caretPositionText, value);
+        }
+
+        private double? currentOffsetSeconds;
+        public double? CurrentOffsetSeconds
+        {
+            get => currentOffsetSeconds;
+            set => SetProperty(ref currentOffsetSeconds, value);
+        }
+
+        private WaveOutEvent? playAudio;
+        public WaveOutEvent? PlayAudio
+        {
+            get => playAudio;
+            set => SetProperty(ref playAudio, value);
+        }
+
+        private double? _currentPlaybackPositionSeconds;
+        public double? CurrentPlaybackPositionSeconds
+        {
+            get => _currentPlaybackPositionSeconds;
+            set => SetProperty(ref _currentPlaybackPositionSeconds, value);
+        }
+
+        private string _currentPlaybackPositionText;
+        public string CurrentPlaybackPositionText
+        {
+            get => _currentPlaybackPositionText;
+            set => SetProperty(ref _currentPlaybackPositionText, value);
+        }
+
+        private TimingWord? wordCurrentlyTiming;
+        public TimingWord? WordCurrentlyTiming
+        {
+            get => wordCurrentlyTiming;
+            set => SetProperty(ref wordCurrentlyTiming, value);
+        }
+
+        private TimingWord? editingTextOfWord;
+        public TimingWord? EditingTextOfWord
+        {
+            get => editingTextOfWord;
+            set => SetProperty(ref editingTextOfWord, value);
+        }
+
+        private bool instructionsVisible;
+        public bool InstructionsVisible
+        {
+            get => instructionsVisible;
+            set => SetProperty(ref instructionsVisible, value);
+        }
+
+        [RelayCommand]
+        public void HideInstructions(object? parameter)
+        {
+            InstructionsVisible = false;
+        }
+        [RelayCommand]
+        public void ShowInstructions(object? parameter)
+        {
+            InstructionsVisible = true;
+        }
+
+        private ILineSplitter Splitter { get; }
+        private IWordMerger WordMerger { get; }
+        public ManualAlignViewModel(KaraokeProcess karaokeProcess, ILineSplitter splitter, IWordMerger merger) : base(karaokeProcess)
+        {
+            CurrentPlaybackPositionText = "0:00.00";
+            FullLengthVocalsDraw = new WaveformDraw
+            {
+                DesiredPeakHeight = 75
+            };
+            Splitter = splitter;
+            WordMerger = merger;
+            Dispatcher.UIThread.Invoke(() => FullLengthVocalsDraw.RedrawWaveform(CurrentProcess!.VocalsAudioStream));
+            AudioPlayingSource = new CancellationTokenSource();
+        }
+
+        [RelayCommand]
+        private async Task EditWordText(object? parameter)
+        {
+            if (parameter is TimingWord editThisWord)
+            {
+                EditingTextOfWord = editThisWord;
+                if (await DialogHost.Show(this, dialogHostName) is string newText)
+                {
+                    // TODO: AddUndoSnapshot($"Change syllable \"{editThisWord.Text}\" to \"{newText}\"");
+                    ApplyEditWordText(newText);
+                };
+            }
+        }
+
+        public void ApplyEditWordText(string newText)
+        {
+            if (!string.IsNullOrWhiteSpace(newText)
+                && EditingTextOfWord != null)
+            {
+                var newSyllables = TimingWord.GetTimingWordsAcrossTime(newText, EditingTextOfWord.StartSecond, EditingTextOfWord.EndSecond);
+
+                EditingTextOfWord.Text = newSyllables[0].Text;
+                EditingTextOfWord.EndSecond = newSyllables[0].EndSecond;
+                if (newSyllables.Count > 1)
+                {
+                    var line = CurrentProcess.ManualTimingLines?.SingleOrDefault(l => l.Words?.Contains(EditingTextOfWord) ?? false);
+                    var index = line?.Words?.IndexOf(EditingTextOfWord);
+                    if (index == null)
+                    {
+                        // TODO: error message
+                        throw new InvalidOperationException("Couldn't find the word we were editing.");
+                    }
+                    for (var i = 1; i < newSyllables.Count; i++)
+                    {
+                        line!.Words!.Insert(index.Value + i, newSyllables[i]);
+                    }
+                }
+            }
+        }
+
+        [RelayCommand]
+        private void DeleteWord(object? parameter)
+        {
+            if (parameter is TimingWord deleteThis)
+            {
+                // TODO: AddUndoSnapshot($"Delete syllable \"{deleteThis.Text}\"");
+
+                CurrentProcess!.ManualTimingLines!.SingleOrDefault(l => l.Words != null && l.Words.Contains(deleteThis));
+
+                Splitter.DeleteWord(CurrentProcess!.ManualTimingLines!, deleteThis);
+            }
+        }
+
+        [RelayCommand]
+        private void MergeWithPrev(object? parameter)
+        {
+            if (parameter is TimingWord mergeHere)
+            {
+                MergeWord(mergeHere, true);
+            }
+        }
+
+        [RelayCommand]
+        private void MergeWithNext(object? parameter)
+        {
+            if (parameter is TimingWord mergeHere)
+            {
+                MergeWord(mergeHere, false);
+            }
+        }
+
+        private void MergeWord(TimingWord mergeHere, bool isBefore)
+        {
+            // TODO: AddUndoSnapshot($"Merge \"{mergeHere.Text}\" with {(isBefore ? "previous" : "next")} syllable");
+            WordMerger.MergeWord(CurrentProcess?.ManualTimingLines, mergeHere, isBefore);
+        }
+
+        [RelayCommand]
+        public void GoToNextStep(object? parameter)
+        {
+            CurrentProcess.ChosenLines = new ObservableCollection<LyricLine>(CurrentProcess.ManualTimingLines.Select(ManualTimingLine.ToLyricLine));
+            CurrentProcess!.SelectedTabIndex = (int)TabIndexes.Edit;
+            CurrentProcess.CanExportFactorsChanged();
+        }
+
+        [RelayCommand]
+        private void MoveHead(object? parameter)
+        {
+            if (parameter is TimingWord word)
+            {
+                // Find the ManualTimingLine that contains the TimingWord
+                var line = CurrentProcess.ManualTimingLines?.FirstOrDefault(l => l.Words.Contains(word));
+
+                if (line != null)
+                {
+                    // Find the index of the TimingWord in the Words collection
+                    int wordIndex = line.Words.IndexOf(word);
+
+                    // Find the index of the ManualTimingLine in ManualTimingLines
+                    int lineIndex = CurrentProcess.ManualTimingLines.IndexOf(line);
+
+                    // Create a new ObservableQueue and add the TimingWord and every word after it in the current line,
+                    // and all words in the lines that come after the current line, to the queue
+                    var queue = new ObservableQueue<TimingWord>();
+                    for (int i = wordIndex; i < line.Words.Count; i++)
+                    {
+                        queue.Enqueue(line.Words[i]);
+                    }
+
+                    for (int i = lineIndex + 1; i < CurrentProcess.ManualTimingLines.Count; i++)
+                    {
+                        foreach (var timingWord in CurrentProcess.ManualTimingLines[i].Words)
+                        {
+                            queue.Enqueue(timingWord);
+                        }
+                    }
+
+                    // clear old IsNext flag
+                    if (CurrentProcess.ManualTimingQueue != null 
+                        && CurrentProcess.ManualTimingQueue.TryPeek(out var oldIsNext))
+                    {
+                        oldIsNext.IsNext = false;
+                    }
+
+                    // Set ManualTimingQueue to the new queue
+                    CurrentProcess.ManualTimingQueue = queue;
+
+                    // Set new IsNext 
+                    word.IsNext = true;
+
+                    // We also want to move playback to a few seconds before the last recorded position of a word
+                    double newPlaybackPosition = 0;
+                    for (int i = lineIndex; i >= 0; i--)
+                    {
+                        var searchingLine = CurrentProcess.ManualTimingLines[i];
+                        for (int w = searchingLine == line ? wordIndex : searchingLine.Words.Count - 1; w >= 0; w--)
+                        {
+                            var searchingWord = searchingLine.Words[w];
+                            if (searchingWord.EndHasBeenManuallySet)
+                            {
+                                newPlaybackPosition = Math.Max(searchingWord.EndSecond - 3, 0);
+                                break;
+                            }
+                        }
+
+                        if (newPlaybackPosition > 0)
+                        {
+                            break;
+                        }
+                    }
+
+                    Seek(newPlaybackPosition);
+                }
+            }
+        }
+
+        private void Play()
+        {
+            if (PlayAudio != null)
+            {
+                PlayAudio.Play();
+                StartTicking();
+            }
+        }
+
+        private void StartNextWord(double? positionTotalSeconds)
+        {
+            WordCurrentlyTiming = CurrentProcess.ManualTimingQueue.Dequeue();
+            StartWord(WordCurrentlyTiming!, positionTotalSeconds.Value);
+
+            if (CurrentProcess.ManualTimingQueue.TryPeek(out var nextWord))
+            {
+                WordIsNext(nextWord);
+            }
+        }
+
+        private void StopWord(TimingWord word, double? endSecond)
+        {
+            word.IsRunning = false;
+            word.IsNext = false;
+            word.HasFinished = true;
+            if (endSecond != null)
+            {
+                word.EndSecond = endSecond.Value;
+                word.EndHasBeenManuallySet = true;
+                CurrentProcess.ManualAlignmentCompletenessChanged();
+            }
+        }
+
+        private void StartWord(TimingWord word, double? startSecond)
+        {
+            word.IsRunning = true;
+            word.IsNext = false;
+            word.HasFinished = false;
+            if (startSecond != null)
+            {
+                word.StartSecond = startSecond.Value;
+                word.StartHasBeenManuallySet = true;
+            }
+        }
+
+        private void WordIsNext(TimingWord word)
+        {
+            word.IsRunning = false;
+            word.IsNext = true;
+            WeakReferenceMessenger.Default.Send(new ScrollIntoViewMessage(word));
+        }
+
+        protected override void Tick()
+        {
+            if (PlayAudio?.PlaybackState == PlaybackState.Playing)
+            {
+                var currentTimespan = PlayAudio.GetPositionTimeSpan();
+                if ((CurrentOffsetSeconds ?? 0) > 0)
+                {
+                    currentTimespan += TimeSpan.FromSeconds(CurrentOffsetSeconds.Value);
+                }
+
+                CurrentPlaybackPositionSeconds = currentTimespan.TotalSeconds;
+                CurrentPlaybackPositionText = currentTimespan.ToString("m\\:ss\\.ff");
+                if (!MovingCaret)
+                {
+                    CaretPositionSeconds = CurrentPlaybackPositionSeconds;
+                    CaretPositionText = CurrentPlaybackPositionText;
+                }
+
+                if (IsPlaying)
+                {
+                    if (!IsRecording)
+                    {
+                        void SetUpNextOrStop()
+                        {
+                            if (CurrentProcess.ManualTimingQueue.TryDequeue(out var nextWord))
+                            {
+                                WordCurrentlyTiming = nextWord;
+                                if (WordCurrentlyTiming!.StartSecond <
+                                    CurrentPlaybackPositionSeconds)
+                                {
+                                    StartWord(nextWord!, null);
+                                }
+                                else
+                                {
+                                    //WordIsNext(nextWord);
+                                }
+                            }
+                            else
+                            {
+                                Stop(null);
+                            }
+                        }
+
+                        if (WordCurrentlyTiming != null)
+                        {
+                            if (WordCurrentlyTiming.StartSecond < CurrentPlaybackPositionSeconds)
+                            {
+                                if (WordCurrentlyTiming.EndSecond <
+                                    CurrentPlaybackPositionSeconds)
+                                {
+                                    StopWord(WordCurrentlyTiming, null);
+                                    SetUpNextOrStop();
+                                }
+                                else
+                                {
+                                    StartWord(WordCurrentlyTiming, null);
+                                    if (CurrentProcess.ManualTimingQueue.TryPeek(out var nextWord))
+                                    {
+                                        //WordIsNext(nextWord);
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // TODO: SetUpNextOrStop();
+                        }
+                    }
+                }
+
+            }
+            if (PlayAudio == null || PlayAudio.PlaybackState == PlaybackState.Stopped)
+            {
+                CurrentPlaybackPositionSeconds = null;
+                CurrentOffsetSeconds = null;
+            }
+        }
+
+        [RelayCommand]
+        private void Pause(object? parameter)
+        {
+            AudioPlayingSource.Cancel();
+            StopTicking();
+            IsPlaying = false;
+
+            if (PlayAudio != null && PlayAudio.PlaybackState == PlaybackState.Playing)
+            {
+                PlayAudio.Pause();
+            }
+        }
+
+        [RelayCommand]
+        private void Stop(object? parameter)
+        {
+            if (WordCurrentlyTiming != null && WordCurrentlyTiming.IsRunning)
+            {
+                if (WordCurrentlyTiming.StartHasBeenManuallySet && !WordCurrentlyTiming.EndHasBeenManuallySet)
+                {
+                    StopWord(WordCurrentlyTiming, CurrentPlaybackPositionSeconds);
+                }
+
+                WordCurrentlyTiming.IsRunning = false;
+                if (WordCurrentlyTiming.StartHasBeenManuallySet && WordCurrentlyTiming.EndHasBeenManuallySet)
+                {
+                    WordCurrentlyTiming.HasFinished = true;
+                }
+            }
+
+            AudioPlayingSource.Cancel();
+            StopTicking();
+            CurrentPlaybackPositionSeconds = null;
+            CurrentOffsetSeconds = null;
+            CaretPositionSeconds = null;
+            CaretPositionText = "0:00.00";
+            CurrentPlaybackPositionText = "0:00.00";
+            IsRecording = false;
+            IsRecording = false;
+            IsPlaying = false;
+
+            if (PlayAudio != null && PlayAudio.PlaybackState != PlaybackState.Stopped)
+            {
+                PlayAudio.Stop();
+            }
+        }
+
+        [RelayCommand]
+        private async Task Play(object? parameter)
+        {
+            if (PlayAudio?.PlaybackState != PlaybackState.Playing)
+            {
+                if (PlayAudio?.PlaybackState == PlaybackState.Paused)
+                {
+                    Play();
+                    IsPlaying = true;
+                }
+                else
+                {
+                    (CurrentProcess.UnseparatedAudioStream ??
+                     CurrentProcess.VocalsAudioStream)!.CurrentTime = TimeSpan.FromSeconds(CurrentPlaybackPositionSeconds ?? 0);
+
+                    PlayAudio = new WaveOutEvent();
+
+                    PlayAudio.Init(CurrentProcess.UnseparatedAudioStream ??
+                                   CurrentProcess.VocalsAudioStream);
+                    IsPlaying = true;
+                    if (parameter is EditingLine lineBeingPlayed)
+                    {
+                        lineBeingPlayed.IsPlaying = true;
+                        IsRecording = false;
+                        // TODO: WordTimingQueue = new ObservableQueue<TimingWord>(LineBeingEdited.NewTiming);
+                    }
+                    Play();
+                }
+            }
+        }
+
+        [RelayCommand(AllowConcurrentExecutions = true)]
+        private async Task Record(object? parameter)
+        {
+            if (!IsRecording)
+            {
+                /* TODO:  WordTimingQueue = new ObservableQueue<TimingWord>(LineBeingEdited.NewTiming);*/
+                if (CurrentProcess.ManualTimingQueue.TryPeek(out var firstWord))
+                {
+                    WordIsNext(firstWord);
+                }
+                IsRecording = true;
+            }
+
+
+            if (PlayAudio == null || PlayAudio?.PlaybackState == PlaybackState.Stopped)
+            {
+
+                PlayAudio = new WaveOutEvent();
+
+                (CurrentProcess.UnseparatedAudioStream ??
+                 CurrentProcess.VocalsAudioStream)!.CurrentTime = TimeSpan.FromSeconds(CurrentPlaybackPositionSeconds ?? 0);
+
+                PlayAudio.Init(CurrentProcess.UnseparatedAudioStream ?? CurrentProcess.VocalsAudioStream);
+                IsPlaying = true;
+                Play();
+            }
+        }
+
+        public void SeekBarPointerPressed(object? sender, PointerPressedEventArgs args)
+        {
+            var control = sender as Control;
+            var point = args.GetCurrentPoint(control);
+            MovingCaret = true;
+            SetCaretPosition(point.Position.X, control?.Bounds.Width ?? 0, FullLengthVocalsDraw.WaveformLengthSeconds ?? 0);
+        }
+
+        private void SetCaretPosition(double pointX, double widthX, double widthSeconds)
+        {
+            var positionSeconds = pointX / widthX * widthSeconds;
+            CaretPositionSeconds = positionSeconds;
+            CaretPositionText = TimeSpan.FromSeconds(positionSeconds).ToString("m\\:ss\\.ff");
+        }
+
+        public void SeekBarPointerMoved(object? sender, PointerEventArgs args)
+        {
+            if (MovingCaret)
+            {
+                var control = sender as Control;
+                var point = args.GetCurrentPoint(control);
+                SetCaretPosition(point.Position.X, control?.Bounds.Width ?? 0, FullLengthVocalsDraw.WaveformLengthSeconds ?? 0);
+            }
+        }
+
+        public void SeekBarPointerReleased(object? sender, PointerReleasedEventArgs args)
+        {
+            if (MovingCaret)
+            {
+                var control = sender as Control;
+                var point = args.GetCurrentPoint(control);
+                SetCaretPosition(point.Position.X, control?.Bounds.Width ?? 0, FullLengthVocalsDraw.WaveformLengthSeconds ?? 0);
+
+                Seek(CaretPositionSeconds);
+
+                MovingCaret = false;
+            }
+        }
+
+        private void Seek(double? seekToSeconds)
+        {
+            if (seekToSeconds == null) seekToSeconds = 0;
+            StopTicking();
+
+            CurrentPlaybackPositionSeconds = seekToSeconds;
+            CurrentPlaybackPositionText = TimeSpan.FromSeconds(seekToSeconds.Value).ToString("m\\:ss\\.ff");
+            CurrentOffsetSeconds = seekToSeconds;
+            CaretPositionSeconds = seekToSeconds;
+
+            if (PlayAudio != null)
+            {
+                PlayAudio.Stop();
+                PlayAudio.Dispose();
+            }
+
+            PlayAudio = new WaveOutEvent();
+            (CurrentProcess.UnseparatedAudioStream ??
+             CurrentProcess.VocalsAudioStream)!.CurrentTime = TimeSpan.FromSeconds(CurrentOffsetSeconds ?? 0);
+            PlayAudio.Init(CurrentProcess.UnseparatedAudioStream ?? CurrentProcess.VocalsAudioStream);
+            if (IsPlaying)
+            {
+                Play();
+                StartTicking();
+            }
+        }
+
+        public void ManualAlignKeyDown(object? sender, KeyEventArgs keyArgs)
+        {
+            if (keyArgs.Key == Key.Escape)
+            {
+                // TODO: cancel stuff maybe?
+                //keyArgs.Handled = true;
+            }
+
+            if (IsRecording)
+            {
+
+                switch (keyArgs.Key)
+                {
+                    case Key.Right:
+                        if (WordCurrentlyTiming == null)
+                        {
+                            if (CurrentProcess.ManualTimingQueue.Count == 0)
+                            {
+                                // TODO: this shouldn't happen; log it
+                            }
+                            else
+                            {
+                                // this is the first word; start it up
+                                StartNextWord(CurrentPlaybackPositionSeconds);
+                            }
+                        }
+                        else
+                        {
+                            if (WordCurrentlyTiming.IsRunning)
+                            {
+                                // this word is going right into the next one, so end it here
+                                StopWord(WordCurrentlyTiming, CurrentPlaybackPositionSeconds);
+                            }
+
+                            // if there aren't any more words, stop running
+                            if (CurrentProcess.ManualTimingQueue!.Count == 0)
+                            {
+                                Stop(null);
+                            }
+                            else
+                            {
+                                // whether the current word was running or not, the next one should start here
+                                StartNextWord(CurrentPlaybackPositionSeconds);
+                            }
+                        }
+
+                        keyArgs.Handled = true;
+                        break;
+                    case Key.Down:
+                        if (WordCurrentlyTiming?.IsRunning ?? false)
+                        {
+                            // just stop the current word
+                            StopWord(WordCurrentlyTiming, CurrentPlaybackPositionSeconds);
+                            // if there aren't any more words, stop running
+                            if (CurrentProcess.ManualTimingQueue!.Count == 0)
+                            {
+                                Stop(null);
+                            }
+
+                            keyArgs.Handled = true;
+                        }
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/ViewModels/NarrowingViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/NarrowingViewModel.cs
index fc2927d..608dfd4 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/NarrowingViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/NarrowingViewModel.cs
@@ -4,6 +4,7 @@
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.Input;
 using KaddaOK.AvaloniaApp.Models;
+using KaddaOK.AvaloniaApp.Views;
 
 namespace KaddaOK.AvaloniaApp.ViewModels
 {
@@ -83,7 +84,7 @@ private void SetLineIgnored(ReadOnlyCollection<object>? parameter)
         public void GoToNextStep(object? parameter)
         {
             CurrentProcess!.SetChosenLinesToSelectedPossibilities();
-            CurrentProcess!.SelectedTabIndex = 4;
+            CurrentProcess!.SelectedTabIndex = (int)TabIndexes.Edit;
         }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/RecognizeViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/RecognizeViewModel.cs
index 64d9a7f..8b4c1c2 100644
--- a/KaddaOK.AvaloniaApp/ViewModels/RecognizeViewModel.cs
+++ b/KaddaOK.AvaloniaApp/ViewModels/RecognizeViewModel.cs
@@ -13,6 +13,7 @@
 using Avalonia.Platform.Storage;
 using KaddaOK.AvaloniaApp.Models;
 using KaddaOK.AvaloniaApp.Services;
+using KaddaOK.AvaloniaApp.Views;
 
 namespace KaddaOK.AvaloniaApp.ViewModels
 {
@@ -79,7 +80,7 @@ internal bool CanStartRecognizing(object? parameter, IReportReasonCantExecute re
                 return false;
             }
 
-            if (!CurrentProcess!.KnownOriginalLyrics?.Lyrics?.Any() ?? true)
+            if (!CurrentProcess!.KnownOriginalLyrics?.SeparatorCleansedLines?.Any() ?? true)
             {
                 reporter.ReasonCantExecute = "Lyrics must be supplied for a quality result.";
                 return false;
@@ -154,68 +155,7 @@ private void AppendLogLine(string line)
         [RelayCommand]
         public void GoToNextStep(object? parameter)
         {
-            CurrentProcess!.SelectedTabIndex = 3;
-        }
-
-        [RelayCommand]
-        public async Task ImportCtm()
-        {
-            if (App.MainWindow == null)
-            {
-                throw new InvalidOperationException(
-                    "Couldn't find the reference to MainWindow in order to show a dialog");
-            }
-
-            var options = new FilePickerOpenOptions
-            {
-                AllowMultiple = false,
-                Title = "Select a .CTM file to import",
-                FileTypeFilter = new FilePickerFileType[] { new ("NeMo Forced Aligner tokens .ctm file")
-                {
-                    Patterns = new[] { "*.ctm" }
-                } }
-            };
-
-            try
-            {
-                Dispatcher.UIThread.Invoke(() => { GettingFile = true; });
-                var results = await App.MainWindow.StorageProvider.OpenFilePickerAsync(options);
-                var result = results?.FirstOrDefault();
-                if (result != null)
-                {
-
-                    var ctmFilePath = result.TryGetLocalPath();
-
-                    if (!string.IsNullOrWhiteSpace(ctmFilePath))
-                    {
-                        var ctmLines = File.ReadAllLines(ctmFilePath).ToList();
-
-                        var lyricLines =
-                            NfaCtmImporter.ImportNfaCtmAndLyrics(ctmLines, CurrentProcess.KnownOriginalLyrics?.Lyrics);
-
-                        CurrentProcess.ChosenLines =
-                            new ObservableCollection<LyricLine>(lyricLines);
-
-
-                        CurrentProcess.KaraokeSource = InitialKaraokeSource.CtmImport;
-                        CurrentProcess.RaiseChosenLinesChanged();
-                        CurrentProcess.NarrowingStepCompletenessChanged();
-                        CurrentProcess.CanExportFactorsChanged();
-                        CurrentProcess!.SelectedTabIndex = 4;
-                    }
-                }
-                GettingFile = false;
-            }
-            catch (Exception e)
-            {
-                // The user canceled or something went wrong
-                if (NotificationManager != null)
-                {
-                    NotificationManager.Position = NotificationPosition.BottomRight;
-                    NotificationManager.Show(new Notification("Error", $"An error occurred: {e.Message}", NotificationType.Error, TimeSpan.Zero));
-                }
-                GettingFile = false;
-            }
+            CurrentProcess!.SelectedTabIndex = (int)TabIndexes.Narrow;
         }
 
         [RelayCommand]
@@ -223,11 +163,5 @@ private void LinkToAzureSpeechService()
         {
             UrlOpener.OpenUrl("https://azure.microsoft.com/en-us/products/ai-services/speech-to-text");
         }
-
-        [RelayCommand]
-        private void LinkToForcedAligner()
-        {
-            UrlOpener.OpenUrl("https://github.com/KaddaOK/Forced-Aligner-for-Karaoke");
-        }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/StartViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/StartViewModel.cs
new file mode 100644
index 0000000..0e2fbbd
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/ViewModels/StartViewModel.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls.Notifications;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using CommunityToolkit.Mvvm.Input;
+using DialogHostAvalonia;
+using KaddaOK.AvaloniaApp.Models;
+using KaddaOK.AvaloniaApp.Services;
+using KaddaOK.AvaloniaApp.Views;
+using KaddaOK.Library;
+using KaddaOK.Library.Ytmm;
+
+namespace KaddaOK.AvaloniaApp.ViewModels
+{
+    public partial class StartViewModel : DrawsFullLengthVocalsBase
+    {
+        private string dialogHostName = "StartViewDialogHost";
+        private bool _gettingFile;
+        public bool GettingFile
+        {
+            get => _gettingFile;
+            set => SetProperty(ref _gettingFile, value);
+        }
+
+        private IRzlrcImporter RzlrcImporter { get; }
+        private IKbpImporter KbpImporter { get; }
+
+        public WindowNotificationManager? NotificationManager { get; set; }
+
+        public StartViewModel(KaraokeProcess karaokeProcess, IRzlrcImporter rzlrcImporter, IKbpImporter kbpImporter) : base(karaokeProcess)
+        {
+            RzlrcImporter = rzlrcImporter;
+            KbpImporter = kbpImporter;
+        }
+
+        [RelayCommand]
+        public void SelectManualProcess()
+        {
+            CurrentProcess.KaraokeSource = InitialKaraokeSource.ManualSync;
+            CurrentProcess.SelectedTabIndex = (int)TabIndexes.Audio;
+        }
+
+        [RelayCommand]
+        public void SelectAzureProcess()
+        {
+            CurrentProcess.KaraokeSource = InitialKaraokeSource.AzureSpeechService;
+            CurrentProcess.SelectedTabIndex = (int)TabIndexes.Audio;
+        }
+
+        [RelayCommand]
+        private void LinkToForcedAligner()
+        {
+            UrlOpener.OpenUrl("https://github.com/KaddaOK/Forced-Aligner-for-Karaoke");
+        }
+
+        [RelayCommand]
+        protected void ClearAll()
+        {
+            // TODO: show confirm
+            CurrentProcess?.ClearAudioAndDownstream();
+        }
+
+        [RelayCommand]
+        protected async Task Import()
+        {
+            if (App.MainWindow == null)
+            {
+                throw new InvalidOperationException(
+                    "Couldn't find the reference to MainWindow in order to show a dialog");
+            }
+
+            var options = new FilePickerOpenOptions
+            {
+                AllowMultiple = false,
+                Title = "Select an existing file to import",
+                FileTypeFilter = new FilePickerFileType[] { new ("Karaoke lyrics file")
+                {
+                    Patterns = new[] { "*.rzlrc", "*.kbp" }
+                } }
+            };
+            try
+            {
+                Dispatcher.UIThread.Invoke(() => { GettingFile = true; });
+                var results = await App.MainWindow.StorageProvider.OpenFilePickerAsync(options);
+                var result = results?.FirstOrDefault();
+                if (result != null)
+                {
+                    var previousFilePath = CurrentProcess!.ImportedKaraokeSourceFilePath;
+                    var existingKaraokeImportFilePath = result.TryGetLocalPath();
+
+                    if (!string.IsNullOrWhiteSpace(existingKaraokeImportFilePath))
+                    {
+                        var extension = System.IO.Path.GetExtension(existingKaraokeImportFilePath);
+                        switch (extension)
+                        {
+                            case ".rzlrc":
+                                var imported = RzlrcImporter.ImportRzlrc(existingKaraokeImportFilePath);
+
+                                // TODO: if (imported == null || imported.Count == 0) // inform and cancel
+                                RzlrcLyric? selectedLayer = null;
+                                if (imported.Count > 1) // select one
+                                {
+                                    var dialogResult = await DialogHost.Show(imported, dialogHostName);
+                                    selectedLayer = dialogResult as RzlrcLyric;
+                                }
+                                CurrentProcess.ClearAudioAndDownstream();
+                                CurrentProcess.OriginalImportedRzlrcFile = imported;
+                                CurrentProcess.OriginalImportedRzlrcPage = selectedLayer ?? imported.First();
+                                await RzlrcImporter.LoadRzlrcPageIntoKaraokeProcessAsync(CurrentProcess, CurrentProcess.OriginalImportedRzlrcPage, existingKaraokeImportFilePath);
+                                break;
+                            case ".kbp":
+                                CurrentProcess.ClearAudioAndDownstream();
+                                await KbpImporter.ImportKbpAsync(CurrentProcess, existingKaraokeImportFilePath);
+                                break;
+                            default:
+                                // TODO: inform better!
+                                throw new InvalidOperationException($"Import of {extension} files not yet supported.");
+                        }
+                    }
+                    CurrentProcess!.SelectedTabIndex = (int)TabIndexes.Edit;
+                }
+                GettingFile = false;
+            }
+            catch (Exception e)
+            {
+                // The user canceled or something went wrong
+                if (NotificationManager != null)
+                {
+                    NotificationManager.Position = NotificationPosition.BottomRight;
+                    NotificationManager.Show(new Notification("Error", $"An error occurred: {e.Message}", NotificationType.Error, TimeSpan.Zero));
+                }
+                GettingFile = false;
+            }
+        }
+
+        [RelayCommand]
+        public async Task SelectCtm()
+        {
+            if (App.MainWindow == null)
+            {
+                throw new InvalidOperationException(
+                    "Couldn't find the reference to MainWindow in order to show a dialog");
+            }
+
+            var options = new FilePickerOpenOptions
+            {
+                AllowMultiple = false,
+                Title = "Select a .CTM file to import",
+                FileTypeFilter = new FilePickerFileType[] { new ("NeMo Forced Aligner tokens .ctm file")
+                {
+                    Patterns = new[] { "*.ctm" }
+                } }
+            };
+
+            try
+            {
+                Dispatcher.UIThread.Invoke(() => { GettingFile = true; });
+                var results = await App.MainWindow.StorageProvider.OpenFilePickerAsync(options);
+                var result = results?.FirstOrDefault();
+                if (result != null)
+                {
+
+                    var ctmFilePath = result.TryGetLocalPath();
+
+                    if (!string.IsNullOrWhiteSpace(ctmFilePath))
+                    {
+                        // CTM import process wants to have the lyrics already, so let's wait to do the import and go through audio and lyrics pages
+                        CurrentProcess.ImportedKaraokeSourceFilePath = ctmFilePath;
+                        CurrentProcess.KaraokeSource = InitialKaraokeSource.CtmImport;
+                        CurrentProcess!.SelectedTabIndex = (int)TabIndexes.Audio;
+                    }
+                }
+                GettingFile = false;
+            }
+            catch (Exception e)
+            {
+                // The user canceled or something went wrong
+                if (NotificationManager != null)
+                {
+                    NotificationManager.Position = NotificationPosition.BottomRight;
+                    NotificationManager.Show(new Notification("Error", $"An error occurred: {e.Message}", NotificationType.Error, TimeSpan.Zero));
+                }
+                GettingFile = false;
+            }
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/Views/AboutView.axaml b/KaddaOK.AvaloniaApp/Views/AboutView.axaml
index d5385cc..b7b00de 100644
--- a/KaddaOK.AvaloniaApp/Views/AboutView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/AboutView.axaml
@@ -14,11 +14,14 @@
     <Design.DataContext>
         <designTime:DesignTimeAboutViewModel />
     </Design.DataContext>
-	<Grid RowDefinitions="50, *">
-        <TextBlock Margin="5,10" FontSize="20">
+	<Grid RowDefinitions="50, 50, *">
+        <TextBlock Classes="pageTitleHeader">
+            About
+        </TextBlock>
+        <TextBlock Grid.Row="1" Margin="5" FontSize="20">
             Kadda OK Tools <Run Text="{Binding AssemblyVersion}" />
         </TextBlock>
-		<ScrollViewer Grid.Row="1">
+		<ScrollViewer Grid.Row="2">
 			<StackPanel Margin="5,0">
 				<StackPanel.Styles>
 					<Style Selector="TextBlock.specialThanks">
diff --git a/KaddaOK.AvaloniaApp/Views/AudioView.axaml b/KaddaOK.AvaloniaApp/Views/AudioView.axaml
index 2139b2d..1264e3f 100644
--- a/KaddaOK.AvaloniaApp/Views/AudioView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/AudioView.axaml
@@ -32,7 +32,7 @@
         <Style Selector="Label.waveformLabel">
             <Setter
                 Property="Margin"
-                Value="0,10,0,0" />
+                Value="0,20,0,0" />
         </Style>
         <Style Selector="Border.outerWaveformBorder">
             <Setter
@@ -77,6 +77,7 @@
             <Setter
                 Property="TextWrapping"
                 Value="Wrap" />
+            <Setter Property="Margin" Value="0,0,0,5" />
         </Style>
     </UserControl.Styles>
     <dialogHost:DialogHost Identifier="AudioViewDialogHost">
@@ -90,33 +91,24 @@
             Classes.gettingFile="{Binding GettingFile}">
             <StackPanel
                 x:Name="AudioTabStackPanel"
-                Margin="20">
-                <TextBlock Classes="introText">
-                    To use the guided process for generating karaoke files, start here and follow
-                    the
-                    instructions on each screen, pushing the "Next Step" button to go through each
-                    tab,
-                    until you are satisfied with the content on the Edit tab.
+                Margin="20,0,20,20">
+                <TextBlock Classes="pageTitleHeader">
+                    Audio
                 </TextBlock>
+				<TextBlock Classes="introText">
+                    To get started, select the WAV or FLAC files to work on below.
+				</TextBlock>
                 <TextBlock
-                    Classes="introText"
-                    Margin="0,10"> To get started, select the WAV or FLAC files to work on below.
+                    Classes="introText"> 
                     (Separate instruments from vocals first using a tool such as <InlineUIContainer>
                         <Button
                             Classes="inline"
                             Content="UVR"
                             Command="{Binding LinkToUVRCommand}" />
-                    </InlineUIContainer>
-                    or whatever you prefer.) To proceed with the automatic process, only Vocals-only
-                    is mandatory, but for the best experience, all 3 should be selected. </TextBlock>
-                <TextBlock
-                    Classes="introText"
-                    Margin="0,10">
-                    Alternately, to edit a file from YTMM or KBS, click the Import... button at the
-                    bottom and select it.
-                    The app will attempt to load it and the accompanying audio files, and jump
-                    directly to the Edit tab.
-                </TextBlock>
+                    </InlineUIContainer>or whatever you prefer.)</TextBlock>
+                <TextBlock Classes="introText">
+					The Vocals-only version is mandatory, but for the best experience, all 3 should be selected.
+				</TextBlock>
                 <Label
                     Classes="waveformLabel"
                     Content="Original Unseparated Audio:" />
@@ -234,11 +226,6 @@
                     ColumnDefinitions="*,*"
                     Margin="0, 15">
                     <StackPanel Orientation="Horizontal">
-                        <Button
-                            Content="Import..."
-                            Command="{Binding ImportCommand}"
-                            ToolTip.Tip="Edit an existing file in this app"
-                            Padding="15, 10" />
                         <Button
                             Content="Clear All"
                             Command="{Binding ClearAllCommand}"
diff --git a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
index f8ca18d..acdd012 100644
--- a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml
@@ -45,48 +45,79 @@
             x:Key="IsIgnoredStroke"
             Color="#B0AAAAAA" />
 
+		<MenuFlyout
+            x:Key="TransformButtonFlyout">
+            <MenuItem 
+				Header="Nudge all timings..."
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).NudgeAllTimingsCommand}"
+				/>
+			<Separator />
+			<MenuItem 
+                Header="UPPER CASE ALL TEXT" 
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).UpperCaseAllTextCommand}"
+				/>
+            <MenuItem
+                Header="lower case all text"
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).LowerCaseAllTextCommand}"
+            />
+            <MenuItem
+                Header="Sentence case all lines"
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).SentenceCaseAllLinesCommand}"
+            />
+            <MenuItem
+                Header="Title Case All Words"
+                Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).TitleCaseAllWordsCommand}"
+            />
+        </MenuFlyout>
         <MenuFlyout
             x:Key="WordButtonFlyout"
             x:DataType="library:LyricWord">
             <MenuItem
-				AttachedToLogicalTree="MenuItem_AttachedToLogicalTree"
                 Header="Split Line Before This Syllable"
-                HotKey="s" InputGesture="s"
+                InputGesture="s"
+                KeyDown="LyricWordButtonFlyoutMenuItem_KeyDown"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).NewLineBeforeCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Split Line After This Syllable"
-                HotKey="a" InputGesture="a"
+                InputGesture="a"
+                KeyDown="LyricWordButtonFlyoutMenuItem_KeyDown"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).NewLineAfterCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Merge With Previous Syllable"
-                HotKey="w" InputGesture="w"
+                InputGesture="w"
+                KeyDown="LyricWordButtonFlyoutMenuItem_KeyDown"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MergeWithPrevCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Merge With Next Syllable"
-                HotKey="q" InputGesture="q"
+                InputGesture="q"
+                KeyDown="LyricWordButtonFlyoutMenuItem_KeyDown"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MergeWithNextCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Change Syllable Text..."
-                HotKey="e" InputGesture="e"
+                InputGesture="e"
+                KeyDown="LyricWordButtonFlyoutMenuItem_KeyDown"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).EditWordTextCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Delete Syllable"
-                HotKey="d" InputGesture="d"
+                InputGesture="d"
+                KeyDown="LyricWordButtonFlyoutMenuItem_KeyDown"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).DeleteWordCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Delete Entire Line"
-                HotKey="delete" InputGesture="delete"
+                InputGesture="delete"
+                KeyDown="LyricWordButtonFlyoutMenuItem_KeyDown"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).DeleteEntireLineCommand}"
                 CommandParameter="{Binding}" />
             <MenuItem
                 Header="Move All Words to Previous Line"
-                HotKey="z" InputGesture="z"
+                InputGesture="z"
+                KeyDown="LyricWordButtonFlyoutMenuItem_KeyDown"
                 Command="{Binding $parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).MoveLineToPreviousCommand}"
                 CommandParameter="{Binding}" />
         </MenuFlyout>
@@ -106,6 +137,9 @@
             </DataTemplate>
             <DataTemplate DataType="models:AddingLine">
                 <dialogs:InsertNewLineDialog DataContext="{Binding}" />
+            </DataTemplate>
+			<DataTemplate DataType="vm:NudgeTimingsViewModel">
+				<dialogs:NudgeTimingsDialog DataContext="{Binding}" />
             </DataTemplate>
         </dialogHost:DialogHost.DataTemplates>
         <Grid
@@ -118,9 +152,12 @@
 					x:Name="SelectionsScrollViewer"
 					Grid.Row="0">
 					<StackPanel>
+                        <TextBlock Classes="pageTitleHeader">
+                            Edit
+                        </TextBlock>
 						<TextBlock
 							TextWrapping="Wrap"
-							Margin="10"
+							Margin="5"
 							FontSize="12">
 							On this screen you can make direct changes to the words and lines.
 							Click the ⤴ button to make a line part of its preceeding line.
@@ -176,17 +213,28 @@
 							<ItemsRepeater.ItemTemplate>
 								<DataTemplate x:DataType="library:LyricLine">
 									<StackPanel x:Name="PhraseRepeaterStackPanel">
-										<Border x:Name="PhrasesRepeaterPhraseBorder"
-											ZIndex="5"
-											BorderBrush="{DynamicResource ListMediumColor}"
-											Background="Black"
-											BorderThickness="0,0,1,1"
-											Margin="13,3,0,0"
-											Padding="0,0,0,3"
-											CornerRadius="3">
-											<Grid x:Name="PhrasesRepeaterGrid"
-												Classes="lineStack"
-												ColumnDefinitions="20,36,*,36,25">
+                                        <StackPanel.Styles>
+											<Style Selector="Border.isCursor">
+												<Setter Property="Background" Value="#FF002628" />
+                                            </Style>
+                                        </StackPanel.Styles>
+                                        <Border x:Name="PhrasesRepeaterPhraseBorder"
+                                                ZIndex="5"
+                                                BorderBrush="{DynamicResource ListMediumColor}"
+                                                Background="Black"
+                                                BorderThickness="0,0,1,1"
+                                                Margin="13,3,0,0"
+                                                Padding="0,0,0,3"
+                                                CornerRadius="3">
+                                            <Classes.isCursor>
+                                                <MultiBinding Converter="{StaticResource ObjectEqualityBooleanConverter}">
+                                                    <Binding Path="." />
+                                                    <Binding Path="$parent[views:EditLinesView].((vm:EditLinesViewModel)DataContext).CursorLine" />
+                                                </MultiBinding>
+                                            </Classes.isCursor>
+                                            <Grid x:Name="PhrasesRepeaterGrid"
+                                                  Classes="lineStack"
+                                                  ColumnDefinitions="20,36,*,36,25">
 												<Button
 													Classes="lineMergeButton"
 													Grid.Column="0"
@@ -265,6 +313,10 @@
 					</StackPanel>
 
 				</ScrollViewer>
+				<Button Grid.Row="1" 
+                        VerticalAlignment="Bottom"
+                        Content="Transform All..."
+                        Flyout="{StaticResource TransformButtonFlyout}"/>
                 <StackPanel x:Name="UndoHistory" Grid.Row="1" HorizontalAlignment="Right" Margin="0,5,10,10">
                     <StackPanel.Styles>
 						<Style Selector="TextBlock.HistoryItem">
diff --git a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml.cs b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml.cs
index eb38887..ffcbd3c 100644
--- a/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml.cs
+++ b/KaddaOK.AvaloniaApp/Views/EditLinesView.axaml.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
@@ -13,7 +14,12 @@
 
 namespace KaddaOK.AvaloniaApp.Views
 {
-    public partial class EditLinesView : UserControl
+    public interface IEditLinesView
+    {
+        bool Focus(NavigationMethod method = 0, KeyModifiers keyModifiers = 0);
+    }
+
+    public partial class EditLinesView : UserControl, IEditLinesView
     {
         private readonly EditLinesViewModel _viewModel;
         private ItemsRepeater? _phrasesRepeater;
@@ -53,15 +59,13 @@ private void EditLinesViewDialog_Closing(object? sender, DialogClosingEventArgs
             {
                 _viewModel.ApplyLineTimingEdit(e.Parameter);
             }
-
-            this.Focus();
         }
 
         private void EditLinesView_OnKeyDown(object? sender, KeyEventArgs e)
         {
             if (!this.FindDescendantOfType<DialogHost>()?.IsOpen ?? false) // leave it alone if dialogs are open
             {
-                _viewModel.KeyPressed(e);
+                HandleWordEditKeys(e, false);
             }
         }
 
@@ -73,30 +77,132 @@ private void EditLinesView_AttachedToVisualTree(object? sender, VisualTreeAttach
 
         private void WordButton_GotFocus(object? sender, GotFocusEventArgs e)
         {
-            _viewModel.CursorWord = ((Button)sender)?.CommandParameter as LyricWord;
+            var lyricWordButton = sender as Button;
+            _viewModel.CursorWord = lyricWordButton?.CommandParameter as LyricWord;
+            var itemsControl = lyricWordButton?.FindLogicalAncestorOfType<ItemsControl>();
+            _viewModel.CursorLine = itemsControl?.DataContext as LyricLine;
         }
 
-        private void MenuItem_AttachedToLogicalTree(object? sender, Avalonia.LogicalTree.LogicalTreeAttachmentEventArgs e)
+        private void LyricWordButtonFlyoutMenuItem_KeyDown(object? sender, Avalonia.Input.KeyEventArgs e)
         {
+            // it's a bit strange to have to do it this way, but these MenuItems are refusing to respond to HotKeys 
             var menuItem = sender as MenuItem;
-            if (menuItem?.InputGesture != null)
+            if (HandleWordEditKeys(e, true))
+            {
+                var menuItemButton = menuItem?.FindLogicalAncestorOfType<Button>();
+                menuItemButton?.Flyout?.Hide();
+            }
+
+            this.Focus();
+        }
+
+        public bool HandleWordEditKeys(KeyEventArgs keyArgs, bool isFromFlyout)
+        {
+            switch (keyArgs.Key)
             {
-                var keyBinding = new KeyBinding
+                case Key.Down:
+                case Key.Right:
+                case Key.Left:
+                case Key.Up:
+                    if (!isFromFlyout)
+                    {
+                        SwitchWordSelection(keyArgs);
+                        return true;
+                    }
+
+                    return false;
+                default:
+                    return _viewModel.HandleWordEditKeys(keyArgs, isFromFlyout);
+            }
+        }
+
+        private void SwitchWordSelection(KeyEventArgs keyArgs)
+        {
+            // this is just gonna change focus and let the handler set it back... wacky I know, but it makes
+            // sense because of what we can and can't control around tabbing and such.
+            // Also, apparently the order in which it finds these isn't reliable, so we'll have to sort it by the order in
+            // memory...
+            var allWordButtonsByPhrases = this.GetVisualDescendants().Where(x => x.Name == "PhraseWordsItemsControl")
+                .Select(s => new
                 {
-                    Gesture = menuItem.InputGesture,
-                    Command = menuItem.Command,
-                    CommandParameter = menuItem.CommandParameter
-                };
-                if (!menuItem.KeyBindings.Any())
+                    Buttons = s.GetVisualDescendants().Where(y => y.Name == "LyricWordButton").Select(y => (Button)y).ToList(),
+                    SortOrder = _viewModel.CurrentProcess.ChosenLines.IndexOf(s.DataContext as LyricLine)
+                }).OrderBy(s => s.SortOrder)
+                .Select(s => s.Buttons.OrderBy(x => _viewModel.CurrentProcess.ChosenLines[s.SortOrder].Words.IndexOf(x.CommandParameter as LyricWord)).ToList())
+                .Where(s => s.Count > 0) // I'm not sure why this even happened; virtualization maybe
+                .ToList();
+
+
+            Button? destinationButton = null;
+            if (_viewModel.CursorWord == null)
+            {
+                switch (keyArgs.Key)
                 {
-                    menuItem.KeyBindings.Add(keyBinding);
+                    case Key.Down:
+                    case Key.Right:
+                        destinationButton = allWordButtonsByPhrases.FirstOrDefault()?.FirstOrDefault();
+                        break;
+                    case Key.Left:
+                        destinationButton = allWordButtonsByPhrases.FirstOrDefault()?.LastOrDefault();
+                        break;
+                    case Key.Up:
+                        destinationButton = allWordButtonsByPhrases.LastOrDefault()?.FirstOrDefault();
+                        break;
                 }
-                var presenter = menuItem?.FindLogicalAncestorOfType<MenuFlyoutPresenter>();
-                if (presenter != null)
+            }
+            else
+            {
+                var currentPhrase = allWordButtonsByPhrases.SingleOrDefault(phrase => phrase.Any(word => word.CommandParameter == _viewModel.CursorWord));
+                if (currentPhrase != null)
                 {
-                    presenter.KeyBindings.AddRange(menuItem.KeyBindings);
+                    var currentPhraseIndex = allWordButtonsByPhrases.IndexOf(currentPhrase);
+                    var currentWordButton = currentPhrase.FirstOrDefault(word => word.CommandParameter == _viewModel.CursorWord);
+                    var currentWordIndex = currentPhrase.IndexOf(currentWordButton);
+                    switch (keyArgs.Key)
+                    {
+                        case Key.Down:
+                            if (allWordButtonsByPhrases.Count > currentPhraseIndex + 1)
+                            {
+                                var nextPhrase = allWordButtonsByPhrases[currentPhraseIndex + 1];
+                                var nextWordIndex = nextPhrase.Count > currentWordIndex
+                                    ? currentWordIndex
+                                    : nextPhrase.Count - 1;
+                                destinationButton = nextPhrase[nextWordIndex];
+                            }
+
+                            break;
+                        case Key.Right:
+                            if (currentWordIndex < currentPhrase.Count - 1)
+                            {
+                                destinationButton = currentPhrase[currentWordIndex + 1];
+                            }
+
+                            break;
+                        case Key.Left:
+                            if (currentWordIndex > 0)
+                            {
+                                destinationButton = currentPhrase[currentWordIndex - 1];
+                            }
+
+                            break;
+                        case Key.Up:
+                            if (currentPhraseIndex > 0)
+                            {
+                                var nextPhrase = allWordButtonsByPhrases[currentPhraseIndex - 1];
+                                var nextWordIndex = nextPhrase.Count > currentWordIndex
+                                    ? currentWordIndex
+                                    : nextPhrase.Count - 1;
+                                destinationButton = nextPhrase[nextWordIndex];
+                            }
+
+                            break;
+                    }
+
                 }
             }
+
+            destinationButton?.BringIntoView();
+            destinationButton?.Focus();
         }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/Views/ExportView.axaml b/KaddaOK.AvaloniaApp/Views/ExportView.axaml
index a8b7f6c..b05a9d7 100644
--- a/KaddaOK.AvaloniaApp/Views/ExportView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/ExportView.axaml
@@ -29,6 +29,9 @@
     </Design.DataContext>
     <ScrollViewer>
         <StackPanel>
+            <TextBlock Classes="pageTitleHeader">
+                Export
+            </TextBlock>
             <Label Content="Colors for Output" />
             <Grid
                 x:Name="FullColorGrid"
diff --git a/KaddaOK.AvaloniaApp/Views/LyricsView.axaml b/KaddaOK.AvaloniaApp/Views/LyricsView.axaml
index 35a2e18..6492764 100644
--- a/KaddaOK.AvaloniaApp/Views/LyricsView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/LyricsView.axaml
@@ -6,6 +6,7 @@
     xmlns:vm="clr-namespace:KaddaOK.AvaloniaApp.ViewModels"
     xmlns:local="clr-namespace:KaddaOK.AvaloniaApp"
     xmlns:designTime="clr-namespace:KaddaOK.AvaloniaApp.ViewModels.DesignTime"
+    xmlns:models="clr-namespace:KaddaOK.AvaloniaApp.Models"
     mc:Ignorable="d"
     d:DesignWidth="1000"
     d:DesignHeight="800"
@@ -19,28 +20,96 @@
             ColumnDefinitions="*,*"
             Margin="5">
             <StackPanel Grid.Column="0">
-                <Label Content="Lyrics Input" />
+                <TextBlock Classes="pageTitleHeader">
+                    Lyrics
+                </TextBlock>
                 <StackPanel
                     Orientation="Horizontal"
                     Margin="0,0,10,5">
-                    <Label FontSize="13">
-                        Type or paste the original lyrics here, or
-                    </Label>
-                    <Button
-                        Classes="inline"
-                        Content="load from a file..."
-                        Height="24"
-                        Padding="5,2"
-                        Command="{Binding SelectLyricsFileCommand}"
-                        IsEnabled="{Binding !GettingFile}" />
+                    <TextBlock TextWrapping="Wrap" FontSize="13">
+                        Type or paste the original lyrics here, or <InlineUIContainer>
+							<Button
+								Classes="inline"
+								Content="load from a file..."
+								Height="24"
+								Padding="1,0,5,2"
+                                Margin="0,-1,0,0"
+								Command="{Binding SelectLyricsFileCommand}"
+								IsEnabled="{Binding !GettingFile}" />
+                        </InlineUIContainer>
+                    </TextBlock>
+
 
                 </StackPanel>
-                <TextBlock
-                    TextWrapping="Wrap"
-                    FontSize="13"
-                    Text="Tip: Recognition will work best if you start a new line wherever the singer stops making continuous sound, which might be different from how the lyrics are normally written." />
+                <StackPanel x:Name="AzureDescription">
+                    <StackPanel.IsVisible>
+                        <MultiBinding Converter="{StaticResource EnumEqualityBooleanConverter}">
+                            <Binding Path="CurrentProcess.KaraokeSource" />
+                            <Binding Source="{x:Static models:InitialKaraokeSource.AzureSpeechService}" />
+                        </MultiBinding>
+                    </StackPanel.IsVisible>
+					<TextBlock
+                        TextWrapping="Wrap"
+                        FontSize="13">
+						For Azure Speech Service, recognition will work best if you start a new line wherever
+						the singer stops making continuous sound, which might be different from how the lyrics are normally written.
+                    </TextBlock>
+					<TextBlock
+                            TextWrapping="Wrap"
+                            FontSize="13">
+                        Do not manually separate syllables in any way when using this mode.
+                    </TextBlock>
+                </StackPanel>
+                <StackPanel x:Name="CtmDescription">
+                    <StackPanel.IsVisible>
+                        <MultiBinding Converter="{StaticResource EnumEqualityBooleanConverter}">
+                            <Binding Path="CurrentProcess.KaraokeSource" />
+                            <Binding Source="{x:Static models:InitialKaraokeSource.CtmImport}" />
+                        </MultiBinding>
+                    </StackPanel.IsVisible>
+					<TextBlock
+                        TextWrapping="Wrap"
+                        FontSize="13">When importing from a CTM file, technically the lyrics are already present in the file.
+                        </TextBlock>
+                    <TextBlock
+                        TextWrapping="Wrap"
+                        FontSize="13">
+                        However, that file does not include line breaks, so if you don't input any lyrics here, you'll get
+                        them all on one line and have to split them up manually on the next screen, which can be tedious.
+                    </TextBlock>
+                    <TextBlock
+                        TextWrapping="Wrap"
+                        FontSize="13">
+                        So if you do have the lyrics that you used to run the forced aligner handy, plug them in here.
+                    </TextBlock>
+                </StackPanel>
+
+                <StackPanel x:Name="ManualDescription">
+                    <StackPanel.IsVisible>
+                        <MultiBinding Converter="{StaticResource EnumEqualityBooleanConverter}">
+                            <Binding Path="CurrentProcess.KaraokeSource" />
+                            <Binding Source="{x:Static models:InitialKaraokeSource.ManualSync}" />
+                        </MultiBinding>
+                    </StackPanel.IsVisible>
+                    <TextBlock
+                        TextWrapping="Wrap"
+                        FontSize="13">In the manual sync process, you will want to use / or | to separate multisyllabic
+                        words into the pieces you want to tap to record. 
+                    </TextBlock>
+                    <TextBlock
+                        TextWrapping="Wrap"
+                        FontSize="13">
+                        For example, you would change "wanna" to "wan/na" or "wan|na" in order to tap both halves of it. 
+                    </TextBlock>
+                    <TextBlock
+                        TextWrapping="Wrap"
+                        FontSize="13">
+                        (Spaces, new lines, and dashes are also syllable separators.)
+                    </TextBlock>
+                </StackPanel>
                 <TextBox
                     MinHeight="200"
+                    Margin="0,10,0,0"
                     TextWrapping="Wrap"
                     AcceptsReturn="True"
                     x:Name="LyricInputEditor"
@@ -50,17 +119,25 @@
             <StackPanel
                 Grid.Column="1"
                 Margin="10,0,5,0">
-                <Label Content="Unique Phrases" />
-                <Label FontSize="13">
+                <StackPanel>
+                    <StackPanel.IsVisible>
+                        <MultiBinding Converter="{StaticResource EnumEqualityBooleanConverter}">
+                            <Binding Path="CurrentProcess.KaraokeSource" />
+                            <Binding Source="{x:Static models:InitialKaraokeSource.AzureSpeechService}" />
+                        </MultiBinding>
+                    </StackPanel.IsVisible>
+                    <Label Content="Unique Phrases" />
+                    <Label FontSize="13">
+                        <TextBlock
+                            TextWrapping="Wrap"
+                            Text="These are automatically de-duplicated from the lyrics to the left. They are sent to the Speech Service engine along with the audio recording to increase the likelihood it interprets the vocals as the right words." />
+                    </Label>
                     <TextBlock
+                        Text="{Binding PhrasesText}"
                         TextWrapping="Wrap"
-                        Text="These are automatically de-duplicated from the lyrics to the left. They are sent to the Speech Service engine along with the audio recording to increase the likelihood it interprets the vocals as the right words." />
-                </Label>
-                <TextBlock
-                    Text="{Binding PhrasesText}"
-                    TextWrapping="Wrap"
-                    Margin="30"
-                    FontSize="14" />
+                        Margin="30"
+                        FontSize="14" />
+                </StackPanel>
 
                 <Button
                     Content="Next Step"
diff --git a/KaddaOK.AvaloniaApp/Views/MainView.axaml b/KaddaOK.AvaloniaApp/Views/MainView.axaml
index a0f1473..ca70740 100644
--- a/KaddaOK.AvaloniaApp/Views/MainView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/MainView.axaml
@@ -8,86 +8,69 @@
     xmlns:avalonia="clr-namespace:KaddaOK.AvaloniaApp"
     xmlns:designTime="clr-namespace:KaddaOK.AvaloniaApp.ViewModels.DesignTime"
     mc:Ignorable="d"
-    d:DesignWidth="1000"
-    d:DesignHeight="800"
+    d:DesignWidth="1180"
+    d:DesignHeight="860"
     x:Class="KaddaOK.AvaloniaApp.Views.MainView"
     x:DataType="vm:MainViewModel">
     <Design.DataContext>
         <designTime:DesignTimeMainViewModel />
     </Design.DataContext>
     <UserControl.Styles>
-        <Style Selector="TabItem">
+
+        <Style Selector="TabControl#MainViewTabControl TabItem">
             <Setter
                 Property="CornerRadius"
-                Value="10,10,0,0" />
+                Value="20" />
             <Setter
                 Property="Margin"
-                Value="0,0,1,0" />
-            <Setter
-                Property="Background"
-                Value="#FF0C0D10" />
-            <Setter
-                Property="BorderThickness"
-                Value="1,1,1,0" />
+                Value="10" />
+            <Setter Property="Width" Value="180" />
+            <Setter Property="Height" Value="50" />
         </Style>
-        <Style Selector="TabItem:selected">
+        <Style Selector="TabControl#MainViewTabControl TabItem:selected">
             <Setter
                 Property="Background"
-                Value="{DynamicResource SystemRegionColor}" />
-            <Setter
-                Property="Margin"
-                Value="0,0,1,-2" />
-            <Setter
-                Property="Padding"
-                Value="12,0,12,2" />
+                Value="{DynamicResource SystemAccentColor}" />
+
             <Setter
                 Property="BorderThickness"
-                Value="1,1,1,0" />
+                Value="0" />
             <Setter
                 Property="BorderBrush"
                 Value="#FFABE1FF" />
         </Style>
-        <Style Selector="TabItem:selected:pointerover /template/ Border">
+        <Style
+            Selector="TabControl#MainViewTabControl TabItem:selected:pointerover /template/ Border">
             <Setter
                 Property="TextElement.Foreground"
                 Value="{DynamicResource TabItemHeaderForegroundSelected}" />
         </Style>
-        <Style Selector="TabItem:pointerover /template/ Border">
+        <Style Selector="TabControl#MainViewTabControl TabItem:pointerover /template/ Border">
             <Setter
                 Property="Background"
                 Value="{DynamicResource SystemRegionColor}" />
+			<Setter
+				Property="Cursor"
+                Value="Hand" />
         </Style>
-        <Style Selector="TabItem:disabled /template/ Border">
-            <Setter
+        <Style Selector="TabControl#MainViewTabControl TabItem:disabled /template/ Border">
+            <!--<Setter
                 Property="Background"
-                Value="#801B1F26" />
+                Value="#801B1F26" />-->
             <Setter
                 Property="TextElement.Foreground"
-                Value="#FF6F6F6F" />
+                Value="#FF444444" />
         </Style>
-        <Style Selector="views|AudioView, views|LyricsView, views|RecognizeView, views|NarrowingView, views|EditLinesView, views|ExportView, views|AboutView">
-            <Setter
-                Property="Background"
-                Value="{DynamicResource SystemRegionColor}" />
-            <Setter
-                Property="Padding"
-                Value="10" />
-            <Setter
-                Property="CornerRadius"
-                Value="0,10,5,5" />
-            <Setter
-                Property="BorderThickness"
-                Value="1,0,1,1" />
-            <Setter
-                Property="BorderBrush"
-                Value="#FFABE1FF" />
+
+        <Style
+            Selector="TabControl#MainViewTabControl /template/ ContentPresenter#PART_SelectedContentHost">
+            <Setter Property="Padding" Value="20,0,0,0" />
         </Style>
     </UserControl.Styles>
-    <Grid RowDefinitions="32,*">
-        <StackPanel
-            Orientation="Horizontal"
-            HorizontalAlignment="Center">
-            <Image
+    <Grid Margin="0">
+        <StackPanel Width="220" Margin="0,20,0,0" Height="32" VerticalAlignment="Top" HorizontalAlignment="Left"
+            Orientation="Horizontal">
+            <Image Margin="30,0,0,0"
                 Source="/Assets/KaddaOKIcon.png"
                 HorizontalAlignment="Center" />
             <Label
@@ -98,64 +81,95 @@
                 IsHitTestVisible="False" />
         </StackPanel>
 
+		<Image Height="20" VerticalAlignment="Top" IsHitTestVisible="False">
+            <DrawingImage>
+                <DrawingGroup>
+                    <GeometryDrawing Brush="Transparent" Geometry="F1M0,0L20,0L20,20L0,20z" />
+                    <GeometryDrawing Brush="#FF444444" Geometry="F0 M7.5 11C6.67 11 6 11.67 6 12.5C6 13.33 6.67 14 7.5 14C8.33 14 9 13.33 9 12.5C9 11.67 8.33 11 7.5 11ZM2.5 6C1.67 6 1 6.67 1 7.5C1 8.33 1.67 9 2.5 9C3.33 9 4 8.33 4 7.5C4 6.67 3.33 6 2.5 6ZM2.5 11C1.67 11 1 11.67 1 12.5C1 13.33 1.67 14 2.5 14C3.33 14 4 13.33 4 12.5C4 11.67 3.33 11 2.5 11ZM17.5 9C18.33 9 19 8.33 19 7.5C19 6.67 18.33 6 17.5 6C16.67 6 16 6.67 16 7.5C16 8.33 16.67 9 17.5 9ZM12.5 11C11.67 11 11 11.67 11 12.5C11 13.33 11.67 14 12.5 14C13.33 14 14 13.33 14 12.5C14 11.67 13.33 11 12.5 11ZM17.5 11C16.67 11 16 11.67 16 12.5C16 13.33 16.67 14 17.5 14C18.33 14 19 13.33 19 12.5C19 11.67 18.33 11 17.5 11ZM7.5 6C6.67 6 6 6.67 6 7.5C6 8.33 6.67 9 7.5 9C8.33 9 9 8.33 9 7.5C9 6.67 8.33 6 7.5 6ZM12.5 6C11.67 6 11 6.67 11 7.5C11 8.33 11.67 9 12.5 9C13.33 9 14 8.33 14 7.5C14 6.67 13.33 6 12.5 6Z" />
+                </DrawingGroup>
+            </DrawingImage>
+        </Image>
 
         <TabControl
-            Grid.Row="1"
-            Margin="10"
+            Margin="10,20,10,10"
             Padding="0"
+            TabStripPlacement="Left"
             x:Name="MainViewTabControl"
             SelectedIndex="{Binding CurrentProcess.SelectedTabIndex, Mode=TwoWay}">
-            <TabItem
+            <TabControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <DockPanel Width="200" />
+                </ItemsPanelTemplate>
+            </TabControl.ItemsPanel>
+            <TabItem DockPanel.Dock="Top" Margin="10,80,10,10"
+                x:Name="StartTab"
+                Header="Start">
+                <views:StartView />
+            </TabItem>
+            <TabItem DockPanel.Dock="Top"
                 x:Name="AudioTab"
-                Header="Audio">
+                Header="Audio"
+                IsVisible="{Binding CurrentProcess.KaraokeSourceIsSet}">
                 <views:AudioView />
             </TabItem>
-            <TabItem
+            <TabItem DockPanel.Dock="Top"
                 x:Name="LyricsTab"
                 Header="Lyrics"
+                IsVisible="{Binding CurrentProcess.LyricsTabVisible}"
                 ToolTip.Tip="{Binding CurrentProcess.ReasonAudioStepIsIncomplete}"
                 avalonia:ShowDisabledTooltipExtension.ShowOnDisabled="true"
                 IsEnabled="{Binding CurrentProcess.AudioStepIsComplete}">
                 <views:LyricsView />
             </TabItem>
-            <TabItem
+            <TabItem DockPanel.Dock="Top"
                 x:Name="RecognizeTab"
                 Header="Recognize"
+                IsVisible="{Binding CurrentProcess.RecognizeTabVisible}"
                 ToolTip.Tip="{Binding CurrentProcess.ReasonLyricsStepIsIncomplete}"
                 avalonia:ShowDisabledTooltipExtension.ShowOnDisabled="true"
                 IsEnabled="{Binding CurrentProcess.LyricsStepIsComplete}">
-                <views:RecognizeView />
+                <views:ManualAlignView />
             </TabItem>
-            <TabItem
+            <TabItem DockPanel.Dock="Top"
                 x:Name="NarrowTab"
                 Header="Narrow"
+                IsVisible="{Binding CurrentProcess.NarrowTabVisible}"
                 ToolTip.Tip="{Binding CurrentProcess.ReasonRecognizeStepIsIncomplete}"
                 avalonia:ShowDisabledTooltipExtension.ShowOnDisabled="true"
                 IsEnabled="{Binding CurrentProcess.RecognizeStepIsComplete}">
                 <views:NarrowingView />
             </TabItem>
-            <TabItem
-                Margin="30,0,1,0"
+            <TabItem DockPanel.Dock="Top"
+                x:Name="AlignTab"
+                Header="Align"
+                IsVisible="{Binding CurrentProcess.ManualAlignTabVisible}"
+                ToolTip.Tip="{Binding CurrentProcess.ReasonManualAlignIsDisabled}"
+                avalonia:ShowDisabledTooltipExtension.ShowOnDisabled="true"
+                IsEnabled="{Binding CurrentProcess.ManualAlignIsEnabled}">
+                <views:ManualAlignView />
+            </TabItem>
+            <TabItem DockPanel.Dock="Top"
                 x:Name="EditLinesTab"
                 Header="Edit"
+                IsVisible="{Binding CurrentProcess.KaraokeSourceIsSet}"
                 ToolTip.Tip="{Binding
                                 CurrentProcess.ReasonEditTabIsDisabled}"
-				avalonia:ShowDisabledTooltipExtension.ShowOnDisabled="true"
-				IsEnabled="{Binding CurrentProcess.EditTabIsEnabled}">
+                avalonia:ShowDisabledTooltipExtension.ShowOnDisabled="true"
+                IsEnabled="{Binding CurrentProcess.EditTabIsEnabled}">
 
                 <views:EditLinesView />
             </TabItem>
-            <TabItem
+            <TabItem DockPanel.Dock="Top"
                 x:Name="ExportTab"
                 Header="Export"
+                IsVisible="{Binding CurrentProcess.KaraokeSourceIsSet}"
                 ToolTip.Tip="{Binding CurrentProcess.ReasonCantExport}"
                 avalonia:ShowDisabledTooltipExtension.ShowOnDisabled="true"
                 IsEnabled="{Binding CurrentProcess.CanExport}">
                 <views:ExportView />
             </TabItem>
 
-            <TabItem
-                Margin="30,0,1,0"
+            <TabItem DockPanel.Dock="Bottom" VerticalAlignment="Bottom"
                 x:Name="AboutTab"
                 Header="About">
                 <views:AboutView />
diff --git a/KaddaOK.AvaloniaApp/Views/MainWindow.axaml b/KaddaOK.AvaloniaApp/Views/MainWindow.axaml
index 72a4af0..5d5d836 100644
--- a/KaddaOK.AvaloniaApp/Views/MainWindow.axaml
+++ b/KaddaOK.AvaloniaApp/Views/MainWindow.axaml
@@ -14,7 +14,7 @@
     Background="Transparent"
     SystemDecorations="Full"
     Position="0,0"
-    Width="1000"
+    Width="1180"
     MinWidth="800"
     Height="860"
     WindowState="Normal"
@@ -22,19 +22,22 @@
     x:Name="Main"
     x:CompileBindings="True"
     x:DataType="vm:MainViewModel"
-    TransparencyLevelHint="AcrylicBlur"
+    RequestedThemeVariant="Dark"
     ExtendClientAreaToDecorationsHint="True"
-    RequestedThemeVariant="Dark">
-    <Panel>
-        <ExperimentalAcrylicBorder CornerRadius="16">
-            <ExperimentalAcrylicBorder.Material>
-                <ExperimentalAcrylicMaterial
-                    BackgroundSource="Digger"
-                    TintColor="Black"
-                    TintOpacity="1"
-                    MaterialOpacity="0.5" />
-            </ExperimentalAcrylicBorder.Material>
+    >
+
+        <Panel>
+
+            <Border CornerRadius="20" IsHitTestVisible="False" Background="#FF17181D" BorderBrush="{DynamicResource SystemBaseLowColor}" BorderThickness="1">
+
+            </Border>
+			<Border Background="#FF2B2B2B" BorderBrush="{DynamicResource SystemBaseLowColor}" BorderThickness="1,1,0,1"
+                    Width="220" HorizontalAlignment="Left" CornerRadius="20,0,0,20">
+
+            </Border>
             <views:MainView />
-        </ExperimentalAcrylicBorder>
-    </Panel>
+        </Panel>
+	<!--
+	</Border>-->
+
 </Window>
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Views/ManualAlignView.axaml b/KaddaOK.AvaloniaApp/Views/ManualAlignView.axaml
new file mode 100644
index 0000000..4c5203a
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Views/ManualAlignView.axaml
@@ -0,0 +1,462 @@
+<UserControl
+	xmlns="https://github.com/avaloniaui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:vm="clr-namespace:KaddaOK.AvaloniaApp.ViewModels"
+    xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
+	xmlns:local="clr-namespace:KaddaOK.AvaloniaApp"
+	xmlns:views="clr-namespace:KaddaOK.AvaloniaApp.Views"
+	xmlns:controls="clr-namespace:KaddaOK.AvaloniaApp.Controls"
+	xmlns:system="clr-namespace:System;assembly=System.Runtime"
+	xmlns:designTime="clr-namespace:KaddaOK.AvaloniaApp.ViewModels.DesignTime"
+	xmlns:models="clr-namespace:KaddaOK.AvaloniaApp.Models"
+	xmlns:dialogs="clr-namespace:KaddaOK.AvaloniaApp.Controls.Dialogs"
+	mc:Ignorable="d"
+	d:DesignWidth="1000"
+	d:DesignHeight="800"
+	x:Class="KaddaOK.AvaloniaApp.Views.ManualAlignView"
+	x:DataType="vm:ManualAlignViewModel"
+	Classes.isRunning="{Binding CurrentProcess.RecognitionIsRunning}"
+	KeyDown="ManualAlign_KeyDown">
+	<UserControl.Resources>
+		<MenuFlyout
+					x:Key="WordButtonFlyout"
+					x:DataType="models:TimingWord">
+			<MenuItem
+                Header="Move Recording Head To Before This Syllable"
+                Command="{Binding $parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).MoveHeadCommand}"
+                CommandParameter="{Binding}" />
+			<Separator />
+            <MenuItem
+                Header="Edit Text/Split Syllables..."
+                Command="{Binding $parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).EditWordTextCommand}"
+                CommandParameter="{Binding}" />
+			<Separator />
+			<MenuItem
+                Header="Merge With Previous Syllable"
+                Command="{Binding $parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).MergeWithPrevCommand}"
+                CommandParameter="{Binding}" />
+			<MenuItem
+                Header="Merge With Next Syllable"
+                Command="{Binding $parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).MergeWithNextCommand}"
+                CommandParameter="{Binding}" />
+			<Separator />
+            <MenuItem
+                Header="Delete Syllable"
+                Command="{Binding $parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).DeleteWordCommand}"
+                CommandParameter="{Binding}" />
+        </MenuFlyout>
+	</UserControl.Resources>
+	<UserControl.Styles>
+		<Style
+			x:DataType="models:ManualTimingLine"
+			Selector="ItemsControl.timedLines > ContentPresenter">
+			<Setter Property="Canvas.Left">
+				<Setter.Value>
+					<MultiBinding Converter="{StaticResource WaveformToPointConverter}">
+						<Binding Path="ManualStartSecond" />
+						<Binding Path="$parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).FullLengthVocalsDraw.WaveformLengthSeconds" />
+						<Binding Path="$parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).FullLengthVocalsDraw.DesiredImageWidth" />
+					</MultiBinding>
+				</Setter.Value>
+			</Setter>
+			<Setter
+				Property="Canvas.Top"
+				Value="0" />
+		</Style>
+	</UserControl.Styles>
+	<Design.DataContext>
+		<designTime:DesignTimeManualAlignViewModel />
+	</Design.DataContext>
+	<dialogHost:DialogHost
+		Identifier="ManualAlignViewDialogHost">
+        <dialogHost:DialogHost.DataTemplates>
+            <DataTemplate DataType="vm:ManualAlignViewModel">
+                <dialogs:EditSyllableTextDialog DataContext="{Binding EditingTextOfWord}" />
+            </DataTemplate>
+            <DataTemplate DataType="models:AddingLine">
+                <dialogs:InsertNewLineDialog DataContext="{Binding}" />
+            </DataTemplate>
+        </dialogHost:DialogHost.DataTemplates>
+	    <Grid RowDefinitions="Auto, 36, 75, *">
+		    <StackPanel Margin="5">
+			    <StackPanel.Styles>
+				    <Style Selector="TextBlock">
+                        <Setter
+                            Property="FontSize"
+                            Value="12" />
+					    <Setter Property="TextWrapping" Value="Wrap"/>
+					    <Setter Property="Margin" Value="0,3" />
+                    </Style>
+                </StackPanel.Styles>
+                <TextBlock Classes="pageTitleHeader">
+                    Align
+                </TextBlock>
+                <TextBlock>
+				    On this screen you can tap the timing of each syllable using the arrow keys on your keyboard.<InlineUIContainer>
+                        <Button Margin="0" Padding="0" Background="Transparent" Command="{Binding ShowInstructions}" IsVisible="{Binding !InstructionsVisible}">
+                            <Button.Styles>
+                                <Style Selector="Button /template/ ContentPresenter">
+                                    <Setter Property="FontStyle" Value="Italic" />
+                                </Style>
+                            </Button.Styles>
+                            ...(show full instructions)
+                        </Button>
+                    </InlineUIContainer>
+                </TextBlock>
+			    <StackPanel IsVisible="{Binding InstructionsVisible}">
+                    <TextBlock>
+                        The position in the audio is shown by a green line on the waveform below.
+                        You can move it by clicking and/or dragging on the waveform.
+                    </TextBlock>
+                    <TextBlock>
+                        The next word/syllable to record is shown in blue.
+                        You can change what syllable to start recording on by clicking on it.
+                        If any syllables before it already have timing, the play position will automatically
+                        jump to 3 seconds before the end of the most recent syllable (but you can still move it
+                        before recording); otherwise it will start at 0.
+                    </TextBlock>
+                    <TextBlock>
+                        When you are ready to record timing, hit the Record (⏺) button.  The audio will start playing.
+                    </TextBlock>
+                    <TextBlock>
+                        While recording, hit the → arrow key on your keyboard to record when the blue syllable begins.
+
+                        The syllable will turn yellow to indicate it is currently being sung.
+                    </TextBlock>
+                    <TextBlock>
+                        If the → key is pressed again, that will record both the end of the current
+                        syllable and the beginning of the next syllable.
+                    </TextBlock>
+                    <TextBlock>
+                        If the ↓ arrow key is pressed instead, it ends the current syllable without
+                        yet starting the next syllable, which will start on the next press of the → arrow key.
+                        This allows you to insert gaps anywhere in a phrase.
+                    </TextBlock>
+                    <TextBlock>
+                        Recording stops automatically after the last syllable, but you
+                        can stop, start, and move around at any time without losing work (as long as you don't leave the tab).
+                    </TextBlock>
+                    <TextBlock>
+                        You can use the Play (⏵) button to preview the timing; syllables that have already been timed will light up yellow while being sung.
+                    </TextBlock>
+                    <TextBlock>
+					    When you have timed every syllable, you can go on to the next step. 
+                    </TextBlock>
+                    <Button Margin="0" Padding="0" Background="Transparent" Command="{Binding HideInstructions}">
+                        <Button.Styles>
+                            <Style Selector="Button /template/ ContentPresenter">
+                                <Setter Property="FontStyle" Value="Italic" />
+                            </Style>
+                        </Button.Styles>
+					    <TextBlock>(hide full instructions)</TextBlock>
+                    </Button>
+                </StackPanel>
+            </StackPanel>
+		    <Border Grid.Row="1" BorderBrush="Gray" Background="#111" BorderThickness="1">
+                <Grid ColumnDefinitions="170, *, 220">
+                    <StackPanel x:Name="TimeReadoutStackPanel"
+                                Orientation="Horizontal"
+                                VerticalAlignment="Center"
+                                Width="120">
+                        <TextBlock
+                            x:Name="PlaybackPositionReadout"
+                            Classes.readoutIsRecording="{Binding IsRecording}"
+                            Width="60"
+                            Text="{Binding CurrentPlaybackPositionText}" />
+                        <TextBlock Text="/" Margin="5,0" />
+                        <TextBlock
+                            x:Name="TotalLengthReadout"
+                            Width="60"
+                            Text="{Binding FullLengthVocalsDraw.WaveformLengthText}" />
+                    </StackPanel>
+                    <StackPanel
+			            Grid.Column="1"
+			            x:Name="ShuttleControls"
+			            Orientation="Horizontal"
+			            HorizontalAlignment="Center">
+			            <Button
+				            Content="⏵"
+				            IsVisible="{Binding !IsPlaying}"
+				            Command="{Binding PlayCommand}"
+				            CommandParameter="{Binding}" />
+                        <Button
+				            Content="⏸"
+				            IsVisible="{Binding IsPlaying}"
+				            Command="{Binding PauseCommand}"
+				            CommandParameter="{Binding}" />
+			            <Button
+				            Content="⏺"
+				            Command="{Binding RecordCommand}"
+				            CommandParameter="{Binding}" />
+			            <Button
+				            x:Name="StopButton"
+				            Content="⏹"
+				            Command="{Binding StopCommand}"
+				            CommandParameter="{Binding}" />
+                    </StackPanel>
+
+			        <StackPanel Grid.Column="2" Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center" Margin="10,0">
+                            <Run Text="{Binding CurrentProcess.TimedWordsInManualTiming}" />
+                            /
+                            <Run Text="{Binding CurrentProcess.TotalWordsInManualTiming}" />
+                            Timed
+                        </TextBlock>
+                        <Button
+                            Margin="10,0"
+                            Content="Next Step"
+                            Classes="accent"
+                            HorizontalAlignment="Right"
+                            Command="{Binding GoToNextStepCommand}"
+                            local:ShowDisabledTooltipExtension.ShowOnDisabled="true"
+                            ToolTip.Tip="{Binding CurrentProcess.ReasonManualAlignmentIsIncomplete}"
+                            IsEnabled="{Binding CurrentProcess.ManualAlignmentIsComplete}" />
+                    </StackPanel>
+                </Grid>
+            </Border>
+		    <Border Grid.Row="2" BorderBrush="Gray" Background="#111" BorderThickness="1,0,1,1">
+                <Grid
+			        SizeChanged="LayoutSizeChanged"
+			        PointerPressed="SeekBar_PointerPressed"
+			        PointerMoved="SeekBar_PointerMoved"
+			        PointerReleased="SeekBar_PointerReleased">
+			        <controls:DrawnWaveformControl
+				        Height="75"
+				        CanSelectIfEmpty="False"
+				        Waveform="{Binding FullLengthVocalsDraw}"
+				        WaveFloats="{Binding CurrentProcess.VocalsAudioFloats}"
+				        WaveStream="{Binding CurrentProcess.VocalsAudioStream}"
+				        WaveformFilePath="{Binding CurrentProcess.VocalsAudioFilePath}" />
+			        <ItemsControl
+				        Classes="timedLines"
+				        ItemsSource="{Binding CurrentProcess.ManualTimingLines}">
+				        <ItemsControl.ItemsPanel>
+					        <ItemsPanelTemplate>
+						        <Canvas />
+					        </ItemsPanelTemplate>
+				        </ItemsControl.ItemsPanel>
+				        <ItemsControl.DataTemplates>
+					        <DataTemplate x:DataType="models:ManualTimingLine">
+						        <controls:OverlayRectangle
+							        AllowDrag="False"
+							        Stroke="#B0FFD800"
+							        Fill="#56FFD800"
+							        Height="{Binding $parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).FullLengthVocalsDraw.DesiredPeakHeight}"
+							        StartSecond="{Binding ManualStartSecond}"
+							        EndSecond="{Binding ManualEndSecond}"
+							        WaveformDraw="{Binding $parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).FullLengthVocalsDraw}">
+							        <ToolTip.Tip>
+								        <Grid
+									        ColumnDefinitions="*,*"
+									        RowDefinitions="*,*">
+									        <TextBlock Text="{Binding ManualStartSecond}" />
+									        <TextBlock
+										        HorizontalAlignment="Right"
+										        Grid.Column="1"
+										        Text="{Binding ManualEndSecond}" />
+									        <TextBlock
+										        Grid.Row="1"
+										        Grid.ColumnSpan="2"
+										        Text="{Binding Text}" />
+								        </Grid>
+							        </ToolTip.Tip>
+						        </controls:OverlayRectangle>
+					        </DataTemplate>
+				        </ItemsControl.DataTemplates>
+			        </ItemsControl>
+			        <Canvas x:Name="CaretCanvas">
+				        <Canvas.Styles>
+					        <Style Selector="Rectangle#PlaybackPositionCaret">
+						        <Setter Property="Canvas.Left">
+							        <Setter.Value>
+								        <MultiBinding Converter="{StaticResource WaveformToPointConverter}">
+									        <Binding Path="CaretPositionSeconds" />
+									        <Binding Path="FullLengthVocalsDraw.WaveformLengthSeconds" />
+									        <Binding Path="FullLengthVocalsDraw.DesiredImageWidth" />
+								        </MultiBinding>
+							        </Setter.Value>
+						        </Setter>
+					        </Style>
+					        <Style Selector="Rectangle.caretIsPlaying">
+						        <Setter
+							        Property="Fill"
+							        Value="Green" />
+					        </Style>
+					        <Style Selector="Rectangle.caretIsRecording">
+						        <Setter
+							        Property="Fill"
+							        Value="Red" />
+					        </Style>
+				        </Canvas.Styles>
+                        <Rectangle
+					        x:Name="PlaybackPositionCaret"
+					        Width="2"
+					        Height="75"
+					        Canvas.Top="0"
+					        Classes.caretIsPlaying="{Binding !IsRecording}"
+					        Classes.caretIsRecording="{Binding IsRecording}">
+				        </Rectangle>
+			        </Canvas>
+		        </Grid>
+            </Border>
+            <ScrollViewer Grid.Row="3">
+			    <ItemsRepeater
+				    x:Name="TimingLinesRepeater"
+				    ItemsSource="{Binding CurrentProcess.ManualTimingLines}">
+				    <ItemsRepeater.ItemTemplate>
+					    <DataTemplate>
+						    <ItemsRepeater
+							    x:Name="NewWordsRepeater"
+							    ItemsSource="{Binding Words}"
+							    Margin="10,0"
+							    HorizontalAlignment="Center">
+							    <ItemsRepeater.Styles>
+								    <Style Selector="Border">
+									    <Setter
+										    Property="BorderThickness"
+										    Value="1" />
+									    <Setter
+										    Property="BorderBrush"
+										    Value="#FF555555" />
+									    <Setter
+										    Property="Background"
+										    Value="#FF333333" />
+									    <Setter
+										    Property="Margin"
+										    Value="2,8,2,2" />
+									    <Setter
+										    Property="CornerRadius"
+										    Value="2" />
+								    </Style>
+								    <Style Selector="Label">
+									    <Setter
+										    Property="FontSize"
+										    Value="22" />
+									    <Setter
+										    Property="FontFamily"
+										    Value="Arial" />
+									    <Setter
+										    Property="HorizontalAlignment"
+										    Value="Center" />
+								    </Style>
+								    <Style Selector="Label.timeDetail">
+									    <Setter
+										    Property="FontSize"
+										    Value="10" />
+								    </Style>
+								    <Style Selector="Border.hasFinished">
+									    <Setter
+										    Property="BorderBrush"
+										    Value="Transparent" />
+									    <Setter
+										    Property="Background"
+										    Value="Transparent" />
+								    </Style>
+								    <Style Selector="Border.hasFinished > Label">
+									    <Setter
+										    Property="Foreground"
+										    Value="Green" />
+								    </Style>
+								    <Style Selector="Border.isRunning">
+									    <Setter
+										    Property="BorderBrush"
+										    Value="Orange" />
+									    <Setter
+										    Property="Background"
+										    Value="DarkOrange" />
+								    </Style>
+								    <Style Selector="Border.isRunning > Label">
+									    <Setter
+										    Property="Foreground"
+										    Value="White" />
+									    <Setter
+										    Property="FontWeight"
+										    Value="Bold" />
+								    </Style>
+								    <Style Selector="Border.isNext">
+									    <Setter
+										    Property="BorderBrush"
+										    Value="Teal" />
+									    <Setter
+										    Property="Background"
+										    Value="DarkBlue" />
+								    </Style>
+								    <Style Selector="Border.isNext > Label">
+									    <Setter
+										    Property="Foreground"
+										    Value="Teal" />
+									    <Setter
+										    Property="FontWeight"
+										    Value="Bold" />
+								    </Style>
+							    </ItemsRepeater.Styles>
+							    <ItemsRepeater.Layout>
+								    <StackLayout Orientation="Horizontal" />
+							    </ItemsRepeater.Layout>
+							    <ItemsRepeater.ItemTemplate>
+								    <DataTemplate DataType="models:TimingWord">
+									    <Border
+										    Classes.hasFinished="{Binding HasFinished}"
+										    Classes.isNext="{Binding IsNext}">
+										    <Classes.isRunning>
+											    <MultiBinding Converter="{StaticResource TimingWordIsPlayingConverter}">
+												    <Binding Path="IsRunning" />
+												    <Binding Path="$parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).IsRecording" />
+												    <Binding Path="$parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).IsPlaying" />
+												    <Binding Path="StartHasBeenManuallySet" />
+												    <Binding Path="$parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).CurrentPlaybackPositionSeconds" />
+												    <Binding Path="StartSecond" />
+												    <Binding Path="EndHasBeenManuallySet" />
+												    <Binding Path="EndSecond" />
+											    </MultiBinding>
+										    </Classes.isRunning>
+										    <Button
+											    ToolTip.Tip="Click to move recording head to before this word"
+											    Background="Transparent"
+											    Foreground="DarkGray"
+											    ZIndex="0"
+											    Command="{Binding $parent[views:ManualAlignView].((vm:ManualAlignViewModel)DataContext).MoveHeadCommand}"
+											    CommandParameter="{Binding}"
+                                                ContextFlyout="{StaticResource WordButtonFlyout}">
+											    <Grid RowDefinitions="18,*,18">
+												    <Label
+													    Classes="timeDetail"
+													    Content="{Binding StartSecond, Converter={StaticResource RoundingConverter}}">
+													    <Label.IsVisible>
+														    <MultiBinding Converter="{x:Static BoolConverters.Or}">
+															    <Binding Path="StartHasBeenManuallySet" />
+														    </MultiBinding>
+													    </Label.IsVisible>
+												    </Label>
+												    <Label
+													    Grid.Row="1"
+													    HorizontalAlignment="Center"
+													    Content="{Binding Text}" />
+												    <Label
+													    Grid.Row="2"
+													    Classes="timeDetail"
+													    Content="{Binding EndSecond, Converter={StaticResource RoundingConverter}}">
+													    <Label.IsVisible>
+														    <MultiBinding Converter="{x:Static BoolConverters.Or}">
+															    <Binding Path="EndHasBeenManuallySet" />
+														    </MultiBinding>
+													    </Label.IsVisible>
+												    </Label>
+											    </Grid>
+										    </Button>
+									    </Border>
+								    </DataTemplate>
+							    </ItemsRepeater.ItemTemplate>
+						    </ItemsRepeater>
+					    </DataTemplate>
+				    </ItemsRepeater.ItemTemplate>
+			    </ItemsRepeater>
+		    </ScrollViewer>
+
+	    </Grid>
+    </dialogHost:DialogHost>
+
+
+</UserControl>
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Views/ManualAlignView.axaml.cs b/KaddaOK.AvaloniaApp/Views/ManualAlignView.axaml.cs
new file mode 100644
index 0000000..91b516e
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Views/ManualAlignView.axaml.cs
@@ -0,0 +1,87 @@
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
+using Avalonia.Input;
+using Avalonia.Threading;
+using CommunityToolkit.Mvvm.Messaging;
+using KaddaOK.AvaloniaApp.Models;
+using KaddaOK.AvaloniaApp.ViewModels;
+using KaddaOK.AvaloniaApp.ViewModels.DesignTime;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KaddaOK.AvaloniaApp.Views
+{
+    public partial class ManualAlignView : UserControl
+    {
+        private readonly ManualAlignViewModel _viewModel;
+        private ItemsRepeater? _timingLinesRepeater;
+
+        public ManualAlignView()
+        {
+            InitializeComponent();
+            _viewModel =
+                Design.IsDesignMode
+                ? new DesignTimeManualAlignViewModel()
+                : App.ServiceProvider.GetRequiredService<ManualAlignViewModel>();
+            DataContext = _viewModel;
+
+            _timingLinesRepeater = this.FindControl<ItemsRepeater>("TimingLinesRepeater");
+
+            WeakReferenceMessenger.Default.Register<ScrollIntoViewMessage>(this, (recipient, message) =>
+            {
+                var sourceLines = (ObservableCollection<ManualTimingLine>?)_timingLinesRepeater?.ItemsSource;
+                if (sourceLines != null)
+                {
+                    var lineToScrollTo = sourceLines.FirstOrDefault(l => l.Words.Contains(message.Item));
+                    if (lineToScrollTo != null)
+                    {
+                        var indexToScrollTo = sourceLines.IndexOf(lineToScrollTo);
+                        var correspondingWordsRepeater = _timingLinesRepeater?.TryGetElement(indexToScrollTo);
+                        if (correspondingWordsRepeater != null)
+                        {
+                            correspondingWordsRepeater.BringIntoView();
+                        }
+                    }
+                }
+            });
+        }
+
+        private void LayoutSizeChanged(object? sender, SizeChangedEventArgs args)
+        {
+            if (args.WidthChanged)
+            {
+                _viewModel.FullLengthVocalsDraw.DesiredImageWidth = (int)args.NewSize.Width;
+                if (_viewModel.CurrentProcess.VocalsAudioStream != null)
+                {
+                    Dispatcher.UIThread.Invoke(() =>
+                        _viewModel.FullLengthVocalsDraw.RedrawWaveform(_viewModel.CurrentProcess?.VocalsAudioStream)
+                        )
+                        ;
+                }
+            }
+        }
+
+        private void SeekBar_PointerPressed(object? sender, PointerPressedEventArgs args)
+        {
+            _viewModel.SeekBarPointerPressed(sender, args);
+        }
+
+        private void SeekBar_PointerMoved(object? sender, PointerEventArgs args)
+        {
+            _viewModel.SeekBarPointerMoved(sender, args);
+        }
+
+        private void SeekBar_PointerReleased(object? sender, PointerReleasedEventArgs args)
+        {
+            _viewModel.SeekBarPointerReleased(sender, args);
+        }
+
+        private void ManualAlign_KeyDown(object? sender, KeyEventArgs e)
+        {
+            _viewModel?.ManualAlignKeyDown(sender, e);
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/Views/NarrowingView.axaml b/KaddaOK.AvaloniaApp/Views/NarrowingView.axaml
index e0dc677..26856bb 100644
--- a/KaddaOK.AvaloniaApp/Views/NarrowingView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/NarrowingView.axaml
@@ -60,11 +60,14 @@
         ColumnDefinitions="*, 100">
         <ScrollViewer x:Name="PossibilitiesScrollViewer">
             <StackPanel>
+                <TextBlock Classes="pageTitleHeader">
+                    Narrow
+                </TextBlock>
                 <TextBlock
                     TextWrapping="Wrap"
-                    Margin="10,10,10,0"
+                    Margin="5,0"
                     FontSize="12">
-                    Each phrase detected by the speech-to-text service has a number of possible
+                    Each phrase detected by the Azure speech-to-text service has a number of possible
                     wordings. On this screen, touch the wording for each phrase that is the most
                     correct (or has the most useful timed syllables). If you don't want to use a
                     phrase at all, you can ignore it by clicking its speaker icon. When you have
diff --git a/KaddaOK.AvaloniaApp/Views/RecognizeView.axaml b/KaddaOK.AvaloniaApp/Views/RecognizeView.axaml
index b1da8ea..3a7cf4f 100644
--- a/KaddaOK.AvaloniaApp/Views/RecognizeView.axaml
+++ b/KaddaOK.AvaloniaApp/Views/RecognizeView.axaml
@@ -49,46 +49,20 @@
     </Design.DataContext>
     <Grid
         Classes.isRunning="{Binding CurrentProcess.RecognitionIsRunning}"
-        RowDefinitions="85,60,80,60,35,200,25,*">
+        RowDefinitions="0,0,130,60,35,200,25,*">
+
 
-			<StackPanel>
-                <TextBlock TextWrapping="Wrap" FontSize="13" Margin="0,5">
-                    There are two ways to proceed from here.
-                </TextBlock>
-                <TextBlock TextWrapping="Wrap" FontSize="13" Margin="0,5">
-                    For the best result, I now recommend you use <InlineUIContainer>
-                        <Button
-                            Classes="inline"
-                            Content="my NeMo Forced Aligner scripts"
-                            Command="{Binding LinkToForcedAlignerCommand}" />
-                    </InlineUIContainer>.  This will conform the known exact text of the lyrics (from the previous tab).
-                </TextBlock>
-                <TextBlock
-                    TextWrapping="Wrap"
-                    FontSize="12">
-					At the above link, you will find a Google Colab jupyter notebook which can be run on free resources, as
-					well as some scripts for running it locally.
-				</TextBlock>
-				<TextBlock
-                    TextWrapping="Wrap"
-                    FontSize="12"> Either way, this will produce a .ctm file with token-level 
-                    timing, which you can then import here:
-                </TextBlock>
-            </StackPanel>
-            <Button Grid.Row="1" Content="Import .ctm..."
-                    Classes="accent"
-                    Command="{Binding ImportCtmCommand}"/>
 
         <StackPanel Grid.Row="2"
                     x:Name="RecognizeInstructionsPanel"
                     Margin="5">
-            <TextBlock
-                TextWrapping="Wrap"
-                FontSize="12">If NFA gives poor results with a particular song, try the original approach still available below: </TextBlock>
+            <TextBlock Classes="pageTitleHeader">
+                Recognize
+            </TextBlock>
             <TextBlock
                 TextWrapping="Wrap"
                 FontSize="12">
-                using <InlineUIContainer>
+                This tab uses <InlineUIContainer>
                     <Button
                         Classes="inline"
                         Content="Azure Speech Service"
diff --git a/KaddaOK.AvaloniaApp/Views/StartView.axaml b/KaddaOK.AvaloniaApp/Views/StartView.axaml
new file mode 100644
index 0000000..cc166ce
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Views/StartView.axaml
@@ -0,0 +1,281 @@
+<UserControl
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:KaddaOK.AvaloniaApp.ViewModels"
+    xmlns:local="clr-namespace:KaddaOK.AvaloniaApp"
+    xmlns:controls="clr-namespace:KaddaOK.AvaloniaApp.Controls"
+    xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
+    xmlns:ytmm="clr-namespace:KaddaOK.Library.Ytmm;assembly=KaddaOK.Library"
+    xmlns:dialogs="clr-namespace:KaddaOK.AvaloniaApp.Controls.Dialogs"
+    xmlns:designTime="clr-namespace:KaddaOK.AvaloniaApp.ViewModels.DesignTime"
+    mc:Ignorable="d"
+    d:DesignWidth="1000"
+    d:DesignHeight="800"
+    x:Class="KaddaOK.AvaloniaApp.Views.StartView"
+    x:DataType="vm:StartViewModel">
+    <Design.DataContext>
+        <designTime:DesignTimeStartViewModel />
+    </Design.DataContext>
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="sourceMethodIconBrush" Color="{DynamicResource SystemAccentColor}" />
+        <Pen x:Key="sourceMethodIconPen" Brush="{DynamicResource sourceMethodIconBrush}" Thickness="1" LineCap="Round" LineJoin="Round" />
+	</UserControl.Resources>
+    <UserControl.Styles>
+        <Style Selector="ScrollViewer.gettingFile">
+            <Setter
+                Property="Cursor"
+                Value="Wait" />
+        </Style>
+        <Style Selector="ScrollViewer.gettingFile StackPanel">
+            <Setter
+                Property="IsEnabled"
+                Value="False" />
+        </Style>
+    </UserControl.Styles>
+    <dialogHost:DialogHost Identifier="StartViewDialogHost">
+        <dialogHost:DialogHost.DataTemplates>
+            <DataTemplate DataType="ytmm:RzlrcLyrics">
+                <dialogs:ChooseImportedLayerDialog DataContext="{Binding}" />
+            </DataTemplate>
+        </dialogHost:DialogHost.DataTemplates>
+        <ScrollViewer
+            x:Name="StartViewScrollViewer"
+            Classes.gettingFile="{Binding GettingFile}">
+            <StackPanel
+                x:Name="StartTabStackPanel"
+                Margin="20,0,20,20">
+				<TextBlock Classes="pageTitleHeader">
+                    Start
+                </TextBlock>
+                <TextBlock Margin="5,0">
+                    Choose the initial lyrics sync method for this project:
+                </TextBlock>
+				<controls:InitialSyncOption
+                    OptionTitle="Manual Timing in Kadda OK Tools"
+                    OptionSummary="Input lyric timing by tapping a key while the song plays."
+                    ChooseCommand="{Binding SelectManualProcessCommand}">
+					<controls:InitialSyncOption.IconDrawing>
+						<DrawingImage>
+							<DrawingGroup>
+								<DrawingGroup>
+									<DrawingGroup.Transform>
+										<MatrixTransform Matrix="12.5,0,0,12.5,0,0" />
+									</DrawingGroup.Transform>
+									<GeometryDrawing Pen="{DynamicResource sourceMethodIconPen}" Geometry="F1 M42 47.75L44.89 47.75Q45.004 47.75 45.1174 47.7388Q45.2308 47.7277 45.3426 47.7054Q45.4544 47.6832 45.5635 47.6501Q45.6725 47.617 45.7778 47.5734Q45.8831 47.5298 45.9836 47.4761Q46.0842 47.4223 46.1789 47.359Q46.2737 47.2957 46.3618 47.2234Q46.4499 47.1511 46.5305 47.0705Q46.6111 46.9899 46.6834 46.9018Q46.7557 46.8137 46.819 46.7189Q46.8823 46.6242 46.9361 46.5236Q46.9898 46.4231 47.0334 46.3178Q47.077 46.2125 47.1101 46.1035Q47.1432 45.9944 47.1654 45.8826Q47.1877 45.7708 47.1988 45.6574Q47.21 45.544 47.21 45.43L47.21 36.78Q47.2088 36.638 47.2006 36.4962Q47.1925 36.3544 47.1775 36.2132Q47.1625 36.0719 47.1406 35.9316Q47.1187 35.7913 47.09 35.6522Q47.0613 35.5131 47.0259 35.3755Q46.9904 35.238 46.9484 35.1023Q46.9063 34.9667 46.8576 34.8333Q46.809 34.6998 46.7539 34.5689Q46.6988 34.438 46.6374 34.3099Q46.576 34.1818 46.5085 34.0569Q46.4409 33.932 46.3674 33.8105Q46.2938 33.689 46.2144 33.5712Q46.135 33.4534 46.05 33.3397Q45.965 33.2259 45.8745 33.1164Q45.784 33.007 45.6883 32.902Q45.5926 32.797 45.492 32.6969Q45.3913 32.5967 45.2858 32.5016Q45.1804 32.4064 45.0704 32.3165Q44.9605 32.2266 44.8463 32.1422Q44.7321 32.0577 44.6139 31.979Q44.4957 31.9002 44.3738 31.8272Q44.252 31.7543 44.1267 31.6874Q44.0014 31.6205 43.873 31.5598Q43.7446 31.4991 43.6134 31.4446Q43.4822 31.3902 43.3485 31.3423Q43.2149 31.2943 43.079 31.253Q42.9431 31.2116 42.8054 31.1768Q42.6677 31.1421 42.5284 31.1142Q42.3892 31.0862 42.2487 31.065Q42.1083 31.0439 41.967 31.0296Q41.8257 31.0153 41.6839 31.0079Q41.542 31.0005 41.4 31L40.11 31Q39.785 30.9805 39.46 31L39.46 26.77Q39.4601 26.6469 39.4486 26.5244Q39.437 26.4019 39.4138 26.281Q39.3906 26.1601 39.356 26.042Q39.3214 25.9239 39.2757 25.8096Q39.23 25.6953 39.1737 25.5859Q39.1173 25.4765 39.0508 25.3729Q38.9843 25.2694 38.9082 25.1726Q38.8322 25.0759 38.7472 24.9868Q38.6623 24.8977 38.5693 24.8172Q38.4763 24.7366 38.376 24.6652Q38.2757 24.5938 38.1691 24.5323Q38.0625 24.4709 37.9505 24.4198Q37.8385 24.3687 37.7222 24.3285Q37.6059 24.2884 37.4863 24.2594Q37.3666 24.2305 37.2448 24.2131Q37.1229 24.1957 37 24.19Q36.866 24.189 36.7325 24.2013Q36.599 24.2136 36.4674 24.2392Q36.3358 24.2647 36.2074 24.3032Q36.079 24.3416 35.9551 24.3927Q35.8312 24.4438 35.7129 24.5069Q35.5947 24.57 35.4833 24.6446Q35.3719 24.7191 35.2685 24.8044Q35.165 24.8897 35.0706 24.9848Q34.9762 25.0799 34.8917 25.184Q34.8072 25.288 34.7334 25.4Q34.6597 25.5119 34.5974 25.6306Q34.5352 25.7493 34.485 25.8736Q34.4349 25.9979 34.3973 26.1266Q34.3598 26.2553 34.3352 26.3871Q34.3107 26.5188 34.2993 26.6524Q34.288 26.786 34.29 26.92L34.29 37.85" />
+									<GeometryDrawing Pen="{DynamicResource sourceMethodIconPen}" Geometry="F1 M34.3 38.23L32.63 36.56Q32.543 36.4734 32.4482 36.3953Q32.3533 36.3173 32.2516 36.2486Q32.1498 36.1799 32.042 36.1211Q31.9342 36.0624 31.8213 36.0141Q31.7084 35.9658 31.5914 35.9284Q31.4744 35.8909 31.3545 35.8648Q31.2345 35.8386 31.1126 35.8239Q30.9907 35.8092 30.8679 35.8061Q30.7452 35.803 30.6227 35.8115Q30.5002 35.82 30.379 35.8401Q30.2579 35.8602 30.1392 35.8916Q30.0205 35.9231 29.9053 35.9656Q29.7901 36.0082 29.6794 36.0614Q29.5688 36.1147 29.4637 36.1781Q29.3586 36.2416 29.2599 36.3147Q29.1613 36.3879 29.07 36.47Q28.9741 36.5634 28.888 36.6659Q28.8018 36.7684 28.7263 36.879Q28.6508 36.9896 28.5868 37.1071Q28.5227 37.2247 28.4706 37.348Q28.4186 37.4714 28.3791 37.5993Q28.3396 37.7272 28.313 37.8584Q28.2864 37.9897 28.2731 38.1229Q28.2598 38.2561 28.2598 38.39Q28.2598 38.5239 28.2731 38.6571Q28.2864 38.7903 28.313 38.9215Q28.3396 39.0528 28.3791 39.1807Q28.4186 39.3086 28.4706 39.432Q28.5227 39.5553 28.5868 39.6729Q28.6508 39.7904 28.7263 39.901Q28.8018 40.0116 28.888 40.1141Q28.9741 40.2166 29.07 40.31L34.3 45.54" />
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M39.74 47.75Q39.74 47.8485 39.7208 47.9451Q39.7016 48.0417 39.6639 48.1327Q39.6262 48.2237 39.5715 48.3056Q39.5168 48.3875 39.4471 48.4571Q39.3775 48.5267 39.2956 48.5815Q39.2137 48.6362 39.1227 48.6739Q39.0317 48.7116 38.9351 48.7308Q38.8385 48.75 38.74 48.75Q38.6415 48.75 38.5449 48.7308Q38.4483 48.7116 38.3573 48.6739Q38.2663 48.6362 38.1844 48.5815Q38.1025 48.5267 38.0329 48.4571Q37.9632 48.3875 37.9085 48.3056Q37.8538 48.2237 37.8161 48.1327Q37.7784 48.0417 37.7592 47.9451Q37.74 47.8485 37.74 47.75Q37.74 47.6515 37.7592 47.5549Q37.7784 47.4583 37.8161 47.3673Q37.8538 47.2763 37.9085 47.1944Q37.9632 47.1125 38.0329 47.0429Q38.1025 46.9732 38.1844 46.9185Q38.2663 46.8638 38.3573 46.8261Q38.4483 46.7884 38.5449 46.7692Q38.6415 46.75 38.74 46.75Q38.8385 46.75 38.9351 46.7692Q39.0317 46.7884 39.1227 46.8261Q39.2137 46.8638 39.2956 46.9185Q39.3775 46.9732 39.4471 47.0429Q39.5168 47.1125 39.5715 47.1944Q39.6262 47.2763 39.6639 47.3673Q39.7016 47.4583 39.7208 47.5549Q39.74 47.6515 39.74 47.75Z" />
+									<GeometryDrawing Pen="{DynamicResource sourceMethodIconPen}" Geometry="F1 M43.13 26.24Q43.1298 26.0901 43.1221 25.9404Q43.1145 25.7907 43.0995 25.6416Q43.0845 25.4925 43.0622 25.3443Q43.0399 25.196 43.0103 25.0491Q42.9807 24.9022 42.9439 24.7569Q42.9071 24.6116 42.8631 24.4683Q42.8192 24.325 42.7683 24.184Q42.7174 24.043 42.6596 23.9048Q42.6018 23.7665 42.5372 23.6312Q42.4726 23.4959 42.4015 23.364Q42.3304 23.2321 42.2528 23.1038Q42.1753 22.9756 42.0915 22.8513Q42.0077 22.727 41.9179 22.607Q41.8281 22.487 41.7325 22.3715Q41.6369 22.2561 41.5357 22.1455Q41.4345 22.035 41.328 21.9295Q41.2215 21.824 41.11 21.7239Q40.9984 21.6239 40.882 21.5294Q40.7656 21.4349 40.6448 21.3463Q40.5239 21.2577 40.3988 21.1751Q40.2737 21.0926 40.1447 21.0163Q40.0156 20.94 39.883 20.8702Q39.7504 20.8003 39.6145 20.7371Q39.4786 20.6739 39.3398 20.6174Q39.2009 20.561 39.0595 20.5115Q38.918 20.4619 38.7743 20.4194Q38.6305 20.3769 38.4849 20.3415Q38.3392 20.3062 38.192 20.278Q38.0448 20.2499 37.8964 20.229Q37.7479 20.2081 37.5987 20.1946Q37.4494 20.1811 37.2996 20.1749Q37.1499 20.1688 37 20.17L37 20.17Q36.8522 20.1719 36.7046 20.1811Q36.557 20.1902 36.41 20.2065Q36.2631 20.2228 36.1171 20.2462Q35.9711 20.2696 35.8264 20.3001Q35.6818 20.3306 35.5387 20.3681Q35.3957 20.4056 35.2547 20.4499Q35.1136 20.4943 34.9749 20.5455Q34.8362 20.5967 34.7001 20.6546Q34.5641 20.7125 34.431 20.7769Q34.2979 20.8413 34.1681 20.9121Q34.0383 20.9829 33.9121 21.06Q33.7859 21.137 33.6636 21.2201Q33.5413 21.3032 33.4232 21.3921Q33.3051 21.481 33.1914 21.5756Q33.0777 21.6702 32.9688 21.7701Q32.8599 21.8701 32.7559 21.9753Q32.652 22.0804 32.5533 22.1905Q32.4546 22.3006 32.3613 22.4153Q32.2681 22.5301 32.1805 22.6492Q32.093 22.7684 32.0113 22.8917Q31.9297 23.0149 31.8541 23.142Q31.7785 23.2691 31.7092 23.3997Q31.6399 23.5303 31.5771 23.6641Q31.5142 23.798 31.4579 23.9347Q31.4016 24.0714 31.352 24.2107Q31.3024 24.35 31.2597 24.4915Q31.2169 24.6331 31.1811 24.7765Q31.1453 24.92 31.1165 25.065Q31.0877 25.21 31.066 25.3563Q31.0442 25.5025 31.0297 25.6497Q31.0151 25.7968 31.0076 25.9445Q31.0002 26.0921 31 26.24" />
+									<GeometryDrawing Pen="{DynamicResource sourceMethodIconPen}" Geometry="F1 M26.82 18.54Q26.9329 18.677 27.0373 18.8205Q27.1417 18.964 27.2372 19.1136Q27.3328 19.2631 27.4192 19.4181Q27.5056 19.5732 27.5825 19.7331Q27.6594 19.8931 27.7266 20.0573Q27.7937 20.2216 27.8508 20.3897Q27.9079 20.5577 27.9548 20.7289Q28.0017 20.9 28.0383 21.0737Q28.0748 21.2474 28.1007 21.423Q28.1267 21.5985 28.1421 21.7753Q28.1575 21.9521 28.1622 22.1296Q28.1669 22.307 28.1609 22.4843Q28.1549 22.6617 28.1382 22.8384Q28.1216 23.0151 28.0943 23.1905Q28.067 23.3658 28.0292 23.5393Q27.9914 23.7127 27.9433 23.8835Q27.8951 24.0543 27.8368 24.2219Q27.7784 24.3895 27.7101 24.5533Q27.6418 24.7171 27.5637 24.8765Q27.4856 25.0359 27.3981 25.1903Q27.3106 25.3447 27.2139 25.4935Q27.1172 25.6423 27.0118 25.7851Q26.9063 25.9278 26.7925 26.064Q26.6786 26.2001 26.5568 26.3292Q26.4349 26.4582 26.3055 26.5797Q26.1761 26.7012 26.0397 26.8146Q25.9032 26.9281 25.7601 27.0331Q25.6171 27.1381 25.468 27.2344Q25.3188 27.3306 25.1642 27.4177Q25.0095 27.5048 24.8499 27.5824Q24.6903 27.66 24.5263 27.7279Q24.3623 27.7957 24.1946 27.8536Q24.0268 27.9114 23.8558 27.9591Q23.6849 28.0068 23.5114 28.044Q23.3378 28.0813 23.1624 28.1081Q22.9869 28.1348 22.8102 28.151Q22.6335 28.1671 22.4561 28.1726Q22.2787 28.1781 22.1013 28.1729Q21.9239 28.1677 21.7471 28.1518Q21.5703 28.1359 21.3949 28.1094Q21.2194 28.0829 21.0458 28.0459Q20.8722 28.0089 20.7012 27.9615Q20.5302 27.9141 20.3623 27.8565Q20.1944 27.7989 20.0303 27.7312Q19.8662 27.6636 19.7065 27.5863Q19.5468 27.5089 19.392 27.422Q19.2372 27.3352 19.088 27.2392Q18.9387 27.1432 18.7955 27.0384Q18.6523 26.9335 18.5156 26.8203Q18.379 26.707 18.2494 26.5857Q18.1198 26.4645 17.9978 26.3356Q17.8757 26.2068 17.7617 26.0708Q17.6476 25.9348 17.542 25.7922Q17.4363 25.6496 17.3394 25.5009Q17.2425 25.3522 17.1548 25.198Q17.067 25.0437 16.9887 24.8845Q16.9104 24.7252 16.8418 24.5615Q16.7732 24.3978 16.7146 24.2303Q16.656 24.0628 16.6076 23.892Q16.5592 23.7213 16.5211 23.5479Q16.4831 23.3746 16.4556 23.1992Q16.428 23.0239 16.4111 22.8472Q16.3942 22.6706 16.3879 22.4932Q16.3816 22.3158 16.3861 22.1384Q16.3905 21.961 16.4056 21.7842Q16.4207 21.6073 16.4464 21.4317Q16.4721 21.2561 16.5084 21.0824Q16.5446 20.9087 16.5913 20.7374Q16.6379 20.5662 16.6948 20.3981Q16.7517 20.2299 16.8186 20.0656Q16.8855 19.9012 16.9621 19.7411Q17.0388 19.581 17.1249 19.4259Q17.2111 19.2707 17.3065 19.121Q17.4018 18.9713 17.506 18.8277Q17.6102 18.684 17.7228 18.5469Q17.8355 18.4097 17.9562 18.2796Q18.0769 18.1495 18.2052 18.0269Q18.3335 17.9043 18.469 17.7896Q18.6045 17.675 18.7466 17.5687Q18.8887 17.4624 19.037 17.3648Q19.1852 17.2673 19.3391 17.1788Q19.493 17.0904 19.6519 17.0114Q19.8108 16.9324 19.9742 16.8631Q20.1376 16.7937 20.3048 16.7344Q20.4721 16.6751 20.6426 16.6259Q20.8132 16.5767 20.9864 16.5379Q21.1595 16.4991 21.3347 16.4708Q21.5099 16.4425 21.6865 16.4248Q21.8631 16.4071 22.0405 16.4001Q22.2178 16.393 22.3952 16.3967Q22.5727 16.4003 22.7496 16.4146Q22.9265 16.4289 23.1022 16.4539Q23.2779 16.4788 23.4518 16.5143Q23.6257 16.5498 23.7971 16.5957Q23.9686 16.6416 24.1369 16.6977Q24.3053 16.7538 24.47 16.82" />
+									<GeometryDrawing Pen="{DynamicResource sourceMethodIconPen}" Geometry="F1 M21.96 19.63L21.96 23.13L24.11 23.13" />
+								</DrawingGroup>
+							</DrawingGroup>
+						</DrawingImage>
+					</controls:InitialSyncOption.IconDrawing>
+					<controls:InitialSyncOption.MoreInfoContent>
+						<TextBlock Classes="introText">
+							This is the gold standard. On the following pages, you will tap
+							arrow keys in time with each syllable (as designated by you during
+							lyrics input) of the vocals to record their start and end
+							timestamps.
+						</TextBlock>
+						<TextBlock Classes="introText">
+							It's easy and fun and gives you a guaranteed result.
+						</TextBlock>
+						<TextBlock Classes="introText">
+							The downsides are that it demands your full and acoustic attention
+							rather than allowing you to multitask in any way, and that it may be
+							difficult to do well if the song's rhythm is complex or swung or
+							goes by very fast, as this tool can currently only run at 100%
+							speed.
+						</TextBlock>
+						<TextBlock Classes="introText">
+							You can, however, move around at will in the audio and/or the text,
+							and punch-in wherever you want as many times as you want.
+						</TextBlock>
+						<TextBlock Classes="introText">
+							Difficult songs could be synchronized first in Karaoke Builder
+							Studio, whose similar method does have a playback speed control, and
+							then imported into Kadda OK Tools to be tweaked using the controls
+							that have fewer drawbacks.
+						</TextBlock>
+					</controls:InitialSyncOption.MoreInfoContent>
+				</controls:InitialSyncOption>
+
+                <controls:InitialSyncOption
+                    OptionTitle="Automatic Timing via Forced Aligner"
+                    OptionSummary="Import a .CTM file created using NeMo Forced Aligner or similar."
+                    ChooseCommand="{Binding SelectCtmCommand}">
+					<controls:InitialSyncOption.IconDrawing>
+						<DrawingImage>
+							<DrawingGroup>
+								<DrawingGroup>
+									<DrawingGroup.Transform>
+										<MatrixTransform Matrix="1.0004057,0,0,1.0004057,-35.202267,-31.407694" />
+									</DrawingGroup.Transform>
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M60.618 102.414C60.618 102.414 83.122 69.211 128.055 65.776L128.055 53.73C78.286 57.727 35.188 99.879 35.188 99.879C35.188 99.879 59.598 170.444 128.055 176.905L128.055 164.101C77.818 157.781 60.618 102.414 60.618 102.414ZM128.055 138.637L128.055 150.363C90.087 143.594 79.548 104.126 79.548 104.126C79.548 104.126 97.778 83.931 128.055 80.656L128.055 93.523C128.032 93.523 128.016 93.516 127.997 93.516C112.106 91.609 99.692 106.454 99.692 106.454C99.692 106.454 106.65 131.445 128.055 138.637M128.055 31.512L128.055 53.73C129.516 53.618 130.977 53.523 132.446 53.473C189.028 51.566 225.895 99.879 225.895 99.879C225.895 99.879 183.552 151.367 139.438 151.367C135.395 151.367 131.61 150.992 128.055 150.362L128.055 164.101C131.095 164.487 134.247 164.714 137.536 164.714C178.587 164.714 208.274 143.749 237.02 118.936C241.786 122.753 261.298 132.039 265.309 136.104C237.977 158.987 174.278 177.433 138.165 177.433C134.684 177.433 131.341 177.222 128.055 176.905L128.055 196.211L284.087 196.211L284.087 31.512L128.055 31.512ZM128.055 80.656L128.055 65.777C129.501 65.676 130.958 65.598 132.446 65.551C173.134 64.273 199.828 100.516 199.828 100.516C199.828 100.516 170.996 140.559 140.082 140.559C135.633 140.559 131.644 139.844 128.054 138.637L128.054 93.523C143.894 95.437 147.082 102.434 156.605 118.309L177.785 100.45C177.785 100.45 162.324 80.173 136.261 80.173C133.428 80.172 130.717 80.371 128.055 80.656" />
+								</DrawingGroup>
+							</DrawingGroup>
+						</DrawingImage>
+                    </controls:InitialSyncOption.IconDrawing>
+                    <controls:InitialSyncOption.MoreInfoContent>
+                        <TextBlock Classes="introText">
+                            This usually gives very good sub-syllable-level timing, and always
+                            has accurate text.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            Using <InlineUIContainer>
+                                <Button
+                                    Classes="inline"
+                                    Content="this Kadda OK repository"
+                                    Command="{Binding LinkToForcedAlignerCommand}" />
+                            </InlineUIContainer>,
+                            you can run this easily using a free (though slow to initialize)
+                            Google Colab notebook, or set it up on your own machine for repeated
+                            use.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            Its downsides are that the timing you get is based on a speaking
+                            voice and may not be where you'd want things to split up musically,
+                            and it will likely give incorrect results if your vocals-only audio
+                            has instruments bleeding through in non-vocal moments.
+                        </TextBlock>
+                    </controls:InitialSyncOption.MoreInfoContent>
+                </controls:InitialSyncOption>
+
+                <controls:InitialSyncOption
+                    OptionTitle="Automatic Timing via Azure Speech Service"
+                    OptionSummary="Automatically time the recording using Azure speech-to-text technology."
+                    ChooseCommand="{Binding SelectAzureProcessCommand}">
+					<controls:InitialSyncOption.IconDrawing>
+						<DrawingImage>
+							<DrawingGroup>
+								<DrawingGroup>
+									<DrawingGroup.ClipGeometry>
+										<StreamGeometry>F1 M0 0L49 0L49 48L0 48L0 0Z</StreamGeometry>
+									</DrawingGroup.ClipGeometry>
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M24.071 1.26001C23.212 1.26001 22.514 1.89201 22.514 2.66501L22.514 45.332C22.514 46.108 23.214 46.737 24.071 46.737C24.903 46.737 25.599 46.11 25.628 45.332L25.628 2.66501C25.628 1.88901 24.929 1.26001 24.071 1.26001Z" />
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M16.925 8.88306C15.928 8.88306 15.117 9.62706 15.117 10.5391L15.117 37.2581C15.117 38.1701 15.928 38.9141 16.925 38.9141C17.922 38.9141 18.733 38.1701 18.733 37.2581L18.733 10.5421C18.733 9.62706 17.923 8.88606 16.925 8.88606L16.925 8.88306Z" />
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M9.873 16.619C8.876 16.619 8.065 17.363 8.065 18.275L8.065 29.52C8.065 30.432 8.875 31.176 9.873 31.176C10.87 31.176 11.649 30.472 11.681 29.52L11.681 18.278C11.681 17.363 10.87 16.622 9.873 16.622L9.873 16.619Z" />
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M2.81999 19.891C1.82299 19.891 1.01199 20.635 1.01199 21.547L1.01199 26.291C1.01199 27.206 1.82299 27.947 2.81999 27.947C3.78499 27.947 4.59599 27.211 4.62799 26.291L4.62799 21.547C4.62799 20.635 3.81799 19.891 2.81999 19.891Z" />
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M31.055 8.88306C30.058 8.88306 29.247 9.62706 29.247 10.5391L29.247 37.2581C29.247 38.1701 30.058 38.9141 31.055 38.9141C32.052 38.9141 32.863 38.1701 32.863 37.2581L32.863 10.5421C32.863 9.62706 32.053 8.88606 31.055 8.88606L31.055 8.88306Z" />
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M38.11 16.619C37.113 16.619 36.302 17.363 36.302 18.275L36.302 29.536C36.334 30.469 37.11 31.176 38.11 31.176C39.11 31.176 39.918 30.432 39.918 29.52L39.918 18.278C39.918 17.363 39.107 16.622 38.11 16.622L38.11 16.619Z" />
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M45.184 19.891C44.187 19.891 43.379 20.635 43.379 21.547L43.379 26.291C43.379 27.206 44.189 27.947 45.184 27.947C46.178 27.947 46.992 27.203 46.992 26.291L46.992 21.547C46.992 20.635 46.181 19.891 45.184 19.891Z" />
+									<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M1.042 8.355C0.915575 8.35513 0.790376 8.33019 0.673654 8.28162C0.556932 8.23304 0.451004 8.16179 0.362002 8.072C0.272388 7.98287 0.201258 7.87691 0.152694 7.76022C0.104129 7.64353 0.0790864 7.51839 0.0790021 7.392L0.0790021 0.96C0.0803214 0.705279 0.182299 0.461412 0.362696 0.281576C0.543094 0.10174 0.787279 0.000524509 1.042 0L7.076 0C7.329 0 7.575 0.101 7.753 0.283C7.8425 0.372187 7.91351 0.478164 7.96196 0.594854C8.01042 0.711544 8.03536 0.83665 8.03536 0.963C8.03536 1.08935 8.01042 1.21446 7.96196 1.33115C7.91351 1.44784 7.8425 1.55381 7.753 1.643C7.66387 1.73261 7.55791 1.80374 7.44122 1.85231C7.32453 1.90087 7.1994 1.92592 7.073 1.926L2.004 1.926L2.004 7.39C2.0039 7.64559 1.90333 7.89089 1.724 8.073C1.54368 8.2538 1.29935 8.35621 1.044 8.358L1.041 8.355L1.042 8.355ZM47.999 7.395L47.999 0.961C47.9991 0.834573 47.9742 0.709374 47.9256 0.592652C47.877 0.475929 47.8058 0.370002 47.716 0.281C47.5349 0.102032 47.2906 0.00146307 47.036 0.001L41.002 0.001C40.8756 0.000864515 40.7504 0.0258073 40.6337 0.0743844C40.5169 0.122962 40.411 0.194208 40.322 0.284C40.2325 0.373187 40.1615 0.479164 40.113 0.595854C40.0646 0.712544 40.0396 0.837651 40.0396 0.964C40.0396 1.09035 40.0646 1.21546 40.113 1.33215C40.1615 1.44884 40.2325 1.55481 40.322 1.644C40.4112 1.73357 40.5171 1.80467 40.6338 1.85323C40.7505 1.90179 40.8756 1.92686 41.002 1.927L46.06 1.927L46.06 7.391C46.0597 7.51793 46.0845 7.64366 46.133 7.76098C46.1815 7.8783 46.2526 7.9849 46.3424 8.07465C46.4321 8.16441 46.5387 8.23555 46.656 8.284C46.7733 8.33246 46.8991 8.35726 47.026 8.357C47.1529 8.35726 47.2787 8.33246 47.396 8.284C47.5133 8.23555 47.6199 8.16441 47.7097 8.07465C47.7994 7.9849 47.8706 7.8783 47.919 7.76098C47.9675 7.64366 47.9923 7.51793 47.992 7.391L48.003 7.396L48 7.396L47.999 7.395ZM7.966 47.038C7.96654 46.9115 7.94101 46.7862 7.891 46.67C7.81829 46.4944 7.69506 46.3445 7.53696 46.2391C7.37886 46.1337 7.19301 46.0776 7.003 46.078L1.932 46.078L1.932 40.612C1.93227 40.4851 1.90746 40.3593 1.85901 40.242C1.81055 40.1247 1.73941 40.0181 1.64965 39.9283C1.5599 39.8386 1.45331 39.7674 1.33599 39.719C1.21867 39.6705 1.09293 39.6457 0.966002 39.646C0.839071 39.6457 0.713338 39.6705 0.596018 39.719C0.478699 39.7674 0.372103 39.8386 0.282349 39.9283C0.192595 40.0181 0.12145 40.1247 0.0729975 40.242C0.0245449 40.3593 -0.000261537 40.4851 2.07919e-06 40.612L2.07919e-06 47.041C0.00211237 47.2955 0.104713 47.5389 0.285457 47.7182C0.466201 47.8974 0.710448 47.998 0.965002 47.998L6.999 47.998C7.12543 47.9981 7.25063 47.9732 7.36735 47.9246C7.48407 47.876 7.59 47.8048 7.679 47.715C7.76862 47.6259 7.83975 47.5199 7.88831 47.4032C7.93687 47.2865 7.96192 47.1614 7.962 47.035L7.966 47.038ZM48.002 47.038L48.002 40.612C48.0023 40.4851 47.9775 40.3593 47.929 40.242C47.8806 40.1247 47.8094 40.0181 47.7197 39.9283C47.6299 39.8386 47.5233 39.7674 47.406 39.719C47.2887 39.6705 47.1629 39.6457 47.036 39.646C46.9091 39.6457 46.7833 39.6705 46.666 39.719C46.5487 39.7674 46.4421 39.8386 46.3524 39.9283C46.2626 40.0181 46.1915 40.1247 46.143 40.242C46.0945 40.3593 46.0697 40.4851 46.07 40.612L46.07 46.078L41.012 46.078C40.8855 46.0775 40.7602 46.103 40.644 46.153C40.5272 46.2011 40.421 46.2718 40.3316 46.361C40.2422 46.4502 40.1713 46.5562 40.123 46.673C40.0747 46.7897 40.0499 46.9148 40.0501 47.0411C40.0503 47.1674 40.0754 47.2924 40.124 47.409C40.1967 47.5845 40.3199 47.7345 40.478 47.8399C40.6361 47.9453 40.822 48.0014 41.012 48.001L47.046 48.001C47.2989 47.9985 47.5405 47.896 47.718 47.716C47.8067 47.6274 47.8772 47.5222 47.9252 47.4064C47.9732 47.2906 47.998 47.1664 47.998 47.041L48.002 47.038Z" />
+								</DrawingGroup>
+							</DrawingGroup>
+						</DrawingImage>
+                    </controls:InitialSyncOption.IconDrawing>
+					<controls:InitialSyncOption.MoreInfoContent>
+                        <TextBlock Classes="introText">
+                            This app will communicate with the Azure cloud to recognize the text
+                            sung in the vocal audio.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            This method can only give word-level timing, and the text is often
+                            inaccurate and needs correction.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            This is because unlike a forced aligner, which starts with the text
+                            and tries to map the audio onto it, Azure Speech starts with the
+                            audio and tries to transcribe it, and while the lyrics provided to
+                            it are taken into account as custom phrases to expect, the cloud
+                            recognizer is not forced to use them and will often interpret things
+                            differently.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            Azure offers a free 5 hours worth of this service every month.
+                            Sign-up is required.
+                        </TextBlock>
+                    </controls:InitialSyncOption.MoreInfoContent>
+                </controls:InitialSyncOption>
+
+                <controls:InitialSyncOption
+                    OptionTitle="Import from Karaoke Builder Studio"
+                    OptionSummary="Ingest a .kbp file to edit and export."
+                    ChooseCommand="{Binding ImportCommand}">
+					<controls:InitialSyncOption.IconDrawing>
+						<DrawingImage>
+							<DrawingGroup>
+								<DrawingGroup>
+									<DrawingGroup.Transform>
+										<MatrixTransform Matrix="3.781046,0,0,3.781046,0,0" />
+									</DrawingGroup.Transform>
+									<DrawingGroup>
+										<DrawingGroup.Transform>
+											<MatrixTransform Matrix="0.99999994,0,0,0.99999994,-1.2294017,-1.0864253" />
+										</DrawingGroup.Transform>
+										<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M26.2604 1.32033C28.5498 3.93785 30.3852 7.49295 29.1005 14.3221C29.772 14.1306 30.4544 13.9997 31.1387 13.8948Q29.6364 14.1328 28.1857 14.5902Q26.7351 15.0476 25.368 15.7143C23.1151 14.5299 20.2457 13.0913 16.3995 13.1015C13.3875 13.1095 9.77823 14.0064 5.40277 16.6104C8.82511 16.8266 12.7951 18.0427 16.6052 23.859C16.6474 23.7831 16.6997 23.714 16.7432 23.6389Q15.6791 25.4326 14.9986 27.404C10.6633 28.7501 4.32683 30.8929 1.46399 42.1721C4.03683 39.905 7.70391 37.9578 14.5107 39.3764C14.3048 38.6545 14.1696 37.9199 14.0632 37.1838Q14.369 39.1507 15.048 41.0218Q15.7269 42.893 16.7535 44.5983C16.4258 44.056 16.1245 43.5218 15.8822 43.0175C13.7686 47.0349 10.8016 53.0308 16.7535 63.0318C16.9697 59.6095 18.1859 55.6394 24.0022 51.8294C22.8808 51.2057 21.856 50.4383 20.9155 49.6047Q21.7183 50.2953 22.5881 50.8994Q23.4578 51.5036 24.3853 52.0147Q25.3127 52.5259 26.288 52.9386Q27.2632 53.3514 28.2758 53.6613C28.0297 53.5866 27.7752 53.5147 27.5466 53.4345C28.8927 57.7697 31.0343 64.1079 42.3147 66.9711C40.0476 64.3983 38.1004 60.7312 39.519 53.9244C38.1855 54.3047 36.8132 54.4869 35.4604 54.5476Q35.8631 54.5246 36.2646 54.4857Q36.6661 54.4469 37.0658 54.3923Q37.4654 54.3376 37.8626 54.2673Q38.2598 54.197 38.654 54.1111Q39.0481 54.0252 39.4385 53.9238Q39.829 53.8224 40.2151 53.7057Q40.6013 53.5891 40.9825 53.4573Q41.3638 53.3255 41.7395 53.1788Q42.1153 53.0321 42.485 52.8707Q42.8547 52.7093 43.2177 52.5335Q43.5807 52.3576 43.9366 52.1676Q44.2924 51.9776 44.6405 51.7738Q44.9886 51.5699 45.3284 51.3525Q45.6681 51.1351 45.9991 50.9045Q46.33 50.6739 46.6517 50.4304Q46.9733 50.1869 47.285 49.9309Q47.5968 49.675 47.8983 49.4069Q48.1997 49.1389 48.4904 48.8592Q48.7811 48.5795 49.0605 48.2886Q49.3399 47.9976 49.6076 47.6959Q49.8754 47.3942 50.131 47.0822Q50.3867 46.7701 50.6298 46.4483Q50.873 46.1264 51.1033 45.7952Q51.3336 45.4641 51.5506 45.1241Q51.7677 44.7841 51.9712 44.4358Q52.1747 44.0875 52.3644 43.7315Q52.554 43.3755 52.7295 43.0122Q52.905 42.649 53.066 42.2792Q53.227 41.9093 53.3733 41.5334Q53.5197 41.1575 53.6511 40.7761Q53.7825 40.3948 53.8988 40.0085Q54.0151 39.6223 54.1161 39.2317C53.9664 39.8338 53.8048 40.4125 53.6231 40.9303C57.9584 39.5842 64.2516 37.3977 67.1148 26.1173C64.4973 28.4067 60.9416 30.2425 54.1125 28.9579C54.1213 28.9886 54.1256 29.0202 54.1342 29.0509Q53.634 27.0909 52.7601 25.2667C54.8735 21.2493 57.7727 15.2546 51.8232 5.25756C51.5914 8.72442 50.3761 12.533 44.651 16.4502Q42.9389 15.4457 41.0657 14.7888C39.719 10.4542 37.5216 4.17861 26.2604 1.32033ZM33.7912 13.67Q32.7545 13.6913 31.7252 13.8172C32.417 13.7341 33.1076 13.6795 33.7912 13.67ZM45.9522 17.2827C46.0185 17.3283 46.0835 17.3747 46.1491 17.4212Q46.0511 17.3513 45.9522 17.2827ZM34.3106 19.3368Q34.6758 19.3368 35.0406 19.3547Q35.4055 19.3726 35.769 19.4084Q36.1325 19.4442 36.4938 19.4978Q36.8551 19.5514 37.2133 19.6227Q37.5716 19.6939 37.9259 19.7827Q38.2802 19.8714 38.6298 19.9775Q38.9793 20.0835 39.3232 20.2065Q39.6671 20.3296 40.0046 20.4694Q40.342 20.6092 40.6722 20.7653Q41.0024 20.9215 41.3246 21.0937Q41.6467 21.2659 41.96 21.4536Q42.2733 21.6414 42.577 21.8443Q42.8807 22.0473 43.1741 22.2649Q43.4675 22.4825 43.7498 22.7142Q44.0322 22.9459 44.3028 23.1912Q44.5735 23.4365 44.8317 23.6948Q45.09 23.953 45.3353 24.2237Q45.5806 24.4943 45.8123 24.7767Q46.0441 25.059 46.2616 25.3524Q46.4792 25.6458 46.6822 25.9495Q46.8851 26.2532 47.0729 26.5665Q47.2607 26.8798 47.4328 27.202Q47.605 27.5241 47.7612 27.8543Q47.9174 28.1845 48.0571 28.5219Q48.1969 28.8594 48.32 29.2033Q48.443 29.5472 48.5491 29.8968Q48.6551 30.2463 48.7438 30.6006Q48.8326 30.9549 48.9039 31.3132Q48.9751 31.6714 49.0287 32.0328Q49.0823 32.3941 49.1181 32.7576Q49.1539 33.1211 49.1718 33.4859Q49.1898 33.8507 49.1898 34.216Q49.1898 34.5813 49.1718 34.9461Q49.1539 35.3109 49.1181 35.6744Q49.0823 36.0379 49.0287 36.3992Q48.9751 36.7605 48.9039 37.1188Q48.8326 37.477 48.7439 37.8313Q48.6551 38.1857 48.5491 38.5352Q48.4431 38.8847 48.32 39.2286Q48.197 39.5726 48.0572 39.91Q47.9174 40.2475 47.7612 40.5777Q47.6051 40.9079 47.4329 41.23Q47.2607 41.5521 47.0729 41.8654Q46.8851 42.1787 46.6822 42.4824Q46.4793 42.7861 46.2617 43.0795Q46.0441 43.3729 45.8124 43.6553Q45.5807 43.9376 45.3354 44.2082Q45.0901 44.4789 44.8318 44.7372Q44.5735 44.9954 44.3029 45.2407Q44.0322 45.486 43.7499 45.7178Q43.4675 45.9495 43.1741 46.1671Q42.8808 46.3847 42.577 46.5876Q42.2733 46.7905 41.96 46.9783Q41.6467 47.1661 41.3246 47.3383Q41.0025 47.5105 40.6723 47.6666Q40.3421 47.8228 40.0046 47.9626Q39.6672 48.1024 39.3232 48.2254Q38.9793 48.3485 38.6298 48.4545Q38.2803 48.5605 37.9259 48.6493Q37.5716 48.738 37.2134 48.8093Q36.8551 48.8806 36.4938 48.9342Q36.1325 48.9877 35.769 49.0236Q35.4055 49.0593 35.0407 49.0773Q34.6758 49.0952 34.3106 49.0952Q33.9453 49.0952 33.5805 49.0773Q33.2157 49.0594 32.8522 49.0236Q32.4887 48.9878 32.1273 48.9342Q31.766 48.8806 31.4078 48.8093Q31.0495 48.7381 30.6952 48.6493Q30.3409 48.5606 29.9914 48.4545Q29.6418 48.3485 29.2979 48.2255Q28.954 48.1024 28.6166 47.9626Q28.2791 47.8228 27.9489 47.6667Q27.6187 47.5105 27.2966 47.3383Q26.9744 47.1661 26.6611 46.9784Q26.3478 46.7906 26.0441 46.5877Q25.7404 46.3847 25.4471 46.1671Q25.1537 45.9495 24.8713 45.7178Q24.589 45.4861 24.3183 45.2408Q24.0477 44.9955 23.7894 44.7372Q23.5311 44.479 23.2858 44.2083Q23.0405 43.9377 22.8088 43.6553Q22.5771 43.373 22.3595 43.0796Q22.1419 42.7862 21.939 42.4825Q21.736 42.1788 21.5483 41.8655Q21.3605 41.5522 21.1883 41.23Q21.0161 40.9079 20.8599 40.5777Q20.7038 40.2475 20.564 39.9101Q20.4242 39.5726 20.3012 39.2287Q20.1781 38.8848 20.0721 38.5352Q19.966 38.1857 19.8773 37.8314Q19.7885 37.4771 19.7173 37.1188Q19.646 36.7606 19.5924 36.3992Q19.5388 36.0379 19.503 35.6744Q19.4672 35.3109 19.4493 34.9461Q19.4314 34.5813 19.4314 34.216Q19.4314 33.8507 19.4493 33.4859Q19.4672 33.1211 19.503 32.7576Q19.5388 32.3941 19.5924 32.0328Q19.646 31.6715 19.7172 31.3132Q19.7885 30.955 19.8773 30.6007Q19.966 30.2463 20.072 29.8968Q20.1781 29.5473 20.3011 29.2034Q20.4242 28.8594 20.5639 28.522Q20.7037 28.1845 20.8599 27.8543Q21.0161 27.5241 21.1882 27.202Q21.3604 26.8799 21.5482 26.5666Q21.736 26.2533 21.9389 25.9496Q22.1418 25.6459 22.3594 25.3525Q22.577 25.0591 22.8087 24.7767Q23.0405 24.4944 23.2858 24.2237Q23.5311 23.9531 23.7893 23.6948Q24.0476 23.4365 24.3183 23.1912Q24.5889 22.946 24.8713 22.7142Q25.1536 22.4825 25.447 22.2649Q25.7404 22.0473 26.0441 21.8444Q26.3478 21.6415 26.6611 21.4537Q26.9744 21.2659 27.2965 21.0937Q27.6187 20.9215 27.9489 20.7654Q28.2791 20.6092 28.6165 20.4694Q28.954 20.3296 29.2979 20.2066Q29.6418 20.0835 29.9913 19.9775Q30.3409 19.8715 30.6952 19.7827Q31.0495 19.694 31.4078 19.6227Q31.766 19.5514 32.1273 19.4978Q32.4886 19.4443 32.8521 19.4085Q33.2156 19.3726 33.5805 19.3547Q33.9453 19.3368 34.3106 19.3368ZM18.4805 21.1553Q17.8867 21.8775 17.3612 22.6508C17.7122 22.1326 18.0824 21.6294 18.4805 21.1553ZM34.3106 24.2693Q34.0656 24.2693 33.821 24.2813Q33.5763 24.2932 33.3325 24.3171Q33.0888 24.341 32.8465 24.3767Q32.6042 24.4124 32.3639 24.46Q32.1237 24.5075 31.8861 24.5667Q31.6485 24.6259 31.4141 24.6966Q31.1796 24.7673 30.949 24.8493Q30.7184 24.9314 30.4921 25.0246Q30.2658 25.1178 30.0443 25.222Q29.8229 25.3261 29.6069 25.4409Q29.3909 25.5558 29.1807 25.681Q28.9706 25.8062 28.767 25.9415Q28.5633 26.0769 28.3666 26.222Q28.1698 26.3671 27.9805 26.5216Q27.7911 26.6761 27.6096 26.8397Q27.4281 27.0033 27.2549 27.1755Q27.0817 27.3477 26.9172 27.5282Q26.7527 27.7087 26.5973 27.897Q26.4419 28.0853 26.296 28.2809Q26.1501 28.4766 26.014 28.6791Q25.8779 28.8816 25.752 29.0906Q25.626 29.2995 25.5106 29.5143Q25.3951 29.7291 25.2904 29.9493Q25.1856 30.1695 25.0919 30.3946Q24.9982 30.6196 24.9156 30.8489Q24.8331 31.0783 24.762 31.3114Q24.6909 31.5445 24.6314 31.7808Q24.5719 32.017 24.5241 32.2559Q24.4763 32.4949 24.4404 32.7358Q24.4044 32.9767 24.3804 33.2192Q24.3564 33.4616 24.3444 33.7048Q24.3324 33.9481 24.3324 34.1917Q24.3324 34.4353 24.3444 34.6786Q24.3564 34.9219 24.3804 35.1643Q24.4044 35.4067 24.4404 35.6476Q24.4763 35.8886 24.5241 36.1275Q24.5719 36.3664 24.6314 36.6027Q24.6909 36.8389 24.762 37.072Q24.8331 37.3051 24.9156 37.5345Q24.9982 37.7638 25.0919 37.9888Q25.1856 38.2139 25.2904 38.4341Q25.3951 38.6543 25.5106 38.8691Q25.626 39.0839 25.752 39.2928Q25.8779 39.5018 26.014 39.7043Q26.1501 39.9068 26.296 40.1025Q26.4419 40.2981 26.5973 40.4864Q26.7527 40.6747 26.9172 40.8552Q27.0817 41.0357 27.2549 41.2079Q27.4281 41.3801 27.6096 41.5437Q27.7911 41.7073 27.9804 41.8618Q28.1698 42.0163 28.3665 42.1614Q28.5633 42.3065 28.767 42.4419Q28.9706 42.5772 29.1807 42.7024Q29.3908 42.8277 29.6069 42.9425Q29.8229 43.0573 30.0443 43.1614Q30.2658 43.2656 30.4921 43.3588Q30.7184 43.452 30.949 43.5341Q31.1796 43.6161 31.414 43.6869Q31.6484 43.7576 31.8861 43.8167Q32.1237 43.8759 32.3639 43.9235Q32.6042 43.971 32.8465 44.0067Q33.0888 44.0424 33.3325 44.0663Q33.5763 44.0902 33.821 44.1022Q34.0656 44.1141 34.3106 44.1141Q34.5555 44.1141 34.8002 44.1022Q35.0448 44.0902 35.2886 44.0663Q35.5324 44.0425 35.7747 44.0067Q36.017 43.971 36.2572 43.9235Q36.4975 43.8759 36.7351 43.8168Q36.9727 43.7576 37.2071 43.6869Q37.4415 43.6162 37.6721 43.5341Q37.9027 43.452 38.1291 43.3588Q38.3554 43.2656 38.5768 43.1615Q38.7982 43.0573 39.0143 42.9425Q39.2303 42.8277 39.4404 42.7024Q39.6505 42.5772 39.8542 42.4419Q40.0578 42.3066 40.2546 42.1615Q40.4513 42.0164 40.6407 41.8618Q40.83 41.7073 41.0115 41.5437Q41.193 41.3802 41.3662 41.2079Q41.5394 41.0357 41.7039 40.8552Q41.8684 40.6747 42.0238 40.4864Q42.1792 40.2981 42.3251 40.1025Q42.4711 39.9068 42.6071 39.7043Q42.7432 39.5018 42.8692 39.2929Q42.9951 39.0839 43.1106 38.8691Q43.226 38.6543 43.3308 38.4341Q43.4355 38.2139 43.5292 37.9889Q43.623 37.7638 43.7055 37.5345Q43.788 37.3051 43.8591 37.072Q43.9302 36.8389 43.9897 36.6027Q44.0493 36.3664 44.097 36.1275Q44.1448 35.8886 44.1808 35.6476Q44.2167 35.4067 44.2407 35.1643Q44.2647 34.9219 44.2767 34.6786Q44.2888 34.4353 44.2888 34.1917Q44.2888 33.9481 44.2767 33.7048Q44.2647 33.4616 44.2407 33.2192Q44.2167 32.9767 44.1808 32.7358Q44.1448 32.4949 44.097 32.256Q44.0493 32.0171 43.9897 31.7808Q43.9302 31.5445 43.8591 31.3114Q43.788 31.0783 43.7055 30.849Q43.623 30.6196 43.5292 30.3946Q43.4355 30.1695 43.3308 29.9493Q43.226 29.7292 43.1106 29.5143Q42.9951 29.2995 42.8692 29.0906Q42.7432 28.8817 42.6072 28.6791Q42.4711 28.4766 42.3251 28.281Q42.1792 28.0853 42.0238 27.897Q41.8684 27.7087 41.7039 27.5282Q41.5394 27.3478 41.3662 27.1755Q41.193 27.0033 41.0115 26.8397Q40.83 26.6761 40.6407 26.5216Q40.4513 26.3671 40.2546 26.222Q40.0578 26.0769 39.8542 25.9415Q39.6505 25.8062 39.4404 25.681Q39.2303 25.5558 39.0143 25.4409Q38.7982 25.3261 38.5768 25.222Q38.3554 25.1178 38.1291 25.0246Q37.9028 24.9314 37.6721 24.8493Q37.4415 24.7673 37.2071 24.6966Q36.9727 24.6259 36.7351 24.5667Q36.4975 24.5075 36.2572 24.46Q36.017 24.4125 35.7747 24.3767Q35.5324 24.341 35.2886 24.3171Q35.0448 24.2932 34.8002 24.2813Q34.5555 24.2693 34.3106 24.2693L34.3106 24.2693ZM54.3088 29.8106C54.541 30.8347 54.6777 31.8691 54.73 32.8977Q54.6372 31.3381 54.3088 29.8106ZM13.9123 32.814Q13.904 32.9212 13.8968 33.0285C13.9014 32.9565 13.9071 32.8857 13.9123 32.814ZM54.7522 33.3737C54.7578 33.577 54.7676 33.78 54.7672 33.9819Q54.7642 33.6777 54.7522 33.3737ZM13.8534 34.5824Q13.8725 35.6931 14.0115 36.7952C13.9207 36.0543 13.8601 35.3137 13.8534 34.5824ZM54.3347 38.2933C54.3077 38.4275 54.2757 38.5526 54.2468 38.6839Q54.2927 38.489 54.3347 38.2933ZM51.9751 44.495C49.8246 48.3615 46.0704 51.2174 43.1627 52.6144C47.1801 54.728 53.1765 57.632 63.1775 51.68C59.7078 51.448 55.8957 50.2323 51.9751 44.495L51.9751 44.495ZM17.5798 45.8592Q17.9555 46.396 18.3648 46.9077C18.0869 46.5581 17.8265 46.2097 17.5798 45.8592L17.5798 45.8592ZM19.097 47.7935Q19.9128 48.7135 20.8328 49.5293C20.214 48.9744 19.6283 48.3953 19.097 47.7935ZM28.6918 53.791Q29.7463 54.08 30.8255 54.2551C30.0745 54.1268 29.3529 53.9751 28.6918 53.791ZM31.858 54.4101Q32.9316 54.5441 34.0134 54.5641C33.2775 54.5458 32.5558 54.496 31.858 54.4101L31.858 54.4101ZM35.0909 54.5646C34.8935 54.5699 34.6963 54.5794 34.5002 54.5791Q34.7957 54.5761 35.0909 54.5646Z" />
+										<GeometryDrawing Pen="{DynamicResource sourceMethodIconPen}" Geometry="F1 M26.2604 1.32033C28.5498 3.93785 30.3852 7.49295 29.1005 14.3221C29.772 14.1306 30.4544 13.9997 31.1387 13.8948Q29.6364 14.1328 28.1857 14.5902Q26.7351 15.0476 25.368 15.7143C23.1151 14.5299 20.2457 13.0913 16.3995 13.1015C13.3875 13.1095 9.77823 14.0064 5.40277 16.6104C8.82511 16.8266 12.7951 18.0427 16.6052 23.859C16.6474 23.7831 16.6997 23.714 16.7432 23.6389Q15.6791 25.4326 14.9986 27.404C10.6633 28.7501 4.32683 30.8929 1.46399 42.1721C4.03683 39.905 7.70391 37.9578 14.5107 39.3764C14.3048 38.6545 14.1696 37.9199 14.0632 37.1838Q14.369 39.1507 15.048 41.0218Q15.7269 42.893 16.7535 44.5983C16.4258 44.056 16.1245 43.5218 15.8822 43.0175C13.7686 47.0349 10.8016 53.0308 16.7535 63.0318C16.9697 59.6095 18.1859 55.6394 24.0022 51.8294C22.8808 51.2057 21.856 50.4383 20.9155 49.6047Q21.7183 50.2953 22.5881 50.8994Q23.4578 51.5036 24.3853 52.0147Q25.3127 52.5259 26.288 52.9386Q27.2632 53.3514 28.2758 53.6613C28.0297 53.5866 27.7752 53.5147 27.5466 53.4345C28.8927 57.7697 31.0343 64.1079 42.3147 66.9711C40.0476 64.3983 38.1004 60.7312 39.519 53.9244C38.1855 54.3047 36.8132 54.4869 35.4604 54.5476Q35.8631 54.5246 36.2646 54.4857Q36.6661 54.4469 37.0658 54.3923Q37.4654 54.3376 37.8626 54.2673Q38.2598 54.197 38.654 54.1111Q39.0481 54.0252 39.4385 53.9238Q39.829 53.8224 40.2151 53.7057Q40.6013 53.5891 40.9825 53.4573Q41.3638 53.3255 41.7395 53.1788Q42.1153 53.0321 42.485 52.8707Q42.8547 52.7093 43.2177 52.5335Q43.5807 52.3576 43.9366 52.1676Q44.2924 51.9776 44.6405 51.7738Q44.9886 51.5699 45.3284 51.3525Q45.6681 51.1351 45.9991 50.9045Q46.33 50.6739 46.6517 50.4304Q46.9733 50.1869 47.285 49.9309Q47.5968 49.675 47.8983 49.4069Q48.1997 49.1389 48.4904 48.8592Q48.7811 48.5795 49.0605 48.2886Q49.3399 47.9976 49.6076 47.6959Q49.8754 47.3942 50.131 47.0822Q50.3867 46.7701 50.6298 46.4483Q50.873 46.1264 51.1033 45.7952Q51.3336 45.4641 51.5506 45.1241Q51.7677 44.7841 51.9712 44.4358Q52.1747 44.0875 52.3644 43.7315Q52.554 43.3755 52.7295 43.0122Q52.905 42.649 53.066 42.2792Q53.227 41.9093 53.3733 41.5334Q53.5197 41.1575 53.6511 40.7761Q53.7825 40.3948 53.8988 40.0085Q54.0151 39.6223 54.1161 39.2317C53.9664 39.8338 53.8048 40.4125 53.6231 40.9303C57.9584 39.5842 64.2516 37.3977 67.1148 26.1173C64.4973 28.4067 60.9416 30.2425 54.1125 28.9579C54.1213 28.9886 54.1256 29.0202 54.1342 29.0509Q53.634 27.0909 52.7601 25.2667C54.8735 21.2493 57.7727 15.2546 51.8232 5.25756C51.5914 8.72442 50.3761 12.533 44.651 16.4502Q42.9389 15.4457 41.0657 14.7888C39.719 10.4542 37.5216 4.17861 26.2604 1.32033ZM33.7912 13.67Q32.7545 13.6913 31.7252 13.8172C32.417 13.7341 33.1076 13.6795 33.7912 13.67ZM45.9522 17.2827C46.0185 17.3283 46.0835 17.3747 46.1491 17.4212Q46.0511 17.3513 45.9522 17.2827ZM34.3106 19.3368Q34.6758 19.3368 35.0406 19.3547Q35.4055 19.3726 35.769 19.4084Q36.1325 19.4442 36.4938 19.4978Q36.8551 19.5514 37.2133 19.6227Q37.5716 19.6939 37.9259 19.7827Q38.2802 19.8714 38.6298 19.9775Q38.9793 20.0835 39.3232 20.2065Q39.6671 20.3296 40.0046 20.4694Q40.342 20.6092 40.6722 20.7653Q41.0024 20.9215 41.3246 21.0937Q41.6467 21.2659 41.96 21.4536Q42.2733 21.6414 42.577 21.8443Q42.8807 22.0473 43.1741 22.2649Q43.4675 22.4825 43.7498 22.7142Q44.0322 22.9459 44.3028 23.1912Q44.5735 23.4365 44.8317 23.6948Q45.09 23.953 45.3353 24.2237Q45.5806 24.4943 45.8123 24.7767Q46.0441 25.059 46.2616 25.3524Q46.4792 25.6458 46.6822 25.9495Q46.8851 26.2532 47.0729 26.5665Q47.2607 26.8798 47.4328 27.202Q47.605 27.5241 47.7612 27.8543Q47.9174 28.1845 48.0571 28.5219Q48.1969 28.8594 48.32 29.2033Q48.443 29.5472 48.5491 29.8968Q48.6551 30.2463 48.7438 30.6006Q48.8326 30.9549 48.9039 31.3132Q48.9751 31.6714 49.0287 32.0328Q49.0823 32.3941 49.1181 32.7576Q49.1539 33.1211 49.1718 33.4859Q49.1898 33.8507 49.1898 34.216Q49.1898 34.5813 49.1718 34.9461Q49.1539 35.3109 49.1181 35.6744Q49.0823 36.0379 49.0287 36.3992Q48.9751 36.7605 48.9039 37.1188Q48.8326 37.477 48.7439 37.8313Q48.6551 38.1857 48.5491 38.5352Q48.4431 38.8847 48.32 39.2286Q48.197 39.5726 48.0572 39.91Q47.9174 40.2475 47.7612 40.5777Q47.6051 40.9079 47.4329 41.23Q47.2607 41.5521 47.0729 41.8654Q46.8851 42.1787 46.6822 42.4824Q46.4793 42.7861 46.2617 43.0795Q46.0441 43.3729 45.8124 43.6553Q45.5807 43.9376 45.3354 44.2082Q45.0901 44.4789 44.8318 44.7372Q44.5735 44.9954 44.3029 45.2407Q44.0322 45.486 43.7499 45.7178Q43.4675 45.9495 43.1741 46.1671Q42.8808 46.3847 42.577 46.5876Q42.2733 46.7905 41.96 46.9783Q41.6467 47.1661 41.3246 47.3383Q41.0025 47.5105 40.6723 47.6666Q40.3421 47.8228 40.0046 47.9626Q39.6672 48.1024 39.3232 48.2254Q38.9793 48.3485 38.6298 48.4545Q38.2803 48.5605 37.9259 48.6493Q37.5716 48.738 37.2134 48.8093Q36.8551 48.8806 36.4938 48.9342Q36.1325 48.9877 35.769 49.0236Q35.4055 49.0593 35.0407 49.0773Q34.6758 49.0952 34.3106 49.0952Q33.9453 49.0952 33.5805 49.0773Q33.2157 49.0594 32.8522 49.0236Q32.4887 48.9878 32.1273 48.9342Q31.766 48.8806 31.4078 48.8093Q31.0495 48.7381 30.6952 48.6493Q30.3409 48.5606 29.9914 48.4545Q29.6418 48.3485 29.2979 48.2255Q28.954 48.1024 28.6166 47.9626Q28.2791 47.8228 27.9489 47.6667Q27.6187 47.5105 27.2966 47.3383Q26.9744 47.1661 26.6611 46.9784Q26.3478 46.7906 26.0441 46.5877Q25.7404 46.3847 25.4471 46.1671Q25.1537 45.9495 24.8713 45.7178Q24.589 45.4861 24.3183 45.2408Q24.0477 44.9955 23.7894 44.7372Q23.5311 44.479 23.2858 44.2083Q23.0405 43.9377 22.8088 43.6553Q22.5771 43.373 22.3595 43.0796Q22.1419 42.7862 21.939 42.4825Q21.736 42.1788 21.5483 41.8655Q21.3605 41.5522 21.1883 41.23Q21.0161 40.9079 20.8599 40.5777Q20.7038 40.2475 20.564 39.9101Q20.4242 39.5726 20.3012 39.2287Q20.1781 38.8848 20.0721 38.5352Q19.966 38.1857 19.8773 37.8314Q19.7885 37.4771 19.7173 37.1188Q19.646 36.7606 19.5924 36.3992Q19.5388 36.0379 19.503 35.6744Q19.4672 35.3109 19.4493 34.9461Q19.4314 34.5813 19.4314 34.216Q19.4314 33.8507 19.4493 33.4859Q19.4672 33.1211 19.503 32.7576Q19.5388 32.3941 19.5924 32.0328Q19.646 31.6715 19.7172 31.3132Q19.7885 30.955 19.8773 30.6007Q19.966 30.2463 20.072 29.8968Q20.1781 29.5473 20.3011 29.2034Q20.4242 28.8594 20.5639 28.522Q20.7037 28.1845 20.8599 27.8543Q21.0161 27.5241 21.1882 27.202Q21.3604 26.8799 21.5482 26.5666Q21.736 26.2533 21.9389 25.9496Q22.1418 25.6459 22.3594 25.3525Q22.577 25.0591 22.8087 24.7767Q23.0405 24.4944 23.2858 24.2237Q23.5311 23.9531 23.7893 23.6948Q24.0476 23.4365 24.3183 23.1912Q24.5889 22.946 24.8713 22.7142Q25.1536 22.4825 25.447 22.2649Q25.7404 22.0473 26.0441 21.8444Q26.3478 21.6415 26.6611 21.4537Q26.9744 21.2659 27.2965 21.0937Q27.6187 20.9215 27.9489 20.7654Q28.2791 20.6092 28.6165 20.4694Q28.954 20.3296 29.2979 20.2066Q29.6418 20.0835 29.9913 19.9775Q30.3409 19.8715 30.6952 19.7827Q31.0495 19.694 31.4078 19.6227Q31.766 19.5514 32.1273 19.4978Q32.4886 19.4443 32.8521 19.4085Q33.2156 19.3726 33.5805 19.3547Q33.9453 19.3368 34.3106 19.3368ZM18.4805 21.1553Q17.8867 21.8775 17.3612 22.6508C17.7122 22.1326 18.0824 21.6294 18.4805 21.1553ZM34.3106 24.2693Q34.0656 24.2693 33.821 24.2813Q33.5763 24.2932 33.3325 24.3171Q33.0888 24.341 32.8465 24.3767Q32.6042 24.4124 32.3639 24.46Q32.1237 24.5075 31.8861 24.5667Q31.6485 24.6259 31.4141 24.6966Q31.1796 24.7673 30.949 24.8493Q30.7184 24.9314 30.4921 25.0246Q30.2658 25.1178 30.0443 25.222Q29.8229 25.3261 29.6069 25.4409Q29.3909 25.5558 29.1807 25.681Q28.9706 25.8062 28.767 25.9415Q28.5633 26.0769 28.3666 26.222Q28.1698 26.3671 27.9805 26.5216Q27.7911 26.6761 27.6096 26.8397Q27.4281 27.0033 27.2549 27.1755Q27.0817 27.3477 26.9172 27.5282Q26.7527 27.7087 26.5973 27.897Q26.4419 28.0853 26.296 28.2809Q26.1501 28.4766 26.014 28.6791Q25.8779 28.8816 25.752 29.0906Q25.626 29.2995 25.5106 29.5143Q25.3951 29.7291 25.2904 29.9493Q25.1856 30.1695 25.0919 30.3946Q24.9982 30.6196 24.9156 30.8489Q24.8331 31.0783 24.762 31.3114Q24.6909 31.5445 24.6314 31.7808Q24.5719 32.017 24.5241 32.2559Q24.4763 32.4949 24.4404 32.7358Q24.4044 32.9767 24.3804 33.2192Q24.3564 33.4616 24.3444 33.7048Q24.3324 33.9481 24.3324 34.1917Q24.3324 34.4353 24.3444 34.6786Q24.3564 34.9219 24.3804 35.1643Q24.4044 35.4067 24.4404 35.6476Q24.4763 35.8886 24.5241 36.1275Q24.5719 36.3664 24.6314 36.6027Q24.6909 36.8389 24.762 37.072Q24.8331 37.3051 24.9156 37.5345Q24.9982 37.7638 25.0919 37.9888Q25.1856 38.2139 25.2904 38.4341Q25.3951 38.6543 25.5106 38.8691Q25.626 39.0839 25.752 39.2928Q25.8779 39.5018 26.014 39.7043Q26.1501 39.9068 26.296 40.1025Q26.4419 40.2981 26.5973 40.4864Q26.7527 40.6747 26.9172 40.8552Q27.0817 41.0357 27.2549 41.2079Q27.4281 41.3801 27.6096 41.5437Q27.7911 41.7073 27.9804 41.8618Q28.1698 42.0163 28.3665 42.1614Q28.5633 42.3065 28.767 42.4419Q28.9706 42.5772 29.1807 42.7024Q29.3908 42.8277 29.6069 42.9425Q29.8229 43.0573 30.0443 43.1614Q30.2658 43.2656 30.4921 43.3588Q30.7184 43.452 30.949 43.5341Q31.1796 43.6161 31.414 43.6869Q31.6484 43.7576 31.8861 43.8167Q32.1237 43.8759 32.3639 43.9235Q32.6042 43.971 32.8465 44.0067Q33.0888 44.0424 33.3325 44.0663Q33.5763 44.0902 33.821 44.1022Q34.0656 44.1141 34.3106 44.1141Q34.5555 44.1141 34.8002 44.1022Q35.0448 44.0902 35.2886 44.0663Q35.5324 44.0425 35.7747 44.0067Q36.017 43.971 36.2572 43.9235Q36.4975 43.8759 36.7351 43.8168Q36.9727 43.7576 37.2071 43.6869Q37.4415 43.6162 37.6721 43.5341Q37.9027 43.452 38.1291 43.3588Q38.3554 43.2656 38.5768 43.1615Q38.7982 43.0573 39.0143 42.9425Q39.2303 42.8277 39.4404 42.7024Q39.6505 42.5772 39.8542 42.4419Q40.0578 42.3066 40.2546 42.1615Q40.4513 42.0164 40.6407 41.8618Q40.83 41.7073 41.0115 41.5437Q41.193 41.3802 41.3662 41.2079Q41.5394 41.0357 41.7039 40.8552Q41.8684 40.6747 42.0238 40.4864Q42.1792 40.2981 42.3251 40.1025Q42.4711 39.9068 42.6071 39.7043Q42.7432 39.5018 42.8692 39.2929Q42.9951 39.0839 43.1106 38.8691Q43.226 38.6543 43.3308 38.4341Q43.4355 38.2139 43.5292 37.9889Q43.623 37.7638 43.7055 37.5345Q43.788 37.3051 43.8591 37.072Q43.9302 36.8389 43.9897 36.6027Q44.0493 36.3664 44.097 36.1275Q44.1448 35.8886 44.1808 35.6476Q44.2167 35.4067 44.2407 35.1643Q44.2647 34.9219 44.2767 34.6786Q44.2888 34.4353 44.2888 34.1917Q44.2888 33.9481 44.2767 33.7048Q44.2647 33.4616 44.2407 33.2192Q44.2167 32.9767 44.1808 32.7358Q44.1448 32.4949 44.097 32.256Q44.0493 32.0171 43.9897 31.7808Q43.9302 31.5445 43.8591 31.3114Q43.788 31.0783 43.7055 30.849Q43.623 30.6196 43.5292 30.3946Q43.4355 30.1695 43.3308 29.9493Q43.226 29.7292 43.1106 29.5143Q42.9951 29.2995 42.8692 29.0906Q42.7432 28.8817 42.6072 28.6791Q42.4711 28.4766 42.3251 28.281Q42.1792 28.0853 42.0238 27.897Q41.8684 27.7087 41.7039 27.5282Q41.5394 27.3478 41.3662 27.1755Q41.193 27.0033 41.0115 26.8397Q40.83 26.6761 40.6407 26.5216Q40.4513 26.3671 40.2546 26.222Q40.0578 26.0769 39.8542 25.9415Q39.6505 25.8062 39.4404 25.681Q39.2303 25.5558 39.0143 25.4409Q38.7982 25.3261 38.5768 25.222Q38.3554 25.1178 38.1291 25.0246Q37.9028 24.9314 37.6721 24.8493Q37.4415 24.7673 37.2071 24.6966Q36.9727 24.6259 36.7351 24.5667Q36.4975 24.5075 36.2572 24.46Q36.017 24.4125 35.7747 24.3767Q35.5324 24.341 35.2886 24.3171Q35.0448 24.2932 34.8002 24.2813Q34.5555 24.2693 34.3106 24.2693L34.3106 24.2693ZM54.3088 29.8106C54.541 30.8347 54.6777 31.8691 54.73 32.8977Q54.6372 31.3381 54.3088 29.8106ZM13.9123 32.814Q13.904 32.9212 13.8968 33.0285C13.9014 32.9565 13.9071 32.8857 13.9123 32.814ZM54.7522 33.3737C54.7578 33.577 54.7676 33.78 54.7672 33.9819Q54.7642 33.6777 54.7522 33.3737ZM13.8534 34.5824Q13.8725 35.6931 14.0115 36.7952C13.9207 36.0543 13.8601 35.3137 13.8534 34.5824ZM54.3347 38.2933C54.3077 38.4275 54.2757 38.5526 54.2468 38.6839Q54.2927 38.489 54.3347 38.2933ZM51.9751 44.495C49.8246 48.3615 46.0704 51.2174 43.1627 52.6144C47.1801 54.728 53.1765 57.632 63.1775 51.68C59.7078 51.448 55.8957 50.2323 51.9751 44.495L51.9751 44.495ZM17.5798 45.8592Q17.9555 46.396 18.3648 46.9077C18.0869 46.5581 17.8265 46.2097 17.5798 45.8592L17.5798 45.8592ZM19.097 47.7935Q19.9128 48.7135 20.8328 49.5293C20.214 48.9744 19.6283 48.3953 19.097 47.7935ZM28.6918 53.791Q29.7463 54.08 30.8255 54.2551C30.0745 54.1268 29.3529 53.9751 28.6918 53.791ZM31.858 54.4101Q32.9316 54.5441 34.0134 54.5641C33.2775 54.5458 32.5558 54.496 31.858 54.4101L31.858 54.4101ZM35.0909 54.5646C34.8935 54.5699 34.6963 54.5794 34.5002 54.5791Q34.7957 54.5761 35.0909 54.5646Z" />
+									</DrawingGroup>
+								</DrawingGroup>
+							</DrawingGroup>
+						</DrawingImage>
+                    </controls:InitialSyncOption.IconDrawing>
+					<controls:InitialSyncOption.MoreInfoContent>
+                        <TextBlock Classes="introText">
+                            If you are already a KBS user and have an existing project, and/or
+                            you prefer to use its method for initial sync and just want to use
+                            Kadda OK Tools for editing or conversion, you can import a .kbp file
+                            here.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            This allows you to make changes using the superior aspects of the
+                            Kadda OK Tools editing experience, then export back to KBS for
+                            rendering, or convert it to a YouTube Movie Maker project for more
+                            advanced graphics.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            It does not require you to have a registered license for KBS, which
+                            is only required for rendering in KBS.
+                        </TextBlock>
+                    </controls:InitialSyncOption.MoreInfoContent>
+                </controls:InitialSyncOption>
+
+
+                <controls:InitialSyncOption
+                    OptionTitle="Import from YouTube Movie Maker"
+                    OptionSummary="Ingest a .rzlrc file to edit and export."
+                    ChooseCommand="{Binding ImportCommand}">
+					<controls:InitialSyncOption.IconDrawing>
+						<DrawingImage>
+							<DrawingGroup>
+								<DrawingGroup>
+									<DrawingGroup.Transform>
+										<MatrixTransform Matrix="3.7732568,0,0,3.7732568,0.29666138,0" />
+									</DrawingGroup.Transform>
+									<DrawingGroup>
+										<DrawingGroup.Transform>
+											<MatrixTransform Matrix="1,0,0,1,-26.399094,-111.30463" />
+										</DrawingGroup.Transform>
+										<GeometryDrawing Brush="{DynamicResource sourceMethodIconBrush}" Geometry="F1 M48.5578 111.305C46.4426 111.304 44.5016 111.312 42.9075 111.33C42.8975 111.329 42.8821 111.321 42.8728 111.321C42.7762 111.319 35.7544 111.15 32.3691 112.368C30.8777 113.085 28.9029 114.912 28.1533 116.071C27.5156 117.058 26.664 119.76 26.5483 120.514C26.4305 121.282 26.2733 160.14 26.5663 162.436C27.1511 167.02 30.9642 171.787 34.9281 172.89C37.8081 173.691 78.7291 173.277 80.5382 172.429C83.6329 170.976 86.5209 167.382 87.4122 163.873C88.2144 160.715 88.5586 123.784 87.9393 120.876C87.892 120.654 86.8836 116.698 84.9225 114.873C81.4849 111.674 78.2585 111.487 74.7303 111.531C71.2022 111.576 60.4511 111.309 57.812 111.321C56.3521 111.327 52.3902 111.307 48.5578 111.305L48.5578 111.305ZM50.2796 117.879C50.3009 117.876 50.3117 117.881 50.3313 117.879C57.8854 122.136 67.6534 127.441 73.0524 130.544C80.7048 134.942 80.6763 134.897 80.3775 141.964C79.3567 166.108 47.7629 173.365 36.466 152.05C31.8895 143.415 33.1239 132.053 40.1981 124.581C43.4368 121.16 48.8576 118.074 50.2796 117.879L50.2796 117.879ZM50.0517 118.377C50.4517 118.386 50.8519 118.393 51.2522 118.399L50.0517 118.377ZM50.6646 120.518C50.5996 120.535 50.599 120.733 50.5979 121.13C50.5969 121.567 51.0736 122.8 51.6573 123.87C52.2409 124.941 53.236 126.489 53.868 127.31C54.5001 128.131 55.5984 129.405 56.3087 130.141C57.019 130.878 57.9726 131.844 58.4931 132.203C58.9242 132.5 59.8871 133.07 60.5989 133.48C57.2484 133.694 53.555 134.895 52.8102 136.681C51.9476 138.748 55.0456 149.133 56.7459 149.874C57.9167 150.383 57.1864 150.511 67.3044 148.02C77.6485 145.474 78.5757 145.286 78.7394 144.7C79.3317 142.577 79.7246 141.893 76.4785 142.915C74.6354 143.496 72.226 138.88 73.5542 136.626C73.5838 136.576 73.6069 136.55 73.6348 136.508C75.1765 135.507 77.1067 136.124 77.6294 137.473C77.8068 137.53 78.1896 137.504 78.31 137.394C78.1162 136.728 77.9459 135.316 77.6521 135.045L76.1091 135.313C75.9872 135.284 72.8858 136.292 65.6632 134.046C65.5736 134.046 64.3983 133.703 63.2824 133.323C62.1666 132.942 60.3956 131.907 59.2315 131.138C58.0674 130.37 56.6621 128.813 55.8385 127.949C55.0147 127.086 53.7348 125.451 52.9942 124.317C52.2536 123.182 51.6445 122.12 51.6413 121.957C51.6383 121.794 51.4029 121.363 51.1183 120.999C50.8597 120.668 50.7302 120.503 50.6651 120.519L50.6646 120.518ZM66.2921 135.166C66.4116 135.196 66.5185 135.226 66.6502 135.255L68.9958 135.786C67.2534 135.438 67.7897 135.288 68.0816 136.449C68.2998 137.317 68.3233 137.316 69.6025 137.146C71.1254 136.944 71.2648 137.112 72.0333 140.075C72.8377 143.176 72.5614 144.18 70.9032 144.18C70.4681 144.18 69.8691 144.311 69.5725 144.47C68.7538 144.909 68.6347 144.642 67.4822 139.794C66.9342 137.489 66.4397 135.578 66.2921 135.166L66.2921 135.166ZM59.323 136.778C60.6465 136.754 61.1537 137.221 59.7312 137.87C58.8614 138.267 58.8724 138.53 59.9374 142.728C60.4178 144.622 60.7621 146.318 60.7022 146.499C60.1685 148.102 59.3905 146.744 58.3902 142.461C57.605 139.098 57.3759 138.58 56.7004 138.645C54.8897 138.817 55.1992 137.702 57.1169 137.144C57.9513 136.901 58.7214 136.789 59.323 136.778ZM75.3329 137.171C74.7551 137.189 74.427 138.043 74.9339 138.551C75.3731 138.991 75.9582 138.655 75.9582 137.963C75.9582 137.63 75.7941 137.295 75.5938 137.218C75.5028 137.183 75.4154 137.168 75.3329 137.171L75.3329 137.171ZM64.7159 138.37C64.8039 138.368 64.904 138.379 65.0172 138.401C66.1966 138.629 67.2541 145.239 66.1112 145.239C65.7712 145.239 65.262 145.414 64.98 145.627C63.5527 146.709 62.7666 145.915 61.9709 142.59C60.9437 138.298 62.0886 137.263 63.1936 141.485C63.8175 143.869 64.1666 144.493 64.7506 144.269C65.257 144.074 65.2267 143.467 64.5842 140.946C64.0936 139.021 64.1002 138.383 64.7159 138.37L64.7159 138.37ZM69.6392 138.624C68.735 138.624 68.7345 139.868 69.6382 142.248C69.9428 143.051 70.7712 142.97 70.8913 142.126C71.0471 141.032 70.1862 138.624 69.6392 138.624L69.6392 138.624ZM77.2521 139.495C77.0363 139.497 76.7446 139.553 76.3824 139.673C75.2353 140.052 75.0546 140.303 75.4269 141C75.8041 141.706 75.9654 141.679 77.0175 140.738C77.866 139.979 77.8997 139.49 77.2521 139.495L77.2521 139.495ZM40.334 141.27C39.551 141.27 39.2405 141.849 39.2405 143.307C39.2405 145.025 38.9473 145.073 38.0302 143.506C37.1431 141.99 36.4365 141.984 36.5285 143.494C36.5692 144.162 36.9798 145.117 37.7346 146.299C38.4223 147.376 39.0158 148.71 39.2214 149.642C39.4096 150.494 39.6837 151.341 39.8306 151.523C40.8934 152.838 41.529 151.544 40.9608 149.222C40.5707 147.627 40.5508 147.015 40.812 144.585C41.129 141.637 41.076 141.27 40.334 141.27L40.334 141.27ZM51.1721 141.592C51.0865 141.602 50.9933 141.626 50.8899 141.659C50.1961 141.879 50.1936 142.347 50.8718 145.008C51.4168 147.146 51.3901 147.62 50.7256 147.62C50.3672 147.62 50.1988 147.158 49.5184 144.313C49.066 142.42 47.9738 141.552 47.5237 142.727C47.2138 143.536 48.7174 148.824 49.3841 149.269C49.8115 149.555 51.0704 149.514 51.2594 149.207C51.3492 149.062 51.7579 148.943 52.1674 148.943C53.5366 148.943 53.6026 148.504 52.7441 145.101C51.997 142.14 51.7711 141.523 51.1721 141.592L51.1721 141.592ZM44.265 143.074C42.1863 143.09 41.1186 147.63 43.493 150.161C44.6106 151.353 46.7918 150.802 47.2994 149.2C47.6195 148.19 46.6592 144.692 45.8354 143.867C45.2779 143.308 44.7447 143.071 44.265 143.074L44.265 143.074ZM44.1668 145.104C44.7455 145.172 45.5802 147.015 45.5802 148.462C45.5802 148.754 45.3875 148.943 45.0908 148.943C44.4836 148.943 43.4736 145.655 43.9379 145.19C44.007 145.121 44.0841 145.095 44.1668 145.104L44.1668 145.104Z" />
+									</DrawingGroup>
+								</DrawingGroup>
+							</DrawingGroup>
+						</DrawingImage>
+                    </controls:InitialSyncOption.IconDrawing>
+					<controls:InitialSyncOption.MoreInfoContent>
+                        <TextBlock Classes="introText">
+                            If you are already a YTMM user and have an existing project, or want
+                            to use Kadda OK Tools for editing or conversion, you can import a
+                            .rzlrc file here.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            This allows you to make changes using the superior aspects of the
+                            Kadda OK Tools editing experience, then export back to YTMM for
+                            rendering, or convert it to a KBS project in order to render to
+                            CD+G.
+                        </TextBlock>
+                        <TextBlock Classes="introText">
+                            It does not require you to have a registered license for YTMM
+                            (though the .rzmmpj generation feature during export back to YTMM
+                            assumes you have unlocked 1080p rendering).
+                        </TextBlock>
+                    </controls:InitialSyncOption.MoreInfoContent>
+                </controls:InitialSyncOption>
+            </StackPanel>
+        </ScrollViewer>
+    </dialogHost:DialogHost>
+
+</UserControl>
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Views/StartView.axaml.cs b/KaddaOK.AvaloniaApp/Views/StartView.axaml.cs
new file mode 100644
index 0000000..ca4cb2c
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Views/StartView.axaml.cs
@@ -0,0 +1,29 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
+using KaddaOK.AvaloniaApp.ViewModels;
+using KaddaOK.AvaloniaApp.ViewModels.DesignTime;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KaddaOK.AvaloniaApp.Views
+{
+    public partial class StartView : UserControl
+    {
+        private StartViewModel _viewModel;
+        public StartView()
+        {
+            InitializeComponent();
+
+            _viewModel = Design.IsDesignMode
+                ? new DesignTimeStartViewModel()
+                : App.ServiceProvider.GetRequiredService<StartViewModel>();
+            DataContext = _viewModel;
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            _viewModel.NotificationManager = new WindowNotificationManager(TopLevel.GetTopLevel(this)!);
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/Views/TabIndexes.cs b/KaddaOK.AvaloniaApp/Views/TabIndexes.cs
new file mode 100644
index 0000000..6301905
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Views/TabIndexes.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KaddaOK.AvaloniaApp.Views
+{
+    public enum TabIndexes
+    {
+        Start = 0,
+        Audio = 1,
+        Lyrics = 2,
+        Recognize = 3,
+        Narrow = 4,
+        ManualAlign = 5,
+        Edit = 6,
+        Export = 7,
+        About = 8
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/WaveformToPointConverter.cs b/KaddaOK.AvaloniaApp/WaveformToPointConverter.cs
index 1faa7ea..fc8eed5 100644
--- a/KaddaOK.AvaloniaApp/WaveformToPointConverter.cs
+++ b/KaddaOK.AvaloniaApp/WaveformToPointConverter.cs
@@ -12,15 +12,16 @@ public class WaveformToPointConverter : IMultiValueConverter
     {
         public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
         {
-            /*
+            
             var sb = new StringBuilder();
-            sb.AppendLine(nameof(WaveformToPointConverter));
+            sb.Append(nameof(WaveformToPointConverter));
             for (int i = 0; i < values.Count; i++)
             {
-                sb.AppendLine($"[{i}]: {values[i]?.ToString() ?? "null"}");
+                sb.Append($"[{i}]: {values[i]?.ToString() ?? "null"}");
             }
             Debug.WriteLine(sb.ToString());
-            */
+
+            double? returnValue = null;
 
             // need to know the second of the point
             // need to know the length of the waveform in seconds
@@ -39,10 +40,13 @@ public class WaveformToPointConverter : IMultiValueConverter
                 }
 
                 //Debug.WriteLine($"{pointSeconds} / {waveLengthSeconds} * {totalWidth}");
-                return pointSeconds / waveLengthSeconds * totalWidth;
+                returnValue = pointSeconds / waveLengthSeconds * totalWidth;
             }
 
-            return null;
+            sb.Append($" = {returnValue}");
+            Debug.WriteLine(sb.ToString());
+
+            return returnValue;
         }
     }
 }
diff --git a/KaddaOK.Library.Tests/NfaCtmImporterTests.cs b/KaddaOK.Library.Tests/NfaCtmImporterTests.cs
new file mode 100644
index 0000000..20e341f
--- /dev/null
+++ b/KaddaOK.Library.Tests/NfaCtmImporterTests.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KaddaOK.Library.Tests
+{
+    public class NfaCtmImporterTests
+    {
+        private List<string> sampleCtmLines = new List<string>
+        {
+            "resampledInput 1 0.00 10.56 <b>",
+            "resampledInput 1 10.56 0.08 ▁And",
+            "resampledInput 1 10.64 0.48 <b>",
+            "resampledInput 1 11.12 0.08 ▁after",
+            "resampledInput 1 11.20 0.64 <b>",
+            "resampledInput 1 11.84 0.08 ▁the",
+            "resampledInput 1 11.92 0.40 <b>",
+            "resampledInput 1 12.32 0.08 ▁sto",
+            "resampledInput 1 12.40 0.24 <b>",
+            "resampledInput 1 12.64 0.08 r",
+            "resampledInput 1 12.72 0.08 m",
+            "resampledInput 1 12.80 3.44 <b>",
+            "resampledInput 1 16.24 0.08 ▁I",
+            "resampledInput 1 16.32 0.08 <b>",
+            "resampledInput 1 16.40 0.08 ▁run",
+            "resampledInput 1 16.48 0.48 <b>",
+            "resampledInput 1 16.96 0.16 ▁and",
+            "resampledInput 1 17.12 0.16 <b>",
+            "resampledInput 1 17.28 0.08 ▁run",
+            "resampledInput 1 17.36 0.40 <b>",
+            "resampledInput 1 17.76 0.08 ▁as",
+            "resampledInput 1 17.84 0.32 <b>",
+            "resampledInput 1 18.16 0.08 ▁the",
+            "resampledInput 1 18.24 0.08 <b>",
+            "resampledInput 1 18.32 0.08 ▁ra",
+            "resampledInput 1 18.40 0.08 <b>",
+            "resampledInput 1 18.48 0.08 in",
+            "resampledInput 1 18.56 0.16 <b>",
+            "resampledInput 1 18.72 0.08 s",
+            "resampledInput 1 18.80 0.16 <b>",
+            "resampledInput 1 18.96 0.08 ▁come",
+            "resampledInput 1 19.04 0.40 <b>"
+        };
+
+        [Fact]
+        public void ShouldParseCorrectly()
+        {
+            var importer = new NfaCtmImporter();
+            var inputLyrics = new List<string>
+            {
+                "And after the storm",
+                "I run and run as the rains come"
+            };
+            var resultingLines = importer.ImportNfaCtmAndLyrics(sampleCtmLines, inputLyrics);
+
+            Assert.Equal(2, resultingLines.Count);
+
+            var firstLine = resultingLines[0];
+            Assert.Equal(6, firstLine.Words.Count);
+            var firstLineFirstWord = firstLine.Words.First();
+            Assert.Equal("And ", firstLineFirstWord.Text);
+            Assert.Equal(10.56, firstLineFirstWord.StartSecond);
+            Assert.Equal(10.64, firstLineFirstWord.EndSecond);
+            var firstLineLastWord = firstLine.Words.Last();
+            Assert.Equal("m", firstLineLastWord.Text);
+            Assert.Equal(12.72, firstLineLastWord.StartSecond);
+            Assert.Equal(12.80, firstLineLastWord.EndSecond);
+
+            var secondLine = resultingLines[1];
+            Assert.Equal(10, secondLine.Words.Count);
+            var secondLineFirstWord = secondLine.Words.First();
+            Assert.Equal("I ", secondLineFirstWord.Text);
+            Assert.Equal(16.24, secondLineFirstWord.StartSecond);
+            Assert.Equal(16.32, secondLineFirstWord.EndSecond);
+            var secondLineLastWord = secondLine.Words.Last();
+            Assert.Equal("come", secondLineLastWord.Text);
+            Assert.Equal(18.8, secondLineLastWord.StartSecond);
+            Assert.Equal(19.04, secondLineLastWord.EndSecond);
+        }
+
+        [Fact]
+        public void ShouldOutputRemainingIfNoMoreLyrics()
+        {
+            var importer = new NfaCtmImporter();
+            var inputLyrics = new List<string>
+            {
+                "And after the storm",
+                "I run"
+            };
+            var resultingLines = importer.ImportNfaCtmAndLyrics(sampleCtmLines, inputLyrics);
+
+            Assert.Equal(2, resultingLines.Count);
+
+            var firstLine = resultingLines[0];
+            Assert.Equal(6, firstLine.Words.Count);
+            var firstLineFirstWord = firstLine.Words.First();
+            Assert.Equal("And ", firstLineFirstWord.Text);
+            Assert.Equal(10.56, firstLineFirstWord.StartSecond);
+            Assert.Equal(10.64, firstLineFirstWord.EndSecond);
+            var firstLineLastWord = firstLine.Words.Last();
+            Assert.Equal("m", firstLineLastWord.Text);
+            Assert.Equal(12.72, firstLineLastWord.StartSecond);
+            Assert.Equal(12.80, firstLineLastWord.EndSecond);
+
+            var secondLine = resultingLines[1];
+            Assert.Equal(10, secondLine.Words.Count);
+            var secondLineFirstWord = secondLine.Words.First();
+            Assert.Equal("I ", secondLineFirstWord.Text);
+            Assert.Equal(16.24, secondLineFirstWord.StartSecond);
+            Assert.Equal(16.32, secondLineFirstWord.EndSecond);
+            var secondLineLastWord = secondLine.Words.Last();
+            Assert.Equal("come", secondLineLastWord.Text);
+            Assert.Equal(18.8, secondLineLastWord.StartSecond);
+            Assert.Equal(19.04, secondLineLastWord.EndSecond);
+        }
+
+        [Fact]
+        public void ShouldOutputRemainingIfTextDifference()
+        {
+            var importer = new NfaCtmImporter();
+            var inputLyrics = new List<string>
+            {
+                "And after the storm,",
+                "I run, and run, as the rains come"
+            };
+            var resultingLines = importer.ImportNfaCtmAndLyrics(sampleCtmLines, inputLyrics);
+
+            Assert.Single(resultingLines);
+
+            var firstLine = resultingLines[0];
+            Assert.Equal(16, firstLine.Words.Count);
+            var firstLineFirstWord = firstLine.Words.First();
+            Assert.Equal("And ", firstLineFirstWord.Text);
+            Assert.Equal(10.56, firstLineFirstWord.StartSecond);
+            Assert.Equal(10.64, firstLineFirstWord.EndSecond);
+            var firstLineLastWord = firstLine.Words.Last();
+            Assert.Equal("come", firstLineLastWord.Text);
+            Assert.Equal(18.8, firstLineLastWord.StartSecond);
+            Assert.Equal(19.04, firstLineLastWord.EndSecond);
+        }
+
+        [Fact]
+        public void ShouldOutputAllOnOneLineIfNoInput()
+        {
+            var importer = new NfaCtmImporter();
+
+            var resultingLines = importer.ImportNfaCtmAndLyrics(sampleCtmLines, null);
+
+            Assert.Single(resultingLines);
+
+            var firstLine = resultingLines[0];
+            Assert.Equal(16, firstLine.Words.Count);
+            var firstLineFirstWord = firstLine.Words.First();
+            Assert.Equal("And ", firstLineFirstWord.Text);
+            Assert.Equal(10.56, firstLineFirstWord.StartSecond);
+            Assert.Equal(10.64, firstLineFirstWord.EndSecond);
+            var firstLineLastWord = firstLine.Words.Last();
+            Assert.Equal("come", firstLineLastWord.Text);
+            Assert.Equal(18.8, firstLineLastWord.StartSecond);
+            Assert.Equal(19.04, firstLineLastWord.EndSecond);
+        }
+    }
+}
diff --git a/KaddaOK.Library/KnownOriginalLyrics.cs b/KaddaOK.Library/KnownOriginalLyrics.cs
index 9ddf214..e8c9096 100644
--- a/KaddaOK.Library/KnownOriginalLyrics.cs
+++ b/KaddaOK.Library/KnownOriginalLyrics.cs
@@ -4,16 +4,29 @@ namespace KaddaOK.Library
 {
     public class KnownOriginalLyrics
     {
-        public List<string>? Lyrics { get; }
+        private static readonly string unguardedDashRegex = "(?<=[0-9A-Za-z])(?<!\\|)-(?!\\|)(?=[0-9A-Za-z])";
+        private static readonly string unguardedDashReplacement = "/-";
+
+        public List<string>? SeparatorCleansedLines { get; }
+        public List<string>? UncleansedLines { get; }
 
         private KnownOriginalLyrics(string? lyrics)
         {
-            Lyrics = lyrics?.Split(Environment.NewLine).Where(l => !string.IsNullOrWhiteSpace(l)).Select(l => l.Trim()).ToList() ?? new List<string>();
+            UncleansedLines = lyrics?
+                .Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(s => AdjustSeparators(s.Trim()))
+                .ToList()
+                ?? new List<string>();
+            SeparatorCleansedLines = UncleansedLines.Select(s => s.Replace("|", "").Replace("/", "")).ToList();
+        }
+
+        private string AdjustSeparators(string input)
+        {
+            return Regex.Replace(input, unguardedDashRegex, unguardedDashReplacement);
         }
         public static KnownOriginalLyrics FromText(string? text)
         {
-            var lyrics = Regex.Replace(text?.Replace("/", "") ?? "", @"\r\n|\n\r|\n|\r", "\r\n");
-            return new KnownOriginalLyrics(lyrics);
+            return new KnownOriginalLyrics(text);
         }
         public static KnownOriginalLyrics FromFilePath(string? filePath)
         {
@@ -30,7 +43,7 @@ public static KnownOriginalLyrics FromFilePath(string? filePath)
             return KnownOriginalLyrics.FromText(lyrics);
         }
 
-        public List<string>? DistinctLines => Lyrics?.Distinct().ToList();
+        public List<string>? DistinctLines => SeparatorCleansedLines?.Distinct().ToList();
 
         public string? DistinctLinesAsText => DistinctLines != null ? string.Join(Environment.NewLine, DistinctLines) : null;
 
diff --git a/KaddaOK.Library/LineSplitter.cs b/KaddaOK.Library/LineSplitter.cs
index eb35121..3d2bcd6 100644
--- a/KaddaOK.Library/LineSplitter.cs
+++ b/KaddaOK.Library/LineSplitter.cs
@@ -4,15 +4,21 @@ namespace KaddaOK.Library
 {
     public interface ILineSplitter
     {
-        void SplitLineAt(ObservableCollection<LyricLine>? allLines, LyricWord wordToSplit, bool splitBefore);
-        void DeleteWord(ObservableCollection<LyricLine> allLines, LyricWord wordToDelete);
+        void SplitLineAt<TList, TItem>(ObservableCollection<TList>? allLines, TItem wordToSplit, bool splitBefore)
+            where TItem : LyricWord
+            where TList : ILyricLine<TItem>, new();
+        void DeleteWord<TList, TItem>(ObservableCollection<TList> allLines, TItem wordToDelete)
+            where TItem : LyricWord
+            where TList : ILyricLine<TItem>, new();
     }
 
     public class LineSplitter : ILineSplitter
     {
-        public void SplitLineAt(ObservableCollection<LyricLine>? allLines, LyricWord wordToSplit, bool splitBefore)
+        public void SplitLineAt<TList, TItem>(ObservableCollection<TList>? allLines, TItem wordToSplit, bool splitBefore)
+            where TItem : LyricWord
+            where TList : ILyricLine<TItem>, new()
         {
-            var originalLine = allLines?.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToSplit));
+            var originalLine = allLines.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToSplit));
             if (originalLine != null)
             {
                 var originalLineIndex = allLines!.IndexOf(originalLine);
@@ -25,20 +31,25 @@ public void SplitLineAt(ObservableCollection<LyricLine>? allLines, LyricWord wor
                         return;
                     }
 
-                    var newLine = new LyricLine
+                    var newLine = new TList
                     {
-                        IsSelected = originalLine.IsSelected,
-                        Words = new ObservableCollection<LyricWord>(originalLine.Words.Skip(originalWordIndex + (splitBefore ? 0 : 1)))
+                        Words = new ObservableCollection<TItem>(originalLine.Words.Skip(originalWordIndex + (splitBefore ? 0 : 1)))
                     };
+                    if (newLine is LyricLine newLyricLine && originalLine is LyricLine oldLyricLine)
+                    {
+                        newLyricLine.IsSelected = oldLyricLine.IsSelected;
+                    }
 
-                    originalLine.Words = new ObservableCollection<LyricWord>(originalLine.Words.Take(splitBefore ? originalWordIndex : originalWordIndex + 1));
+                    originalLine.Words = new ObservableCollection<TItem>(originalLine.Words.Take(splitBefore ? originalWordIndex : originalWordIndex + 1));
                     originalLine.Words.Last().Text = originalLine.Words.Last().Text?.TrimEnd();
                     allLines.Insert(originalLineIndex+1, newLine);
                 }
             }
         }
 
-        public void DeleteWord(ObservableCollection<LyricLine> allLines, LyricWord wordToDelete)
+        public void DeleteWord<TList, TItem>(ObservableCollection<TList> allLines, TItem wordToDelete)
+            where TItem : LyricWord
+            where TList : ILyricLine<TItem>, new()
         {
             var originalLine = allLines.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToDelete));
             if (originalLine?.Words != null)
diff --git a/KaddaOK.Library/LyricLine.cs b/KaddaOK.Library/LyricLine.cs
index bedd8ba..1584b12 100644
--- a/KaddaOK.Library/LyricLine.cs
+++ b/KaddaOK.Library/LyricLine.cs
@@ -1,11 +1,17 @@
 using Microsoft.CognitiveServices.Speech;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using KaddaOK.Library.Kbs;
 using KaddaOK.Library.Ytmm;
 
 namespace KaddaOK.Library
 {
-    public class LyricLine : ObservableBase, IAudioSpan
+    public interface ILyricLine<T> where T : LyricWord
+    {
+        ObservableCollection<T> Words { get; set; }
+    }
+
+    public class LyricLine : ObservableBase, IAudioSpan, ILyricLine<LyricWord>
     {
         public string? Text => string.Concat(Words.Select(w => w.Text));
 
@@ -48,11 +54,16 @@ public ObservableCollection<LyricWord> Words
             set
             {
                 SetProperty(ref words, value);
-                RaisePropertyChanged(nameof(StartSecond));
-                RaisePropertyChanged(nameof(EndSecond));
+                RaiseTimingChanged();
             }
         }
 
+        public void RaiseTimingChanged()
+        {
+            RaisePropertyChanged(nameof(StartSecond));
+            RaisePropertyChanged(nameof(EndSecond));
+        }
+
         public double StartSecond
         {
             get
@@ -121,6 +132,15 @@ public LyricLine()
             words = new ObservableCollection<LyricWord>();
         }
 
+        public static LyricLine FromIncomingSeparatedText(string text, double songLength)
+        {
+            return new LyricLine
+            {
+                Words = new ObservableCollection<LyricWord>(
+                    LyricWord.GetLyricWordsAcrossTime(text, songLength, songLength))
+            };
+        }
+
         public static void MoveSpacesToEndsOfWords(IList<LyricWord> words)
         {
             for (int i = 0; i < words.Count; i++)
diff --git a/KaddaOK.Library/LyricWord.cs b/KaddaOK.Library/LyricWord.cs
index 3b4cecf..89f92bc 100644
--- a/KaddaOK.Library/LyricWord.cs
+++ b/KaddaOK.Library/LyricWord.cs
@@ -30,5 +30,32 @@ public LyricWord(WordLevelTimingResult fromAzure)
             Text = fromAzure.Word;
         }
         public LyricWord() {}
+
+        public static List<LyricWord> GetLyricWordsAcrossTime(string? enteredText, double startTime, double endTime)
+        {
+            var fullWords = enteredText?.Split(' ') ?? new[] { enteredText };
+            var syllables = fullWords
+                .SelectMany(f => (f + " ")
+                    .Split('|', '/'))
+                .Where(w => !string.IsNullOrWhiteSpace(w))
+                .ToList();
+            var availableTime = endTime - startTime;
+            var eachSyllableGets = Math.Round(availableTime / (double)syllables.Count, 2);
+            var currentTime = Math.Round(startTime, 2);
+            var listOfNewWords = new List<LyricWord>();
+            for (int i = 0; i < syllables.Count; i++)
+            {
+                var newWord = new LyricWord
+                {
+                    Text = syllables[i],
+                    StartSecond = currentTime
+                };
+                currentTime = Math.Round(currentTime + eachSyllableGets, 2);
+                newWord.EndSecond = currentTime;
+                listOfNewWords.Add(newWord);
+            }
+
+            return listOfNewWords;
+        }
     }
 }
diff --git a/KaddaOK.Library/NfaCtmImporter.cs b/KaddaOK.Library/NfaCtmImporter.cs
index a289a96..0d42aae 100644
--- a/KaddaOK.Library/NfaCtmImporter.cs
+++ b/KaddaOK.Library/NfaCtmImporter.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace KaddaOK.Library
+namespace KaddaOK.Library
 {
     public interface INfaCtmImporter
     {
@@ -14,12 +8,8 @@ public class NfaCtmImporter : INfaCtmImporter
     {
         public List<LyricLine> ImportNfaCtmAndLyrics(List<string> ctmLines, List<string>? originalLyrics)
         {
-            if (originalLyrics == null)
-            {
-                throw new InvalidOperationException(
-                    "System is not designed to parse NFA output without access to the lyric lines that fed it, sorry");
-            }
             var lines = new List<LyricLine>();
+            originalLyrics ??= new List<string>();
 
             // constants that could change with CTM formatting versions:
             var expectedPartsCount = 5;
@@ -30,25 +20,44 @@ public List<LyricLine> ImportNfaCtmAndLyrics(List<string> ctmLines, List<string>
 
             var currentExpectedLineIndex = 0;
             var currentLine = new LyricLine();
+
+            var noMoreOriginalLyrics = !originalLyrics.Any();
+
             for (var i = 0; i < ctmLines.Count(); i++)
             {
-                if (currentExpectedLineIndex > originalLyrics.Count() - 1)
-                {
-                    // we must be at the end
-                    break;
-                }
-
+                // we expect each row of a CTM to be expectedPartsCount space-separated values
                 var parts = ctmLines[i].Split(" ");
                 if (parts.Count() == expectedPartsCount)
                 {
+                    // parse start, length, and rawContent out of the current CTM row
                     var start = Decimal.Parse(parts[onsetTimeIndex]);
                     var length = Decimal.Parse(parts[tokenLengthIndex]);
                     var rawContent = parts[tokenContentIndex];
 
-                    if (rawContent.Trim() != breakContent) // this doesn't provide us useful data; we'll reach back if we want it
+                    // It seems like almost every row in the CTM has its own `<b>` row following it, which if we
+                    // actually honored as breaks, would be quite choppy. From experimenting with it a bit when I
+                    // first wrote this importer, it seemed like I got results that were closer to what I'd expect
+                    // if we let the *following* syllable absorb that extra time instead of adding it to the
+                    // *preceding* one (but this should be played around with and verified a lot more, and honestly
+                    // ideally we should accept a parameter to choose from a few diffrent modes of `<b>` handling
+                    // so people can experiment themselves, because I could be very wrong and it might give much
+                    // better results handled some other way... )
+                    // So we skip those as primary objects of the loop, and instead reach back for
+                    // them by `index--` when we're processing a row that does have actual text.
+                    // TODO: re-examine and/or make configurable the processing of `<b>` rows
+                    if (rawContent.Trim() != breakContent)
                     {
+                        // Underscores is what CTM (at least, NeMo Forced Aligner in English) does with spaces
+                        // (which we'll flip to the other side of words after we're finished parsing)
                         var cleanedContent = rawContent.Replace("▁", " ");
+
                         var startTime = start;
+                        // If this isn't the first syllable in the line, we should check to see if the previous 
+                        // row was a `<b>` and if so steal its startTime instead of using what this row claims.
+                        // (we don't do it when this is the first syllable of a line, because that would pull 
+                        // in the gap between lines.  And that's another problem with not having the original
+                        // lines of lyrics to go off of. Maybe we should re-examine this algorithm's assumptions
+                        // about the accuracy of `<b>`'s, as this may turn out real bad in some cases...)
                         if (currentLine.Words.Any())
                         {
                             var previous = ctmLines[i - 1];
@@ -59,19 +68,46 @@ public List<LyricLine> ImportNfaCtmAndLyrics(List<string> ctmLines, List<string>
                                 startTime = Decimal.Parse(previousParts[onsetTimeIndex]);
                             }
                         }
-                        currentLine.Words.Add(new LyricWord { StartSecond = (double)startTime, EndSecond = (double)(start + length), Text = cleanedContent });
 
-                        if (currentLine.Text?.Trim().ToLowerInvariant() == originalLyrics[currentExpectedLineIndex].Trim().ToLowerInvariant())
+                        // anyway, let's add the current syllable to the line we're constructing
+                        currentLine.Words.Add(new LyricWord
+                        {
+                            StartSecond = (double)startTime, 
+                            EndSecond = (double)(start + length), 
+                            Text = cleanedContent
+                        });
+
+                        // If we've now constructed the full line (and there are any more of the line-break lyrics left) then we
+                        // save the current line and start a new one.
+                        // If we're out of line-broken lyrics, or never received any to begin with, then everything remaining 
+                        // in the CTM will continue to get added to the same line, which we'll add after the whole loop.
+                        if (!noMoreOriginalLyrics 
+                            && currentLine.Text?.Trim().ToLowerInvariant() == originalLyrics[currentExpectedLineIndex].Trim().ToLowerInvariant())
                         {
                             currentExpectedLineIndex++;
                             lines.Add(currentLine);
-                            currentLine = new LyricLine();
+                            if (currentExpectedLineIndex <= originalLyrics.Count() - 1)
+                            {
+                                currentLine = new LyricLine();
+                            }
+                            else
+                            {
+                                noMoreOriginalLyrics = true;
+                            }
                         }
                     }
                 }
             }
 
-            // this results in spaces in front of the words, and I prefer them to be behind them so let's change that
+            // If we still have a line we haven't added to the parsed list yet (either because we ran out of lyrics, or 
+            // the lyrics stopped matching up at some point) here's where we make sure we include it
+            if (currentLine.Words.Any() && !lines.Contains(currentLine))
+            {
+                lines.Add(currentLine);
+            }
+
+            // As mentioned above, this process results in spaces in front of the words, and everything else expects them 
+            // to be on the end of words, so let's go through and flip that around.
             foreach (var line in lines)
             {
                 for (var i = 0; i < line.Words.Count; i++)
diff --git a/KaddaOK.Library/RzProjectGenerator.cs b/KaddaOK.Library/RzProjectGenerator.cs
index 14a74df..954dd9d 100644
--- a/KaddaOK.Library/RzProjectGenerator.cs
+++ b/KaddaOK.Library/RzProjectGenerator.cs
@@ -90,7 +90,7 @@ public RzProject GenerateProject(string rzlrcFileName,
                     eMediaType = 6,
                     eMediaTypeLine = (int)RzLinesSpec.Text0,
                     dxScale = 1,
-                    dyScale = 1, 
+                    dyScale = 1,
                     dzScale = 1,
                     source = rzlrcFileName
                 });
@@ -202,12 +202,12 @@ public RzProject GenerateProject(string rzlrcFileName,
         }
 
         public void InsertProgressBars(
-                                            RzProject project, 
-                                            List<LyricLine> lyrics, 
+                                            RzProject project,
+                                            List<LyricLine> lyrics,
                                             decimal minimumGapLength,
-                                            int width, 
-                                            int height, 
-                                            int yPosition,  
+                                            int width,
+                                            int height,
+                                            int yPosition,
                                             SKColor fill,
                                             SKColor outline,
                                             int screenWidth = 1920)
@@ -238,13 +238,13 @@ public void InsertProgressBars(
         }
 
         public RzLineItem GenerateProgressBar(
-                                                decimal startTime, 
-                                                decimal endTime, 
-                                                int width, 
-                                                int height, 
-                                                int yPosition, 
-                                                SKColor fill, 
-                                                SKColor outline, 
+                                                decimal startTime,
+                                                decimal endTime,
+                                                int width,
+                                                int height,
+                                                int yPosition,
+                                                SKColor fill,
+                                                SKColor outline,
                                                 int screenWidth = 1920)
         {
             var barMargin = (screenWidth - width) / 2;
@@ -273,7 +273,7 @@ public RzLineItem GenerateProgressBar(
                             nShapeType=1,
                             nOutlineWidth=4,
                             nOutlineType=0,
-                            bSmooth=1,
+                            bSmooth=0,
                             Points = new List<GraffitiPoint>
                             {
                                 new()
@@ -302,7 +302,7 @@ public RzLineItem GenerateProgressBar(
                             nShapeType=1,
                             nOutlineWidth=4,
                             nOutlineType=2,
-                            bSmooth=1,
+                            bSmooth=0,
                             Points = new List<GraffitiPoint>
                             {
                                 new()
diff --git a/KaddaOK.Library/WordMerger.cs b/KaddaOK.Library/WordMerger.cs
index 2bcba5e..24ee59d 100644
--- a/KaddaOK.Library/WordMerger.cs
+++ b/KaddaOK.Library/WordMerger.cs
@@ -4,31 +4,36 @@ namespace KaddaOK.Library
 {
     public interface IWordMerger
     {
-        LyricWord MergeWord(ObservableCollection<LyricLine>? allLines, LyricWord wordToMerge, bool withWordBefore);
+        (TList? resultingLine, TItem? resultingWord) MergeWord<TList, TItem>(ObservableCollection<TList> allLines, TItem wordToMerge, bool withWordBefore)
+            where TItem : LyricWord, new()
+            where TList : ILyricLine<TItem>, new();
     }
 
     public class WordMerger : IWordMerger
     {
-        public LyricWord? MergeWord(ObservableCollection<LyricLine>? allLines, LyricWord wordToMerge, bool withWordBefore)
+        public (TList? resultingLine, TItem? resultingWord) MergeWord<TList, TItem>
+            (ObservableCollection<TList> allLines, TItem wordToMerge, bool withWordBefore)
+            where TItem : LyricWord, new()
+            where TList : ILyricLine<TItem>, new()
         {
-            var originalLine = allLines?.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToMerge));
+            var originalLine = allLines.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToMerge));
             if (originalLine == null)
             {
-                return null;
+                return (default, default);
             }
 
             var originalLineIndex = allLines!.IndexOf(originalLine);
 
             if (originalLine.Words == null)
             {
-                return null;
+                return (default, default);
             }
 
             var originalWordIndex = originalLine.Words.IndexOf(wordToMerge);
             if ((withWordBefore && originalWordIndex < 1)
                 || (!withWordBefore && originalWordIndex == originalLine.Words.Count - 1))
             {
-                return null; // I don't wanna.  TODO: I guess this would move the word to the line in question?
+                return (default, default); // I don't wanna.  TODO: I guess this would move the word to the previous line...
             }
 
             // either we're merging with the word with the previous index or the next index
@@ -37,18 +42,18 @@ public class WordMerger : IWordMerger
             var firstWord = originalLine.Words[firstWordIndex];
             var secondWord = originalLine.Words[secondWordIndex];
 
-            var replacementWord = new LyricWord
+            var replacementWord = new TItem
             {
                 StartSecond = firstWord.StartSecond,
                 EndSecond = secondWord.EndSecond,
                 Text = $"{firstWord.Text.TrimEnd()}{secondWord.Text.TrimStart()}"
             };
 
-            originalLine.Words = new ObservableCollection<LyricWord>(
+            originalLine.Words = new ObservableCollection<TItem>(
                 originalLine.Words.Take(firstWordIndex).Concat(new[] { replacementWord })
                     .Concat(originalLine.Words.Skip(secondWordIndex + 1)));
 
-            return replacementWord;
+            return (originalLine, replacementWord);
         }
     }
 }