From fa98b3e0f28227c3aaf286fd45648908de789a49 Mon Sep 17 00:00:00 2001
From: Nathan Wreggit <obbay2@hotmail.com>
Date: Mon, 27 Mar 2023 21:56:39 -0700
Subject: [PATCH] Update to be significantly more performant, add more useful
 features (#3)

* Update to be significantly more performant, add more useful features

* Add new user control

* Refactor so thatat all specific type transforms are more maintainable

* Fix READ of MLeader with Block contents
---
 FindAndReplaceCAD/CADUtil.cs                  | 105 ++++--------
 FindAndReplaceCAD/FindAndReplaceCAD.csproj    |  73 +++-----
 .../FindAndReplaceCAD.csproj.user             |   2 +-
 FindAndReplaceCAD/MainWindow.xaml             | 139 ++++++++-------
 FindAndReplaceCAD/MainWindow.xaml.cs          | 141 ++++++++++++---
 FindAndReplaceCAD/ObjectInformation.cs        |  82 +++++++--
 FindAndReplaceCAD/TypeUtil.cs                 | 121 ++++---------
 .../UserControl/FindAndReplace.xaml           |  48 ++++++
 .../UserControl/FindAndReplace.xaml.cs        |  26 +++
 FindAndReplaceCAD/Util/DBTextUtil.cs          |  53 ++++++
 FindAndReplaceCAD/Util/DimensionUtil.cs       |  65 +++++++
 FindAndReplaceCAD/Util/ITypeUtil.cs           |  39 +++++
 FindAndReplaceCAD/Util/MLeaderUtil.cs         | 160 ++++++++++++++++++
 FindAndReplaceCAD/Util/MTextUtil.cs           |  55 ++++++
 FindAndReplaceCAD/packages.config             |   6 -
 15 files changed, 809 insertions(+), 306 deletions(-)
 create mode 100644 FindAndReplaceCAD/UserControl/FindAndReplace.xaml
 create mode 100644 FindAndReplaceCAD/UserControl/FindAndReplace.xaml.cs
 create mode 100644 FindAndReplaceCAD/Util/DBTextUtil.cs
 create mode 100644 FindAndReplaceCAD/Util/DimensionUtil.cs
 create mode 100644 FindAndReplaceCAD/Util/ITypeUtil.cs
 create mode 100644 FindAndReplaceCAD/Util/MLeaderUtil.cs
 create mode 100644 FindAndReplaceCAD/Util/MTextUtil.cs
 delete mode 100644 FindAndReplaceCAD/packages.config

diff --git a/FindAndReplaceCAD/CADUtil.cs b/FindAndReplaceCAD/CADUtil.cs
index 782012d..4c2bcd0 100644
--- a/FindAndReplaceCAD/CADUtil.cs
+++ b/FindAndReplaceCAD/CADUtil.cs
@@ -2,7 +2,7 @@
 using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.EditorInput;
 using Autodesk.AutoCAD.Geometry;
-using Autodesk.AutoCAD.Runtime;
+using FindAndReplaceCAD.Util;
 using System;
 using System.Collections.Generic;
 
@@ -10,39 +10,7 @@ namespace CADApp
 {
     class CADUtil
     {
-		public static Handle StringToHandle(string strHandle)
-		{
-			Handle handle = new Handle();
-
-			try
-			{
-				Int64 nHandle = Convert.ToInt64(strHandle, 16);
-				handle = new Handle(nHandle);
-			}
-			catch (FormatException)
-			{
-			}
-			return handle;
-		}
-
-		public static ObjectId HandleToObjectId(Database db, Handle h)
-		{
-			ObjectId id = ObjectId.Null;
-			try
-			{
-				id = db.GetObjectId(false, h, 0);
-			}
-			catch (Autodesk.AutoCAD.Runtime.Exception x)
-			{
-				if (x.ErrorStatus != ErrorStatus.UnknownHandle)
-				{
-					throw x;
-				}
-			}
-			return id;
-		}
-
-		public static void WriteCADItems(IList<ObjectInformation> items)
+		public static void WriteCADItems(IEnumerable<ObjectInformation> items)
 		{
 			Database db = Application.DocumentManager.MdiActiveDocument.Database;
 
@@ -50,9 +18,24 @@ public static void WriteCADItems(IList<ObjectInformation> items)
 			{
 				foreach (ObjectInformation objInfo in items)
 				{
-					ObjectId id = HandleToObjectId(db, StringToHandle(objInfo.Id));
-					DBObject obj = myT.GetObject(id, OpenMode.ForWrite);
-					TypeUtil.WriteText(obj, objInfo.NewText);
+					ObjectId id = objInfo.Id;
+					if (TypeUtil.IsSupportedType(id))
+					{
+                        DBObject obj = myT.GetObject(id, OpenMode.ForWrite);
+
+                        TypeUtil.TypeInformation typeInfo = TypeUtil.GetTypeInformation(obj.Id);
+                        ITypeUtil typeUtil = typeInfo.TypeUtil;
+
+						if (typeUtil.CanTextBeEdited(obj))
+						{
+							typeUtil.WriteText(obj, objInfo.NewText, myT);
+						}
+
+						if (typeUtil.CanMaskBeEdited(obj))
+						{
+							typeUtil.WriteMask(obj, objInfo.NewMask);
+						}
+                    }					
 				}
 				myT.Commit();
 			}
@@ -76,13 +59,13 @@ public static IList<ObjectInformation> ReadCADItems()
 				// iterate through block table to locate objects
 				foreach (ObjectId id in btr)
 				{
-					// open each object to read
-					DBObject obj = myT.GetObject(id, OpenMode.ForRead);
-					if(TypeUtil.IsSupportedType(obj))
+					if (TypeUtil.IsSupportedType(id))
 					{
-						textFound.Add(new ObjectInformation(obj));
-					}
-
+                        // open each object to read
+                        DBObject obj = myT.GetObject(id, OpenMode.ForRead);
+						//string t = TypeUtil.GetText(obj, myT);
+                        textFound.Add(new ObjectInformation(obj, myT));
+                    }
 				}
 				myT.Commit();
 			}
@@ -110,7 +93,7 @@ public static string ReplaceWithCADEscapeCharacters(string data)
 		/// https://through-the-interface.typepad.com/through_the_interface/2012/12/zooming-panning-and-orbiting-the-current-autocad-view-using-net.html
 		/// </summary>
 		/// <param name="id">Id of the AutoCAD element</param>
-		public static void MoveViewPort(string id)
+		public static void MoveViewPort(ObjectId objId)
 		{
 			Database db = Application.DocumentManager.MdiActiveDocument.Database;
 			Editor ed = Application.DocumentManager.MdiActiveDocument.Editor;
@@ -119,34 +102,14 @@ public static void MoveViewPort(string id)
 			
 			using (Transaction myT = db.TransactionManager.StartTransaction())
 			{
-				ObjectId objId = HandleToObjectId(db, StringToHandle(id));
+				TypeUtil.TypeInformation t = TypeUtil.GetTypeInformation(objId);
+				ITypeUtil typeUtil = t.TypeUtil;
 				DBObject obj = myT.GetObject(objId, OpenMode.ForRead);
 
+				typeUtil.MoveViewPort(ed, view, myT, obj);
 
-				MText mtext = null;
-				if (obj is MLeader)
-				{
-					MLeader mLeader = obj as MLeader;
-					mtext = mLeader.MText;
-				}
-
-				if (obj is MText)
-				{
-					MText mText = obj as MText;
-					mtext = mText;
-                }
-
-				if (mtext != null)
-				{
-					ed.SetImpliedSelection(new[] { objId });
-					view.CenterPoint = new Point2d(mtext.Location.X, mtext.Location.Y);
-					view.Height = mtext.ActualHeight * 3;
-					view.Width = mtext.ActualWidth * 3;
-					ed.SetCurrentView(view);
-					ed.Regen(); // Update gizmos to be accurate after movement
-				}
-				myT.Commit();
-			}
-		}
-	}
+                myT.Commit();
+            }
+        }
+    }
 }
diff --git a/FindAndReplaceCAD/FindAndReplaceCAD.csproj b/FindAndReplaceCAD/FindAndReplaceCAD.csproj
index e304f8a..64fdff9 100644
--- a/FindAndReplaceCAD/FindAndReplaceCAD.csproj
+++ b/FindAndReplaceCAD/FindAndReplaceCAD.csproj
@@ -13,6 +13,8 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -55,75 +57,38 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AcCoreMgd, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.Core.24.2.0\lib\net47\AcCoreMgd.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AcCui, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AcCui.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AcDbMgd, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.Model.24.2.0\lib\net47\AcDbMgd.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="acdbmgdbrep, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.Model.24.2.0\lib\net47\acdbmgdbrep.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AcDx, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AcDx.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AcMgd, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AcMgd.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AcMr, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AcMr.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AcSeamless, Version=24.2.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AcSeamless.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AcTcMgd, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AcTcMgd.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AcWindows, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AcWindows.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AdUIMgd, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AdUIMgd.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AdUiPalettes, Version=24.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AdUiPalettes.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="AdWindows, Version=4.0.0.6, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoCAD.NET.24.2.0\lib\net47\AdWindows.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CAD.cs" />
     <Compile Include="CADUtil.cs" />
+    <Compile Include="UserControl\FindAndReplace.xaml.cs">
+      <DependentUpon>FindAndReplace.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ObjectInformation.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="TypeUtil.cs" />
+    <Compile Include="Util\DimensionUtil.cs" />
+    <Compile Include="Util\DBTextUtil.cs" />
+    <Compile Include="Util\MLeaderUtil.cs" />
+    <Compile Include="Util\MTextUtil.cs" />
+    <Compile Include="Util\ITypeUtil.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="UserControl\FindAndReplace.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -133,7 +98,9 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="AutoCAD.NET">
+      <Version>24.2.0</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/FindAndReplaceCAD/FindAndReplaceCAD.csproj.user b/FindAndReplaceCAD/FindAndReplaceCAD.csproj.user
index a1532db..581e742 100644
--- a/FindAndReplaceCAD/FindAndReplaceCAD.csproj.user
+++ b/FindAndReplaceCAD/FindAndReplaceCAD.csproj.user
@@ -18,7 +18,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <StartProgram>C:\Program Files\Autodesk\AutoCAD 2022\acad.exe</StartProgram>
-    <StartArguments>C:\Users\natha\OneDrive\Projects\AutoCAD\FindAndReplaceCAD\config\Drawing1.dwg /b C:\Users\natha\OneDrive\Projects\AutoCAD\FindAndReplaceCAD\config\script.scr /nologo</StartArguments>
+    <StartArguments>"C:\Users\natha\OneDrive\Desktop\CI-001 - Standard\CI-001.dwg" /b C:\Users\natha\OneDrive\Projects\AutoCAD\FindAndReplaceCAD\config\script.scr /nologo</StartArguments>
     <StartAction>Program</StartAction>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
diff --git a/FindAndReplaceCAD/MainWindow.xaml b/FindAndReplaceCAD/MainWindow.xaml
index 334f3bd..5351d49 100644
--- a/FindAndReplaceCAD/MainWindow.xaml
+++ b/FindAndReplaceCAD/MainWindow.xaml
@@ -3,86 +3,111 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:CADApp"
         mc:Ignorable="d"
         Title="Find and Replace"
         Height="800"
-        Width="918">
+        Width="918"
+        Name="MainControlWindow">
     <Window.Resources>
         <CollectionViewSource x:Key="ItemCollectionViewSource" CollectionViewType="ListCollectionView"/>
+        <Style TargetType="{x:Type Button}">
+            <Setter Property="Margin" Value="10,0,10,0" />
+            <Setter Property="Padding" Value="10,5,10,5" />
+            <Setter Property="FontSize" Value="14" />
+        </Style>
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="50" />
-            <RowDefinition Height="50" />
-            <RowDefinition Height="120" />
-            <RowDefinition Height="6*" />
-            <RowDefinition Height="50" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Grid Margin="10" Grid.Row="0">
-            <Grid.Resources>
-                <Style TargetType="{x:Type TextBox}">
-                    <Setter Property="Margin" Value="0,0,10,0" />
+        <local:FindAndReplace Grid.Row="0" Visibility="Collapsed" />
+        <Separator Grid.Row="1" Visibility="Collapsed"/>
+        <StackPanel Margin="10" Grid.Row="2" Orientation="Horizontal">
+            <StackPanel.Resources>
+                <Style TargetType="{x:Type CheckBox}">
+                    <Setter Property="Margin" Value="10,2,0,0" />
+                    <Setter Property="VerticalAlignment" Value="Center" />
                 </Style>
-            </Grid.Resources>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="100"/>
-            </Grid.ColumnDefinitions>
-            <TextBox Grid.Column="0" Text="{Binding FilterText}" VerticalContentAlignment="Center" FontSize="14" Name="findText"/>
-            <Button Content="Find" Grid.Column="1" FontSize="14" Name="findButton" Click="findButton_Click"/>
-        </Grid>
-        <Grid Margin="10" Grid.Row="1">
-            <Grid.Resources>
-                <Style TargetType="{x:Type TextBox}">
-                    <Setter Property="Margin" Value="0,0,10,0" />
-                </Style>
-            </Grid.Resources>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="100"/>
-            </Grid.ColumnDefinitions>
-            <TextBox Grid.Column="0" VerticalContentAlignment="Center" FontSize="14" Name="blah2"/>
-            <Button Content="Replace" Grid.Column="1" FontSize="14" Name="replaceButton"/>
-        </Grid>
-        <StackPanel Margin="10" Grid.Row="2">
+            </StackPanel.Resources>
             <Label FontWeight="Bold">Text Types</Label>
-            <CheckBox IsChecked="{Binding ShowText}" Name="showText" Checked="findButton_Click" Unchecked="findButton_Click">Show Single Line Text</CheckBox>
-            <CheckBox IsChecked="{Binding ShowMText}" Name="showMText" Checked="findButton_Click" Unchecked="findButton_Click">Show Multi-Line Text</CheckBox>
-            <CheckBox IsChecked="{Binding ShowMLeader}" Name="showMLeader" Checked="findButton_Click" Unchecked="findButton_Click">Show Multi-Leader Text</CheckBox>
-            <CheckBox IsChecked="{Binding ShowDimension}" Name="showDimension" Checked="findButton_Click" Unchecked="findButton_Click">Show Dimensions</CheckBox>
+            <CheckBox IsChecked="{Binding Path=ShowText, ElementName=MainControlWindow}" Content="Show Text"/>
+            <CheckBox IsChecked="{Binding Path=ShowMText, ElementName=MainControlWindow}" Content="Show Multi-Line Text" />
+            <CheckBox IsChecked="{Binding Path=ShowMLeader, ElementName=MainControlWindow}" Content="Show Multi-Leader Text" />
+            <CheckBox IsChecked="{Binding Path=ShowDimension, ElementName=MainControlWindow}" Content="Show Dimensions" />
+        </StackPanel>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,10,0,10">
+            <Button Content="Refresh" Click="refreshButton_Click"/>
         </StackPanel>
-        <DataGrid ItemsSource="{Binding Texts}" SelectionMode="Extended" CanUserResizeRows="False"  AutoGenerateColumns="False" Grid.Row="3">
+        <DataGrid RowDetailsVisibilityMode="Collapsed" Name="DataGrid" ItemsSource="{Binding Path=Texts, ElementName=MainControlWindow}" CurrentCellChanged="DataGrid_CurrentCellChanged" SelectedCellsChanged="DataGrid_SelectedCellsChanged" SelectionMode="Extended" CanUserResizeRows="False"  AutoGenerateColumns="False" Grid.Row="4">
             <DataGrid.Resources>
                 <Style TargetType="DataGridRow">
-                    <Setter Property="IsSelected"
-                    Value="{Binding IsSelected}" />
+                    <Setter Property="IsSelected" Value="{Binding IsSelected}" />
+                </Style>
+                <Style TargetType="CheckBox" x:Key="maskStyle">
+                    <Setter Property="IsEnabled" Value="{Binding CanBeMasked}"/>
+                    <Setter Property="IsChecked" Value="{Binding NewMask, UpdateSourceTrigger=PropertyChanged}"/>
+                </Style>
+                <Style TargetType="DataGridCell" x:Key="newMaskCellStyle">
+                    <Setter Property="Background" Value="{Binding HasMaskChanged}" />
                 </Style>
             </DataGrid.Resources>
+            <DataGrid.RowDetailsTemplate>
+                <DataTemplate>
+                    <StackPanel Margin="20,10">
+                        <TextBlock Text="Here are the details for the selected mountain:"/>
+                        <TextBlock Text="{Binding FriendlyType}"/>
+                        <TextBlock FontSize="13" Text="{Binding ContentType}"/>
+                        <TextBlock FontSize="13" Text="{Binding OriginalText}" TextWrapping="WrapWithOverflow" />
+                        <TextBlock FontSize="13" Text="{Binding Id}" />
+                    </StackPanel>
+                </DataTemplate>
+            </DataGrid.RowDetailsTemplate>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Original Text" Binding="{Binding OriginalText}" Width="1*" IsReadOnly="True" />
-                <DataGridTemplateColumn Width="75">
+                <DataGridTemplateColumn Width="100" CanUserResize="False" >
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Button Content="Details" FontSize="12" Click="btnDetails_Click" CommandParameter="{Binding Path=ID}"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTextColumn Header="Type" Binding="{Binding FriendlyType}" Width="115" IsReadOnly="True" CanUserResize="False" />
+                <DataGridTextColumn Header="Type" Binding="{Binding ContentType}" Width="50" IsReadOnly="True" CanUserResize="False" />
+                <DataGridTextColumn Header="Original Text" Binding="{Binding OriginalText}" Width="1*" IsReadOnly="True"  />
+                <DataGridTemplateColumn Width="75" CanUserResize="False" >
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Button Content="Go To" FontSize="12" Name="btnJumpTo" Click="btnJumpTo_Click"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Width="1*" Header="New Text">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <Button Content="Jump To" FontSize="12" Name="btnJumpTo" Click="btnJumpTo_Click"/>
+                            <TextBox Text="{Binding NewText}" Background="{Binding HasTextChanged}" IsEnabled="{Binding CanEditText}"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="New Text" Binding="{Binding NewText}" Width="1*" />
-                <DataGridTextColumn Header="Type" Binding="{Binding FriendlyType}" Width="1*" IsReadOnly="True" />
+                <DataGridCheckBoxColumn Header="Masked" Width="60" CanUserResize="False" ElementStyle="{StaticResource maskStyle}" EditingElementStyle="{StaticResource maskStyle}" CellStyle="{StaticResource newMaskCellStyle}" />
             </DataGrid.Columns>
         </DataGrid>
-        <Grid Margin="10" Grid.Row="4">
-            <Grid.Resources>
-                <Style TargetType="{x:Type Button}">
-                    <Setter Property="Margin" Value="2,0,2,0" />
-                </Style>
-            </Grid.Resources>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Button Content="Strip New Lines" Grid.Column="0" FontSize="12" Name="btnStrip" Click="btnStrip_Click"/>
-            <Button Content="Execute Changes" Grid.Column="2" FontSize="14" Name="btnExecuteChanges" Click="btnExecute_Click"/>
-        </Grid>
+        <UniformGrid Grid.Row="5" Visibility="{Binding Path=HasAnySelection, ElementName=MainControlWindow}" Rows="1" Columns="2" Margin="0,5,0,5">
+            <Button Content="Mask Selected" Name="btnMask" Click="btnMask_Click"/>
+            <Button Content="Unmask Selected" Click="btnUnmask_Click"/>
+        </UniformGrid>
+        <StackPanel Grid.Row="6" Orientation="Horizontal" Margin="0,5,0,5">
+            <Button Content="Strip New Lines" Click="btnStrip_Click"/>
+        </StackPanel>
+        <DockPanel Grid.Row="7" HorizontalAlignment="Stretch" Margin="0,5,0,5">
+            <Label Width="300" Content="{Binding Path=EditedAttributes, ElementName=MainControlWindow}" Margin="0,0,10,0" />
+            <Button Content="Execute Changes" Click="btnExecute_Click"/>
+        </DockPanel>
     </Grid>
 </Window>
diff --git a/FindAndReplaceCAD/MainWindow.xaml.cs b/FindAndReplaceCAD/MainWindow.xaml.cs
index fef2c13..2c428b0 100644
--- a/FindAndReplaceCAD/MainWindow.xaml.cs
+++ b/FindAndReplaceCAD/MainWindow.xaml.cs
@@ -1,7 +1,8 @@
 using Autodesk.AutoCAD.DatabaseServices;
-using System;
+using Autodesk.AutoCAD.EditorInput;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Data;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -12,30 +13,98 @@ namespace CADApp
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class MainWindow : Window, INotifyPropertyChanged
     {
-        // TODO: Add background mask
         // TODO: Apply same width to all selected boxes
-        private ObservableCollection<ObjectInformation> Test { get; set; } = new ObservableCollection<ObjectInformation>(CADUtil.ReadCADItems());
+        private ObservableCollection<ObjectInformation> Test { get; set; } = new ObservableCollection<ObjectInformation>();
 
-        public ICollectionView Texts { get; set; } 
-        public string FilterText { get; set; } = "";
-        public bool ShowText { get; set; } = true;
-        public bool ShowMText { get; set; } = true;
-        public bool ShowMLeader { get; set; } = true;
-        public bool ShowDimension { get; set; } = true;
+        public ICollectionView Texts { get; set; }
+
+        private bool _showText = true;
+        public bool ShowText { get { return _showText; } set { _showText = value; Texts?.Refresh(); } }
+
+        private bool _showMText = true;
+        public bool ShowMText { get { return _showMText; } set { _showMText = value; Texts?.Refresh(); } }
+
+        private bool _showMLeader = true;
+        public bool ShowMLeader { get { return _showMLeader; } set { _showMLeader = value; Texts?.Refresh(); } }
+
+        private bool _showDimension = true;
+        public bool ShowDimension { get { return _showDimension; } set { _showDimension = value; Texts?.Refresh(); } }
+
+        private string _visibility = System.Windows.Visibility.Collapsed.ToString();
+        public string HasAnySelection
+        {
+            get
+            {
+                return _visibility;
+            }
+            set
+            {
+                if (value != _visibility)
+                {
+                    _visibility = value;
+                    NotifyPropertyChanged(nameof(HasAnySelection));
+                }
+            }
+        }
+
+        private string _editedAttributes = "Edited 0 attributes on 0 records";
+        public string EditedAttributes
+        {
+            get
+            {
+                return _editedAttributes;
+            }
+            set
+            {
+                if (value != _editedAttributes)
+                {
+                    _editedAttributes = value;
+                    NotifyPropertyChanged(nameof(EditedAttributes));
+                }
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected void NotifyPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
 
         public MainWindow()
-        {     
-            InitializeComponent();
+        {
             Texts = CollectionViewSource.GetDefaultView(Test);
             Texts.Filter = FindFilter;
+            refreshData();
+
             DataContext = this;
+            InitializeComponent();
+        }
+
+        public void btnMask_Click(object sender, RoutedEventArgs e)
+        {
+            foreach (ObjectInformation item in Test.Where(item => item.IsSelected && item.CanBeMasked))
+            {
+                item.NewMask = true;
+            }
+        }
+
+        public void btnUnmask_Click(object sender, RoutedEventArgs e)
+        {
+            foreach (ObjectInformation item in Test.Where(item => item.IsSelected && item.CanBeMasked))
+            {
+                item.NewMask = false;
+            }
         }
 
         public void btnExecute_Click(object sender, RoutedEventArgs e)
         {
-            CADUtil.WriteCADItems(Test);
+            MessageBoxResult messageBoxResult = MessageBox.Show("Are you sure?", "Execute Confirmation", MessageBoxButton.YesNo);
+            
+            if (messageBoxResult == MessageBoxResult.Yes) {
+                CADUtil.WriteCADItems(Test.Where(item => item.IsSelected));
+            }
         }
 
         public void btnStrip_Click(object sender, RoutedEventArgs e)
@@ -53,6 +122,15 @@ private void btnJumpTo_Click(object sender, RoutedEventArgs e)
             CADUtil.MoveViewPort(info.Id);
         }
 
+        public void refreshButton_Click(object sender, RoutedEventArgs e)
+        {
+            MessageBoxResult messageBoxResult = MessageBox.Show("Are you sure? All edits made so far will be discarded.", "Refresh Confirmation", MessageBoxButton.YesNo);
+            if (messageBoxResult == MessageBoxResult.Yes)
+            {
+                refreshData();
+            }
+        }
+
         private bool FindFilter(object item)
         {
             bool shouldShow = true;
@@ -60,30 +138,53 @@ private bool FindFilter(object item)
 
             if (objInfo.Type == typeof(MText))
             {
-                shouldShow &= ShowMText;
+                return ShowMText;
             }
 
             if (objInfo.Type == typeof(MLeader))
             {
-                shouldShow &= ShowMLeader;
+                return ShowMLeader;
             }
 
             if (objInfo.Type == typeof(DBText))
             {
-                shouldShow &= ShowText;
+                return ShowText;
             }
 
             if (objInfo.Type == typeof(Dimension))
             {
-                shouldShow &= ShowDimension;
+                return ShowDimension;
             }
 
-            return shouldShow &= objInfo.OriginalText.Contains(FilterText);
+            return shouldShow;
+        }
+
+        private void DataGrid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
+        {
+            HasAnySelection = DataGrid.SelectedItems.Count > 1 ? 
+                System.Windows.Visibility.Visible.ToString() : System.Windows.Visibility.Collapsed.ToString();
+        }
+
+        private void refreshData()
+        {
+            Test.Clear();
+            foreach (var item in CADUtil.ReadCADItems())
+            {
+                Test.Add(item);
+            }
+        }
+
+        private void DataGrid_CurrentCellChanged(object sender, System.EventArgs e)
+        {
+            int recordsChanged = Test.Count(item => item.AttributesChanged() > 0);
+            int attributesChanged = Test.Sum(item => item.AttributesChanged());
+            EditedAttributes = $"Edited {attributesChanged} attributes on {recordsChanged} records";
         }
 
-        private void findButton_Click(object sender, RoutedEventArgs e)
+        private void btnDetails_Click(object sender, RoutedEventArgs e)
         {
-            Texts.Refresh();
+            DataGridRow dgr = DataGridRow.GetRowContainingElement((Button)sender);
+            DataGrid.SetDetailsVisibilityForItem(dgr, System.Windows.Visibility.Visible);
         }
     }
 }
diff --git a/FindAndReplaceCAD/ObjectInformation.cs b/FindAndReplaceCAD/ObjectInformation.cs
index 9b72879..ade94f9 100644
--- a/FindAndReplaceCAD/ObjectInformation.cs
+++ b/FindAndReplaceCAD/ObjectInformation.cs
@@ -1,18 +1,24 @@
 using Autodesk.AutoCAD.DatabaseServices;
+using FindAndReplaceCAD.Util;
 using System;
 using System.ComponentModel;
+using System.Windows.Media;
 
 namespace CADApp
 {
 	public class ObjectInformation : INotifyPropertyChanged
 	{
 		private string _newText;
+		private bool _newMask;
+
 		public bool IsSelected { get; set; }
 		public Type Type { get; }
 
 		public string FriendlyType { get; }
 
-		public string Id { get; }
+		public string ContentType { get; }
+
+		public ObjectId Id { get; }
 
 		public string OriginalText { get; }
 
@@ -27,29 +33,79 @@ public string NewText
 				if (value != _newText)
 				{
 					_newText = value;
-					NotifyPropertyChanged("NewText");
-				}
+					NotifyPropertyChanged(nameof(NewText));
+                    NotifyPropertyChanged(nameof(HasTextChanged));
+                }
+			}
+		}
+
+		public bool CanEditText { get; }
+
+		public bool OriginalMask { get; }
+
+		public bool NewMask { 
+			get
+			{
+				return _newMask;
+			}
+			set {
+                if (value != _newMask)
+                {
+                    _newMask = value;
+                    NotifyPropertyChanged(nameof(NewMask));
+                    NotifyPropertyChanged(nameof(HasMaskChanged));
+                }
+            }
+		}
+
+        public bool CanBeMasked { get; }
+
+		public SolidColorBrush HasTextChanged {
+            get
+			{
+				return OriginalText != NewText ? new SolidColorBrush(Colors.Yellow) : new SolidColorBrush(Colors.Transparent);
 			}
+        }
+
+        public SolidColorBrush HasMaskChanged
+        {
+            get
+            {
+                return OriginalMask != NewMask ? new SolidColorBrush(Colors.Yellow) : new SolidColorBrush(Colors.Transparent);
+            }
+        }
+
+		public int AttributesChanged()
+		{
+			return (OriginalText != NewText ? 1 : 0) + (OriginalMask != NewMask ? 1 : 0);
 		}
 
-		public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler PropertyChanged;
 
 		protected void NotifyPropertyChanged(string propertyName)
 		{
 			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 		}
 
-		public ObjectInformation(DBObject obj) : this(obj, TypeUtil.GetText(obj), TypeUtil.GetText(obj)) { }
+		public ObjectInformation(DBObject obj, Transaction t)
+		{
+			TypeUtil.TypeInformation typeInfo = TypeUtil.GetTypeInformation(obj.Id);
+			this.Type = typeInfo.Type;
+			this.FriendlyType = typeInfo.FriendlyName;
+			this.Id = obj.Id;
 
-		public ObjectInformation(DBObject obj, string originalTextContent) : this(obj, originalTextContent, originalTextContent) { }
+			ITypeUtil typeUtil = typeInfo.TypeUtil;
+			string text = typeUtil.GetText(obj, t);
+			this.OriginalText = text;
+			this.NewText = text;
 
-		public ObjectInformation(DBObject obj, string originalTextContent, string newTextContent)
-		{
-			this.Type = TypeUtil.GetType(obj);
-			this.FriendlyType = TypeUtil.getFriendlyTypeName(obj);
-			this.Id = obj.Handle.ToString();
-			this.OriginalText = originalTextContent;
-			this.NewText = newTextContent;
+			bool mask = typeUtil.GetMask(obj);
+			this.OriginalMask = mask;
+			this.NewMask = mask;
+
+			this.CanBeMasked = typeUtil.CanMaskBeEdited(obj);
+			this.CanEditText = typeUtil.CanTextBeEdited(obj);
+			this.ContentType = typeUtil.GetInternalContentType(obj);
 		}
 
 		public override string ToString()
diff --git a/FindAndReplaceCAD/TypeUtil.cs b/FindAndReplaceCAD/TypeUtil.cs
index b9d77f7..f274836 100644
--- a/FindAndReplaceCAD/TypeUtil.cs
+++ b/FindAndReplaceCAD/TypeUtil.cs
@@ -1,106 +1,57 @@
 using Autodesk.AutoCAD.DatabaseServices;
+using Autodesk.AutoCAD.GraphicsInterface;
+using FindAndReplaceCAD.Util;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace CADApp
 {
     class TypeUtil
     {
-
-		private static Dictionary<Type, string> types = new Dictionary<Type, string>() {
-			{ typeof(MLeader), "Multi-Leader Text" },
-			{ typeof(MText), "Multi-Line Text" },
-			{ typeof(DBText), "Single Line Text" },
-			{ typeof(Dimension), "Dimension Text" }
-		};
-		
-		public static bool IsSupportedType(DBObject obj)
+		public class TypeInformation
 		{
-			if(obj == null)
-			{
-				return false;
-			}
-
-			Type type = GetType(obj);
-
-			if(type == null)
-			{
-				return false;
+			public string FriendlyName;
+			public Type Type;
+			public ITypeUtil TypeUtil;
+
+			public TypeInformation(Type type, string friendlyName, ITypeUtil typeUtil) 
+			{ 
+				this.Type = type;
+				this.FriendlyName = friendlyName;
+				this.TypeUtil = typeUtil;
 			}
-
-			return types.ContainsKey(type);
 		}
 
-		public static Type GetType(DBObject obj)
+		private static Dictionary<string, TypeInformation> types = new Dictionary<string, TypeInformation>()
 		{
-			switch (obj)
-			{
-				case MLeader _:
-					return typeof(MLeader);
-				case MText _:
-					return typeof(MText);
-				case DBText _:
-					return typeof(DBText);
-				case Dimension _:
-					return typeof(Dimension);
-				default:
-					return null;
-			}
-		}
-
-		public static string GetText(DBObject obj)
-        {
-
-			AssertSupportedType(obj);
-
-			switch (obj)
-			{
-				case MLeader mLeader:
-					return mLeader.MText.Text;
-				case MText mText:
-					return mText.Text;
-				case DBText dbText:
-					return dbText.TextString;
-				case Dimension dimension:
-					return dimension.DimensionText;
-				default:
-					return "";
-			}
-		}
+			{ "MULTILEADER", new TypeInformation(typeof(MLeader), "Multi-Leader Text", new MLeaderUtil()) },
+			{ "MTEXT", new TypeInformation(typeof(MText), "Multi-Line Text", new MTextUtil()) },
+			{ "TEXT", new TypeInformation(typeof(DBText), "Text", new DBTextUtil())},
+			{ "DIMENSION", new TypeInformation(typeof(Dimension), "Dimension", new DimensionUtil())}
+		};
 
-		public static void WriteText(DBObject obj, string newText)
+		public static readonly string MTEXT = "MText";
+		public static readonly string DBTEXT = "Text";
+		public static readonly string BLOCK = "Block";
+		
+		public static bool IsSupportedType(ObjectId obj)
 		{
-			AssertSupportedType(obj);
-
-			switch (obj)
+			if(obj == null)
 			{
-				case MLeader mLeader:
-					MText newMText = mLeader.MText.Clone() as MText;
-					newMText.Contents = CADUtil.ReplaceWithCADEscapeCharacters(newText);
-					mLeader.MText = newMText;
-					break;
-				case MText mText:
-					mText.Contents = CADUtil.ReplaceWithCADEscapeCharacters(newText);
-					break;
-				case DBText dbText:
-					dbText.TextString = newText;
-					break;
-				case Dimension dimension:
-					dimension.DimensionText = newText;
-					break;
+				return false;
 			}
-		}
 
-		public static string getFriendlyTypeName(DBObject obj)
-		{
-			AssertSupportedType(obj);
-			return types[GetType(obj)];
+			return types.ContainsKey(obj.ObjectClass.DxfName);
 		}
 
-		private static void AssertSupportedType(DBObject obj)
-		{
-			if (!IsSupportedType(obj)) throw new ArgumentException($"Unsupported Type: {obj.GetType()}");
-		}
-    }
+        public static TypeInformation GetTypeInformation(ObjectId obj)
+        {
+            if (types.ContainsKey(obj.ObjectClass.DxfName))
+            {
+                return types[obj.ObjectClass.DxfName];
+            }
+
+            return null;
+        }
+	}
 }
diff --git a/FindAndReplaceCAD/UserControl/FindAndReplace.xaml b/FindAndReplaceCAD/UserControl/FindAndReplace.xaml
new file mode 100644
index 0000000..4900819
--- /dev/null
+++ b/FindAndReplaceCAD/UserControl/FindAndReplace.xaml
@@ -0,0 +1,48 @@
+<UserControl x:Class="CADApp.FindAndReplace"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:CADApp"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Margin="10" Grid.Row="0">
+            <Grid.Resources>
+                <Style TargetType="{x:Type TextBox}">
+                    <Setter Property="Margin" Value="0,0,10,0" />
+                </Style>
+            </Grid.Resources>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="100"/>
+            </Grid.ColumnDefinitions>
+            <TextBox Grid.Column="0" VerticalContentAlignment="Center" FontSize="14" />
+            <Button Content="Find" Grid.Column="1" FontSize="14" Click="FindButton_Click"/>
+        </Grid>
+        <Grid Margin="10" Grid.Row="1">
+            <Grid.Resources>
+                <Style TargetType="{x:Type TextBox}">
+                    <Setter Property="Margin" Value="0,0,10,0" />
+                </Style>
+            </Grid.Resources>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="100"/>
+            </Grid.ColumnDefinitions>
+            <TextBox Grid.Column="0" VerticalContentAlignment="Center" FontSize="14" />
+            <Button Content="Replace" Grid.Column="1" FontSize="14" Click="ReplaceButton_Click"/>
+        </Grid>
+        <Grid Margin="10" Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <CheckBox Grid.Column="0" Content="Regex"/>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/FindAndReplaceCAD/UserControl/FindAndReplace.xaml.cs b/FindAndReplaceCAD/UserControl/FindAndReplace.xaml.cs
new file mode 100644
index 0000000..0ab3f76
--- /dev/null
+++ b/FindAndReplaceCAD/UserControl/FindAndReplace.xaml.cs
@@ -0,0 +1,26 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace CADApp
+{
+    /// <summary>
+    /// Interaction logic for FindAndReplace.xaml
+    /// </summary>
+    public partial class FindAndReplace : UserControl
+    {
+        public FindAndReplace()
+        {
+            InitializeComponent();
+        }
+
+        private void FindButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void ReplaceButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/FindAndReplaceCAD/Util/DBTextUtil.cs b/FindAndReplaceCAD/Util/DBTextUtil.cs
new file mode 100644
index 0000000..ae22576
--- /dev/null
+++ b/FindAndReplaceCAD/Util/DBTextUtil.cs
@@ -0,0 +1,53 @@
+using Autodesk.AutoCAD.DatabaseServices;
+using Autodesk.AutoCAD.EditorInput;
+using CADApp;
+using System;
+
+namespace FindAndReplaceCAD.Util
+{
+    internal class DBTextUtil : ITypeUtil
+    {
+        public override string GetText(DBObject obj, Transaction t)
+        {
+            DBText dbText = Cast<DBText>(obj);
+            return dbText.TextString;
+        }
+
+        public override void WriteText(DBObject obj, string newText, Transaction t)
+        {
+            DBText dbText = Cast<DBText>(obj);
+            dbText.TextString = CADUtil.ReplaceWithCADEscapeCharacters(newText);
+        }
+
+        public override bool GetMask(DBObject obj)
+        {
+            throw new InvalidOperationException();
+        }
+
+        public override void WriteMask(DBObject obj, bool newMask)
+        {
+            throw new InvalidOperationException();
+        }
+
+        public override bool CanTextBeEdited(DBObject obj)
+        {
+            return true;
+        }
+
+        public override bool CanMaskBeEdited(DBObject obj)
+        {
+            return false;
+        }
+
+        public override string GetInternalContentType(DBObject obj)
+        {
+            return TypeUtil.DBTEXT;
+        }
+
+        public override void MoveViewPort(Editor ed, ViewTableRecord view, Transaction t, DBObject obj)
+        {
+            DBText dbText = Cast<DBText>(obj);
+            base.MoveViewPort(ed, view, obj, dbText.Position, dbText.Height, dbText.Bounds.Value.MaxPoint.X - dbText.Bounds.Value.MinPoint.X);
+        }
+    }
+}
diff --git a/FindAndReplaceCAD/Util/DimensionUtil.cs b/FindAndReplaceCAD/Util/DimensionUtil.cs
new file mode 100644
index 0000000..db055fc
--- /dev/null
+++ b/FindAndReplaceCAD/Util/DimensionUtil.cs
@@ -0,0 +1,65 @@
+using Autodesk.AutoCAD.DatabaseServices;
+using Autodesk.AutoCAD.EditorInput;
+using CADApp;
+using System;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+
+namespace FindAndReplaceCAD.Util
+{
+    internal class DimensionUtil : ITypeUtil
+    {
+        public override string GetText(DBObject obj, Transaction t)
+        {
+            Dimension dimension = Cast<Dimension>(obj);
+            return dimension.DimensionText;
+        }
+
+        public override void WriteText(DBObject obj, string newText, Transaction t)
+        {
+            Dimension dimension = Cast<Dimension>(obj);
+            dimension.DimensionText = newText;
+        }
+
+        public override bool GetMask(DBObject obj)
+        {
+            Dimension dimension = Cast<Dimension>(obj);
+            return dimension.Dimtfill == 1;
+        }
+
+        public override void WriteMask(DBObject obj, bool newMask)
+        {
+            Dimension dimension = Cast<Dimension>(obj);
+            dimension.Dimtfill = newMask ? 1 : 0;
+        }
+
+        public override bool CanTextBeEdited(DBObject obj)
+        {
+            return true;
+        }
+
+        public override bool CanMaskBeEdited(DBObject obj)
+        {
+            return true;
+        }
+
+        public override string GetInternalContentType(DBObject obj)
+        {
+            return TypeUtil.MTEXT;
+        }
+
+        public override void MoveViewPort(Editor ed, ViewTableRecord view, Transaction t, DBObject obj)
+        {
+            Dimension dimension = Cast<Dimension>(obj);
+            var dimensionBlock = t.GetObject(dimension.DimBlockId, OpenMode.ForRead) as BlockTableRecord;
+            foreach (var subId in dimensionBlock)
+            {
+                if (TypeUtil.GetTypeInformation(subId).Type == typeof(MText))
+                {
+                    var mText = t.GetObject(subId, OpenMode.ForRead) as MText;
+                    base.MoveViewPort(ed, view, obj, mText.Location, mText.ActualHeight, mText.ActualWidth);
+                }
+            }
+        }
+    }
+}
diff --git a/FindAndReplaceCAD/Util/ITypeUtil.cs b/FindAndReplaceCAD/Util/ITypeUtil.cs
new file mode 100644
index 0000000..bee9324
--- /dev/null
+++ b/FindAndReplaceCAD/Util/ITypeUtil.cs
@@ -0,0 +1,39 @@
+using Autodesk.AutoCAD.DatabaseServices;
+using Autodesk.AutoCAD.EditorInput;
+using Autodesk.AutoCAD.Geometry;
+using System;
+using System.Security.Cryptography;
+
+namespace FindAndReplaceCAD.Util
+{
+    internal abstract class ITypeUtil
+    {
+        public abstract bool CanMaskBeEdited(DBObject entity);
+        public abstract bool CanTextBeEdited(DBObject entity);
+        public abstract bool GetMask(DBObject entity);
+        public abstract string GetText(DBObject entity, Transaction t);
+        public abstract void WriteMask(DBObject entity, bool newMask);
+        public abstract void WriteText(DBObject entity, string newText, Transaction t);
+        public abstract string GetInternalContentType(DBObject entity);
+        public abstract void MoveViewPort(Editor ed, ViewTableRecord view, Transaction t, DBObject obj);
+        protected void MoveViewPort(Editor ed, ViewTableRecord view, DBObject entity, Point3d position, double height, double width)
+        {
+            ed.SetImpliedSelection(new[] { entity.Id });
+            view.CenterPoint = new Point2d(position.X, position.Y);
+            view.Height = height * 3;
+            view.Width = width * 3;
+            ed.SetCurrentView(view);
+            ed.Regen(); // Update gizmos to be accurate after movement
+        }
+
+        protected T Cast<T>(DBObject obj) where T : DBObject
+        {
+            if (obj is T)
+            {
+                return obj as T;
+            }
+
+            throw new InvalidOperationException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/FindAndReplaceCAD/Util/MLeaderUtil.cs b/FindAndReplaceCAD/Util/MLeaderUtil.cs
new file mode 100644
index 0000000..f71586a
--- /dev/null
+++ b/FindAndReplaceCAD/Util/MLeaderUtil.cs
@@ -0,0 +1,160 @@
+using Autodesk.AutoCAD.DatabaseServices;
+using Autodesk.AutoCAD.EditorInput;
+using Autodesk.AutoCAD.GraphicsSystem;
+using CADApp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Documents;
+
+namespace FindAndReplaceCAD.Util
+{
+    internal class MLeaderUtil : ITypeUtil
+    {
+        public override string GetText(DBObject obj, Transaction t)
+        {
+            MLeader mLeader = Cast<MLeader>(obj);
+            if (mLeader.ContentType == ContentType.BlockContent)
+            {
+                return GetMLeaderBlockText(mLeader, t);
+            }
+            else if (mLeader.ContentType == ContentType.MTextContent)
+            {
+                return mLeader.MText.Text;
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        public override void WriteText(DBObject obj, string newText, Transaction t)
+        {
+            MLeader mLeader = Cast<MLeader>(obj);
+            if (mLeader.ContentType == ContentType.BlockContent)
+            {
+                throw new InvalidOperationException();
+            }
+            else if (mLeader.ContentType == ContentType.MTextContent)
+            {
+                MText newMText = mLeader.MText.Clone() as MText;
+                newMText.Contents = CADUtil.ReplaceWithCADEscapeCharacters(newText);
+                mLeader.MText = newMText;
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        public override bool GetMask(DBObject obj)
+        {
+            MLeader mLeader = Cast<MLeader>(obj);
+            if (mLeader.ContentType == ContentType.BlockContent)
+            {
+                return true;
+            }
+            else if (mLeader.ContentType == ContentType.MTextContent)
+            {
+                return mLeader.MText.BackgroundFill && mLeader.MText.UseBackgroundColor;
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        public override void WriteMask(DBObject obj, bool newMask)
+        {
+            MLeader mLeader = Cast<MLeader>(obj);
+            if (mLeader.ContentType == ContentType.BlockContent)
+            {
+            }
+            else if (mLeader.ContentType == ContentType.MTextContent)
+            {
+                MText newMText = mLeader.MText.Clone() as MText;
+                newMText.BackgroundFill = newMask;
+                newMText.UseBackgroundColor = true;
+                mLeader.MText = newMText;
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        public override bool CanTextBeEdited(DBObject obj)
+        {
+            MLeader mLeader = Cast<MLeader>(obj);
+            if (mLeader.ContentType == ContentType.BlockContent)
+            {
+                return false;
+            }
+            else if (mLeader.ContentType == ContentType.MTextContent)
+            {
+                return true;
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        public override bool CanMaskBeEdited(DBObject obj)
+        {
+            MLeader mLeader = Cast<MLeader>(obj);
+            if (mLeader.ContentType == ContentType.BlockContent)
+            {
+                return false;
+            }
+            else if (mLeader.ContentType == ContentType.MTextContent)
+            {
+                return true;
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        private string GetMLeaderBlockText(MLeader obj, Transaction myT)
+        {
+            BlockTableRecord btr2 = myT.GetObject(obj.BlockContentId, OpenMode.ForRead) as BlockTableRecord;
+            if (btr2.HasAttributeDefinitions)
+            {
+                foreach (ObjectId id2 in btr2)
+                {
+                    if (id2.ObjectClass.DxfName == "ATTDEF")
+                    {
+                        AttributeDefinition attDef = myT.GetObject(id2, OpenMode.ForRead) as AttributeDefinition;
+                        AttributeReference attRef = obj.GetBlockAttribute(attDef.Id);
+                        return attRef.TextString;
+                    }
+                }
+            }
+
+            return "";
+        }
+
+        public override string GetInternalContentType(DBObject obj)
+        {
+            MLeader mLeader = Cast<MLeader>(obj);
+
+            if (mLeader.ContentType == ContentType.BlockContent)
+            {
+                return TypeUtil.BLOCK;
+            }
+            else if (mLeader.ContentType == ContentType.MTextContent)
+            {
+                return TypeUtil.MTEXT;
+            }
+
+            return "";
+        }
+
+        public override void MoveViewPort(Editor ed, ViewTableRecord view, Transaction t, DBObject obj)
+        {
+            MLeader mLeader = Cast<MLeader>(obj);
+
+            if (mLeader.ContentType == ContentType.BlockContent)
+            {
+                throw new InvalidOperationException();
+            }
+            else if (mLeader.ContentType == ContentType.MTextContent)
+            {
+                MText mText = mLeader.MText;
+                base.MoveViewPort(ed, view, obj, mText.Location, mText.ActualHeight, mText.ActualWidth);
+            }
+
+            
+        }
+    }
+}
diff --git a/FindAndReplaceCAD/Util/MTextUtil.cs b/FindAndReplaceCAD/Util/MTextUtil.cs
new file mode 100644
index 0000000..86e8247
--- /dev/null
+++ b/FindAndReplaceCAD/Util/MTextUtil.cs
@@ -0,0 +1,55 @@
+using Autodesk.AutoCAD.DatabaseServices;
+using Autodesk.AutoCAD.EditorInput;
+using CADApp;
+
+namespace FindAndReplaceCAD.Util
+{
+    internal class MTextUtil : ITypeUtil
+    {
+        public override string GetText(DBObject obj, Transaction t)
+        {
+            MText mText = Cast<MText>(obj);
+            return mText.Contents;
+        }
+
+        public override void WriteText(DBObject obj, string newText, Transaction t)
+        {
+            MText mText = Cast<MText>(obj);
+            mText.Contents = CADUtil.ReplaceWithCADEscapeCharacters(newText);
+        }
+
+        public override bool GetMask(DBObject obj)
+        {
+            MText mText = Cast<MText>(obj);
+            return mText.BackgroundFill && mText.UseBackgroundColor;
+        }
+
+        public override void WriteMask(DBObject obj, bool newMask)
+        {
+            MText mText = Cast<MText>(obj);
+            mText.BackgroundFill = newMask;
+            mText.UseBackgroundColor = true;
+        }
+
+        public override bool CanTextBeEdited(DBObject obj)
+        {
+            return true;
+        }
+
+        public override bool CanMaskBeEdited(DBObject obj)
+        {
+            return true;
+        }
+
+        public override string GetInternalContentType(DBObject obj)
+        {
+            return TypeUtil.MTEXT;
+        }
+
+        public override void MoveViewPort(Editor ed, ViewTableRecord view, Transaction t, DBObject obj)
+        {
+            MText mText = Cast<MText>(obj);
+            base.MoveViewPort(ed, view, obj, mText.Location, mText.ActualHeight, mText.ActualWidth);
+        }
+    }
+}
diff --git a/FindAndReplaceCAD/packages.config b/FindAndReplaceCAD/packages.config
deleted file mode 100644
index 3c1f79e..0000000
--- a/FindAndReplaceCAD/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AutoCAD.NET" version="24.2.0" targetFramework="net47" />
-  <package id="AutoCAD.NET.Core" version="24.2.0" targetFramework="net47" />
-  <package id="AutoCAD.NET.Model" version="24.2.0" targetFramework="net47" />
-</packages>
\ No newline at end of file