4 files changed, 38 insertions, 5 deletions
diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index 5ea3595..891cd01 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -42,6 +42,8 @@ namespace grapher
             WriteButton = writeButton;
             ScaleMenuItem = scaleMenuItem;
             Settings = settings;
+            OptionSetX = optionSetX;
+            OptionSetY = optionSetY;
             Settings.Startup();
             RefreshOnRead();
 
diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index e4637ec..a75207b 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -52,8 +52,6 @@ namespace grapher.Models
             TextBox midpointBoxX,
             TextBox midpointBoxY,
             CheckBox sensXYLock,
-            CheckBox weightXYLock,
-            CheckBox capXYLock,
             Label sensitivityLabel,
             Label rotationLabel,
             Label weightLabelX,
@@ -84,7 +82,8 @@ namespace grapher.Models
             Label limitExpActiveLabelY,
             Label midpointActiveLabelX,
             Label midpointActiveLabelY,
-            Label accelTypeActiveLabel,
+            Label accelTypeActiveLabelX,
+            Label accelTypeActiveLabelY,
             Label optionSetXTitle,
             Label optionSetYTitle,
             Label mouseLabel)
@@ -209,7 +208,7 @@ namespace grapher.Models
                     weightX
                 },
                 writeButton,
-                new ActiveValueLabel(accelTypeActiveLabel, activeValueTitle));
+                new ActiveValueLabel(accelTypeActiveLabelX, activeValueTitle));
 
             var accelerationOptionsY = new AccelTypeOptions(
                 accelTypeDropY,
@@ -223,7 +222,7 @@ namespace grapher.Models
                     weightY
                 },
                 writeButton,
-                new ActiveValueLabel(accelTypeActiveLabel, activeValueTitle));
+                new ActiveValueLabel(accelTypeActiveLabelY, activeValueTitle));
 
             var capOptionsX = new CapOptions(
                 sensitivityToolStripMenuItem,
diff --git a/grapher/Models/Options/CapOptions.cs b/grapher/Models/Options/CapOptions.cs
index 6768a85..713842c 100644
--- a/grapher/Models/Options/CapOptions.cs
+++ b/grapher/Models/Options/CapOptions.cs
@@ -76,6 +76,27 @@ namespace grapher
             }
         }
 
+        public int Top
+        { 
+            get 
+            {
+                return CapOption.Top;
+            }
+            set
+            {
+                CapOption.Top = value;
+            }
+        }
+
+        public int Height
+        {
+            get
+            {
+                return CapOption.Height;
+            }
+        }
+
+
         #endregion Properties
 
         #region Methods
@@ -90,6 +111,12 @@ namespace grapher
             CapOption.Show();
         }
 
+        public void SnapTo(Option option)
+        {
+            Top = option.Top + option.Height + Constants.OptionVerticalSeperation;
+        }
+
+
         public void SetActiveValues(double gainCap, double sensCap, bool capGainEnabled)
         {
             if (capGainEnabled)
diff --git a/grapher/Models/Options/Option.cs b/grapher/Models/Options/Option.cs
index bd2c9a1..2006dec 100644
--- a/grapher/Models/Options/Option.cs
+++ b/grapher/Models/Options/Option.cs
@@ -150,6 +150,11 @@ namespace grapher
             Top = option.Top + option.Height + Constants.OptionVerticalSeperation;
         }
 
+        public void SnapTo(CapOptions option)
+        {
+            Top = option.Top + option.Height + Constants.OptionVerticalSeperation;
+        }
+
         #endregion Methods
     }
 }