diff --git a/Mirivoice/App.axaml.cs b/Mirivoice/App.axaml.cs
index 7b4c8f8..8f2234b 100644
--- a/Mirivoice/App.axaml.cs
+++ b/Mirivoice/App.axaml.cs
@@ -65,9 +65,10 @@ public override void OnFrameworkInitializationCompleted()
                     
                 }
             }
-            mainviewModel.OnPropertyChanged((mainviewModel.Title));
+            mainWindow.Content = new MainView(mainviewModel);
             mainWindow.DataContext = mainviewModel;
-            desktop.MainWindow = mainWindow; 
+            mainviewModel.OnPropertyChanged((mainviewModel.Title));
+            desktop.MainWindow = mainWindow;
         }
         
         base.OnFrameworkInitializationCompleted();
diff --git a/Mirivoice/Commands/AddLineBoxReceiver.cs b/Mirivoice/Commands/AddLineBoxCommand.cs
similarity index 75%
rename from Mirivoice/Commands/AddLineBoxReceiver.cs
rename to Mirivoice/Commands/AddLineBoxCommand.cs
index 49a577e..a462b41 100644
--- a/Mirivoice/Commands/AddLineBoxReceiver.cs
+++ b/Mirivoice/Commands/AddLineBoxCommand.cs
@@ -3,21 +3,20 @@
 
 namespace Mirivoice.Commands
 {
-    public class AddLineBoxReceiver : MReceiver
+    public class AddLineBoxCommand : ICommand
     {
         private readonly MainViewModel v;
         private int LineBoxIndexLastAdded;
-        public AddLineBoxReceiver(MainViewModel mainViewModel)
+        public AddLineBoxCommand(MainViewModel mainViewModel)
         {
             v = mainViewModel;
         }
 
-        public override void DoAction()
+        public void Execute(bool isRedoing)
         {
-
-            var lineBox = new LineBoxView(v); 
+            var lineBox = new LineBoxView(v);
             int LineNoToBeAdded = v.LineBoxCollection.Count + 1;
-        
+
             lineBox.viewModel.SetLineNo(LineNoToBeAdded);
             lineBox.ShouldPhonemizeWhenSelected = true;
 
@@ -26,7 +25,7 @@ public override void DoAction()
             lineBox.ScrollToEnd();
         }
 
-        public override void UndoAction()
+        public void UnExecute()
         {
             if (LineBoxIndexLastAdded < 0)
                 return;
@@ -37,5 +36,6 @@ public override void UndoAction()
         }
 
 
+
     }
 }
diff --git a/Mirivoice/Commands/AddLineBoxesReceiver.cs b/Mirivoice/Commands/AddLineBoxesCommand.cs
similarity index 92%
rename from Mirivoice/Commands/AddLineBoxesReceiver.cs
rename to Mirivoice/Commands/AddLineBoxesCommand.cs
index 81371b9..f047dff 100644
--- a/Mirivoice/Commands/AddLineBoxesReceiver.cs
+++ b/Mirivoice/Commands/AddLineBoxesCommand.cs
@@ -10,7 +10,7 @@
 
 namespace Mirivoice.Commands
 {
-    public class AddLineBoxesReceiver : MReceiver
+    public class AddLineBoxesCommand : ICommand
     {
         private MainViewModel v;
         private int InitialEndOfLineBoxCollection;
@@ -20,23 +20,19 @@ public class AddLineBoxesReceiver : MReceiver
         int DefaultVoicerMetaOriginal;
         
 
-        public AddLineBoxesReceiver(MainViewModel mainViewModel)
+        public AddLineBoxesCommand(MainViewModel mainViewModel)
         {
             v = mainViewModel;
             InitialEndOfLineBoxCollection = v.LineBoxCollection.Count - 1; // if undo, remove all lineboxes after this index
 
             DefaultVoicerOriginal = MainManager.Instance.DefaultVoicerIndex;
             DefaultVoicerMetaOriginal = MainManager.Instance.DefaultMetaIndex;
-        }
 
-        public void SetScript(string newscript) // should be called when script is changed
-        {
-            script = newscript;
+            script = v.mTextBoxEditor.CurrentScript;
             InitialEndOfLineBoxCollection = v.LineBoxCollection.Count - 1; // if undo, remove all lineboxes after this index
-            
         }
 
-        public override void DoAction()
+        public void Execute(bool isRedoing)
         {
             string pattern = @"\[(?<nickname>[^\]]+)\](?:\s*\((?<style>[^\)]+)\))?";
             var regex = new Regex(pattern);
@@ -72,7 +68,7 @@ public override void DoAction()
                 }
                 else
                 {
-                    
+
                     AddLineBox(line.Trim());
                     results.Add(line.Trim());
                 }
@@ -81,14 +77,21 @@ public override void DoAction()
 
             MainManager.Instance.DefaultVoicerIndex = DefaultVoicerOriginal;
             MainManager.Instance.DefaultMetaIndex = DefaultVoicerMetaOriginal;
+        }
+
+        public void SetScript(string newscript) // should be called when script is changed
+        {
+            script = newscript;
+            InitialEndOfLineBoxCollection = v.LineBoxCollection.Count - 1; // if undo, remove all lineboxes after this index
             
         }
 
-        public override void UndoAction()
+
+        public void UnExecute()
         {
             for (int i = v.LineBoxCollection.Count - 1; i > InitialEndOfLineBoxCollection; i--)
             {
-                
+
 
                 if (v.CurrentLineBox == v.LineBoxCollection[i])
                 {
@@ -104,7 +107,6 @@ public override void UndoAction()
                 v.LineBoxCollection.RemoveAt(i);
             }
         }
-        
 
 
 
diff --git a/Mirivoice/Commands/DelLineBoxReceiver.cs b/Mirivoice/Commands/DelLineBoxCommand.cs
similarity index 89%
rename from Mirivoice/Commands/DelLineBoxReceiver.cs
rename to Mirivoice/Commands/DelLineBoxCommand.cs
index de8a306..3c66178 100644
--- a/Mirivoice/Commands/DelLineBoxReceiver.cs
+++ b/Mirivoice/Commands/DelLineBoxCommand.cs
@@ -7,7 +7,7 @@
 
 namespace Mirivoice.Commands
 {
-    public class DelLineBoxReceiver : MReceiver
+    public class DelLineBoxCommand : ICommand
     {
         private MainViewModel v;
         private LineBoxView l;
@@ -21,13 +21,13 @@ public class DelLineBoxReceiver : MReceiver
 
         private SingleLineEditorView lastEditor;
 
-        public DelLineBoxReceiver(MainViewModel mainViewModel, LineBoxView l)
+        public DelLineBoxCommand(MainViewModel mainViewModel, LineBoxView l)
         {
             this.l = l;
             v = mainViewModel;
         }
 
-        public override void DoAction()
+        public void Execute(bool isRedoing)
         {
             lastLineBox = l; // backup
             LineBoxIndexLastDeleted = Int32.Parse(l.viewModel.LineNo) - 1;
@@ -36,7 +36,7 @@ public override void DoAction()
             RefreshLineNos(control);
 
 
-            
+
 
             v.LineBoxCollection.RemoveAt(RemoveIndex);
 
@@ -46,8 +46,8 @@ public override void DoAction()
                 v.CurrentSingleLineEditor = null;
                 lastResults = new ObservableCollection<MResult>(l.MResultsCollection);
                 v.MResultsCollection.Clear();
-                
-               if (v.CurrentEditIndex == 1)
+
+                if (v.CurrentEditIndex == 1)
                 {
                     v.CurrentEdit = null;
                     v.OnPropertyChanged(nameof(v.CurrentEdit));
@@ -56,12 +56,10 @@ public override void DoAction()
 
             RefreshLineNos(control);
             v.OnPropertyChanged(nameof(v.CurrentSingleLineEditor));
-
         }
 
-        public override void UndoAction()
+        public void UnExecute()
         {
-            
             v.LineBoxCollection.Insert(LineBoxIndexLastDeleted, lastLineBox);
             RefreshLineNos(control);
             if (lastEditor != null)
@@ -79,6 +77,7 @@ public override void UndoAction()
 
             }
         }
+        
 
         void RefreshLineNos(ItemsControl i)
         {
diff --git a/Mirivoice/Commands/DuplicateLineBoxReceiver.cs b/Mirivoice/Commands/DuplicateLineBoxCommand.cs
similarity index 88%
rename from Mirivoice/Commands/DuplicateLineBoxReceiver.cs
rename to Mirivoice/Commands/DuplicateLineBoxCommand.cs
index 0982d8f..3446d9c 100644
--- a/Mirivoice/Commands/DuplicateLineBoxReceiver.cs
+++ b/Mirivoice/Commands/DuplicateLineBoxCommand.cs
@@ -6,16 +6,16 @@
 
 namespace Mirivoice.Commands
 {
-    public class DuplicateLineBoxReceiver : MReceiver
+    public class DuplicateLineBoxCommand : ICommand
     {
         private LineBoxView l;
         private int LineBoxIndexLastAdded;
-        public DuplicateLineBoxReceiver(LineBoxView l)
+        public DuplicateLineBoxCommand(LineBoxView l)
         {
             this.l = l;
         }
 
-        public override void DoAction()
+        public void Execute(bool isRedoing)
         {
             MLinePrototype mLinePrototype = new MLinePrototype(l);
             int LineNoToBeAdded = Int32.Parse(l.viewModel.LineNo);
@@ -31,7 +31,7 @@ public override void DoAction()
                 metaIndex++;
             }
             var lineBox = new LineBoxView(mLinePrototype, l.v, LineNoToBeAdded + 1, l.viewModel.voicerSelector.CurrentDefaultVoicerIndex, metaIndex, true);
-            
+
 
             l.v.LineBoxCollection.Insert(LineNoToBeAdded, lineBox);
             LineBoxIndexLastAdded = LineNoToBeAdded;
@@ -39,8 +39,7 @@ public override void DoAction()
             RefreshLineNos();
 
         }
-
-        public override void UndoAction()
+        public void UnExecute()
         {
             if (LineBoxIndexLastAdded < 0)
                 return;
diff --git a/Mirivoice/Commands/LockLineBoxCommand.cs b/Mirivoice/Commands/LockLineBoxCommand.cs
new file mode 100644
index 0000000..3bb0fc6
--- /dev/null
+++ b/Mirivoice/Commands/LockLineBoxCommand.cs
@@ -0,0 +1,30 @@
+using Mirivoice.Views;
+using System;
+
+namespace Mirivoice.Commands
+{
+    [Obsolete("[still working class]")]
+    public class LockLineBoxCommand : ICommand
+    {
+        // Still implementing 
+        LineBoxView l;
+
+        public LockLineBoxCommand(LineBoxView lineBoxView)
+        {
+            l = lineBoxView;
+        }
+
+
+        public void Execute(bool isRedoing)
+        {
+            l.UnLock(false);
+        }
+
+        public void UnExecute()
+        {
+            l.UnLock(true);
+        }
+
+
+    }
+}
diff --git a/Mirivoice/Commands/LockLineBoxReceiver.cs b/Mirivoice/Commands/LockLineBoxReceiver.cs
deleted file mode 100644
index e9f7435..0000000
--- a/Mirivoice/Commands/LockLineBoxReceiver.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Mirivoice.Views;
-
-namespace Mirivoice.Commands
-{
-    public class LockLineBoxReceiver : MReceiver
-    {
-
-        LineBoxView l;
-
-        public LockLineBoxReceiver(LineBoxView lineBoxView)
-        {
-            l = lineBoxView;
-        }
-
-
-        public override void DoAction()
-        {
-            l.UnLock(false);
-            
-        }
-
-        public override void UndoAction()
-        {
-            l.UnLock(true);
-        }
-
-    }
-}
diff --git a/Mirivoice/Commands/MCommand.cs b/Mirivoice/Commands/MCommand.cs
index 8746348..5301b9f 100644
--- a/Mirivoice/Commands/MCommand.cs
+++ b/Mirivoice/Commands/MCommand.cs
@@ -1,5 +1,8 @@
-namespace Mirivoice.Commands
+using System;
+
+namespace Mirivoice.Commands
 {
+    [Obsolete("This class will be obsolete, use ICommand instead")]
     public class MCommand : ICommand
     {
         private readonly MReceiver _receiver;
diff --git a/Mirivoice/Commands/MOriginator.cs b/Mirivoice/Commands/MOriginator.cs
index c2b82c9..858790b 100644
--- a/Mirivoice/Commands/MOriginator.cs
+++ b/Mirivoice/Commands/MOriginator.cs
@@ -3,6 +3,7 @@
 
 namespace Mirivoice.Commands
 {
+    [Obsolete("This class will be obsolete, use ICommand instead")]
     public class MOriginator<T>
     {
         protected T obj;
diff --git a/Mirivoice/Commands/MReceiver.cs b/Mirivoice/Commands/MReceiver.cs
index 8cc8692..f0f86d2 100644
--- a/Mirivoice/Commands/MReceiver.cs
+++ b/Mirivoice/Commands/MReceiver.cs
@@ -3,6 +3,7 @@
 
 namespace Mirivoice.Commands
 {
+    [Obsolete("This class will be obsolete, use ICommand instead")]
     public abstract class MReceiver
     {
         protected readonly List<object> _data = new List<object>();
diff --git a/Mirivoice/Commands/Memento.cs b/Mirivoice/Commands/Memento.cs
index 64973cc..7538772 100644
--- a/Mirivoice/Commands/Memento.cs
+++ b/Mirivoice/Commands/Memento.cs
@@ -27,6 +27,8 @@ public T Pop()
             return states.Pop();
         }
 
+        public bool CanPop => states.Count > 0;
+
         public int Count => states.Count;
         public override string ToString()
         {
diff --git a/Mirivoice/Commands/MementoCommand.cs b/Mirivoice/Commands/MementoCommand.cs
index 5ff6fdf..871782a 100644
--- a/Mirivoice/Commands/MementoCommand.cs
+++ b/Mirivoice/Commands/MementoCommand.cs
@@ -1,7 +1,9 @@
 using Serilog;
+using System;
 
 namespace Mirivoice.Commands
 {
+    [Obsolete("This class will be obsolete, use ICommand with Memento instead")]
     public class MementoCommand<T> : ICommand
     {
         // Handles undo/redo in combobox, textbox, etc.
diff --git a/Mirivoice/Commands/SetComboboxOriginator.cs b/Mirivoice/Commands/SetComboboxOriginator.cs
deleted file mode 100644
index 50d7391..0000000
--- a/Mirivoice/Commands/SetComboboxOriginator.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Mirivoice.Mirivoice.Core.Format;
-
-namespace Mirivoice.Commands
-{
-    public class SetProsodyOriginator : MOriginator<int>
-    {
-        private int index;
-
-        private readonly MResult v;
-
-        public SetProsodyOriginator(ref int index, MResult v) : base(ref index)
-        {
-            this.index = index;
-            this.v = v;
-        }
-
-
-        public override void UpdateProperties()
-        {
-            //Log.Debug("[Updating Properties] -- {obj}", obj);
-            v.NotProcessingSetProsodyCommand = true; // prevent recursion loop
-            v.Prosody = obj;
-        }
-    }
-}
diff --git a/Mirivoice/Commands/SetProsodyCommand.cs b/Mirivoice/Commands/SetProsodyCommand.cs
new file mode 100644
index 0000000..7b392b0
--- /dev/null
+++ b/Mirivoice/Commands/SetProsodyCommand.cs
@@ -0,0 +1,55 @@
+using Mirivoice.Mirivoice.Core.Format;
+using Mirivoice.ViewModels;
+using Serilog;
+
+namespace Mirivoice.Commands
+{
+    public class SetProsodyCommand : ICommand
+    {
+        // TODO
+        private MResult v;
+
+        int undoMem;
+        int redoMem;
+
+        bool isFirstExec = true;
+        public void Execute(bool isRedoing)
+        {
+            if (isRedoing)
+            {
+                Log.Debug($"Redo: {redoMem}");
+                v.DonotExecCommand = true;
+                v.Prosody = redoMem;
+                v.DonotExecCommand = false;
+
+            }
+            else
+            {
+                if (!isFirstExec)
+                {
+                    undoMem = v.Prosody;
+                }
+                isFirstExec = false;
+                Log.Debug($"Execute: undo: {undoMem}, redo: {redoMem}");
+            }
+        }
+
+        public void UnExecute()
+        {
+
+            redoMem = v.Prosody;
+            v.DonotExecCommand = true;
+            v.Prosody = undoMem;
+            v.DonotExecCommand = false;
+            Log.Debug($"Undo: undo: {undoMem} redo: {redoMem}");
+
+
+        }
+        public SetProsodyCommand(MResult v)
+        {
+            this.v = v;
+            undoMem = v.Prosody;
+        }
+    }
+
+}
diff --git a/Mirivoice/Commands/TextBoxEditCommand.cs b/Mirivoice/Commands/TextBoxEditCommand.cs
new file mode 100644
index 0000000..692335a
--- /dev/null
+++ b/Mirivoice/Commands/TextBoxEditCommand.cs
@@ -0,0 +1,57 @@
+using Avalonia;
+using Mirivoice.ViewModels;
+using Serilog;
+
+namespace Mirivoice.Commands
+{
+    public class TextBoxEditCommand : ICommand
+    {
+        private VoicerSelectingViewModelBase v;
+
+        Memento<string> undoMem = new Memento<string>();
+        Memento<string> redoMem = new Memento<string>();
+
+
+        bool isFirstExec = true;
+        public void Execute(bool isRedoing)
+        {
+            if (isRedoing)
+            {
+                Log.Debug($"Redo: {redoMem}");
+                if (!redoMem.CanPop) { return; }
+
+                v.mTextBoxEditor.DonotExecCommand = true;
+                v.mTextBoxEditor.CurrentScript = redoMem.Pop();
+                v.mTextBoxEditor.DonotExecCommand = false;
+
+            }
+            else
+            {
+                if (!isFirstExec)
+                {
+                    undoMem.Push(v.mTextBoxEditor.CurrentScript);
+                }
+                isFirstExec = false;
+                Log.Debug($"Execute: undo: {undoMem}, redo: {redoMem}");
+            }
+        }
+
+        public void UnExecute()
+        {
+            
+            redoMem.Push(v.mTextBoxEditor.CurrentScript);
+            if (!undoMem.CanPop) { return; }
+            v.mTextBoxEditor.DonotExecCommand = true;
+            v.mTextBoxEditor.CurrentScript = undoMem.Pop();
+            v.mTextBoxEditor.DonotExecCommand = false;
+            Log.Debug($"Undo: undo: {undoMem} redo: {redoMem}");
+            
+
+        }
+    public TextBoxEditCommand(VoicerSelectingViewModelBase v)
+        {
+            this.v = v;
+            undoMem.Push(v.mTextBoxEditor.CurrentScript);
+        }
+    }
+}
diff --git a/Mirivoice/Commands/TextBoxEditOriginator.cs b/Mirivoice/Commands/TextBoxEditOriginator.cs
deleted file mode 100644
index 402cd61..0000000
--- a/Mirivoice/Commands/TextBoxEditOriginator.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Mirivoice.ViewModels;
-using Serilog;
-
-namespace Mirivoice.Commands
-{
-    public class TextBoxEditOriginator : MOriginator<string>
-    {
-        private VoicerSelectingViewModelBase v;
-        private string script;
-        public TextBoxEditOriginator(VoicerSelectingViewModelBase v, ref string script) : base(ref script)
-        {
-            this.script = script;
-            this.v = v;
-        }
-
-        public override void UpdateProperties()
-        {
-
-            //Log.Debug("[Updating Properties] -- {obj}", obj);
-            v.NotProcessingSetScriptCommand = true; // prevent recursion loop
-            v.mTextBoxEditor.CurrentScript = obj;
-
-        }
-    }
-}
diff --git a/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs b/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs
index 352b28e..3d7c765 100644
--- a/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs
+++ b/Mirivoice/Mirivoice.Core/Editor/MTextBoxEditor.cs
@@ -10,12 +10,8 @@ namespace Mirivoice.Mirivoice.Core.Editor
     public partial class MTextBoxEditor : ReactiveObject, INotifyPropertyChanged
     {
         string _currentScript;
-        string lastScript;
         VoicerSelectingViewModelBase v;
-        bool init = false;
-
-        public MementoCommand<string> TextBoxEditCommand { get; set; }
-        TextBoxEditOriginator textBoxEditOriginator;
+        bool IsFirstExec = true;
 
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -29,28 +25,18 @@ public MTextBoxEditor()
         {
             //Log.Debug("MTextBoxEditor Constructor -- default");
             this._currentScript = string.Empty;
-            this.lastScript = string.Empty;
-            init = false;
         }
-
-        public MTextBoxEditor(VoicerSelectingViewModelBase v, ref string _currentScript, ref string lastScript)
+        public TextBoxEditCommand textBoxEditCommand;
+        public MTextBoxEditor(VoicerSelectingViewModelBase v, string _currentScript)
         {
             //Log.Debug("MTextBoxEditor Constructor");
             this.v = v;
             
             this._currentScript = _currentScript;
-            this.lastScript = lastScript;
-            textBoxEditOriginator = new TextBoxEditOriginator(v, ref _currentScript);
-            TextBoxEditCommand = new MementoCommand<string>(textBoxEditOriginator);
             
-
-            init = true;
         }
 
-
-
-
-        bool Undobackuped = false;
+        public bool DonotExecCommand = false;
 
         public string CurrentScript
         {
@@ -60,51 +46,17 @@ public string CurrentScript
             }
             set
             {
-                if (!init)
+                if (IsFirstExec)
                 {
-                    //Log.Debug("MTextBoxEditor not fully initialized");
-                    return;
+                    textBoxEditCommand = new TextBoxEditCommand(v);
+                    IsFirstExec = false;
                 }
-                
-                if ( value != null)
-                {
-                    if (value == _currentScript)
-                    {
-                        Log.Debug("CurrentScript was same as lastScript");
-                        return;
-                    }
-                    lastScript = _currentScript;
-
-                    //Log.Debug("CurrentScript: {value}", value);
-
-                    //Log.Debug($"LastScript: {lastScript}");
-                    //Log.Debug($"NotProCessingCommand: {v.NotProcessingSetScriptCommand}");
-
-
-                    if (!v.NotProcessingSetScriptCommand)
-                    {
-                        if (!Undobackuped)
-                        {
-                            //Log.Debug($"backup : {lastScript}");
-
-                            TextBoxEditCommand.Backup(lastScript);
-                            Undobackuped = true;
-                        }
-                        MainManager.Instance.cmd.ExecuteCommand(TextBoxEditCommand);
-
-                        Undobackuped = false;
-                    }
-                    else
-                    {
-                        v.NotProcessingSetScriptCommand = false;
-
-                    }
-                    this.RaiseAndSetIfChanged(ref _currentScript, value);
-
-                    OnPropertyChanged(nameof(CurrentScript));
-                }
-
 
+                
+                this.RaiseAndSetIfChanged(ref _currentScript, value);
+                if (!DonotExecCommand) 
+                    MainManager.Instance.cmd.ExecuteCommand(textBoxEditCommand);
+                OnPropertyChanged(nameof(CurrentScript));
             }
         }
 
diff --git a/Mirivoice/Mirivoice.Core/Format/MResult.cs b/Mirivoice/Mirivoice.Core/Format/MResult.cs
index a93a873..7544849 100644
--- a/Mirivoice/Mirivoice.Core/Format/MResult.cs
+++ b/Mirivoice/Mirivoice.Core/Format/MResult.cs
@@ -46,8 +46,6 @@ public class MResult : VoicerSelectingViewModelBase
         public string Word { get; set; }
 
         public int _currentProsodyIndex;
-        public bool NotProcessingSetProsodyCommand = false;
-        int lastProsodyIndex;
         public override MTextBoxEditor mTextBoxEditor { get; set; }
 
         public override void OnStyleChanged() { }
@@ -99,6 +97,9 @@ public ImageBrush SpaceIcon
 
         bool UndobackupedProsody = false;
 
+        bool IsFirstExec = true;
+        public bool DonotExecCommand = false;
+        SetProsodyCommand setProsodyCommand;
         public int Prosody
         {
             get
@@ -111,29 +112,18 @@ public int Prosody
                 {
                     return;
                 }
-                lastProsodyIndex = _prosody;
-
-                
-
-                if (NotProcessingSetProsodyCommand)
+                if (IsFirstExec)
                 {
-                    if (!UndobackupedProsody)
-                    {
-
-
-                        setProsodyCommand.Backup(lastProsodyIndex);
-                        UndobackupedProsody = true;
-                    }
-                    MainManager.Instance.cmd.ExecuteCommand(setProsodyCommand);
-
-                    UndobackupedProsody = false;
+                    
+                    IsFirstExec = false;
                 }
-                else
-                {
-                    NotProcessingSetProsodyCommand = false;
 
-                }
+                setProsodyCommand = new SetProsodyCommand(this);
                 this.RaiseAndSetIfChanged(ref _prosody, value);
+                if (!DonotExecCommand)
+                    
+                    MainManager.Instance.cmd.ExecuteCommand(setProsodyCommand);
+
                 
                 OnPropertyChanged(nameof(Prosody));
 
@@ -155,7 +145,6 @@ public MResult(string word, string phoneme, bool isEditable, ProsodyType prosody
             Prosody = (int)prosodyType;
             SetIcons();
             this.l = l;
-            SetCommands();
         }
 
         public MResult(MResultPrototype mResultPrototype, LineBoxView l) : base(mResultPrototype.Phoneme, false)
@@ -165,7 +154,6 @@ public MResult(MResultPrototype mResultPrototype, LineBoxView l) : base(mResultP
             this.Prosody = mResultPrototype.ProsodyType;
             SetIcons();
             this.l = l;
-            SetCommands();
         }
 
         void SetIcons()
@@ -176,14 +164,6 @@ void SetIcons()
             SpaceIcon = MainManager.Instance.IconM.SpaceIcon;
         }
 
-        MOriginator<int> setProsodyOriginator;
-        MementoCommand<int> setProsodyCommand;
-        void SetCommands()
-        {
-            setProsodyOriginator = new SetProsodyOriginator(ref _prosody, this);
-            setProsodyCommand = new MementoCommand<int>(setProsodyOriginator);
-            NotProcessingSetProsodyCommand = true;
-        }
         public override void OnVoicerChanged(Voicer value) { }
         public override void OnVoicerCultureChanged(CultureInfo culture) { }
 
diff --git a/Mirivoice/ViewModels/MainViewModel.cs b/Mirivoice/ViewModels/MainViewModel.cs
index 2e90b55..d696e7b 100644
--- a/Mirivoice/ViewModels/MainViewModel.cs
+++ b/Mirivoice/ViewModels/MainViewModel.cs
@@ -419,13 +419,7 @@ public void StopAudio()
             MainManager.Instance.AudioM.StopAudio();
             MainWindowGetInput = true;
         }
-        public void OnAddButtonClick()
-        {
-            MainManager.Instance.DefaultVoicerIndex = voicerSelector.CurrentDefaultVoicerIndex;
-            MainManager.Instance.DefaultMetaIndex = voicerSelector.Voicers[voicerSelector.CurrentDefaultVoicerIndex]
-                .VoicerMetaCollection.IndexOf(voicerSelector.Voicers[voicerSelector.CurrentDefaultVoicerIndex].CurrentVoicerMeta);
-            MainManager.Instance.cmd.ExecuteCommand(AddLineBoxCommand);
-        }
+        
 
         private bool _isPlaying;
         public bool isPlaying {
@@ -669,15 +663,7 @@ public void OnStopButtonClick()
             EnablePreviewPlay = true;
         }
 
-        public void OnAddBoxesButtonClick()
-        {
-            addLineBoxesReceiver.SetScript(mTextBoxEditor.CurrentScript);
-            MainManager.Instance.DefaultVoicerIndex = voicerSelector.CurrentDefaultVoicerIndex;
-            MainManager.Instance.DefaultMetaIndex = voicerSelector.Voicers[voicerSelector.CurrentDefaultVoicerIndex]
-                .VoicerMetaCollection.IndexOf(voicerSelector.Voicers[voicerSelector.CurrentDefaultVoicerIndex].CurrentVoicerMeta);
-            
-            MainManager.Instance.cmd.ExecuteCommand(AddLineBoxesCommand);
-        }
+        
 
         public void OnUpdateCheckButtonClick()
         {
@@ -975,20 +961,9 @@ void SetGestures()
             }
         }
         // Commands
-        public MCommand AddLineBoxCommand { get; set; }
-        AddLineBoxReceiver addLineBoxReceiver;
-
-        public MCommand AddLineBoxesCommand { get; set; }
-        AddLineBoxesReceiver addLineBoxesReceiver;
-
-
         void SetCommands()
         {
-            addLineBoxReceiver = new AddLineBoxReceiver(this);
-            AddLineBoxCommand = new MCommand(addLineBoxReceiver);
 
-            addLineBoxesReceiver = new AddLineBoxesReceiver(this);
-            AddLineBoxesCommand = new MCommand(addLineBoxesReceiver);
         }
 
 
diff --git a/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs b/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs
index 30ad380..4e6c6b6 100644
--- a/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs
+++ b/Mirivoice/ViewModels/VoicerSelectingViewModelBase.cs
@@ -16,7 +16,7 @@ public abstract class VoicerSelectingViewModelBase: ViewModelBase
         protected int lastDefaultVoicerIndex;
 
 
-        public string _currentScript;
+        public string _currentScript = string.Empty;
         public bool NotProcessingSetScriptCommand = false;
         protected string lastScript;
         public abstract void OnStyleChanged();
@@ -39,7 +39,7 @@ public VoicerSelectingViewModelBase(bool useVoicerSelector=false)
             }
             
 
-            mTextBoxEditor = new MTextBoxEditor(this, ref _currentScript, ref lastScript);
+            mTextBoxEditor = new MTextBoxEditor(this, _currentScript);
             mTextBoxEditor.CurrentScript = string.Empty; // save undo history
         }
 
@@ -61,8 +61,7 @@ public VoicerSelectingViewModelBase(int voicerIndex, bool useVoicerSelector = fa
             }
 
 
-            mTextBoxEditor = new MTextBoxEditor(this, ref _currentScript, ref lastScript);
-            mTextBoxEditor.CurrentScript = string.Empty; // save undo history
+            mTextBoxEditor = new MTextBoxEditor(this, _currentScript);
         }
         public abstract void OnVoicerChanged(Voicer value);
         public abstract void OnVoicerCultureChanged(CultureInfo culture);
@@ -86,7 +85,7 @@ public VoicerSelectingViewModelBase(string initText, bool saveUndoAtInit, bool u
             _currentScript = initText;
             lastScript = initText;
             //Log.Debug($"VoicerSelectingViewModelBase Constructor -- using MTextBoxEditor {initText}, {_currentScript}");
-            mTextBoxEditor = new MTextBoxEditor(this, ref _currentScript, ref lastScript);
+            mTextBoxEditor = new MTextBoxEditor(this, _currentScript);
         }
 
     }
diff --git a/Mirivoice/Views/LineBoxView.axaml.cs b/Mirivoice/Views/LineBoxView.axaml.cs
index 253192b..edb99eb 100644
--- a/Mirivoice/Views/LineBoxView.axaml.cs
+++ b/Mirivoice/Views/LineBoxView.axaml.cs
@@ -291,28 +291,19 @@ public LineBoxView(MLinePrototype mLinePrototype, MainViewModel v, int index, in
             viewModel.OnStyleChanged();
         }
         // Commands
-        public MCommand DelLineBoxCommand { get; set; }
-        DelLineBoxReceiver delLineBoxReceiver;
-        
+
         public MCommand SwapLineBoxCommand { get; set; }
         SwapLineBoxReceiver swapLineBoxReceiver;
 
-        public MCommand DuplicateLineBoxCommand { get; set; }
-        DuplicateLineBoxReceiver duplicateLineBoxReceiver;
         //public MCommand LockLineBoxCommand { get; set; }
         //LockLineBoxReceiver lockLineBoxReceiver;
 
 
         public void SetCommands(MainViewModel v)
         {
-            delLineBoxReceiver = new DelLineBoxReceiver(v, this);
-            DelLineBoxCommand = new MCommand(delLineBoxReceiver);
 
             swapLineBoxReceiver = new SwapLineBoxReceiver(v);
             SwapLineBoxCommand = new MCommand(swapLineBoxReceiver);
-
-            duplicateLineBoxReceiver = new DuplicateLineBoxReceiver(this);
-            DuplicateLineBoxCommand = new MCommand(duplicateLineBoxReceiver);
             //lockLineBoxReceiver = new LockLineBoxReceiver(this);
             //LockLineBoxCommand = new MCommand(lockLineBoxReceiver);
         }
@@ -462,12 +453,14 @@ public void UnLock(bool isLocked = false)
 
         private void OnDeleteButtonClick(object sender, RoutedEventArgs e)
         {
-            MainManager.Instance.cmd.ExecuteCommand(DelLineBoxCommand);
+            DelLineBoxCommand delLineBoxCommand = new DelLineBoxCommand(v, this);
+            MainManager.Instance.cmd.ExecuteCommand(delLineBoxCommand);
             
         }
 
         private void OnDuplicateButtonClick(object sender, RoutedEventArgs e)
         {
+            DuplicateLineBoxCommand DuplicateLineBoxCommand = new DuplicateLineBoxCommand(this);
             MainManager.Instance.cmd.ExecuteCommand(DuplicateLineBoxCommand);
         }
 
diff --git a/Mirivoice/Views/MainView.axaml b/Mirivoice/Views/MainView.axaml
index 5448c78..0ead03a 100644
--- a/Mirivoice/Views/MainView.axaml
+++ b/Mirivoice/Views/MainView.axaml
@@ -127,7 +127,7 @@
 
 					</Grid>
 					<StackPanel Grid.ColumnSpan="2" Grid.Row="4" HorizontalAlignment="Stretch">
-						<Button Cursor="Hand" IsHitTestVisible="{Binding MainWindowGetInput}" Command="{Binding OnAddBoxesButtonClick}" Content="{DynamicResource editor.input.mult.genLines}" Height="40" VerticalContentAlignment="Center" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextBlock.TextAlignment="Center" FontSize="16" CornerRadius="25" MinWidth="140" Margin="13 0 13 0"></Button>
+						<Button Cursor="Hand" IsHitTestVisible="{Binding MainWindowGetInput}" Click="OnAddBoxesButtonClick" Content="{DynamicResource editor.input.mult.genLines}" Height="40" VerticalContentAlignment="Center" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextBlock.TextAlignment="Center" FontSize="16" CornerRadius="25" MinWidth="140" Margin="13 0 13 0"></Button>
 					</StackPanel>
 
 				</Grid>
@@ -136,7 +136,7 @@
 
 				<Panel Grid.Column="2">
 					<Grid RowDefinitions="20*, 80*" >
-						<Button IsHitTestVisible="{Binding MainWindowGetInput}" Focusable="False" Cursor="Hand"  Grid.Row="0" Command="{Binding OnAddButtonClick}" Background="LightSlateGray" Width="50" Height="50">
+						<Button IsHitTestVisible="{Binding MainWindowGetInput}" Focusable="False" Cursor="Hand"  Grid.Row="0" Click ="OnAddButtonClick" Background="LightSlateGray" Width="50" Height="50">
 							<Path Data="{StaticResource add_regular}" Fill="Wheat" Stretch="Fill"/>
 						</Button>
 
diff --git a/Mirivoice/Views/MainView.axaml.cs b/Mirivoice/Views/MainView.axaml.cs
index 77f7513..11d9f16 100644
--- a/Mirivoice/Views/MainView.axaml.cs
+++ b/Mirivoice/Views/MainView.axaml.cs
@@ -1,21 +1,45 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Mirivoice.Mirivoice.Core.Editor;
+using Mirivoice.Mirivoice.Core;
+using Mirivoice.ViewModels;
+using Avalonia.Interactivity;
+using Mirivoice.Commands;
 
 namespace Mirivoice.Views;
 
 public partial class MainView : UserControl
 {
-    public MainView()
+    private MainViewModel viewModel;
+    public MainView(MainViewModel v)
     {
-        InitializeComponent();
-        Setup();
+        InitializeComponent(v);
+    }
 
+    private void OnAddButtonClick(object sender, RoutedEventArgs e)
+    {
+        AddLineBoxCommand addLineBoxCommand = new AddLineBoxCommand(viewModel);
+        MainManager.Instance.DefaultVoicerIndex = viewModel.voicerSelector.CurrentDefaultVoicerIndex;
+        MainManager.Instance.DefaultMetaIndex = viewModel.voicerSelector.Voicers[viewModel.voicerSelector.CurrentDefaultVoicerIndex]
+            .VoicerMetaCollection.IndexOf(viewModel.voicerSelector.Voicers[viewModel.voicerSelector.CurrentDefaultVoicerIndex].CurrentVoicerMeta);
+        MainManager.Instance.cmd.ExecuteCommand(addLineBoxCommand);
     }
 
-    private void Setup()
+    private void OnAddBoxesButtonClick(object sender, RoutedEventArgs e)
     {
+        AddLineBoxesCommand addLineBoxesCommand = new AddLineBoxesCommand(viewModel);
+        MainManager.Instance.DefaultVoicerIndex = viewModel.voicerSelector.CurrentDefaultVoicerIndex;
+        MainManager.Instance.DefaultMetaIndex = viewModel.voicerSelector.Voicers[viewModel.voicerSelector.CurrentDefaultVoicerIndex]
+            .VoicerMetaCollection.IndexOf(viewModel.voicerSelector.Voicers[viewModel.voicerSelector.CurrentDefaultVoicerIndex].CurrentVoicerMeta);
+
+        MainManager.Instance.cmd.ExecuteCommand(addLineBoxesCommand);
     }
+    private void InitializeComponent(MainViewModel v)
+    {
+        this.DataContext = viewModel = v;
+        AvaloniaXamlLoader.Load(this);
 
+    }
 
 
     private void InitializeComponent()
diff --git a/Mirivoice/Views/MainWindow.axaml b/Mirivoice/Views/MainWindow.axaml
index c0d6b7d..4e1f9d8 100644
--- a/Mirivoice/Views/MainWindow.axaml
+++ b/Mirivoice/Views/MainWindow.axaml
@@ -17,5 +17,5 @@
 		<KeyBinding Gesture="{Binding SaveAsGesture}" Command="{Binding OnSaveAsButtonClick}" />
 		<KeyBinding Gesture="{Binding NewGesture}" Command="{Binding OnNewButtonClick}" />
 	</Window.KeyBindings>
-	<views:MainView />
+
 </Window>
\ No newline at end of file