1 files changed, 10 insertions, 13 deletions
diff --git a/grapher/Models/Charts/AccelCharts.cs b/grapher/Models/Charts/AccelCharts.cs
index b7abb35..2369432 100644
--- a/grapher/Models/Charts/AccelCharts.cs
+++ b/grapher/Models/Charts/AccelCharts.cs
@@ -1,9 +1,8 @@
 using grapher.Models.Calculations;
+using grapher.Models.Calculations.Data;
 using grapher.Models.Charts;
 using grapher.Models.Charts.ChartState;
-using grapher.Models.Serialized;
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 
 namespace grapher
@@ -26,8 +25,14 @@ namespace grapher
             var estimatedX = new EstimatedPoints();
             var estimatedY = new EstimatedPoints();
             SetupCharts(sensitivityChart, velocityChart, gainChart, estimated, estimatedX, estimatedY);
-            var accelData = new AccelData(estimated, estimatedX, estimatedY);
-            ChartStateManager = new ChartStateManager(sensitivityChart, velocityChart, gainChart, accelData, accelCalculator);
+            ChartStateManager = new ChartStateManager(
+                sensitivityChart,
+                velocityChart,
+                gainChart,
+                accelCalculator,
+                estimated,
+                estimatedY,
+                estimatedX);
 
             ContainingForm = form;
             EnableVelocityAndGain = enableVelocityAndGain;
@@ -56,7 +61,7 @@ namespace grapher
 
         private Button WriteButton { get; }
 
-        public AccelData AccelData
+        public IAccelData AccelData
         {
             get
             {
@@ -80,14 +85,6 @@ namespace grapher
             }
         }
 
-        public int TopChartHeight
-        {
-            get
-            {
-                return ChartState.SensitivityChart.Height;
-            }
-        }
-
         private int FormBorderHeight { get; }
 
         private ChartState ChartState { get; set; }