diff --git a/Rubberduck.Core/App.cs b/Rubberduck.Core/App.cs
index 066061dc0d..3e2df344b7 100644
--- a/Rubberduck.Core/App.cs
+++ b/Rubberduck.Core/App.cs
@@ -5,12 +5,10 @@
 using Rubberduck.Common;
 using Rubberduck.Interaction;
 using Rubberduck.Settings;
-using Rubberduck.UI;
 using Rubberduck.UI.Command.MenuItems;
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/ParameterViewModel.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/ParameterViewModel.cs
index 68f97c810b..7182dd78df 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/ParameterViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/ParameterViewModel.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class ParameterViewModel : ViewModelBase
+    public class ParameterViewModel : ViewModelBase
     {
         private Parameter wrapped;
         internal Parameter Wrapped { get => wrapped; }
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersDialog.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersDialog.cs
index 36ed3882fe..45dcb6446c 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersDialog.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersDialog.cs
@@ -3,7 +3,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal sealed partial class RemoveParametersDialog : Form, IRefactoringDialog<RemoveParametersViewModel>
+    public sealed partial class RemoveParametersDialog : Form, IRefactoringDialog<RemoveParametersViewModel>
     {
         public RemoveParametersViewModel ViewModel { get; }
 
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
index b98d6c96e0..bd420a7f1d 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs
@@ -6,7 +6,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class RemoveParametersPresenter : IRemoveParametersPresenter
+    public class RemoveParametersPresenter : IRemoveParametersPresenter
     {
         private readonly IRefactoringDialog<RemoveParametersViewModel> _view;
         private readonly RemoveParametersModel _model;
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenterFactory.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenterFactory.cs
index 48221f6ff0..984b7f730e 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenterFactory.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenterFactory.cs
@@ -6,7 +6,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class RemoveParametersPresenterFactory : IRefactoringPresenterFactory<RemoveParametersPresenter>
+    public class RemoveParametersPresenterFactory : IRefactoringPresenterFactory<RemoveParametersPresenter>
     {
         private readonly IVBE _vbe;
         private readonly IRefactoringDialog<RemoveParametersViewModel> _view;
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml.cs
index 0564c42a98..35d87e97b1 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml.cs
@@ -16,7 +16,7 @@ public RemoveParametersView()
         private void ListBoxItem_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             var item = (ListBoxItem)sender;
-            var target = (Parameter)item.Content;
+            var target = (ParameterViewModel)item.Content;
 
             if (target.IsRemoved)
             {
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs
index d39124625b..7fb7533a82 100644
--- a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs
+++ b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs
@@ -10,7 +10,7 @@
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class RemoveParametersViewModel : ViewModelBase
+    public class RemoveParametersViewModel : ViewModelBase
     {
         public RubberduckParserState State { get; }
 
diff --git a/Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs b/Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs
index ac5344f4e9..9a5634222f 100644
--- a/Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs
+++ b/Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs
@@ -1,10 +1,10 @@
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Concrete;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.MoveCloserToUsage;
 using Rubberduck.Resources.Inspections;
-using Rubberduck.UI;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.QuickFixes
diff --git a/Rubberduck.Inspections/QuickFixes/RemoveUnusedParameterQuickFix.cs b/Rubberduck.Inspections/QuickFixes/RemoveUnusedParameterQuickFix.cs
index 4c91f24418..77017f84c4 100644
--- a/Rubberduck.Inspections/QuickFixes/RemoveUnusedParameterQuickFix.cs
+++ b/Rubberduck.Inspections/QuickFixes/RemoveUnusedParameterQuickFix.cs
@@ -1,9 +1,9 @@
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Concrete;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.RemoveParameters;
-using Rubberduck.UI;
 using Rubberduck.UI.Refactorings.RemoveParameters;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
diff --git a/Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs b/Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs
index e8414aed3a..ab6c2817a8 100644
--- a/Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs
+++ b/Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs
@@ -1,11 +1,11 @@
 using System.Globalization;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Concrete;
+using Rubberduck.Interaction;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.Resources;
-using Rubberduck.UI;
 using Rubberduck.UI.Refactorings.Rename;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
diff --git a/Rubberduck.Inspections/Rubberduck.Inspections.csproj b/Rubberduck.Inspections/Rubberduck.Inspections.csproj
index 254375e74d..7bd94daed4 100644
--- a/Rubberduck.Inspections/Rubberduck.Inspections.csproj
+++ b/Rubberduck.Inspections/Rubberduck.Inspections.csproj
@@ -204,14 +204,22 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj">
-      <Project>{A1587EAC-7B54-407E-853F-4C7493D0323E}</Project>
+      <Project>{a1587eac-7b54-407e-853f-4c7493d0323e}</Project>
       <Name>Rubberduck.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Rubberduck.Interaction\Rubberduck.Interaction.csproj">
+      <Project>{AC54B7FB-170D-4DA6-A30B-8CAD182F0E6B}</Project>
+      <Name>Rubberduck.Interaction</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj">
       <Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
       <Name>Rubberduck.Parsing</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Rubberduck.Refactorings\Rubberduck.Refactorings.csproj">
+      <Project>{D4B6A510-14E1-420A-A8D5-6A09890FD7D8}</Project>
+      <Name>Rubberduck.Refactorings</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj">
       <Project>{1B84B387-F7C4-4876-9BDF-C644C365359A}</Project>
       <Name>Rubberduck.Resources</Name>
diff --git a/Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs b/Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs
index 8af3336549..7ab9d80199 100644
--- a/Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs
+++ b/Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs
@@ -38,7 +38,7 @@ public void Refactor()
 
             if (!selection.HasValue)
             {
-                _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceField_Caption, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                _messageBox.NotifyWarn(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceField_Caption);
                 return;
             }
 
@@ -63,7 +63,7 @@ public void Refactor(Declaration target)
         {
             if (target.DeclarationType != DeclarationType.Variable)
             {
-                _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                _messageBox.NotifyWarn(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption);
                 throw new ArgumentException(@"Invalid declaration type", nameof(target));
             }
 
@@ -75,7 +75,7 @@ private void PromoteVariable(IModuleRewriter rewriter, Declaration target)
         {
             if (new[] { DeclarationType.ClassModule, DeclarationType.ProceduralModule }.Contains(target.ParentDeclaration.DeclarationType))
             {
-                _messageBox.Show(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                _messageBox.NotifyWarn(RubberduckUI.PromoteVariable_InvalidSelection, RubberduckUI.IntroduceParameter_Caption);
                 return;
             }
 
diff --git a/RubberduckTests/CodeExplorer/CodeExplorerTests.cs b/RubberduckTests/CodeExplorer/CodeExplorerTests.cs
index 0855213af0..35ef6ae0e8 100644
--- a/RubberduckTests/CodeExplorer/CodeExplorerTests.cs
+++ b/RubberduckTests/CodeExplorer/CodeExplorerTests.cs
@@ -19,6 +19,7 @@
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.ComManagement;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.CodeExplorer
 {
@@ -772,9 +773,7 @@ public void RemoveCommand_RemovesModuleWhenPromptOk()
             saveFileDialog.Setup(o => o.ShowDialog()).Returns(DialogResult.OK);
 
             var messageBox = new Mock<IMessageBox>();
-            messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>(), It.IsAny<MessageBoxDefaultButton>()))
-                .Returns(DialogResult.Yes);
+            messageBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
 
             var projectRepository = new ProjectsRepository(vbe.Object);
             using (var state = new RubberduckParserState(vbe.Object, projectRepository, new DeclarationFinderFactory(), vbeEvents.Object))
@@ -817,10 +816,7 @@ public void RemoveCommand_CancelsWhenFilePromptCancels()
             saveFileDialog.Setup(o => o.ShowDialog()).Returns(DialogResult.Cancel);
 
             var messageBox = new Mock<IMessageBox>();
-            messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(),
-                    It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>(), It.IsAny<MessageBoxDefaultButton>()))
-                .Returns(DialogResult.Yes);
+            messageBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(true);
 
             var projectRepository = new ProjectsRepository(vbe.Object);
             using (var state = new RubberduckParserState(vbe.Object, projectRepository, new DeclarationFinderFactory(), vbeEvents.Object))
@@ -863,10 +859,7 @@ public void RemoveCommand_GivenMsgBoxNO_RemovesModuleNoExport()
             saveFileDialog.Setup(o => o.ShowDialog()).Returns(DialogResult.OK);
 
             var messageBox = new Mock<IMessageBox>();
-            messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(),
-                    It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>(), It.IsAny<MessageBoxDefaultButton>()))
-                .Returns(DialogResult.No);
+            messageBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(false);
 
             var projectRepository = new ProjectsRepository(vbe.Object);
             using (var state = new RubberduckParserState(vbe.Object, projectRepository, new DeclarationFinderFactory(), vbeEvents.Object))
@@ -909,9 +902,7 @@ public void RemoveModule_Cancel()
             saveFileDialog.Setup(o => o.OverwritePrompt);
 
             var messageBox = new Mock<IMessageBox>();
-            messageBox.Setup(m =>
-                m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>(), It.IsAny<MessageBoxDefaultButton>())).Returns(DialogResult.Cancel);
+            messageBox.Setup(m => m.Confirm(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns((bool?)null);
 
             var projectRepository = new ProjectsRepository(vbe.Object);
             using (var state = new RubberduckParserState(vbe.Object, projectRepository, new DeclarationFinderFactory(), vbeEvents.Object))
diff --git a/RubberduckTests/Commands/FindAllImplementationsTests.cs b/RubberduckTests/Commands/FindAllImplementationsTests.cs
index 5ce1c5d5c1..10189a8178 100644
--- a/RubberduckTests/Commands/FindAllImplementationsTests.cs
+++ b/RubberduckTests/Commands/FindAllImplementationsTests.cs
@@ -12,6 +12,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Commands
 {
@@ -144,17 +145,13 @@ public void FindAllImplementations_NoResults_DisplayMessageBox()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var vm = new SearchResultsWindowViewModel();
                 var command = new FindAllImplementationsCommand(null, messageBox.Object, state, vbe.Object, vm, null, uiDispatcher.Object);
 
                 command.Execute(state.AllUserDeclarations.Single(s => s.IdentifierName == "Foo"));
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 
diff --git a/RubberduckTests/Commands/FindAllReferencesTests.cs b/RubberduckTests/Commands/FindAllReferencesTests.cs
index 25671abef6..8b8c4c675f 100644
--- a/RubberduckTests/Commands/FindAllReferencesTests.cs
+++ b/RubberduckTests/Commands/FindAllReferencesTests.cs
@@ -12,6 +12,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Commands
 {
@@ -91,9 +92,6 @@ public void FindAllReferences_NoResults_DisplayMessageBox()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var vm = new SearchResultsWindowViewModel();
                 var uiDispatcher = new Mock<IUiDispatcher>();
@@ -101,8 +99,7 @@ public void FindAllReferences_NoResults_DisplayMessageBox()
 
                 command.Execute(state.AllUserDeclarations.Single(s => s.IdentifierName == "Foo"));
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 
@@ -348,9 +345,6 @@ End Sub
                 AssertParserReady(state);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var vm = new SearchResultsWindowViewModel();
                 var uiDispatcher = new Mock<IUiDispatcher>();
@@ -359,8 +353,7 @@ End Sub
 
                 command.Execute(target);
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 
@@ -485,9 +478,6 @@ End Sub
                 AssertParserReady(state);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var vm = new SearchResultsWindowViewModel();
                 var uiDispatcher = new Mock<IUiDispatcher>();
@@ -496,8 +486,7 @@ End Sub
 
                 command.Execute(target);
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 
diff --git a/RubberduckTests/Commands/RefactorCommandTests.cs b/RubberduckTests/Commands/RefactorCommandTests.cs
index f3b99451f9..81f77f5321 100644
--- a/RubberduckTests/Commands/RefactorCommandTests.cs
+++ b/RubberduckTests/Commands/RefactorCommandTests.cs
@@ -8,6 +8,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Commands
 {
diff --git a/RubberduckTests/Commands/UnitTestCommandTests.cs b/RubberduckTests/Commands/UnitTestCommandTests.cs
index 2b1a500624..420af3a2d1 100644
--- a/RubberduckTests/Commands/UnitTestCommandTests.cs
+++ b/RubberduckTests/Commands/UnitTestCommandTests.cs
@@ -10,6 +10,7 @@
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Commands
 {
diff --git a/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs b/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs
index 481d1d82b6..bdccf19aa3 100644
--- a/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs
+++ b/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs
@@ -6,6 +6,7 @@
 using Rubberduck.Inspections.QuickFixes;
 using Rubberduck.UI;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.QuickFixes
 {
diff --git a/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs b/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs
index eaef12a07d..3f39c47ad9 100644
--- a/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs
+++ b/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs
@@ -6,6 +6,7 @@
 using Rubberduck.Inspections.QuickFixes;
 using Rubberduck.UI;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.QuickFixes
 {
diff --git a/RubberduckTests/Refactoring/ExtractInterfaceTests.cs b/RubberduckTests/Refactoring/ExtractInterfaceTests.cs
index 7ca04b6c30..8a53d7a59a 100644
--- a/RubberduckTests/Refactoring/ExtractInterfaceTests.cs
+++ b/RubberduckTests/Refactoring/ExtractInterfaceTests.cs
@@ -10,6 +10,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.UI.Refactorings.ExtractInterface;
 
 namespace RubberduckTests.Refactoring
 {
@@ -56,10 +57,6 @@ End Sub
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                foreach (var member in model.Members)
-                {
-                    member.IsSelected = true;
-                }
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -165,10 +162,6 @@ End Property
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                foreach (var member in model.Members)
-                {
-                    member.IsSelected = true;
-                }
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -253,13 +246,7 @@ End Function
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                foreach (var member in model.Members)
-                {
-                    if (!member.FullMemberSignature.Contains("Property"))
-                    {
-                        member.IsSelected = true;
-                    }
-                }
+                model.Members = model.Members.Where(member => !member.FullMemberSignature.Contains("Property")).ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -405,7 +392,7 @@ End Sub
 
                 //Specify Params to remove
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                model.Members.ElementAt(0).IsSelected = true;
+                model.Members = new[]{ model.Members.ElementAt(0) }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -437,7 +424,7 @@ public void Presenter_Reject_ReturnsNull()
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var model = new ExtractInterfaceModel(state, qualifiedSelection);
-                model.Members.ElementAt(0).IsSelected = true;
+                model.Members = new[] { model.Members.ElementAt(0) }.ToList();
 
                 var view = new Mock<IRefactoringDialog<ExtractInterfaceViewModel>>();
                 view.Setup(v => v.ViewModel).Returns(new ExtractInterfaceViewModel());
diff --git a/RubberduckTests/Refactoring/IntroduceFieldTests.cs b/RubberduckTests/Refactoring/IntroduceFieldTests.cs
index 780bcd852a..b4e8125408 100644
--- a/RubberduckTests/Refactoring/IntroduceFieldTests.cs
+++ b/RubberduckTests/Refactoring/IntroduceFieldTests.cs
@@ -10,6 +10,7 @@
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Refactoring
 {
@@ -368,15 +369,11 @@ public void IntroduceFieldRefactoring_DisplaysInvalidSelectionAndDoesNothingForF
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var refactoring = new IntroduceFieldRefactoring(vbe.Object, state, messageBox.Object);
                 refactoring.Refactor(qualifiedSelection);
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
                 Assert.AreEqual(inputCode, component.CodeModule.Content());
             }
         }
@@ -402,15 +399,11 @@ public void IntroduceFieldRefactoring_DisplaysInvalidSelectionAndDoesNothingForI
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var refactoring = new IntroduceFieldRefactoring(vbe.Object, state, messageBox.Object);
                 refactoring.Refactor(qualifiedSelection);
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
 
                 var actual = state.GetRewriter(component).GetText();
                 Assert.AreEqual(inputCode, actual);
@@ -467,8 +460,6 @@ public void IntroduceFieldRefactoring_PassInTarget_Nonvariable()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.OK);
 
                 var refactoring = new IntroduceFieldRefactoring(vbe.Object, state, messageBox.Object);
 
@@ -478,9 +469,7 @@ public void IntroduceFieldRefactoring_PassInTarget_Nonvariable()
                 }
                 catch (ArgumentException e)
                 {
-                    messageBox.Verify(m =>
-                        m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                            It.IsAny<MessageBoxIcon>()), Times.Once);
+                    messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
 
                     Assert.AreEqual("target", e.ParamName);
                     var actual = state.GetRewriter(component).GetText();
diff --git a/RubberduckTests/Refactoring/MoveCloserToUsageTests.cs b/RubberduckTests/Refactoring/MoveCloserToUsageTests.cs
index 21e51b210d..824fe0ad16 100644
--- a/RubberduckTests/Refactoring/MoveCloserToUsageTests.cs
+++ b/RubberduckTests/Refactoring/MoveCloserToUsageTests.cs
@@ -9,6 +9,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Refactoring
 {
@@ -587,15 +588,11 @@ public void MoveCloserToUsageRefactoring_NoReferences()
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var refactoring = new MoveCloserToUsageRefactoring(vbe.Object, state, messageBox.Object);
                 refactoring.Refactor(qualifiedSelection);
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once());
 
                 var rewriter = state.GetRewriter(component);
                 Assert.AreEqual(inputCode, rewriter.GetText());
@@ -625,15 +622,11 @@ End Sub
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>())).Returns(DialogResult.OK);
 
                 var refactoring = new MoveCloserToUsageRefactoring(vbe.Object, state, messageBox.Object);
                 refactoring.Refactor(qualifiedSelection);
 
-                messageBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                    It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once());
                 var rewriter = state.GetRewriter(component);
                 Assert.AreEqual(inputCode, rewriter.GetText());
             }
@@ -882,17 +875,13 @@ public void IntroduceFieldRefactoring_PassInTarget_Nonvariable()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.OK);
 
                 var refactoring = new MoveCloserToUsageRefactoring(vbe.Object, state, messageBox.Object);
                 refactoring.Refactor(state.AllUserDeclarations.First(d => d.DeclarationType != DeclarationType.Variable));
                 var rewriter = state.GetRewriter(component);
                 Assert.AreEqual(inputCode, rewriter.GetText());
 
-                messageBox.Verify(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
         }
 
@@ -914,17 +903,13 @@ public void IntroduceFieldRefactoring_InvalidSelection()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.OK);
 
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var refactoring = new MoveCloserToUsageRefactoring(vbe.Object, state, messageBox.Object);
                 refactoring.Refactor(qualifiedSelection);
 
-                messageBox.Verify(m =>
-                    m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
-                        It.IsAny<MessageBoxIcon>()), Times.Once);
+                messageBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
 
                 var rewriter = state.GetRewriter(component);
                 Assert.AreEqual(inputCode, rewriter.GetText());
diff --git a/RubberduckTests/Refactoring/RemoveParametersTests.cs b/RubberduckTests/Refactoring/RemoveParametersTests.cs
index 6349198cba..acaa3bd8ea 100644
--- a/RubberduckTests/Refactoring/RemoveParametersTests.cs
+++ b/RubberduckTests/Refactoring/RemoveParametersTests.cs
@@ -43,7 +43,6 @@ public void RemoveParametersRefactoring_RemoveBothParams()
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters.ForEach(arg => arg.IsRemoved = true);
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -80,7 +79,6 @@ public void RemoveParametersRefactoring_RemoveOnlyParam()
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters.ForEach(arg => arg.IsRemoved = true);
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -117,7 +115,7 @@ public void RemoveParametersRefactoring_RemoveFirstParam()
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -154,7 +152,7 @@ public void RemoveParametersRefactoring_RemoveSecondParam()
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -201,7 +199,7 @@ End Sub
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[2].IsRemoved = true;
+                model.Parameters =  new[] { model.Parameters[2] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -248,7 +246,7 @@ Sub goo()
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[2].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[2] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -285,7 +283,7 @@ public void RemoveParametersRefactoring_RemoveLastFromFunction()
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -322,7 +320,6 @@ public void RemoveParametersRefactoring_RemoveAllFromFunction()
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters.ForEach(p => p.IsRemoved = true);
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -369,7 +366,6 @@ End Sub
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters.ForEach(p => p.IsRemoved = true);
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -414,10 +410,12 @@ End Sub
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters.ElementAt(2).IsRemoved = true;
-                model.Parameters.ElementAt(3).IsRemoved = true;
-                model.Parameters.ElementAt(5).IsRemoved = true;
-
+                model.Parameters = new[] {
+                    model.Parameters.ElementAt(2),
+                    model.Parameters.ElementAt(3),
+                    model.Parameters.ElementAt(5),
+                }.ToList();
+                
                 //SetupFactory
                 var factory = SetupFactory(model);
 
@@ -453,7 +451,6 @@ public void RemoveParametersRefactoring_RemoveFromGetter()
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters.ForEach(p => p.IsRemoved = true);
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -529,7 +526,7 @@ public void RemoveParametersRefactoring_RemoveFirstParamFromSetter()
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -576,7 +573,7 @@ End Sub
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -627,7 +624,7 @@ End Sub
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -682,7 +679,7 @@ End Sub
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -729,7 +726,7 @@ End Sub
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -781,7 +778,7 @@ End Sub
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -841,7 +838,7 @@ End Sub
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -932,7 +929,7 @@ End Property
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -975,7 +972,7 @@ End Property
 
                 //Specify Param(s) to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1020,7 +1017,7 @@ End Sub
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1067,7 +1064,7 @@ Foo 1
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1116,7 +1113,7 @@ End Sub
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1174,7 +1171,7 @@ Foo 1
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1215,7 +1212,7 @@ public void RemoveParametersRefactoring_SignatureOnMultipleLines()
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1255,7 +1252,7 @@ public void RemoveParametersRefactoring_SignatureOnMultipleLines_RemoveSecond()
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1295,7 +1292,7 @@ public void RemoveParametersRefactoring_SignatureOnMultipleLines_RemoveLast()
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[2].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[2] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1335,7 +1332,7 @@ public void RemoveParametersRefactoring_PassTargetIn()
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1389,7 +1386,7 @@ End Sub
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1444,7 +1441,7 @@ public void RemoveParametersRefactoring_LastInterfaceParamRemoved()
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1500,7 +1497,7 @@ public void RemoveParametersRefactoring_LastInterfaceParamRemoved_Implementation
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1568,7 +1565,7 @@ public void RemoveParametersRefactoring_LastInterfaceParamRemoved_Implementation
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1625,7 +1622,7 @@ public void RemoveParametersRefactoring_LastEventParamRemoved()
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1681,7 +1678,7 @@ public void ReorderParametersRefactoring_LastEventParamRemoved_EventImplementati
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters.Last().IsRemoved = true;
+                model.Parameters = new[] { model.Parameters.Last() }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1737,7 +1734,7 @@ public void RemoveParametersRefactoring_LastEventParamRemoved_ParamsHaveDifferen
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1805,7 +1802,7 @@ public void RemoveParametersRefactoring_LastEventParamRemoved_ParamsHaveDifferen
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, null);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -1866,7 +1863,7 @@ public void RemoveParametersRefactoring_LastInterfaceParamsRemoved_AcceptPrompt(
 
                 //Specify Params to remove
                 var model = new RemoveParametersModel(state, qualifiedSelection, messageBox.Object);
-                model.Parameters[1].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[1] }.ToList();
 
                 //SetupFactory
                 var factory = SetupFactory(model);
@@ -2031,7 +2028,7 @@ public void Presenter_Accept_AutoMarksSingleParamAsRemoved()
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var model = new RemoveParametersModel(state, qualifiedSelection, new Mock<IMessageBox>().Object);
-                model.Parameters[0].IsRemoved = true;
+                model.Parameters = new[] { model.Parameters[0] }.ToList();
 
                 var factory = new RemoveParametersPresenterFactory(vbe.Object, null, state, null);
 
diff --git a/RubberduckTests/Refactoring/RenameTests.cs b/RubberduckTests/Refactoring/RenameTests.cs
index 9dd12ca477..e4d4abf2e6 100644
--- a/RubberduckTests/Refactoring/RenameTests.cs
+++ b/RubberduckTests/Refactoring/RenameTests.cs
@@ -14,6 +14,7 @@
 using System.Collections.Generic;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Refactorings.Rename;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Refactoring
 {
@@ -521,7 +522,7 @@ End Sub
             inputOutput.ControlNames.Add("cmdBtn1");
             PerformExpectedVersusActualRenameTests(tdo, inputOutput);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Never);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
 
         [Test, Ignore("")]
@@ -558,7 +559,7 @@ End Sub
             inputOutput.ControlNames.Add("cmdBtn1");
             PerformExpectedVersusActualRenameTests(tdo, inputOutput);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.OK, It.IsAny<MessageBoxIcon>()), Times.Never);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
 
         [Test, Ignore("")]
@@ -1060,7 +1061,7 @@ public void RenameRefactoring_RenameInterface()
             };
             PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutput2);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Never);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
 
         [Test]
@@ -1231,7 +1232,7 @@ End Sub
             };
             PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutputWithSelection, inputOutput3);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Once);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         [Test]
@@ -1309,7 +1310,7 @@ c1.Nothing 7
             };
             PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutputWithSelection, inputOutput3);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Once);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         [Test]
@@ -1329,7 +1330,7 @@ public void RenameRefactoring_RenameInterfaceNoImplementers()
             };
             PerformExpectedVersusActualRenameTests(tdo, inputOutput1);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Never);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
 
         [Test]
@@ -1493,7 +1494,7 @@ public void RenameRefactoring_RenameInterface_AcceptPrompt()
             };
             PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutput2);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()), Times.Once);
+            tdo.MsgBox.Verify(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         [Test]
@@ -1523,7 +1524,7 @@ public void RenameRefactoring_RenameInterface_RejectPrompt()
             tdo.MsgBoxReturn = DialogResult.No;
             PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutput2);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()), Times.Once);
+            tdo.MsgBox.Verify(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         #endregion
@@ -1633,8 +1634,7 @@ public void RenameRefactoring_RenameCodeModule()
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var msgbox = new Mock<IMessageBox>();
-                msgbox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.Yes);
+                msgbox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
 
                 var vbeWrapper = vbe.Object;
                 var model = new RenameModel(vbeWrapper, state, qualifiedSelection) { NewName = newName };
@@ -1671,8 +1671,7 @@ public void RenameRefactoring_RenameProject()
             {
 
                 var msgbox = new Mock<IMessageBox>();
-                msgbox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.Yes);
+                msgbox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
 
                 var vbeWrapper = vbe.Object;
                 var model = new RenameModel(vbeWrapper, state, default(QualifiedSelection)) { NewName = newName };
@@ -1726,7 +1725,7 @@ MsgBox CStr(Fruits.Apple)
             };
             PerformExpectedVersusActualRenameTests(tdo, inputOutput);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Never);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
 
         [Test]
@@ -1764,7 +1763,7 @@ MsgBox CStr(CranApple)
             };
             PerformExpectedVersusActualRenameTests(tdo, inputOutput);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Never);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
 
         #endregion
@@ -1802,7 +1801,7 @@ Exit Sub
             };
             PerformExpectedVersusActualRenameTests(tdo, inputOutput1);
 
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Never);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
         #endregion
         #region Property Tests
@@ -1878,7 +1877,7 @@ End Sub
                 ProjectName = projectName
             };
             PerformExpectedVersusActualRenameTests(tdo, classInputOutput, usageInputOutput, testLibraries: new[] { "VBA.4.2.xml" });
-            tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Never);
+            tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
         #endregion
 
@@ -1906,7 +1905,7 @@ public void RenameRefactoring_CheckAllRefactorCallPaths()
 
                 PerformExpectedVersusActualRenameTests(tdo, inputOutput);
 
-                tdo.MsgBox.Verify(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()), Times.Never);
+                tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
             }
         }
 
@@ -2075,8 +2074,7 @@ public void RenameRefactoring_RenameClassModule_DoesNotChangeMeReferences()
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
 
                 var msgbox = new Mock<IMessageBox>();
-                msgbox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.Yes);
+                msgbox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
 
                 var vbeWrapper = vbe.Object;
                 var model = new RenameModel(vbeWrapper, state, qualifiedSelection) { NewName = newName };
@@ -2158,8 +2156,8 @@ public void RenameRefactoring_RenameClassModule_DoesNotChangeMeReferences()
             }
 
             tdo.MsgBox = new Mock<IMessageBox>();
-            tdo.MsgBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
-                .Returns(tdo.MsgBoxReturn);
+            // FIXME this might be a bit broken now
+            tdo.MsgBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>())).Returns(tdo.MsgBoxReturn == DialogResult.Yes);
 
             tdo.VBE = tdo.VBE ?? BuildProject(tdo.ProjectName, tdo.ModuleTestSetupDefs);
             tdo.ParserState = MockParser.CreateAndParse(tdo.VBE, testLibraries: testLibraries);
@@ -2374,6 +2372,7 @@ public RenameTestsDataObject(string selection, string newName)
             public QualifiedSelection QualifiedSelection { get; set; }
             public RenameModel RenameModel { get; set; }
             public Mock<IMessageBox> MsgBox { get; set; }
+            [Obsolete] // FIXME replace with a more complete MessageBox modelling
             public DialogResult MsgBoxReturn { get; set; }
             public RefactorParams RefactorParamType { get; set; }
             public Selection? RawSelection { get; set; }
diff --git a/RubberduckTests/Refactoring/ReorderParametersTests.cs b/RubberduckTests/Refactoring/ReorderParametersTests.cs
index d853c17107..085682b129 100644
--- a/RubberduckTests/Refactoring/ReorderParametersTests.cs
+++ b/RubberduckTests/Refactoring/ReorderParametersTests.cs
@@ -11,6 +11,8 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
+using Rubberduck.Interaction;
+using Rubberduck.UI.Refactorings.ReorderParameters;
 
 namespace RubberduckTests.Refactoring
 {
@@ -800,7 +802,6 @@ End Sub
                 var factory = SetupFactory(model);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.OK, MessageBoxIcon.Warning)).Returns(DialogResult.OK);
 
                 var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, messageBox.Object, state.ProjectsProvider);
                 refactoring.Refactor(qualifiedSelection);
@@ -871,7 +872,6 @@ End Sub
                 var factory = SetupFactory(model);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.OK, MessageBoxIcon.Warning)).Returns(DialogResult.OK);
 
                 var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, messageBox.Object, state.ProjectsProvider);
                 refactoring.Refactor(qualifiedSelection);
@@ -956,7 +956,6 @@ End Sub
                 var factory = SetupFactory(model);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.OK, MessageBoxIcon.Warning)).Returns(DialogResult.OK);
 
                 var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, messageBox.Object, state.ProjectsProvider);
                 refactoring.Refactor(qualifiedSelection);
@@ -997,7 +996,6 @@ public void ReorderParams_MoveOptionalParamBeforeNonOptionalParamFails()
                 var factory = SetupFactory(model);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.OK, MessageBoxIcon.Warning)).Returns(DialogResult.OK);
 
                 var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, messageBox.Object, state.ProjectsProvider);
                 refactoring.Refactor(qualifiedSelection);
@@ -1393,9 +1391,7 @@ public void ReorderParametersRefactoring_InterfaceParamsSwapped_AcceptPrompt()
                 var module2 = project.Object.VBComponents[1].CodeModule;
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(
-                        m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.Yes);
+                messageBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
 
                 //Specify Params to remove
                 var model = new ReorderParametersModel(state, qualifiedSelection, messageBox.Object);
@@ -1442,8 +1438,7 @@ public void ReorderParametersRefactoring_ParamsSwapped_RejectPrompt()
                 var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(project.Object.VBComponents[0]), selection);
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.No);
+                messageBox.Setup(m => m.ConfirmYN(It.IsAny<string>(), It.IsAny<string>())).Returns(false);
 
                 //Specify Params to remove
                 var model = new ReorderParametersModel(state, qualifiedSelection, messageBox.Object);
@@ -1706,8 +1701,6 @@ public void Presenter_ParameterlessMemberCreatesNullModel()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.OK);
 
                 var factory = new ReorderParametersPresenterFactory(vbe.Object, null, state, messageBox.Object);
                 var presenter = factory.Create();
@@ -1735,8 +1728,6 @@ public void Presenter_SingleParameterMemberCreatesNullModel()
             {
 
                 var messageBox = new Mock<IMessageBox>();
-                messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(), It.IsAny<MessageBoxIcon>()))
-                    .Returns(DialogResult.OK);
 
                 var factory = new ReorderParametersPresenterFactory(vbe.Object, null, state, messageBox.Object);
                 var presenter = factory.Create();
diff --git a/RubberduckTests/RubberduckTests.csproj b/RubberduckTests/RubberduckTests.csproj
index 03ccaaf0cd..2be3ff2cfa 100644
--- a/RubberduckTests/RubberduckTests.csproj
+++ b/RubberduckTests/RubberduckTests.csproj
@@ -342,6 +342,10 @@
       <Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
       <Name>Rubberduck.Parsing</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Rubberduck.Refactorings\Rubberduck.Refactorings.csproj">
+      <Project>{d4b6a510-14e1-420a-a8d5-6a09890fd7d8}</Project>
+      <Name>Rubberduck.Refactorings</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Rubberduck.RegexAssistant\Rubberduck.RegexAssistant.csproj">
       <Project>{40cc03e3-756c-4674-af07-384115deaee2}</Project>
       <Name>Rubberduck.RegexAssistant</Name>
diff --git a/RubberduckTests/Settings/GeneralSettingsTests.cs b/RubberduckTests/Settings/GeneralSettingsTests.cs
index 084af83f79..0dbc166702 100644
--- a/RubberduckTests/Settings/GeneralSettingsTests.cs
+++ b/RubberduckTests/Settings/GeneralSettingsTests.cs
@@ -9,6 +9,7 @@
 using Rubberduck.UI;
 using Rubberduck.VBEditor.VBERuntime.Settings;
 using System;
+using Rubberduck.Interaction;
 
 namespace RubberduckTests.Settings
 {