diff --git a/Navigator/Model/ConsumerPriceIndexModel.cs b/Navigator/Model/ConsumerPriceIndexModel.cs
index 55e6e94..63de663 100644
--- a/Navigator/Model/ConsumerPriceIndexModel.cs
+++ b/Navigator/Model/ConsumerPriceIndexModel.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using DataDisplay.DataSource;
 using MarketData.MarketDataModel;
-using MarketData.MarketDataModel.GainLoss;
 
 namespace Navigator.MarketDataModel
 {
diff --git a/Navigator/Model/EconomicIndicatorsModel.cs b/Navigator/Model/EconomicIndicatorsModel.cs
new file mode 100644
index 0000000..2758c52
--- /dev/null
+++ b/Navigator/Model/EconomicIndicatorsModel.cs
@@ -0,0 +1,25 @@
+using DataDisplay.DataSource;
+using MarketData.MarketDataModel;
+using System;
+using System.Linq;
+
+namespace Navigator.MarketDataModel
+{
+  public class EconomicIndicatorsModel
+  {
+    private EconomicIndicatorsModel()
+    {
+    }
+    public static CompositeDataSource Elements(EconomicIndicators economicIndicators)
+    {
+      if (null == economicIndicators) return null;
+      CompositeDataSource compositeDataSource;
+      var xData = new EnumerableDataSource<DateTime>(economicIndicators.Select(x => new DateTime(x.Year,1, 1)));
+      xData.SetXMapping(x => (x.Ticks / 10000000000.0));
+      var yData = new EnumerableDataSource<double>(economicIndicators.Select(y => y.IndicatorValue));
+      yData.SetYMapping(y => y);
+      compositeDataSource = xData.Join(yData);
+      return compositeDataSource;
+    }
+  }
+}