diff --git a/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln b/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln
index 90ba96c7..e2d8477b 100644
--- a/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln
+++ b/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln
@@ -42,9 +42,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.PropertyGri
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Wizard", "Src\Samples\Modules\Samples.Modules.Wizard\Samples.Modules.Wizard.csproj", "{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.TimelinePanel", "Src\Samples\Modules\Samples.Modules.TimelinePanel\Samples.Modules.TimelinePanel.csproj", "{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}"
+EndProject
 Global
 	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 14
+		SccNumberOfProjects = 15
 		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
 		SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs02
 		SccLocalPath0 = .
@@ -99,6 +101,10 @@ Global
 		SccProjectTopLevelParentUniqueName13 = ExtendedWPFToolkit.sln
 		SccProjectName13 = Src/Samples/Modules/Samples.Modules.Wizard
 		SccLocalPath13 = Src\\Samples\\Modules\\Samples.Modules.Wizard
+		SccProjectUniqueName14 = Src\\Samples\\Modules\\Samples.Modules.TimelinePanel\\Samples.Modules.TimelinePanel.csproj
+		SccProjectTopLevelParentUniqueName14 = ExtendedWPFToolkit.sln
+		SccProjectName14 = Src/Samples/Modules/Samples.Modules.TimelinePanel
+		SccLocalPath14 = Src\\Samples\\Modules\\Samples.Modules.TimelinePanel
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -239,6 +245,16 @@ Global
 		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -257,5 +273,6 @@ Global
 		{22F36E4A-98E6-4A1C-96CA-52CA46F19274} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
 		{511FB369-57D2-430B-9002-F367DF165E70} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
 		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
 	EndGlobalSection
 EndGlobal
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
index 78e12432..23e0e804 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
@@ -17,8 +17,8 @@
 
   ********************************************************************-->
 <TreeViewItem x:Class="Samples.Modules.ChildWindow.Views.NavigationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:views="clr-namespace:Samples.Modules.ChildWindow.Views"
               Header="ChildWindow" Tag="{x:Type views:HomeView}">
 
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..259a8bc2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 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( "Extended WPF Toolkit TimelinePanel Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit TimelinePanel Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[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 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// 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" )]
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..e0aceb50
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.261
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Samples.Modules.TimelinePanel.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Samples.Modules.TimelinePanel.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Resources.resx b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Resources.resx
new file mode 100644
index 00000000..85c90909
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Resources.resx
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Settings.Designer.cs
new file mode 100644
index 00000000..58ad38e9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.261
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Samples.Modules.TimelinePanel.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Settings.settings b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Settings.settings
new file mode 100644
index 00000000..15034e76
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/Settings.settings
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj
new file mode 100644
index 00000000..278589ab
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.TimelinePanel</RootNamespace>
+    <AssemblyName>Samples.Modules.TimelinePanel</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="TimelinePanelModule.cs" />
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj.vspscc b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj.vspscc
new file mode 100644
index 00000000..feffdeca
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj.vspscc
@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = ""
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs
new file mode 100644
index 00000000..e5fed880
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.TimelinePanel.Views;
+
+namespace Samples.Modules.TimelinePanel
+{
+  public class TimelinePanelModule : ModuleBase
+  {
+    public TimelinePanelModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml
new file mode 100644
index 00000000..ba73c941
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml
@@ -0,0 +1,184 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.TimelinePanel.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:pf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 Title="TimelinePanel">
+   <sample:DemoView.Resources>
+      <ObjectDataProvider x:Key="Orientations" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="Orientation" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+      <ObjectDataProvider x:Key="OverlapBehaviors" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="xctk:OverlapBehavior" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+
+      <ControlTemplate x:Key="TimelineItemTemplate"
+                       TargetType="ContentControl">
+         <xctk:DropDownButton DataContext="{Binding ., RelativeSource={RelativeSource TemplatedParent}}"
+                              Content="{TemplateBinding Content}">
+            <xctk:DropDownButton.ContentTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{TemplateBinding Content}" 
+                             TextTrimming="WordEllipsis" 
+                             VerticalAlignment="Center" />
+               </DataTemplate>
+            </xctk:DropDownButton.ContentTemplate>
+
+            <xctk:DropDownButton.DropDownContent>
+               <Border Background="Lavender"
+                       Padding="5">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <TextBox Text="{Binding Content, Mode=TwoWay}"
+                           Grid.Row="0"
+                           Grid.Column="0"
+                           Grid.ColumnSpan="2"
+                           VerticalAlignment="Center"
+                           HorizontalContentAlignment="Center" />
+
+                     <TextBlock Text="From"
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                VerticalAlignment="Center"
+                                Margin="0,0,5,0" />
+                     <xctk:DateTimePicker Value="{Binding (xctk:TimelinePanel.Date), Mode=TwoWay}"
+                                          Grid.Row="1"
+                                          Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          Format="ShortDate" />
+
+                     <TextBlock Text="To"
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                VerticalAlignment="Center"
+                                Margin="0,0,5,0" />
+                     <xctk:DateTimePicker Value="{Binding (xctk:TimelinePanel.DateEnd), Mode=TwoWay}"
+                                          Grid.Row="2"
+                                          Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          Format="ShortDate" />
+                  </Grid>
+               </Border>
+            </xctk:DropDownButton.DropDownContent>
+         </xctk:DropDownButton>
+      </ControlTemplate>
+   </sample:DemoView.Resources>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="The TimelinePanel arrange elements on a timeline."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" Margin="5">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Orientation:" VerticalAlignment="Center" Margin="2" />
+            <ComboBox Name="_cboOrientation" Grid.Column="1" ItemsSource="{Binding Source={StaticResource Orientations}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
+
+            <TextBlock Text="Overlap behavior:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+            <ComboBox Name="_cboOverlap" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Source={StaticResource OverlapBehaviors}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
+
+            <TextBlock Text="Keep original order:" Grid.Row="2" VerticalAlignment="Center" Margin="2" />
+            <CheckBox x:Name="_keepOrder" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="5" IsChecked="True" />
+         </Grid>
+      </GroupBox>
+
+      <xctk:TimelinePanel x:Name="_panel"
+                          Grid.Row="2"
+                          Orientation="{Binding SelectedItem, ElementName=_cboOrientation}"
+                          OverlapBehavior="{Binding SelectedItem, ElementName=_cboOverlap}"
+                          KeepOriginalOrderForOverlap="{Binding IsChecked, ElementName=_keepOrder}">
+
+         <ContentControl xctk:TimelinePanel.Date="2012-01-01T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-01-16T00:00:00"
+                         Content="Event #1"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-02T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-02-26T00:00:00"
+                         Content="Event #2"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-14T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-03-14T00:00:00"
+                         Content="Event #3"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-21T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-03-10T00:00:00"
+                         Content="Event #4"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-05-17T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-06-23T00:00:00"
+                         Content="Event #5"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-06-06T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-08-13T00:00:00"
+                         Content="Event #6"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-08-13T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-09-29T00:00:00"
+                         Content="Event #7"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-11-01T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-12-01T00:00:00"
+                         Content="Event #8"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+      </xctk:TimelinePanel>
+   </Grid>
+</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..2d2fadc6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.TimelinePanel.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml
new file mode 100644
index 00000000..c5d85051
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.TimelinePanel.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.TimelinePanel.Views"
+              Header="TimelinePanel" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..1c3a1b26
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.TimelinePanel.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config
index cc9cb69d..dde3ced8 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <configSections>
-    <section name="modules" type="Microsoft.Practices.Prism.Modularity.ModulesConfigurationSection, Microsoft.Practices.Prism"/>
-  </configSections>
+   <configSections>
+      <section name="modules" type="Microsoft.Practices.Prism.Modularity.ModulesConfigurationSection, Microsoft.Practices.Prism"/>
+   </configSections>
 
-  <modules>
-    <module assemblyFile="Samples.Modules.BusyIndicator.dll" moduleType="Samples.Modules.BusyIndicator.BusyIndicatorModule, Samples.Modules.BusyIndicator" moduleName="BusyIndicatorModule" />
-    <module assemblyFile="Samples.Modules.Button.dll" moduleType="Samples.Modules.Button.ButtonModule, Samples.Modules.Button" moduleName="ButtonModule" />
-    <module assemblyFile="Samples.Modules.Calculator.dll" moduleType="Samples.Modules.Calculator.CalculatorModule, Samples.Modules.Calculator" moduleName="CalculatorModule" />
-    <module assemblyFile="Samples.Modules.ChildWindow.dll" moduleType="Samples.Modules.ChildWindow.ChildWindowModule, Samples.Modules.ChildWindow" moduleName="ChildWindowModule" />
-    <module assemblyFile="Samples.Modules.Color.dll" moduleType="Samples.Modules.Color.ColorModule, Samples.Modules.Color" moduleName="ColorModule" />    
-    <module assemblyFile="Samples.Modules.DateTime.dll" moduleType="Samples.Modules.DateTime.DateTimeModule, Samples.Modules.DateTime" moduleName="DateTimeModule" />    
-    <module assemblyFile="Samples.Modules.Numeric.dll" moduleType="Samples.Modules.Numeric.NumericModule, Samples.Modules.Numeric" moduleName="NumericModule" />
-    <module assemblyFile="Samples.Modules.PropertyGrid.dll" moduleType="Samples.Modules.PropertyGrid.PropertyGridModule, Samples.Modules.PropertyGrid" moduleName="PropertyGridModule" />
-    <module assemblyFile="Samples.Modules.Text.dll" moduleType="Samples.Modules.Text.TextModule, Samples.Modules.Text" moduleName="TextModule" />
-    <module assemblyFile="Samples.Modules.Wizard.dll" moduleType="Samples.Modules.Wizard.WizardModule, Samples.Modules.Wizard" moduleName="WizardModule" />
-  </modules>
+   <modules>
+      <module assemblyFile="Samples.Modules.BusyIndicator.dll" moduleType="Samples.Modules.BusyIndicator.BusyIndicatorModule, Samples.Modules.BusyIndicator" moduleName="BusyIndicatorModule" />
+      <module assemblyFile="Samples.Modules.Button.dll" moduleType="Samples.Modules.Button.ButtonModule, Samples.Modules.Button" moduleName="ButtonModule" />
+      <module assemblyFile="Samples.Modules.Calculator.dll" moduleType="Samples.Modules.Calculator.CalculatorModule, Samples.Modules.Calculator" moduleName="CalculatorModule" />
+      <module assemblyFile="Samples.Modules.ChildWindow.dll" moduleType="Samples.Modules.ChildWindow.ChildWindowModule, Samples.Modules.ChildWindow" moduleName="ChildWindowModule" />
+      <module assemblyFile="Samples.Modules.Color.dll" moduleType="Samples.Modules.Color.ColorModule, Samples.Modules.Color" moduleName="ColorModule" />
+      <module assemblyFile="Samples.Modules.DateTime.dll" moduleType="Samples.Modules.DateTime.DateTimeModule, Samples.Modules.DateTime" moduleName="DateTimeModule" />
+      <module assemblyFile="Samples.Modules.Numeric.dll" moduleType="Samples.Modules.Numeric.NumericModule, Samples.Modules.Numeric" moduleName="NumericModule" />
+      <module assemblyFile="Samples.Modules.PropertyGrid.dll" moduleType="Samples.Modules.PropertyGrid.PropertyGridModule, Samples.Modules.PropertyGrid" moduleName="PropertyGridModule" />
+      <module assemblyFile="Samples.Modules.Text.dll" moduleType="Samples.Modules.Text.TextModule, Samples.Modules.Text" moduleName="TextModule" />
+      <module assemblyFile="Samples.Modules.TimelinePanel.dll" moduleType="Samples.Modules.TimelinePanel.TimelinePanelModule, Samples.Modules.TimelinePanel" moduleName="TimelinePanelModule" />
+      <module assemblyFile="Samples.Modules.Wizard.dll" moduleType="Samples.Modules.Wizard.WizardModule, Samples.Modules.Wizard" moduleName="WizardModule" />
+   </modules>
 </configuration>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
index 5c688663..27a420bd 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
@@ -32,7 +32,7 @@
          </Grid.RowDefinitions>
 
          <Grid Margin="10,0,10,10">
-            <TextBlock Text="Extended WPF Toolkit" Foreground="WHite" FontSize="28" FontWeight="Bold" />
+            <TextBlock Text="Extended WPF Toolkit" Foreground="White" FontSize="28" FontWeight="Bold" />
          </Grid>
 
          <Grid Grid.Row="1">
@@ -43,9 +43,9 @@
 
             <Border CornerRadius="5" BorderBrush="#FF666666" BorderThickness="1">
                <TreeView prism:RegionManager.RegionName="{x:Static inf:RegionNames.NavigationRegion}" 
-                              infCommands:TreeViewSelected.Command="{Binding NavigateCommand}" 
-                              BorderBrush="{x:Null}" MinWidth="225" Margin="3"
-                              Loaded="TreeView_Loaded">
+                         infCommands:TreeViewSelected.Command="{Binding NavigateCommand}" 
+                         BorderBrush="{x:Null}" MinWidth="225" Margin="3"
+                         Loaded="TreeView_Loaded">
                   <TreeView.Background>
                      <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                         <GradientStop Color="#A1000000" Offset="0" />
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs
index 28fd6694..8917394e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
+//     Runtime Version:4.0.30319.261
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs
index 3d2d9dad..6ec402eb 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
+//     Runtime Version:4.0.30319.261
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
index c8de792b..50f09ab1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
@@ -18,6 +18,7 @@
   **********************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows;
@@ -192,7 +193,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         editor = new FontComboBoxEditor();
       else if( propertyItem.PropertyType.IsGenericType )
       {
-        if( propertyItem.PropertyType.GetInterface( "IList" ) != null )
+        if( propertyItem.PropertyType.GetInterface( typeof( IList ).FullName ) != null )
         {
           var t = propertyItem.PropertyType.GetGenericArguments()[ 0 ];
           if( !t.IsPrimitive && !t.Equals( typeof( String ) ) )
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs
new file mode 100644
index 00000000..0bc9e99c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs
@@ -0,0 +1,94 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal sealed class DateElement : IComparable<DateElement>
+  {
+    #region Members
+
+    private readonly int _originalIndex;
+
+    #endregion //Members
+
+    #region Fields
+
+    public readonly UIElement Element;
+    public readonly DateTime Date;
+    public readonly DateTime DateEnd;
+    public Rect PlacementRectangle;
+
+    public int Column = 0;
+    public int ColumnSpan = 1;
+
+    #endregion //Fields
+
+    #region Constructors
+
+    internal DateElement( UIElement element, DateTime date, DateTime dateEnd )
+      : this( element, date, dateEnd, -1 )
+    {
+    }
+
+    internal DateElement( UIElement element, DateTime date, DateTime dateEnd, int originalIndex )
+    {
+      Element = element;
+      Date = date;
+      DateEnd = dateEnd;
+      _originalIndex = originalIndex;
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override string ToString()
+    {
+      var fe = Element as FrameworkElement;
+      if( fe == null )
+        return base.ToString();
+
+      if( fe.Tag != null )
+        return fe.Tag.ToString();
+
+      return fe.Name;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    public int CompareTo( DateElement d )
+    {
+      int dateCompare = Date.CompareTo( d.Date );
+      if( dateCompare != 0 )
+        return dateCompare;
+
+      if( _originalIndex >= 0 )
+        return ( _originalIndex < d._originalIndex ) ? -1 : 1;
+
+      return -DateEnd.CompareTo( d.DateEnd );
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs
new file mode 100644
index 00000000..a1bf2213
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum OverlapBehavior
+  {
+    Stack,
+    Stretch,
+    Hide,
+    None
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs
new file mode 100644
index 00000000..644a7d28
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs
@@ -0,0 +1,1312 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class TimelinePanel : Panel, IScrollInfo
+  {
+    #region Members
+
+    private List<DateElement> _visibleElements = null;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region BeginDate Property
+
+    public static readonly DependencyProperty BeginDateProperty = DependencyProperty.Register( "BeginDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public DateTime BeginDate
+    {
+      get
+      {
+        return ( DateTime )GetValue( BeginDateProperty );
+      }
+      set
+      {
+        SetValue( BeginDateProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region EndDate Property
+
+    public static readonly DependencyProperty EndDateProperty = DependencyProperty.Register( "EndDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public DateTime EndDate
+    {
+      get
+      {
+        return ( DateTime )GetValue( EndDateProperty );
+      }
+      set
+      {
+        SetValue( EndDateProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region OverlapBehavior Property
+
+    public static readonly DependencyProperty OverlapBehaviorProperty = DependencyProperty.Register( "OverlapBehavior", typeof( OverlapBehavior ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( default( OverlapBehavior ), FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public OverlapBehavior OverlapBehavior
+    {
+      get
+      {
+        return ( OverlapBehavior )GetValue( OverlapBehaviorProperty );
+      }
+      set
+      {
+        SetValue( OverlapBehaviorProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region KeepOriginalOrderForOverlap Property
+
+    public static readonly DependencyProperty KeepOriginalOrderForOverlapProperty = DependencyProperty.Register( "KeepOriginalOrderForOverlap", typeof( bool ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public bool KeepOriginalOrderForOverlap
+    {
+      get
+      {
+        return ( bool )GetValue( KeepOriginalOrderForOverlapProperty );
+      }
+      set
+      {
+        SetValue( KeepOriginalOrderForOverlapProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Orientation Property
+
+    public static readonly DependencyProperty OrientationProperty = StackPanel.OrientationProperty.AddOwner( typeof( TimelinePanel ), new FrameworkPropertyMetadata( Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public Orientation Orientation
+    {
+      get
+      {
+        return ( Orientation )GetValue( OrientationProperty );
+      }
+      set
+      {
+        SetValue( OrientationProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region UnitTimeSpan Property
+
+    public static readonly DependencyProperty UnitTimeSpanProperty = DependencyProperty.Register( "UnitTimeSpan", typeof( TimeSpan ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( TimeSpan.Zero, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public TimeSpan UnitTimeSpan
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( UnitTimeSpanProperty );
+      }
+      set
+      {
+        SetValue( UnitTimeSpanProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region UnitSize Property
+
+    public static readonly DependencyProperty UnitSizeProperty = DependencyProperty.Register( "UnitSize", typeof( double ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public double UnitSize
+    {
+      get
+      {
+        return ( double )GetValue( UnitSizeProperty );
+      }
+      set
+      {
+        SetValue( UnitSizeProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Date Attached Property
+
+    public static readonly DependencyProperty DateProperty = DependencyProperty.RegisterAttached( "Date", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
+
+    public static DateTime GetDate( DependencyObject obj )
+    {
+      return ( DateTime )obj.GetValue( DateProperty );
+    }
+
+    public static void SetDate( DependencyObject obj, DateTime value )
+    {
+      obj.SetValue( DateProperty, value );
+    }
+
+    #endregion
+
+    #region DateEnd Attached Property
+
+    public static readonly DependencyProperty DateEndProperty = DependencyProperty.RegisterAttached( "DateEnd", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
+
+    public static DateTime GetDateEnd( DependencyObject obj )
+    {
+      return ( DateTime )obj.GetValue( DateEndProperty );
+    }
+
+    public static void SetDateEnd( DependencyObject obj, DateTime value )
+    {
+      obj.SetValue( DateEndProperty, value );
+    }
+
+    #endregion
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static TimelinePanel()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimelinePanel ), new FrameworkPropertyMetadata( typeof( TimelinePanel ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override Size MeasureOverride( Size availableSize )
+    {
+      DateTime calcBeginDate = DateTime.MaxValue;
+      DateTime calcEndDate = DateTime.MinValue;
+
+      foreach( UIElement child in InternalChildren )
+      {
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        if( date < calcBeginDate )
+        {
+          calcBeginDate = date;
+        }
+
+        if( date > calcEndDate )
+        {
+          calcEndDate = date;
+        }
+
+        if( dateEnd > calcEndDate )
+        {
+          calcEndDate = dateEnd;
+        }
+      }
+
+      if( BeginDate == DateTime.MinValue )
+      {
+        BeginDate = calcBeginDate;
+      }
+
+      if( EndDate == DateTime.MinValue )
+      {
+        EndDate = calcEndDate;
+      }
+
+      foreach( UIElement child in InternalChildren )
+      {
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        Size childSize = availableSize;
+
+        if( dateEnd > DateTime.MinValue && dateEnd > date )
+        {
+          if( Orientation == Orientation.Horizontal )
+          {
+            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+            {
+              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+              childSize.Width = size * UnitSize;
+            }
+            else if( !double.IsPositiveInfinity( availableSize.Width ) )
+            {
+              // width is DateEnd - Date
+              childSize.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
+            }
+          }
+          else
+          {
+            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+            {
+              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+              childSize.Height = size * UnitSize;
+            }
+            else if( !double.IsPositiveInfinity( availableSize.Height ) )
+            {
+              // height is DateEnd - Date
+              childSize.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
+            }
+          }
+        }
+
+        child.Measure( childSize );
+      }
+
+      Size newAvailableSize = new Size( availableSize.Width, availableSize.Height );
+
+      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+      {
+        double size = ( double )( EndDate.Ticks - BeginDate.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+        if( Orientation == Orientation.Horizontal )
+        {
+          newAvailableSize.Width = size * UnitSize;
+        }
+        else
+        {
+          newAvailableSize.Height = size * UnitSize;
+        }
+      }
+
+      Size desiredSize = new Size();
+
+      if( ( Orientation == Orientation.Vertical && double.IsPositiveInfinity( newAvailableSize.Height ) ) ||
+          ( Orientation == Orientation.Horizontal && double.IsPositiveInfinity( newAvailableSize.Width ) ) )
+      {
+        // Our panel cannot layout items when we have positive infinity in the layout direction
+        // so defer to arrange pass.
+        _visibleElements = null;
+      }
+      else
+      {
+        LayoutItems( InternalChildren, newAvailableSize );
+
+        Rect desiredRect = new Rect();
+
+        foreach( DateElement child in _visibleElements )
+        {
+          desiredRect.Union( child.PlacementRectangle );
+        }
+
+        if( Orientation == Orientation.Horizontal )
+        {
+          desiredSize.Width = newAvailableSize.Width;
+          desiredSize.Height = desiredRect.Size.Height;
+        }
+        else
+        {
+          desiredSize.Width = desiredRect.Size.Width;
+          desiredSize.Height = newAvailableSize.Height;
+        }
+      }
+
+      if( IsScrolling )
+      {
+        Size viewport = new Size( availableSize.Width, availableSize.Height );
+        Size extent = new Size( desiredSize.Width, desiredSize.Height );
+        Vector offset = new Vector( Math.Max( 0, Math.Min( _offset.X, extent.Width - viewport.Width ) ),
+                                    Math.Max( 0, Math.Min( _offset.Y, extent.Height - viewport.Height ) ) );
+
+        SetScrollingData( viewport, extent, offset );
+
+        desiredSize.Width = Math.Min( desiredSize.Width, availableSize.Width );
+        desiredSize.Height = Math.Min( desiredSize.Height, availableSize.Height );
+
+        _physicalViewport = availableSize;
+      }
+
+      return desiredSize;
+    }
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      Rect finalRect = new Rect();
+
+      if( _visibleElements == null )
+      {
+        LayoutItems( InternalChildren, finalSize );
+      }
+
+      foreach( DateElement child in _visibleElements )
+      {
+        if( IsScrolling )
+        {
+          Rect placement = new Rect( child.PlacementRectangle.Location, child.PlacementRectangle.Size );
+          placement.Offset( -_offset );
+
+          child.Element.Arrange( placement );
+        }
+        else
+        {
+          child.Element.Arrange( child.PlacementRectangle );
+        }
+
+        finalRect.Union( child.PlacementRectangle );
+      }
+
+      Size renderSize;
+
+      if( Orientation == Orientation.Horizontal )
+      {
+        renderSize = new Size( finalSize.Width, finalRect.Size.Height );
+      }
+      else
+      {
+        renderSize = new Size( finalRect.Size.Width, finalSize.Height );
+      }
+
+      return renderSize;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    private void ResetScrollInfo()
+    {
+      _offset = new Vector();
+      _physicalViewport = _viewport = _extent = new Size( 0, 0 );
+    }
+
+    private void SetScrollingData( Size viewport, Size extent, Vector offset )
+    {
+      _offset = offset;
+
+      if( !AreVirtuallyEqual( viewport, _viewport ) ||
+          !AreVirtuallyEqual( extent, _extent ) ||
+          !AreVirtuallyEqual( offset, _computedOffset ) )
+      {
+        _viewport = viewport;
+        _extent = extent;
+        _offset = offset;
+
+        OnScrollChange();
+      }
+    }
+
+    private double ValidateInputOffset( double offset, string parameterName )
+    {
+      if( double.IsNaN( offset ) )
+        throw new ArgumentOutOfRangeException( parameterName );
+
+      return Math.Max( 0d, offset );
+    }
+
+    private void OnScrollChange()
+    {
+      if( ScrollOwner != null )
+      {
+        ScrollOwner.InvalidateScrollInfo();
+      }
+    }
+
+    private double CalculateTimelineOffset( DateTime d, double finalWidth )
+    {
+      double offset;
+
+      long tickRange = EndDate.Ticks - BeginDate.Ticks;
+      long tickOffset = d.Ticks - BeginDate.Ticks;
+
+      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+      {
+        offset = ( ( double )tickOffset / ( double )UnitTimeSpan.Ticks ) * UnitSize;
+      }
+      else
+      {
+        if( tickRange > 0 )
+        {
+          offset = ( ( double )tickOffset / ( double )tickRange ) * finalWidth;
+        }
+        else
+        {
+          offset = 0;
+        }
+      }
+
+      return offset;
+    }
+
+    private static int CompareElementsByLeft( DateElement a, DateElement b )
+    {
+      return a.PlacementRectangle.Left.CompareTo( b.PlacementRectangle.Left );
+    }
+
+    private static int CompareElementsByTop( DateElement a, DateElement b )
+    {
+      return a.PlacementRectangle.Top.CompareTo( b.PlacementRectangle.Top );
+    }
+
+    private void LayoutItems( UIElementCollection children, Size availableSize )
+    {
+      _visibleElements = new List<DateElement>();
+      List<DateElement> overlappingElements = new List<DateElement>();
+
+      int index = 0;
+      foreach( UIElement child in children )
+      {
+        if( child == null )
+          continue;
+
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        if( child.Visibility != Visibility.Collapsed )
+        {
+          if( KeepOriginalOrderForOverlap )
+          {
+            _visibleElements.Add( new DateElement( child, date, dateEnd, index ) );
+          }
+          else
+          {
+            _visibleElements.Add( new DateElement( child, date, dateEnd ) );
+          }
+        }
+
+        index++;
+      }
+
+      _visibleElements.Sort();
+
+      foreach( DateElement child in _visibleElements )
+      {
+        DateTime date = GetDate( child.Element );
+        DateTime dateEnd = GetDateEnd( child.Element );
+
+        if( Orientation == Orientation.Vertical )
+        {
+
+          //---------------------------------------------------------------------
+          // 
+          // Begin Layout Algorithm (Vertical Orientation)
+          //
+          //---------------------------------------------------------------------
+
+          // calculate the values for y (top) and height
+
+          // y
+          child.PlacementRectangle.Y = CalculateTimelineOffset( date, availableSize.Height );
+
+          // height
+          if( dateEnd > DateTime.MinValue && dateEnd > date )
+          {
+            // height is DateEnd - Date
+            child.PlacementRectangle.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
+          }
+          else
+          {
+            // height is the desired size
+            child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+          }
+
+          // now calcualte the values for x (left) and width based on the OverlapBehavior
+
+          switch( OverlapBehavior )
+          {
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == None (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.None:
+
+              #region OverlapBehavior == None (Vertical)
+
+              child.PlacementRectangle.X = 0;
+              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Hide (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Hide:
+
+              #region OverlapBehavior = Hide
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              if( overlappingElements.Count > 0 )
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Width = 0;
+                child.PlacementRectangle.Height = 0;
+              }
+              else
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stretch (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stretch:
+
+              #region OverlapBehavior = Stretch
+
+              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
+              // only need to look for elements that intersect at the "top" of the item that is being
+              // placed because the _VisibleElements collection has been sorted so that the first 
+              // items come first--this means there won't be anything "below" the current item that
+              // isn't also below the current item
+
+              // find all overlapping elements
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByLeft );
+
+              // initialize left and width such that the item will be stretch to fill the available 
+              // space and if there are no overlapping items, skip to the end
+
+              double left = 0;
+              double width = availableSize.Width;
+
+              if( overlappingElements.Count > 0 )
+              {
+
+                bool foundGap = false;
+
+                // now, look for a gap (there is a good chance that there won't be one, but if there is 
+                // then we will place the item in it)
+
+                for( int i = 0; i < overlappingElements.Count; i++ )
+                {
+                  Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                  // if this is the first overlapping element, then look for a gap at the beginning
+                  if( i == 0 )
+                  {
+                    if( r.Left > 0 )
+                    {
+                      left = 0;
+                      width = r.Left;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                  // if this is the last overlapping element
+                  if( i == overlappingElements.Count - 1 )
+                  {
+                    //left = r.Right;
+                    break;
+                  }
+
+                  // if this is an element somewhere in the middle, then 
+                  else
+                  {
+                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                    if( ( n.Left - r.Right ) > 0 )
+                    {
+                      left = r.Right;
+                      width = n.Left - r.Right;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                }
+
+                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
+                // over and then placing the item at the end
+
+                if( !foundGap )
+                {
+                  width = Math.Min( availableSize.Width / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Width );
+                  left = 0;
+
+                  foreach( DateElement e in overlappingElements )
+                  {
+                    e.PlacementRectangle.Width = width;
+                    e.PlacementRectangle.X = left;
+                    left += width;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.X = left;
+
+              if( double.IsPositiveInfinity( width ) )
+              {
+                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+              }
+              else
+              {
+                child.PlacementRectangle.Width = width;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stack (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stack:
+
+              #region OverlapBehavior = Stack;
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByLeft );
+
+              // initialize left and width values, width will always be it's desired size
+
+              left = 0;
+              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+
+              // find the first gap that is big enough to accomodate the current item
+
+              for( int i = 0; i < overlappingElements.Count; i++ )
+              {
+                Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                if( i == 0 )
+                {
+                  if( r.Left >= child.PlacementRectangle.Width )
+                  {
+                    left = 0;
+                    break;
+                  }
+                }
+
+                if( i == overlappingElements.Count - 1 )
+                {
+                  left = r.Right;
+                  break;
+                }
+                else
+                {
+                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                  if( ( n.Left - r.Right ) >= child.PlacementRectangle.Width )
+                  {
+                    left = r.Right;
+                    break;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.X = left;
+
+              break;
+
+              #endregion
+          }
+        }
+        else
+        {
+          //---------------------------------------------------------------------
+          // 
+          // Begin Layout Algorithm (Horizontal Orientation)
+          //
+          //---------------------------------------------------------------------
+
+          // calculate the values for x (left) and width
+
+          // x
+          child.PlacementRectangle.X = CalculateTimelineOffset( date, availableSize.Width );
+
+          // width
+          if( dateEnd > DateTime.MinValue && dateEnd > date )
+          {
+            // width is DateEnd - Date
+            child.PlacementRectangle.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
+          }
+          else
+          {
+            // width is the desired size
+            child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+          }
+
+          // now calcualte the values for y (top) and height based on the OverlapBehavior
+
+          switch( OverlapBehavior )
+          {
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == None (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.None:
+
+              #region OverlapBehavior == None (Horizontal)
+
+              child.PlacementRectangle.Y = 0;
+              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Hide (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Hide:
+
+              #region OverlapBehavior = Hide (Horizontal)
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              if( overlappingElements.Count > 0 )
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Width = 0;
+                child.PlacementRectangle.Height = 0;
+              }
+              else
+              {
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stretch (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stretch:
+
+              #region OverlapBehavior = Stretch
+
+              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
+              // only need to look for elements that intersect at the "top" of the item that is being
+              // placed because the _VisibleElements collection has been sorted so that the first 
+              // items come first--this means there won't be anything "below" the current item that
+              // isn't also below the current item
+
+              // find all overlapping elements
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByTop );
+
+              // initialize left and width such that the item will be stretch to fill the available 
+              // space and if there are no overlapping items, skip to the end
+
+              double top = 0;
+              double height = availableSize.Height;
+
+              if( overlappingElements.Count > 0 )
+              {
+
+                bool foundGap = false;
+
+                // now, look for a gap (there is a good chance that there won't be one, but if there is 
+                // then we will place the item in it)
+
+                for( int i = 0; i < overlappingElements.Count; i++ )
+                {
+                  Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                  // if this is the first overlapping element, then look for a gap at the beginning
+                  if( i == 0 )
+                  {
+                    if( r.Top > 0 )
+                    {
+                      top = 0;
+                      height = r.Top;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                  // if this is the last overlapping element
+                  if( i == overlappingElements.Count - 1 )
+                  {
+                    //left = r.Right;
+                    break;
+                  }
+
+                  // if this is an element somewhere in the middle, then 
+                  else
+                  {
+                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                    if( ( n.Top - r.Bottom ) > 0 )
+                    {
+                      top = r.Bottom;
+                      height = n.Top - r.Bottom;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                }
+
+                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
+                // over and then placing the item at the end
+
+                if( !foundGap )
+                {
+                  height = Math.Min( availableSize.Height / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Height );
+                  top = 0;
+
+                  foreach( DateElement e in overlappingElements )
+                  {
+                    e.PlacementRectangle.Height = height;
+                    e.PlacementRectangle.Y = top;
+                    top += height;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.Y = top;
+
+              if( double.IsPositiveInfinity( height ) )
+              {
+                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+              }
+              else
+              {
+                child.PlacementRectangle.Height = height;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stack (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stack:
+
+              #region OverlapBehavior = Stack;
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByTop );
+
+              // initialize left and width values, width will always be it's desired size
+
+              top = 0;
+              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+
+              // find the first gap that is big enough to accomodate the current item
+
+              for( int i = 0; i < overlappingElements.Count; i++ )
+              {
+                Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                if( i == 0 )
+                {
+                  if( r.Top >= child.PlacementRectangle.Height )
+                  {
+                    top = 0;
+                    break;
+                  }
+                }
+
+                if( i == overlappingElements.Count - 1 )
+                {
+                  top = r.Bottom;
+                  break;
+                }
+                else
+                {
+                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                  if( ( n.Top - r.Bottom ) >= child.PlacementRectangle.Height )
+                  {
+                    top = r.Bottom;
+                    break;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.Y = top;
+
+              break;
+
+              #endregion
+          }
+        }
+      }
+    }
+
+    private static bool AreVirtuallyEqual( double d1, double d2 )
+    {
+      if( double.IsPositiveInfinity( d1 ) )
+        return double.IsPositiveInfinity( d2 );
+
+      if( double.IsNegativeInfinity( d1 ) )
+        return double.IsNegativeInfinity( d2 );
+
+      if( double.IsNaN( d1 ) )
+        return double.IsNaN( d2 );
+
+      double n = d1 - d2;
+      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
+      return ( -d < n ) && ( d > n );
+    }
+
+    private static bool AreVirtuallyEqual( Size s1, Size s2 )
+    {
+      return AreVirtuallyEqual( s1.Width, s2.Width )
+          && AreVirtuallyEqual( s1.Height, s2.Height );
+    }
+
+    private static bool AreVirtuallyEqual( Vector v1, Vector v2 )
+    {
+      return AreVirtuallyEqual( v1.X, v2.X )
+          && AreVirtuallyEqual( v1.Y, v2.Y );
+    }
+
+    #endregion //Methods
+
+    #region Interfaces
+
+    #region IScrollInfo
+
+    public bool CanHorizontallyScroll
+    {
+      get
+      {
+        return _allowHorizontal;
+      }
+      set
+      {
+        _allowHorizontal = value;
+      }
+    }
+
+    public bool CanVerticallyScroll
+    {
+      get
+      {
+        return _allowVertical;
+      }
+      set
+      {
+        _allowVertical = value;
+      }
+    }
+
+    public double ExtentHeight
+    {
+      get
+      {
+        return _extent.Height;
+      }
+    }
+
+    public double ExtentWidth
+    {
+      get
+      {
+        return _extent.Width;
+      }
+    }
+
+    public double HorizontalOffset
+    {
+      get
+      {
+        return _offset.X;
+      }
+    }
+
+    public void LineDown()
+    {
+      SetVerticalOffset( VerticalOffset + ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
+    }
+
+    public void LineLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
+    }
+
+    public void LineRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
+    }
+
+    public void LineUp()
+    {
+      SetVerticalOffset( VerticalOffset - ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
+    }
+
+    public Rect MakeVisible( Visual visual, Rect rectangle )
+    {
+      return rectangle;
+    }
+
+    public void MouseWheelDown()
+    {
+      SetVerticalOffset( VerticalOffset + ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelUp()
+    {
+      SetVerticalOffset( VerticalOffset - ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
+    }
+
+    public void PageDown()
+    {
+      SetVerticalOffset( VerticalOffset + ViewportHeight );
+    }
+
+    public void PageLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ViewportWidth );
+    }
+
+    public void PageRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ViewportWidth );
+    }
+
+    public void PageUp()
+    {
+      SetVerticalOffset( VerticalOffset - ViewportHeight );
+    }
+
+    public ScrollViewer ScrollOwner
+    {
+      get
+      {
+        return _scrollOwner;
+      }
+      set
+      {
+        if( _scrollOwner != value )
+        {
+          _scrollOwner = value;
+
+          ResetScrollInfo();
+        }
+      }
+    }
+
+    public void SetHorizontalOffset( double offset )
+    {
+      offset = ValidateInputOffset( offset, "HorizontalOffset" );
+
+      if( !AreVirtuallyEqual( offset, _offset.X ) )
+      {
+        _offset.X = offset;
+
+        InvalidateMeasure();
+      }
+    }
+
+    public void SetVerticalOffset( double offset )
+    {
+      offset = ValidateInputOffset( offset, "VerticalOffset" );
+
+      if( !AreVirtuallyEqual( offset, _offset.Y ) )
+      {
+        _offset.Y = offset;
+
+        InvalidateMeasure();
+      }
+    }
+
+    public double VerticalOffset
+    {
+      get
+      {
+        return _offset.Y;
+      }
+    }
+
+    public double ViewportHeight
+    {
+      get
+      {
+        return _viewport.Height;
+      }
+    }
+
+    public double ViewportWidth
+    {
+      get
+      {
+        return _viewport.Width;
+      }
+    }
+
+    private bool IsScrolling
+    {
+      get
+      {
+        return ( _scrollOwner != null );
+      }
+    }
+
+    private bool _allowHorizontal = false;
+    private bool _allowVertical = false;
+    private Vector _computedOffset = new Vector( 0d, 0d );
+    private Size _extent = new Size( 0, 0 );
+    private Vector _offset = new Vector( 0, 0 );
+    private ScrollViewer _scrollOwner = null;
+    private Size _viewport;
+    private Size _physicalViewport;
+
+    #endregion //IScrollInfo
+
+    #endregion //Interfaces
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
index ad4a0ecb..c449db15 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{72E591D6-8F83-4D8C-8F67-9C325E623234}</ProjectGuid>
     <OutputType>library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Windows.Controls</RootNamespace>
+    <RootNamespace>Xceed.Wpf.Toolkit</RootNamespace>
     <AssemblyName>WPFToolkit.Extended</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
@@ -324,6 +324,9 @@
     <Compile Include="Core\Primitives\UpDownBase.cs" />
     <Compile Include="SplitButton\Implementation\SplitButton.cs" />
     <Compile Include="Core\Themes\ResourceKeys.cs" />
+    <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
+    <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
+    <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
     <Compile Include="TimePicker\Implementation\TimeFormat.cs" />
     <Compile Include="TimePicker\Implementation\TimeItem.cs" />
     <Compile Include="TimePicker\Implementation\TimePicker.cs" />
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
index 2693f55e..4ae399a3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -541,6 +541,15 @@
     <Compile Include="..\..\..\ExtendedWPFToolkitSolution\Src\WPFToolkit.Extended\SplitButton\Implementation\SplitButton.cs">
       <Link>SplitButton\Implementation\SplitButton.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\ExtendedWPFToolkitSolution\Src\WPFToolkit.Extended\TimelinePanel\Implementation\DateElement.cs">
+      <Link>TimelinePanel\Implementation\DateElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\ExtendedWPFToolkitSolution\Src\WPFToolkit.Extended\TimelinePanel\Implementation\OverlapBehavior.cs">
+      <Link>TimelinePanel\Implementation\OverlapBehavior.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\ExtendedWPFToolkitSolution\Src\WPFToolkit.Extended\TimelinePanel\Implementation\TimelinePanel.cs">
+      <Link>TimelinePanel\Implementation\TimelinePanel.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\ExtendedWPFToolkitSolution\Src\WPFToolkit.Extended\TimePicker\Implementation\TimeFormat.cs">
       <Link>TimePicker\Implementation\TimeFormat.cs</Link>
     </Compile>