Index: Core/Components/src/Core.Components.OxyPlot.Forms/BaseChart.cs
===================================================================
diff -u -ra70fac40e34e16bed007b1d0d4e437d91c89d0cb -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/src/Core.Components.OxyPlot.Forms/BaseChart.cs	(.../BaseChart.cs)	(revision a70fac40e34e16bed007b1d0d4e437d91c89d0cb)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/BaseChart.cs	(.../BaseChart.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -1,41 +1,49 @@
 using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
 using Core.Components.OxyPlot.Data;
 using Core.Components.OxyPlot.Properties;
 using OxyPlot;
 using OxyPlot.Axes;
-using OxyPlot.Series;
 using OxyPlot.WindowsForms;
+using TickStyle = OxyPlot.Axes.TickStyle;
 
 namespace Core.Components.OxyPlot.Forms
 {
     /// <summary>
     /// This class describes a plot view with configured representation of axes.
     /// </summary>
-    public sealed class BaseChart : PlotView
+    public sealed class BaseChart : Control
     {
-        private LinearAxis xAxis;
-        private LinearAxis yAxis;
-        
+        private PlotView view;
+
+        public ICollection<IChartData> Series { get; private set; }
+
         /// <summary>
         /// Creates a new instance of <see cref="BaseChart"/>.
         /// </summary>
         public BaseChart()
         {
-            Model = new PlotModel();
-            InitializeAxes();
-
+            InitializePlotView();
+            Series = new List<IChartData>();
             MinimumSize = new System.Drawing.Size(50, 75);
         }
 
-        /// <summary>
-        /// Sets up default axes representations.
-        /// </summary>
-        private void InitializeAxes()
+        private void InitializePlotView()
         {
-            xAxis = CreateAxis(Resources.BaseChart_XAxisTitle, AxisPosition.Bottom);
-            yAxis = CreateAxis(Resources.BaseChart_YAxisTitle, AxisPosition.Left);
-            Model.Axes.Add(xAxis);
-            Model.Axes.Add(yAxis);
+            view = new PlotView
+            {
+                Dock = DockStyle.Fill,
+                Model = new PlotModel
+                {
+                    Axes =
+                    {
+                        CreateAxis(Resources.BaseChart_XAxisTitle, AxisPosition.Bottom),
+                        CreateAxis(Resources.BaseChart_YAxisTitle, AxisPosition.Left)
+                    }
+                }
+            };
+            Controls.Add(view);
         }
 
         /// <summary>
@@ -70,29 +78,39 @@
             {
                 throw new ArgumentNullException("data", "Cannot add null data to the chart.");
             }
-            data.AddTo(Model);
+            Series.Add(data);
+            UpdateTree();
         }
 
         /// <summary>
         /// Remove all the <see cref="IChartData"/> that has been added to the <see cref="BaseChart"/>.
         /// </summary>
         public void ClearData()
         {
-            Model.Series.Clear();
+            Series.Clear();
+            UpdateTree();
         }
 
+        private void UpdateTree()
+        {
+            view.Model.Series.Clear();
+            foreach (var data in Series)
+            {
+                view.Model.Series.Add(((ISeries)data).Series);
+            }
+        }
+
         /// <summary>
         /// Sets the visibility of a series in this <see cref="BaseChart"/>.
         /// </summary>
         /// <param name="series">The <see cref="IChartData"/> to set the visibility for.</param>
         /// <param name="visibility">A boolean value representing the new visibility of the <paramref name="series"/>.</param>
         public void SetVisibility(IChartData series, bool visibility)
         {
-            var chartData = series as Series;
-            if (chartData != null)
+            if (series != null)
             {
-                chartData.IsVisible = visibility;
-                Invalidate();
+                series.IsVisible = visibility;
+                view.Invalidate();
             }
             else
             {
Index: Core/Components/src/Core.Components.OxyPlot.Forms/Properties/AssemblyInfo.cs
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/src/Core.Components.OxyPlot.Forms/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -1,6 +1,8 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Core.Components.OxyPlot.Forms")]
 [assembly: AssemblyProduct("Core.Components.OxyPlot.Forms")]
-[assembly: Guid("9b055a22-085f-40fb-89e6-38a9edc8b4c0")]
\ No newline at end of file
+[assembly: Guid("9b055a22-085f-40fb-89e6-38a9edc8b4c0")]
+[assembly: InternalsVisibleTo("Core.Components.OxyPlot.Forms.Test")]
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj	(.../Core.Components.OxyPlot.csproj)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj	(.../Core.Components.OxyPlot.csproj)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -49,7 +49,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Data\AreaData.cs" />
-    <Compile Include="Data\CollectionData.cs" />
+    <Compile Include="Data\ISeries.cs" />
     <Compile Include="Data\PointData.cs" />
     <Compile Include="Data\LineData.cs" />
     <Compile Include="Data\IChartData.cs" />
Index: Core/Components/src/Core.Components.OxyPlot/Data/AreaData.cs
===================================================================
diff -u -r5a98830aee77b1ee0158c11ba5cccffc656226e0 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/src/Core.Components.OxyPlot/Data/AreaData.cs	(.../AreaData.cs)	(revision 5a98830aee77b1ee0158c11ba5cccffc656226e0)
+++ Core/Components/src/Core.Components.OxyPlot/Data/AreaData.cs	(.../AreaData.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -9,8 +9,10 @@
     /// <summary>
     /// This class represents data which is represented as an area on <see cref="BaseChart"/>.
     /// </summary>
-    public class AreaData : AreaSeries, IChartData
+    public class AreaData : ISeries
     {
+        private AreaSeries series = new AreaSeries();
+
         /// <summary>
         /// Creates a new instance of <see cref="AreaData"/>.
         /// </summary>
@@ -25,11 +27,11 @@
             }
             foreach (var p in points)
             {
-                Points.Add(TupleToDataPoint(p));
+                series.Points.Add(TupleToDataPoint(p));
             }
             if (points.Count > 0)
             {
-                Points2.Add(TupleToDataPoint(points.First()));
+                series.Points2.Add(TupleToDataPoint(points.First()));
             }
         }
 
@@ -38,18 +40,24 @@
             return new DataPoint(point.Item1, point.Item2);
         }
 
-        /// <summary>
-        /// Adds the information in the <see cref="AreaData"/> as a series of the <paramref name="model"/>.
-        /// </summary>
-        /// <param name="model">The <see cref="PlotModel"/> to add a series to.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
-        public void AddTo(PlotModel model)
+        public Series Series
         {
-            if (model == null)
+            get
             {
-                throw new ArgumentNullException("model", "A model is required to add points to.");
+                return series;
             }
-            model.Series.Add(this);
         }
+
+        public bool IsVisible
+        {
+            get
+            {
+                return series.IsVisible;
+            }
+            set
+            {
+                series.IsVisible = value;
+            }
+        }
     }
 }
\ No newline at end of file
Fisheye: Tag ec36de61b0eb813fedd9616e5113bd695470935c refers to a dead (removed) revision in file `Core/Components/src/Core.Components.OxyPlot/Data/CollectionData.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/src/Core.Components.OxyPlot/Data/IChartData.cs
===================================================================
diff -u -r4ea1323ca52ee52133113dbc01bae0429946d0d4 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/src/Core.Components.OxyPlot/Data/IChartData.cs	(.../IChartData.cs)	(revision 4ea1323ca52ee52133113dbc01bae0429946d0d4)
+++ Core/Components/src/Core.Components.OxyPlot/Data/IChartData.cs	(.../IChartData.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -1,18 +1,9 @@
-using System;
-using OxyPlot;
-
-namespace Core.Components.OxyPlot.Data
+namespace Core.Components.OxyPlot.Data
 {
     /// <summary>
-    /// This interface describes the data which can be added to the <see cref="BaseChart"/>.
+    /// This interface describes the chart data.
     /// </summary>
     public interface IChartData {
-
-        /// <summary>
-        /// Adds the information in the <see cref="LineData"/> as a series of the <paramref name="model"/>.
-        /// </summary>
-        /// <param name="model">The <see cref="PlotModel"/> to add a series to.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
-        void AddTo(PlotModel model);
+        bool IsVisible { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Data/ISeries.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.OxyPlot/Data/ISeries.cs	(revision 0)
+++ Core/Components/src/Core.Components.OxyPlot/Data/ISeries.cs	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -0,0 +1,11 @@
+using OxyPlot.Series;
+
+namespace Core.Components.OxyPlot.Data
+{
+    internal interface ISeries : IChartData {
+        Series Series
+        {
+            get;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Data/LineData.cs
===================================================================
diff -u -r5a98830aee77b1ee0158c11ba5cccffc656226e0 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/src/Core.Components.OxyPlot/Data/LineData.cs	(.../LineData.cs)	(revision 5a98830aee77b1ee0158c11ba5cccffc656226e0)
+++ Core/Components/src/Core.Components.OxyPlot/Data/LineData.cs	(.../LineData.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -8,8 +8,9 @@
     /// <summary>
     /// This class represents data which is represented as a line on <see cref="BaseChart"/>.
     /// </summary>
-    public class LineData : LineSeries, IChartData
+    public class LineData : ISeries
     {
+        private LineSeries series = new LineSeries();
 
         /// <summary>
         /// Creates a new instance of <see cref="LineData"/>.
@@ -23,8 +24,8 @@
             {
                 throw new ArgumentNullException("points", "A point collection is required when creating ChartData.");
             }
-            ItemsSource = points;
-            Mapping = TupleToDataPoint;
+            series.ItemsSource = points;
+            series.Mapping = TupleToDataPoint;
         }
 
         private DataPoint TupleToDataPoint(object obj)
@@ -33,18 +34,24 @@
             return new DataPoint(point.Item1, point.Item2);
         }
 
-        /// <summary>
-        /// Adds the information in the <see cref="LineData"/> as a series of the <paramref name="model"/>.
-        /// </summary>
-        /// <param name="model">The <see cref="PlotModel"/> to add a series to.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
-        public void AddTo(PlotModel model)
+        public Series Series
         {
-            if (model == null)
+            get
             {
-                throw new ArgumentNullException("model", "A model is required to add points to.");
+                return series;
             }
-            model.Series.Add(this);
         }
+
+        public bool IsVisible
+        {
+            get
+            {
+                return series.IsVisible;
+            }
+            set
+            {
+                series.IsVisible = value;
+            }
+        }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Data/PointData.cs
===================================================================
diff -u -r5a98830aee77b1ee0158c11ba5cccffc656226e0 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/src/Core.Components.OxyPlot/Data/PointData.cs	(.../PointData.cs)	(revision 5a98830aee77b1ee0158c11ba5cccffc656226e0)
+++ Core/Components/src/Core.Components.OxyPlot/Data/PointData.cs	(.../PointData.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -8,8 +8,10 @@
     /// <summary>
     /// This class represents data which is represented as points on <see cref="BaseChart"/>.
     /// </summary>
-    public class PointData : LineSeries, IChartData
+    public class PointData : ISeries
     {
+        private LineSeries series = new LineSeries();
+
         /// <summary>
         /// Creates a new instance of <see cref="PointData"/>.
         /// </summary>
@@ -21,10 +23,10 @@
             {
                 throw new ArgumentNullException("points", "A point collection is required when creating ChartData.");
             }
-            ItemsSource = points;
-            Mapping = TupleToDataPoint;
-            LineStyle = LineStyle.None;
-            MarkerType = MarkerType.Circle;
+            series.ItemsSource = points;
+            series.Mapping = TupleToDataPoint;
+            series.LineStyle = LineStyle.None;
+            series.MarkerType = MarkerType.Circle;
         }
 
         private DataPoint TupleToDataPoint(object obj)
@@ -33,18 +35,24 @@
             return new DataPoint(point.Item1, point.Item2);
         }
 
-        /// <summary>
-        /// Adds the information in the <see cref="PointData"/> as a series of the <paramref name="model"/>.
-        /// </summary>
-        /// <param name="model">The <see cref="PlotModel"/> to add a series to.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="model"/> is <c>null</c>.</exception>
-        public void AddTo(PlotModel model)
+        public Series Series
         {
-            if (model == null)
+            get
             {
-                throw new ArgumentNullException("model", "A model is required to add points to.");
+                return series;
             }
-            model.Series.Add(this);
         }
+
+        public bool IsVisible
+        {
+            get
+            {
+                return series.IsVisible;
+            }
+            set
+            {
+                series.IsVisible = value;
+            }
+        }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Properties/AssemblyInfo.cs
===================================================================
diff -u -r3d4b98ca16e7a608e4db4ba639c028ce81bd440f -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/src/Core.Components.OxyPlot/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 3d4b98ca16e7a608e4db4ba639c028ce81bd440f)
+++ Core/Components/src/Core.Components.OxyPlot/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -1,6 +1,10 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Core.Components.OxyPlot")]
 [assembly: AssemblyProduct("Core.Components.OxyPlot")]
 [assembly: Guid("05a1a16f-6f4f-4ebb-9540-b09a94bfded0")]
+[assembly: InternalsVisibleTo("Core.Components.OxyPlot.Forms")]
+[assembly: InternalsVisibleTo("Core.Components.OxyPlot.Forms.Test")]
+[assembly: InternalsVisibleTo("Core.Components.OxyPlot.Test")]
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/BaseChartTest.cs
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/test/Core.Components.OxyPlot.Forms.Test/BaseChartTest.cs	(.../BaseChartTest.cs)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/BaseChartTest.cs	(.../BaseChartTest.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows.Forms;
 using Core.Components.OxyPlot.Data;
 using NUnit.Framework;
-using OxyPlot;
 using OxyPlot.Series;
-using OxyPlot.WindowsForms;
 using Rhino.Mocks;
 
 namespace Core.Components.OxyPlot.Forms.Test
@@ -20,11 +19,7 @@
             var chart = new BaseChart();
 
             // Assert
-            Assert.IsInstanceOf<PlotView>(chart);
-            Assert.IsInstanceOf<PlotModel>(chart.Model);
-            Assert.IsNull(chart.Controller);
-            Assert.AreEqual(2, chart.Model.Axes.Count);
-
+            Assert.IsInstanceOf<Control>(chart);
             Assert.AreEqual(75, chart.MinimumSize.Height);
             Assert.AreEqual(50, chart.MinimumSize.Width);
         }
@@ -43,31 +38,12 @@
         }
 
         [Test]
-        public void AddData_WithIChartData_Added()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var chart = new BaseChart();
-            var dataMock = mocks.StrictMock<IChartData>();
-            dataMock.Expect(d => d.AddTo(chart.Model));
-
-            mocks.ReplayAll();
-
-            // Call
-            chart.AddData(dataMock);
-
-            // Assert
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void ClearData_Always_RemovesSeriesFromModel()
         {
             // Setup
             var mocks = new MockRepository();
             var chart = new BaseChart();
-            var dataMock = mocks.StrictMock<IChartData>();
-            dataMock.Expect(d => d.AddTo(chart.Model));
+            var dataMock = new TestChartData(mocks.Stub<Series>());
             mocks.ReplayAll();
 
             chart.AddData(dataMock);
@@ -76,73 +52,42 @@
             chart.ClearData();
             
             // Assert
-            Assert.IsEmpty(chart.Model.Series);
+            Assert.IsEmpty(chart.Series);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void GivenBaseChart_WhenPointDataAdded_ThenSeriesHasPointStyle()
+        public void AddData_Always_AddsToSeries()
         {
             // Given
+            var mocks = new MockRepository();
             var chart = new BaseChart();
-            var pointData = new PointData(new Collection<Tuple<double, double>>());
+            var dataMock = new TestChartData(mocks.Stub<Series>());
 
             // When
-            chart.AddData(pointData);
+            chart.AddData(dataMock);
 
             // Then
-            var pointSeries = (LineSeries)chart.Model.Series.First();
-            Assert.AreEqual(LineStyle.None, pointSeries.LineStyle);
-            Assert.AreEqual(MarkerType.Circle, pointSeries.MarkerType);
+            Assert.IsInstanceOf<TestChartData>(chart.Series.First());
         }
+    }
 
-        [Test]
-        public void GivenBaseChart_WhenLineDataAdded_ThenSeriesIsLineSeries()
-        {
-            // Given
-            var chart = new BaseChart();
-            var pointData = new LineData(new Collection<Tuple<double, double>>());
+    public class TestChartData : ISeries {
+        private Series series;
 
-            // When
-            chart.AddData(pointData);
-
-            // Then
-            Assert.IsInstanceOf<LineSeries>(chart.Model.Series.First());
-        }
-
-        [Test]
-        public void GivenBaseChart_WhenAreaDataAdded_ThenSeriesIsAreaSeries()
+        public TestChartData(Series series)
         {
-            // Given
-            var chart = new BaseChart();
-            var pointData = new AreaData(new Collection<Tuple<double, double>>());
-
-            // When
-            chart.AddData(pointData);
-
-            // Then
-            Assert.IsInstanceOf<AreaSeries>(chart.Model.Series.First());
+            this.series = series;
         }
 
-        [Test]
-        [TestCase(0)]
-        [TestCase(1)]
-        [TestCase(11)]
-        public void GivenANumberOfChartData_WhenAddedToChart_AddsSameNumberOfSeriesToModel(int numberOfSeries)
+        public bool IsVisible { get; set; }
+
+        public Series Series
         {
-            // Given
-            var chart = new BaseChart();
-            var data = new CollectionData();
-            for (int i = 0; i < numberOfSeries; i++)
+            get
             {
-                data.Add(new LineData(new Collection<Tuple<double, double>>()));
+                return series;
             }
-
-            // When
-            chart.AddData(data);
-
-            // Assert
-            Assert.AreEqual(numberOfSeries, chart.Model.Series.Count);
         }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj	(.../Core.Components.OxyPlot.Forms.Test.csproj)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/Core.Components.OxyPlot.Forms.Test.csproj	(.../Core.Components.OxyPlot.Forms.Test.csproj)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -65,6 +65,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Plugins\test\Core.Plugins.OxyPlot.Test\Core.Plugins.OxyPlot.Test.csproj">
+      <Project>{45EF3071-5C30-40AA-8B99-CE174DCEEE48}</Project>
+      <Name>Core.Plugins.OxyPlot.Test</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Core.Components.OxyPlot.Forms\Core.Components.OxyPlot.Forms.csproj">
       <Project>{dadaa0a5-288c-49cb-9f08-337f16832c86}</Project>
       <Name>Core.Components.OxyPlot.Forms</Name>
Index: Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj	(.../Core.Components.OxyPlot.Test.csproj)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Core.Components.OxyPlot.Test.csproj	(.../Core.Components.OxyPlot.Test.csproj)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -50,7 +50,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Data\AreaDataTest.cs" />
-    <Compile Include="Data\CollectionDataTest.cs" />
     <Compile Include="Data\PointDataTest.cs" />
     <Compile Include="Data\LineDataTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Core/Components/test/Core.Components.OxyPlot.Test/Data/AreaDataTest.cs
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/test/Core.Components.OxyPlot.Test/Data/AreaDataTest.cs	(.../AreaDataTest.cs)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Data/AreaDataTest.cs	(.../AreaDataTest.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -47,41 +47,6 @@
             Assert.IsInstanceOf<IChartData>(data);
         }
 
-        [Test]
-        public void AddTo_NoModel_ThrowsArgumentNullException()
-        {
-            // Setup
-            var points = CreateTestPoints();
-            var testData = new AreaData(points);
-
-            // Call
-            TestDelegate test = () => testData.AddTo(null);
-
-            // Assert
-            Assert.Throws<ArgumentNullException>(test);
-        }
-
-        [Test]
-        public void AddTo_Model_DataAddedToModelAsSeries()
-        {
-            // Setup
-            var points = CreateTestPoints();
-            var testData = new AreaData(points);
-            var model = new PlotModel();
-
-            // Call
-            testData.AddTo(model);
-
-            // Assert
-            Assert.AreEqual(1, model.Series.Count);
-            Assert.IsInstanceOf<AreaSeries>(model.Series.First());
-
-            var series = (AreaSeries)model.Series.First();
-            var equivalentPoints = points.Select(p => new DataPoint(p.Item1, p.Item2)).ToArray();
-            CollectionAssert.AreEquivalent(equivalentPoints, series.Points);
-            CollectionAssert.AreEquivalent(Arrays.CopyOf(equivalentPoints,1), series.Points2);
-        }
-
         private Collection<Tuple<double, double>> CreateTestPoints()
         {
             return new Collection<Tuple<double, double>>
Fisheye: Tag ec36de61b0eb813fedd9616e5113bd695470935c refers to a dead (removed) revision in file `Core/Components/test/Core.Components.OxyPlot.Test/Data/CollectionDataTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Components/test/Core.Components.OxyPlot.Test/Data/LineDataTest.cs
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/test/Core.Components.OxyPlot.Test/Data/LineDataTest.cs	(.../LineDataTest.cs)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Data/LineDataTest.cs	(.../LineDataTest.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -47,39 +47,6 @@
             Assert.IsInstanceOf<IChartData>(data);
         }
 
-        [Test]
-        public void AddTo_NoModel_ThrowsArgumentNullException()
-        {
-            // Setup
-            var points = CreateTestPoints();
-            var testData = new LineData(points);
-
-            // Call
-            TestDelegate test = () => testData.AddTo(null);
-
-            // Assert
-            Assert.Throws<ArgumentNullException>(test);
-        }
-
-        [Test]
-        public void AddTo_Model_DataAddedToModelAsSeries()
-        {
-            // Setup
-            var points = CreateTestPoints();
-            var testData = new LineData(points);
-            var model = new PlotModel();
-
-            // Call
-            testData.AddTo(model);
-
-            // Assert
-            Assert.AreEqual(1, model.Series.Count);
-            Assert.IsInstanceOf<LineSeries>(model.Series.First());
-            
-            var series = (LineSeries)model.Series.First();
-            Assert.AreSame(points, series.ItemsSource);
-        }
-
         private Collection<Tuple<double, double>> CreateTestPoints()
         {
             return new Collection<Tuple<double, double>>
Index: Core/Components/test/Core.Components.OxyPlot.Test/Data/PointDataTest.cs
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Components/test/Core.Components.OxyPlot.Test/Data/PointDataTest.cs	(.../PointDataTest.cs)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Data/PointDataTest.cs	(.../PointDataTest.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -47,39 +47,6 @@
             Assert.IsInstanceOf<IChartData>(data);
         }
 
-        [Test]
-        public void AddTo_NoModel_ThrowsArgumentNullException()
-        {
-            // Setup
-            var points = CreateTestPoints();
-            var testData = new PointData(points);
-
-            // Call
-            TestDelegate test = () => testData.AddTo(null);
-
-            // Assert
-            Assert.Throws<ArgumentNullException>(test);
-        }
-
-        [Test]
-        public void AddTo_Model_DataAddedToModelAsSeries()
-        {
-            // Setup
-            var points = CreateTestPoints();
-            var testData = new PointData(points);
-            var model = new PlotModel();
-
-            // Call
-            testData.AddTo(model);
-
-            // Assert
-            Assert.AreEqual(1, model.Series.Count);
-            Assert.IsInstanceOf<LineSeries>(model.Series.First());
-            
-            var series = (LineSeries)model.Series.First();
-            Assert.AreSame(points, series.ItemsSource);
-        }
-
         private Collection<Tuple<double, double>> CreateTestPoints()
         {
             return new Collection<Tuple<double, double>>
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Commands/OpenChartViewCommand.cs
===================================================================
diff -u -ra70fac40e34e16bed007b1d0d4e437d91c89d0cb -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/src/Core.Plugins.OxyPlot/Commands/OpenChartViewCommand.cs	(.../OpenChartViewCommand.cs)	(revision a70fac40e34e16bed007b1d0d4e437d91c89d0cb)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Commands/OpenChartViewCommand.cs	(.../OpenChartViewCommand.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -3,7 +3,6 @@
 using Core.Common.Gui;
 using Core.Components.OxyPlot.Data;
 using Core.Plugins.OxyPlot.Forms;
-using OxyPlot;
 
 namespace Core.Plugins.OxyPlot.Commands
 {
@@ -54,19 +53,13 @@
                 new Tuple<double, double>(1.0, 1.0),
                 new Tuple<double, double>(0.5, 0.5)
             });
-            clearArea.Fill = OxyColor.FromArgb(255,255,255,255);
             var points = new PointData(new Collection<Tuple<double, double>>
             {
                 new Tuple<double, double>(0.0, 1.1),    
                 new Tuple<double, double>(0.5, 1.6),  
                 new Tuple<double, double>(1.0, 2.1)
             });
-            var data = new CollectionData();
-            data.Add(area);
-            data.Add(clearArea);
-            data.Add(line);
-            data.Add(points);
-            Gui.DocumentViewsResolver.OpenViewForData(data);
+            Gui.DocumentViewsResolver.OpenViewForData(new Collection<IChartData>() { area, clearArea, line, points });
         }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs
===================================================================
diff -u -r570101d9648e296b96c7e624c4d4f6bfad8d41b6 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs	(.../ChartDataView.cs)	(revision 570101d9648e296b96c7e624c4d4f6bfad8d41b6)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Forms/ChartDataView.cs	(.../ChartDataView.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -1,6 +1,9 @@
-using System.Windows.Forms;
+using System.Collections.Generic;
+using System.Windows.Controls;
+using System.Windows.Forms;
 using Core.Components.OxyPlot.Data;
 using Core.Components.OxyPlot.Forms;
+using UserControl = System.Windows.Forms.UserControl;
 
 namespace Core.Plugins.OxyPlot.Forms
 {
@@ -10,7 +13,7 @@
     public class ChartDataView : UserControl, IChartView
     {
         private readonly BaseChart baseChart;
-        private IChartData data;
+        private ICollection<IChartData> data;
 
         /// <summary>
         /// Creates an instance of <see cref="ChartDataView"/> with just a <see cref="BaseChart"/> on it.
@@ -33,10 +36,13 @@
             set
             {
                 baseChart.ClearData();
-                data = (IChartData) value;
+                data = (ICollection<IChartData>) value;
                 if (data != null)
                 {
-                    baseChart.AddData(data);
+                    foreach (var series in data)
+                    {
+                        baseChart.AddData(series);
+                    }
                 }
             }
         }
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartNodePresenter.cs
===================================================================
diff -u -r10a16f2a08c6a50176351ae46c9a23a37ab92e28 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartNodePresenter.cs	(.../ChartNodePresenter.cs)	(revision 10a16f2a08c6a50176351ae46c9a23a37ab92e28)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/ChartNodePresenter.cs	(.../ChartNodePresenter.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -18,7 +18,7 @@
 
         public override IEnumerable GetChildNodeObjects(BaseChart parentNodeData)
         {
-            return parentNodeData.Model.Series;
+            return parentNodeData.Series;
         }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs
===================================================================
diff -u -ra70fac40e34e16bed007b1d0d4e437d91c89d0cb -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision a70fac40e34e16bed007b1d0d4e437d91c89d0cb)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -39,7 +39,7 @@
 
         public override IEnumerable<ViewInfo> GetViewInfoObjects()
         {
-            yield return new ViewInfo<IChartData, ChartDataView>
+            yield return new ViewInfo<ICollection<IChartData>, ChartDataView>
             {
                 Image = Resources.ChartIcon,
                 GetViewName = (v, o) => "Diagram"
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Forms/ChartDataViewTest.cs
===================================================================
diff -u -r10a16f2a08c6a50176351ae46c9a23a37ab92e28 -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Forms/ChartDataViewTest.cs	(.../ChartDataViewTest.cs)	(revision 10a16f2a08c6a50176351ae46c9a23a37ab92e28)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Forms/ChartDataViewTest.cs	(.../ChartDataViewTest.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -38,29 +38,10 @@
             chartView.Data = null;
 
             // Assert
-            Assert.IsEmpty(chart.Model.Series);
+            Assert.IsEmpty(chart.Series);
         }
 
         [Test]
-        public void Data_SetToIChartData_ChartDataAdded()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var chartView = new ChartDataView();
-            var chart = (BaseChart)chartView.Controls[0];
-            var chartData = mocks.StrictMock<IChartData>();
-            chartData.Expect(d => d.AddTo(chart.Model));
-            mocks.ReplayAll();
-
-            // Call
-            chartView.Data = chartData;
-
-            // Assert
-            Assert.AreSame(chartData, chartView.Data);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void Data_SetToObject_InvalidCastException()
         {
             // Setup
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataNodePresenterTest.cs
===================================================================
diff -u -ra70fac40e34e16bed007b1d0d4e437d91c89d0cb -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataNodePresenterTest.cs	(.../ChartDataNodePresenterTest.cs)	(revision a70fac40e34e16bed007b1d0d4e437d91c89d0cb)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataNodePresenterTest.cs	(.../ChartDataNodePresenterTest.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -91,9 +91,6 @@
     }
 
     public class TestChartData : IChartData {
-        public void AddTo(PlotModel model)
-        {
-            throw new NotImplementedException();
-        }
+        public bool IsVisible { get; set; }
     }
 }
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartNodePresenterTest.cs
===================================================================
diff -u -ra70fac40e34e16bed007b1d0d4e437d91c89d0cb -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartNodePresenterTest.cs	(.../ChartNodePresenterTest.cs)	(revision a70fac40e34e16bed007b1d0d4e437d91c89d0cb)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartNodePresenterTest.cs	(.../ChartNodePresenterTest.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -50,7 +50,7 @@
             var result = nodePresenter.GetChildNodeObjects(chart);
 
             // Assert
-            CollectionAssert.AreEquivalent(chart.Model.Series, result);
+            CollectionAssert.AreEquivalent(chart.Series, result);
         } 
     }
 }
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs
===================================================================
diff -u -ra70fac40e34e16bed007b1d0d4e437d91c89d0cb -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision a70fac40e34e16bed007b1d0d4e437d91c89d0cb)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Forms;
@@ -92,7 +93,7 @@
 
                 // Assert
                 Assert.AreEqual(1, views.Length);
-                Assert.AreEqual(typeof(IChartData), views[0].DataType);
+                Assert.AreEqual(typeof(ICollection<IChartData>), views[0].DataType);
                 Assert.AreEqual(typeof(ChartDataView), views[0].ViewType);
                 Assert.AreEqual("Diagram", views[0].GetViewName(view, null));
             }
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u -r3d4b98ca16e7a608e4db4ba639c028ce81bd440f -rec36de61b0eb813fedd9616e5113bd695470935c
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 3d4b98ca16e7a608e4db4ba639c028ce81bd440f)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision ec36de61b0eb813fedd9616e5113bd695470935c)
@@ -1,18 +1,8 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("Core.Plugins.OxyPlot.Test")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Core.Plugins.OxyPlot.Test")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -21,16 +11,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("5b5d3afc-316c-44e9-90ba-4b55cfa074f8")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]