diff --git a/CaliburnMicro.pptx b/CaliburnMicro.pptx
index ebfdf0c..97c85f8 100644
Binary files a/CaliburnMicro.pptx and b/CaliburnMicro.pptx differ
diff --git a/CoroutineNote.txt b/CoroutineNote.txt
new file mode 100644
index 0000000..fe9d666
--- /dev/null
+++ b/CoroutineNote.txt
@@ -0,0 +1,22 @@
+public void DoStuff()
+{
+	....
+
+	if (someQuestion)
+	{
+		return;
+	}
+
+	if (someOtherQuestion)
+	{
+		return;
+	}
+
+	Action<Result> whenCompleted = (result) => 
+	{
+		(blah, blah, ...)
+	};
+
+	Async(doXyz(), whenCompleted );
+
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/License.txt b/code/Caliburn.Micro/License.txt
similarity index 100%
rename from code/Caliburn.Micro/src/License.txt
rename to code/Caliburn.Micro/License.txt
diff --git a/code/Caliburn.Micro/Readme.txt b/code/Caliburn.Micro/Readme.txt
index 9fea068..63bc613 100644
--- a/code/Caliburn.Micro/Readme.txt
+++ b/code/Caliburn.Micro/Readme.txt
@@ -1,6 +1,6 @@
-The Caliburn.Micro source code is from November 17, 2010.
+The Caliburn.Micro source code is from June 1, 2011.
 
-The changeset is: b41ec4270d71
+The changeset is: 5764a107cea0 and is sssociated with Release: Caliburn.Micro v1.1 RTW.
 
-The url is: http://caliburnmicro.codeplex.com/SourceControl/changeset/changes/b41ec4270d71
+The url is: http://caliburnmicro.codeplex.com/SourceControl/changeset/changes/5764a107cea0
 
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction.sln
new file mode 100644
index 0000000..639ff22
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.BubblingAction", "Caliburn.Micro.BubblingAction\Caliburn.Micro.BubblingAction.csproj", "{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/App.xaml
new file mode 100644
index 0000000..0fdcca5
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/App.xaml
@@ -0,0 +1,8 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.BubblingAction"
+             x:Class="Caliburn.Micro.BubblingAction.App">
+	<Application.Resources>
+        <local:MefBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/App.xaml.cs
new file mode 100644
index 0000000..68d938d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/App.xaml.cs
@@ -0,0 +1,12 @@
+namespace Caliburn.Micro.BubblingAction
+{
+    using System.Windows;
+
+    public partial class App : Application
+    {
+        public App()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction.csproj
new file mode 100644
index 0000000..c0e22d2
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction.csproj
@@ -0,0 +1,117 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.BubblingAction</RootNamespace>
+    <AssemblyName>Caliburn.Micro.BubblingAction</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloWorld.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.BubblingAction.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloWorldTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Model.cs" />
+    <Compile Include="IShell.cs" />
+    <Compile Include="MefBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/IShell.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/IShell.cs
new file mode 100644
index 0000000..4d810d0
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/IShell.cs
@@ -0,0 +1,7 @@
+namespace Caliburn.Micro.BubblingAction
+{
+    public interface IShell
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/MefBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/MefBootstrapper.cs
new file mode 100644
index 0000000..0c392c0
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/MefBootstrapper.cs
@@ -0,0 +1,52 @@
+namespace Caliburn.Micro.BubblingAction
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.Primitives;
+    using System.Linq;
+
+    public class MefBootstrapper : Bootstrapper<IShell>
+    {
+        private CompositionContainer container;
+
+        protected override void Configure()
+        {
+            container = CompositionHost.Initialize(
+                new AggregateCatalog(
+                    AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()
+                    )
+                );
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue(container);
+
+            container.Compose(batch);
+        }
+
+        protected override object GetInstance(Type serviceType, string key)
+        {
+            string contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if (exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType)
+        {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance)
+        {
+            container.SatisfyImportsOnce(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Model.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Model.cs
new file mode 100644
index 0000000..6bf49d7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Model.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.BubblingAction
+{
+    using System;
+
+    public class Model
+    {
+        public Guid Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..965b80f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("Caliburn.Micro.BubblingAction")]
+[assembly:AssemblyDescription("")]
+[assembly:AssemblyConfiguration("")]
+[assembly:AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.BubblingAction")]
+[assembly:AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly:Guid("12bf83be-62fe-43d7-8d46-b4e7dd69b06e")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersion("1.0.0.0")]
+[assembly:AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/ShellView.xaml
new file mode 100644
index 0000000..d2fb264
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/ShellView.xaml
@@ -0,0 +1,20 @@
+<UserControl x:Class="Caliburn.Micro.BubblingAction.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:cal="http://www.caliburnproject.org">
+	<StackPanel>
+		<ItemsControl x:Name="Items">
+			<ItemsControl.ItemTemplate>
+				<DataTemplate>
+					<StackPanel Orientation="Horizontal">
+						<Button Content="Remove"
+						        cal:Message.Attach="Remove($dataContext)" />
+						<TextBlock Text="{Binding Id}" />
+					</StackPanel>
+				</DataTemplate>
+			</ItemsControl.ItemTemplate>
+		</ItemsControl>
+		<Button Content="Add"
+		        cal:Message.Attach="Add" />
+	</StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/ShellViewModel.cs
new file mode 100644
index 0000000..5388b54
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.BubblingAction/Caliburn.Micro.BubblingAction/ShellViewModel.cs
@@ -0,0 +1,31 @@
+namespace Caliburn.Micro.BubblingAction
+{
+    using System;
+    using System.ComponentModel.Composition;
+
+    [Export(typeof(IShell))]
+    public class ShellViewModel : IShell
+    {
+        public BindableCollection<Model> Items { get; private set; }
+
+        public ShellViewModel()
+        {
+            Items = new BindableCollection<Model>{
+                new Model { Id = Guid.NewGuid() },
+                new Model { Id = Guid.NewGuid() },
+                new Model { Id = Guid.NewGuid() },
+                new Model { Id = Guid.NewGuid() }
+            };
+        }
+
+        public void Add()
+        {
+            Items.Add(new Model { Id = Guid.NewGuid() });
+        }
+
+        public void Remove(Model child)
+        {
+            Items.Remove(child);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/App.xaml
new file mode 100644
index 0000000..21e6696
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/App.xaml
@@ -0,0 +1,3 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="Caliburn.Micro.Coroutines.External.App" />
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/App.xaml.cs
new file mode 100644
index 0000000..2a1394b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/App.xaml.cs
@@ -0,0 +1,12 @@
+namespace Caliburn.Micro.Coroutines.External
+{
+    using System.Windows;
+
+    public partial class App : Application
+    {
+        public App()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Caliburn.Micro.Coroutines.External.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Caliburn.Micro.Coroutines.External.csproj
new file mode 100644
index 0000000..be9b917
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Caliburn.Micro.Coroutines.External.csproj
@@ -0,0 +1,116 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2400BC51-BF6A-4225-80A6-BC639ED73033}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.Coroutines.External</RootNamespace>
+    <AssemblyName>Caliburn.Micro.Coroutines.External</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.Coroutines.External.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.Coroutines.External.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.Coroutines.ExternalTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ExternalScreenView.xaml.cs">
+      <DependentUpon>ExternalScreenView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ExternalScreenViewModel.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ExternalScreenView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenView.xaml
new file mode 100644
index 0000000..554cd38
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="Caliburn.Micro.Coroutines.External.ExternalScreenView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro">
+    <StackPanel>
+        <TextBlock Text="External Screen"
+                   FontSize="24" />
+        <Button Content="Back"
+                cal:Message.Attach="GoBack" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenView.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenView.xaml.cs
new file mode 100644
index 0000000..13142f1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenView.xaml.cs
@@ -0,0 +1,12 @@
+namespace Caliburn.Micro.Coroutines.External
+{
+    using System.Windows.Controls;
+
+    public partial class ExternalScreenView : UserControl
+    {
+        public ExternalScreenView()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenViewModel.cs
new file mode 100644
index 0000000..ce2d243
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/ExternalScreenViewModel.cs
@@ -0,0 +1,7 @@
+namespace Caliburn.Micro.Coroutines.External
+{
+    using System.ComponentModel.Composition;
+
+    [Export("ExternalScreen", typeof(ExternalScreenViewModel))]
+    public class ExternalScreenViewModel {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0c0f6e3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.External/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Caliburn.Micro.Coroutines.External")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.Coroutines.External")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b0333fe5-ab17-404f-a664-8a2e4632b4d9")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.sln
new file mode 100644
index 0000000..5ae6647
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.sln
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Coroutines", "Caliburn.Micro.Coroutines\Caliburn.Micro.Coroutines.csproj", "{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Host\Host.csproj", "{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Coroutines.External", "Caliburn.Micro.Coroutines.External\Caliburn.Micro.Coroutines.External.csproj", "{2400BC51-BF6A-4225-80A6-BC639ED73033}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/App.xaml
new file mode 100644
index 0000000..ecf3b0e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/App.xaml
@@ -0,0 +1,8 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.Coroutines"
+             x:Class="Caliburn.Micro.Coroutines.App">
+	<Application.Resources>
+        <local:CoroutinesBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/App.xaml.cs
new file mode 100644
index 0000000..3154b47
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/App.xaml.cs
@@ -0,0 +1,12 @@
+namespace Caliburn.Micro.Coroutines
+{
+    using System.Windows;
+
+    public partial class App : Application
+    {
+        public App()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.csproj
new file mode 100644
index 0000000..7ef3e1e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines.csproj
@@ -0,0 +1,128 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.Coroutines</RootNamespace>
+    <AssemblyName>Caliburn.Micro.Coroutines</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.Coroutines.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.Coroutines.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.CoroutinesTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>true</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Controls.Toolkit, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="CoroutinesBootstrapper.cs" />
+    <Compile Include="IShell.cs" />
+    <Compile Include="LoadCatalog.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScreenOneViewModel.cs" />
+    <Compile Include="ShellViewModel.cs" />
+    <Compile Include="Loader.cs" />
+    <Compile Include="ShowScreen.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ScreenOneView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\OutOfBrowserSettings.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/CoroutinesBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/CoroutinesBootstrapper.cs
new file mode 100644
index 0000000..c4af0e7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/CoroutinesBootstrapper.cs
@@ -0,0 +1,56 @@
+namespace Caliburn.Micro.Coroutines
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.Primitives;
+    using System.Linq;
+    using System.Windows;
+
+    public class CoroutinesBootstrapper : Bootstrapper<IShell>
+    {
+        private CompositionContainer container;
+
+        protected override void Configure()
+        {
+            var catalog = new AggregateCatalog(AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>());
+            container = CompositionHost.Initialize(catalog);
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue(container);
+            batch.AddExportedValue(catalog);
+
+            container.Compose(batch);
+
+            Coroutine.Completed += (s, e) => {
+                if (e.Error != null)
+                    MessageBox.Show(e.Error.Message);
+            };
+        }
+
+        protected override object GetInstance(Type serviceType, string key)
+        {
+            string contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if (exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType)
+        {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance)
+        {
+            container.SatisfyImportsOnce(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/IShell.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/IShell.cs
new file mode 100644
index 0000000..0167c58
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/IShell.cs
@@ -0,0 +1,7 @@
+namespace Caliburn.Micro.Coroutines
+{
+    public interface IShell : IConductor
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/LoadCatalog.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/LoadCatalog.cs
new file mode 100644
index 0000000..6bc8388
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/LoadCatalog.cs
@@ -0,0 +1,56 @@
+namespace Caliburn.Micro.Coroutines
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.ReflectionModel;
+    using System.Linq;
+
+    public class LoadCatalog : IResult
+    {
+        static readonly Dictionary<string, DeploymentCatalog> Catalogs = new Dictionary<string, DeploymentCatalog>();
+        readonly string uri;
+
+        [Import]
+        public AggregateCatalog Catalog { get; set; }
+
+        public LoadCatalog(string relativeUri)
+        {
+            uri = relativeUri;
+        }
+
+        public void Execute(ActionExecutionContext context)
+        {
+            DeploymentCatalog catalog;
+
+            if(Catalogs.TryGetValue(uri, out catalog))
+                Completed(this, new ResultCompletionEventArgs());
+            else
+            {
+                catalog = new DeploymentCatalog(new Uri("/ClientBin/" + uri, UriKind.RelativeOrAbsolute));
+                catalog.DownloadCompleted += (s, e) =>{
+                    if(e.Error == null)
+                    {
+                        Catalogs[uri] = catalog;
+                        Catalog.Catalogs.Add(catalog);
+                        catalog.Parts
+                            .Select(part => ReflectionModelServices.GetPartType(part).Value.Assembly)
+                            .Where(assembly => !AssemblySource.Instance.Contains(assembly))
+                            .Apply(x => AssemblySource.Instance.Add(x));
+                    }
+                    else Loader.Hide().Execute(context);
+
+                    Completed(this, new ResultCompletionEventArgs {
+                        Error = e.Error,
+                        WasCancelled = false
+                    });
+                };
+
+                catalog.DownloadAsync();
+            }
+        }
+
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Loader.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Loader.cs
new file mode 100644
index 0000000..a6bb731
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Loader.cs
@@ -0,0 +1,54 @@
+namespace Caliburn.Micro.Coroutines
+{
+    using System;
+    using System.Windows;
+    using System.Windows.Controls;
+
+    public class Loader : IResult
+    {
+        readonly string message;
+        readonly bool hide;
+
+        public Loader(string message)
+        {
+            this.message = message;
+        }
+
+        public Loader(bool hide)
+        {
+            this.hide = hide;
+        }
+
+        public void Execute(ActionExecutionContext context)
+        {
+            var view = context.View as FrameworkElement;
+            while(view != null)
+            {
+                var busyIndicator = view as BusyIndicator;
+                if(busyIndicator != null)
+                {
+                    if(!string.IsNullOrEmpty(message))
+                        busyIndicator.BusyContent = message;
+                    busyIndicator.IsBusy = !hide;
+                    break;
+                }
+
+                view = view.Parent as FrameworkElement;
+            }
+
+            Completed(this, new ResultCompletionEventArgs());
+        }
+
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+
+        public static IResult Show(string message = null)
+        {
+            return new Loader(message);
+        }
+
+        public static IResult Hide()
+        {
+            return new Loader(true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..5a8634e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Caliburn.Micro.Coroutines")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.Coroutines")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d0b18c00-80ff-49f8-914c-9a406e1f7d8b")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/OutOfBrowserSettings.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/OutOfBrowserSettings.xml
new file mode 100644
index 0000000..cf85278
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/Properties/OutOfBrowserSettings.xml
@@ -0,0 +1,7 @@
+<OutOfBrowserSettings ShortName="Caliburn.Micro.Coroutines Application" EnableGPUAcceleration="False" ShowInstallMenuItem="True">
+  <OutOfBrowserSettings.Blurb>Caliburn.Micro.Coroutines Application on your desktop; at home, at work or on the go.</OutOfBrowserSettings.Blurb>
+  <OutOfBrowserSettings.WindowSettings>
+    <WindowSettings Title="Caliburn.Micro.Coroutines Application" />
+  </OutOfBrowserSettings.WindowSettings>
+  <OutOfBrowserSettings.Icons />
+</OutOfBrowserSettings>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ScreenOneView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ScreenOneView.xaml
new file mode 100644
index 0000000..99353e3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ScreenOneView.xaml
@@ -0,0 +1,10 @@
+<UserControl x:Class="Caliburn.Micro.Coroutines.ScreenOneView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel>
+        <TextBlock Text="Screen One"
+                   FontSize="24" />
+        <Button x:Name="GoForward"
+                Content="Next" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ScreenOneViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ScreenOneViewModel.cs
new file mode 100644
index 0000000..3be5607
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ScreenOneViewModel.cs
@@ -0,0 +1,17 @@
+namespace Caliburn.Micro.Coroutines
+{
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+
+    [Export(typeof(ScreenOneViewModel))]
+    public class ScreenOneViewModel
+    {
+        public IEnumerable<IResult> GoForward()
+        {
+            yield return Loader.Show("Downloading...");
+            yield return new LoadCatalog("Caliburn.Micro.Coroutines.External.xap");
+            yield return Loader.Hide();
+            yield return new ShowScreen("ExternalScreen");
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShellView.xaml
new file mode 100644
index 0000000..5cd19ba
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShellView.xaml
@@ -0,0 +1,8 @@
+<UserControl x:Class="Caliburn.Micro.Coroutines.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Controls="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+    <Controls:BusyIndicator>
+        <ContentControl x:Name="ActiveItem" />
+    </Controls:BusyIndicator>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShellViewModel.cs
new file mode 100644
index 0000000..1501390
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShellViewModel.cs
@@ -0,0 +1,47 @@
+namespace Caliburn.Micro.Coroutines
+{
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+
+    [Export(typeof(IShell))]
+    public class ShellViewModel : Conductor<object>, IShell
+    {
+        readonly ScreenOneViewModel initialialScreen;
+        readonly Stack<object> previous = new Stack<object>();
+        bool goingBack;
+
+        [ImportingConstructor]
+        public ShellViewModel(ScreenOneViewModel initialialScreen)
+        {
+            this.initialialScreen = initialialScreen;
+        }
+
+        public bool CanGoBack
+        {
+            get { return previous.Count > 0; }
+        }
+
+        public void GoBack()
+        {
+            goingBack = true;
+            ActivateItem(previous.Pop());
+            goingBack = false;
+        }
+
+        protected override void OnInitialize()
+        {
+            ActivateItem(initialialScreen);
+            base.OnInitialize();
+        }
+
+        protected override void ChangeActiveItem(object newItem, bool closePrevious)
+        {
+            if(ActiveItem != null && !goingBack)
+                previous.Push(ActiveItem);
+
+            NotifyOfPropertyChange(() => CanGoBack);
+
+            base.ChangeActiveItem(newItem, closePrevious);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShowScreen.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShowScreen.cs
new file mode 100644
index 0000000..29e8203
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Caliburn.Micro.Coroutines/ShowScreen.cs
@@ -0,0 +1,41 @@
+namespace Caliburn.Micro.Coroutines
+{
+    using System;
+    using System.ComponentModel.Composition;
+
+    public class ShowScreen : IResult
+    {
+        readonly Type screenType;
+        readonly string name;
+
+        [Import]
+        public IShell Shell { get; set; }
+
+        public ShowScreen(string name)
+        {
+            this.name = name;
+        }
+
+        public ShowScreen(Type screenType)
+        {
+            this.screenType = screenType;
+        }
+
+        public void Execute(ActionExecutionContext context)
+        {
+            var screen = !string.IsNullOrEmpty(name)
+                ? IoC.Get<object>(name)
+                : IoC.GetInstance(screenType, null);
+
+            Shell.ActivateItem(screen);
+            Completed(this, new ResultCompletionEventArgs());
+        }
+
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+
+        public static ShowScreen Of<T>()
+        {
+            return new ShowScreen(typeof(T));
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Caliburn.Micro.CoroutinesTestPage.aspx b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Caliburn.Micro.CoroutinesTestPage.aspx
new file mode 100644
index 0000000..9ac08c5
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Caliburn.Micro.CoroutinesTestPage.aspx
@@ -0,0 +1,74 @@
+<%@ Page Language="c#" AutoEventWireup="true" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Caliburn.Micro.Coroutines</title>
+    <style type="text/css">
+    html, body {
+	    height: 100%;
+	    overflow: auto;
+    }
+    body {
+	    padding: 0;
+	    margin: 0;
+    }
+    #silverlightControlHost {
+	    height: 100%;
+	    text-align:center;
+    }
+    </style>
+    <script type="text/javascript" src="Silverlight.js"></script>
+    <script type="text/javascript">
+        function onSilverlightError(sender, args) {
+            var appSource = "";
+            if (sender != null && sender != 0) {
+              appSource = sender.getHost().Source;
+            }
+            
+            var errorType = args.ErrorType;
+            var iErrorCode = args.ErrorCode;
+
+            if (errorType == "ImageError" || errorType == "MediaError") {
+              return;
+            }
+
+            var errMsg = "Unhandled Error in Silverlight Application " +  appSource + "\n" ;
+
+            errMsg += "Code: "+ iErrorCode + "    \n";
+            errMsg += "Category: " + errorType + "       \n";
+            errMsg += "Message: " + args.ErrorMessage + "     \n";
+
+            if (errorType == "ParserError") {
+                errMsg += "File: " + args.xamlFile + "     \n";
+                errMsg += "Line: " + args.lineNumber + "     \n";
+                errMsg += "Position: " + args.charPosition + "     \n";
+            }
+            else if (errorType == "RuntimeError") {           
+                if (args.lineNumber != 0) {
+                    errMsg += "Line: " + args.lineNumber + "     \n";
+                    errMsg += "Position: " +  args.charPosition + "     \n";
+                }
+                errMsg += "MethodName: " + args.methodName + "     \n";
+            }
+
+            throw new Error(errMsg);
+        }
+    </script>
+</head>
+<body>
+    <form id="form1" runat="server" style="height:100%">
+    <div id="silverlightControlHost">
+        <object data="data:application/x-silverlight-2," type="application/x-silverlight-2" width="100%" height="100%">
+		  <param name="source" value="ClientBin/Caliburn.Micro.Coroutines.xap"/>
+		  <param name="onError" value="onSilverlightError" />
+		  <param name="background" value="white" />
+		  <param name="minRuntimeVersion" value="4.0.50401.0" />
+		  <param name="autoUpgrade" value="true" />
+		  <a href="http://go.microsoft.com/fwlink/?LinkID=149156&v=4.0.50401.0" style="text-decoration:none">
+ 			  <img src="http://go.microsoft.com/fwlink/?LinkId=161376" alt="Get Microsoft Silverlight" style="border-style:none"/>
+		  </a>
+	    </object><iframe id="_sl_historyFrame" style="visibility:hidden;height:0px;width:0px;border:0px"></iframe></div>
+    </form>
+</body>
+</html>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/ClientBin/Caliburn.Micro.Coroutines.External.xap b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/ClientBin/Caliburn.Micro.Coroutines.External.xap
new file mode 100644
index 0000000..0426a2f
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/ClientBin/Caliburn.Micro.Coroutines.External.xap differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/ClientBin/Caliburn.Micro.Coroutines.xap b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/ClientBin/Caliburn.Micro.Coroutines.xap
new file mode 100644
index 0000000..1f5cce1
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/ClientBin/Caliburn.Micro.Coroutines.xap differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Host.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Host.csproj
new file mode 100644
index 0000000..f0b5013
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Host.csproj
@@ -0,0 +1,97 @@
+<?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>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Host</RootNamespace>
+    <AssemblyName>Host</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightApplicationList>{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}|..\Caliburn.Micro.Coroutines\Caliburn.Micro.Coroutines.csproj|ClientBin|False,{2400BC51-BF6A-4225-80A6-BC639ED73033}|..\Caliburn.Micro.Coroutines.External\Caliburn.Micro.Coroutines.External.csproj|ClientBin|False</SilverlightApplicationList>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</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\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Caliburn.Micro.CoroutinesTestPage.aspx" />
+    <Content Include="ClientBin\Caliburn.Micro.Coroutines.External.xap" />
+    <Content Include="ClientBin\Caliburn.Micro.Coroutines.xap" />
+    <Content Include="Silverlight.js" />
+    <Content Include="Web.config" />
+    <Content Include="Web.Debug.config">
+      <DependentUpon>Web.config</DependentUpon>
+    </Content>
+    <Content Include="Web.Release.config">
+      <DependentUpon>Web.config</DependentUpon>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>17665</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <!-- 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/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..c19a921
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Host")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Host")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("ef177bf6-d5e8-42d7-b313-40397fad6bfe")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Silverlight.js b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Silverlight.js
new file mode 100644
index 0000000..80ff397
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Silverlight.js
@@ -0,0 +1,2 @@
+//v2.0.30511.0
+if(!window.Silverlight)window.Silverlight={};Silverlight._silverlightCount=0;Silverlight.__onSilverlightInstalledCalled=false;Silverlight.fwlinkRoot="http://go2.microsoft.com/fwlink/?LinkID=";Silverlight.__installationEventFired=false;Silverlight.onGetSilverlight=null;Silverlight.onSilverlightInstalled=function(){window.location.reload(false)};Silverlight.isInstalled=function(b){if(b==undefined)b=null;var a=false,m=null;try{var i=null,j=false;if(window.ActiveXObject)try{i=new ActiveXObject("AgControl.AgControl");if(b===null)a=true;else if(i.IsVersionSupported(b))a=true;i=null}catch(l){j=true}else j=true;if(j){var k=navigator.plugins["Silverlight Plug-In"];if(k)if(b===null)a=true;else{var h=k.description;if(h==="1.0.30226.2")h="2.0.30226.2";var c=h.split(".");while(c.length>3)c.pop();while(c.length<4)c.push(0);var e=b.split(".");while(e.length>4)e.pop();var d,g,f=0;do{d=parseInt(e[f]);g=parseInt(c[f]);f++}while(f<e.length&&d===g);if(d<=g&&!isNaN(d))a=true}}}catch(l){a=false}return a};Silverlight.WaitForInstallCompletion=function(){if(!Silverlight.isBrowserRestartRequired&&Silverlight.onSilverlightInstalled){try{navigator.plugins.refresh()}catch(a){}if(Silverlight.isInstalled(null)&&!Silverlight.__onSilverlightInstalledCalled){Silverlight.onSilverlightInstalled();Silverlight.__onSilverlightInstalledCalled=true}else setTimeout(Silverlight.WaitForInstallCompletion,3e3)}};Silverlight.__startup=function(){navigator.plugins.refresh();Silverlight.isBrowserRestartRequired=Silverlight.isInstalled(null);if(!Silverlight.isBrowserRestartRequired){Silverlight.WaitForInstallCompletion();if(!Silverlight.__installationEventFired){Silverlight.onInstallRequired();Silverlight.__installationEventFired=true}}else if(window.navigator.mimeTypes){var b=navigator.mimeTypes["application/x-silverlight-2"],c=navigator.mimeTypes["application/x-silverlight-2-b2"],d=navigator.mimeTypes["application/x-silverlight-2-b1"],a=d;if(c)a=c;if(!b&&(d||c)){if(!Silverlight.__installationEventFired){Silverlight.onUpgradeRequired();Silverlight.__installationEventFired=true}}else if(b&&a)if(b.enabledPlugin&&a.enabledPlugin)if(b.enabledPlugin.description!=a.enabledPlugin.description)if(!Silverlight.__installationEventFired){Silverlight.onRestartRequired();Silverlight.__installationEventFired=true}}if(!Silverlight.disableAutoStartup)if(window.removeEventListener)window.removeEventListener("load",Silverlight.__startup,false);else window.detachEvent("onload",Silverlight.__startup)};if(!Silverlight.disableAutoStartup)if(window.addEventListener)window.addEventListener("load",Silverlight.__startup,false);else window.attachEvent("onload",Silverlight.__startup);Silverlight.createObject=function(m,f,e,k,l,h,j){var d={},a=k,c=l;d.version=a.version;a.source=m;d.alt=a.alt;if(h)a.initParams=h;if(a.isWindowless&&!a.windowless)a.windowless=a.isWindowless;if(a.framerate&&!a.maxFramerate)a.maxFramerate=a.framerate;if(e&&!a.id)a.id=e;delete a.ignoreBrowserVer;delete a.inplaceInstallPrompt;delete a.version;delete a.isWindowless;delete a.framerate;delete a.data;delete a.src;delete a.alt;if(Silverlight.isInstalled(d.version)){for(var b in c)if(c[b]){if(b=="onLoad"&&typeof c[b]=="function"&&c[b].length!=1){var i=c[b];c[b]=function(a){return i(document.getElementById(e),j,a)}}var g=Silverlight.__getHandlerName(c[b]);if(g!=null){a[b]=g;c[b]=null}else throw"typeof events."+b+" must be 'function' or 'string'";}slPluginHTML=Silverlight.buildHTML(a)}else slPluginHTML=Silverlight.buildPromptHTML(d);if(f)f.innerHTML=slPluginHTML;else return slPluginHTML};Silverlight.buildHTML=function(a){var b=[];b.push('<object type="application/x-silverlight" data="data:application/x-silverlight,"');if(a.id!=null)b.push(' id="'+Silverlight.HtmlAttributeEncode(a.id)+'"');if(a.width!=null)b.push(' width="'+a.width+'"');if(a.height!=null)b.push(' height="'+a.height+'"');b.push(" >");delete a.id;delete a.width;delete a.height;for(var c in a)if(a[c])b.push('<param name="'+Silverlight.HtmlAttributeEncode(c)+'" value="'+Silverlight.HtmlAttributeEncode(a[c])+'" />');b.push("</object>");return b.join("")};Silverlight.createObjectEx=function(b){var a=b,c=Silverlight.createObject(a.source,a.parentElement,a.id,a.properties,a.events,a.initParams,a.context);if(a.parentElement==null)return c};Silverlight.buildPromptHTML=function(b){var a="",d=Silverlight.fwlinkRoot,c=b.version;if(b.alt)a=b.alt;else{if(!c)c="";a="<a href='javascript:Silverlight.getSilverlight(\"{1}\");' style='text-decoration: none;'><img src='{2}' alt='Get Microsoft Silverlight' style='border-style: none'/></a>";a=a.replace("{1}",c);a=a.replace("{2}",d+"108181")}return a};Silverlight.getSilverlight=function(e){if(Silverlight.onGetSilverlight)Silverlight.onGetSilverlight();var b="",a=String(e).split(".");if(a.length>1){var c=parseInt(a[0]);if(isNaN(c)||c<2)b="1.0";else b=a[0]+"."+a[1]}var d="";if(b.match(/^\d+\056\d+$/))d="&v="+b;Silverlight.followFWLink("149156"+d)};Silverlight.followFWLink=function(a){top.location=Silverlight.fwlinkRoot+String(a)};Silverlight.HtmlAttributeEncode=function(c){var a,b="";if(c==null)return null;for(var d=0;d<c.length;d++){a=c.charCodeAt(d);if(a>96&&a<123||a>64&&a<91||a>43&&a<58&&a!=47||a==95)b=b+String.fromCharCode(a);else b=b+"&#"+a+";"}return b};Silverlight.default_error_handler=function(e,b){var d,c=b.ErrorType;d=b.ErrorCode;var a="\nSilverlight error message     \n";a+="ErrorCode: "+d+"\n";a+="ErrorType: "+c+"       \n";a+="Message: "+b.ErrorMessage+"     \n";if(c=="ParserError"){a+="XamlFile: "+b.xamlFile+"     \n";a+="Line: "+b.lineNumber+"     \n";a+="Position: "+b.charPosition+"     \n"}else if(c=="RuntimeError"){if(b.lineNumber!=0){a+="Line: "+b.lineNumber+"     \n";a+="Position: "+b.charPosition+"     \n"}a+="MethodName: "+b.methodName+"     \n"}alert(a)};Silverlight.__cleanup=function(){for(var a=Silverlight._silverlightCount-1;a>=0;a--)window["__slEvent"+a]=null;Silverlight._silverlightCount=0;if(window.removeEventListener)window.removeEventListener("unload",Silverlight.__cleanup,false);else window.detachEvent("onunload",Silverlight.__cleanup)};Silverlight.__getHandlerName=function(b){var a="";if(typeof b=="string")a=b;else if(typeof b=="function"){if(Silverlight._silverlightCount==0)if(window.addEventListener)window.addEventListener("onunload",Silverlight.__cleanup,false);else window.attachEvent("onunload",Silverlight.__cleanup);var c=Silverlight._silverlightCount++;a="__slEvent"+c;window[a]=b}else a=null;return a};Silverlight.onRequiredVersionAvailable=function(){};Silverlight.onRestartRequired=function(){};Silverlight.onUpgradeRequired=function(){};Silverlight.onInstallRequired=function(){};Silverlight.IsVersionAvailableOnError=function(d,a){var b=false;try{if(a.ErrorCode==8001&&!Silverlight.__installationEventFired){Silverlight.onUpgradeRequired();Silverlight.__installationEventFired=true}else if(a.ErrorCode==8002&&!Silverlight.__installationEventFired){Silverlight.onRestartRequired();Silverlight.__installationEventFired=true}else if(a.ErrorCode==5014||a.ErrorCode==2106){if(Silverlight.__verifySilverlight2UpgradeSuccess(a.getHost()))b=true}else b=true}catch(c){}return b};Silverlight.IsVersionAvailableOnLoad=function(b){var a=false;try{if(Silverlight.__verifySilverlight2UpgradeSuccess(b.getHost()))a=true}catch(c){}return a};Silverlight.__verifySilverlight2UpgradeSuccess=function(d){var c=false,b="2.0.31005",a=null;try{if(d.IsVersionSupported(b+".99")){a=Silverlight.onRequiredVersionAvailable;c=true}else if(d.IsVersionSupported(b+".0"))a=Silverlight.onRestartRequired;else a=Silverlight.onUpgradeRequired;if(a&&!Silverlight.__installationEventFired){a();Silverlight.__installationEventFired=true}}catch(e){}return c}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.Debug.config b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.Debug.config
new file mode 100644
index 0000000..2c6dd51
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.Debug.config
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
+
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--
+    In the example below, the "SetAttributes" transform will change the value of 
+    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator 
+    finds an atrribute "name" that has a value of "MyDB".
+    
+    <connectionStrings>
+      <add name="MyDB" 
+        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
+        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    </connectionStrings>
+  -->
+  <system.web>
+    <!--
+      In the example below, the "Replace" transform will replace the entire 
+      <customErrors> section of your web.config file.
+      Note that because there is only one customErrors section under the 
+      <system.web> node, there is no need to use the "xdt:Locator" attribute.
+      
+      <customErrors defaultRedirect="GenericError.htm"
+        mode="RemoteOnly" xdt:Transform="Replace">
+        <error statusCode="500" redirect="InternalError.htm"/>
+      </customErrors>
+    -->
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.Release.config b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.Release.config
new file mode 100644
index 0000000..4122d79
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.Release.config
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
+
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--
+    In the example below, the "SetAttributes" transform will change the value of 
+    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator 
+    finds an atrribute "name" that has a value of "MyDB".
+    
+    <connectionStrings>
+      <add name="MyDB" 
+        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
+        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    </connectionStrings>
+  -->
+  <system.web>
+    <compilation xdt:Transform="RemoveAttributes(debug)" />
+    <!--
+      In the example below, the "Replace" transform will replace the entire 
+      <customErrors> section of your web.config file.
+      Note that because there is only one customErrors section under the 
+      <system.web> node, there is no need to use the "xdt:Locator" attribute.
+      
+      <customErrors defaultRedirect="GenericError.htm"
+        mode="RemoteOnly" xdt:Transform="Replace">
+        <error statusCode="500" redirect="InternalError.htm"/>
+      </customErrors>
+    -->
+  </system.web>
+</configuration>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.config b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.config
new file mode 100644
index 0000000..ea5e4d6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Coroutines/Host/Web.config
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<!--
+  For more information on how to configure your ASP.NET application, please visit
+  http://go.microsoft.com/fwlink/?LinkId=169433
+  -->
+
+<configuration>
+    <system.web>
+        <compilation debug="true" targetFramework="4.0" />
+    </system.web>
+
+</configuration>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello.sln
new file mode 100644
index 0000000..b693fea
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Hello", "Caliburn.Micro.Hello\Caliburn.Micro.Hello.csproj", "{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/App.xaml
new file mode 100644
index 0000000..02033bf
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/App.xaml
@@ -0,0 +1,8 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.Hello"
+             x:Class="Caliburn.Micro.Hello.App">
+	<Application.Resources>
+        <local:HelloBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/App.xaml.cs
new file mode 100644
index 0000000..0714729
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/App.xaml.cs
@@ -0,0 +1,12 @@
+namespace Caliburn.Micro.Hello
+{
+    using System.Windows;
+
+    public partial class App : Application
+    {
+        public App()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Caliburn.Micro.Hello.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Caliburn.Micro.Hello.csproj
new file mode 100644
index 0000000..2507d69
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Caliburn.Micro.Hello.csproj
@@ -0,0 +1,113 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{726EF716-D323-4393-8C02-335E4565BA10}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.Hello</RootNamespace>
+    <AssemblyName>Caliburn.Micro.Hello</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloWorld.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.Hello.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloWorldTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="HelloBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/HelloBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/HelloBootstrapper.cs
new file mode 100644
index 0000000..93f6e6f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/HelloBootstrapper.cs
@@ -0,0 +1,4 @@
+namespace Caliburn.Micro.Hello
+{
+    public class HelloBootstrapper : Bootstrapper<ShellViewModel> {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..4ecf463
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly:AssemblyTitle("Caliburn.Micro.Hello")]
+[assembly:AssemblyDescription("")]
+[assembly:AssemblyConfiguration("")]
+[assembly:AssemblyCompany("Microsoft")]
+[assembly:AssemblyProduct("Caliburn.Micro.Hello")]
+[assembly:AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly:Guid("12bf83be-62fe-43d7-8d46-b4e7dd69b06e")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersion("1.0.0.0")]
+[assembly:AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/ShellView.xaml
new file mode 100644
index 0000000..cdc0622
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/ShellView.xaml
@@ -0,0 +1,9 @@
+<UserControl x:Class="Caliburn.Micro.Hello.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel>
+        <TextBox x:Name="Name" />
+        <Button x:Name="SayHello"
+                Content="Click Me" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/ShellViewModel.cs
new file mode 100644
index 0000000..6f9ec5a
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.Hello/Caliburn.Micro.Hello/ShellViewModel.cs
@@ -0,0 +1,30 @@
+namespace Caliburn.Micro.Hello
+{
+    using System.Windows;
+
+    public class ShellViewModel : PropertyChangedBase
+    {
+        string name;
+
+        public string Name
+        {
+            get { return name; }
+            set
+            {
+                name = value;
+                NotifyOfPropertyChange(() => Name);
+                NotifyOfPropertyChange(() => CanSayHello);
+            }
+        }
+
+        public bool CanSayHello
+        {
+            get { return !string.IsNullOrWhiteSpace(Name); }
+        }
+
+        public void SayHello()
+        {
+            MessageBox.Show(string.Format("Hello {0}!", Name)); //Don't do this in real life :)
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator.sln
new file mode 100644
index 0000000..9a2401b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloEventAggregator", "Caliburn.Micro.HelloEventAggregator\Caliburn.Micro.HelloEventAggregator.csproj", "{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/App.xaml
new file mode 100644
index 0000000..0828641
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/App.xaml
@@ -0,0 +1,8 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.HelloEventAggregator"
+             x:Class="Caliburn.Micro.HelloEventAggregator.App">
+	<Application.Resources>
+        <local:MefBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/App.xaml.cs
new file mode 100644
index 0000000..32258f8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/App.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloEventAggregator {
+    using System.Windows;
+
+    public partial class App : Application {
+        public App() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator.csproj
new file mode 100644
index 0000000..b543a59
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator.csproj
@@ -0,0 +1,128 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.HelloEventAggregator</RootNamespace>
+    <AssemblyName>Caliburn.Micro.HelloEventAggregator</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloEventAggregator.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.HelloEventAggregator.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloEventAggregatorTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="IShell.cs" />
+    <Compile Include="LeftEvent.cs" />
+    <Compile Include="LeftViewModel.cs" />
+    <Compile Include="MEFBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RightEvent.cs" />
+    <Compile Include="RightViewModel.cs" />
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="LeftView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RightView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ShellView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/IShell.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/IShell.cs
new file mode 100644
index 0000000..07b5fc8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/IShell.cs
@@ -0,0 +1,5 @@
+namespace Caliburn.Micro.HelloEventAggregator {
+    public interface IShell {
+        
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftEvent.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftEvent.cs
new file mode 100644
index 0000000..2d41a29
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftEvent.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloEventAggregator {
+    public class LeftEvent {
+        public int Number;
+
+        public override string ToString() {
+            return "Left " + Number;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftView.xaml
new file mode 100644
index 0000000..d5be0f8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftView.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="Caliburn.Micro.HelloEventAggregator.LeftView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<StackPanel>
+		<Button x:Name="Publish">
+			<TextBlock FontSize="32">Publish Left</TextBlock>
+		</Button>
+		<TextBlock FontSize="20">From Right</TextBlock>
+		<ItemsControl x:Name="History"
+		              FontSize="16" />
+	</StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftViewModel.cs
new file mode 100644
index 0000000..29f7b41
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/LeftViewModel.cs
@@ -0,0 +1,30 @@
+namespace Caliburn.Micro.HelloEventAggregator {
+    using System.ComponentModel.Composition;
+
+    [Export(typeof(LeftViewModel))]
+    public class LeftViewModel : IHandle<RightEvent> {
+        readonly IEventAggregator events;
+        readonly IObservableCollection<int> history = new BindableCollection<int>();
+        int count = 1;
+
+        [ImportingConstructor]
+        public LeftViewModel(IEventAggregator events) {
+            this.events = events;
+            events.Subscribe(this);
+        }
+
+        public IObservableCollection<int> History {
+            get { return history; }
+        }
+
+        public void Handle(RightEvent message) {
+            history.Add(message.Number);
+        }
+
+        public void Publish() {
+            events.Publish(new LeftEvent {
+                Number = count++
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/MEFBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/MEFBootstrapper.cs
new file mode 100644
index 0000000..05dbc9c
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/MEFBootstrapper.cs
@@ -0,0 +1,50 @@
+namespace Caliburn.Micro.HelloEventAggregator {
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.Primitives;
+    using System.Linq;
+
+    public class MefBootstrapper : Bootstrapper<IShell> {
+        private CompositionContainer container;
+
+        protected override void Configure()
+        {
+            container = CompositionHost.Initialize(
+                new AggregateCatalog(
+                    AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()
+                    )
+                );
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue(container);
+
+            container.Compose(batch);
+        }
+
+        protected override object GetInstance(Type serviceType, string key)
+        {
+            string contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if (exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType)
+        {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance)
+        {
+            container.SatisfyImportsOnce(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f1e9762
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Caliburn.Micro.HelloEventAggregator")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.HelloEventAggregator")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("b2740e43-901d-4f70-a136-0693a279df1a")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightEvent.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightEvent.cs
new file mode 100644
index 0000000..1f65c6d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightEvent.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloEventAggregator {
+    public class RightEvent {
+        public int Number;
+
+        public override string ToString() {
+            return "Right " + Number;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightView.xaml
new file mode 100644
index 0000000..2bdf844
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightView.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="Caliburn.Micro.HelloEventAggregator.RightView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel>
+        <Button x:Name="Publish">
+            <TextBlock FontSize="32">Publish Right</TextBlock>
+        </Button>
+        <TextBlock FontSize="20">From Left</TextBlock>
+        <ItemsControl x:Name="History"
+		              FontSize="16" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightViewModel.cs
new file mode 100644
index 0000000..f7b0fed
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/RightViewModel.cs
@@ -0,0 +1,30 @@
+namespace Caliburn.Micro.HelloEventAggregator {
+    using System.ComponentModel.Composition;
+
+    [Export(typeof(RightViewModel))]
+    public class RightViewModel : IHandle<LeftEvent> {
+        readonly IEventAggregator events;
+        readonly IObservableCollection<int> history = new BindableCollection<int>();
+        int count = 1;
+
+        [ImportingConstructor]
+        public RightViewModel(IEventAggregator events) {
+            this.events = events;
+            events.Subscribe(this);
+        }
+
+        public IObservableCollection<int> History {
+            get { return history; }
+        }
+
+        public void Handle(LeftEvent message) {
+            history.Add(message.Number);
+        }
+
+        public void Publish() {
+            events.Publish(new RightEvent {
+                Number = count++
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/ShellView.xaml
new file mode 100644
index 0000000..88c0c89
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/ShellView.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="Caliburn.Micro.HelloEventAggregator.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel>
+        <TextBlock x:Name="LastEvent"
+                   FontSize="16"/>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+            <ContentControl x:Name="Left" />
+            <ContentControl x:Name="Right"
+                            Grid.Column="1" />
+        </Grid>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/ShellViewModel.cs
new file mode 100644
index 0000000..6a608bd
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloEventAggregator/Caliburn.Micro.HelloEventAggregator/ShellViewModel.cs
@@ -0,0 +1,28 @@
+namespace Caliburn.Micro.HelloEventAggregator {
+    using System.ComponentModel.Composition;
+
+    [Export(typeof(IShell))]
+    public class ShellViewModel : PropertyChangedBase, IShell, IHandle<object> {
+        string lastEvent = "No Events Yet";
+
+        [ImportingConstructor]
+        public ShellViewModel(LeftViewModel left, RightViewModel right, IEventAggregator events) {
+            Left = left;
+            Right = right;
+
+            events.Subscribe(this);
+        }
+
+        public LeftViewModel Left { get; private set; }
+        public RightViewModel Right { get; private set; }
+
+        public string LastEvent {
+            get { return lastEvent; }
+        }
+
+        public void Handle(object message) {
+            lastEvent = "Last Event: " + message;
+            NotifyOfPropertyChange(() => LastEvent);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction.sln
new file mode 100644
index 0000000..c6f6b9c
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloExplicitAction", "Caliburn.Micro.Hello\Caliburn.Micro.HelloExplicitAction.csproj", "{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/App.xaml
new file mode 100644
index 0000000..c08afe0
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/App.xaml
@@ -0,0 +1,7 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.HelloExplicitAction" xmlns:HelloExplicitAction="clr-namespace:Caliburn.Micro.HelloExplicitAction" x:Class="Caliburn.Micro.HelloExplicitAction.App">
+	<Application.Resources>
+        <HelloExplicitAction:HelloBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/App.xaml.cs
new file mode 100644
index 0000000..ad9e0e3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/App.xaml.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace Caliburn.Micro.HelloExplicitAction
+{
+    public partial class App
+    {
+        public App()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction.csproj
new file mode 100644
index 0000000..17d88b1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction.csproj
@@ -0,0 +1,113 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{392A795C-167B-4EF0-A450-3C707B65BF34}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.HelloExplicitAction</RootNamespace>
+    <AssemblyName>Caliburn.Micro.HelloExplicitAction</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloExplicitActionWorld.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.HelloExplicitAction.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloExplicitActionWorldTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="HelloBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/HelloBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/HelloBootstrapper.cs
new file mode 100644
index 0000000..a13fb31
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/HelloBootstrapper.cs
@@ -0,0 +1,4 @@
+namespace Caliburn.Micro.HelloExplicitAction
+{
+    public class HelloBootstrapper : Bootstrapper<ShellViewModel> {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..4ecf463
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly:AssemblyTitle("Caliburn.Micro.Hello")]
+[assembly:AssemblyDescription("")]
+[assembly:AssemblyConfiguration("")]
+[assembly:AssemblyCompany("Microsoft")]
+[assembly:AssemblyProduct("Caliburn.Micro.Hello")]
+[assembly:AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly:Guid("12bf83be-62fe-43d7-8d46-b4e7dd69b06e")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersion("1.0.0.0")]
+[assembly:AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/ShellView.xaml
new file mode 100644
index 0000000..e3b8c38
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/ShellView.xaml
@@ -0,0 +1,16 @@
+<UserControl x:Class="Caliburn.Micro.HelloExplicitAction.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:cal="http://www.caliburnproject.org">
+    <StackPanel>
+        <TextBox x:Name="Name" />
+        <Button Content="Click Me">
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="Click">
+                    <cal:ActionMessage MethodName="SayHello" />
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+        </Button>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/ShellViewModel.cs
new file mode 100644
index 0000000..a283325
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloExplicitAction/Caliburn.Micro.HelloExplicitAction/ShellViewModel.cs
@@ -0,0 +1,30 @@
+using System.Windows;
+
+namespace Caliburn.Micro.HelloExplicitAction
+{
+    public class ShellViewModel : PropertyChangedBase
+    {
+        string name;
+
+        public string Name
+        {
+            get { return name; }
+            set
+            {
+                name = value;
+                NotifyOfPropertyChange(() => Name);
+                NotifyOfPropertyChange(() => CanSayHello);
+            }
+        }
+
+        public bool CanSayHello
+        {
+            get { return !string.IsNullOrWhiteSpace(Name); }
+        }
+
+        public void SayHello()
+        {
+            MessageBox.Show(string.Format("Hello {0}!", Name)); //Don't do this in real life :)
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef.sln
new file mode 100644
index 0000000..cb78268
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloMef", "Caliburn.Micro.HelloMef\Caliburn.Micro.HelloMef.csproj", "{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/App.xaml
new file mode 100644
index 0000000..01f3f4a
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/App.xaml
@@ -0,0 +1,8 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.HelloMef"
+             x:Class="Caliburn.Micro.HelloMef.App">
+	<Application.Resources>
+        <local:MefBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/App.xaml.cs
new file mode 100644
index 0000000..a300653
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/App.xaml.cs
@@ -0,0 +1,12 @@
+namespace Caliburn.Micro.HelloMef
+{
+    using System.Windows;
+
+    public partial class App : Application
+    {
+        public App()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef.csproj
new file mode 100644
index 0000000..a0526e1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef.csproj
@@ -0,0 +1,116 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.HelloMef</RootNamespace>
+    <AssemblyName>Caliburn.Micro.HelloMef</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloWorld.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.HelloMef.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloWorldTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="IShell.cs" />
+    <Compile Include="MefBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/IShell.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/IShell.cs
new file mode 100644
index 0000000..244dc0c
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/IShell.cs
@@ -0,0 +1,6 @@
+namespace Caliburn.Micro.HelloMef
+{
+    public interface IShell
+    {
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/MefBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/MefBootstrapper.cs
new file mode 100644
index 0000000..1848bd3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/MefBootstrapper.cs
@@ -0,0 +1,59 @@
+namespace Caliburn.Micro.HelloMef
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.Primitives;
+    using System.Linq;
+
+    public class MefBootstrapper : Bootstrapper<IShell>
+    {
+        private CompositionContainer container;
+
+        protected override void Configure()
+        {
+            container = CompositionHost.Initialize(
+                new AggregateCatalog(
+                    AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()
+                    )
+                );
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue(container);
+
+            container.Compose(batch);
+        }
+
+        //protected override IEnumerable<Assembly> SelectAssemblies()
+        //{
+        //    return new[] {
+        //        Assembly.GetExecutingAssembly()
+        //    };
+        //}
+
+        protected override object GetInstance(Type serviceType, string key)
+        {
+            string contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if (exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType)
+        {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance)
+        {
+            container.SatisfyImportsOnce(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..e7a8761
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly:AssemblyTitle("Caliburn.Micro.HelloMef")]
+[assembly:AssemblyDescription("")]
+[assembly:AssemblyConfiguration("")]
+[assembly:AssemblyCompany("Microsoft")]
+[assembly:AssemblyProduct("Caliburn.Micro.HelloMef")]
+[assembly:AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly:Guid("12bf83be-62fe-43d7-8d46-b4e7dd69b06e")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersion("1.0.0.0")]
+[assembly:AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/ShellView.xaml
new file mode 100644
index 0000000..686e9c2
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/ShellView.xaml
@@ -0,0 +1,9 @@
+<UserControl x:Class="Caliburn.Micro.HelloMef.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel>
+        <TextBox x:Name="Name" />
+        <Button x:Name="SayHello"
+                Content="Click Me" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/ShellViewModel.cs
new file mode 100644
index 0000000..a0a15ff
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloMef/Caliburn.Micro.HelloMef/ShellViewModel.cs
@@ -0,0 +1,32 @@
+namespace Caliburn.Micro.HelloMef
+{
+    using System.ComponentModel.Composition;
+    using System.Windows;
+
+    [Export(typeof(IShell))]
+    public class ShellViewModel : PropertyChangedBase, IShell
+    {
+        string name;
+
+        public string Name
+        {
+            get { return name; }
+            set
+            {
+                name = value;
+                NotifyOfPropertyChange(() => Name);
+                NotifyOfPropertyChange(() => CanSayHello);
+            }
+        }
+
+        public bool CanSayHello
+        {
+            get { return !string.IsNullOrWhiteSpace(Name); }
+        }
+
+        public void SayHello()
+        {
+            MessageBox.Show(string.Format("Hello {0}!", Name));
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters.sln
new file mode 100644
index 0000000..742f76b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloParameters", "Caliburn.Micro.HelloParameters\Caliburn.Micro.HelloParameters.csproj", "{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/App.xaml
new file mode 100644
index 0000000..0f450b1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/App.xaml
@@ -0,0 +1,8 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.HelloParameters"
+             x:Class="Caliburn.Micro.HelloParameters.App">
+	<Application.Resources>
+        <local:MefBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/App.xaml.cs
new file mode 100644
index 0000000..21af9e0
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/App.xaml.cs
@@ -0,0 +1,12 @@
+namespace Caliburn.Micro.HelloParameters
+{
+    using System.Windows;
+
+    public partial class App : Application
+    {
+        public App()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters.csproj
new file mode 100644
index 0000000..3c2ea15
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters.csproj
@@ -0,0 +1,119 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.HelloParameters</RootNamespace>
+    <AssemblyName>Caliburn.Micro.HelloParameters</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloWorld.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.HelloParameters.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloWorldTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+    <Utf8Output>true</Utf8Output>
+    <ExpressionBlendVersion>4.0.20520.0</ExpressionBlendVersion>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Expression.Interactions" />
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="IShell.cs" />
+    <Compile Include="MefBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/IShell.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/IShell.cs
new file mode 100644
index 0000000..8b127c3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/IShell.cs
@@ -0,0 +1,6 @@
+namespace Caliburn.Micro.HelloParameters
+{
+    public interface IShell
+    {
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/MefBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/MefBootstrapper.cs
new file mode 100644
index 0000000..2197c19
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/MefBootstrapper.cs
@@ -0,0 +1,52 @@
+namespace Caliburn.Micro.HelloParameters
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.Primitives;
+    using System.Linq;
+
+    public class MefBootstrapper : Bootstrapper<IShell>
+    {
+        private CompositionContainer container;
+
+        protected override void Configure()
+        {
+            container = CompositionHost.Initialize(
+                new AggregateCatalog(
+                    AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()
+                    )
+                );
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue(container);
+
+            container.Compose(batch);
+        }
+
+        protected override object GetInstance(Type serviceType, string key)
+        {
+            string contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if (exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType)
+        {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance)
+        {
+            container.SatisfyImportsOnce(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..59c7ccc
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("Caliburn.Micro.HelloParameters")]
+[assembly:AssemblyDescription("")]
+[assembly:AssemblyConfiguration("")]
+[assembly:AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.HelloParameters")]
+[assembly:AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly:Guid("12bf83be-62fe-43d7-8d46-b4e7dd69b06e")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersion("1.0.0.0")]
+[assembly:AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/ShellView.xaml
new file mode 100644
index 0000000..f8083fd
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/ShellView.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="Caliburn.Micro.HelloParameters.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:cal="http://www.caliburnproject.org">
+    <StackPanel>
+        <TextBox x:Name="Name" />
+        <Button Content="Click Me">
+            <i:Interaction.Triggers>
+                <i:EventTrigger EventName="Click">
+                    <cal:ActionMessage MethodName="SayHello">
+                        <cal:Parameter Value="{Binding ElementName=Name, Path=Text}" />
+                    </cal:ActionMessage>
+                </i:EventTrigger>
+            </i:Interaction.Triggers>
+        </Button>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/ShellViewModel.cs
new file mode 100644
index 0000000..8dc5c2a
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloParameters/Caliburn.Micro.HelloParameters/ShellViewModel.cs
@@ -0,0 +1,19 @@
+namespace Caliburn.Micro.HelloParameters
+{
+    using System.ComponentModel.Composition;
+    using System.Windows;
+
+    [Export(typeof(IShell))]
+    public class ShellViewModel : IShell
+    {
+        public bool CanSayHello(string name)
+        {
+            return !string.IsNullOrWhiteSpace(name);
+        }
+
+        public void SayHello(string name)
+        {
+            MessageBox.Show(string.Format("Hello {0}!", name));
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens.sln
new file mode 100644
index 0000000..c4df8e0
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloScreens", "Caliburn.Micro.HelloScreens\Caliburn.Micro.HelloScreens.csproj", "{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/App.xaml
new file mode 100644
index 0000000..f211d74
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/App.xaml
@@ -0,0 +1,20 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Shell="clr-namespace:Caliburn.Micro.HelloScreens.Shell"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+             xmlns:Converters="clr-namespace:Caliburn.Micro.HelloScreens.Framework.Converters"
+             x:Class="Caliburn.Micro.HelloScreens.App">
+	<Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources/DefaultStyles.xaml" />
+                <ResourceDictionary Source="Resources/NamedStyles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+
+            <Shell:ScreensBootstrapper x:Key="bootstrapper" />
+
+            <cal:BooleanToVisibilityConverter x:Key="booleanToVisibility" />
+            <Converters:NullToCollapsedConverter x:Key="nullToCollapsed" />
+        </ResourceDictionary>
+	</Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/App.xaml.cs
new file mode 100644
index 0000000..550b0f3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/App.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloScreens {
+    using System.Windows;
+
+    public partial class App : Application {
+        public App() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens.csproj
new file mode 100644
index 0000000..69a23d0
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens.csproj
@@ -0,0 +1,223 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.HelloScreens</RootNamespace>
+    <AssemblyName>Caliburn.Micro.HelloScreens</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloScreens.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.HelloScreens.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloScreensTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>true</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Expression.Effects, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Controls, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+    <Reference Include="System.Windows.Controls.Layout.Toolkit, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Controls.Toolkit, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Customers\AddressViewModel.cs" />
+    <Compile Include="Customers\CustomersWorkspaceViewModel.cs" />
+    <Compile Include="Customers\CustomerViewModel.cs" />
+    <Compile Include="Framework\ApplicationCloseCheck.cs" />
+    <Compile Include="Framework\Controls\CustomTransitionControl.cs" />
+    <Compile Include="Framework\Controls\TiledBackground.cs" />
+    <Compile Include="Framework\DocumentBase.cs" />
+    <Compile Include="Framework\IDocumentWorkspace.cs" />
+    <Compile Include="Framework\IHaveShutdownTask.cs" />
+    <Compile Include="Shell\ApplicationCloseStrategy.cs" />
+    <Compile Include="Shell\DialogConductorView.xaml.cs">
+      <DependentUpon>DialogConductorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Shell\DialogConductorViewModel.cs" />
+    <Compile Include="Framework\IDialogManager.cs" />
+    <Compile Include="Framework\IMessageBox.cs" />
+    <Compile Include="Framework\MessageBoxOptions.cs" />
+    <Compile Include="Shell\MessageBoxViewModel.cs" />
+    <Compile Include="Framework\Converters\NullToCollapsedConverter.cs" />
+    <Compile Include="Orders\OrdersWorkspaceViewModel.cs" />
+    <Compile Include="Orders\OrderViewModel.cs" />
+    <Compile Include="Settings\SettingsViewModel.cs" />
+    <Compile Include="Framework\IShell.cs" />
+    <Compile Include="Framework\IWorkspace.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Shell\ScreensBootstrapper.cs" />
+    <Compile Include="Shell\ShellViewModel.cs" />
+    <Compile Include="Framework\DocumentWorkspace.cs" />
+    <Compile Include="Framework\DocumentWorkspaceState.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Customers\AddressView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Customers\CustomersWorkspaceView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Customers\CustomerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Customers\CustomersWorkspace\Detail.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Customers\CustomersWorkspace\Master.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\DefaultStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\NamedStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Shell\DialogConductorView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Shell\MessageBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Orders\OrdersWorkspace\Detail.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Orders\OrdersWorkspaceView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Orders\OrdersWorkspace\Master.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Orders\OrderView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Settings\SettingsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Shell\ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Orders\Resources\Images\shopping-cart-full48.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Customers\Resources\Images\man1-48.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\OutOfBrowserSettings.xml" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Settings\Resources\Images\report48.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\Images\backgroundshadow.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Resources\Images\backgroundtexture.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/AddressView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/AddressView.xaml
new file mode 100644
index 0000000..f1ec1b1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/AddressView.xaml
@@ -0,0 +1,10 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Customers.AddressView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<StackPanel>
+        <TextBlock FontSize="20"
+                   Text="This is where the address details would go..." />
+		<Button Content="Close"
+		        x:Name="TryClose" />
+	</StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/AddressViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/AddressViewModel.cs
new file mode 100644
index 0000000..28a9bb6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/AddressViewModel.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloScreens.Customers
+{
+    public class AddressViewModel : Screen
+    {
+        public AddressViewModel() {
+            DisplayName = "Address";
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomerView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomerView.xaml
new file mode 100644
index 0000000..d07ad82
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomerView.xaml
@@ -0,0 +1,29 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Customers.CustomerView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ct="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+	<Grid>
+		<ct:DockPanel Margin="12">
+			<StackPanel Orientation="Horizontal"
+			            ct:DockPanel.Dock="Bottom"
+			            HorizontalAlignment="Right">
+				<Button Content="Save"
+				        x:Name="Save" />
+				<Button Content="Close"
+				        x:Name="TryClose" />
+			</StackPanel>
+
+			<StackPanel>
+				<TextBlock Foreground="White"
+				           FontSize="20"
+				           Text="This is where the customer details would go..." />
+				<Button x:Name="EditAddress"
+				        Content="EditAddress" />
+			</StackPanel>
+		</ct:DockPanel>
+
+        <ContentControl x:Name="Dialogs" 
+                        VerticalContentAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"/>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomerViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomerViewModel.cs
new file mode 100644
index 0000000..d460bf1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomerViewModel.cs
@@ -0,0 +1,19 @@
+namespace Caliburn.Micro.HelloScreens.Customers
+{
+    using System.ComponentModel.Composition;
+    using Framework;
+
+    [Export(typeof(CustomerViewModel))]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
+    public class CustomerViewModel : DocumentBase
+    {
+        public void Save() {
+            IsDirty = false;
+            Dialogs.ShowMessageBox("Your data has been successfully saved.", "Data Saved");
+        }
+
+        public void EditAddress() {
+            Dialogs.ShowDialog(new AddressViewModel());
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspace/Detail.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspace/Detail.xaml
new file mode 100644
index 0000000..e88410e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspace/Detail.xaml
@@ -0,0 +1,6 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Customers.CustomersWorkspace.Detail"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:clt="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit">
+	<clt:TransitioningContentControl x:Name="ActiveItem" />
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspace/Master.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspace/Master.xaml
new file mode 100644
index 0000000..308524d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspace/Master.xaml
@@ -0,0 +1,63 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Customers.CustomersWorkspace.Master"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+             xmlns:ct="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+	<Grid Margin="12">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="*" />
+			<ColumnDefinition Width="*" />
+		</Grid.ColumnDefinitions>
+
+		<StackPanel Orientation="Horizontal">
+			<TextBlock Text="Search"
+			           Margin="0 0 4 0"
+			           Foreground="White"
+			           VerticalAlignment="Center" />
+			<TextBox Width="175" />
+			<Button Content="Go" />
+		</StackPanel>
+
+		<TextBlock Grid.Row="1"
+		           Foreground="White"
+		           Margin="4"
+		           Text="No matches found for search." />
+
+		<ct:DockPanel Grid.Row="1"
+		              Grid.Column="1">
+			<TextBlock Text="Open Customers"
+			           Foreground="White"
+			           FontSize="16"
+			           FontWeight="Bold"
+			           ct:DockPanel.Dock="Top"
+			           Margin="4" />
+			<ItemsControl x:Name="Items"
+                          Margin="4 0 0 0">
+				<ItemsControl.ItemTemplate>
+					<DataTemplate>
+						<StackPanel Orientation="Horizontal"
+						            Margin="4">
+							<Button Content="+"
+							        cal:Message.Attach="Edit($dataContext)" />
+							<TextBlock Text="{Binding DisplayName, Mode=TwoWay}"
+							           VerticalAlignment="Center"
+							           Foreground="White"
+							           Margin="4 0 0 0" />
+						</StackPanel>
+					</DataTemplate>
+				</ItemsControl.ItemTemplate>
+			</ItemsControl>
+		</ct:DockPanel>
+
+		<Button Content="New"
+		        Grid.Row="2"
+		        Grid.Column="1"
+		        HorizontalAlignment="Right"
+		        x:Name="New" />
+	</Grid>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspaceView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspaceView.xaml
new file mode 100644
index 0000000..d479bb7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspaceView.xaml
@@ -0,0 +1,75 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Customers.CustomersWorkspaceView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+             xmlns:clt="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit"
+             xmlns:ct="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+	<Border CornerRadius="0 0 8 8"
+	        BorderBrush="#FF2C5403"
+	        BorderThickness="2">
+		<Border.Background>
+			<RadialGradientBrush>
+				<RadialGradientBrush.RelativeTransform>
+					<TransformGroup>
+						<ScaleTransform CenterX="0.5"
+						                CenterY="0.5"
+						                ScaleX="1.587"
+						                ScaleY="1.587" />
+						<SkewTransform AngleX="0"
+						               AngleY="0"
+						               CenterX="0.5"
+						               CenterY="0.5" />
+						<RotateTransform Angle="0"
+						                 CenterX="0.5"
+						                 CenterY="0.5" />
+						<TranslateTransform X="0"
+						                    Y="0" />
+					</TransformGroup>
+				</RadialGradientBrush.RelativeTransform>
+				<GradientStop Color="#FF2C5403"
+				              Offset="1" />
+				<GradientStop Color="#FF33FD69"
+				              Offset="0" />
+			</RadialGradientBrush>
+		</Border.Background>
+		<ct:DockPanel>
+			<Border BorderBrush="#FF2C5403"
+			        BorderThickness="0 0 0 2"
+			        Padding="4"
+			        ct:DockPanel.Dock="Top">
+				<Border.Background>
+					<LinearGradientBrush>
+						<LinearGradientBrush.RelativeTransform>
+							<TransformGroup>
+								<ScaleTransform CenterX="0.5"
+								                CenterY="0.5"
+								                ScaleX="1.587"
+								                ScaleY="1.587" />
+								<SkewTransform AngleX="0"
+								               AngleY="0"
+								               CenterX="0.5"
+								               CenterY="0.5" />
+								<RotateTransform Angle="0"
+								                 CenterX="0.5"
+								                 CenterY="0.5" />
+								<TranslateTransform X="0"
+								                    Y="0" />
+							</TransformGroup>
+						</LinearGradientBrush.RelativeTransform>
+						<GradientStop Color="#FF2C5403"
+						              Offset="-.75" />
+						<GradientStop Color="#FF33FD69"
+						              Offset="2.5" />
+					</LinearGradientBrush>
+				</Border.Background>
+				<TextBlock Text="{Binding DisplayName, Mode=TwoWay}"
+				           Foreground="White"
+				           FontWeight="Bold"
+				           FontSize="20" />
+			</Border>
+			<clt:TransitioningContentControl cal:View.Context="{Binding State, Mode=TwoWay}"
+			                                 cal:View.Model="{Binding}" 
+                                             Style="{StaticResource specialTransition}"/>
+		</ct:DockPanel>
+	</Border>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspaceViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspaceViewModel.cs
new file mode 100644
index 0000000..61ddb53
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/CustomersWorkspaceViewModel.cs
@@ -0,0 +1,33 @@
+namespace Caliburn.Micro.HelloScreens.Customers
+{
+    using System;
+    using System.ComponentModel.Composition;
+    using Framework;
+
+    [Export(typeof(IWorkspace))]
+    public class CustomersWorkspaceViewModel : DocumentWorkspace<CustomerViewModel>
+    {
+        readonly Func<CustomerViewModel> createCustomerViewModel;
+        static int count = 1;
+
+        [ImportingConstructor]
+        public CustomersWorkspaceViewModel(Func<CustomerViewModel> customerVMFactory) {
+            createCustomerViewModel = customerVMFactory;
+        }
+
+        public override string IconName {
+            get { return "Customers"; }
+        }
+
+        public override string Icon {
+            get { return "../Customers/Resources/Images/man1-48.png"; }
+        }
+
+        public void New() {
+            var vm = createCustomerViewModel();
+            vm.DisplayName = "Customer " + count++;
+            vm.IsDirty = true;
+            Edit(vm);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/Resources/Images/man1-48.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/Resources/Images/man1-48.png
new file mode 100644
index 0000000..66411cd
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Customers/Resources/Images/man1-48.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/ApplicationCloseCheck.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/ApplicationCloseCheck.cs
new file mode 100644
index 0000000..cee8a8b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/ApplicationCloseCheck.cs
@@ -0,0 +1,27 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    using System;
+    using System.ComponentModel.Composition;
+
+    public class ApplicationCloseCheck : IResult {
+        readonly Action<IDialogManager, Action<bool>> closeCheck;
+        readonly IChild screen;
+
+        public ApplicationCloseCheck(IChild screen, Action<IDialogManager, Action<bool>> closeCheck) {
+            this.screen = screen;
+            this.closeCheck = closeCheck;
+        }
+
+        [Import]
+        public IShell Shell { get; set; }
+
+        public void Execute(ActionExecutionContext context) {
+            var documentWorkspace = screen.Parent as IDocumentWorkspace;
+            if (documentWorkspace != null)
+                documentWorkspace.Edit(screen);
+
+            closeCheck(Shell.Dialogs, result => Completed(this, new ResultCompletionEventArgs { WasCancelled = !result }));
+        }
+
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Controls/CustomTransitionControl.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Controls/CustomTransitionControl.cs
new file mode 100644
index 0000000..3a8c33e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Controls/CustomTransitionControl.cs
@@ -0,0 +1,13 @@
+namespace Caliburn.Micro.HelloScreens.Framework.Controls {
+    using System;
+    using System.Windows.Controls;
+
+    public class CustomTransitionControl : TransitioningContentControl {
+        public event EventHandler ContentChanged = delegate { };
+
+        protected override void OnContentChanged(object oldContent, object newContent) {
+            base.OnContentChanged(oldContent, newContent);
+            ContentChanged(this, EventArgs.Empty);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Controls/TiledBackground.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Controls/TiledBackground.cs
new file mode 100644
index 0000000..75cdd79
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Controls/TiledBackground.cs
@@ -0,0 +1,83 @@
+namespace Caliburn.Micro.HelloScreens.Framework.Controls {
+    using System;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Media;
+    using System.Windows.Media.Imaging;
+
+    /// <summary>
+    /// This class was borrowed from the SL4 JetPack Theme.
+    /// </summary>
+    public class TiledBackground : UserControl {
+        public static readonly DependencyProperty SourceUriProperty = DependencyProperty.Register(
+            "SourceUri",
+            typeof(Uri),
+            typeof(TiledBackground),
+            new PropertyMetadata(null, OnSourceUriChanged)
+            );
+
+        BitmapImage bitmap;
+        int lastHeight;
+        int lastWidth;
+        WriteableBitmap sourceBitmap;
+        readonly Image tiledImage = new Image();
+
+        public TiledBackground() {
+            tiledImage.Stretch = Stretch.None;
+            Content = tiledImage;
+            SizeChanged += TiledBackgroundSizeChanged;
+        }
+
+        /// <summary>
+        /// A description of the property.
+        /// </summary>
+        public Uri SourceUri {
+            get { return (Uri)GetValue(SourceUriProperty); }
+            set { SetValue(SourceUriProperty, value); }
+        }
+
+        void TiledBackgroundSizeChanged(object sender, SizeChangedEventArgs e) {
+            UpdateTiledImage();
+        }
+
+        void UpdateTiledImage() {
+            if(sourceBitmap == null)
+                return;
+
+            var width = (int)Math.Ceiling(ActualWidth);
+            var height = (int)Math.Ceiling(ActualHeight);
+
+            // only regenerate the image if the width/height has grown
+            if(width < lastWidth && height < lastHeight)
+                return;
+            lastWidth = width;
+            lastHeight = height;
+
+            var final = new WriteableBitmap(width, height);
+
+            for(var x = 0; x < final.PixelWidth; x++) {
+                for(var y = 0; y < final.PixelHeight; y++) {
+                    var tiledX = (x % sourceBitmap.PixelWidth);
+                    var tiledY = (y % sourceBitmap.PixelHeight);
+                    final.Pixels[y * final.PixelWidth + x] = sourceBitmap.Pixels[tiledY * sourceBitmap.PixelWidth + tiledX];
+                }
+            }
+
+            tiledImage.Source = final;
+        }
+
+        static void OnSourceUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) {
+            ((TiledBackground)d).OnSourceUriChanged(e);
+        }
+
+        protected virtual void OnSourceUriChanged(DependencyPropertyChangedEventArgs e) {
+            bitmap = new BitmapImage(e.NewValue as Uri) { CreateOptions = BitmapCreateOptions.None };
+            bitmap.ImageOpened += BitmapImageOpened;
+        }
+
+        void BitmapImageOpened(object sender, RoutedEventArgs e) {
+            sourceBitmap = new WriteableBitmap(bitmap);
+            UpdateTiledImage();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Converters/NullToCollapsedConverter.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Converters/NullToCollapsedConverter.cs
new file mode 100644
index 0000000..938d146
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/Converters/NullToCollapsedConverter.cs
@@ -0,0 +1,18 @@
+namespace Caliburn.Micro.HelloScreens.Framework.Converters
+{
+    using System;
+    using System.Globalization;
+    using System.Windows;
+    using System.Windows.Data;
+
+    public class NullToCollapsedConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            return value == null ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentBase.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentBase.cs
new file mode 100644
index 0000000..c99c010
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentBase.cs
@@ -0,0 +1,39 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    using System;
+    using System.ComponentModel.Composition;
+
+    public class DocumentBase : Screen, IHaveShutdownTask {
+        bool isDirty;
+
+        public bool IsDirty {
+            get { return isDirty; }
+            set {
+                isDirty = value;
+                NotifyOfPropertyChange(() => IsDirty);
+            }
+        }
+
+        [Import]
+        public IDialogManager Dialogs { get; set; }
+
+        public override void CanClose(Action<bool> callback)
+        {
+            if (IsDirty) 
+                DoCloseCheck(Dialogs, callback);
+            else callback(true);
+        }
+
+        public IResult GetShutdownTask() {
+            return IsDirty ? new ApplicationCloseCheck(this, DoCloseCheck) : null;
+        }
+
+        protected virtual void DoCloseCheck(IDialogManager dialogs, Action<bool> callback) {
+            dialogs.ShowMessageBox(
+                "You have unsaved data. Are you sure you want to close this document? All changes will be lost.",
+                "Unsaved Data",
+                MessageBoxOptions.YesNo,
+                box => callback(box.WasSelected(MessageBoxOptions.Yes))
+                );
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentWorkspace.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentWorkspace.cs
new file mode 100644
index 0000000..c4eab59
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentWorkspace.cs
@@ -0,0 +1,77 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    using System.ComponentModel;
+
+    public abstract class DocumentWorkspace<TDocument> : Conductor<TDocument>.Collection.OneActive, IDocumentWorkspace
+        where TDocument : INotifyPropertyChanged, IDeactivate, IHaveDisplayName {
+        DocumentWorkspaceState state = DocumentWorkspaceState.Master;
+
+        protected DocumentWorkspace() {
+            Items.CollectionChanged += delegate { NotifyOfPropertyChange(() => Status); };
+            DisplayName = IconName;
+        }
+
+        public DocumentWorkspaceState State {
+            get { return state; }
+            set {
+                if(state == value)
+                    return;
+
+                state = value;
+                NotifyOfPropertyChange(() => State);
+            }
+        }
+
+        protected IConductor Conductor {
+            get { return (IConductor)Parent; }
+        }
+
+        public abstract string IconName { get; }
+        public abstract string Icon { get; }
+
+        public string Status {
+            get { return Items.Count > 0 ? Items.Count.ToString() : string.Empty; }
+        }
+
+        public void Show() {
+            var haveActive = Parent as IHaveActiveItem;
+            if (haveActive != null && haveActive.ActiveItem == this) {
+                DisplayName = IconName;
+                State = DocumentWorkspaceState.Master;
+            }
+            else Conductor.ActivateItem(this);
+        }
+
+        void IDocumentWorkspace.Edit(object document) {
+            Edit((TDocument)document);
+        }
+
+        public void Edit(TDocument child) {
+            Conductor.ActivateItem(this);
+            State = DocumentWorkspaceState.Detail;
+            DisplayName = child.DisplayName;
+            ActivateItem(child);
+        }
+
+        public override void ActivateItem(TDocument item) {
+            item.Deactivated += OnItemOnDeactivated;
+            item.PropertyChanged += OnItemPropertyChanged;
+
+            base.ActivateItem(item);
+        }
+
+        void OnItemPropertyChanged(object sender, PropertyChangedEventArgs e) {
+            if(e.PropertyName == "DisplayName")
+                DisplayName = ((TDocument)sender).DisplayName;
+        }
+
+        void OnItemOnDeactivated(object sender, DeactivationEventArgs e) {
+            var doc = (TDocument)sender;
+            if(e.WasClosed) {
+                DisplayName = IconName;
+                State = DocumentWorkspaceState.Master;
+                doc.Deactivated -= OnItemOnDeactivated;
+                doc.PropertyChanged -= OnItemPropertyChanged;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentWorkspaceState.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentWorkspaceState.cs
new file mode 100644
index 0000000..0219e11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/DocumentWorkspaceState.cs
@@ -0,0 +1,6 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    public enum DocumentWorkspaceState {
+        Master,
+        Detail
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IDialogManager.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IDialogManager.cs
new file mode 100644
index 0000000..7d0ff70
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IDialogManager.cs
@@ -0,0 +1,8 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    using System;
+
+    public interface IDialogManager {
+        void ShowDialog(IScreen dialogModel);
+        void ShowMessageBox(string message, string title = null, MessageBoxOptions options = MessageBoxOptions.Ok, Action<IMessageBox> callback = null);
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IDocumentWorkspace.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IDocumentWorkspace.cs
new file mode 100644
index 0000000..a42196e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IDocumentWorkspace.cs
@@ -0,0 +1,5 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    public interface IDocumentWorkspace : IWorkspace {
+        void Edit(object document);
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IHaveShutdownTask.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IHaveShutdownTask.cs
new file mode 100644
index 0000000..49e002d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IHaveShutdownTask.cs
@@ -0,0 +1,5 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    public interface IHaveShutdownTask {
+        IResult GetShutdownTask();
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IMessageBox.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IMessageBox.cs
new file mode 100644
index 0000000..d4aa241
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IMessageBox.cs
@@ -0,0 +1,13 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    public interface IMessageBox : IScreen {
+        string Message { get; set; }
+        MessageBoxOptions Options { get; set; }
+
+        void Ok();
+        void Cancel();
+        void Yes();
+        void No();
+
+        bool WasSelected(MessageBoxOptions option);
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IShell.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IShell.cs
new file mode 100644
index 0000000..185b972
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IShell.cs
@@ -0,0 +1,5 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    public interface IShell : IConductor, IGuardClose {
+        IDialogManager Dialogs { get; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IWorkspace.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IWorkspace.cs
new file mode 100644
index 0000000..7b8b095
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/IWorkspace.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    public interface IWorkspace {
+        string Icon { get; }
+        string IconName { get; }
+        string Status { get; }
+
+        void Show();
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/MessageBoxOptions.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/MessageBoxOptions.cs
new file mode 100644
index 0000000..4d64518
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Framework/MessageBoxOptions.cs
@@ -0,0 +1,15 @@
+namespace Caliburn.Micro.HelloScreens.Framework {
+    using System;
+
+    [Flags]
+    public enum MessageBoxOptions {
+        Ok = 2,
+        Cancel = 4,
+        Yes = 8,
+        No = 16,
+
+        OkCancel = Ok | Cancel,
+        YesNo = Yes | No,
+        YesNoCancel = Yes | No | Cancel
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrderView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrderView.xaml
new file mode 100644
index 0000000..0331395
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrderView.xaml
@@ -0,0 +1,25 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Orders.OrderView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ct="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+    <Grid>
+        <ct:DockPanel Margin="12">
+            <StackPanel Orientation="Horizontal"
+		            ct:DockPanel.Dock="Bottom"
+		            HorizontalAlignment="Right">
+                <Button Content="Save"
+			        x:Name="Save" />
+                <Button Content="Close"
+			        x:Name="TryClose" />
+            </StackPanel>
+
+            <TextBlock Foreground="White"
+                   FontSize="20"
+                   Text="This is where the order details would go..." />
+        </ct:DockPanel>
+        
+        <ContentControl x:Name="Dialogs" 
+                        VerticalContentAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"/>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrderViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrderViewModel.cs
new file mode 100644
index 0000000..6338824
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrderViewModel.cs
@@ -0,0 +1,13 @@
+namespace Caliburn.Micro.HelloScreens.Orders {
+    using System.ComponentModel.Composition;
+    using Framework;
+
+    [Export(typeof(OrderViewModel)), PartCreationPolicy(CreationPolicy.NonShared)]
+    
+    public class OrderViewModel : DocumentBase {
+        public void Save() {
+            IsDirty = false;
+            Dialogs.ShowMessageBox("Your data has been successfully saved.", "Data Saved");
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspace/Detail.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspace/Detail.xaml
new file mode 100644
index 0000000..5a7270d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspace/Detail.xaml
@@ -0,0 +1,6 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Orders.OrdersWorkspace.Detail"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:clt="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit">
+    <clt:TransitioningContentControl x:Name="ActiveItem" />
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspace/Master.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspace/Master.xaml
new file mode 100644
index 0000000..74c9165
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspace/Master.xaml
@@ -0,0 +1,63 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Orders.OrdersWorkspace.Master"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ct="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro">
+	<Grid Margin="12">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="*" />
+			<ColumnDefinition Width="*" />
+		</Grid.ColumnDefinitions>
+
+		<StackPanel Orientation="Horizontal">
+			<TextBlock Text="Search"
+			           Margin="0 0 4 0"
+			           Foreground="White"
+			           VerticalAlignment="Center" />
+			<TextBox Width="175" />
+			<Button Content="Go" />
+		</StackPanel>
+
+		<TextBlock Grid.Row="1"
+		           Foreground="White"
+		           Margin="4"
+		           Text="No matches found for search." />
+
+		<ct:DockPanel Grid.Row="1"
+		              Grid.Column="1">
+			<TextBlock Text="Open Orders"
+			           Foreground="White"
+			           FontSize="16"
+			           FontWeight="Bold"
+			           ct:DockPanel.Dock="Top"
+			           Margin="4" />
+			<ItemsControl x:Name="Items"
+			              Margin="4 0 0 0">
+				<ItemsControl.ItemTemplate>
+					<DataTemplate>
+						<StackPanel Orientation="Horizontal"
+						            Margin="4">
+							<Button Content="+"
+							        cal:Message.Attach="Edit($dataContext)" />
+							<TextBlock Text="{Binding DisplayName, Mode=TwoWay}"
+							           VerticalAlignment="Center"
+							           Foreground="White"
+							           Margin="4 0 0 0" />
+						</StackPanel>
+					</DataTemplate>
+				</ItemsControl.ItemTemplate>
+			</ItemsControl>
+		</ct:DockPanel>
+
+		<Button Content="New"
+		        Grid.Row="2"
+		        Grid.Column="1"
+		        HorizontalAlignment="Right"
+		        x:Name="New" />
+	</Grid>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspaceView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspaceView.xaml
new file mode 100644
index 0000000..998d6fc
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspaceView.xaml
@@ -0,0 +1,75 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Orders.OrdersWorkspaceView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+             xmlns:Controls="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit"
+             xmlns:ct="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+    <Border CornerRadius="0 0 8 8"
+	        BorderBrush="#FF051F42"
+	        BorderThickness="2">
+        <Border.Background>
+            <RadialGradientBrush>
+                <RadialGradientBrush.RelativeTransform>
+                    <TransformGroup>
+                        <ScaleTransform CenterX="0.5"
+						                CenterY="0.5"
+						                ScaleX="1.587"
+						                ScaleY="1.587" />
+                        <SkewTransform AngleX="0"
+						               AngleY="0"
+						               CenterX="0.5"
+						               CenterY="0.5" />
+                        <RotateTransform Angle="0"
+						                 CenterX="0.5"
+						                 CenterY="0.5" />
+                        <TranslateTransform X="0"
+						                    Y="0" />
+                    </TransformGroup>
+                </RadialGradientBrush.RelativeTransform>
+                <GradientStop Color="#FF0D6BEA"
+				              Offset="0" />
+                <GradientStop Color="#FF051F42"
+				              Offset="1" />
+            </RadialGradientBrush>
+        </Border.Background>
+    <ct:DockPanel>
+            <Border BorderBrush="#FF051F42"
+			        BorderThickness="0 0 0 2"
+			        Padding="4"
+			        ct:DockPanel.Dock="Top">
+				<Border.Background>
+					<LinearGradientBrush>
+						<LinearGradientBrush.RelativeTransform>
+							<TransformGroup>
+								<ScaleTransform CenterX="0.5"
+								                CenterY="0.5"
+								                ScaleX="1.587"
+								                ScaleY="1.587" />
+								<SkewTransform AngleX="0"
+								               AngleY="0"
+								               CenterX="0.5"
+								               CenterY="0.5" />
+								<RotateTransform Angle="0"
+								                 CenterX="0.5"
+								                 CenterY="0.5" />
+								<TranslateTransform X="0"
+								                    Y="0" />
+							</TransformGroup>
+						</LinearGradientBrush.RelativeTransform>
+                        <GradientStop Color="#FF0D6BEA"
+				              Offset="2" />
+                        <GradientStop Color="#FF051F42"
+				              Offset="-.75" />
+                    </LinearGradientBrush>
+				</Border.Background>
+				<TextBlock Text="{Binding DisplayName, Mode=TwoWay}"
+				           Foreground="White"
+				           FontWeight="Bold"
+				           FontSize="20" />
+			</Border>
+			<Controls:TransitioningContentControl cal:View.Context="{Binding State, Mode=TwoWay}"
+			                                      cal:View.Model="{Binding}" 
+                                                  Style="{StaticResource specialTransition}"/>
+		</ct:DockPanel>
+	</Border>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspaceViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspaceViewModel.cs
new file mode 100644
index 0000000..513eb8a
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/OrdersWorkspaceViewModel.cs
@@ -0,0 +1,33 @@
+namespace Caliburn.Micro.HelloScreens.Orders
+{
+    using System;
+    using System.ComponentModel.Composition;
+    using Framework;
+
+    [Export(typeof(IWorkspace))]
+    public class OrdersWorkspaceViewModel : DocumentWorkspace<OrderViewModel>
+    {
+        static int count = 1;
+        readonly Func<OrderViewModel> createOrderViewModel;
+
+        [ImportingConstructor]
+        public OrdersWorkspaceViewModel(Func<OrderViewModel> orderVMFactory) {
+            createOrderViewModel = orderVMFactory;
+        }
+
+        public override string IconName {
+            get { return "Orders"; }
+        }
+
+        public override string Icon {
+            get { return "../Orders/Resources/Images/shopping-cart-full48.png"; }
+        }
+
+        public void New() {
+            var vm = createOrderViewModel();
+            vm.DisplayName = "Order " + count++;
+            vm.IsDirty = true;
+            Edit(vm);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/Resources/Images/shopping-cart-full48.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/Resources/Images/shopping-cart-full48.png
new file mode 100644
index 0000000..f43cf19
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Orders/Resources/Images/shopping-cart-full48.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..8f5645b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Caliburn.Micro.HelloScreens")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.HelloScreens")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("74158b2e-a568-4674-a6dd-abfbc195717a")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/OutOfBrowserSettings.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/OutOfBrowserSettings.xml
new file mode 100644
index 0000000..6c8f638
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Properties/OutOfBrowserSettings.xml
@@ -0,0 +1,10 @@
+<OutOfBrowserSettings ShortName="Hello Screens" EnableGPUAcceleration="True" ShowInstallMenuItem="True">
+  <OutOfBrowserSettings.Blurb>A simple "Billy Hollis" style shell built with Caliburn.Micro's Screens and Conductors.</OutOfBrowserSettings.Blurb>
+  <OutOfBrowserSettings.WindowSettings>
+    <WindowSettings Title="Hello Screens" Height="768" Width="1024" />
+  </OutOfBrowserSettings.WindowSettings>
+  <OutOfBrowserSettings.SecuritySettings>
+    <SecuritySettings ElevatedPermissions="Required" />
+  </OutOfBrowserSettings.SecuritySettings>
+  <OutOfBrowserSettings.Icons />
+</OutOfBrowserSettings>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/DefaultStyles.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/DefaultStyles.xaml
new file mode 100644
index 0000000..95efc98
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/DefaultStyles.xaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:tl="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit">
+    <Style TargetType="tl:TransitioningContentControl">
+        <Setter Property="HorizontalContentAlignment"
+			        Value="Stretch" />
+        <Setter Property="VerticalContentAlignment"
+			        Value="Stretch" />
+        <Setter Property="HorizontalAlignment"
+			        Value="Stretch" />
+        <Setter Property="VerticalAlignment"
+			        Value="Stretch" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/Images/backgroundshadow.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/Images/backgroundshadow.png
new file mode 100644
index 0000000..4bf7c54
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/Images/backgroundshadow.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/Images/backgroundtexture.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/Images/backgroundtexture.png
new file mode 100644
index 0000000..cf52613
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/Images/backgroundtexture.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/NamedStyles.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/NamedStyles.xaml
new file mode 100644
index 0000000..f4fa264
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Resources/NamedStyles.xaml
@@ -0,0 +1,111 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ei="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions"
+                    xmlns:ee="clr-namespace:Microsoft.Expression.Media.Effects;assembly=Microsoft.Expression.Effects"
+                    xmlns:tl="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit">
+	<Style TargetType="tl:TransitioningContentControl"
+	       x:Key="specialTransition">
+		<Setter Property="HorizontalContentAlignment"
+		        Value="Stretch" />
+		<Setter Property="VerticalContentAlignment"
+		        Value="Stretch" />
+		<Setter Property="HorizontalAlignment"
+		        Value="Stretch" />
+		<Setter Property="VerticalAlignment"
+		        Value="Stretch" />
+
+		<Setter Property="Transition"
+		        Value="DefaultTransition" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="tl:TransitioningContentControl">
+					<Border BorderBrush="{TemplateBinding BorderBrush}"
+					        BorderThickness="{TemplateBinding BorderThickness}"
+					        Background="{TemplateBinding Background}"
+					        CornerRadius="2">
+						<VisualStateManager.CustomVisualStateManager>
+							<ei:ExtendedVisualStateManager />
+						</VisualStateManager.CustomVisualStateManager>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="PresentationStates">
+								<VisualStateGroup.Transitions>
+									<VisualTransition GeneratedDuration="0:0:0.3">
+										<ei:ExtendedVisualStateManager.TransitionEffect>
+											<ee:SlideInTransitionEffect />
+										</ei:ExtendedVisualStateManager.TransitionEffect>
+										<Storyboard>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)"
+											                               Storyboard.TargetName="PreviousContentPresentationSite">
+												<DiscreteObjectKeyFrame KeyTime="0:0:0.5">
+													<DiscreteObjectKeyFrame.Value>
+														<Visibility>Collapsed</Visibility>
+													</DiscreteObjectKeyFrame.Value>
+												</DiscreteObjectKeyFrame>
+											</ObjectAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualTransition>
+								</VisualStateGroup.Transitions>
+								<VisualState x:Name="DefaultTransition">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+										                               Storyboard.TargetProperty="(UIElement.Visibility)"
+										                               Storyboard.TargetName="PreviousContentPresentationSite">
+											<DiscreteObjectKeyFrame KeyTime="00:00:00">
+												<DiscreteObjectKeyFrame.Value>
+													<Visibility>Collapsed</Visibility>
+												</DiscreteObjectKeyFrame.Value>
+											</DiscreteObjectKeyFrame>
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="Normal">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+										                               Storyboard.TargetProperty="(UIElement.Visibility)"
+										                               Storyboard.TargetName="PreviousContentPresentationSite">
+											<DiscreteObjectKeyFrame KeyTime="00:00:00">
+												<DiscreteObjectKeyFrame.Value>
+													<Visibility>Collapsed</Visibility>
+												</DiscreteObjectKeyFrame.Value>
+											</DiscreteObjectKeyFrame>
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+						<Grid>
+							<ContentPresenter x:Name="PreviousContentPresentationSite"
+							                  ContentTemplate="{TemplateBinding ContentTemplate}"
+							                  Content="{x:Null}"
+							                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+								<ContentPresenter.RenderTransform>
+									<TransformGroup>
+										<ScaleTransform />
+										<SkewTransform />
+										<RotateTransform />
+										<TranslateTransform />
+									</TransformGroup>
+								</ContentPresenter.RenderTransform>
+							</ContentPresenter>
+							<ContentPresenter x:Name="CurrentContentPresentationSite"
+							                  ContentTemplate="{TemplateBinding ContentTemplate}"
+							                  Content="{x:Null}"
+							                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+								<ContentPresenter.RenderTransform>
+									<TransformGroup>
+										<ScaleTransform />
+										<SkewTransform />
+										<RotateTransform />
+										<TranslateTransform />
+									</TransformGroup>
+								</ContentPresenter.RenderTransform>
+							</ContentPresenter>
+						</Grid>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/Resources/Images/report48.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/Resources/Images/report48.png
new file mode 100644
index 0000000..c5539bd
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/Resources/Images/report48.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/SettingsView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/SettingsView.xaml
new file mode 100644
index 0000000..71abf07
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/SettingsView.xaml
@@ -0,0 +1,75 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Settings.SettingsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ct="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+	<Border CornerRadius="0 0 8 8"
+	        BorderBrush="#FF590980"
+	        BorderThickness="2">
+		<Border.Background>
+			<RadialGradientBrush>
+				<RadialGradientBrush.RelativeTransform>
+					<TransformGroup>
+						<ScaleTransform CenterX="0.5"
+						                CenterY="0.5"
+						                ScaleX="1.587"
+						                ScaleY="1.587" />
+						<SkewTransform AngleX="0"
+						               AngleY="0"
+						               CenterX="0.5"
+						               CenterY="0.5" />
+						<RotateTransform Angle="0"
+						                 CenterX="0.5"
+						                 CenterY="0.5" />
+						<TranslateTransform X="0"
+						                    Y="0" />
+					</TransformGroup>
+				</RadialGradientBrush.RelativeTransform>
+                <GradientStop Color="#FF590980"
+				              Offset="1" />
+                <GradientStop Color="#FFA111EA"
+				              Offset="0" />
+            </RadialGradientBrush>
+		</Border.Background>
+		<ct:DockPanel>
+            <Border BorderBrush="#FF590980"
+			        BorderThickness="0 0 0 2"
+			        Padding="4"
+			        ct:DockPanel.Dock="Top">
+				<Border.Background>
+					<LinearGradientBrush>
+						<LinearGradientBrush.RelativeTransform>
+							<TransformGroup>
+								<ScaleTransform CenterX="0.5"
+								                CenterY="0.5"
+								                ScaleX="1.587"
+								                ScaleY="1.587" />
+								<SkewTransform AngleX="0"
+								               AngleY="0"
+								               CenterX="0.5"
+								               CenterY="0.5" />
+								<RotateTransform Angle="0"
+								                 CenterX="0.5"
+								                 CenterY="0.5" />
+								<TranslateTransform X="0"
+								                    Y="0" />
+							</TransformGroup>
+						</LinearGradientBrush.RelativeTransform>
+                        <GradientStop Color="#FF590980"
+						              Offset="-.75" />
+                        <GradientStop Color="#FFA111EA"
+						              Offset="2.5" />
+					</LinearGradientBrush>
+				</Border.Background>
+				<TextBlock Text="{Binding DisplayName, Mode=TwoWay}"
+				           Foreground="White"
+				           FontWeight="Bold"
+				           FontSize="20" />
+			</Border>
+
+			<TextBlock Foreground="White"
+			           Margin="12"
+			           FontSize="20"
+			           Text="Settings go here..." />
+		</ct:DockPanel>
+	</Border>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/SettingsViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/SettingsViewModel.cs
new file mode 100644
index 0000000..d096a18
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Settings/SettingsViewModel.cs
@@ -0,0 +1,28 @@
+namespace Caliburn.Micro.HelloScreens.Settings
+{
+    using System.ComponentModel.Composition;
+    using Framework;
+
+    [Export(typeof(IWorkspace))]
+    public class SettingsViewModel : Screen, IWorkspace {
+        public SettingsViewModel() {
+            DisplayName = IconName;
+        }
+
+        public string Icon {
+            get { return "../Settings/Resources/Images/report48.png"; }
+        }
+
+        public string IconName {
+            get { return "Settings"; }
+        }
+
+        public string Status {
+            get { return string.Empty; }
+        }
+
+        public void Show() {
+            ((IConductor)Parent).ActivateItem(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ApplicationCloseStrategy.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ApplicationCloseStrategy.cs
new file mode 100644
index 0000000..51547f9
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ApplicationCloseStrategy.cs
@@ -0,0 +1,48 @@
+namespace Caliburn.Micro.HelloScreens.Shell {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Framework;
+
+    public class ApplicationCloseStrategy : ICloseStrategy<IWorkspace> {
+        IEnumerator<IWorkspace> enumerator;
+        bool finalResult;
+        Action<bool, IEnumerable<IWorkspace>> callback;
+
+        public void Execute(IEnumerable<IWorkspace> toClose, Action<bool, IEnumerable<IWorkspace>> callback) {
+            enumerator = toClose.GetEnumerator();
+            this.callback = callback;
+            finalResult = true;
+
+            Evaluate(finalResult);
+        }
+
+        void Evaluate(bool result)
+        {
+            finalResult = finalResult && result;
+
+            if (!enumerator.MoveNext() || !result)
+                callback(finalResult, new List<IWorkspace>());
+            else
+            {
+                var current = enumerator.Current;
+                var conductor = current as IConductor;
+                if (conductor != null)
+                {
+                    var tasks = conductor.GetChildren()
+                        .OfType<IHaveShutdownTask>()
+                        .Select(x => x.GetShutdownTask())
+                        .Where(x => x != null);
+
+                    var sequential = new SequentialResult(tasks.GetEnumerator());
+                    sequential.Completed += (s, e) => {
+                        if(!e.WasCancelled)
+                        Evaluate(!e.WasCancelled);
+                    };
+                    sequential.Execute(new ActionExecutionContext());
+                }
+                else Evaluate(true);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorView.xaml
new file mode 100644
index 0000000..2347d4e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorView.xaml
@@ -0,0 +1,39 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Shell.DialogConductorView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Controls="clr-namespace:Caliburn.Micro.HelloScreens.Framework.Controls">
+	<Grid Visibility="{Binding ActiveItem, Mode=TwoWay, Converter={StaticResource nullToCollapsed}}"
+	      Background="Transparent"
+	      IsHitTestVisible="True">
+		<Border BorderBrush="Black"
+		        BorderThickness="1"
+		        VerticalAlignment="Center"
+		        HorizontalAlignment="Center"
+		        Background="White"
+		        CornerRadius="0 0 4 4">
+			<Border.Effect>
+				<DropShadowEffect Opacity=".5" />
+			</Border.Effect>
+			<StackPanel>
+				<Border>
+					<Border.Background>
+						<LinearGradientBrush StartPoint="-1,0.5"
+						                     EndPoint="1,0.5">
+							<GradientStop Offset="1"
+							              Color="#FF3B3B3B" />
+							<GradientStop Offset="0"
+							              Color="#FF000000" />
+						</LinearGradientBrush>
+					</Border.Background>
+					<TextBlock x:Name="ActiveItem_DisplayName"
+					           FontWeight="Bold"
+					           FontSize="14"
+					           Margin="4 2 2 2"
+					           Foreground="White" />
+				</Border>
+                <Controls:CustomTransitionControl x:Name="ActiveItem"
+                                               Margin="8" />
+			</StackPanel>
+		</Border>
+	</Grid>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorView.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorView.xaml.cs
new file mode 100644
index 0000000..bb249e7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorView.xaml.cs
@@ -0,0 +1,68 @@
+namespace Caliburn.Micro.HelloScreens.Shell {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Windows;
+    using System.Windows.Controls;
+
+    public partial class DialogConductorView : UserControl {
+        bool disabled;
+
+        public DialogConductorView() {
+            InitializeComponent();
+            ActiveItem.ContentChanged += OnTransitionCompleted;
+            Loaded += OnLoad;
+        }
+
+        void OnLoad(object sender, RoutedEventArgs e) {
+            if(disabled) DisableBackground();
+        }
+
+        void OnTransitionCompleted(object sender, EventArgs e) {
+            if(ActiveItem.Content == null)
+                EnableBackground();
+            else {
+                DisableBackground();
+
+                var control = ActiveItem.Content as Control;
+                if(control != null)
+                    control.Focus();
+            }
+        }
+
+        public void EnableBackground() {
+            disabled = false;
+            ChangeEnabledState(GetBackground(), true);
+        }
+
+        public void DisableBackground() {
+            disabled = true;
+            ChangeEnabledState(GetBackground(), false);
+        }
+
+        IEnumerable<UIElement> GetBackground() {
+            var contentControl = (ContentControl)Parent;
+            var container = (Panel)contentControl.Parent;
+            return container.Children.Where(child => child != contentControl);
+        }
+
+        void ChangeEnabledState(IEnumerable<UIElement> background, bool state) {
+            foreach(var uiElement in background) {
+                var control = uiElement as Control;
+                if (control != null)
+                    control.IsEnabled = state;
+                else
+                {
+                    var panel = uiElement as Panel;
+                    if (panel != null)
+                    {
+                        foreach (var child in panel.Children)
+                        {
+                            ChangeEnabledState(new [] {child}, state);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorViewModel.cs
new file mode 100644
index 0000000..07a179f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/DialogConductorViewModel.cs
@@ -0,0 +1,78 @@
+namespace Caliburn.Micro.HelloScreens.Shell {
+    using System;
+    using System.Collections;
+    using System.ComponentModel.Composition;
+    using Framework;
+
+    [Export(typeof(IDialogManager)), PartCreationPolicy(CreationPolicy.NonShared)]
+    public class DialogConductorViewModel : PropertyChangedBase, IDialogManager, IConductActiveItem {
+        readonly Func<IMessageBox> createMessageBox;
+
+        [ImportingConstructor]
+        public DialogConductorViewModel(Func<IMessageBox> messageBoxFactory) {
+            createMessageBox = messageBoxFactory;
+        }
+
+        public IScreen ActiveItem { get; private set; }
+
+        public IEnumerable GetChildren() {
+            return ActiveItem != null ? new[] { ActiveItem } : new object[0];
+        }
+
+        public void ActivateItem(object item) {
+            ActiveItem = item as IScreen;
+
+            var child = ActiveItem as IChild;
+            if(child != null)
+                child.Parent = this;
+
+            if(ActiveItem != null)
+                ActiveItem.Activate();
+
+            NotifyOfPropertyChange(() => ActiveItem);
+            ActivationProcessed(this, new ActivationProcessedEventArgs { Item = ActiveItem, Success = true });
+        }
+
+        public void DeactivateItem(object item, bool close) {
+            var guard = item as IGuardClose;
+            if(guard != null) {
+                guard.CanClose(result => {
+                    if(result)
+                        CloseActiveItemCore();
+                });
+            }
+            else CloseActiveItemCore();
+        }
+
+        object IHaveActiveItem.ActiveItem
+        {
+            get { return ActiveItem; }
+            set { ActivateItem(value); }
+        }
+
+        public event EventHandler<ActivationProcessedEventArgs> ActivationProcessed = delegate { };
+
+        public void ShowDialog(IScreen dialogModel) {
+            ActivateItem(dialogModel);
+        }
+
+        public void ShowMessageBox(string message, string title = "Hello Screens", MessageBoxOptions options = MessageBoxOptions.Ok, Action<IMessageBox> callback = null) {
+            var box = createMessageBox();
+
+            box.DisplayName = title;
+            box.Options = options;
+            box.Message = message;
+
+            if(callback != null)
+                box.Deactivated += delegate { callback(box); };
+
+            ActivateItem(box);
+        }
+
+        void CloseActiveItemCore() {
+            var oldItem = ActiveItem;
+            ActivateItem(null);
+            oldItem.Deactivate(true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/MessageBoxView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/MessageBoxView.xaml
new file mode 100644
index 0000000..c1fb267
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/MessageBoxView.xaml
@@ -0,0 +1,29 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Shell.MessageBoxView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             MaxWidth="375">
+    <StackPanel>
+        <TextBlock x:Name="Message" 
+                   TextWrapping="Wrap" />
+        <StackPanel Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Margin="0 8 0 0">
+            <Button x:Name="Ok"
+                    Margin="2 0 0 0"
+                    Visibility="{Binding OkVisible, Converter={StaticResource booleanToVisibility}}"
+                    Content="Ok" />
+            <Button x:Name="Yes"
+                    Margin="2 0 0 0"
+                    Visibility="{Binding YesVisible, Converter={StaticResource booleanToVisibility}}"
+                    Content="Yes" />
+            <Button x:Name="No"
+                    Margin="2 0 0 0"
+                    Visibility="{Binding NoVisible, Converter={StaticResource booleanToVisibility}}"
+                    Content="No" />
+            <Button x:Name="Cancel"
+                    Margin="2 0 0 0"
+                    Visibility="{Binding CancelVisible, Converter={StaticResource booleanToVisibility}}"
+                    Content="Cancel" />
+        </StackPanel>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/MessageBoxViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/MessageBoxViewModel.cs
new file mode 100644
index 0000000..c46bc9d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/MessageBoxViewModel.cs
@@ -0,0 +1,58 @@
+namespace Caliburn.Micro.HelloScreens.Shell {
+    using System.ComponentModel.Composition;
+    using Framework;
+
+    [Export(typeof(IMessageBox)), PartCreationPolicy(CreationPolicy.NonShared)]
+    
+    public class MessageBoxViewModel : Screen, IMessageBox {
+        MessageBoxOptions selection;
+
+        public bool OkVisible {
+            get { return IsVisible(MessageBoxOptions.Ok); }
+        }
+
+        public bool CancelVisible {
+            get { return IsVisible(MessageBoxOptions.Cancel); }
+        }
+
+        public bool YesVisible {
+            get { return IsVisible(MessageBoxOptions.Yes); }
+        }
+
+        public bool NoVisible {
+            get { return IsVisible(MessageBoxOptions.No); }
+        }
+
+        public string Message { get; set; }
+        public MessageBoxOptions Options { get; set; }
+
+        public void Ok() {
+            Select(MessageBoxOptions.Ok);
+        }
+
+        public void Cancel() {
+            Select(MessageBoxOptions.Cancel);
+        }
+
+        public void Yes() {
+            Select(MessageBoxOptions.Yes);
+        }
+
+        public void No() {
+            Select(MessageBoxOptions.No);
+        }
+
+        public bool WasSelected(MessageBoxOptions option) {
+            return (selection & option) == option;
+        }
+
+        bool IsVisible(MessageBoxOptions option) {
+            return (Options & option) == option;
+        }
+
+        void Select(MessageBoxOptions option) {
+            selection = option;
+            TryClose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ScreensBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ScreensBootstrapper.cs
new file mode 100644
index 0000000..bcbc4cf
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ScreensBootstrapper.cs
@@ -0,0 +1,85 @@
+namespace Caliburn.Micro.HelloScreens.Shell
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.Primitives;
+    using System.Linq;
+    using System.Windows;
+    using Customers;
+    using Framework;
+    using Orders;
+
+    public class ScreensBootstrapper : Bootstrapper<IShell>
+    {
+        CompositionContainer container;
+        Window mainWindow;
+        bool actuallyClosing;
+
+        protected override void Configure() {
+            container = CompositionHost.Initialize(
+                new AggregateCatalog(
+                    AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()
+                    )
+                );
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue<Func<IMessageBox>>(() => container.GetExportedValue<IMessageBox>());
+            batch.AddExportedValue<Func<CustomerViewModel>>(() => container.GetExportedValue<CustomerViewModel>());
+            batch.AddExportedValue<Func<OrderViewModel>>(() => container.GetExportedValue<OrderViewModel>());
+            batch.AddExportedValue(container);
+
+            container.Compose(batch);
+        }
+
+        protected override object GetInstance(Type serviceType, string key) {
+            var contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if(exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType) {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance) {
+            container.SatisfyImportsOnce(instance);
+        }
+
+        protected override void OnStartup(object sender, StartupEventArgs e) {
+            base.OnStartup(sender, e);
+
+            if(Application.IsRunningOutOfBrowser) {
+                mainWindow = Application.MainWindow;
+                mainWindow.Closing += MainWindowClosing;
+            }
+        }
+
+        void MainWindowClosing(object sender, ClosingEventArgs e) {
+            if (actuallyClosing)
+                return;
+
+            e.Cancel = true;
+
+            Execute.OnUIThread(() => {
+                var shell = IoC.Get<IShell>();
+
+                shell.CanClose(result => {
+                    if(result) {
+                        actuallyClosing = true;
+                        mainWindow.Close();
+                    }
+                });
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ShellView.xaml
new file mode 100644
index 0000000..17fefac
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ShellView.xaml
@@ -0,0 +1,62 @@
+<UserControl x:Class="Caliburn.Micro.HelloScreens.Shell.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ct="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+             xmlns:Controls="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit"
+             xmlns:local="clr-namespace:Caliburn.Micro.HelloScreens.Framework.Controls">
+	<Grid>
+        <!--Resources and TiledBackground control borrowed from the SL4 JetPack theme.-->
+		<local:TiledBackground SourceUri="/Resources/Images/backgroundtexture.png" />
+		<Image Source="/Resources/Images/backgroundshadow.png"
+		       Stretch="Fill" />
+
+		<ct:DockPanel>
+			<TextBlock ct:DockPanel.Dock="Top"
+			           Foreground="White"
+			           Text="Hello Screens"
+			           Margin="4 4 0 12"
+			           FontSize="28"
+			           FontWeight="Bold" />
+
+			<ItemsControl x:Name="Items"
+			              ct:DockPanel.Dock="Bottom"
+			              HorizontalAlignment="Center">
+				<ItemsControl.ItemsPanel>
+					<ItemsPanelTemplate>
+						<StackPanel Orientation="Horizontal" />
+					</ItemsPanelTemplate>
+				</ItemsControl.ItemsPanel>
+				<ItemsControl.ItemTemplate>
+					<DataTemplate>
+						<Button cal:Message.Attach="Show"
+						        Margin="8">
+							<Grid Width="100">
+								<StackPanel>
+									<Image Source="{Binding Icon}"
+									       Width="48"
+									       Height="48" />
+									<TextBlock Text="{Binding IconName, Mode=TwoWay}"
+									           HorizontalAlignment="Center" />
+								</StackPanel>
+								<TextBlock VerticalAlignment="Top"
+								           HorizontalAlignment="Right"
+								           Margin="2"
+								           Text="{Binding Status, Mode=TwoWay}" />
+							</Grid>
+						</Button>
+					</DataTemplate>
+				</ItemsControl.ItemTemplate>
+			</ItemsControl>
+
+			<Controls:TransitioningContentControl x:Name="ActiveItem"
+			                                      Style="{StaticResource specialTransition}"
+			                                      Margin="20" />
+		</ct:DockPanel>
+
+        <ContentControl x:Name="Dialogs" 
+                        VerticalContentAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"/>
+    </Grid>
+
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ShellViewModel.cs
new file mode 100644
index 0000000..12bee82
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/Caliburn.Micro.HelloScreens/Shell/ShellViewModel.cs
@@ -0,0 +1,23 @@
+namespace Caliburn.Micro.HelloScreens.Shell
+{
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using Framework;
+
+    [Export(typeof(IShell))]
+    public class ShellViewModel : Conductor<IWorkspace>.Collection.OneActive, IShell
+    {
+        readonly IDialogManager dialogs;
+
+        [ImportingConstructor]
+        public ShellViewModel(IDialogManager dialogs, [ImportMany]IEnumerable<IWorkspace> workspaces) {
+            this.dialogs = dialogs;
+            Items.AddRange(workspaces);
+            CloseStrategy = new ApplicationCloseStrategy();
+        }
+
+        public IDialogManager Dialogs {
+            get { return dialogs; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Effects.dll b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Effects.dll
new file mode 100644
index 0000000..c52a2b2
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Effects.dll differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Effects.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Effects.xml
new file mode 100644
index 0000000..8070f20
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Effects.xml
@@ -0,0 +1,1044 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Microsoft.Expression.Effects</name>
+    </assembly>
+    <members>
+        <member name="T:Microsoft.Expression.Media.Effects.BlindOrientation">
+            <summary>
+            Determine the orientation of the blinds.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.BlindsTransitionEffect">
+            <summary>
+            Transition shader that simulates blinds opening when transitioning
+            from one visual to another. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BlindsTransitionEffect.OrientationProperty">
+            <summary>
+            Gets or sets the orientation of the blinds.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BlindsTransitionEffect.CountProperty">
+            <summary>
+            Gets or sets the number of blinds.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BlindsTransitionEffect.ShaderOrientationProperty">
+            <summary>
+            Gets or sets the Amplitude variable within the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.BlindsTransitionEffect.#ctor">
+            <summary>
+            Creates an instance of the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.BlindsTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the BlindsTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the BlindsTransitionEffect effect.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BlindsTransitionEffect.Orientation">
+            <summary>
+            Gets or sets the orientation of the blinds.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BlindsTransitionEffect.Count">
+            <summary>
+            Gets or sets the number of blinds to display.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BlindsTransitionEffect.ShaderOrientation">
+            <summary>
+            Gets or sets the orientation of the blinds.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.BloomEffect">
+            <summary>
+            Effect that implements a bloom illumination of a visual. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BloomEffect.InputProperty">
+            <summary>
+            The explicit input for this pixel shader.
+            </summary>
+            
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BloomEffect.BloomIntensityProperty">
+            <summary>
+            This property is mapped to the BloomIntensity variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BloomEffect.BaseIntensityProperty">
+            <summary>
+            This property is mapped to the BaseIntensity variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BloomEffect.BloomSaturationProperty">
+            <summary>
+            This property is mapped to the BloomSaturation variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BloomEffect.BaseSaturationProperty">
+            <summary>
+            This property is mapped to the BaseSaturation variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BloomEffect.BaseBloomIntensityProperty">
+            <summary>
+            This property is mapped to the BloomIntensity variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BloomEffect.BaseBloomSaturationProperty">
+            <summary>
+            This property is mapped to the BloomSaturation variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.BloomEffect.ThresholdProperty">
+            <summary>
+            This property is mapped to the BaseSaturation variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.BloomEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BloomEffect.Threshold">
+            <summary>
+            Gets or sets the minimum intensity that will be used for the bloom.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BloomEffect.BaseIntensity">
+            <summary>
+            Gets or sets the base intensity.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BloomEffect.BloomIntensity">
+            <summary>
+            Gets or sets the bloom intensity.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BloomEffect.BaseSaturation">
+            <summary>
+            Gets or sets the base saturation.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BloomEffect.BloomSaturation">
+            <summary>
+            Gets or sets the bloom saturation.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BloomEffect.Input">
+            <summary>
+            Gets or sets the Input shader sampler.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BloomEffect.BaseBloomIntensity">
+            <summary>
+            Gets or sets the Base/BloomIntensity variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.BloomEffect.BaseBloomSaturation">
+            <summary>
+            Gets or sets the BaseBloomSaturation variable within the shader.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect">
+            <summary>
+            Transition effect that reveals two visuals through a growing/shrinking circle. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect.FeatherAmountProperty">
+            <summary>
+            Dependency property which modifies the feather amount variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect.ReverseProperty">
+            <summary>
+            Dependency property which modifies the circle movement.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect.ReverseShaderProperty">
+            <summary>
+            Dependency property which modifies the reverseShader variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the CircleRevealTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the CircleRevealTransitionEffect effect.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect.FeatherAmount">
+            <summary>
+            Gets or sets the FuzzyAmount variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect.Reverse">
+            <summary>
+            Gets or sets playing the circle reveal backward.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.CircleRevealTransitionEffect.ReverseShader">
+            <summary>
+            Gets or sets playing the circle reveal backward into the shader.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.CloudRevealTransitionEffect">
+            <summary>
+            Transition effect that transitions two visuals using a cloud 
+            texture as the sampler threshold.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.CloudyTransitionEffect">
+            <summary>
+            Defines a transition shader effect that uses an image as a sampler threshold
+            for interpolating pixel value between two visuals. 
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.RandomizedTransitionEffect">
+            <summary>
+            Defines a transition shader effect that provides a random value,
+            allowing the effect to provide variance each time the effect is run.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.RandomizedTransitionEffect.RandomSeedProperty">
+            <summary>
+            Dependency property which modifies the RandomSeed variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.RandomizedTransitionEffect.#ctor">
+            <summary>
+            Updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.RandomizedTransitionEffect.RandomSeed">
+            <summary>
+            Gets or sets the RandomSeed variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.CloudyTransitionEffect.CloudImageProperty">
+            <summary>
+            Dependency property which modifies the CloudImage variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.CloudyTransitionEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.CloudyTransitionEffect.CloudImage">
+            <summary>
+            Gets or sets the CloudImage variable within the shader used for sampling. 
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.CloudRevealTransitionEffect.#ctor">
+            <summary>
+            Creates an instance of the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.CloudRevealTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the CloudRevealTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the CloudRevealTransitionEffect effect.</returns>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.ColorToneEffect">
+            <summary>
+            Effect that modifies the color tone of a visual using
+            two colors as the sampling.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.ColorToneEffect.InputProperty">
+            <summary>
+            The explicit input for this pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.ColorToneEffect.DesaturationProperty">
+            <summary>
+            This property is mapped to the Desaturation variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.ColorToneEffect.ToneAmountProperty">
+            <summary>
+            This property is mapped to the Tone variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.ColorToneEffect.LightColorProperty">
+            <summary>
+            This property is mapped to the LightColor variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.ColorToneEffect.DarkColorProperty">
+            <summary>
+            This property is mapped to the DarkColor variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.ColorToneEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.ColorToneEffect.Desaturation">
+            <summary>
+            Gets or sets the Desaturation variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.ColorToneEffect.ToneAmount">
+            <summary>
+            Gets or sets the Tone variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.ColorToneEffect.LightColor">
+            <summary>
+            Gets or sets the LightColor variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.ColorToneEffect.DarkColor">
+            <summary>
+            Gets or sets the DarkColor variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.ColorToneEffect.Input">
+            <summary>
+            Gets or sets the Input shader sampler.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.EmbossedEffect">
+            <summary>
+            Effect that simulates an embossed look for the visual. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.EmbossedEffect.InputProperty">
+            <summary>
+            The explicit input for this pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.EmbossedEffect.AmountProperty">
+            <summary>
+            This property is mapped to the Amount variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.EmbossedEffect.HeightProperty">
+            <summary>
+            This property is mapped to the Height variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.EmbossedEffect.ColorProperty">
+            <summary>
+            This property is mapped to the Color variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.EmbossedEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.EmbossedEffect.Amount">
+            <summary>
+            Gets or sets the Amount variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.EmbossedEffect.Height">
+            <summary>
+            Gets or sets the Height variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.EmbossedEffect.Color">
+            <summary>
+            Gets or sets the Color variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.EmbossedEffect.Input">
+            <summary>
+            Gets or sets the Input shader sampler.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.FadeTransitionEffect">
+            <summary>
+            Transition effect that gradually transitions from one visual to another.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.FadeTransitionEffect.#ctor">
+            <summary>
+            Creates an instance of the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.FadeTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the FadeTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the FadeTransitionEffect effect.</returns>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.MagnifyEffect">
+            <summary>
+            Effect that simulates a magnifying lens.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.InnerRadiusProperty">
+            <summary>
+            Gets or sets the InnerRadius variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.OuterRadiusProperty">
+            <summary>
+            Gets or sets the OuterRadius variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.CenterProperty">
+            <summary>
+            Gets or sets the center variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.AmountProperty">
+            <summary>
+            Gets or sets the amount variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.InputProperty">
+            <summary>
+            Gets or sets the Input used in the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.generalTransform">
+            <summary>
+            The transform used for this shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.MagnifyEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MagnifyEffect.InnerRadius">
+            <summary>
+            Gets or sets the InnerRadius variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MagnifyEffect.OuterRadius">
+            <summary>
+            Gets or sets the OuterRadius variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MagnifyEffect.Center">
+            <summary>
+            Gets or sets the Center variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MagnifyEffect.Amount">
+            <summary>
+            Gets or sets the ShrinkFactor. 
+            The higher the shrink factor the "smaller" the content inside the ellipse will appear. 
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MagnifyEffect.EffectMapping">
+            <summary>
+            Gets the EffectMapping.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MagnifyEffect.Input">
+            <summary>
+            Gets or sets the Input shader sampler.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform">
+            <summary>
+            The GeneralTransform corresponding to the Magnify effect.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.biasValue">
+            <summary>
+            Attempt to transform a point based on the effect.
+            </summary>
+            <param name="targetPoint">The point to transform.</param>
+            <param name="result">The result if available.</param>
+            <returns>Return true if successful.</returns>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.effect">
+            <summary>
+            The effect instance.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.IsInverse">
+            <summary>
+            If the transform is an inverse.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.inverseTransform">
+            <summary>
+            The transform specific to this Effect.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.#ctor(Microsoft.Expression.Media.Effects.MagnifyEffect)">
+            <summary>
+            Creates a new instance.
+            </summary>
+            <param name="fx">The source effect.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.TransformBounds(System.Windows.Rect)">
+            <summary>
+            This particular effect keeps axis-aligned lines axis-aligned, so the transformation of the Rect is just
+            transformation of its corner points.
+            </summary>
+            <param name="rect">The input Rect.</param>
+            <returns>The output Rect.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.OutToIn(System.Windows.Point,System.Double,System.Double,System.Windows.Point,System.Double)">
+            <summary>
+            For the inverse of the shader, we need to find Pin which is the Pixel Ouput, given Pout the texture input (is the reverse of the shader)
+            However, the shader algorithm is dependant on the radius of the pixel output from the center, which is a variable that we don't
+            have when computing the inverse. We need to perform bisection in order to converge using the equation below
+            PHatout = PHat_in*Scalar where
+            PHatout = Pout - Pcenter  
+            pHatin = Pin -Pcenter
+            
+            Scalar is dependent on the radius of Pin (which we don't have). 
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.InToOut(System.Windows.Point,System.Double,System.Double,System.Windows.Point,System.Double)">
+            <summary>
+            Given a pixel output (Pin) find the texture input (Pout).
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.PointIsInCircle(System.Windows.Point,System.Windows.Point,System.Double)">
+            <summary>
+            Determines if a point is within an ellipse.
+            </summary>
+            <param name="pt">The test point.</param>
+            <param name="center">The center point of the ellipse.</param>
+            <param name="radius">The radius of the ellipse.</param>
+            <returns>Return true if successful.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MagnifyEffect.MagnifyGeneralTransform.Inverse">
+            <summary>
+            Gets the inverse transform.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.MonochromeEffect">
+             <summary>
+            Effect that turns a visual into a monochrome color.
+             </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MonochromeEffect.ColorProperty">
+            <summary>
+            Gets or sets the Color variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.MonochromeEffect.InputProperty">
+            <summary>
+            Gets or sets the Input of the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.MonochromeEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MonochromeEffect.Color">
+            <summary>
+            Gets or sets the Color variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.MonochromeEffect.Input">
+            <summary>
+            Gets or sets the Input used in the shader.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.PixelateEffect">
+            <summary>
+            Effect that pixelates a visual.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.PixelateEffect.InputProperty">
+            <summary>
+            The explicit input for this pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.PixelateEffect.PixelationProperty">
+            <summary>
+            This property is mapped to the Pixelation variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.PixelateEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.PixelateEffect.Pixelation">
+            <summary>
+            Gets or sets the amount of pixelation inside the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.PixelateEffect.Input">
+            <summary>
+            Gets or sets the Input shader sampler.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.PixelateTransitionEffect">
+            <summary>
+            Transition effect that increases or decreases pixelation between two visuals.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.PixelateTransitionEffect.#ctor">
+            <summary>
+            Creates an instance of the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.PixelateTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the PixelateTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the PixelateTransitionEffect effect.</returns>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.RadialBlurTransitionEffect">
+            <summary>
+            Transition effect that performs a radial blur of the current visual as the new visual is introduced.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.RadialBlurTransitionEffect.#ctor">
+            <summary>
+            Creates an instance of the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.RadialBlurTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the RadialBlurTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the RadialBlurTransitionEffect effect.</returns>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.RippleEffect">
+            <summary>
+            Effect that simulates water ripples on the visual. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.RippleEffect.CenterProperty">
+            <summary>
+            Gets or sets the Center variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.RippleEffect.MagnitudeProperty">
+            <summary>
+            Gets or sets the Amplitude variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.RippleEffect.FrequencyProperty">
+            <summary>
+            Gets or sets the Frequency variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.RippleEffect.PhaseProperty">
+            <summary>
+            Gets or sets the Phase variable within the shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.RippleEffect.InputProperty">
+            <summary>
+            Gets or sets the Input brush used in the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.RippleEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.RippleEffect.Center">
+            <summary>
+            Gets or sets the Center variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.RippleEffect.Magnitude">
+            <summary>
+            Gets or sets the Amplitude variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.RippleEffect.Frequency">
+            <summary>
+            Gets or sets the Frequency variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.RippleEffect.Phase">
+            <summary>
+            Gets or sets the Phase variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.RippleEffect.Input">
+            <summary>
+            Gets or sets the Input shader sampler.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.RippleTransitionEffect">
+            <summary>
+            Transition effect that simulates water ripple during transition. 
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.RippleTransitionEffect.#ctor">
+            <summary>
+            Creates an instance of the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.RippleTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the RippleTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the RippleTransitionEffect effect.</returns>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.SharpenEffect">
+            <summary>
+            Effect that makes a visual crisper and sharper. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SharpenEffect.InputProperty">
+            <summary>
+            The explicit input for this pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SharpenEffect.AmountProperty">
+            <summary>
+            This property is mapped to the Amount variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SharpenEffect.HeightProperty">
+            <summary>
+            This property is mapped to the Width variable within the pixel shader. 
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SharpenEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SharpenEffect.Amount">
+            <summary>
+            Gets or sets the Amount variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SharpenEffect.Height">
+            <summary>
+            Gets or sets the Height variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SharpenEffect.Input">
+            <summary>
+            Gets or sets the Input shader sampler.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.SlideDirection">
+            <summary>
+            Defines the slide orientation.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.SlideInTransitionEffect">
+            <summary>
+            Transition effect that slides the current visual away, revealing the new visual. 
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SlideInTransitionEffect.SlideDirectionProperty">
+            <summary>
+            Dependency property that modifies the SlideAmount variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SlideInTransitionEffect.SlideNormalProperty">
+            <summary>
+            Dependency property that modifies the SlideAmount variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SlideInTransitionEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SlideInTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the SlideInTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the SlideInTransitionEffect effect.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SlideInTransitionEffect.SlideDirection">
+            <summary>
+            Gets or sets the SlideAmount variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SlideInTransitionEffect.SlideNormal">
+            <summary>
+            Gets or sets the SlideAmount variable within the shader.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.SmoothSwirlGridTransitionEffect">
+             <summary>
+            Transition effect that swirls the current visual while introducing the new visual.
+             </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SmoothSwirlGridTransitionEffect.TwistAmountProperty">
+            <summary>
+            Dependency property that modifies the TwistAmount variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SmoothSwirlGridTransitionEffect.CellCountProperty">
+            <summary>
+            Dependency property that modifies the number of cells where pixels will be twisted.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SmoothSwirlGridTransitionEffect.#ctor(System.Double)">
+            <summary>
+            Creates an instance and sets the shader's twist variable to the specified values.
+            </summary>
+            <param name="twist">Level of swirl twist.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SmoothSwirlGridTransitionEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SmoothSwirlGridTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the SmoothSwirlGridTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the SmoothSwirlGridTransitionEffect effect.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SmoothSwirlGridTransitionEffect.TwistAmount">
+            <summary>
+            Gets or sets the TwistAmount variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SmoothSwirlGridTransitionEffect.CellCount">
+            <summary>
+            Gets or sets the CellCount variable within the shader.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.SwirlEffect">
+            <summary>
+            Effect that swirls the current visual.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SwirlEffect.InputProperty">
+            <summary>
+            The explicit input for this pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SwirlEffect.CenterProperty">
+            <summary>
+            This property is mapped to the Center variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SwirlEffect.TwistAmountProperty">
+            <summary>
+            This property is mapped to the TwistAmount variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SwirlEffect.AngleFrequencyProperty">
+            <summary>
+            This property is mapped to the AngleFrequency variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SwirlEffect.generalTransform">
+            <summary>
+            The transform used when this Effect is applied.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SwirlEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SwirlEffect.Center">
+            <summary>
+            Gets or sets the Center variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SwirlEffect.TwistAmount">
+            <summary>
+            Gets or sets the TwistAmount variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SwirlEffect.AngleFrequency">
+            <summary>
+            Gets or sets the AngleFrequency variable within the shader.
+            This property is not exposed.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SwirlEffect.Input">
+            <summary>
+            Gets or sets the Input shader sampler.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SwirlEffect.EffectMapping">
+            <summary>
+            Gets the GeneralTransform for this effect.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.SwirlEffect.SwirlGeneralTransform">
+            <summary>
+            Used for transforming input and tree transformations.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SwirlEffect.SwirlGeneralTransform.theEffect">
+            <summary>
+            The instance of the Effect.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SwirlEffect.SwirlGeneralTransform.thisIsInverse">
+            <summary>
+            The inverse of the transform.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.SwirlEffect.SwirlGeneralTransform.inverseTransform">
+            <summary>
+            The inverse of this GeneralTransform.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SwirlEffect.SwirlGeneralTransform.#ctor(Microsoft.Expression.Media.Effects.SwirlEffect)">
+            <summary>
+            Creates an instance of this class.
+            </summary>
+            <param name="eff">The effect itself.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SwirlEffect.SwirlGeneralTransform.TransformBounds(System.Windows.Rect)">
+            <summary>
+            For this operation, the bounds is the bounding box of the four transformed points. 
+            Need to transform each of them, and then circumscribe.  This is true for both the 
+            forward and the inverse.
+            </summary>
+            <param name="rect">The input Rect.</param>
+            <returns>The transformed Rect.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.SwirlEffect.SwirlGeneralTransform.TryTransform(System.Windows.Point,System.Windows.Point@)">
+            <summary>
+            Attempt to transform inPoint with the Swirl effect.
+            </summary>
+            <param name="targetPoint">The input point.</param>
+            <param name="result">The output point after transformed using the Swirl effect.</param>
+            <returns>Returns true but throws if false.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.SwirlEffect.SwirlGeneralTransform.Inverse">
+            <summary>
+            Gets a clone of the inverse of the current transform.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.WaveTransitionEffect">
+            <summary>
+            Transition effect that waves the current visual while introducing the new visual.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.WaveTransitionEffect.MagnitudeProperty">
+            <summary>
+            Dependency property that modifies the Magnitude variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.WaveTransitionEffect.PhaseProperty">
+            <summary>
+            Dependency property that modifies the Phase variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.WaveTransitionEffect.FrequencyProperty">
+            <summary>
+            Dependency property that modifies the Frequency variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.WaveTransitionEffect.#ctor">
+            <summary>
+            Creates an instance of the shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.WaveTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the WaveTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the WaveTransitionEffect effect.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.WaveTransitionEffect.Magnitude">
+            <summary>
+            Gets or sets the magnitude of the wave.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.WaveTransitionEffect.Phase">
+            <summary>
+            Gets or sets the phase of the wave.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.WaveTransitionEffect.Frequency">
+            <summary>
+            Gets or sets the magnitude of the wave.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.WipeDirection">
+            <summary>
+            Define the wipe direction.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.WipeTransitionEffect">
+            <summary>
+            Transition effect that wipes the current visual while introducing the new visual.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.WipeTransitionEffect.WipeDirectionProperty">
+            <summary>
+            Dependency property that modifies the WipeDirection variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.WipeTransitionEffect.FeatherAmountProperty">
+            <summary>
+            Dependency property that modifies the FeatherAmount variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.WipeTransitionEffect.LineOriginProperty">
+            <summary>
+            Dependency property that modifies the LineOrigin variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.WipeTransitionEffect.LineNormalProperty">
+            <summary>
+            Dependency property that modifies the LineNormal variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.WipeTransitionEffect.LineOffsetProperty">
+            <summary>
+            Dependency property that modifies the LineOffset variable within the pixel shader.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.WipeTransitionEffect.#ctor">
+            <summary>
+            Creates an instance and updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.WipeTransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the WipeTransitionEffect effect. 
+            </summary>
+            <returns>A clone of the current instance of the WipeTransitionEffect effect.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.WipeTransitionEffect.WipeDirection">
+            <summary>
+            Gets or sets the direction of the wipe.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.WipeTransitionEffect.FeatherAmount">
+            <summary>
+            Gets or sets the FeatherAmount variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.WipeTransitionEffect.LineOrigin">
+            <summary>
+            Gets or sets the LineOrigin variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.WipeTransitionEffect.LineNormal">
+            <summary>
+            Gets or sets the LineNormal variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.WipeTransitionEffect.LineOffset">
+            <summary>
+            Gets or sets the LineOffset variable within the shader.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Interactions.dll b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Interactions.dll
new file mode 100644
index 0000000..10031c8
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Interactions.dll differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Interactions.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Interactions.xml
new file mode 100644
index 0000000..1898529
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloScreens/lib/Microsoft.Expression.Interactions.xml
@@ -0,0 +1,1256 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Microsoft.Expression.Interactions</name>
+    </assembly>
+    <members>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ActionCommand">
+            <summary>
+            A basic implementation of ICommand that wraps a method that takes no parameters or a method that takes one parameter.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ActionCommand.#ctor(System.Action)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Expression.Interactivity.Core.ActionCommand"/> class.
+            </summary>
+            <param name="action">The action.</param>
+            <remarks>Use this constructor to provide an action that ignores the ICommand parameter.</remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ActionCommand.#ctor(System.Action{System.Object})">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Expression.Interactivity.Core.ActionCommand"/> class.
+            </summary>
+            <param name="objectAction">An action that takes an object parameter.</param>
+            <remarks>Use this constructor to provide an action that uses the object parameter passed by the Execute method.</remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ActionCommand.System#Windows#Input#ICommand#CanExecute(System.Object)">
+            <summary>
+            Defines the method that determines whether the command can execute in its current state.
+            </summary>
+            <param name="parameter">Data used by the command.  If the command does not require data to be passed, then this object can be set to null.</param>
+            <returns>
+            Always returns true.
+            </returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ActionCommand.Execute(System.Object)">
+            <summary>
+            Defines the method to be called when the command is invoked.
+            </summary>
+            <param name="parameter">Data used by the command.  If the command does not require data to be passed, then this object can be set to null.</param>
+        </member>
+        <member name="E:Microsoft.Expression.Interactivity.Core.ActionCommand.System#Windows#Input#ICommand#CanExecuteChanged">
+            <summary>
+            Occurs when changes occur that affect whether the command should execute. Will not be fired by ActionCommand.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.CallMethodAction">
+            <summary>
+            Calls a method on a specified object when invoked.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.CallMethodAction.Invoke(System.Object)">
+            <summary>
+            Invokes the action.
+            </summary>
+            <param name="parameter">The parameter of the action. If the action does not require a parameter, the parameter may be set to a null reference.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.CallMethodAction.OnAttached">
+            <summary>
+            Called after the action is attached to an AssociatedObject.
+            </summary>
+            <remarks>Override this to hook up functionality to the AssociatedObject.</remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.CallMethodAction.OnDetaching">
+            <summary>
+            Called when the action is getting detached from its AssociatedObject, but before it has actually occurred.
+            </summary>
+            <remarks>Override this to unhook functionality from the AssociatedObject.</remarks>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.CallMethodAction.TargetObject">
+            <summary>
+            The object that exposes the method of interest. This is a dependency property.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.CallMethodAction.MethodName">
+            <summary>
+            The name of the method to invoke. This is a dependency property.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ChangePropertyAction">
+            <summary>
+            An action that will change a specified property to a specified value when invoked.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Expression.Interactivity.Core.ChangePropertyAction"/> class.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.Invoke(System.Object)">
+            <summary>
+            Invokes the action.
+            </summary>
+            <param name="parameter">The parameter of the action. If the action does not require a parameter, then the parameter may be set to a null reference.</param>
+            <exception cref="T:System.ArgumentException">A property with <c cref="P:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.PropertyName"/> could not be found on the Target.</exception>
+            <exception cref="T:System.ArgumentException">Could not set <c cref="P:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.PropertyName"/> to the value specified by <c cref="P:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.Value"/>.</exception>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.PropertyName">
+            <summary>
+            Gets or sets the name of the property to change. This is a dependency property.
+            </summary>
+            <value>The name of the property to change.</value>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.Value">
+            <summary>
+            Gets or sets the value to set. This is a dependency property.
+            </summary>
+            <value>The value to set.</value>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.Duration">
+            <summary>
+            Gets or sets the duration of the animation that will occur when the ChangePropertyAction is invoked.  This is a dependency property.
+            If the duration is unset, no animation will be applied.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.Increment">
+            <summary>
+            Increment by Value if true; otherwise, set the value directly. If the property cannot be incremented, it will instead try to set the value directly.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ChangePropertyAction.Ease">
+            <summary>
+            Gets or sets the easing function to use with the animation when the ChangePropertyAction is invoked.  This is a dependency property.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ComparisonCondition">
+            <summary>
+            Represents one ternary condition.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ComparisonCondition.Evaluate">
+            <summary>
+            Method that evaluates the condition. Note that this method can throw ArgumentException if the operator is
+            incompatible with the type. For instance, operators LessThan, LessThanOrEqual, GreaterThan, and GreaterThanOrEqual
+            require both operators to implement IComparable. 
+            </summary>
+            <returns>Returns true if the condition has been met; otherwise, returns false.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ComparisonCondition.EnsureBindingUpToDate">
+            <summary>
+            Ensure that any binding on DP operands are up-to-date.  
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ComparisonCondition.LeftOperand">
+            <summary>
+            Gets or sets the left operand.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ComparisonCondition.RightOperand">
+            <summary>
+            Gets or sets the right operand.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ComparisonCondition.Operator">
+            <summary>
+            Gets or sets the comparison operator. 
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ComparisonConditionType">
+            <summary>
+            Enumeration of different comparison operators.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.ComparisonLogic.EvaluateImpl(System.Object,Microsoft.Expression.Interactivity.Core.ComparisonConditionType,System.Object)">
+            <summary>
+            This method evaluates operands. 
+            </summary>
+            <param name="leftOperand">Left operand from the LeftOperand property.</param>
+            <param name="operatorType">Operator from Operator property.</param>
+            <param name="rightOperand">Right operand from the RightOperand property.</param>
+            <returns>Returns true if the condition is met; otherwise, returns false.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.ComparisonLogic.EvaluateComparable(System.IComparable,Microsoft.Expression.Interactivity.Core.ComparisonConditionType,System.IComparable)">
+            <summary>
+            Evaluates both operands that implement the IComparable interface.
+            </summary>
+            <param name="leftOperand">Left operand from the LeftOperand property.</param>
+            <param name="operatorType">Operator from Operator property.</param>
+            <param name="rightOperand">Right operand from the RightOperand property.</param>
+            <returns>Returns true if the condition is met; otherwise, returns false.</returns>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ForwardChaining">
+            <summary>
+            Forward chaining.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ConditionalExpression">
+            <summary>
+            Represents a conditional expression that is set on a ConditionBehavior.Condition property. 
+            Contains a list of conditions that gets evaluated in order to return true or false for ICondition.Evaluate().
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ICondition">
+            <summary>
+            An interface that a given object must implement in order to be 
+            set on a ConditionBehavior.Condition property. 
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ConditionalExpression.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Expression.Interactivity.Core.ConditionalExpression"/> class.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ConditionalExpression.Evaluate">
+            <summary>
+            Goes through the Conditions collection and evalutes each condition based on 
+            ForwardChaining property.
+            </summary>
+            <returns>Returns true if conditions are met; otherwise, returns false.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ConditionalExpression.ForwardChaining">
+            <summary>
+            Gets or sets forward chaining for the conditions.
+            If forward chaining is set to ForwardChaining.And, all conditions must be met.
+            If forward chaining is set to ForwardChaining.Or, only one condition must be met.		
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ConditionalExpression.Conditions">
+            <summary>
+            Return the Condition collections.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ConditionBehavior">
+            <summary>
+            A behavior that attaches to a trigger and controls the conditions
+            to fire the actions. 
+            </summary>
+            
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ConditionBehavior.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Expression.Interactivity.Core.ConditionBehavior"/> class.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ConditionBehavior.OnPreviewInvoke(System.Object,System.Windows.Interactivity.PreviewInvokeEventArgs)">
+            <summary>
+            The event handler that is listening to the preview invoke event that is fired by 
+            the trigger. Setting PreviewInvokeEventArgs.Cancelling to True will
+            cancel the invocation.
+            </summary>
+            <param name="sender">The trigger base object.</param>
+            <param name="e">An object of type PreviewInvokeEventArgs where e.Cancelling can be set to True.</param>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.ConditionBehavior.Condition">
+            <summary>
+            Gets or sets the IConditon object on behavior.
+            </summary>
+            <value>The name of the condition to change.</value>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.DataBindingHelper">
+            <summary>
+            Helper class for managing binding expressions on dependency objects.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.DataBindingHelper.EnsureDataBindingUpToDateOnMembers(System.Windows.DependencyObject)">
+            <summary>
+            Ensure that all DP on an action with binding expressions are
+            up to date. DataTrigger fires during data binding phase. Since
+            actions are children of the trigger, any bindings on the action
+            may not be up-to-date. This routine is called before the action
+            is invoked in order to guarantee that all bindings are up-to-date
+            with the most current data. 
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.DataBindingHelper.EnsureDataBindingOnActionsUpToDate(System.Windows.Interactivity.TriggerBase{System.Windows.DependencyObject})">
+            <summary>
+            Ensures that all binding expression on actions are up to date
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.DataBindingHelper.EnsureBindingUpToDate(System.Windows.DependencyObject,System.Windows.DependencyProperty)">
+            <summary>
+             This helper function ensures that, if a dependency property on a dependency object
+             has a binding expression, the binding expression is up-to-date. 
+            </summary>
+            <param name="target"></param>
+            <param name="dp"></param>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.DataStateBehavior">
+            <summary>
+            Toggles between two states based on a conditional statement.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.DataStateBehavior.OnAttached">
+            <summary>
+            Called after the behavior is attached to an AssociatedObject.
+            </summary>
+            <remarks>Override this to hook up functionality to the AssociatedObject.</remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.DataStateBehavior.IsElementLoaded(System.Windows.FrameworkElement)">
+            <summary>
+            A helper function to take the place of FrameworkElement.IsLoaded, as this property isn't available in Silverlight.
+            </summary>
+            <param name="element">The element of interest.</param>
+            <returns>Returns true if the element has been loaded; otherwise, returns false.</returns>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.DataStateBehavior.Binding">
+            <summary>
+            Gets or sets the binding that produces the property value of the data object. This is a dependency property.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.DataStateBehavior.Value">
+            <summary>
+            Gets or sets the value to be compared with the property value of the data object. This is a dependency property.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.DataStateBehavior.TrueState">
+            <summary>
+            Gets or sets the name of the visual state to transition to when the condition is met. This is a dependency property.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.DataStateBehavior.FalseState">
+            <summary>
+            Gets or sets the name of the visual state to transition to when the condition is not met. This is a dependency property.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.DataStoreChangedTrigger">
+            <summary>
+            Trigger designed to be bound to a data store property. Fires when the property changes.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.PropertyChangedTrigger">
+             <summary>
+             Represents a trigger that performs actions when the bound data have changed. 
+             </summary>
+            UA_REVIEW:chabiss
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.PropertyChangedTrigger.EvaluateBindingChange(System.Object)">
+            <summary>
+            Called when the binding property has changed. 
+            UA_REVIEW:chabiss
+            </summary>
+            <param name="args"><see cref="T:System.Windows.DependencyPropertyChangedEventArgs"/> argument.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.PropertyChangedTrigger.OnAttached">
+            <summary>
+            Called after the trigger is attached to an AssociatedObject.
+            UA_REVIEW:chabiss
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.PropertyChangedTrigger.OnDetaching">
+            <summary>
+            Called when the trigger is being detached from its AssociatedObject, but before it has actually occurred.
+            UA_REVIEW:chabiss
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.PropertyChangedTrigger.Binding">
+             <summary>
+             A binding object that the trigger will listen to, and that causes the trigger to fire when it changes.
+             </summary>
+            UA_REVIEW:chabiss
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.DataTrigger">
+            <summary>
+            Represents a trigger that performs actions when the bound data meets a specified condition.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.DataTrigger.EvaluateBindingChange(System.Object)">
+            <summary>
+            Called when the binding property has changed. 
+            UA_REVIEW:chabiss
+            </summary>
+            <param name="args"><see cref="T:System.Windows.DependencyPropertyChangedEventArgs"/> argument.</param>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.DataTrigger.Value">
+            <summary>
+            Gets or sets the value to be compared with the property value of the data object. This is a dependency property.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.DataTrigger.Comparison">
+            <summary>
+            Gets or sets the type of comparison to be performed between the specified values. This is a dependency property.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager">
+            <summary>
+            ExtendedVisualStateManager is a custom VisualStateManager that can smooth out the animation of layout properties.
+            With this custom VisualStateManager, states can include changes to properties like Grid.Column, can change element heights to or from Auto, and so on.
+            These changes will be smoothed out over time using the GeneratedDuration and GeneratedEasingFunction of the appropriate transition.
+            See the "VisualStateManager overrides" region below for a general description of the algorithm.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.UseFluidLayoutProperty">
+            <summary>
+            A VisualStateGroup that can use FluidLayout or not.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.RuntimeVisibilityPropertyProperty">
+            <summary>
+            Visibility is shadowed by a custom attached property at runtime.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.OriginalLayoutValuesProperty">
+            <summary>
+            A VisualStateGroup keeps a list of these original values in an attached property.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.LayoutStoryboardProperty">
+            <summary>
+            For every state, the layout-specific properties get extracted and then are attached to the state. These properties are removed from the state itself.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.CurrentStateProperty">
+            <summary>
+            Remember the current state.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.TransitionEffectProperty">
+            <summary>
+            The TransitionEffect to use when the state changes.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.TransitionEffectStoryboardProperty">
+            <summary>
+            The TransitionEffectStoryboard in use during the state change.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.DidCacheBackgroundProperty">
+            <summary>
+            The cached background in use during the state change.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.CachedBackgroundProperty">
+            <summary>
+            The cached background in use during the state change.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.CachedEffectProperty">
+            <summary>
+            The cached background in use during the state change.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.MovingElements">
+            <summary>
+            This is the set of elements that are currently in motion.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.LayoutTransitionStoryboard">
+            <summary>
+            This is the storyboard that is animating the transition.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.LayoutProperties">
+            <summary>
+            This list contains all the known layout properties.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.PathToPropertyMap">
+            <summary>
+            Silverlight does not provide a direct means of getting a DependencyProperty from a PropertyPath, so this structure is used
+            to locate tracked paths.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.StopAnimations">
+            <summary>
+            Stop the animation and replace the layout changes that were made to support that animation.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.FindTransition(System.Windows.VisualStateGroup,System.Windows.VisualState,System.Windows.VisualState)">
+            <summary>
+            Locate the transition that VisualStateManager will use to animate the change, so that the layout animation can match the duration and easing.
+            </summary>
+            <param name="group">The group in which the transition is taking place.</param>
+            <param name="previousState">The state that you are coming from.</param>
+            <param name="state">The state you are going to.</param>
+            <returns>The transition</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.ExtractLayoutStoryboard(System.Windows.VisualState)">
+            <summary>
+            Remove all layout-affecting properties from the Storyboard for the state and cache them in an attached property.
+            </summary>
+            <param name="state">The state you are moving to.</param>
+            <returns>A Storyboard containing the layout properties in that state.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.FindTargetElements(System.Windows.FrameworkElement,System.Windows.FrameworkElement,System.Windows.Media.Animation.Storyboard,System.Collections.Generic.List{Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.OriginalLayoutValueRecord},System.Collections.Generic.List{System.Windows.FrameworkElement})">
+            <summary>
+            The set of target elements is the set of all elements that might have moved in a layout transition. This set is the closure of:
+             - Elements with layout properties animated in the state.
+             - Siblings of elements in the set.
+             - Parents of elements in the set.
+             
+            Subsequent code will check these rectangles both before and after the layout change.
+            </summary>
+            <param name="control">The control whose layout is changing state.</param>
+            <param name="layoutStoryboard">The storyboard containing the layout changes.</param>
+            <param name="originalValueRecords">Any previous values from previous state navigations that might be reverted.</param>
+            <param name="movingElements">The set of elements currently in motion, if there is a state change transition ongoing.</param>
+            <returns>The full set of elements whose layout may have changed.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.GetRectsOfTargets(System.Collections.Generic.List{System.Windows.FrameworkElement},System.Collections.Generic.List{System.Windows.FrameworkElement})">
+            <summary>
+            Gets a set of rectangles for all the elements in the target list.
+            </summary>
+            <param name="targets">The set of elements to consider.</param>
+            <param name="movingElements">The set of elements currently in motion.</param>
+            <returns>A Dictionary mapping elements to their Rects.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.GetLayoutRect(System.Windows.FrameworkElement)">
+            <summary>
+            Get the layout rectangle of an element, by getting the layout slot and then computing which portion of the slot is being used.
+            </summary>
+            <param name="element">The element whose layout Rect will be retrieved.</param>
+            <returns>The layout Rect of that element.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.GetOldOpacities(System.Windows.FrameworkElement,System.Windows.FrameworkElement,System.Windows.Media.Animation.Storyboard,System.Collections.Generic.List{Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.OriginalLayoutValueRecord},System.Collections.Generic.List{System.Windows.FrameworkElement})">
+            <summary>
+            Get the opacities of elements at the time of the state change, instead of visibilities, because the state change may be in process and the current value is the most important.
+            </summary>
+            <param name="control">The control whose state is changing.</param>
+            <param name="layoutStoryboard">The storyboard with the layout properties.</param>
+            <param name="originalValueRecords">The set of original values.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.SetLayoutStoryboardProperties(System.Windows.FrameworkElement,System.Windows.FrameworkElement,System.Windows.Media.Animation.Storyboard,System.Collections.Generic.List{Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.OriginalLayoutValueRecord})">
+            <summary>
+            Go through the layout Storyboard and set all the properties by using SetValue to enable calling UpdateLayout without
+            ticking the timeline, which would cause a render.
+            All values that are overwritten will be stored in the collection of OriginalValueRecords so that they can be replaced later.
+            </summary>
+            <param name="control">The control whose state is changing.</param>
+            <param name="layoutStoryboard">The Storyboard holding the layout properties.</param>
+            <param name="originalValueRecords">The store of original values.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.WrapMovingElementsInCanvases(System.Collections.Generic.List{System.Windows.FrameworkElement},System.Collections.Generic.Dictionary{System.Windows.FrameworkElement,System.Windows.Rect},System.Collections.Generic.Dictionary{System.Windows.FrameworkElement,System.Windows.Rect})">
+            <summary>
+            Take all the elements that will be moving as a result of the layout animation, and wrap them in Canvas panels so that
+            they do not affect their sibling elements.
+            </summary>
+            <param name="movingElements">The set of elements that will be moving.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.UnwrapMovingElementsFromCanvases(System.Collections.Generic.List{System.Windows.FrameworkElement})">
+            <summary>
+            Take all the elements that have been moving as a result of the layout animation, and unwrap them from their Canvas panels.
+            </summary>
+            <param name="movingElements">The set of elements that have been moving.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.CopyLayoutProperties(System.Windows.FrameworkElement,System.Windows.FrameworkElement,System.Boolean)">
+            <summary>
+            Copy the layout properties from the source element to the target element, clearing them from the source.
+            </summary>
+            <param name="source">The source of the layout properties.</param>
+            <param name="target">The destination of the layout properties.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.CreateLayoutTransitionStoryboard(System.Windows.VisualTransition,System.Collections.Generic.List{System.Windows.FrameworkElement},System.Collections.Generic.Dictionary{System.Windows.FrameworkElement,System.Double})">
+            <summary>
+            Create the actual Storyboard that will be used to animate the transition. Use all previously calculated results.
+            </summary>
+            <param name="duration">The duration of the animation.</param>
+            <param name="ease">The easing function to be used in the animation.</param>
+            <param name="movingElements">The set of elements that will be moving.</param>
+            <param name="oldOpacities">The old opacities of the elements whose visibility properties are changing.</param>
+            <returns>The Storyboard.</returns>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.ExtendedVisualStateManager.OriginalLayoutValueRecord">
+            <summary>
+            OriginalValueRecord remembers the original value of a property that was changed in a state.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Layout.FluidMoveScope">
+            <summary>
+            This enumerated type indicates whether a FluidMoveBehavior applies to the element to which it is attached, or to the children of that element.
+            "Self" is useful when there is a single element that should behave in a special manner; "Children" is useful when the same behavior should apply to all
+            children of a WrapPanel or to the ItemsHost panel of an ItemsControl.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Layout.TagType">
+            <summary>
+            This enumerated type indicates whether an element is identified by itself, or by its DataContext.
+            DataContext identification allows movement from one data-driven location to another.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.AppliesToProperty">
+            <summary>
+            Dependency property for the scope of the behavior. See FluidMoveScope for more details.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.IsActiveProperty">
+            <summary>
+            Dependency property for the active state of the behavior.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.TagProperty">
+            <summary>
+            Dependency property that provides the ability to use the element as its own tag, or the binding on the element.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.TagPathProperty">
+            <summary>
+            Dependency property for the extra path to add to the binding when UsaBindingAsTag is true.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.IdentityTagProperty">
+            <summary>
+            Identity tag used to detect element motion between containers.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.AppliesTo">
+            <summary>
+            Indicates whether the behavior applies just to this element, or to all children of the element (if the element is a Panel).
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.IsActive">
+            <summary>
+            Indicates whether the behavior is currently active.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.Tag">
+            <summary>
+            Indicates whether to use the element as its own tag, or to use the binding on the element as the tag.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.TagPath">
+            <summary>
+            Extra path to add to the binding when TagType is specified.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Layout.FluidMoveBehaviorBase.TagData">
+            <summary>
+            Private structure that stores all relevant data pertaining to a tagged item.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior">
+            <summary>
+            Behavior that watches an element (or a set of elements) for layout changes, and moves the element smoothly to the new position when needed.
+            This behavior does not animate the size or visibility of an element; it only animates the offset of that element within its parent container.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.DurationProperty">
+            <summary>
+            Dependency property for the duration of the move.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.InitialTagProperty">
+            <summary>
+            Dependency property for the tag type to use just before the object is loaded.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.InitialTagPathProperty">
+            <summary>
+            Dependency property for the extra path to add to the binding when UsaBindingAsTag is true.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.InitialIdentityTagProperty">
+            <summary>
+            Identity tag used to detect element motion between containers.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.FloatAboveProperty">
+            <summary>
+            Dependency property for the FloatAbove flag.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.EaseXProperty">
+            <summary>
+            Dependency property for the EasingFunction to use for the horizontal component of the move.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.EaseYProperty">
+            <summary>
+            Dependency property for the EasingFunction to use for the vertical component of the move.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.OverlayProperty">
+            <summary>
+            Remember the popup/adorner being used, in case of element motion between containers when FloatAbove is true.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.CacheDuringOverlayProperty">
+            <summary>
+            Opacity cache used when floating a Popup.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.HasTransformWrapperProperty">
+            <summary>
+            Marks the animation transform.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.Duration">
+            <summary>
+            The duration of the move.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.InitialTag">
+            <summary>
+            Spawning point for this item.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.InitialTagPath">
+            <summary>
+            Extra path to add to the binding when TagType is specified.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.FloatAbove">
+            <summary>
+            Flag that says whether elements are allowed to float above their containers (in a Popup or Adorner) when changing containers.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.EaseX">
+            <summary>
+            EasingFunction to use for the horizontal component of the move.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.FluidMoveBehavior.EaseY">
+            <summary>
+            EasingFunction to use for the vertical component of the move.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.GoToStateAction">
+            <summary>
+            An action that will transition a FrameworkElement to a specified VisualState when invoked.
+            </summary>
+            <remarks>
+            If the TargetName property is set, this action will attempt to change the state of the targeted element. If not, it walks
+            the element tree in an attempt to locate an alternative target that defines states. ControlTemplate and UserControl are 
+            two common possibilities.
+            </remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.GoToStateAction.OnTargetChanged(System.Windows.FrameworkElement,System.Windows.FrameworkElement)">
+            <summary>
+            Called when the target changes. If the TargetName property isn't set, this action has custom behavior.
+            </summary>
+            <param name="oldTarget"></param>
+            <param name="newTarget"></param>
+            <exception cref="T:System.InvalidOperationException">Could not locate an appropriate FrameworkElement with states.</exception>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.GoToStateAction.Invoke(System.Object)">
+            <summary>
+            This method is called when some criteria is met and the action is invoked.
+            </summary>
+            <param name="parameter"></param>
+            <exception cref="T:System.InvalidOperationException">Could not change the target to the specified StateName.</exception>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.GoToStateAction.UseTransitions">
+            <summary>
+            Determines whether or not to use a VisualTransition to transition between states.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.GoToStateAction.StateName">
+            <summary>
+            The name of the VisualState.  
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.HyperlinkAction">
+            <summary>
+            An action that will navigate to a given hyperlink.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.HyperlinkAction.Invoke(System.Object)">
+            <summary>
+            This method is called when some criteria is met and the action is invoked.
+            </summary>
+            <param name="parameter"></param>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.HyperlinkAction.NavigateUri">
+            <summary>
+            The Uri of the page to open.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.HyperlinkAction.TargetWindow">
+            <summary>
+            The name of the window or tab in which NavigateUri should be opened. 
+            </summary>
+            <remarks>
+            Several values have special meanings: "_blank" will load in a new browser window, "_parent" will attempt to 
+            load in the parent frame, and "_self" will target the current page or frame. 
+            </remarks>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Input.KeyTrigger">
+            <summary>
+            A Trigger that is triggered by a keyboard event.  If the target Key and Modifiers are detected, it fires.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Input.KeyTrigger.Key">
+            <summary>
+            The key that must be pressed for the trigger to fire.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Input.KeyTrigger.Modifiers">
+            <summary>
+            The modifiers that must be active for the trigger to fire (the default is no modifiers pressed).
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Input.KeyTrigger.FiredOn">
+            <summary>
+            Determines whether or not to listen to the KeyDown or KeyUp event.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior">
+            <summary>
+            Repositions the attached element in response to mouse drag gestures on the element.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.XProperty">
+            <summary>
+            Dependency property for the X position of the dragged element, relative to the left of the root element.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.YProperty">
+            <summary>
+            Dependency property for the Y position of the dragged element, relative to the top of the root element.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.ConstrainToParentBoundsProperty">
+            <summary>
+            Dependency property for the ConstrainToParentBounds property. If true, the dragged element will be constrained to stay within the bounds of its parent container.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.UpdatePosition(System.Windows.Point)">
+            <summary>
+            Attempts to update the position of the associated element to the specified coordinates.
+            </summary>
+            <param name="point">The desired position of the element in root coordinates.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.ApplyTranslation(System.Double,System.Double)">
+            <summary>
+            Applies a relative position translation to the associated element.
+            </summary>
+            <param name="x">The X component of the desired translation in root coordinates.</param>
+            <param name="y">The Y component of the desired translation in root coordinates.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.ApplyTranslationTransform(System.Double,System.Double)">
+            <summary>
+            Applies the given translation to the RenderTransform of the associated element.
+            </summary>
+            <param name="x">The X component of the translation in parent coordinates.</param>
+            <param name="y">The Y component of the translation in parent coordinates.</param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.CloneTransform(System.Windows.Media.Transform)">
+            <summary>
+            Does a recursive deep copy of the specified transform.
+            </summary>
+            <param name="transform">The transform to clone.</param>
+            <returns>A deep copy of the specified transform, or null if the specified transform is null.</returns>
+            <exception cref="T:System.ArgumentException">Thrown if the type of the Transform is not recognized.</exception>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.UpdatePosition">
+            <summary>
+            Updates the X and Y properties based on the current rendered position of the associated element.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.RectContainsRect(System.Windows.Rect,System.Windows.Rect)">
+            <summary>
+            Check if one Rect is contained by another.
+            </summary>
+            <param name="rect1">The containing Rect.</param>
+            <param name="rect2">The contained Rect.</param>
+            <returns><c>True</c> if rect1 contains rect2; otherwise, <c>False</c>.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.TransformAsVector(System.Windows.Media.GeneralTransform,System.Double,System.Double)">
+            <summary>
+            Transforms as vector.
+            </summary>
+            <param name="transform">The transform.</param>
+            <param name="x">The X component of the vector.</param>
+            <param name="y">The Y component of the vector.</param>
+            <returns>A point containing the values of X and Y transformed by transform as a vector.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.GetTransformOffset(System.Windows.Media.GeneralTransform)">
+            <summary>
+            Gets the transform offset.
+            </summary>
+            <param name="transform">The transform.</param>
+            <returns>The offset of the transform.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.OnAttached">
+            <summary>
+            Called after the behavior is attached to an AssociatedObject.
+            </summary>
+            <remarks>Override this to hook up functionality to the AssociatedObject.</remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.OnDetaching">
+            <summary>
+            Called when the behavior is getting detached from its AssociatedObject, but before it has actually occurred.
+            </summary>
+            <remarks>Override this to unhook functionality from the AssociatedObject.</remarks>
+        </member>
+        <member name="E:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.DragBegun">
+            <summary>
+            Occurs when a drag gesture is initiated.
+            </summary>
+        </member>
+        <member name="E:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.Dragging">
+            <summary>
+            Occurs when a drag gesture update is processed.
+            </summary>
+        </member>
+        <member name="E:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.DragFinished">
+            <summary>
+            Occurs when a drag gesture is finished.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.X">
+            <summary>
+            Gets or sets the X position of the dragged element, relative to the left of the root element. This is a dependency property.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.Y">
+            <summary>
+            Gets or sets the Y position of the dragged element, relative to the top of the root element. This is a dependency property.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.ConstrainToParentBounds">
+            <summary>
+            Gets or sets a value indicating whether the dragged element is constrained to stay within the bounds of its parent container. This is a dependency property.
+            </summary>
+            <value>
+            	<c>True</c> if the dragged element should be constrained to its parents bounds; otherwise, <c>False</c>.
+            </value>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.ActualPosition">
+            <summary>
+            Gets the on-screen position of the associated element in root coordinates.
+            </summary>
+            <value>The on-screen position of the associated element in root coordinates.</value>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.ElementBounds">
+            <summary>
+            Gets the element bounds in element coordinates.
+            </summary>
+            <value>The element bounds in element coordinates.</value>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.ParentElement">
+            <summary>
+            Gets the parent element of the associated object.
+            </summary>
+            <value>The parent element of the associated object.</value>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.RootElement">
+            <summary>
+            Gets the root element of the scene in which the associated object is located.
+            </summary>
+            <value>The root element of the scene in which the associated object is located.</value>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Layout.MouseDragElementBehavior.RenderTransform">
+            <summary>
+            Gets and sets the RenderTransform of the associated element.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Media.PlaySoundAction">
+            <summary>
+            An action that will play a sound to completion.
+            </summary>
+            <remarks>
+            This action is intended for use with short sound effects that don't need to be stopped or controlled. If you're trying 
+            to create a music player or game, it may not meet your needs.
+            </remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Media.PlaySoundAction.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Expression.Interactivity.Media.PlaySoundAction"/> class.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Media.PlaySoundAction.SetMediaElementProperties(System.Windows.Controls.MediaElement)">
+            <summary>
+            When the action is invoked, this method is used to customize the dynamically created MediaElement.
+            </summary>
+            <remarks>
+            This method may be useful for Action authors who wish to extend PlaySoundAction. If you want to control the 
+            MediaElement Balance property, you could inherit from PlaySoundAction and override this method.
+            </remarks>
+            <param name="mediaElement"></param>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Media.PlaySoundAction.Invoke(System.Object)">
+            <summary>
+            This method is called when some criteria are met and the action should be invoked. 
+            </summary>
+            <remarks>
+            Each invocation of the Action plays a new sound. Although the implementation is subject-to-change, the caller should 
+            anticipate that this will create a new MediaElement that will be cleaned up when the sound completes or if the media 
+            fails to play.
+            </remarks>
+            <param name="parameter"></param>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Media.PlaySoundAction.Source">
+            <summary>
+            A Uri defining the location of the sound file. This is used to set the source property of the MediaElement. This is a dependency property.
+            </summary>
+            <remarks>
+            The sound can be any file format supported by MediaElement. In the case of a video, it will play only the
+            audio portion.
+            </remarks>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Media.PlaySoundAction.Volume">
+            <summary>
+            Control the volume of the sound. This is used to set the Volume property of the MediaElement. This is a dependency property.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.RemoveElementAction">
+            <summary>
+            An action that will remove the targeted element from the tree when invoked.
+            </summary>
+            <remarks>
+            This action may fail. The action understands how to remove elements from common parents but not from custom collections or direct manipulation
+            of the visual tree.
+            </remarks>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.SetDataStoreValueAction">
+            <summary>
+            An action that will change the value of a property from a data store object.
+            This class is identical to ChangePropertyAction. The only difference is that the data store picker is loaded 
+            for this action.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Media.StoryboardAction">
+            <summary>
+            An abstract class that provides the ability to target a Storyboard.
+            </summary>
+            <remarks>
+            For action authors, this class provides a standard way to target a Storyboard. Design tools may choose to provide a 
+            special editing experience for classes that inherit from this action, thereby improving the designer experience.
+            </remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Media.StoryboardAction.OnStoryboardChanged(System.Windows.DependencyPropertyChangedEventArgs)">
+            <summary>
+            This method is called when the Storyboard property is changed.
+            </summary>
+            <param name="args"></param>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Media.StoryboardAction.Storyboard">
+            <summary>
+            The targeted Storyboard. This is a dependency property.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Media.ControlStoryboardAction">
+            <summary>
+            An action that will change the state of a targeted storyboard when invoked.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Media.ControlStoryboardAction.Invoke(System.Object)">
+            <summary>
+            This method is called when some criteria is met and the action should be invoked. This method will attempt to 
+            change the targeted storyboard in a way defined by the ControlStoryboardOption.
+            </summary>
+            <param name="parameter"></param>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Media.StoryboardTrigger">
+            <summary>
+            An abstract class that provides the ability to target a Storyboard.
+            </summary>
+            <remarks>
+            For Trigger authors, this class provides a standard way to target a Storyboard. Design tools may choose to provide a 
+            special editing experience for classes that inherit from this trigger, thereby improving the designer experience. 
+            </remarks>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Media.StoryboardTrigger.OnStoryboardChanged(System.Windows.DependencyPropertyChangedEventArgs)">
+            <summary>
+            This method is called when the Storyboard property is changed.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Media.StoryboardTrigger.Storyboard">
+            <summary>
+            The targeted Storyboard. This is a dependency property.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Media.StoryboardCompletedTrigger">
+            <summary>
+            A trigger that listens for the completion of a Storyboard.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Media.StoryboardCompletedTrigger.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Expression.Interactivity.Media.StoryboardCompletedTrigger"/> class.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.Core.TimerTrigger">
+            <summary>
+            A trigger that is triggered by a specified event occurring on its source and fires after a delay when that event is fired.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.Core.TimerTrigger.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Expression.Interactivity.Core.TimerTrigger"/> class.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.TimerTrigger.MillisecondsPerTick">
+            <summary>
+            Gets or sets the number of milliseconds to wait between ticks. This is a dependency property.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.Core.TimerTrigger.TotalTicks">
+            <summary>
+            Gets or sets the total number of ticks to be fired before the trigger is finished.  This is a dependency property.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Media.Effects.TransitionEffect">
+            <summary>
+            Defines a transition effect shader that transitions from one visual to another visual
+            using an interpolated value between 0 and 1.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.TransitionEffect.InputProperty">
+            <summary>
+            Brush-valued properties that turn into sampler-properties in the shader.
+            Represents the image present in the final state of the transition.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.TransitionEffect.OldImageProperty">
+            <summary>
+            Brush-valued properties that turn into sampler-properties in the shader.
+            Represents the image present in the initial state of the transition.
+            </summary>
+        </member>
+        <member name="F:Microsoft.Expression.Media.Effects.TransitionEffect.ProgressProperty">
+            <summary>
+            A Dependency property as the backing store for Progress.
+            Also used to represent the state of a transition from start to finish (range between 0 and 1).
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.TransitionEffect.CloneCurrentValue">
+            <summary>
+            Creates a modifiable clone (deep copy) of the <see cref="T:TransitionEffect"/> using its current values.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.TransitionEffect.DeepCopy">
+            <summary>
+            Makes a deep copy of the transition effect. Implements CloneCurrentValue in Silverlight.
+            </summary>
+            <returns>A clone of current instance of transition effect.</returns>
+        </member>
+        <member name="M:Microsoft.Expression.Media.Effects.TransitionEffect.#ctor">
+            <summary>
+            Updates the shader's variables to the default values.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.TransitionEffect.Input">
+            <summary>
+            Gets or sets the Input variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.TransitionEffect.OldImage">
+            <summary>
+            Gets or sets the OldImage variable within the shader.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Media.Effects.TransitionEffect.Progress">
+            <summary>
+            Gets or sets the Progress variable within the shader.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.VisualStateUtilities">
+            <summary>
+            This class provides various platform agnostic standard operations for working with VisualStateManager.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.VisualStateUtilities.GoToState(System.Windows.FrameworkElement,System.String,System.Boolean)">
+            <summary>
+            Transitions the control between two states.
+            </summary>
+            <param name="element">The element to transition between states.</param>
+            <param name="stateName">The state to transition to.</param>
+            <param name="useTransitions">True to use a System.Windows.VisualTransition to transition between states; otherwise, false.</param>
+            <returns>True if the control successfully transitioned to the new state; otherwise, false.</returns>
+            <exception cref="T:System.ArgumentNullException">Control is null.</exception>
+            <exception cref="T:System.ArgumentNullException">StateName is null.</exception>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.VisualStateUtilities.GetVisualStateGroups(System.Windows.FrameworkElement)">
+            <summary>
+            Gets the value of the VisualStateManager.VisualStateGroups attached property.
+            </summary>
+            <param name="targetObject">The element from which to get the VisualStateManager.VisualStateGroups.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Microsoft.Expression.Interactivity.VisualStateUtilities.TryFindNearestStatefulControl(System.Windows.FrameworkElement,System.Windows.FrameworkElement@)">
+            <summary>
+            Find the nearest parent which contains visual states.
+            </summary>
+            <param name="contextElement">The element from which to find the nearest stateful control.</param>
+            <param name="resolvedControl">The nearest stateful control if True; else null.</param>
+            <returns>True if a parent contains visual states; else False.</returns>
+        </member>
+        <member name="T:Microsoft.Expression.Interactivity.ExceptionStringTable">
+            <summary>
+              A strongly-typed resource class, for looking up localized strings, etc.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.ResourceManager">
+            <summary>
+              Returns the cached ResourceManager instance used by this class.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.Culture">
+            <summary>
+              Overrides the current thread's CurrentUICulture property for all
+              resource lookups using this strongly typed resource class.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.CallMethodActionValidMethodNotFoundExceptionMessage">
+            <summary>
+              Looks up a localized string similar to Could not find method named &apos;{0}&apos; on object of type &apos;{1}&apos; that matches the expected signature..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.ChangePropertyActionAmbiguousAdditionOperationExceptionMessage">
+            <summary>
+              Looks up a localized string similar to More than one potential addition operator was found on type &apos;{0}&apos;..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.ChangePropertyActionCannotAnimateTargetTypeExceptionMessage">
+            <summary>
+              Looks up a localized string similar to Cannot animate a property change on a type &apos;{0}&apos; Target. Property changes can only be animated on types derived from DependencyObject..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.ChangePropertyActionCannotFindPropertyNameExceptionMessage">
+            <summary>
+              Looks up a localized string similar to Cannot find a property named &quot;{0}&quot; on type &quot;{1}&quot;..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.ChangePropertyActionCannotIncrementAnimatedPropertyChangeExceptionMessage">
+            <summary>
+              Looks up a localized string similar to The Increment property cannot be set to True if the Duration property is set..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.ChangePropertyActionCannotIncrementWriteOnlyPropertyExceptionMessage">
+            <summary>
+              Looks up a localized string similar to The &apos;{0}&apos; property cannot be incremented because its value cannot be read..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.ChangePropertyActionCannotSetValueExceptionMessage">
+            <summary>
+              Looks up a localized string similar to Cannot assign value of type &quot;{0}&quot; to property &quot;{1}&quot; of type &quot;{2}&quot;. The &quot;{1}&quot; property can be assigned only values of type &quot;{2}&quot;..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.ChangePropertyActionPropertyIsReadOnlyExceptionMessage">
+            <summary>
+              Looks up a localized string similar to Property &quot;{0}&quot; defined by type &quot;{1}&quot; does not expose a set method and therefore cannot be modified..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.DataStateBehaviorStateNameNotFoundExceptionMessage">
+            <summary>
+              Looks up a localized string similar to Cannot find state named &apos;{0}&apos; on type &apos;{1}&apos;. Ensure that the state exists and that it can be accessed from this context..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.GoToStateActionTargetHasNoStateGroups">
+            <summary>
+              Looks up a localized string similar to Target {0} does not define any VisualStateGroups. .
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.InvalidLeftOperand">
+            <summary>
+              Looks up a localized string similar to LeftOperand of type &quot;{0}&quot; cannot be used with operator &quot;{1}&quot;..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.InvalidOperands">
+            <summary>
+              Looks up a localized string similar to LeftOperand of type &quot;{1}&quot; and RightOperand of type &quot;{0}&quot; cannot be used with operator &quot;{2}&quot;..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.InvalidRightOperand">
+            <summary>
+              Looks up a localized string similar to RightOperand of type &quot;{0}&quot; cannot be used with operator &quot;{1}&quot;..
+            </summary>
+        </member>
+        <member name="P:Microsoft.Expression.Interactivity.ExceptionStringTable.UnsupportedRemoveTargetExceptionMessage">
+            <summary>
+              Looks up a localized string similar to The target of the RemoveElementAction is not supported..
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7.sln
new file mode 100644
index 0000000..0c99bed
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloWP7", "Caliburn.Micro.HelloWP7\Caliburn.Micro.HelloWP7.csproj", "{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|Any CPU.Deploy.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/App.xaml
new file mode 100644
index 0000000..de7039b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="Caliburn.Micro.HelloWP7.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.HelloWP7">
+	<Application.Resources>
+        <local:HelloWP7Bootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/App.xaml.cs
new file mode 100644
index 0000000..d9834f8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/App.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System.Windows;
+
+    public partial class App : Application {
+        public App() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/ApplicationIcon.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/ApplicationIcon.png
new file mode 100644
index 0000000..5859393
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/ApplicationIcon.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Background.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Background.png
new file mode 100644
index 0000000..e46f21d
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Background.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7.csproj
new file mode 100644
index 0000000..895798b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7.csproj
@@ -0,0 +1,127 @@
+<?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>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BC67A641-95A3-4674-9B39-D2A39B33292E}</ProjectGuid>
+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.HelloWP7</RootNamespace>
+    <AssemblyName>Caliburn.Micro.HelloWP7</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloWP7.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.HelloWP7.App</SilverlightAppEntry>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\WP7\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="Caliburn.Micro.Extensions">
+      <HintPath>..\..\..\bin\WP7\Debug\Caliburn.Micro.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Phone" />
+    <Reference Include="Microsoft.Phone.Controls, Version=7.0.0.0, Culture=neutral, PublicKeyToken=24eec0d8c86cda1e, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.Phone.Interop" />
+    <Reference Include="System.Windows" />
+    <Reference Include="mscorlib" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="HelloWP7Bootstrapper.cs" />
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainPageViewModel.cs" />
+    <Compile Include="PivotPage.xaml.cs">
+      <DependentUpon>PivotPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PivotPageViewModel.cs" />
+    <Compile Include="PivotPageModelStorage.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TabViewModel.cs" />
+    <Compile Include="TabViewModelStorage.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PivotPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TabView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+    <None Include="Properties\WMAppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ApplicationIcon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Background.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="SplashScreenImage.jpg" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions />
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/HelloWP7Bootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/HelloWP7Bootstrapper.cs
new file mode 100644
index 0000000..c797ed1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/HelloWP7Bootstrapper.cs
@@ -0,0 +1,65 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System;
+    using System.Collections.Generic;
+    using System.Windows.Controls;
+    using Microsoft.Phone.Controls;
+
+    public class HelloWP7Bootstrapper : PhoneBootstrapper {
+        PhoneContainer container;
+
+        protected override void Configure() {
+            container = new PhoneContainer(RootFrame);
+
+            container.RegisterPhoneServices();
+            container.PerRequest<MainPageViewModel>();
+            container.PerRequest<PivotPageViewModel>();
+            container.PerRequest<TabViewModel, TabViewModel>();
+
+            AddCustomConventions();
+        }
+
+        static void AddCustomConventions() {
+            ConventionManager.AddElementConvention<Pivot>(Pivot.ItemsSourceProperty, "SelectedItem", "SelectionChanged").ApplyBinding =
+                (viewModelType, path, property, element, convention) => {
+                    if(ConventionManager
+                        .GetElementConvention(typeof(ItemsControl))
+                        .ApplyBinding(viewModelType, path, property, element, convention)) {
+                        ConventionManager
+                            .ConfigureSelectedItem(element, Pivot.SelectedItemProperty, viewModelType, path);
+                        ConventionManager
+                            .ApplyHeaderTemplate(element, Pivot.HeaderTemplateProperty, viewModelType);
+                        return true;
+                    }
+
+                    return false;
+                };
+
+            ConventionManager.AddElementConvention<Panorama>(Panorama.ItemsSourceProperty, "SelectedItem", "SelectionChanged").ApplyBinding =
+                (viewModelType, path, property, element, convention) => {
+                    if(ConventionManager
+                        .GetElementConvention(typeof(ItemsControl))
+                        .ApplyBinding(viewModelType, path, property, element, convention)) {
+                        ConventionManager
+                            .ConfigureSelectedItem(element, Panorama.SelectedItemProperty, viewModelType, path);
+                        ConventionManager
+                            .ApplyHeaderTemplate(element, Panorama.HeaderTemplateProperty, viewModelType);
+                        return true;
+                    }
+
+                    return false;
+                };
+        }
+
+        protected override object GetInstance(Type service, string key) {
+            return container.GetInstance(service, key);
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type service) {
+            return container.GetAllInstances(service);
+        }
+
+        protected override void BuildUp(object instance) {
+            container.BuildUp(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPage.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPage.xaml
new file mode 100644
index 0000000..498796d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPage.xaml
@@ -0,0 +1,39 @@
+<phone:PhoneApplicationPage x:Class="Caliburn.Micro.HelloWP7.MainPage"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+                            xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+                            xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+                            SupportedOrientations="Portrait"
+                            Orientation="Portrait"
+                            shell:SystemTray.IsVisible="True">
+	<Grid Background="Transparent">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
+		<StackPanel Grid.Row="0"
+		            Margin="24,24,0,12">
+			<TextBlock Text="WP7 Caliburn.Micro"
+			           Style="{StaticResource PhoneTextNormalStyle}" />
+			<TextBlock Text="Main Page"
+			           Margin="-3,-8,0,0"
+			           Style="{StaticResource PhoneTextTitle1Style}" />
+		</StackPanel>
+
+		<Grid Grid.Row="1">
+			<Button x:Name="GotoPageTwo"
+			        Content="Goto Page Two" />
+		</Grid>
+	</Grid>
+
+	<phone:PhoneApplicationPage.ApplicationBar>
+		<shell:ApplicationBar IsVisible="True">
+			<shell:ApplicationBar.Buttons>
+				<cal:AppBarButton IconUri="ApplicationIcon.png"
+				                  Text="Page Two"
+				                  Message="GotoPageTwo" />
+			</shell:ApplicationBar.Buttons>
+		</shell:ApplicationBar>
+	</phone:PhoneApplicationPage.ApplicationBar>
+</phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPage.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPage.xaml.cs
new file mode 100644
index 0000000..a2d32d6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPage.xaml.cs
@@ -0,0 +1,7 @@
+namespace Caliburn.Micro.HelloWP7 {
+    public partial class MainPage {
+        public MainPage() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPageViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPageViewModel.cs
new file mode 100644
index 0000000..9538cab
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/MainPageViewModel.cs
@@ -0,0 +1,15 @@
+namespace Caliburn.Micro.HelloWP7 {
+    public class MainPageViewModel {
+        readonly INavigationService navigationService;
+
+        public MainPageViewModel(INavigationService navigationService) {
+            this.navigationService = navigationService;
+        }
+
+        public void GotoPageTwo() {
+            navigationService.UriFor<PivotPageViewModel>()
+                .WithParam(x => x.NumberOfTabs, 5)
+                .Navigate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPage.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPage.xaml
new file mode 100644
index 0000000..46c869f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPage.xaml
@@ -0,0 +1,29 @@
+<phone:PhoneApplicationPage x:Class="Caliburn.Micro.HelloWP7.PivotPage"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+                            xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+                            xmlns:Controls="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls"
+                            SupportedOrientations="Portrait"
+                            Orientation="Portrait"
+                            shell:SystemTray.IsVisible="True">
+	<Grid Background="Transparent">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
+
+		<StackPanel Grid.Row="0"
+		            Margin="24,24,0,12">
+			<TextBlock Text="WP7 Caliburn.Micro"
+			           Style="{StaticResource PhoneTextNormalStyle}" />
+			<TextBlock Text="Page Two"
+			           Margin="-3,-8,0,0"
+			           Style="{StaticResource PhoneTextTitle1Style}" />
+		</StackPanel>
+
+        <Controls:Pivot x:Name="Items"
+		                Grid.Row="1" />
+    </Grid>
+
+</phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPage.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPage.xaml.cs
new file mode 100644
index 0000000..5d06b6d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPage.xaml.cs
@@ -0,0 +1,7 @@
+namespace Caliburn.Micro.HelloWP7 {
+    public partial class PivotPage {
+        public PivotPage() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPageModelStorage.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPageModelStorage.cs
new file mode 100644
index 0000000..85261a6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPageModelStorage.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloWP7 {
+    public class PivotPageModelStorage : StorageHandler<PivotPageViewModel> {
+        public override void Configure() {
+            this.ActiveItemIndex()
+                .InPhoneState()
+                .RestoreAfterViewLoad();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPageViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPageViewModel.cs
new file mode 100644
index 0000000..d664405
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/PivotPageViewModel.cs
@@ -0,0 +1,24 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System;
+    using System.Linq;
+
+    public class PivotPageViewModel : Conductor<IScreen>.Collection.OneActive {
+        readonly Func<TabViewModel> createTab;
+
+        public PivotPageViewModel(Func<TabViewModel> createTab) {
+            this.createTab = createTab;
+        }
+
+        public int NumberOfTabs { get; set; }
+
+        protected override void OnInitialize() {
+            Enumerable.Range(1, NumberOfTabs).Apply(x => {
+                var tab = createTab();
+                tab.DisplayName = "Item " + x;
+                Items.Add(tab);
+            });
+
+            ActivateItem(Items[0]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..511a5e1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Caliburn.Micro.HelloWP7")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft IT")]
+[assembly: AssemblyProduct("Caliburn.Micro.HelloWP7")]
+[assembly: AssemblyCopyright("Copyright © Microsoft IT 2009")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3b73eba5-a55f-4a99-88f0-231e13c4221d")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/WMAppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/WMAppManifest.xml
new file mode 100644
index 0000000..37f87f1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/Properties/WMAppManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2009/deployment" AppPlatformVersion="7.0">
+  <App xmlns="" ProductID="{1144cfb1-fb22-4ff9-8e63-0dee28a7c4e6}" Title="Caliburn.Micro.HelloWP7" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal"  Author="Caliburn.Micro.HelloWP7 author" Description="Sample description" Publisher="Caliburn.Micro.HelloWP7">
+    <IconPath IsRelative="true" IsResource="false">ApplicationIcon.png</IconPath>
+    <Capabilities>
+      <Capability Name="ID_CAP_NETWORKING" />
+      <Capability Name="ID_CAP_LOCATION" />
+      <Capability Name="ID_CAP_SENSORS" />
+      <Capability Name="ID_CAP_MICROPHONE" />
+      <Capability Name="ID_CAP_MEDIALIB" />
+      <Capability Name="ID_CAP_GAMERSERVICES" />
+      <Capability Name="ID_CAP_PHONEDIALER" />
+      <Capability Name="ID_CAP_PUSH_NOTIFICATION" />
+      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
+    </Capabilities>
+    <Tasks>
+      <DefaultTask  Name ="_default" NavigationPage="MainPage.xaml"/>
+    </Tasks>
+    <Tokens>
+      <PrimaryToken TokenID="Caliburn.Micro.HelloWP7Token" TaskName="_default">
+        <TemplateType5>
+          <BackgroundImageURI IsRelative="true" IsResource="false">Background.png</BackgroundImageURI>
+          <Count>0</Count>
+          <Title>Caliburn.Micro.HelloWP7</Title>
+        </TemplateType5>
+      </PrimaryToken>
+    </Tokens>
+  </App>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/SplashScreenImage.jpg b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/SplashScreenImage.jpg
new file mode 100644
index 0000000..353b192
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/SplashScreenImage.jpg differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabView.xaml
new file mode 100644
index 0000000..025fd37
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabView.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="Caliburn.Micro.HelloWP7.TabView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<StackPanel Background="{StaticResource PhoneChromeBrush}">
+		<TextBlock x:Name="DisplayName"
+                   Margin="8 0 0 0"
+		           FontFamily="{StaticResource PhoneFontFamilyNormal}"
+		           FontSize="{StaticResource PhoneFontSizeNormal}"
+		           Foreground="{StaticResource PhoneForegroundBrush}" />
+        <TextBox x:Name="Text" />
+        <Button Content="Choose"
+                x:Name="Choose" />
+	</StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabViewModel.cs
new file mode 100644
index 0000000..465ac58
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabViewModel.cs
@@ -0,0 +1,39 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System.Windows;
+    using Microsoft.Phone.Tasks;
+
+    public class TabViewModel : Screen, IHandle<TaskCompleted<PhoneNumberResult>> {
+        string text;
+        readonly IEventAggregator events;
+
+        public TabViewModel(IEventAggregator events) {
+            this.events = events;
+        }
+
+        public string Text {
+            get { return text; }
+            set {
+                text = value;
+                NotifyOfPropertyChange(() => Text);
+            }
+        }
+
+        public void Choose() {
+            events.RequestTask<PhoneNumberChooserTask>();
+        }
+
+        public void Handle(TaskCompleted<PhoneNumberResult> message) {
+            MessageBox.Show("The result was " + message.Result.TaskResult, DisplayName, MessageBoxButton.OK);
+        }
+
+        protected override void OnActivate() {
+            events.Subscribe(this);
+            base.OnActivate();
+        }
+
+        protected override void OnDeactivate(bool close) {
+            events.Unsubscribe(this);
+            base.OnDeactivate(close);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabViewModelStorage.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabViewModelStorage.cs
new file mode 100644
index 0000000..12e16a6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWP7/Caliburn.Micro.HelloWP7/TabViewModelStorage.cs
@@ -0,0 +1,11 @@
+namespace Caliburn.Micro.HelloWP7 {
+    public class TabViewModelStorage : StorageHandler<TabViewModel> {
+        public override void Configure() {
+            Id(x => x.DisplayName);
+
+            Property(x => x.Text)
+                .InPhoneState()
+                .RestoreAfterActivation();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.sln
new file mode 100644
index 0000000..59d6bec
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloWindowManager", "Caliburn.Micro.HelloWindowManager\Caliburn.Micro.HelloWindowManager.csproj", "{250F5661-596A-4D8A-9F45-6B76AEC79E3A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Debug|x86.ActiveCfg = Debug|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Debug|x86.Build.0 = Debug|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Release|x86.ActiveCfg = Release|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/App.xaml
new file mode 100644
index 0000000..e4da9df
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/App.xaml
@@ -0,0 +1,14 @@
+<Application x:Class="Caliburn.Micro.HelloWindowManager.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.HelloWindowManager">
+	<Application.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary>
+					<local:MefBootstrapper x:Key="bootstrapper" />
+				</ResourceDictionary>
+			</ResourceDictionary.MergedDictionaries>
+		</ResourceDictionary>
+	</Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/App.xaml.cs
new file mode 100644
index 0000000..5ef506e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/App.xaml.cs
@@ -0,0 +1,8 @@
+namespace Caliburn.Micro.HelloWindowManager {
+    using System.Windows;
+
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.csproj
new file mode 100644
index 0000000..86d28ca
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager.csproj
@@ -0,0 +1,126 @@
+<?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)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{250F5661-596A-4D8A-9F45-6B76AEC79E3A}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.HelloWindowManager</RootNamespace>
+    <AssemblyName>Caliburn.Micro.HelloWindowManager</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <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|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\WPF\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\WPF\Debug\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DialogViewModel.cs" />
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="IShell.cs" />
+    <Compile Include="MefBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <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>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Page Include="DialogView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Dialog\Modeless.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Dialog\Popup.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- 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/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Dialog/Modeless.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Dialog/Modeless.xaml
new file mode 100644
index 0000000..0768453
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Dialog/Modeless.xaml
@@ -0,0 +1,6 @@
+<UserControl x:Class="Caliburn.Micro.HelloWindowManager.Dialog.Modeless"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Height="240">
+    <TextBlock FontSize="20">This is a custom WINDOW view.</TextBlock>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Dialog/Popup.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Dialog/Popup.xaml
new file mode 100644
index 0000000..cf0e475
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Dialog/Popup.xaml
@@ -0,0 +1,22 @@
+<UserControl x:Class="Caliburn.Micro.HelloWindowManager.Dialog.Popup"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Height="240">
+	<Border CornerRadius="6"
+	        BorderBrush="Black"
+	        BorderThickness="1"
+	        Background="White"
+	        Padding="4"
+	        Margin="6">
+		<Border.Effect>
+			<DropShadowEffect Opacity=".5" />
+		</Border.Effect>
+		<StackPanel>
+			<TextBlock FontSize="20">
+				This is a custom POPUP view.
+			</TextBlock>
+			<Button x:Name="TryClose"
+			        Content="Close" />
+		</StackPanel>
+	</Border>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/DialogView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/DialogView.xaml
new file mode 100644
index 0000000..c416748
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/DialogView.xaml
@@ -0,0 +1,6 @@
+<UserControl x:Class="Caliburn.Micro.HelloWindowManager.DialogView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Height="240">
+    <TextBlock FontSize="20">This is the default MODAL dialog view.</TextBlock>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/DialogViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/DialogViewModel.cs
new file mode 100644
index 0000000..50e637f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/DialogViewModel.cs
@@ -0,0 +1,3 @@
+namespace Caliburn.Micro.HelloWindowManager {
+    public class DialogViewModel : Screen {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/IShell.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/IShell.cs
new file mode 100644
index 0000000..80f1b62
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/IShell.cs
@@ -0,0 +1,5 @@
+namespace Caliburn.Micro.HelloWindowManager {
+    public interface IShell {
+        
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/MefBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/MefBootstrapper.cs
new file mode 100644
index 0000000..6bd7cd9
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/MefBootstrapper.cs
@@ -0,0 +1,46 @@
+namespace Caliburn.Micro.HelloWindowManager {
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition.Hosting;
+    using System.Linq;
+    using System.ComponentModel.Composition;
+
+    public class MefBootstrapper : Bootstrapper<IShell> {
+        private CompositionContainer container;
+
+        protected override void Configure() {
+            container = new CompositionContainer(
+                new AggregateCatalog(AssemblySource.Instance.Select(x => new AssemblyCatalog(x)))
+                );
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue(container);
+
+            container.Compose(batch);
+        }
+
+        protected override object GetInstance(Type serviceType, string key)
+        {
+            string contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if (exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType)
+        {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance)
+        {
+            container.SatisfyImportsOnce(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..5663eea
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+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("Caliburn.Micro.HelloWindowManager")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.HelloWindowManager")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Resources.Designer.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..4287e0e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.1
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Caliburn.Micro.HelloWindowManager.Properties
+{
+
+
+    /// <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 ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Caliburn.Micro.HelloWindowManager.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/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Resources.resx b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    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">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </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="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <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>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Settings.Designer.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..c13a013
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.1
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Caliburn.Micro.HelloWindowManager.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/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Settings.settings b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Settings.settings
new file mode 100644
index 0000000..033d7a5
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/ShellView.xaml
new file mode 100644
index 0000000..32d35c8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/ShellView.xaml
@@ -0,0 +1,14 @@
+<Window x:Class="Caliburn.Micro.HelloWindowManager.ShellView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Width="640"
+        Height="480">
+	<StackPanel>
+		<Button x:Name="OpenModeless"
+		        Content="Open Modeless" />
+		<Button x:Name="OpenModal"
+		        Content="Open Modal" />
+        <Button x:Name="OpenPopup"
+                Content="Open Popup" />
+	</StackPanel>
+</Window>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/ShellViewModel.cs
new file mode 100644
index 0000000..ad3b1e1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManager/Caliburn.Micro.HelloWindowManager/ShellViewModel.cs
@@ -0,0 +1,31 @@
+namespace Caliburn.Micro.HelloWindowManager {
+    using System.ComponentModel.Composition;
+    using System.Dynamic;
+    using System.Windows.Controls.Primitives;
+
+    [Export(typeof(IShell))]
+    public class ShellViewModel : Screen, IShell {
+        readonly IWindowManager windowManager;
+
+        [ImportingConstructor]
+        public ShellViewModel(IWindowManager windowManager) {
+            this.windowManager = windowManager;
+        }
+
+        public void OpenModeless() {
+            windowManager.ShowWindow(new DialogViewModel(), "Modeless");
+        }
+
+        public void OpenModal() {
+            var result = windowManager.ShowDialog(new DialogViewModel());
+        }
+
+        public void OpenPopup() {
+            dynamic settings = new ExpandoObject();
+            settings.Placement = PlacementMode.Center;
+            settings.PlacementTarget = GetView(null);
+
+            windowManager.ShowPopup(new DialogViewModel(), "Popup", settings);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7.sln
new file mode 100644
index 0000000..086fd62
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloWindowManagerWP7", "Caliburn.Micro.HelloWindowManagerWP7\Caliburn.Micro.HelloWindowManagerWP7.csproj", "{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|Any CPU.Deploy.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/App.xaml
new file mode 100644
index 0000000..7306132
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="Caliburn.Micro.HelloWP7.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.HelloWP7">
+	<Application.Resources>
+        <local:WP7AppBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/App.xaml.cs
new file mode 100644
index 0000000..d9834f8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/App.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System.Windows;
+
+    public partial class App : Application {
+        public App() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/ApplicationIcon.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/ApplicationIcon.png
new file mode 100644
index 0000000..5859393
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/ApplicationIcon.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Background.png b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Background.png
new file mode 100644
index 0000000..e46f21d
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Background.png differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7.csproj
new file mode 100644
index 0000000..f4fd6e5
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7.csproj
@@ -0,0 +1,129 @@
+<?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>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}</ProjectGuid>
+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.HelloWP7</RootNamespace>
+    <AssemblyName>Caliburn.Micro.HelloWP7</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloWP7.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.HelloWP7.App</SilverlightAppEntry>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\WP7\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="Caliburn.Micro.Extensions">
+      <HintPath>..\..\..\bin\WP7\Debug\Caliburn.Micro.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Phone" />
+    <Reference Include="Microsoft.Phone.Controls, Version=7.0.0.0, Culture=neutral, PublicKeyToken=24eec0d8c86cda1e, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.Phone.Interop" />
+    <Reference Include="System.Windows" />
+    <Reference Include="mscorlib" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DialogView.xaml.cs">
+      <DependentUpon>DialogView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DialogViewModel.cs" />
+    <Compile Include="WP7AppBootstrapper.cs" />
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainPageViewModel.cs" />
+    <Compile Include="MessageView.xaml.cs">
+      <DependentUpon>MessageView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MessageViewModel.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShowDialog.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+    <Page Include="DialogView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MessageView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+    <None Include="Properties\WMAppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ApplicationIcon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Background.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="SplashScreenImage.jpg" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions />
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogView.xaml
new file mode 100644
index 0000000..efcdc35
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogView.xaml
@@ -0,0 +1,45 @@
+<UserControl x:Class="Caliburn.Micro.HelloWP7.DialogView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+             
+             mc:Ignorable="d"
+             FontFamily="{StaticResource PhoneFontFamilyNormal}"
+             FontSize="{StaticResource PhoneFontSizeNormal}"
+             Foreground="{StaticResource PhoneForegroundBrush}"
+             d:DesignHeight="480"
+             d:DesignWidth="480">
+    
+    <!--add a reference to WP7 Toolkit to test with DatePicker and TimePicker-->
+    <!--xmlns:tkctl="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit"-->
+    
+    <StackPanel Background="{StaticResource PhoneChromeBrush}">
+        <TextBlock Style="{StaticResource PhoneTextLargeStyle}">An input dialog</TextBlock>
+        <TextBlock Style="{StaticResource PhoneTextNormalStyle}">Enter some text</TextBlock>
+        <TextBox Name="SomeTextInput" />
+
+        <!-- add a reference to WP7 Toolkit to test with DatePicker and TimePicker
+        <TextBlock Style="{StaticResource PhoneTextNormalStyle}">Choose a date</TextBlock>
+        <tkctl:DatePicker 
+                          Value="{Binding SomeDateInput, Mode=TwoWay}" />
+
+        <TextBlock Style="{StaticResource PhoneTextNormalStyle}">Choose a time</TextBlock>
+        <tkctl:TimePicker Value="{Binding SomeDateInput, Mode=TwoWay}" />
+        -->
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Button Name="Confirm"
+                    Content="confirm" />
+            <Button Name="TryClose"
+                    Content="cancel"
+                    Grid.Column="1" />
+
+        </Grid>
+    </StackPanel>
+
+</UserControl>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogView.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogView.xaml.cs
new file mode 100644
index 0000000..6a57a82
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogView.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System.Windows.Controls;
+
+    public partial class DialogView : UserControl {
+        public DialogView() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogViewModel.cs
new file mode 100644
index 0000000..de812e1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/DialogViewModel.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+
+namespace Caliburn.Micro.HelloWP7
+{
+	public class DialogViewModel: Screen
+	{
+
+		public string Message { get; set; }
+
+
+		string someTextInput; 
+		public string SomeTextInput {
+			get { return someTextInput; }
+			set { someTextInput = value; NotifyOfPropertyChange(() => SomeTextInput); }
+		}
+
+        DateTime? someDateInput;
+        public DateTime? SomeDateInput
+        {
+            get { return someDateInput; }
+            set { someDateInput = value; NotifyOfPropertyChange(() => SomeDateInput); }
+        }
+
+		public string Result { get; set; }
+
+		public void Confirm() {
+			Result = SomeTextInput + "\n" + SomeDateInput.ToString();
+			TryClose();
+		}
+		public void Cancel()
+		{
+			Result = null;
+			this.TryClose();
+		}
+	}
+}
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPage.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPage.xaml
new file mode 100644
index 0000000..aa12eca
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPage.xaml
@@ -0,0 +1,76 @@
+<phone:PhoneApplicationPage x:Class="Caliburn.Micro.HelloWP7.MainPage"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+                            xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+                            xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+                            SupportedOrientations="PortraitOrLandscape"
+                            Orientation="Portrait"
+                            shell:SystemTray.IsVisible="True"
+                            mc:Ignorable="d"
+                            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                            d:DesignHeight="696"
+                            d:DesignWidth="480"
+                            x:Name="thePage">
+    
+    <Grid Background="RoyalBlue">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0">
+            <TextBlock Text="WP7 Caliburn.Micro"
+                       Style="{StaticResource PhoneTextExtraLargeStyle}" />
+ 
+        </StackPanel>
+
+        <Grid Grid.Row="1">
+            <Button x:Name="ShowMessageAsPopup"
+                    Content="Show message as popup"
+                    Background="SlateGray"></Button>
+        </Grid>
+        <Grid Grid.Row="2">
+            <Button x:Name="ShowMessageAsDialog"
+                    Content="Show message as dialog"
+                    Background="SlateGray"></Button>
+        </Grid>
+        <Grid Grid.Row="3">
+            <Button x:Name="ShowInputDialog"
+                    Content="Show input dialog"
+                    Background="SlateGray"></Button>
+        </Grid>
+
+        <Grid Grid.Row="4">
+            <CheckBox IsChecked="{Binding Path=(shell:SystemTray.IsVisible), ElementName=thePage, Mode=TwoWay}"
+                      Content="Show system tray" />
+
+        </Grid>
+        <Grid Grid.Row="5">
+            <CheckBox IsChecked="{Binding ApplicationBar.IsVisible, ElementName=thePage, Mode=TwoWay}"
+                      Content="Show application bar" />
+        </Grid>
+    </Grid>
+
+    <phone:PhoneApplicationPage.ApplicationBar>
+        <shell:ApplicationBar IsVisible="True">
+            <shell:ApplicationBar.Buttons>
+                <cal:AppBarButton IconUri="ApplicationIcon.png"
+                                  Text="input"
+                                  Message="ShowInputDialog" />
+
+                <cal:AppBarButton IconUri="ApplicationIcon.png"
+                                  Text="message"
+                                  Message="ShowMessageBox" />
+            </shell:ApplicationBar.Buttons>
+            <shell:ApplicationBar.MenuItems>
+                <shell:ApplicationBarMenuItem Text="Dummy 1" />
+                <shell:ApplicationBarMenuItem Text="Dummy 2" />
+            </shell:ApplicationBar.MenuItems>
+        </shell:ApplicationBar>
+    </phone:PhoneApplicationPage.ApplicationBar>
+</phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPage.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPage.xaml.cs
new file mode 100644
index 0000000..a2d32d6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPage.xaml.cs
@@ -0,0 +1,7 @@
+namespace Caliburn.Micro.HelloWP7 {
+    public partial class MainPage {
+        public MainPage() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPageViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPageViewModel.cs
new file mode 100644
index 0000000..f1010cc
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MainPageViewModel.cs
@@ -0,0 +1,48 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System;
+	using System.Collections.Generic;
+	using System.Windows;
+
+    public class MainPageViewModel {
+
+		IWindowManager windowManager;
+		Func<MessageViewModel> messageViewModelFactory;
+		public MainPageViewModel(IWindowManager windowManager, Func<MessageViewModel> messageViewModelFactory)
+		{
+			this.windowManager = windowManager;
+			this.messageViewModelFactory = messageViewModelFactory;
+       
+		}
+
+         
+
+		public void ShowMessageAsPopup() {
+ 			var msgVM = messageViewModelFactory();
+			msgVM.Message = "A message shown in the popup.\nSecond row of message shown in the popup.";
+			windowManager.ShowPopup(msgVM);
+		}
+		public void ShowMessageAsDialog()
+		{
+			var msgVM = messageViewModelFactory();
+            msgVM.Message = "A message shown in the dialog.\nSecond row of message shown in the dialog.";
+			windowManager.ShowDialog(msgVM);
+		}
+
+		public IEnumerable<IResult> ShowInputDialog() {
+            var showDialog = new ShowDialog<DialogViewModel>();
+			yield return showDialog;
+
+			var result = showDialog.Dialog.Result ;
+            if (result != null) {
+
+                yield return new ShowDialog<MessageViewModel>()
+                    .Init(x=>x.Message= "The user entered: " + result);
+            }
+		}
+
+
+		public void ShowMessageBox() {
+			MessageBox.Show("Some message...", "WP7 native Message Box", MessageBoxButton.OK);
+		}
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageView.xaml
new file mode 100644
index 0000000..11f91bd
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageView.xaml
@@ -0,0 +1,24 @@
+<UserControl x:Class="Caliburn.Micro.HelloWP7.MessageView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d"
+             xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+             FontFamily="{StaticResource PhoneFontFamilyNormal}"
+             FontSize="{StaticResource PhoneFontSizeNormal}"
+             Foreground="{StaticResource PhoneForegroundBrush}"
+             d:DesignHeight="480"
+             d:DesignWidth="480">
+
+    <StackPanel Background="{StaticResource PhoneChromeBrush}">
+        <TextBlock Style="{StaticResource PhoneTextLargeStyle}" >A message dialog</TextBlock>
+        <TextBlock  Style="{StaticResource PhoneTextNormalStyle}" Name="Message" />
+        <Button Name="TryClose"
+                Content="ok" 
+                Width="240"
+                HorizontalAlignment="Left"
+                />
+    </StackPanel>
+
+</UserControl>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageView.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageView.xaml.cs
new file mode 100644
index 0000000..3b8140e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageView.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System.Windows.Controls;
+
+    public partial class MessageView : UserControl {
+        public MessageView() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageViewModel.cs
new file mode 100644
index 0000000..9f7b4ea
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/MessageViewModel.cs
@@ -0,0 +1,5 @@
+namespace Caliburn.Micro.HelloWP7 {
+    public class MessageViewModel : Screen {
+        public string Message { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..511a5e1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Caliburn.Micro.HelloWP7")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft IT")]
+[assembly: AssemblyProduct("Caliburn.Micro.HelloWP7")]
+[assembly: AssemblyCopyright("Copyright © Microsoft IT 2009")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3b73eba5-a55f-4a99-88f0-231e13c4221d")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/WMAppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/WMAppManifest.xml
new file mode 100644
index 0000000..37f87f1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/Properties/WMAppManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2009/deployment" AppPlatformVersion="7.0">
+  <App xmlns="" ProductID="{1144cfb1-fb22-4ff9-8e63-0dee28a7c4e6}" Title="Caliburn.Micro.HelloWP7" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal"  Author="Caliburn.Micro.HelloWP7 author" Description="Sample description" Publisher="Caliburn.Micro.HelloWP7">
+    <IconPath IsRelative="true" IsResource="false">ApplicationIcon.png</IconPath>
+    <Capabilities>
+      <Capability Name="ID_CAP_NETWORKING" />
+      <Capability Name="ID_CAP_LOCATION" />
+      <Capability Name="ID_CAP_SENSORS" />
+      <Capability Name="ID_CAP_MICROPHONE" />
+      <Capability Name="ID_CAP_MEDIALIB" />
+      <Capability Name="ID_CAP_GAMERSERVICES" />
+      <Capability Name="ID_CAP_PHONEDIALER" />
+      <Capability Name="ID_CAP_PUSH_NOTIFICATION" />
+      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
+    </Capabilities>
+    <Tasks>
+      <DefaultTask  Name ="_default" NavigationPage="MainPage.xaml"/>
+    </Tasks>
+    <Tokens>
+      <PrimaryToken TokenID="Caliburn.Micro.HelloWP7Token" TaskName="_default">
+        <TemplateType5>
+          <BackgroundImageURI IsRelative="true" IsResource="false">Background.png</BackgroundImageURI>
+          <Count>0</Count>
+          <Title>Caliburn.Micro.HelloWP7</Title>
+        </TemplateType5>
+      </PrimaryToken>
+    </Tokens>
+  </App>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/ShowDialog.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/ShowDialog.cs
new file mode 100644
index 0000000..1825fa1
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/ShowDialog.cs
@@ -0,0 +1,37 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System;
+
+    public class ShowDialog<T> : IResult {
+        Action<T> initialization = x => { };
+
+        public IWindowManager WindowManager { get; set; }
+
+
+        public ShowDialog<T> Init(Action<T> initialization) {
+            this.initialization = initialization;
+            return this;
+        }
+
+        public void Execute(ActionExecutionContext context) {
+            var screen = IoC.Get<T>();
+            initialization.Invoke(screen);
+
+            Dialog = screen;
+            WindowManager.ShowDialog(screen);
+
+            var deactivated = screen as IDeactivate;
+            if(deactivated == null)
+                Completed(this, new ResultCompletionEventArgs());
+            else {
+                deactivated.Deactivated += (o, e) => {
+                    if(e.WasClosed) {
+                        Completed(this, new ResultCompletionEventArgs());
+                    }
+                };
+            }
+        }
+
+        public T Dialog { get; private set; }
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/SplashScreenImage.jpg b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/SplashScreenImage.jpg
new file mode 100644
index 0000000..353b192
Binary files /dev/null and b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/SplashScreenImage.jpg differ
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/WP7AppBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/WP7AppBootstrapper.cs
new file mode 100644
index 0000000..f2bdfe6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.HelloWindowManagerWP7/Caliburn.Micro.HelloWindowManagerWP7/WP7AppBootstrapper.cs
@@ -0,0 +1,66 @@
+namespace Caliburn.Micro.HelloWP7 {
+    using System;
+    using System.Collections.Generic;
+    using System.Windows.Controls;
+    using Microsoft.Phone.Controls;
+
+    public class WP7AppBootstrapper : PhoneBootstrapper {
+        PhoneContainer container;
+
+        protected override void Configure() {
+            container = new PhoneContainer(RootFrame);
+
+            container.RegisterPhoneServices();
+
+            container.PerRequest<MainPageViewModel>();
+            container.PerRequest<MessageViewModel, MessageViewModel>();
+            container.PerRequest<DialogViewModel, DialogViewModel>();
+
+            AddCustomConventions();
+        }
+
+        static void AddCustomConventions() {
+            ConventionManager.AddElementConvention<Pivot>(Pivot.ItemsSourceProperty, "SelectedItem", "SelectionChanged").ApplyBinding =
+                (viewModelType, path, property, element, convention) => {
+                    if(ConventionManager
+                        .GetElementConvention(typeof(ItemsControl))
+                        .ApplyBinding(viewModelType, path, property, element, convention)) {
+                        ConventionManager
+                            .ConfigureSelectedItem(element, Pivot.SelectedItemProperty, viewModelType, path);
+                        ConventionManager
+                            .ApplyHeaderTemplate(element, Pivot.HeaderTemplateProperty, viewModelType);
+                        return true;
+                    }
+
+                    return false;
+                };
+
+            ConventionManager.AddElementConvention<Panorama>(Panorama.ItemsSourceProperty, "SelectedItem", "SelectionChanged").ApplyBinding =
+                (viewModelType, path, property, element, convention) => {
+                    if(ConventionManager
+                        .GetElementConvention(typeof(ItemsControl))
+                        .ApplyBinding(viewModelType, path, property, element, convention)) {
+                        ConventionManager
+                            .ConfigureSelectedItem(element, Panorama.SelectedItemProperty, viewModelType, path);
+                        ConventionManager
+                            .ApplyHeaderTemplate(element, Panorama.HeaderTemplateProperty, viewModelType);
+                        return true;
+                    }
+
+                    return false;
+                };
+        }
+
+        protected override object GetInstance(Type service, string key) {
+            return container.GetInstance(service, key);
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type service) {
+            return container.GetAllInstances(service);
+        }
+
+        protected override void BuildUp(object instance) {
+            container.BuildUp(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.sln
new file mode 100644
index 0000000..0cc431c
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.SimpleMDI", "Caliburn.Micro.SimpleMDI\Caliburn.Micro.SimpleMDI.csproj", "{50D9F822-15E6-4492-BD89-DF350566ADBF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Debug|x86.ActiveCfg = Debug|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Debug|x86.Build.0 = Debug|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Release|x86.ActiveCfg = Release|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/App.xaml
new file mode 100644
index 0000000..79eee26
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/App.xaml
@@ -0,0 +1,14 @@
+<Application x:Class="Caliburn.Micro.SimpleMDI.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.SimpleMDI">
+	<Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <local:AppBootstrapper x:Key="bootstrapper" />
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+	</Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/App.xaml.cs
new file mode 100644
index 0000000..5f78cd4
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/App.xaml.cs
@@ -0,0 +1,10 @@
+namespace Caliburn.Micro.SimpleMDI {
+    using System.Windows;
+
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application {
+        public App() {}
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/AppBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/AppBootstrapper.cs
new file mode 100644
index 0000000..9334d69
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/AppBootstrapper.cs
@@ -0,0 +1,3 @@
+namespace Caliburn.Micro.SimpleMDI {
+    public class AppBootstrapper : Bootstrapper<ShellViewModel> {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.csproj
new file mode 100644
index 0000000..093646f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI.csproj
@@ -0,0 +1,116 @@
+<?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)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{50D9F822-15E6-4492-BD89-DF350566ADBF}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.SimpleMDI</RootNamespace>
+    <AssemblyName>Caliburn.Micro.SimpleMDI</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <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|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\WPF\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\WPF\Debug\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ShellViewModel.cs" />
+    <Compile Include="TabViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AppBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <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>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TabView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- 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/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..822a186
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+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("Caliburn.Micro.SimpleMDI")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.SimpleMDI")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Resources.Designer.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..6c0cf2a
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.1
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Caliburn.Micro.SimpleMDI.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("Caliburn.Micro.SimpleMDI.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/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Resources.resx b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    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">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </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="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <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>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Settings.Designer.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..bf917aa
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.1
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Caliburn.Micro.SimpleMDI.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/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Settings.settings b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Settings.settings
new file mode 100644
index 0000000..033d7a5
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/ShellView.xaml
new file mode 100644
index 0000000..9702c6c
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/ShellView.xaml
@@ -0,0 +1,23 @@
+<Window x:Class="Caliburn.Micro.SimpleMDI.ShellView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:cal="http://www.caliburnproject.org"
+        Width="640"
+        Height="480">
+    <DockPanel>
+        <Button x:Name="OpenTab"
+                Content="Open Tab" 
+                DockPanel.Dock="Top" />
+        <TabControl x:Name="Items">
+            <TabControl.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding DisplayName}" />
+                        <Button Content="X"
+                                cal:Message.Attach="DeactivateItem($dataContext, 'true')" />
+                    </StackPanel>
+                </DataTemplate>
+            </TabControl.ItemTemplate>
+        </TabControl>
+    </DockPanel>
+</Window>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/ShellViewModel.cs
new file mode 100644
index 0000000..e65c8bf
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/ShellViewModel.cs
@@ -0,0 +1,11 @@
+namespace Caliburn.Micro.SimpleMDI {
+    public class ShellViewModel : Conductor<IScreen>.Collection.OneActive {
+        int count = 1;
+
+        public void OpenTab() {
+            ActivateItem(new TabViewModel {
+                DisplayName = "Tab " + count++
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/TabView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/TabView.xaml
new file mode 100644
index 0000000..058a038
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/TabView.xaml
@@ -0,0 +1,9 @@
+<UserControl x:Class="Caliburn.Micro.SimpleMDI.TabView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel Orientation="Horizontal">
+        <TextBlock Text="This is the view for "/>
+        <TextBlock x:Name="DisplayName" />
+        <TextBlock Text="." />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/TabViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/TabViewModel.cs
new file mode 100644
index 0000000..7d00d7b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleMDI/Caliburn.Micro.SimpleMDI/TabViewModel.cs
@@ -0,0 +1,3 @@
+namespace Caliburn.Micro.SimpleMDI {
+    public class TabViewModel : Screen {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation.sln
new file mode 100644
index 0000000..951bf3d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.SimpleNavigation", "Caliburn.Micro.SimpleNavigation\Caliburn.Micro.SimpleNavigation.csproj", "{EF8546AF-1D38-4F3F-AF88-942ECE42C565}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/App.xaml
new file mode 100644
index 0000000..981dfeb
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/App.xaml
@@ -0,0 +1,8 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.SimpleNavigation"
+             x:Class="Caliburn.Micro.SimpleNavigation.App">
+	<Application.Resources>
+        <local:AppBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/App.xaml.cs
new file mode 100644
index 0000000..1fb2802
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/App.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.SimpleNavigation {
+    using System.Windows;
+
+    public partial class App : Application {
+        public App() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/AppBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/AppBootstrapper.cs
new file mode 100644
index 0000000..3d3a3f5
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/AppBootstrapper.cs
@@ -0,0 +1,3 @@
+namespace Caliburn.Micro.SimpleNavigation {
+    public class AppBootstrapper : Bootstrapper<ShellViewModel> {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation.csproj
new file mode 100644
index 0000000..cb5f3db
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation.csproj
@@ -0,0 +1,124 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EF8546AF-1D38-4F3F-AF88-942ECE42C565}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.SimpleNavigation</RootNamespace>
+    <AssemblyName>Caliburn.Micro.SimpleNavigation</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloScreenNavigation.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.SimpleNavigation.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloScreenNavigationTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Controls.Toolkit, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="AppBootstrapper.cs" />
+    <Compile Include="PageOneViewModel.cs" />
+    <Compile Include="PageTwoViewModel.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="PageOneView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PageTwoView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageOneView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageOneView.xaml
new file mode 100644
index 0000000..b38a620
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageOneView.xaml
@@ -0,0 +1,5 @@
+<UserControl x:Class="Caliburn.Micro.SimpleNavigation.PageOneView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <TextBlock FontSize="32">Page One</TextBlock>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageOneViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageOneViewModel.cs
new file mode 100644
index 0000000..21db069
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageOneViewModel.cs
@@ -0,0 +1,3 @@
+namespace Caliburn.Micro.SimpleNavigation {
+    public class PageOneViewModel {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageTwoView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageTwoView.xaml
new file mode 100644
index 0000000..0dcfbd0
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageTwoView.xaml
@@ -0,0 +1,5 @@
+<UserControl x:Class="Caliburn.Micro.SimpleNavigation.PageTwoView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <TextBlock FontSize="32">Page Two</TextBlock>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageTwoViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageTwoViewModel.cs
new file mode 100644
index 0000000..6c851e7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/PageTwoViewModel.cs
@@ -0,0 +1,10 @@
+namespace Caliburn.Micro.SimpleNavigation {
+    using System.Windows;
+
+    public class PageTwoViewModel : Screen {
+        protected override void OnActivate() {
+            MessageBox.Show("Page Two Activated"); //Don't do this in a real VM.
+            base.OnActivate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..386dd0f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Caliburn.Micro.SimpleNavigation")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.SimpleNavigation")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("6a53eee0-bd6e-4a49-8261-20eb7adb1990")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/ShellView.xaml
new file mode 100644
index 0000000..0e3191c
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/ShellView.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="Caliburn.Micro.SimpleNavigation.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:tc="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+	<tc:DockPanel>
+		<StackPanel Orientation="Horizontal"
+                    HorizontalAlignment="Center"
+		            tc:DockPanel.Dock="Top">
+			<Button x:Name="ShowPageOne"
+			        Content="Show Page One" />
+			<Button x:Name="ShowPageTwo"
+			        Content="Show Page Two" />
+		</StackPanel>
+
+		<ContentControl x:Name="ActiveItem" />
+	</tc:DockPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/ShellViewModel.cs
new file mode 100644
index 0000000..1af0098
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.SimpleNavigation/Caliburn.Micro.SimpleNavigation/ShellViewModel.cs
@@ -0,0 +1,15 @@
+namespace Caliburn.Micro.SimpleNavigation {
+    public class ShellViewModel : Conductor<object> {
+        public ShellViewModel() {
+            ShowPageOne();
+        }
+
+        public void ShowPageOne() {
+            ActivateItem(new PageOneViewModel());
+        }
+
+        public void ShowPageTwo() {
+            ActivateItem(new PageTwoViewModel());
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst.sln b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst.sln
new file mode 100644
index 0000000..3973628
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.ViewFirst", "Caliburn.Micro.ViewFirst\Caliburn.Micro.ViewFirst.csproj", "{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/App.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/App.xaml
new file mode 100644
index 0000000..4db5cf5
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/App.xaml
@@ -0,0 +1,8 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Caliburn.Micro.ViewFirst"
+             x:Class="Caliburn.Micro.ViewFirst.App">
+	<Application.Resources>
+        <local:MefBootstrapper x:Key="bootstrapper" />
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/App.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/App.xaml.cs
new file mode 100644
index 0000000..9ab86f8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/App.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.ViewFirst {
+    using System.Windows;
+
+    public partial class App : Application {
+        public App() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst.csproj b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst.csproj
new file mode 100644
index 0000000..d1d81fa
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst.csproj
@@ -0,0 +1,119 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3B15ECA5-A872-42CB-A4C6-D12D100284CC}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro.ViewFirst</RootNamespace>
+    <AssemblyName>Caliburn.Micro.ViewFirst</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>Caliburn.Micro.HelloWorld.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>Caliburn.Micro.ViewFirst.App</SilverlightAppEntry>
+    <TestPageFileName>Caliburn.Micro.HelloWorldTestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>false</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="IShell.cs" />
+    <Compile Include="MefBootstrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ShellView.xaml.cs">
+      <DependentUpon>ShellView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/IShell.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/IShell.cs
new file mode 100644
index 0000000..67b2093
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/IShell.cs
@@ -0,0 +1,3 @@
+namespace Caliburn.Micro.ViewFirst {
+    public interface IShell {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/MefBootstrapper.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/MefBootstrapper.cs
new file mode 100644
index 0000000..aa4c393
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/MefBootstrapper.cs
@@ -0,0 +1,51 @@
+namespace Caliburn.Micro.ViewFirst {
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.Primitives;
+    using System.Linq;
+    using System.Windows;
+
+    public class MefBootstrapper : Bootstrapper {
+        CompositionContainer container;
+
+        protected override void Configure() {
+            container = CompositionHost.Initialize(
+                new AggregateCatalog(
+                    AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()
+                    )
+                );
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue(container);
+
+            container.Compose(batch);
+        }
+
+        protected override void OnStartup(object sender, StartupEventArgs e) {
+            Application.Current.RootVisual = new ShellView();
+        }
+
+        protected override object GetInstance(Type serviceType, string key) {
+            var contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if(exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType) {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance) {
+            container.SatisfyImportsOnce(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..3696d33
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly:AssemblyTitle("Caliburn.Micro.ViewFirst")]
+[assembly:AssemblyDescription("")]
+[assembly:AssemblyConfiguration("")]
+[assembly:AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Caliburn.Micro.ViewFirst")]
+[assembly:AssemblyCopyright("Copyright © Microsoft 2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly:Guid("12bf83be-62fe-43d7-8d46-b4e7dd69b06e")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly:AssemblyVersion("1.0.0.0")]
+[assembly:AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellView.xaml b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellView.xaml
new file mode 100644
index 0000000..b299784
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellView.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="Caliburn.Micro.ViewFirst.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:cal="http://www.caliburnproject.org"
+             cal:Bind.Model="Shell">
+    <StackPanel>
+        <TextBox x:Name="Name" />
+        <Button x:Name="SayHello"
+                Content="Click Me" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellView.xaml.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellView.xaml.cs
new file mode 100644
index 0000000..79e1521
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellView.xaml.cs
@@ -0,0 +1,9 @@
+namespace Caliburn.Micro.ViewFirst {
+    using System.Windows.Controls;
+
+    public partial class ShellView : UserControl {
+        public ShellView() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellViewModel.cs b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellViewModel.cs
new file mode 100644
index 0000000..c854b1d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/Caliburn.Micro.ViewFirst/Caliburn.Micro.ViewFirst/ShellViewModel.cs
@@ -0,0 +1,26 @@
+namespace Caliburn.Micro.ViewFirst {
+    using System.ComponentModel.Composition;
+    using System.Windows;
+
+    [Export("Shell", typeof(IShell))]
+    public class ShellViewModel : PropertyChangedBase, IShell {
+        string name;
+
+        public string Name {
+            get { return name; }
+            set {
+                name = value;
+                NotifyOfPropertyChange(() => Name);
+                NotifyOfPropertyChange(() => CanSayHello);
+            }
+        }
+
+        public bool CanSayHello {
+            get { return !string.IsNullOrWhiteSpace(Name); }
+        }
+
+        public void SayHello() {
+            MessageBox.Show(string.Format("Hello {0}!", Name));
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary.sln b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary.sln
new file mode 100644
index 0000000..c89762d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameLibrary", "GameLibrary\GameLibrary.csproj", "{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/App.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/App.xaml
new file mode 100644
index 0000000..da452cf
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/App.xaml
@@ -0,0 +1,14 @@
+<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:GameLibrary"
+             x:Class="GameLibrary.App">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources/DefaultStyles.xaml" />
+                <ResourceDictionary Source="Resources/NamedStyles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <local:AppBootstrapper x:Key="bootstrapper" />
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/App.xaml.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/App.xaml.cs
new file mode 100644
index 0000000..73a394f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/App.xaml.cs
@@ -0,0 +1,7 @@
+namespace GameLibrary {
+    public partial class App {
+        public App() {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/AppBootstrapper.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/AppBootstrapper.cs
new file mode 100644
index 0000000..d50cba7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/AppBootstrapper.cs
@@ -0,0 +1,73 @@
+namespace GameLibrary {
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.Composition.Hosting;
+    using System.ComponentModel.Composition.Primitives;
+    using System.Linq;
+    using System.Windows.Controls;
+    using Caliburn.Micro;
+    using Framework;
+
+    public class AppBootstrapper : Bootstrapper<IShell> {
+        CompositionContainer container;
+
+        protected override void StartDesignTime()
+        {
+            LogManager.GetLog = type => new SimpleLog(type);
+            base.StartDesignTime();
+        }
+
+        protected override void Configure() {
+            ConfigureContainer();
+            ConfigureConventions();
+        }
+
+        void ConfigureContainer() {
+            container = CompositionHost.Initialize(
+                new AggregateCatalog(
+                    AssemblySource.Instance.Select(x => new AssemblyCatalog(x)).OfType<ComposablePartCatalog>()
+                    )
+                );
+
+            var batch = new CompositionBatch();
+
+            batch.AddExportedValue<IWindowManager>(new WindowManager());
+            batch.AddExportedValue<IEventAggregator>(new EventAggregator());
+            batch.AddExportedValue(container);
+
+            container.Compose(batch);
+        }
+
+        void ConfigureConventions() {
+            ConventionManager.AddElementConvention<BusyIndicator>(BusyIndicator.IsBusyProperty, "IsBusy", "IsBusyChanged");
+            ConventionManager.AddElementConvention<Rating>(Rating.ValueProperty, "Value", "ValueChanged");
+
+            // If you speak Klingon or RegEx you'll clearly see this lets
+            // Model.GameDTO map to Views.GameDTOView
+            ViewLocator.NameTransformer.AddRule(
+                @"(?<namespace>(.*\.)*)Model\.(?<basename>[A-Za-z]\w*)",
+                @"${namespace}Views.${basename}",
+                @"(.*\.)*Model\.[A-Za-z]\w*"
+                );
+        }
+
+        protected override object GetInstance(Type serviceType, string key) {
+            var contract = string.IsNullOrEmpty(key) ? AttributedModelServices.GetContractName(serviceType) : key;
+            var exports = container.GetExportedValues<object>(contract);
+
+            if(exports.Count() > 0)
+                return exports.First();
+
+            throw new Exception(string.Format("Could not locate any instances of contract {0}.", contract));
+        }
+
+        protected override IEnumerable<object> GetAllInstances(Type serviceType) {
+            return container.GetExportedValues<object>(AttributedModelServices.GetContractName(serviceType));
+        }
+
+        protected override void BuildUp(object instance) {
+            container.SatisfyImportsOnce(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/BusyResult.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/BusyResult.cs
new file mode 100644
index 0000000..62ae532
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/BusyResult.cs
@@ -0,0 +1,57 @@
+namespace GameLibrary.Framework {
+    using System;
+    using System.Collections.Generic;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Media;
+    using Caliburn.Micro;
+
+    public class BusyResult : IResult {
+        readonly bool hide;
+
+        public BusyResult(bool hide) {
+            this.hide = hide;
+        }
+
+        public void Execute(ActionExecutionContext context) {
+            var view = context.View as FrameworkElement;
+
+            //bottom up search
+            while(view != null) {
+                var indicator = view as BusyIndicator;
+                if(indicator != null) {
+                    indicator.IsBusy = !hide;
+                    break;
+                }
+                view = view.Parent as FrameworkElement;
+            }
+
+            //top down search
+            if(view == null) {
+                var queue = new Queue<FrameworkElement>();
+                queue.Enqueue(App.Current.RootVisual as FrameworkElement);
+
+                while(queue.Count > 0) {
+                    var current = queue.Dequeue();
+                    if(current == null)
+                        continue;
+
+                    var indicator = current as BusyIndicator;
+                    if(indicator != null) {
+                        indicator.IsBusy = !hide;
+                        break;
+                    }
+
+                    var count = VisualTreeHelper.GetChildrenCount(current);
+                    for(var i = 0; i < count; i++) {
+                        queue.Enqueue(VisualTreeHelper.GetChild(current, i) as FrameworkElement);
+                    }
+                }
+            }
+
+            Completed(this, new ResultCompletionEventArgs());
+        }
+
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Error.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Error.cs
new file mode 100644
index 0000000..31aa29b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Error.cs
@@ -0,0 +1,13 @@
+namespace GameLibrary.Framework {
+    public class Error {
+        public Error(object instance, string propertyName, string message) {
+            Instance = instance;
+            Key = propertyName;
+            Message = message;
+        }
+
+        public object Instance { get; private set; }
+        public string Key { get; private set; }
+        public string Message { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IOpenResult.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IOpenResult.cs
new file mode 100644
index 0000000..3d243a8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IOpenResult.cs
@@ -0,0 +1,9 @@
+namespace GameLibrary.Framework {
+    using System;
+    using Caliburn.Micro;
+
+    public interface IOpenResult<TTarget> : IResult {
+        Action<TTarget> OnConfigure { get; set; }
+        Action<TTarget> OnClose { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IShell.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IShell.cs
new file mode 100644
index 0000000..02a1498
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IShell.cs
@@ -0,0 +1,5 @@
+namespace GameLibrary.Framework {
+    using Caliburn.Micro;
+
+    public interface IShell : IConductActiveItem {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IValidator.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IValidator.cs
new file mode 100644
index 0000000..f58e7f7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/IValidator.cs
@@ -0,0 +1,9 @@
+namespace GameLibrary.Framework {
+    using System.Collections.Generic;
+
+    public interface IValidator
+    {
+        IEnumerable<Error> Validate(object instance);
+        IEnumerable<Error> Validate(object instance, string propertyName);
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/OpenChildResult.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/OpenChildResult.cs
new file mode 100644
index 0000000..9502e44
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/OpenChildResult.cs
@@ -0,0 +1,65 @@
+namespace GameLibrary.Framework {
+    using System;
+    using Caliburn.Micro;
+
+    public class OpenChildResult<TChild> : OpenResultBase<TChild> {
+        readonly Func<ActionExecutionContext, TChild> locateChild = c => IoC.Get<TChild>();
+        Func<ActionExecutionContext, IConductor> locateParent = c => (IConductor)c.Target;
+
+        public OpenChildResult() {}
+
+        public OpenChildResult(TChild child) {
+            locateChild = c => child;
+        }
+
+        public OpenChildResult<TChild> In<TParent>()
+            where TParent : IConductor {
+            locateParent = c => IoC.Get<TParent>();
+            return this;
+        }
+
+        public OpenChildResult<TChild> In(IConductor parent) {
+            locateParent = c => parent;
+            return this;
+        }
+
+        public override void Execute(ActionExecutionContext context) {
+            var parent = locateParent(context);
+            var child = locateChild(context);
+
+            if(onConfigure != null)
+                onConfigure(child);
+
+            EventHandler<ActivationProcessedEventArgs> processed = null;
+            processed = (s, e) => {
+                parent.ActivationProcessed -= processed;
+
+                if(e.Success) {
+                    OnOpened(parent, child);
+
+                    var deactivator = child as IDeactivate;
+                    if(deactivator != null && onClose != null) {
+                        EventHandler<DeactivationEventArgs> handler = null;
+                        handler = (s2, e2) => {
+                            if(!e2.WasClosed)
+                                return;
+
+                            deactivator.Deactivated -= handler;
+                            onClose(child);
+                        };
+
+                        deactivator.Deactivated += handler;
+                    }
+
+                    OnCompleted(null, false);
+                }
+                else OnCompleted(null, true);
+            };
+
+            parent.ActivationProcessed += processed;
+            parent.ActivateItem(child);
+        }
+
+        protected virtual void OnOpened(IConductor parent, TChild child) {}
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/OpenResultBase.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/OpenResultBase.cs
new file mode 100644
index 0000000..e91932c
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/OpenResultBase.cs
@@ -0,0 +1,31 @@
+namespace GameLibrary.Framework {
+    using System;
+    using Caliburn.Micro;
+
+    public abstract class OpenResultBase<TTarget> : IOpenResult<TTarget>
+    {
+        protected Action<TTarget> onConfigure;
+        protected Action<TTarget> onClose;
+
+        Action<TTarget> IOpenResult<TTarget>.OnConfigure
+        {
+            get { return onConfigure; }
+            set { onConfigure = value; }
+        }
+
+        Action<TTarget> IOpenResult<TTarget>.OnClose
+        {
+            get { return onClose; }
+            set { onClose = value; }
+        }
+
+        public abstract void Execute(ActionExecutionContext context);
+
+        protected virtual void OnCompleted(Exception exception, bool wasCancelled)
+        {
+            Completed(this, new ResultCompletionEventArgs { Error = exception, WasCancelled = wasCancelled });
+        }
+
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/ResultExtensions.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/ResultExtensions.cs
new file mode 100644
index 0000000..1b9a5ed
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/ResultExtensions.cs
@@ -0,0 +1,15 @@
+namespace GameLibrary.Framework {
+    using System;
+
+    public static class ResultExtensions {
+        public static IOpenResult<TChild> Configured<TChild>(this IOpenResult<TChild> result, Action<TChild> configure) {
+            result.OnConfigure = configure;
+            return result;
+        }
+
+        public static IOpenResult<TChild> WhenClosing<TChild>(this IOpenResult<TChild> result, Action<TChild> onShutdown) {
+            result.OnClose = onShutdown;
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Show.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Show.cs
new file mode 100644
index 0000000..e7e665a
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Show.cs
@@ -0,0 +1,19 @@
+namespace GameLibrary.Framework {
+    using Caliburn.Micro;
+
+    public static class Show {
+        public static OpenChildResult<TChild> Child<TChild>()
+            where TChild : IScreen
+        {
+            return new OpenChildResult<TChild>();
+        }
+
+        public static IResult Busy() {
+            return new BusyResult(false);
+        }
+
+        public static IResult NotBusy() {
+            return new BusyResult(true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/SimpleLog.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/SimpleLog.cs
new file mode 100644
index 0000000..642e116
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/SimpleLog.cs
@@ -0,0 +1,27 @@
+namespace GameLibrary.Framework {
+    using System;
+    using System.Diagnostics;
+    using Caliburn.Micro;
+
+    public class SimpleLog : ILog {
+        readonly Type type;
+
+        public SimpleLog(Type type) {
+            this.type = type;
+        }
+
+        public void Info(string format, params object[] args)
+        {
+            Debug.WriteLine("INFO: {0} : {1}", type.Name, string.Format(format, args));
+        }
+
+        public void Warn(string format, params object[] args)
+        {
+            Debug.WriteLine("WARN: {0} : {1}", type.Name, string.Format(format, args));
+        }
+
+        public void Error(Exception exception) {
+            Debug.WriteLine("ERROR: {0}\n{1}", type.Name, exception);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Validator.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Validator.cs
new file mode 100644
index 0000000..14ad089
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Framework/Validator.cs
@@ -0,0 +1,35 @@
+namespace GameLibrary.Framework {
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.DataAnnotations;
+    using System.Linq;
+    using System.Reflection;
+    using Caliburn.Micro;
+
+    [Export(typeof(IValidator))]
+    public class Validator : IValidator {
+        public IEnumerable<Error> Validate(object instance) {
+            return from property in instance.GetType().GetProperties()
+                   from error in GetValidationErrors(instance, property)
+                   select error;
+        }
+
+        public IEnumerable<Error> Validate(object instance, string propertyName) {
+            var property = instance.GetType().GetProperty(propertyName);
+            return GetValidationErrors(instance, property);
+        }
+
+        IEnumerable<Error> GetValidationErrors(object instance, PropertyInfo property) {
+            var context = new ValidationContext(instance, null, null);
+            var validators = from attribute in property.GetAttributes<ValidationAttribute>(true)
+                             where attribute.GetValidationResult(property.GetValue(instance, null), context) != ValidationResult.Success
+                             select new Error(
+                                 instance,
+                                 property.Name,
+                                 attribute.FormatErrorMessage(property.Name)
+                                 );
+
+            return validators.OfType<Error>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/GameLibrary.csproj b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/GameLibrary.csproj
new file mode 100644
index 0000000..c17ebc8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/GameLibrary.csproj
@@ -0,0 +1,229 @@
+<?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.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}</ProjectGuid>
+    <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>GameLibrary</RootNamespace>
+    <AssemblyName>GameLibrary</AssemblyName>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>GameLibrary.xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>GameLibrary.App</SilverlightAppEntry>
+    <TestPageFileName>TestPage.html</TestPageFileName>
+    <CreateTestPage>true</CreateTestPage>
+    <ValidateXaml>true</ValidateXaml>
+    <EnableOutOfBrowser>true</EnableOutOfBrowser>
+    <OutOfBrowserSettingsFile>Properties\OutOfBrowserSettings.xml</OutOfBrowserSettingsFile>
+    <UsePlatformExtensions>false</UsePlatformExtensions>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <LinkedServerProject>
+    </LinkedServerProject>
+  </PropertyGroup>
+  <!-- This property group is only here to support building this project using the 
+       MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 
+       to set the TargetFrameworkVersion to v3.5 -->
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <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;SILVERLIGHT</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Caliburn.Micro">
+      <HintPath>..\..\..\bin\Silverlight\Debug\Caliburn.Micro.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.ComponentModel.DataAnnotations, Version=2.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Windows.Controls, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+    <Reference Include="System.Windows.Controls.Input.Toolkit, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Controls.Layout.Toolkit, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Controls.Toolkit, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Windows.Interactivity, Version=4.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="AppBootstrapper.cs" />
+    <Compile Include="Framework\BusyResult.cs" />
+    <Compile Include="Framework\SimpleLog.cs" />
+    <Compile Include="Framework\Error.cs" />
+    <Compile Include="Framework\IOpenResult.cs" />
+    <Compile Include="Framework\OpenChildResult.cs" />
+    <Compile Include="Framework\OpenResultBase.cs" />
+    <Compile Include="Framework\ResultExtensions.cs" />
+    <Compile Include="Framework\Show.cs" />
+    <Compile Include="Framework\Validator.cs" />
+    <Compile Include="Framework\IShell.cs" />
+    <Compile Include="Framework\IValidator.cs" />
+    <Compile Include="Model\AddGameToLibrary.cs" />
+    <Compile Include="Model\BackendUIExtensions.cs" />
+    <Compile Include="Model\CheckGameIn.cs" />
+    <Compile Include="Model\CheckGameOut.cs" />
+    <Compile Include="Model\CommandResult.cs" />
+    <Compile Include="Model\FakeBackend.cs" />
+    <Compile Include="Model\GameDTO.cs" />
+    <Compile Include="Model\GetGame.cs" />
+    <Compile Include="Model\IBackend.cs" />
+    <Compile Include="Model\ICommand.cs" />
+    <Compile Include="Model\IQuery.cs" />
+    <Compile Include="Model\QueryResult.cs" />
+    <Compile Include="Model\SearchGames.cs" />
+    <Compile Include="Model\SearchResult.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ViewModels\AddGameViewModel.cs" />
+    <Compile Include="ViewModels\ExploreGameViewModel.cs" />
+    <Compile Include="ViewModels\IndividualResultViewModel.cs" />
+    <Compile Include="ViewModels\NoResultsViewModel.cs" />
+    <Compile Include="ViewModels\ResultsViewModel.cs" />
+    <Compile Include="ViewModels\SearchViewModel.cs" />
+    <Compile Include="Resources\Background.xaml.cs">
+      <DependentUpon>Background.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ViewModels\ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AppManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\OutOfBrowserSettings.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Resources\ColorsAndBrushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\ControlTemplates\BusyIndicator.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\ControlTemplates\Button.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\ControlTemplates\HyperlinkButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\ControlTemplates\Manifest.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\ControlTemplates\Rating.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\ControlTemplates\TextBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\ControlTemplates\ValidationToolTip.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\DefaultStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\NamedStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\Background.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\AddGameView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ExploreGameView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\GameDTO.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\IndividualResultView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NoResultsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ResultsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\SearchView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ShellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <!-- 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>
+  -->
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
+        <SilverlightProjectProperties />
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/AddGameToLibrary.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/AddGameToLibrary.cs
new file mode 100644
index 0000000..f7010b3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/AddGameToLibrary.cs
@@ -0,0 +1,7 @@
+namespace GameLibrary.Model {
+    public class AddGameToLibrary : ICommand {
+        public string Title { get; set; }
+        public string Notes { get; set; }
+        public double Rating { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/BackendUIExtensions.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/BackendUIExtensions.cs
new file mode 100644
index 0000000..9b3cd22
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/BackendUIExtensions.cs
@@ -0,0 +1,11 @@
+namespace GameLibrary.Model {
+    public static class BackendUIExtensions {
+        public static QueryResult<TResponse> AsResult<TResponse>(this IQuery<TResponse> query) {
+            return new QueryResult<TResponse>(query);
+        }
+
+        public static CommandResult AsResult(this ICommand command) {
+            return new CommandResult(command);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CheckGameIn.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CheckGameIn.cs
new file mode 100644
index 0000000..50a8037
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CheckGameIn.cs
@@ -0,0 +1,7 @@
+namespace GameLibrary.Model {
+    using System;
+
+    public class CheckGameIn : ICommand {
+        public Guid Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CheckGameOut.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CheckGameOut.cs
new file mode 100644
index 0000000..1ffe455
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CheckGameOut.cs
@@ -0,0 +1,8 @@
+namespace GameLibrary.Model {
+    using System;
+
+    public class CheckGameOut : ICommand {
+        public Guid Id { get; set; }
+        public string Borrower { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CommandResult.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CommandResult.cs
new file mode 100644
index 0000000..9bad4b0
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/CommandResult.cs
@@ -0,0 +1,23 @@
+namespace GameLibrary.Model {
+    using System;
+    using System.ComponentModel.Composition;
+    using Caliburn.Micro;
+
+    public class CommandResult : IResult {
+        readonly ICommand command;
+
+        [Import]
+        public IBackend Backend { get; set; }
+
+        public CommandResult(ICommand command) {
+            this.command = command;
+        }
+
+        public void Execute(ActionExecutionContext context) {
+            Backend.Send(command);
+            Completed(this, new ResultCompletionEventArgs());
+        }
+
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/FakeBackend.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/FakeBackend.cs
new file mode 100644
index 0000000..43fc386
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/FakeBackend.cs
@@ -0,0 +1,123 @@
+namespace GameLibrary.Model {
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.Linq;
+    using System.Reflection;
+    using System.Threading;
+
+    [Export(typeof(IBackend))]
+    public class FakeBackend : IBackend {
+        //The 'Notes' are taken from the Game Spot reviews for each of these games.
+        readonly List<GameDTO> games = new List<GameDTO> {
+            new GameDTO {
+                Id = Guid.NewGuid(),
+                Title = "Halo 1",
+                Rating = 1,
+                Notes = "Not only is this easily the best of the Xbox launch games, but it's easily one of the best shooters ever, on any platform.",
+                AddedOn = DateTime.Today
+            },
+            new GameDTO {
+                Id = Guid.NewGuid(),
+                Title = "Halo 2",
+                Rating = .8,
+                Notes = "Despite a rather short campaign and a disappointing storyline, Halo 2 is an exceptional shooter that frequently delivers thrilling, memorable, and unique moments in its online, co-op, and single-player modes.",
+                AddedOn = DateTime.Today
+            },
+            new GameDTO {
+                Id = Guid.NewGuid(),
+                Title = "Halo 3",
+                Rating = .8,
+                Notes = "Halo 3 builds upon the concepts of Halo 2 in ways that you'd expect, but there are also new modes and options that send the series in exciting new directions.",
+                AddedOn = DateTime.Today
+            },
+            new GameDTO {
+                Id = Guid.NewGuid(),
+                Title = "Mass Effect 1",
+                Rating = .8,
+                Notes = "An excellent story and fun battles make this a universe worth exploring.",
+                AddedOn = DateTime.Today
+            },
+            new GameDTO {
+                Id = Guid.NewGuid(),
+                Title = "Mass Effect 2",
+                Rating = 1,
+                Notes = "Once this intense and action-packed role-playing game pulls you into its orbit, you won't want to escape.",
+                AddedOn = DateTime.Today
+            },
+            new GameDTO {
+                Id = Guid.NewGuid(),
+                Title = "Final Fantasy XIII",
+                Rating = .8,
+                Notes = "The most beautiful Final Fantasy game yet is an imperfect but still impressive saga that will touch your heart.",
+                AddedOn = DateTime.Today
+            }
+        };
+
+        readonly IEnumerable<MethodInfo> methods = typeof(FakeBackend)
+            .GetMethods()
+            .Where(x => x.Name == "Handle");
+
+        public void Send<TResponse>(IQuery<TResponse> query, Action<TResponse> reply) {
+            Invoke(query, query, reply);
+        }
+
+        public void Send(ICommand command) {
+            Invoke(command, command);
+        }
+
+        void Invoke(object request, params object[] args) {
+            ThreadPool.QueueUserWorkItem(state => {
+                Thread.Sleep(1000); //simulating network
+
+                var requestType = request.GetType();
+                var handler = methods.Where(x => requestType.IsAssignableFrom(x.GetParameters().First().ParameterType)).First();
+
+                handler.Invoke(this, args);
+            });
+        }
+
+        public void Handle(SearchGames search, Action<IEnumerable<SearchResult>> reply) {
+            reply(
+                from game in games
+                where game.Title.ToLower().Contains(search.SearchText.ToLower())
+                orderby game.Title
+                select new SearchResult {
+                    Id = game.Id,
+                    Title = game.Title
+                });
+        }
+
+        public void Handle(GetGame getGame, Action<GameDTO> reply) {
+            reply(
+                (from game in games
+                 where game.Id == getGame.Id
+                 select game).FirstOrDefault()
+                );
+        }
+
+        public void Handle(AddGameToLibrary addGame) {
+            var game = new GameDTO {
+                Id = Guid.NewGuid(),
+                Title = addGame.Title,
+                Notes = addGame.Notes,
+                Rating = addGame.Rating,
+                AddedOn = DateTime.Now,
+            };
+
+            games.Add(game);
+        }
+
+        public void Handle(CheckGameIn checkIn) {
+            var game = games.FirstOrDefault(x => x.Id == checkIn.Id);
+            if(game != null)
+                game.Borrower = null;
+        }
+
+        public void Handle(CheckGameOut checkOut) {
+            var game = games.FirstOrDefault(x => x.Id == checkOut.Id);
+            if(game != null)
+                game.Borrower = checkOut.Borrower;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/GameDTO.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/GameDTO.cs
new file mode 100644
index 0000000..4e38e52
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/GameDTO.cs
@@ -0,0 +1,12 @@
+namespace GameLibrary.Model {
+    using System;
+
+    public class GameDTO {
+        public Guid Id { get; set; }
+        public string Title { get; set; }
+        public double Rating { get; set; }
+        public string Notes { get; set; }
+        public string Borrower { get; set; }
+        public DateTime AddedOn { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/GetGame.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/GetGame.cs
new file mode 100644
index 0000000..e3f4259
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/GetGame.cs
@@ -0,0 +1,7 @@
+namespace GameLibrary.Model {
+    using System;
+
+    public class GetGame : IQuery<GameDTO> {
+        public Guid Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/IBackend.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/IBackend.cs
new file mode 100644
index 0000000..94cdfe6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/IBackend.cs
@@ -0,0 +1,8 @@
+namespace GameLibrary.Model {
+    using System;
+
+    public interface IBackend {
+        void Send(ICommand command);
+        void Send<TResponse>(IQuery<TResponse> query, Action<TResponse> reply);
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/ICommand.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/ICommand.cs
new file mode 100644
index 0000000..c932504
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/ICommand.cs
@@ -0,0 +1,3 @@
+namespace GameLibrary.Model {
+    public interface ICommand {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/IQuery.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/IQuery.cs
new file mode 100644
index 0000000..a2290f3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/IQuery.cs
@@ -0,0 +1,3 @@
+namespace GameLibrary.Model {
+    public interface IQuery<TResponse> {}
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/QueryResult.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/QueryResult.cs
new file mode 100644
index 0000000..b80eab2
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/QueryResult.cs
@@ -0,0 +1,26 @@
+namespace GameLibrary.Model {
+    using System;
+    using System.ComponentModel.Composition;
+    using Caliburn.Micro;
+
+    public class QueryResult<TResponse> : IResult {
+        readonly IQuery<TResponse> query;
+
+        public QueryResult(IQuery<TResponse> query) {
+            this.query = query;
+        }
+
+        [Import]
+        public IBackend Backend { get; set; }
+        public TResponse Response { get; set; }
+
+        public void Execute(ActionExecutionContext context) {
+            Backend.Send(query, response => {
+                Response = response;
+                Caliburn.Micro.Execute.OnUIThread(() => Completed(this, new ResultCompletionEventArgs()));
+            });
+        }
+
+        public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/SearchGames.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/SearchGames.cs
new file mode 100644
index 0000000..13338ff
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/SearchGames.cs
@@ -0,0 +1,7 @@
+namespace GameLibrary.Model {
+    using System.Collections.Generic;
+
+    public class SearchGames : IQuery<IEnumerable<SearchResult>> {
+        public string SearchText { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/SearchResult.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/SearchResult.cs
new file mode 100644
index 0000000..70c377b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Model/SearchResult.cs
@@ -0,0 +1,8 @@
+namespace GameLibrary.Model {
+    using System;
+
+    public class SearchResult {
+        public Guid Id { get; set; }
+        public string Title { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/AppManifest.xml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/AppManifest.xml
new file mode 100644
index 0000000..6712a11
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7cec5eb
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("GameLibrary")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("GameLibrary")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("633d3f9c-3b5b-406c-bbfe-0ac5e75c72c8")]
+
+// 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 Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/OutOfBrowserSettings.xml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/OutOfBrowserSettings.xml
new file mode 100644
index 0000000..d2c61b2
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Properties/OutOfBrowserSettings.xml
@@ -0,0 +1,10 @@
+<OutOfBrowserSettings ShortName="Game Library" EnableGPUAcceleration="True" ShowInstallMenuItem="True">
+  <OutOfBrowserSettings.Blurb>A library for your games</OutOfBrowserSettings.Blurb>
+  <OutOfBrowserSettings.WindowSettings>
+    <WindowSettings Title="Game Library" Height="800" Width="500" />
+  </OutOfBrowserSettings.WindowSettings>
+  <OutOfBrowserSettings.SecuritySettings>
+    <SecuritySettings ElevatedPermissions="Required" />
+  </OutOfBrowserSettings.SecuritySettings>
+  <OutOfBrowserSettings.Icons />
+</OutOfBrowserSettings>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/Background.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/Background.xaml
new file mode 100644
index 0000000..d90b828
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/Background.xaml
@@ -0,0 +1,69 @@
+<UserControl x:Class="GameLibrary.Resources.Background"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Grid>
+        <Grid.OpacityMask>
+            <RadialGradientBrush RadiusX="1.147"
+                                 RadiusY="1.147"
+                                 GradientOrigin="0.638,0.403"
+                                 Center="0.664,0.33">
+                <RadialGradientBrush.RelativeTransform>
+                    <TransformGroup>
+                        <ScaleTransform CenterX="0.4830000102519989"
+                                        CenterY="0.460999995470047" />
+                        <SkewTransform AngleX="0"
+                                       AngleY="0"
+                                       CenterX="0.4830000102519989"
+                                       CenterY="0.460999995470047" />
+                        <RotateTransform Angle="36.693"
+                                         CenterX="0.4830000102519989"
+                                         CenterY="0.460999995470047" />
+                        <TranslateTransform />
+                    </TransformGroup>
+                </RadialGradientBrush.RelativeTransform>
+                <GradientStop Color="Black" />
+                <GradientStop Color="Transparent"
+                              Offset="0.904" />
+            </RadialGradientBrush>
+        </Grid.OpacityMask>
+        <Grid x:Name="baseBrush">
+            <Grid.Background>
+                <RadialGradientBrush Center="-0.044,1.083"
+                                     GradientOrigin="-0.634,1.596"
+                                     RadiusX="1.192"
+                                     RadiusY="1.192">
+                    <RadialGradientBrush.RelativeTransform>
+                        <TransformGroup>
+                            <ScaleTransform CenterX="0.22599999606609345"
+                                            CenterY="0.71200001239776611" />
+                            <SkewTransform AngleX="0"
+                                           AngleY="0"
+                                           CenterX="0.22599999606609345"
+                                           CenterY="0.71200001239776611" />
+                            <RotateTransform Angle="183.969"
+                                             CenterX="0.22599999606609345"
+                                             CenterY="0.71200001239776611" />
+                            <TranslateTransform Y="0" />
+                        </TransformGroup>
+                    </RadialGradientBrush.RelativeTransform>
+                    <GradientStop Color="Black" />
+                    <GradientStop Color="#FF021B2C"
+                                  Offset="0.682" />
+                    <GradientStop Color="#FF000105"
+                                  Offset="0.079" />
+                </RadialGradientBrush>
+            </Grid.Background>
+        </Grid>
+        <Grid x:Name="overlayBrush">
+            <Grid.Background>
+                <RadialGradientBrush Center="1.482,0.243"
+                                     GradientOrigin="1.482,0.243"
+                                     RadiusX="1.239"
+                                     RadiusY="1.239">
+                    <GradientStop Color="#FFA1501A" />
+                    <GradientStop Offset="1" />
+                </RadialGradientBrush>
+            </Grid.Background>
+        </Grid>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/Background.xaml.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/Background.xaml.cs
new file mode 100644
index 0000000..8a1d38d
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/Background.xaml.cs
@@ -0,0 +1,12 @@
+namespace GameLibrary.Resources
+{
+    using System.Windows.Controls;
+
+    public partial class Background : UserControl
+    {
+        public Background()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ColorsAndBrushes.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ColorsAndBrushes.xaml
new file mode 100644
index 0000000..47a9f4b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ColorsAndBrushes.xaml
@@ -0,0 +1,25 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <SolidColorBrush x:Key="caretBrush" 
+                     Color="Gray" />
+
+    <LinearGradientBrush x:Key="panelBrush"
+                         Opacity=".5"
+                         EndPoint="0.907,0.791"
+                         StartPoint="0.093,0.209">
+        <GradientStop Color="#FF766C5E"
+                      Offset="1" />
+        <GradientStop Color="#FF2F3441" />
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Name="specialBrush"
+                         EndPoint="0.504,0.869"
+                         StartPoint="0.504,0">
+        <GradientStop Color="#FF09D1EE"
+                      Offset="0" />
+        <GradientStop Color="#FF094974"
+                      Offset="1" />
+    </LinearGradientBrush>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/BusyIndicator.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/BusyIndicator.xaml
new file mode 100644
index 0000000..63720f8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/BusyIndicator.xaml
@@ -0,0 +1,116 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:s="clr-namespace:System;assembly=mscorlib"
+                    xmlns:tc="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+
+    <ControlTemplate x:Key="busyIndicator"
+                     TargetType="tc:BusyIndicator">
+        <Grid>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="VisibilityStates">
+                    <VisualState x:Name="Hidden">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                           Duration="00:00:00.001"
+                                                           Storyboard.TargetProperty="(UIElement.Visibility)"
+                                                           Storyboard.TargetName="busycontent">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                           Duration="00:00:00.001"
+                                                           Storyboard.TargetProperty="(UIElement.Visibility)"
+                                                           Storyboard.TargetName="overlay">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Visible">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                           Duration="00:00:00.001"
+                                                           Storyboard.TargetProperty="(UIElement.Visibility)"
+                                                           Storyboard.TargetName="busycontent">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                           Duration="00:00:00.001"
+                                                           Storyboard.TargetProperty="(UIElement.Visibility)"
+                                                           Storyboard.TargetName="overlay">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="BusyStatusStates">
+                    <VisualState x:Name="Idle">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                           Duration="00:00:00.001"
+                                                           Storyboard.TargetProperty="(Control.IsEnabled)"
+                                                           Storyboard.TargetName="content">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <s:Boolean>True</s:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Busy">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00"
+                                                           Duration="00:00:00.001"
+                                                           Storyboard.TargetProperty="(Control.IsEnabled)"
+                                                           Storyboard.TargetName="content">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <s:Boolean>False</s:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <ContentControl x:Name="content"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+            <Rectangle x:Name="overlay"
+                       Fill="Transparent"
+                       Opacity="0" />
+            <ContentPresenter x:Name="busycontent">
+                <Grid HorizontalAlignment="Right"
+                      VerticalAlignment="Top">
+                    <StackPanel Orientation="Horizontal"
+                                Margin="0 16 0 0">
+                        <TextBlock Text="Loading"
+                                   Foreground="White"
+                                   Margin="0 0 4 0" />
+                        <ProgressBar Width="75"
+                                     Style="{TemplateBinding ProgressBarStyle}"
+                                     Foreground="{StaticResource specialBrush}" />
+                    </StackPanel>
+                </Grid>
+            </ContentPresenter>
+        </Grid>
+    </ControlTemplate>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Button.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Button.xaml
new file mode 100644
index 0000000..afd03f7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Button.xaml
@@ -0,0 +1,97 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ControlTemplate x:Key="button"
+                     TargetType="Button">
+        <Grid>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="MouseOver">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Duration="0"
+                                                           Storyboard.TargetProperty="Effect"
+                                                           Storyboard.TargetName="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <DropShadowEffect BlurRadius="10"
+                                                          Color="#FF09D1EE"
+                                                          Opacity=".75"
+                                                          ShadowDepth="0"
+                                                          Direction="0" />
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Pressed">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Duration="0"
+                                                           Storyboard.TargetProperty="Effect"
+                                                           Storyboard.TargetName="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <DropShadowEffect BlurRadius="10"
+                                                          Color="#FF09D1EE"
+                                                          Opacity=".75"
+                                                          ShadowDepth="0"
+                                                          Direction="0" />
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Disabled">
+                        <Storyboard>
+                            <DoubleAnimation Duration="0"
+                                             To=".15"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Storyboard.TargetName="DisabledVisualElement" />
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="FocusStates">
+                    <VisualState x:Name="Focused">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Duration="0"
+                                                           Storyboard.TargetProperty="Effect"
+                                                           Storyboard.TargetName="Background">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <DropShadowEffect BlurRadius="10"
+                                                          Color="#FF09D1EE"
+                                                          Opacity=".75"
+                                                          ShadowDepth="0"
+                                                          Direction="0" />
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Unfocused" />
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border x:Name="Background"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    CornerRadius="16"
+                    MinWidth="75">
+                <ContentPresenter x:Name="contentPresenter"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Content="{TemplateBinding Content}"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  Margin="{TemplateBinding Padding}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </Border>
+
+            <Rectangle x:Name="DisabledVisualElement"
+                       RadiusX="16"
+                       RadiusY="16"
+                       Fill="LightGray"
+                       IsHitTestVisible="false"
+                       Opacity="0" />
+        </Grid>
+    </ControlTemplate>
+
+</ResourceDictionary>
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/HyperlinkButton.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/HyperlinkButton.xaml
new file mode 100644
index 0000000..40facb3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/HyperlinkButton.xaml
@@ -0,0 +1,39 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
+    <ControlTemplate x:Key="hyperlinkButton" 
+                     TargetType="HyperlinkButton">
+        <Grid Background="{TemplateBinding Background}"
+              Cursor="{TemplateBinding Cursor}">
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="MouseOver">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Duration="0"
+                                                           Storyboard.TargetProperty="Effect"
+                                                           Storyboard.TargetName="contentPresenter">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <DropShadowEffect BlurRadius="10"
+                                                          Color="#FF09D1EE"
+                                                          Opacity="1"
+                                                          ShadowDepth="0"
+                                                          Direction="0" />
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <ContentPresenter x:Name="contentPresenter"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              Margin="{TemplateBinding Padding}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+        </Grid>
+    </ControlTemplate>
+    
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Manifest.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Manifest.xaml
new file mode 100644
index 0000000..397e1e3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Manifest.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="BusyIndicator.xaml" />
+        <ResourceDictionary Source="HyperlinkButton.xaml" />
+        <ResourceDictionary Source="TextBox.xaml" />
+        <ResourceDictionary Source="Button.xaml" />
+        <ResourceDictionary Source="Rating.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Rating.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Rating.xaml
new file mode 100644
index 0000000..8e3442a
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/Rating.xaml
@@ -0,0 +1,29 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ti="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Input.Toolkit">
+
+    <ControlTemplate x:Key="rating"
+                     TargetType="ti:Rating">
+        <Grid x:Name="Root">
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="MouseOver" />
+                    <VisualState x:Name="Pressed" />
+                    <VisualState x:Name="Disabled" />
+                    <VisualState x:Name="ReadOnly" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="FocusStates">
+                    <VisualState x:Name="Focused" />
+                    <VisualState x:Name="Unfocused" />
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}">
+                <ItemsPresenter />
+            </Border>
+        </Grid>
+    </ControlTemplate>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/TextBox.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/TextBox.xaml
new file mode 100644
index 0000000..2f0ca5e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/TextBox.xaml
@@ -0,0 +1,147 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:s="clr-namespace:System;assembly=mscorlib">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ValidationToolTip.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <ControlTemplate x:Key="textBox"
+                     TargetType="TextBox">
+        <Grid x:Name="RootElement">
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="FocusStates">
+                    <VisualState x:Name="Focused">
+                        <Storyboard>
+                            <DoubleAnimation Duration="0"
+                                             To="1"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Storyboard.TargetName="FocusVisualElement" />
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Unfocused">
+                        <Storyboard>
+                            <DoubleAnimation Duration="0"
+                                             To="0"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Storyboard.TargetName="FocusVisualElement" />
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="ValidationStates">
+                    <VisualState x:Name="Valid" />
+                    <VisualState x:Name="InvalidUnfocused">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility"
+                                                           Storyboard.TargetName="ValidationErrorElement">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="InvalidFocused">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility"
+                                                           Storyboard.TargetName="ValidationErrorElement">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsOpen"
+                                                           Storyboard.TargetName="validationTooltip">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <s:Boolean>True</s:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border x:Name="Border"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    CornerRadius="3"
+                    Opacity="1">
+                <Grid>
+                    <Border x:Name="ReadOnlyVisualElement"
+                            Background="#5EC9C9C9"
+                            Opacity="0" />
+                    <Border x:Name="MouseOverBorder"
+                            BorderBrush="Transparent"
+                            BorderThickness="1">
+                        <ScrollViewer x:Name="ContentElement"
+                                      BorderThickness="0"
+                                      IsTabStop="False"
+                                      Padding="{TemplateBinding Padding}" />
+                    </Border>
+                </Grid>
+            </Border>
+            <Border x:Name="DisabledVisualElement"
+                    BorderBrush="#A5F7F7F7"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="#A5F7F7F7"
+                    IsHitTestVisible="False"
+                    Opacity="0" />
+            <Border x:Name="FocusVisualElement"
+                    BorderBrush="White"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    IsHitTestVisible="False"
+                    Margin="1"
+                    Opacity="0" />
+            <Border x:Name="ValidationErrorElement"
+                    BorderBrush="#FFDB000C"
+                    BorderThickness="1"
+                    CornerRadius="1"
+                    Visibility="Collapsed">
+                <ToolTipService.ToolTip>
+                    <ToolTip x:Name="validationTooltip"
+                             DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                             Placement="Right"
+                             PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                             Template="{StaticResource ValidationToolTipTemplate}">
+                        <ToolTip.Triggers>
+                            <EventTrigger RoutedEvent="Canvas.Loaded">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsHitTestVisible"
+                                                                       Storyboard.TargetName="validationTooltip">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <s:Boolean>true</s:Boolean>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </EventTrigger>
+                        </ToolTip.Triggers>
+                    </ToolTip>
+                </ToolTipService.ToolTip>
+                <Grid Background="Transparent"
+                      HorizontalAlignment="Right"
+                      Height="12"
+                      Margin="1,-4,-4,0"
+                      VerticalAlignment="Top"
+                      Width="12">
+                    <Path Data="M 1,0 L6,0 A 2,2 90 0 1 8,2 L8,7 z"
+                          Fill="#FFDC000C"
+                          Margin="1,3,0,0" />
+                    <Path Data="M 0,0 L2,0 L 8,6 L8,8"
+                          Fill="#ffffff"
+                          Margin="1,3,0,0" />
+                </Grid>
+            </Border>
+        </Grid>
+    </ControlTemplate>
+
+</ResourceDictionary>
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/ValidationToolTip.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/ValidationToolTip.xaml
new file mode 100644
index 0000000..55cb66e
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/ControlTemplates/ValidationToolTip.xaml
@@ -0,0 +1,71 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ControlTemplate x:Key="ValidationToolTipTemplate">
+        <Grid x:Name="Root"
+              Margin="5,0"
+              Opacity="0"
+              RenderTransformOrigin="0,0">
+            <Grid.RenderTransform>
+                <TranslateTransform x:Name="xform"
+                                    X="-167" 
+                                    Y="4"/>
+            </Grid.RenderTransform>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="OpenStates">
+                    <VisualStateGroup.Transitions>
+                        <VisualTransition GeneratedDuration="0" />
+                        <VisualTransition GeneratedDuration="0:0:0.2"
+                                          To="Open">
+                            <Storyboard>
+                                <DoubleAnimation Duration="0:0:0.2"
+                                                 To="1"
+                                                 Storyboard.TargetProperty="Opacity"
+                                                 Storyboard.TargetName="Root" />
+                            </Storyboard>
+                        </VisualTransition>
+                    </VisualStateGroup.Transitions>
+                    <VisualState x:Name="Closed">
+                        <Storyboard>
+                            <DoubleAnimation Duration="0"
+                                             To="0"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Storyboard.TargetName="Root" />
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Open">
+                        <Storyboard>
+                            <DoubleAnimation Duration="0"
+                                             To="1"
+                                             Storyboard.TargetProperty="Opacity"
+                                             Storyboard.TargetName="Root" />
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border Background="#052A2E31"
+                    CornerRadius="5"
+                    Margin="4,4,-4,-4" />
+            <Border Background="#152A2E31"
+                    CornerRadius="4"
+                    Margin="3,3,-3,-3" />
+            <Border Background="#252A2E31"
+                    CornerRadius="3"
+                    Margin="2,2,-2,-2" />
+            <Border Background="#352A2E31"
+                    CornerRadius="2"
+                    Margin="1,1,-1,-1" />
+            <Border Background="#FFDC000C"
+                    CornerRadius="2" />
+            <Border CornerRadius="2">
+                <TextBlock Foreground="White"
+                           MaxWidth="250"
+                           Margin="8,4,8,4"
+                           TextWrapping="Wrap"
+                           Text="{Binding (Validation.Errors)[0].ErrorContent}"
+                           UseLayoutRounding="false" />
+            </Border>
+        </Grid>
+    </ControlTemplate>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/DefaultStyles.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/DefaultStyles.xaml
new file mode 100644
index 0000000..b570002
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/DefaultStyles.xaml
@@ -0,0 +1,121 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ti="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Input.Toolkit"
+                    xmlns:tc="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit"
+                    xmlns:tl="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ColorsAndBrushes.xaml" />
+        <ResourceDictionary Source="ControlTemplates/Manifest.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style TargetType="TextBlock">
+        <Setter Property="Foreground"
+                Value="White" />
+        <Setter Property="FontSize"
+                Value="20" />
+        <Setter Property="FontFamily"
+                Value="Trebuchet MS" />
+        <Setter Property="TextWrapping"
+                Value="Wrap" />
+    </Style>
+
+    <Style TargetType="tl:TransitioningContentControl">
+        <Setter Property="HorizontalContentAlignment"
+                Value="Stretch" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Stretch" />
+    </Style>
+
+    <Style TargetType="tc:BusyIndicator">
+        <Setter Property="IsTabStop"
+                Value="False" />
+        <Setter Property="DisplayAfter"
+                Value="00:00:00.1" />
+        <Setter Property="HorizontalAlignment"
+                Value="Stretch" />
+        <Setter Property="VerticalAlignment"
+                Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Stretch" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Stretch" />
+        <Setter Property="Template"
+                Value="{StaticResource busyIndicator}" />
+    </Style>
+    
+    <Style TargetType="HyperlinkButton">
+        <Setter Property="Cursor"
+                Value="Hand" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Left" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Top" />
+        <Setter Property="Background"
+                Value="Transparent" />
+        <Setter Property="Template"
+                Value="{StaticResource hyperlinkButton}" />
+    </Style>
+    
+    <Style TargetType="TextBox">
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="Background"
+                Value="Black" />
+        <Setter Property="Foreground"
+                Value="White" />
+        <Setter Property="Padding"
+                Value="2" />
+        <Setter Property="BorderBrush"
+                Value="Gray" />
+        <Setter Property="FontSize"
+                Value="20" />
+        <Setter Property="FontFamily"
+                Value="Trebuchet MS" />
+        <Setter Property="TextWrapping"
+                Value="Wrap" />
+        <Setter Property="Template"
+                Value="{StaticResource textBox}" />
+    </Style>
+
+    <Style TargetType="Button">
+        <Setter Property="Background"
+                Value="Transparent" />
+        <Setter Property="Foreground"
+                Value="Gray" />
+        <Setter Property="Padding"
+                Value="8 3 8 3" />
+        <Setter Property="Margin"
+                Value="8 0 0 0" />
+        <Setter Property="BorderThickness"
+                Value="2" />
+        <Setter Property="BorderBrush"
+                Value="Gray" />
+        <Setter Property="FontSize"
+                Value="20" />
+        <Setter Property="FontFamily"
+                Value="Trebuchet MS" />
+        <Setter Property="Template"
+                Value="{StaticResource button}" />
+    </Style>
+
+    <Style TargetType="ti:Rating">
+        <Setter Property="Background"
+                Value="Transparent" />
+        <Setter Property="Foreground"
+                Value="{StaticResource specialBrush}" />
+        <Setter Property="ItemCount"
+                Value="5" />
+        <Setter Property="SelectionMode"
+                Value="Continuous" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template" 
+                Value="{StaticResource rating}" />
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/NamedStyles.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/NamedStyles.xaml
new file mode 100644
index 0000000..a2558a2
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Resources/NamedStyles.xaml
@@ -0,0 +1,162 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="clr-namespace:Caliburn.ShellFramework.Controls;assembly=Caliburn.ShellFramework" xmlns:tk="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ColorsAndBrushes.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    
+    <Style TargetType="TextBlock"
+           x:Key="header">
+        <Setter Property="Foreground"
+                Value="White" />
+        <Setter Property="FontSize"
+                Value="36" />
+        <Setter Property="FontFamily"
+                Value="Trebuchet MS" />
+        <Setter Property="Effect">
+            <Setter.Value>
+                <DropShadowEffect BlurRadius="10"
+                                  Color="#FF09D1EE"
+                                  Opacity="1"
+                                  ShadowDepth="0"
+                                  Direction="0" />
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="subheader">
+        <Setter Property="Foreground"
+                Value="{StaticResource specialBrush}" />
+        <Setter Property="FontSize"
+                Value="28" />
+        <Setter Property="FontFamily"
+                Value="Trebuchet MS" />
+        <Setter Property="HorizontalAlignment"
+                Value="Right" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="smallEmphasis">
+        <Setter Property="Foreground"
+                Value="White" />
+        <Setter Property="FontSize"
+                Value="18" />
+        <Setter Property="FontFamily"
+                Value="Trebuchet MS" />
+        <Setter Property="TextWrapping"
+                Value="Wrap" />
+        <Setter Property="FontStyle"
+                Value="Italic" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="label">
+        <Setter Property="Foreground"
+                Value="Gray" />
+        <Setter Property="FontSize"
+                Value="16" />
+        <Setter Property="FontFamily"
+                Value="Trebuchet MS" />
+        <Setter Property="Margin"
+                Value="0 16 0 0" />
+    </Style>
+
+    <Style TargetType="Border"
+           x:Key="panel">
+        <Setter Property="Background"
+                Value="{StaticResource panelBrush}" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="CornerRadius"
+                Value="4" />
+        <Setter Property="BorderBrush"
+                Value="Gray" />
+        <Setter Property="Margin"
+                Value="8 20 8 8" />
+        <Setter Property="Padding"
+                Value="12" />
+        <Setter Property="HorizontalAlignment"
+                Value="Stretch" />
+    </Style>
+
+    <Style x:Key="backButton"
+           TargetType="Button">
+        <Setter Property="Content"
+                Value="&lt;" />
+        <Setter Property="Background"
+                Value="Transparent" />
+        <Setter Property="Foreground"
+                Value="{StaticResource specialBrush}" />
+        <Setter Property="Margin"
+                Value="8 0" />
+        <Setter Property="BorderThickness"
+                Value="2" />
+        <Setter Property="FontSize"
+                Value="24" />
+        <Setter Property="FontWeight"
+                Value="Bold" />
+        <Setter Property="FontFamily"
+                Value="Arial Bold" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Duration="0"
+                                                                       Storyboard.TargetProperty="Effect"
+                                                                       Storyboard.TargetName="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <DropShadowEffect BlurRadius="10"
+                                                                      Color="#FF09D1EE"
+                                                                      Opacity=".75"
+                                                                      ShadowDepth="0"
+                                                                      Direction="0" />
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Duration="0"
+                                                                       Storyboard.TargetProperty="Effect"
+                                                                       Storyboard.TargetName="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <DropShadowEffect BlurRadius="10"
+                                                                      Color="#FF09D1EE"
+                                                                      Opacity="1"
+                                                                      ShadowDepth="0"
+                                                                      Direction="0" />
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Grid x:Name="Background">
+                            <Ellipse Fill="{TemplateBinding Background}"
+                                     Stroke="{TemplateBinding Foreground}"
+                                     StrokeThickness="3"
+                                     Width="40"
+                                     Height="40" />
+                            <ContentPresenter x:Name="contentPresenter"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              Content="{TemplateBinding Content}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              Margin="{TemplateBinding Padding}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Grid>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/AddGameViewModel.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/AddGameViewModel.cs
new file mode 100644
index 0000000..46048c7
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/AddGameViewModel.cs
@@ -0,0 +1,88 @@
+namespace GameLibrary.ViewModels {
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.ComponentModel.Composition;
+    using System.ComponentModel.DataAnnotations;
+    using System.Windows;
+    using Caliburn.Micro;
+    using Framework;
+    using Model;
+    using System.Linq;
+
+    [Export(typeof(AddGameViewModel)), PartCreationPolicy(CreationPolicy.NonShared)]
+    public class AddGameViewModel : Screen, IDataErrorInfo {
+        readonly IValidator validator; //NOTE: You could also achieve validation without implementing the IDataErrorInfo interface by using Caliburn's AOP support.
+        string notes;
+        double rating;
+        string title;
+        bool wasSaved;
+
+        [ImportingConstructor]
+        public AddGameViewModel(IValidator validator) {
+            this.validator = validator;
+        }
+
+        [Required]
+        public string Title {
+            get { return title; }
+            set {
+                title = value;
+                NotifyOfPropertyChange(() => Title);
+                NotifyOfPropertyChange(() => CanAddGame);
+            }
+        }
+
+        public string Notes {
+            get { return notes; }
+            set {
+                notes = value;
+                NotifyOfPropertyChange(() => Notes);
+            }
+        }
+
+        public double Rating {
+            get { return rating; }
+            set {
+                rating = value;
+                NotifyOfPropertyChange(() => Rating);
+            }
+        }
+
+        public bool CanAddGame {
+            get { return string.IsNullOrEmpty(Error); }
+        }
+
+        public string this[string columnName] {
+            get { return string.Join(Environment.NewLine, validator.Validate(this, columnName).Select(x => x.Message)); }
+        }
+
+        public string Error {
+            get { return string.Join(Environment.NewLine, validator.Validate(this).Select(x => x.Message)); }
+        }
+
+        public IEnumerable<IResult> AddGame() {
+            var add = new AddGameToLibrary {
+                Title = Title,
+                Notes = Notes,
+                Rating = Rating
+            }.AsResult();
+
+            wasSaved = true;
+
+            yield return add;
+            yield return Show.Child<SearchViewModel>()
+                .In<IShell>();
+        }
+
+        public override void CanClose(Action<bool> callback) {
+            callback(
+                wasSaved || MessageBox.Show(
+                    "Are you sure you want to cancel?  Changes will be lost.",
+                    "Unsaved Changes",
+                    MessageBoxButton.OKCancel
+                    ) == MessageBoxResult.OK
+                );
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ExploreGameViewModel.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ExploreGameViewModel.cs
new file mode 100644
index 0000000..daa5ab9
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ExploreGameViewModel.cs
@@ -0,0 +1,72 @@
+namespace GameLibrary.ViewModels {
+    using System.ComponentModel.Composition;
+    using Caliburn.Micro;
+    using Model;
+
+    [Export(typeof(ExploreGameViewModel))]
+    public class ExploreGameViewModel : Screen {
+        string borrower;
+        GameDTO game;
+
+        public GameDTO Game {
+            get { return game; }
+        }
+
+        public string BorrowedMessage {
+            get { return Game.Title + " is currently checked out to " + Game.Borrower + "."; }
+        }
+
+        public string Borrower {
+            get { return borrower; }
+            set {
+                borrower = value;
+                NotifyOfPropertyChange(() => Borrower);
+                NotifyOfPropertyChange(() => CanCheckOut);
+            }
+        }
+
+        public bool IsCheckedOut {
+            get { return !string.IsNullOrEmpty(game.Borrower); }
+        }
+
+        public bool IsCheckedIn {
+            get { return !IsCheckedOut; }
+        }
+
+        public bool CanCheckOut {
+            get { return !string.IsNullOrEmpty(Borrower); }
+        }
+
+        public void WithGame(GameDTO game) {
+            this.game = game;
+            Borrower = game.Borrower ?? string.Empty;
+            Refresh();
+        }
+
+        public IResult CheckIn() {
+            SetBorrower(null);
+
+            return new CheckGameIn {
+                Id = game.Id
+            }.AsResult();
+        }
+
+        public IResult CheckOut() {
+            SetBorrower(Borrower);
+
+            return new CheckGameOut {
+                Id = game.Id,
+                Borrower = Borrower
+            }.AsResult();
+        }
+
+        void SetBorrower(string borrower) {
+            game.Borrower = borrower;
+            Borrower = borrower;
+
+            NotifyOfPropertyChange(() => IsCheckedOut);
+            NotifyOfPropertyChange(() => IsCheckedIn);
+            NotifyOfPropertyChange(() => BorrowedMessage);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/IndividualResultViewModel.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/IndividualResultViewModel.cs
new file mode 100644
index 0000000..7b77479
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/IndividualResultViewModel.cs
@@ -0,0 +1,37 @@
+namespace GameLibrary.ViewModels {
+    using System.Collections.Generic;
+    using Caliburn.Micro;
+    using Framework;
+    using Model;
+
+    public class IndividualResultViewModel : Screen {
+        readonly int number;
+        readonly SearchResult result;
+
+        public IndividualResultViewModel(SearchResult result, int number) {
+            this.result = result;
+            this.number = number;
+        }
+
+        public int Number {
+            get { return number; }
+        }
+
+        public string Title {
+            get { return result.Title; }
+        }
+
+        public IEnumerable<IResult> Open() {
+            var getGame = new GetGame {
+                Id = result.Id
+            }.AsResult();
+
+            yield return Show.Busy();
+            yield return getGame;
+            yield return Show.Child<ExploreGameViewModel>()
+                .In<IShell>()
+                .Configured(x => x.WithGame(getGame.Response));
+            yield return Show.NotBusy();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/NoResultsViewModel.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/NoResultsViewModel.cs
new file mode 100644
index 0000000..78b178b
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/NoResultsViewModel.cs
@@ -0,0 +1,21 @@
+namespace GameLibrary.ViewModels {
+    using System.ComponentModel.Composition;
+    using Caliburn.Micro;
+    using Framework;
+
+    [Export(typeof(NoResultsViewModel))]
+    public class NoResultsViewModel {
+        string searchText;
+
+        public IResult AddGame() {
+            return Show.Child<AddGameViewModel>()
+                .In<IShell>()
+                .Configured(x => x.Title = searchText);
+        }
+
+        public NoResultsViewModel WithTitle(string searchText) {
+            this.searchText = searchText;
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ResultsViewModel.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ResultsViewModel.cs
new file mode 100644
index 0000000..d21b5af
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ResultsViewModel.cs
@@ -0,0 +1,38 @@
+namespace GameLibrary.ViewModels {
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.ComponentModel.Composition;
+    using Caliburn.Micro;
+    using Model;
+
+    [Export(typeof(ResultsViewModel))]
+    public class ResultsViewModel : Screen {
+        public ResultsViewModel() {
+            Results = new ObservableCollection<IndividualResultViewModel>();
+        }
+
+        public string Message {
+            get {
+                if(Results.Count == 1)
+                    return "1 Match Found";
+                return Results.Count + " Matches Found";
+            }
+        }
+
+        public ObservableCollection<IndividualResultViewModel> Results { get; private set; }
+
+        public ResultsViewModel With(IEnumerable<SearchResult> searchResults) {
+            Results.Clear();
+
+            var number = 1;
+
+            foreach(var result in searchResults) {
+                Results.Add(new IndividualResultViewModel(result, number));
+                number++;
+            }
+
+            NotifyOfPropertyChange(() => Message);
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/SearchViewModel.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/SearchViewModel.cs
new file mode 100644
index 0000000..f0445d6
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/SearchViewModel.cs
@@ -0,0 +1,84 @@
+namespace GameLibrary.ViewModels {
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using System.Linq;
+    using Caliburn.Micro;
+    using Framework;
+    using Model;
+
+    [Export(typeof(SearchViewModel))]
+    public class SearchViewModel : Screen {
+        readonly NoResultsViewModel noResults;
+        readonly ResultsViewModel results;
+
+        object searchResults;
+        string searchText;
+
+        [ImportingConstructor]
+        public SearchViewModel(NoResultsViewModel noResults, ResultsViewModel results) {
+            this.noResults = noResults;
+            this.results = results;
+        }
+
+        public string SearchText {
+            get { return searchText; }
+            set {
+                searchText = value;
+                NotifyOfPropertyChange(() => SearchText);
+                NotifyOfPropertyChange(() => CanExecuteSearch);
+            }
+        }
+
+        public object SearchResults {
+            get { return searchResults; }
+            set {
+                searchResults = value;
+                NotifyOfPropertyChange(() => SearchResults);
+            }
+        }
+
+        public bool CanExecuteSearch {
+            get { return !string.IsNullOrEmpty(SearchText); }
+        }
+
+        public IEnumerable<IResult> ExecuteSearch() {
+            var search = new SearchGames {
+                SearchText = SearchText
+            }.AsResult();
+
+            yield return Show.Busy();
+            yield return search;
+
+            var resultCount = search.Response.Count();
+
+            if(resultCount == 0)
+                SearchResults = noResults.WithTitle(SearchText);
+            else if(resultCount == 1 && search.Response.First().Title == SearchText) {
+                var getGame = new GetGame {
+                    Id = search.Response.First().Id
+                }.AsResult();
+
+                yield return getGame;
+                yield return Show.Child<ExploreGameViewModel>()
+                    .In<IShell>()
+                    .Configured(x => x.WithGame(getGame.Response));
+            }
+            else SearchResults = results.With(search.Response);
+
+            yield return Show.NotBusy();
+        }
+
+        public IResult AddGame() {
+            return Show.Child<AddGameViewModel>()
+                .In<IShell>()
+                .Configured(x => x.Title = "New Game");
+        }
+
+        protected override void OnActivate() {
+            SearchText = null;
+            SearchResults = null;
+
+            base.OnActivate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ShellViewModel.cs b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ShellViewModel.cs
new file mode 100644
index 0000000..921fac3
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/ViewModels/ShellViewModel.cs
@@ -0,0 +1,25 @@
+namespace GameLibrary.ViewModels {
+    using System.Collections.Generic;
+    using System.ComponentModel.Composition;
+    using Caliburn.Micro;
+    using Framework;
+
+    [Export(typeof(IShell))]
+    public class ShellViewModel : Conductor<IScreen>, IShell {
+        readonly SearchViewModel firstScreen;
+
+        [ImportingConstructor]
+        public ShellViewModel(SearchViewModel firstScreen) {
+            this.firstScreen = firstScreen;
+        }
+
+        public void Back() {
+            ActivateItem(firstScreen);
+        }
+
+        protected override void OnInitialize() {
+            ActivateItem(firstScreen);
+            base.OnInitialize();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/AddGameView.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/AddGameView.xaml
new file mode 100644
index 0000000..0e9c176
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/AddGameView.xaml
@@ -0,0 +1,34 @@
+<UserControl x:Class="GameLibrary.Views.AddGameView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ti="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Input.Toolkit">
+
+    <StackPanel>
+        <TextBlock Style="{StaticResource label}"
+                   Text="Title:" />
+        <TextBox x:Name="Title">
+            <TextBox.CaretBrush>
+                <SolidColorBrush Color="Gray" />
+            </TextBox.CaretBrush>
+        </TextBox>
+
+        <TextBlock Style="{StaticResource label}"
+                   Text="Rating:" />
+        <ti:Rating x:Name="Rating"/>
+
+        <TextBlock Style="{StaticResource label}"
+                   Text="Notes:"/>
+        <TextBox x:Name="Notes"
+                 Height="120">
+            <TextBox.CaretBrush>
+                <SolidColorBrush Color="Gray" />
+            </TextBox.CaretBrush>
+        </TextBox>
+
+        <Button x:Name="AddGame"
+                Content="Add"
+                HorizontalAlignment="Right"
+                Margin="0 12 0 0" />
+    </StackPanel>
+    
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ExploreGameView.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ExploreGameView.xaml
new file mode 100644
index 0000000..158e285
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ExploreGameView.xaml
@@ -0,0 +1,37 @@
+<UserControl x:Class="GameLibrary.Views.ExploreGameView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel>
+        <ContentControl x:Name="Game" 
+                        HorizontalContentAlignment="Stretch"/>
+
+        <Border x:Name="IsCheckedOut"
+                Margin="0 42 0 0">
+            <StackPanel>
+                <TextBlock x:Name="BorrowedMessage"/>
+                <Button x:Name="CheckIn"
+                        Content="Check In"
+                        Margin="0 12 0 0"
+                        HorizontalAlignment="Right" />
+            </StackPanel>
+        </Border>
+
+        <Border x:Name="IsCheckedIn">
+            <StackPanel>
+                <TextBlock Text="Borrower:"
+                           Style="{StaticResource label}" />
+                <TextBox x:Name="Borrower">
+                    <TextBox.CaretBrush>
+                        <SolidColorBrush Color="Gray" />
+                    </TextBox.CaretBrush>
+                </TextBox>
+                
+                <Button x:Name="CheckOut"
+                        Content="Check Out"
+                        Margin="0 12 0 0"
+                        HorizontalAlignment="Right" />
+            </StackPanel>
+        </Border>
+        
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/GameDTO.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/GameDTO.xaml
new file mode 100644
index 0000000..898af95
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/GameDTO.xaml
@@ -0,0 +1,30 @@
+<UserControl x:Class="GameLibrary.Views.GameDTO"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ti="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Input.Toolkit">
+    <StackPanel HorizontalAlignment="Stretch">
+        <StackPanel HorizontalAlignment="Right">
+            <TextBlock x:Name="Title"
+                       Style="{StaticResource subheader}"/>
+            <StackPanel Orientation="Horizontal"
+                        HorizontalAlignment="Right">
+                <TextBlock Text="Added on "
+                           Style="{StaticResource smallEmphasis}"/>
+                <TextBlock x:Name="AddedOn"
+                           Style="{StaticResource smallEmphasis}"/>
+            </StackPanel>
+        </StackPanel>
+        
+        <TextBlock Style="{StaticResource label}"
+                   Text="Rating:" />
+        <ti:Rating x:Name="Rating"
+                   IsReadOnly="True" />
+
+        <TextBlock Style="{StaticResource label}"
+                   Text="Notes:" />
+        <Border Style="{StaticResource panel}"
+                Margin="0 2 0 0">
+            <TextBlock x:Name="Notes" />
+        </Border>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/IndividualResultView.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/IndividualResultView.xaml
new file mode 100644
index 0000000..f1e5d0f
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/IndividualResultView.xaml
@@ -0,0 +1,15 @@
+<UserControl x:Class="GameLibrary.Views.IndividualResultView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
+    <StackPanel Orientation="Horizontal">
+        <TextBlock x:Name="Number"
+                   FontWeight="Bold" />
+        <TextBlock Text=". " />
+        <HyperlinkButton x:Name="Open">
+            <TextBlock x:Name="Title"
+                       Foreground="White" />
+        </HyperlinkButton>
+    </StackPanel>
+    
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/NoResultsView.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/NoResultsView.xaml
new file mode 100644
index 0000000..6d0f231
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/NoResultsView.xaml
@@ -0,0 +1,19 @@
+<UserControl x:Class="GameLibrary.Views.NoResultsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Border Margin="8 20 8 8"
+            HorizontalAlignment="Center">
+        <StackPanel>
+            <TextBlock Text="No results were found for that search text." />
+            <StackPanel Orientation="Horizontal"
+                        HorizontalAlignment="Center">
+                <TextBlock Text=" Would you like to " />
+                <HyperlinkButton x:Name="AddGame">
+                    <TextBlock Text="Create a New Game"
+                               TextDecorations="Underline" />
+                </HyperlinkButton>
+                <TextBlock Text="?" />
+            </StackPanel>
+        </StackPanel>
+    </Border>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ResultsView.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ResultsView.xaml
new file mode 100644
index 0000000..cab4f67
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ResultsView.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="GameLibrary.Views.ResultsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:tk="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+    <Border Style="{StaticResource panel}"
+            VerticalAlignment="Top">
+        <tk:DockPanel>
+            <TextBlock x:Name="Message"
+                       tk:DockPanel.Dock="Top"
+                       Style="{StaticResource smallEmphasis}"
+                       HorizontalAlignment="Center"
+                       Margin="0 0 0 20" />
+            
+            <ItemsControl x:Name="Results" />
+        </tk:DockPanel>
+    </Border>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/SearchView.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/SearchView.xaml
new file mode 100644
index 0000000..7b0a9bb
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/SearchView.xaml
@@ -0,0 +1,28 @@
+<UserControl x:Class="GameLibrary.Views.SearchView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:tl="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit"
+             xmlns:tc="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit">
+    <tc:DockPanel>
+        <Border tc:DockPanel.Dock="Top"
+                HorizontalAlignment="Center">
+            <StackPanel Orientation="Horizontal">
+                <TextBox x:Name="SearchText"
+                         Width="225">
+                    <TextBox.CaretBrush>
+                        <SolidColorBrush Color="Gray" />
+                    </TextBox.CaretBrush>
+                </TextBox>
+                <Button x:Name="ExecuteSearch"
+                        Content="Go" />
+            </StackPanel>
+        </Border>
+        
+        <Button x:Name="AddGame"
+                tc:DockPanel.Dock="Bottom"
+                Content="Add Game"
+                HorizontalAlignment="Center" />
+        
+        <tl:TransitioningContentControl x:Name="SearchResults" />
+    </tc:DockPanel>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ShellView.xaml b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ShellView.xaml
new file mode 100644
index 0000000..09be9c8
--- /dev/null
+++ b/code/Caliburn.Micro/samples/GameLibrary/GameLibrary/Views/ShellView.xaml
@@ -0,0 +1,26 @@
+<UserControl x:Class="GameLibrary.Views.ShellView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:tc="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Toolkit"
+             xmlns:tl="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit"
+             xmlns:Resources="clr-namespace:GameLibrary.Resources">
+	<tc:BusyIndicator>
+		<tc:DockPanel Background="Black">
+			<Border tc:DockPanel.Dock="Top"
+			        Padding="4">
+				<StackPanel Orientation="Horizontal">
+					<Button x:Name="Back"
+					        Style="{StaticResource backButton}" />
+					<TextBlock Text="My Games"
+					           Style="{StaticResource header}" />
+				</StackPanel>
+			</Border>
+			<Grid>
+				<Resources:Background />
+				<tl:TransitioningContentControl x:Name="ActiveItem"
+				                                Transition="UpTransition"
+				                                Margin="40" />
+			</Grid>
+		</tc:DockPanel>
+	</tc:BusyIndicator>
+</UserControl>
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Action.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Action.cs
index 31a6f94..117ca82 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Action.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Action.cs
@@ -1,119 +1,157 @@
 namespace Caliburn.Micro
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
     using System.Windows;
+    using System.Reflection;
 
-    /// <summary>
-    /// A host for action related attached properties.
-    /// </summary>
-    public static class Action
-    {
-        static readonly ILog Log = LogManager.GetLog(typeof(Action));
-
-        /// <summary>
-        /// A property definition representing the target of an <see cref="ActionMessage"/>.  
-        /// The DataContext of the element will be set to this instance.
-        /// </summary>
-        public static readonly DependencyProperty TargetProperty =
-            DependencyProperty.RegisterAttached(
-                "Target",
-                typeof(object),
-                typeof(Action),
-                new PropertyMetadata(OnTargetChanged)
-                );
-
-        /// <summary>
-        /// A property definition representing the target of an <see cref="ActionMessage"/>.  
-        /// The DataContext of the element is not set to this instance.
-        /// </summary>
-        public static readonly DependencyProperty TargetWithoutContextProperty =
-            DependencyProperty.RegisterAttached(
-                "TargetWithoutContext",
-                typeof(object),
-                typeof(Action),
-                new PropertyMetadata(OnTargetWithoutContextChanged)
-                );
-
-        /// <summary>
-        /// Sets the target of the <see cref="ActionMessage"/>.
-        /// </summary>
-        /// <param name="d">The element to attach the target to.</param>
-        /// <param name="target">The target for instances of <see cref="ActionMessage"/>.</param>
-        public static void SetTarget(DependencyObject d, object target)
-        {
-            d.SetValue(TargetProperty, target);
-        }
+	/// <summary>
+	/// A host for action related attached properties.
+	/// </summary>
+	public static class Action
+	{
+		static readonly ILog Log = LogManager.GetLog(typeof(Action));
 
-        /// <summary>
-        /// Gets the target for instances of <see cref="ActionMessage"/>.
-        /// </summary>
-        /// <param name="d">The element to which the target is attached.</param>
-        /// <returns>The target for instances of <see cref="ActionMessage"/></returns>
-        public static object GetTarget(DependencyObject d)
-        {
-            return d.GetValue(TargetProperty);
-        }
+		/// <summary>
+		/// A property definition representing the target of an <see cref="ActionMessage"/>.  
+		/// The DataContext of the element will be set to this instance.
+		/// </summary>
+		public static readonly DependencyProperty TargetProperty =
+			DependencyProperty.RegisterAttached(
+				"Target",
+				typeof(object),
+				typeof(Action),
+				new PropertyMetadata(OnTargetChanged)
+				);
 
-        /// <summary>
-        /// Sets the target of the <see cref="ActionMessage"/>.
-        /// </summary>
-        /// <param name="d">The element to attach the target to.</param>
-        /// <param name="target">The target for instances of <see cref="ActionMessage"/>.</param>
-        /// <remarks>The DataContext will not be set.</remarks>
-        public static void SetTargetWithoutContext(DependencyObject d, object target)
-        {
-            d.SetValue(TargetWithoutContextProperty, target);
-        }
+		/// <summary>
+		/// A property definition representing the target of an <see cref="ActionMessage"/>.  
+		/// The DataContext of the element is not set to this instance.
+		/// </summary>
+		public static readonly DependencyProperty TargetWithoutContextProperty =
+			DependencyProperty.RegisterAttached(
+				"TargetWithoutContext",
+				typeof(object),
+				typeof(Action),
+				new PropertyMetadata(OnTargetWithoutContextChanged)
+				);
 
-        /// <summary>
-        /// Gets the target for instances of <see cref="ActionMessage"/>.
-        /// </summary>
-        /// <param name="d">The element to which the target is attached.</param>
-        /// <returns>The target for instances of <see cref="ActionMessage"/></returns>
-        public static object GetTargetWithoutContext(DependencyObject d)
-        {
-            return d.GetValue(TargetWithoutContextProperty);
-        }
+		/// <summary>
+		/// Sets the target of the <see cref="ActionMessage"/>.
+		/// </summary>
+		/// <param name="d">The element to attach the target to.</param>
+		/// <param name="target">The target for instances of <see cref="ActionMessage"/>.</param>
+		public static void SetTarget(DependencyObject d, object target)
+		{
+			d.SetValue(TargetProperty, target);
+		}
 
-        ///<summary>
-        /// Checks if the <see cref="ActionMessage"/>-Target was set.
-        ///</summary>
-        ///<param name="element">DependencyObject to check</param>
-        ///<returns>True if Target or TargetWithoutContext was set on <paramref name="element"/></returns>
-        public static bool HasTargetSet(DependencyObject element)
-        {
-            return (element.ReadLocalValue(TargetProperty) != DependencyProperty.UnsetValue)
-              || (element.ReadLocalValue(TargetWithoutContextProperty) != DependencyProperty.UnsetValue);
-        }
+		/// <summary>
+		/// Gets the target for instances of <see cref="ActionMessage"/>.
+		/// </summary>
+		/// <param name="d">The element to which the target is attached.</param>
+		/// <returns>The target for instances of <see cref="ActionMessage"/></returns>
+		public static object GetTarget(DependencyObject d)
+		{
+			return d.GetValue(TargetProperty);
+		}
 
-        private static void OnTargetWithoutContextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            SetTargetCore(e, d, false);
-        }
+		/// <summary>
+		/// Sets the target of the <see cref="ActionMessage"/>.
+		/// </summary>
+		/// <param name="d">The element to attach the target to.</param>
+		/// <param name="target">The target for instances of <see cref="ActionMessage"/>.</param>
+		/// <remarks>The DataContext will not be set.</remarks>
+		public static void SetTargetWithoutContext(DependencyObject d, object target)
+		{
+			d.SetValue(TargetWithoutContextProperty, target);
+		}
 
-        private static void OnTargetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            SetTargetCore(e, d, true);
-        }
+		/// <summary>
+		/// Gets the target for instances of <see cref="ActionMessage"/>.
+		/// </summary>
+		/// <param name="d">The element to which the target is attached.</param>
+		/// <returns>The target for instances of <see cref="ActionMessage"/></returns>
+		public static object GetTargetWithoutContext(DependencyObject d)
+		{
+			return d.GetValue(TargetWithoutContextProperty);
+		}
 
-        private static void SetTargetCore(DependencyPropertyChangedEventArgs e, DependencyObject d, bool setContext)
-        {
-            if (Bootstrapper.IsInDesignMode || e.NewValue == e.OldValue || e.NewValue == null)
-                return;
+		///<summary>
+		/// Checks if the <see cref="ActionMessage"/>-Target was set.
+		///</summary>
+		///<param name="element">DependencyObject to check</param>
+		///<returns>True if Target or TargetWithoutContext was set on <paramref name="element"/></returns>
+        public static bool HasTargetSet(DependencyObject element) {
+		    if(GetTarget(element) != null || GetTargetWithoutContext(element) != null)
+		        return true;
 
-            var target = e.NewValue;
-            var containerKey = e.NewValue as string;
+		    var frameworkElement = element as FrameworkElement;
+		    if(frameworkElement == null)
+		        return false;
 
-            if (containerKey != null)
-                target = IoC.GetInstance(null, containerKey);
+		    return ConventionManager.HasBinding(frameworkElement, TargetProperty)
+		           || ConventionManager.HasBinding(frameworkElement, TargetWithoutContextProperty);
+		}
 
-            if (setContext && d is FrameworkElement)
-            {
-                Log.Info("Setting DC of {0} to {1}.", d, target);
-                ((FrameworkElement)d).DataContext = target;
+	    ///<summary>
+        /// Uses the action pipeline to invoke the method.
+        ///</summary>
+        ///<param name="target">The object instance to invoke the method on.</param>
+        ///<param name="methodName">The name of the method to invoke.</param>
+        ///<param name="view">The view.</param>
+        ///<param name="source">The source of the invocation.</param>
+        ///<param name="eventArgs">The event args.</param>
+        ///<param name="parameters">The method parameters.</param>
+        public static void Invoke(object target, string methodName, DependencyObject view = null, FrameworkElement source = null, object eventArgs = null, object[] parameters = null) {
+            var context = new ActionExecutionContext {
+                Target = target,
+                Method = target.GetType().GetMethod(methodName),
+                Message = new ActionMessage {
+                    MethodName = methodName
+                },
+                View = view,
+                Source = source,
+                EventArgs = eventArgs
+            };
+
+            if(parameters != null) {
+                parameters.Apply(x => context.Message.Parameters.Add(x as Parameter ?? new Parameter { Value = x }));
             }
 
-            Log.Info("Attaching message handler {0} to {1}.", target, d);
-            Message.SetHandler(d, target);
+            ActionMessage.InvokeAction(context);
         }
-    }
+
+	    private static void OnTargetWithoutContextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			SetTargetCore(e, d, false);
+		}
+
+		private static void OnTargetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			SetTargetCore(e, d, true);
+		}
+
+		private static void SetTargetCore(DependencyPropertyChangedEventArgs e, DependencyObject d, bool setContext)
+		{
+			if (Bootstrapper.IsInDesignMode || e.NewValue == e.OldValue || e.NewValue == null)
+				return;
+
+			var target = e.NewValue;
+			var containerKey = e.NewValue as string;
+
+			if (containerKey != null)
+				target = IoC.GetInstance(null, containerKey);
+
+			if (setContext && d is FrameworkElement)
+			{
+				Log.Info("Setting DC of {0} to {1}.", d, target);
+				((FrameworkElement)d).DataContext = target;
+			}
+
+			Log.Info("Attaching message handler {0} to {1}.", target, d);
+			Message.SetHandler(d, target);
+		}
+	}
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ActionExecutionContext.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ActionExecutionContext.cs
index 52f632a..10fec42 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ActionExecutionContext.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ActionExecutionContext.cs
@@ -1,5 +1,4 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Collections.Generic;
     using System.Reflection;
@@ -8,26 +7,44 @@
     /// <summary>
     /// The context used during the execution of an Action or its guard.
     /// </summary>
-    public class ActionExecutionContext
-    {
-        Dictionary<string, object> values;
+    public class ActionExecutionContext : IDisposable {
+        /// <summary>
+        /// Determines whether the action can execute.
+        /// </summary>
+        /// <remarks>Returns true if the action can execute, false otherwise.</remarks>
+        public Func<bool> CanExecute;
+
+        /// <summary>
+        /// Any event arguments associated with the action's invocation.
+        /// </summary>
+        public object EventArgs;
+
+        /// <summary>
+        /// The actual method info to be invoked.
+        /// </summary>
+        public MethodInfo Method;
+
+        WeakReference message;
+        WeakReference source;
         WeakReference target;
         WeakReference view;
+        Dictionary<string, object> values;
 
         /// <summary>
         /// The message being executed.
         /// </summary>
-        public ActionMessage Message;
+        public ActionMessage Message {
+            get { return message == null ? null : message.Target as ActionMessage; }
+            set { message = new WeakReference(value); }
+        }
 
         /// <summary>
         /// The source from which the message originates.
         /// </summary>
-        public FrameworkElement Source;
-
-        /// <summary>
-        /// Any event arguments associated with the action's invocation.
-        /// </summary>
-        public object EventArgs;
+        public FrameworkElement Source {
+            get { return source == null ? null : source.Target as FrameworkElement; }
+            set { source = new WeakReference(value); }
+        }
 
         /// <summary>
         /// The instance on which the action is invoked.
@@ -45,38 +62,39 @@ public class ActionExecutionContext
             set { view = new WeakReference(value); }
         }
 
-        /// <summary>
-        /// The actual method info to be invoked.
-        /// </summary>
-        public MethodInfo Method;
-
-        /// <summary>
-        /// Determines whether the action can execute.
-        /// </summary>
-        /// <remarks>Returns true if the action can execute, false otherwise.</remarks>
-        public Func<bool> CanExecute;
-
         /// <summary>
         /// Gets or sets additional data needed to invoke the action.
         /// </summary>
         /// <param name="key">The data key.</param>
         /// <returns>Custom data associated with the context.</returns>
-        public object this[string key]
-        {
-            get
-            {
+        public object this[string key] {
+            get {
                 if(values == null)
                     values = new Dictionary<string, object>();
 
-                return values[key];
+                object result;
+                values.TryGetValue(key, out result);
+
+                return result;
             }
-            set
-            {
+            set {
                 if(values == null)
                     values = new Dictionary<string, object>();
 
                 values[key] = value;
             }
         }
+        
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose() {
+            Disposing(this, System.EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Called when the execution context is disposed
+        /// </summary>
+        public event EventHandler Disposing = delegate { };
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ActionMessage.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ActionMessage.cs
index 166d23a..3263ca3 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ActionMessage.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ActionMessage.cs
@@ -13,15 +13,16 @@ namespace Caliburn.Micro
     using System.Windows.Interactivity;
     using System.Windows.Markup;
     using System.Windows.Media;
+    using EventTrigger = System.Windows.Interactivity.EventTrigger;
 
     /// <summary>
     /// Used to send a message from the UI to a presentation model class, indicating that a particular Action should be invoked.
     /// </summary>
-    [DefaultTrigger(typeof(FrameworkElement), typeof(System.Windows.Interactivity.EventTrigger), "MouseLeftButtonDown")]
-    [DefaultTrigger(typeof(ButtonBase), typeof(System.Windows.Interactivity.EventTrigger), "Click")] 
+    [DefaultTrigger(typeof(FrameworkElement), typeof(EventTrigger), "MouseLeftButtonDown")]
+    [DefaultTrigger(typeof(ButtonBase), typeof(EventTrigger), "Click")] 
     [ContentProperty("Parameters")]
     [TypeConstraint(typeof(FrameworkElement))]
-    public class ActionMessage : TriggerAction<FrameworkElement>
+    public class ActionMessage : TriggerAction<FrameworkElement>, IHaveParameters
     {
         static readonly ILog Log = LogManager.GetLog(typeof(ActionMessage));
 
@@ -32,6 +33,18 @@ public class ActionMessage : TriggerAction<FrameworkElement>
             new PropertyMetadata(HandlerPropertyChanged)
             );
 
+        ///<summary>
+        /// Causes the action invocation to "double check" if the action should be invoked by executing the guard immediately before hand.
+        ///</summary>
+        /// <remarks>This is disabled by default. If multiple actions are attached to the same element, you may want to enable this so that each individaul action checks its guard regardless of how the UI state appears.</remarks>
+        public static bool EnforceGuardsDuringInvocation = false;
+
+        ///<summary>
+        /// Causes the action to throw if it cannot locate the target or the method at invocation time.
+        ///</summary>
+        /// <remarks>True by default.</remarks>
+        public static bool ThrowsExceptions = true;
+
         /// <summary>
         /// Represents the method name of an action message.
         /// </summary>
@@ -95,6 +108,9 @@ public AttachedCollection<Parameter> Parameters
         /// </summary>
         public event EventHandler Detaching = delegate { };
 
+        /// <summary>
+        /// Called after the action is attached to an AssociatedObject.
+        /// </summary>
         protected override void OnAttached()
         {
             if (!Bootstrapper.IsInDesignMode)
@@ -102,9 +118,12 @@ protected override void OnAttached()
                 Parameters.Attach(AssociatedObject);
                 Parameters.Apply(x => x.MakeAwareOf(this));
 
-                if((bool)AssociatedObject.GetValue(View.IsLoadedProperty))
-                    ElementLoaded(null, null);
-                else AssociatedObject.Loaded += ElementLoaded;
+                if(View.ExecuteOnLoad(AssociatedObject, ElementLoaded)) {
+                    var trigger = Interaction.GetTriggers(AssociatedObject)
+                        .FirstOrDefault(t => t.Actions.Contains(this)) as EventTrigger;
+                    if(trigger != null && trigger.EventName == "Loaded")
+                        Invoke(new RoutedEventArgs());
+                }
             }
 
             base.OnAttached();
@@ -115,6 +134,9 @@ static void HandlerPropertyChanged(DependencyObject d, DependencyPropertyChanged
             ((ActionMessage)d).UpdateContext();
         }
 
+        /// <summary>
+        /// Called when the action is being detached from its AssociatedObject, but before it has actually occurred.
+        /// </summary>
         protected override void OnDetaching()
         {
             if (!Bootstrapper.IsInDesignMode)
@@ -162,6 +184,9 @@ void ElementLoaded(object sender, RoutedEventArgs e)
 
         void UpdateContext()
         {
+            if (context != null)
+                context.Dispose();
+
             context = new ActionExecutionContext {
                 Message = this, 
                 Source = AssociatedObject
@@ -171,15 +196,25 @@ void UpdateContext()
             UpdateAvailabilityCore();
         }
 
+        /// <summary>
+        /// Invokes the action.
+        /// </summary>
+        /// <param name="eventArgs">The parameter to the action. If the action does not require a parameter, the parameter may be set to a null reference.</param>
         protected override void Invoke(object eventArgs) {
             Log.Info("Invoking {0}.", this);
 
+            if(context == null)
+                UpdateContext();
+
             if(context.Target == null || context.View == null) {
                 PrepareContext(context);
                 if (context.Target == null)
                 {
                     var ex = new Exception(string.Format("No target found for method {0}.", context.Message.MethodName));
                     Log.Error(ex);
+
+                    if (!ThrowsExceptions)
+                        return;
                     throw ex;
                 }
                 if (!UpdateAvailabilityCore())
@@ -188,14 +223,21 @@ void UpdateContext()
 
             if (context.Method == null)
             {
-                var ex = new Exception(string.Format("Method {0} not found on target of type {1}.",
-                    context.Message.MethodName, context.Target.GetType()));
+                var ex = new Exception(string.Format("Method {0} not found on target of type {1}.", context.Message.MethodName, context.Target.GetType()));
                 Log.Error(ex);
+
+                if (!ThrowsExceptions)
+                    return;
                 throw ex;
             }
 
             context.EventArgs = eventArgs;
+
+            if (EnforceGuardsDuringInvocation && context.CanExecute != null && !context.CanExecute())
+                return;
+
             InvokeAction(context);
+            context.EventArgs = null;
         }
 
         /// <summary>
@@ -235,13 +277,15 @@ public override string ToString()
             var values = MessageBinder.DetermineParameters(context, context.Method.GetParameters());
             var returnValue = context.Method.Invoke(context.Target, values);
 
-            if (returnValue is IResult)
-                returnValue = new[] { returnValue as IResult };
+            var result = returnValue as IResult;
+            if (result != null)
+                returnValue = new[] { result };
 
-            if (returnValue is IEnumerable<IResult>)
-                Coroutine.Execute(((IEnumerable<IResult>)returnValue).GetEnumerator(), context);
+            var enumerable = returnValue as IEnumerable<IResult>;
+            if(enumerable != null)
+                Coroutine.BeginExecute(enumerable.GetEnumerator(), context);
             else if (returnValue is IEnumerator<IResult>)
-                Coroutine.Execute(((IEnumerator<IResult>)returnValue), context);
+                Coroutine.BeginExecute((IEnumerator<IResult>)returnValue, context);
         };
 
         /// <summary>
@@ -270,8 +314,12 @@ public override string ToString()
 
 #if SILVERLIGHT
             var source = (Control)context.Source;
+            if (ConventionManager.HasBinding(source, Control.IsEnabledProperty))
+                return source.IsEnabled;
 #else
             var source = context.Source;
+            if (ConventionManager.HasBinding(source, UIElement.IsEnabledProperty))
+                return source.IsEnabled;
 #endif
             if (context.CanExecute != null) 
                 source.IsEnabled = context.CanExecute();
@@ -342,7 +390,7 @@ public override string ToString()
 
             var guardName = "Can" + context.Method.Name;
             var targetType = context.Target.GetType();
-            var guard = targetType.GetMethod(guardName);
+            var guard = TryFindGuardMethod(context);
 
             if(guard == null)
             {
@@ -354,12 +402,19 @@ public override string ToString()
                 if(guard == null)
                     return;
 
-                PropertyChangedEventHandler handler = (s, e) =>{
-                    if(string.IsNullOrEmpty(e.PropertyName) || e.PropertyName == guardName)
+                PropertyChangedEventHandler handler = null;
+                handler = (s, e) => {
+                    if(string.IsNullOrEmpty(e.PropertyName) || e.PropertyName == guardName) {
+                        if(context.Message == null) {
+                            inpc.PropertyChanged -= handler;
+                            return;
+                        }
                         context.Message.UpdateAvailability();
+                    }
                 };
 
                 inpc.PropertyChanged += handler;
+                context.Disposing += delegate { inpc.PropertyChanged -= handler; };
                 context.Message.Detaching += delegate { inpc.PropertyChanged -= handler; };
             }
 
@@ -368,5 +423,37 @@ public override string ToString()
                 MessageBinder.DetermineParameters(context, guard.GetParameters())
                 );
         };
+
+		/// <summary>
+		/// Try to find a candidate for guard function, having:
+		///		- a name in the form "CanXXX"
+		///		- no generic parameters
+		///		- a bool return type
+		///		- no parameters or a set of parameters corresponding to the action method
+		/// </summary>
+		/// <param name="context">The execution context</param>
+		/// <returns>A MethodInfo, if found; null otherwise</returns>
+		private static MethodInfo TryFindGuardMethod(ActionExecutionContext context) {
+			var guardName = "Can" + context.Method.Name;
+            var targetType = context.Target.GetType();
+            var guard = targetType.GetMethod(guardName);
+
+			if (guard ==null) return null;
+			if (guard.ContainsGenericParameters) return null;
+			if (!typeof(bool).Equals(guard.ReturnType)) return null;
+
+			var guardPars = guard.GetParameters();
+			var actionPars = context.Method.GetParameters();
+			if (guardPars.Length == 0) return guard;
+			if (guardPars.Length != actionPars.Length) return null;
+
+			var comparisons = guardPars.Zip(
+					context.Method.GetParameters(),
+					(x, y) => x.ParameterType.Equals(y.ParameterType)
+				);
+			if (comparisons.Any(x => !x)) return null;
+
+			return guard;
+		}
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Bind.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Bind.cs
index a109465..d080c31 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Bind.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Bind.cs
@@ -47,20 +47,21 @@ static void ModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs
             if (fe == null)
                 return;
 
-            RoutedEventHandler handler = null;
-            handler = delegate{
+            View.ExecuteOnLoad(fe, delegate {
                 var target = e.NewValue;
                 var containerKey = e.NewValue as string;
 
-                if (containerKey != null)
+                if(containerKey != null)
                     target = IoC.GetInstance(null, containerKey);
 
-                d.SetValue(View.IsLoadedProperty, true);
-                ViewModelBinder.Bind(target, d, null);
-                fe.Loaded -= handler;
-            };
+                d.SetValue(View.IsScopeRootProperty, true);
 
-            fe.Loaded += handler;
+                string context = string.IsNullOrEmpty(fe.Name)
+                    ? fe.GetHashCode().ToString()
+                    : fe.Name;
+
+                ViewModelBinder.Bind(target, d, context);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/BindableCollection.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/BindableCollection.cs
index a6bf1c0..9e05687 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/BindableCollection.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/BindableCollection.cs
@@ -17,6 +17,12 @@ public interface IObservableCollection<T> : IList<T>, INotifyPropertyChangedEx,
         /// </summary>
         /// <param name="items">The items.</param>
         void AddRange(IEnumerable<T> items);
+
+        /// <summary>
+        /// Removes the range.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        void RemoveRange(IEnumerable<T> items);
     }
 
     /// <summary>
@@ -75,7 +81,7 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// </summary>
         /// <param name="index">The index to insert at.</param>
         /// <param name="item">The item to be inserted.</param>
-        protected override void InsertItem(int index, T item) {
+        protected sealed override void InsertItem(int index, T item) {
             Execute.OnUIThread(() => InsertItemBase(index, item));
         }
 
@@ -85,7 +91,7 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// <param name="index">The index.</param>
         /// <param name="item">The item.</param>
         /// <remarks>Used to avoid compiler warning regarding unverifiable code.</remarks>
-        void InsertItemBase(int index, T item) {
+        protected virtual void InsertItemBase(int index, T item) {
             base.InsertItem(index, item);
         }
 
@@ -95,7 +101,7 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// </summary>
         /// <param name="oldIndex">The old position of the item.</param>
         /// <param name="newIndex">The new position of the item.</param>
-        protected override void MoveItem(int oldIndex, int newIndex) {
+        protected sealed override void MoveItem(int oldIndex, int newIndex) {
             Execute.OnUIThread(() => MoveItemBase(oldIndex, newIndex));
         }
 
@@ -105,7 +111,7 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// <param name="oldIndex">The old index.</param>
         /// <param name="newIndex">The new index.</param>
         /// <remarks>Used to avoid compiler warning regarding unverificable code.</remarks>
-        private void MoveItemBase(int oldIndex, int newIndex) {
+        protected virtual void MoveItemBase(int oldIndex, int newIndex) {
             base.MoveItem(oldIndex, newIndex);
         }
 #endif
@@ -115,7 +121,7 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// </summary>
         /// <param name="index">The index to set the item at.</param>
         /// <param name="item">The item to set.</param>
-        protected override void SetItem(int index, T item) {
+        protected sealed override void SetItem(int index, T item) {
             Execute.OnUIThread(() => SetItemBase(index, item));
         }
 
@@ -125,7 +131,7 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// <param name="index">The index.</param>
         /// <param name="item">The item.</param>
         /// <remarks>Used to avoid compiler warning regarding unverifiable code.</remarks>
-        void SetItemBase(int index, T item) {
+        protected virtual void SetItemBase(int index, T item) {
             base.SetItem(index, item);
         }
 
@@ -133,7 +139,7 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// Removes the item at the specified position.
         /// </summary>
         /// <param name="index">The position used to identify the item to remove.</param>
-        protected override void RemoveItem(int index) {
+        protected sealed override void RemoveItem(int index) {
             Execute.OnUIThread(() => RemoveItemBase(index));
         }
 
@@ -142,14 +148,14 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// </summary>
         /// <param name="index">The index.</param>
         /// <remarks>Used to avoid compiler warning regarding unverifiable code.</remarks>
-        void RemoveItemBase(int index) {
+        protected virtual void RemoveItemBase(int index) {
             base.RemoveItem(index);
         }
 
         /// <summary>
         /// Clears the items contained by the collection.
         /// </summary>
-        protected override void ClearItems() {
+        protected sealed override void ClearItems() {
             Execute.OnUIThread(ClearItemsBase);
         }
 
@@ -157,7 +163,7 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// Exposes the base implementation of the <see cref="ClearItems"/> function.
         /// </summary>
         /// <remarks>Used to avoid compiler warning regarding unverifiable code.</remarks>
-        void ClearItemsBase() {
+        protected virtual void ClearItemsBase() {
             base.ClearItems();
         }
 
@@ -187,12 +193,37 @@ public class BindableCollection<T> : ObservableCollection<T>, IObservableCollect
         /// Adds the range.
         /// </summary>
         /// <param name="items">The items.</param>
-        public void AddRange(IEnumerable<T> items) {
-            IsNotifying = false;
-            items.Apply(Add);
-            IsNotifying = true;
+        public virtual void AddRange(IEnumerable<T> items) {
+            Execute.OnUIThread(() => {
+                var previousNotificationSetting = IsNotifying;
+                IsNotifying = false;
+                var index = Count;
+                foreach(var item in items) {
+                    InsertItemBase(index, item);
+                    index++;
+                }
+                IsNotifying = previousNotificationSetting;
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+                OnPropertyChanged(new PropertyChangedEventArgs(string.Empty));
+            });
+        }
 
-            Refresh();
+        /// <summary>
+        /// Removes the range.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        public virtual void RemoveRange(IEnumerable<T> items) {
+            Execute.OnUIThread(() => {
+                var previousNotificationSetting = IsNotifying;
+                IsNotifying = false;
+                foreach(var item in items) {
+                    var index = IndexOf(item);
+                    RemoveItemBase(index);
+                }
+                IsNotifying = previousNotificationSetting;
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+                OnPropertyChanged(new PropertyChangedEventArgs(string.Empty));
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/BindingScope.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/BindingScope.cs
new file mode 100644
index 0000000..af6d061
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/BindingScope.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Caliburn.Micro {
+    /// <summary>
+    /// Provides methods for searching a given scope for named elements.
+    /// </summary>
+    public static class BindingScope {
+        /// <summary>
+        /// Searches through the list of named elements looking for a case-insensitive match.
+        /// </summary>
+        /// <param name="elementsToSearch">The named elements to search through.</param>
+        /// <param name="name">The name to search for.</param>
+        /// <returns>The named element or null if not found.</returns>
+        public static FrameworkElement FindName(this IEnumerable<FrameworkElement> elementsToSearch, string name) {
+            return elementsToSearch.FirstOrDefault(x => x.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        /// <summary>
+        /// Gets all the <see cref="FrameworkElement"/> instances with names in the scope.
+        /// </summary>
+        /// <returns>Named <see cref="FrameworkElement"/> instances in the provided scope.</returns>
+        /// <remarks>Pass in a <see cref="DependencyObject"/> and receive a list of named <see cref="FrameworkElement"/> instances in the same scope.</remarks>
+        public static Func<DependencyObject, IEnumerable<FrameworkElement>> GetNamedElements = elementInScope => {
+            var root = elementInScope;
+            var previous = elementInScope;
+            DependencyObject contentPresenter = null;
+            var routeHops = new Dictionary<DependencyObject, DependencyObject>();
+
+            while(true) {
+                if(root == null) {
+                    root = previous;
+                    break;
+                }
+
+                if(root is UserControl)
+                    break;
+#if !SILVERLIGHT
+                if(root is Page) {
+                    root = ((Page)root).Content as DependencyObject ?? root;
+                    break;
+                }
+#endif
+                if((bool)root.GetValue(View.IsScopeRootProperty))
+                    break;
+
+                if(root is ContentPresenter)
+                    contentPresenter = root;
+                else if(root is ItemsPresenter && contentPresenter != null) {
+                    routeHops[root] = contentPresenter;
+                    contentPresenter = null;
+                }
+
+                previous = root;
+                root = VisualTreeHelper.GetParent(previous);
+            }
+
+            var descendants = new List<FrameworkElement>();
+            var queue = new Queue<DependencyObject>();
+            queue.Enqueue(root);
+
+            while(queue.Count > 0) {
+                var current = queue.Dequeue();
+                var currentElement = current as FrameworkElement;
+
+                if(currentElement != null && !string.IsNullOrEmpty(currentElement.Name))
+                    descendants.Add(currentElement);
+
+                if(current is UserControl && current != root)
+                    continue;
+
+                if(routeHops.ContainsKey(current)){
+                    queue.Enqueue(routeHops[current]);
+                    continue;
+                }
+
+#if NET
+                var childCount = (current is UIElement || current is UIElement3D || current is ContainerVisual ? VisualTreeHelper.GetChildrenCount(current) : 0);
+#else
+                var childCount = VisualTreeHelper.GetChildrenCount(current);
+#endif
+                if(childCount > 0) {
+                    for(var i = 0; i < childCount; i++) {
+                        var childDo = VisualTreeHelper.GetChild(current, i);
+                        queue.Enqueue(childDo);
+                    }
+                }
+                else {
+                    var contentControl = current as ContentControl;
+                    if(contentControl != null) {
+                        if(contentControl.Content is DependencyObject)
+                            queue.Enqueue(contentControl.Content as DependencyObject);
+#if !SILVERLIGHT
+                        var headeredControl = contentControl as HeaderedContentControl;
+                        if (headeredControl != null && headeredControl.Header is DependencyObject)
+                            queue.Enqueue(headeredControl.Header as DependencyObject);
+#endif
+                    }
+                    else {
+                        var itemsControl = current as ItemsControl;
+                        if(itemsControl != null) {
+                            itemsControl.Items.OfType<DependencyObject>()
+                                .Apply(queue.Enqueue);
+#if !SILVERLIGHT
+                            var headeredControl = itemsControl as HeaderedItemsControl;
+                            if (headeredControl != null && headeredControl.Header is DependencyObject)
+                                queue.Enqueue(headeredControl.Header as DependencyObject);
+#endif
+                        }
+                    }
+                }
+            }
+
+            return descendants;
+        };
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Bootstrapper.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Bootstrapper.cs
index 380a43a..31b126d 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Bootstrapper.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Bootstrapper.cs
@@ -2,6 +2,8 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.Diagnostics;
     using System.Reflection;
     using System.Windows;
     using System.Windows.Threading;
@@ -12,11 +14,12 @@
     public class Bootstrapper
     {
         private static bool? isInDesignMode;
+        readonly bool useApplication;
 
         /// <summary>
         /// The application.
         /// </summary>
-        public Application Application { get; private set; }
+        public Application Application { get; protected set; }
 
         /// <summary>
         /// Indicates whether or not the framework is in design-time mode.
@@ -27,11 +30,15 @@ public static bool IsInDesignMode
             {
                 if (isInDesignMode == null)
                 {
-                    var app = Application.Current.ToString();
+#if SILVERLIGHT
+                    isInDesignMode = DesignerProperties.IsInDesignTool;
+#else
+                    var prop = DesignerProperties.IsInDesignModeProperty;
+                    isInDesignMode = (bool)DependencyPropertyDescriptor.FromProperty(prop, typeof(FrameworkElement)).Metadata.DefaultValue;
 
-                    if (app == "System.Windows.Application" || app == "Microsoft.Expression.Blend.BlendApplication")
+                    if (!isInDesignMode.GetValueOrDefault(false) && Process.GetCurrentProcess().ProcessName.StartsWith("devenv", StringComparison.Ordinal))
                         isInDesignMode = true;
-                    else isInDesignMode = false;
+#endif
                 }
 
                 return isInDesignMode.GetValueOrDefault(false);
@@ -41,16 +48,30 @@ public static bool IsInDesignMode
         /// <summary>
         /// Creates an instance of the bootstrapper.
         /// </summary>
-        public Bootstrapper()
-        {
-            if(IsInDesignMode)
-                return;
+        public Bootstrapper(bool useApplication = true) {
+            this.useApplication = useApplication;
+
+            if (IsInDesignMode)
+                StartDesignTime();
+            else StartRuntime();
+        }
+
+        /// <summary>
+        /// Called by the bootstrapper's constructor at design time to start the framework.
+        /// </summary>
+        protected virtual void StartDesignTime() {}
 
+        /// <summary>
+        /// Called by the bootstrapper's constructor at runtime to start the framework.
+        /// </summary>
+        protected virtual void StartRuntime() {
             Execute.InitializeWithDispatcher();
             AssemblySource.Instance.AddRange(SelectAssemblies());
 
-            Application = Application.Current;
-            PrepareApplication();
+            if (useApplication) {
+                Application = Application.Current;
+                PrepareApplication();
+            }
 
             Configure();
             IoC.GetInstance = GetInstance;
@@ -122,12 +143,7 @@ protected virtual IEnumerable<object> GetAllInstances(Type service)
         /// </summary>
         /// <param name="sender">The sender.</param>
         /// <param name="e">The args.</param>
-        protected virtual void OnStartup(object sender, StartupEventArgs e)
-        {
-#if !WP7
-            DisplayRootView();
-#endif
-        }
+        protected virtual void OnStartup(object sender, StartupEventArgs e) {}
 
         /// <summary>
         /// Override this to add custom behavior on exit.
@@ -136,13 +152,6 @@ protected virtual void OnStartup(object sender, StartupEventArgs e)
         /// <param name="e">The event args.</param>
         protected virtual void OnExit(object sender, EventArgs e) { }
 
-#if !WP7
-        /// <summary>
-        /// Override to display your UI at startup.
-        /// </summary>
-        protected virtual void DisplayRootView() {}
-#endif
-
 #if SILVERLIGHT
         /// <summary>
         /// Override this to add custom behavior for unhandled exceptions.
@@ -158,31 +167,32 @@ protected virtual void OnStartup(object sender, StartupEventArgs e)
         /// <param name="e">The event args.</param>
         protected virtual void OnUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e) { }
 #endif
-    }
-
-#if !WP7
-    /// <summary>
-    /// A strongly-typed version of <see cref="Bootstrapper"/> that specifies the type of root model to create for the application.
-    /// </summary>
-    /// <typeparam name="TRootModel">The type of root model for the application.</typeparam>
-    public class Bootstrapper<TRootModel> : Bootstrapper
-    {
+            
+#if SILVERLIGHT && !WP7
         /// <summary>
-        /// Override to display your UI at startup.
+        /// Locates the view model, locates the associate view, binds them and shows it as the root view.
         /// </summary>
-        protected override void DisplayRootView()
-        {
-            var viewModel = IoC.Get<TRootModel>();
-#if SILVERLIGHT
+        /// <param name="application">The application.</param>
+        /// <param name="viewModelType">The view model type.</param>
+        protected static void DisplayRootViewFor(Application application, Type viewModelType) {
+            var viewModel = IoC.GetInstance(viewModelType, null);
             var view = ViewLocator.LocateForModel(viewModel, null, null);
+
             ViewModelBinder.Bind(viewModel, view, null);
 
             var activator = viewModel as IActivate;
-            if (activator != null)
+            if(activator != null)
                 activator.Activate();
 
-            Application.RootVisual = view;
-#else
+            Mouse.Initialize(view);
+            application.RootVisual = view;
+        }
+#elif NET
+        /// <summary>
+        /// Locates the view model, locates the associate view, binds them and shows it as the root view.
+        /// </summary>
+        /// <param name="viewModelType">The view model type.</param>
+        protected static void DisplayRootViewFor(Type viewModelType) {
             IWindowManager windowManager;
 
             try
@@ -194,7 +204,28 @@ protected override void DisplayRootView()
                 windowManager = new WindowManager();
             }
 
-            windowManager.Show(viewModel);
+            windowManager.ShowWindow(IoC.GetInstance(viewModelType, null));
+        }
+#endif
+    }
+
+#if !WP7
+    /// <summary>
+    /// A strongly-typed version of <see cref="Bootstrapper"/> that specifies the type of root model to create for the application.
+    /// </summary>
+    /// <typeparam name="TRootModel">The type of root model for the application.</typeparam>
+    public class Bootstrapper<TRootModel> : Bootstrapper {
+        /// <summary>
+        /// Override this to add custom behavior to execute after the application starts.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The args.</param>
+        protected override void OnStartup(object sender, StartupEventArgs e)
+        {
+#if SILVERLIGHT
+            DisplayRootViewFor(Application, typeof(TRootModel));
+#else
+            DisplayRootViewFor(typeof(TRootModel));
 #endif
         }
     }
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Caliburn.Micro.Silverlight.csproj b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Caliburn.Micro.Silverlight.csproj
index 41c3391..4d9b4e9 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Caliburn.Micro.Silverlight.csproj
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Caliburn.Micro.Silverlight.csproj
@@ -28,24 +28,30 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>Bin\Debug</OutputPath>
+    <OutputPath>..\..\bin\Silverlight\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Bin\Debug\Caliburn.Micro.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\Silverlight\Debug\Caliburn.Micro.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>Bin\Release</OutputPath>
+    <OutputPath>..\..\bin\Silverlight\Release\</OutputPath>
     <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Bin\Release\Caliburn.Micro.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\Silverlight\Release\Caliburn.Micro.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>Caliburn.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
@@ -65,8 +71,12 @@
     <Compile Include="AttachedCollection.cs" />
     <Compile Include="Bind.cs" />
     <Compile Include="BindableCollection.cs" />
+    <Compile Include="BindingScope.cs" />
     <Compile Include="BooleanToVisibilityConverter.cs" />
     <Compile Include="Bootstrapper.cs" />
+    <Compile Include="ConductorBaseWithActiveItem.cs" />
+    <Compile Include="ConductorWithCollectionAllActive.cs" />
+    <Compile Include="NameTransformer.cs" />
     <Compile Include="Coroutine.cs" />
     <Compile Include="DefaultCloseStrategy.cs" />
     <Compile Include="Conductor.cs" />
@@ -80,6 +90,7 @@
     <Compile Include="IChild.cs" />
     <Compile Include="IConductor.cs" />
     <Compile Include="IHandle.cs" />
+    <Compile Include="IHaveParameters.cs" />
     <Compile Include="IoC.cs" />
     <Compile Include="IResult.cs" />
     <Compile Include="IScreen.cs" />
@@ -87,20 +98,26 @@
     <Compile Include="Logging.cs" />
     <Compile Include="Message.cs" />
     <Compile Include="MessageBinder.cs" />
+    <Compile Include="Mouse.cs" />
     <Compile Include="Parameter.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyChangedBase.cs" />
     <Compile Include="ResultCompletionEventArgs.cs" />
     <Compile Include="Screen.cs" />
+    <Compile Include="ScreenExtensions.cs" />
     <Compile Include="SequentialResult.cs" />
     <Compile Include="TypeDescriptor.cs" />
     <Compile Include="View.cs" />
+    <Compile Include="ViewAware.cs" />
     <Compile Include="ViewLocator.cs" />
     <Compile Include="ViewModelBinder.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="WindowManager.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Caliburn.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Caliburn.snk b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Caliburn.snk
new file mode 100644
index 0000000..fed9681
Binary files /dev/null and b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Caliburn.snk differ
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Conductor.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Conductor.cs
index f874014..30a67a0 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Conductor.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Conductor.cs
@@ -1,85 +1,74 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Collections.Generic;
 
     /// <summary>
     /// An implementation of <see cref="IConductor"/> that holds on to and activates only one item at a time.
     /// </summary>
-    public partial class Conductor<T> : ConductorBase<T>
-    {
+    public partial class Conductor<T> : ConductorBaseWithActiveItem<T> {
         /// <summary>
         /// Activates the specified item.
         /// </summary>
         /// <param name="item">The item to activate.</param>
-        public override void ActivateItem(T item)
-        {
-            if (item != null && item.Equals(ActiveItem))
-            {
-                OnActivationProcessed(item, true);
+        public override void ActivateItem(T item) {
+            if(item != null && item.Equals(ActiveItem)) {
+                if (IsActive) {
+                    ScreenExtensions.TryActivate(item);
+                    OnActivationProcessed(item, true);
+                }
                 return;
             }
 
-            CloseStrategy.Execute(new[] { ActiveItem }, (canClose, items) =>
-            {
-                if (canClose)
+            CloseStrategy.Execute(new[] { ActiveItem }, (canClose, items) => {
+                if(canClose)
                     ChangeActiveItem(item, true);
                 else OnActivationProcessed(item, false);
             });
         }
 
         /// <summary>
-        /// Closes the specified item.
+        /// Deactivates the specified item.
         /// </summary>
         /// <param name="item">The item to close.</param>
-        public override void CloseItem(T item)
-        {
-            if (item == null || !item.Equals(ActiveItem))
+        /// <param name="close">Indicates whether or not to close the item after deactivating it.</param>
+        public override void DeactivateItem(T item, bool close) {
+            if(item == null || !item.Equals(ActiveItem))
                 return;
 
-            CloseStrategy.Execute(new[] { ActiveItem }, (canClose, items) => 
-            {
-                if (canClose)
-                    ChangeActiveItem(default(T), true);
+            CloseStrategy.Execute(new[] { ActiveItem }, (canClose, items) => {
+                if(canClose)
+                    ChangeActiveItem(default(T), close);
             });
         }
 
         /// <summary>
         /// Called to check whether or not this instance can close.
         /// </summary>
-        /// <param name="callback">The implementer calls this action with the result of the close check.</param>
-        public override void CanClose(Action<bool> callback)
-        {
+        /// <param name="callback">The implementor calls this action with the result of the close check.</param>
+        public override void CanClose(Action<bool> callback) {
             CloseStrategy.Execute(new[] { ActiveItem }, (canClose, items) => callback(canClose));
         }
 
         /// <summary>
         /// Called when activating.
         /// </summary>
-        protected override void OnActivate()
-        {
-            var activator = ActiveItem as IActivate;
-            if (activator != null)
-                activator.Activate();
+        protected override void OnActivate() {
+            ScreenExtensions.TryActivate(ActiveItem);
         }
 
         /// <summary>
         /// Called when deactivating.
         /// </summary>
-        /// <param name="close">Indicates whether this instance will be closed.</param>
-        protected override void OnDeactivate(bool close)
-        {
-            var deactivator = ActiveItem as IDeactivate;
-            if (deactivator != null)
-                deactivator.Deactivate(close);
+        /// <param name="close">Inidicates whether this instance will be closed.</param>
+        protected override void OnDeactivate(bool close) {
+            ScreenExtensions.TryDeactivate(ActiveItem, close);
         }
 
         /// <summary>
-        /// Gets all the items currently being conducted.
+        /// Gets the children.
         /// </summary>
-        /// <returns></returns>
-        protected override IEnumerable<T> GetConductedItems()
-        {
+        /// <returns>The collection of children.</returns>
+        public override IEnumerable<T> GetChildren() {
             return new[] { ActiveItem };
         }
     }
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorBase.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorBase.cs
index f257b32..290c9f9 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorBase.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorBase.cs
@@ -1,5 +1,4 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Collections;
     using System.Collections.Generic;
@@ -8,49 +7,28 @@
     /// A base class for various implementations of <see cref="IConductor"/>.
     /// </summary>
     /// <typeparam name="T">The type that is being conducted.</typeparam>
-    public abstract class ConductorBase<T> : Screen, IConductor
-    {
-        T activeItem;
+    public abstract class ConductorBase<T> : Screen, IConductor, IParent<T> {
         ICloseStrategy<T> closeStrategy;
 
         /// <summary>
         /// Gets or sets the close strategy.
         /// </summary>
         /// <value>The close strategy.</value>
-        public ICloseStrategy<T> CloseStrategy
-        {
+        public ICloseStrategy<T> CloseStrategy {
             get { return closeStrategy ?? (closeStrategy = new DefaultCloseStrategy<T>()); }
             set { closeStrategy = value; }
         }
 
-        /// <summary>
-        /// The currently active item.
-        /// </summary>
-        public T ActiveItem
-        {
-            get { return activeItem; }
-            set { ActivateItem(value); }
-        }
-
-        object IConductor.ActiveItem
-        {
-            get { return ActiveItem; }
-            set { ActiveItem = (T)value; }
-        }
-
-        IEnumerable IConductor.GetConductedItems()
-        {
-            return GetConductedItems();
+        void IConductor.ActivateItem(object item) {
+            ActivateItem((T)item);
         }
 
-        void IConductor.ActivateItem(object item)
-        {
-            ActivateItem((T)item);
+        void IConductor.DeactivateItem(object item, bool close) {
+            DeactivateItem((T)item, close);
         }
 
-        void IConductor.CloseItem(object item)
-        {
-            CloseItem((T)item);
+        IEnumerable IParent.GetChildren() {
+            return GetChildren();
         }
 
         /// <summary>
@@ -59,10 +37,10 @@ void IConductor.CloseItem(object item)
         public event EventHandler<ActivationProcessedEventArgs> ActivationProcessed = delegate { };
 
         /// <summary>
-        /// Gets all the items currently being conducted.
+        /// Gets the children.
         /// </summary>
-        /// <returns></returns>
-        protected abstract IEnumerable<T> GetConductedItems();
+        /// <returns>The collection of children.</returns>
+        public abstract IEnumerable<T> GetChildren();
 
         /// <summary>
         /// Activates the specified item.
@@ -71,62 +49,35 @@ void IConductor.CloseItem(object item)
         public abstract void ActivateItem(T item);
 
         /// <summary>
-        /// Closes the specified item.
+        /// Deactivates the specified item.
         /// </summary>
         /// <param name="item">The item to close.</param>
-        public abstract void CloseItem(T item);
+        /// <param name="close">Indicates whether or not to close the item after deactivating it.</param>
+        public abstract void DeactivateItem(T item, bool close);
 
         /// <summary>
         /// Called by a subclass when an activation needs processing.
         /// </summary>
         /// <param name="item">The item on which activation was attempted.</param>
         /// <param name="success">if set to <c>true</c> activation was successful.</param>
-        protected virtual void OnActivationProcessed(T item, bool success)
-        {
-            if (item == null)
+        protected virtual void OnActivationProcessed(T item, bool success) {
+            if(item == null)
                 return;
 
-            ActivationProcessed(this, new ActivationProcessedEventArgs
-            {
+            ActivationProcessed(this, new ActivationProcessedEventArgs {
                 Item = item,
                 Success = success
             });
         }
 
-        /// <summary>
-        /// Changes the active item.
-        /// </summary>
-        /// <param name="newItem">The new item to activate.</param>
-        /// <param name="closePrevious">Indicates whether or not to close the previous active item.</param>
-        protected virtual void ChangeActiveItem(T newItem, bool closePrevious)
-        {
-            var deactivator = activeItem as IDeactivate;
-            if (deactivator != null)
-                deactivator.Deactivate(closePrevious);
-
-            newItem = EnsureItem(newItem);
-
-            if (IsActive)
-            {
-                var activator = newItem as IActivate;
-                if (activator != null)
-                    activator.Activate();
-            }
-
-            activeItem = newItem;
-            NotifyOfPropertyChange("ActiveItem");
-            OnActivationProcessed(activeItem, true);
-        }
-
         /// <summary>
         /// Ensures that an item is ready to be activated.
         /// </summary>
         /// <param name="newItem"></param>
         /// <returns>The item to be activated.</returns>
-        protected virtual T EnsureItem(T newItem)
-        {
-            var node = newItem as IChild<IConductor>;
-            if (node != null && node.Parent != this)
+        protected virtual T EnsureItem(T newItem) {
+            var node = newItem as IChild;
+            if(node != null && node.Parent != this)
                 node.Parent = this;
 
             return newItem;
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorBaseWithActiveItem.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorBaseWithActiveItem.cs
new file mode 100644
index 0000000..25b6750
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorBaseWithActiveItem.cs
@@ -0,0 +1,44 @@
+namespace Caliburn.Micro {
+    /// <summary>
+    /// A base class for various implementations of <see cref="IConductor"/> that maintain an active item.
+    /// </summary>
+    /// <typeparam name="T">The type that is being conducted.</typeparam>
+    public abstract class ConductorBaseWithActiveItem<T> : ConductorBase<T>, IConductActiveItem {
+        T activeItem;
+
+        /// <summary>
+        /// The currently active item.
+        /// </summary>
+        public T ActiveItem {
+            get { return activeItem; }
+            set { ActivateItem(value); }
+        }
+
+        /// <summary>
+        /// The currently active item.
+        /// </summary>
+        /// <value></value>
+        object IHaveActiveItem.ActiveItem {
+            get { return ActiveItem; }
+            set { ActiveItem = (T)value; }
+        }
+
+        /// <summary>
+        /// Changes the active item.
+        /// </summary>
+        /// <param name="newItem">The new item to activate.</param>
+        /// <param name="closePrevious">Indicates whether or not to close the previous active item.</param>
+        protected virtual void ChangeActiveItem(T newItem, bool closePrevious) {
+            ScreenExtensions.TryDeactivate(activeItem, closePrevious);
+
+            newItem = EnsureItem(newItem);
+
+            if(IsActive)
+                ScreenExtensions.TryActivate(newItem);
+
+            activeItem = newItem;
+            NotifyOfPropertyChange("ActiveItem");
+            OnActivationProcessed(activeItem, true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorWithCollectionAllActive.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorWithCollectionAllActive.cs
new file mode 100644
index 0000000..d6e2590
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorWithCollectionAllActive.cs
@@ -0,0 +1,161 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.Specialized;
+    using System.Linq;
+
+    public partial class Conductor<T> {
+        /// <summary>
+        /// An implementation of <see cref="IConductor"/> that holds on many items.
+        /// </summary>
+        public partial class Collection {
+            /// <summary>
+            /// An implementation of <see cref="IConductor"/> that holds on to many items wich are all activated.
+            /// </summary>
+            public class AllActive : ConductorBase<T> {
+                readonly BindableCollection<T> items = new BindableCollection<T>();
+                readonly bool openPublicItems;
+
+                /// <summary>
+                /// Initializes a new instance of the <see cref="Conductor&lt;T&gt;.Collection.AllActive"/> class.
+                /// </summary>
+                /// <param name="openPublicItems">if set to <c>true</c> opens public items that are properties of this class.</param>
+                public AllActive(bool openPublicItems)
+                    : this() {
+                    this.openPublicItems = openPublicItems;
+                }
+
+                /// <summary>
+                /// Initializes a new instance of the <see cref="Conductor&lt;T&gt;.Collection.AllActive"/> class.
+                /// </summary>
+                public AllActive() {
+                    items.CollectionChanged += (s, e) => {
+                        switch(e.Action) {
+                            case NotifyCollectionChangedAction.Add:
+                            case NotifyCollectionChangedAction.Replace:
+                                e.NewItems.OfType<IChild>().Apply(x => x.Parent = this);
+                                break;
+                            case NotifyCollectionChangedAction.Reset:
+                                items.OfType<IChild>().Apply(x => x.Parent = this);
+                                break;
+                        }
+                    };
+                }
+
+                /// <summary>
+                /// Gets the items that are currently being conducted.
+                /// </summary>
+                public IObservableCollection<T> Items {
+                    get { return items; }
+                }
+
+                /// <summary>
+                /// Called when activating.
+                /// </summary>
+                protected override void OnActivate() {
+                    items.OfType<IActivate>().Apply(x => x.Activate());
+                }
+
+                /// <summary>
+                /// Called when deactivating.
+                /// </summary>
+                /// <param name="close">Inidicates whether this instance will be closed.</param>
+                protected override void OnDeactivate(bool close) {
+                    items.OfType<IDeactivate>().Apply(x => x.Deactivate(close));
+                    if(close)
+                        items.Clear();
+                }
+
+                /// <summary>
+                /// Called to check whether or not this instance can close.
+                /// </summary>
+                /// <param name="callback">The implementor calls this action with the result of the close check.</param>
+                public override void CanClose(Action<bool> callback) {
+                    CloseStrategy.Execute(items, (canClose, closable) => {
+                        if (!canClose && closable.Any()) {
+                            closable.OfType<IDeactivate>().Apply(x => x.Deactivate(true));
+                            items.RemoveRange(closable);
+                        }
+
+                        callback(canClose);
+                    });
+                }
+
+                /// <summary>
+                /// Called when initializing.
+                /// </summary>
+                protected override void OnInitialize() {
+                    if(openPublicItems) {
+                        GetType().GetProperties()
+                            .Where(x => x.Name != "Parent" && typeof(T).IsAssignableFrom(x.PropertyType))
+                            .Select(x => x.GetValue(this, null))
+                            .Cast<T>()
+                            .Apply(ActivateItem);
+                    }
+                }
+
+                /// <summary>
+                /// Activates the specified item.
+                /// </summary>
+                /// <param name="item">The item to activate.</param>
+                public override void ActivateItem(T item) {
+                    if(item == null)
+                        return;
+
+                    item = EnsureItem(item);
+
+                    if(IsActive)
+                        ScreenExtensions.TryActivate(item);
+
+                    OnActivationProcessed(item, true);
+                }
+
+                /// <summary>
+                /// Deactivates the specified item.
+                /// </summary>
+                /// <param name="item">The item to close.</param>
+                /// <param name="close">Indicates whether or not to close the item after deactivating it.</param>
+                public override void DeactivateItem(T item, bool close) {
+                    if(item == null)
+                        return;
+
+                    if(close) {
+                        CloseStrategy.Execute(new[] { item }, (canClose, closable) => {
+                            if(canClose)
+                                CloseItemCore(item);
+                        });
+                    }
+                    else ScreenExtensions.TryDeactivate(item, false);
+                }
+
+                /// <summary>
+                /// Gets the children.
+                /// </summary>
+                /// <returns>The collection of children.</returns>
+                public override IEnumerable<T> GetChildren() {
+                    return items;
+                }
+
+                void CloseItemCore(T item) {
+                    ScreenExtensions.TryDeactivate(item, true);
+                    items.Remove(item);
+                }
+
+                /// <summary>
+                /// Ensures that an item is ready to be activated.
+                /// </summary>
+                /// <param name="newItem"></param>
+                /// <returns>The item to be activated.</returns>
+                protected override T EnsureItem(T newItem) {
+                    var index = items.IndexOf(newItem);
+
+                    if(index == -1)
+                        items.Add(newItem);
+                    else newItem = items[index];
+
+                    return base.EnsureItem(newItem);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorWithCollectionOneActive.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorWithCollectionOneActive.cs
index e19082a..36d7858 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorWithCollectionOneActive.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConductorWithCollectionOneActive.cs
@@ -1,39 +1,32 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Collections.Generic;
     using System.Collections.Specialized;
     using System.Linq;
 
-    public partial class Conductor<T>
-    {
+    public partial class Conductor<T> {
         /// <summary>
-        /// An implementation of <see cref="IConductor"/> that holds on to many items.
+        /// An implementation of <see cref="IConductor"/> that holds on many items.
         /// </summary>
-        public partial class Collection
-        {
+        public partial class Collection {
             /// <summary>
-            /// An implementation of <see cref="IConductor"/> that holds on to many items but only activates one at a time.
+            /// An implementation of <see cref="IConductor"/> that holds on many items but only activates on at a time.
             /// </summary>
-            public class OneActive : ConductorBase<T>
-            {
+            public class OneActive : ConductorBaseWithActiveItem<T> {
                 readonly BindableCollection<T> items = new BindableCollection<T>();
 
                 /// <summary>
                 /// Initializes a new instance of the <see cref="Conductor&lt;T&gt;.Collection.OneActive"/> class.
                 /// </summary>
-                public OneActive()
-                {
-                    items.CollectionChanged += (s, e) =>
-                    {
-                        switch (e.Action)
-                        {
+                public OneActive() {
+                    items.CollectionChanged += (s, e) => {
+                        switch(e.Action) {
                             case NotifyCollectionChangedAction.Add:
                             case NotifyCollectionChangedAction.Replace:
-                                e.NewItems.OfType<IChild<IConductor>>().Apply(x => x.Parent = this);
+                                e.NewItems.OfType<IChild>().Apply(x => x.Parent = this);
                                 break;
                             case NotifyCollectionChangedAction.Reset:
-                                items.OfType<IChild<IConductor>>().Apply(x => x.Parent = this);
+                                items.OfType<IChild>().Apply(x => x.Parent = this);
                                 break;
                         }
                     };
@@ -42,17 +35,15 @@ public OneActive()
                 /// <summary>
                 /// Gets the items that are currently being conducted.
                 /// </summary>
-                public IObservableCollection<T> Items
-                {
+                public IObservableCollection<T> Items {
                     get { return items; }
                 }
 
                 /// <summary>
-                /// Gets all the items currently being conducted.
+                /// Gets the children.
                 /// </summary>
-                /// <returns></returns>
-                protected override IEnumerable<T> GetConductedItems()
-                {
+                /// <returns>The collection of children.</returns>
+                public override IEnumerable<T> GetChildren() {
                     return items;
                 }
 
@@ -60,11 +51,12 @@ protected override IEnumerable<T> GetConductedItems()
                 /// Activates the specified item.
                 /// </summary>
                 /// <param name="item">The item to activate.</param>
-                public override void ActivateItem(T item)
-                {
-                    if (item != null && item.Equals(ActiveItem))
-                    {
-                        OnActivationProcessed(item, true);
+                public override void ActivateItem(T item) {
+                    if(item != null && item.Equals(ActiveItem)) {
+                        if (IsActive) {
+                            ScreenExtensions.TryActivate(item);
+                            OnActivationProcessed(item, true);
+                        }
                         return;
                     }
 
@@ -72,36 +64,32 @@ public override void ActivateItem(T item)
                 }
 
                 /// <summary>
-                /// Closes the specified item.
+                /// Deactivates the specified item.
                 /// </summary>
                 /// <param name="item">The item to close.</param>
-                public override void CloseItem(T item)
-                {
-                    if (item == null)
+                /// <param name="close">Indicates whether or not to close the item after deactivating it.</param>
+                public override void DeactivateItem(T item, bool close) {
+                    if(item == null)
                         return;
 
-                    CloseStrategy.Execute(new[] { item }, (canClose, closable) =>
-                    {
-                        if (canClose)
-                            CloseItemCore(item);
-                    });
+                    if(!close)
+                        ScreenExtensions.TryDeactivate(item, false);
+                    else {
+                        CloseStrategy.Execute(new[] { item }, (canClose, closable) => {
+                            if(canClose)
+                                CloseItemCore(item);
+                        });
+                    }
                 }
 
-                void CloseItemCore(T item)
-                {
-                    if (item.Equals(ActiveItem))
-                    {
+                void CloseItemCore(T item) {
+                    if(item.Equals(ActiveItem)) {
                         var index = items.IndexOf(item);
-                        var next = DetermineNextItemToActivate(index);
+                        var next = DetermineNextItemToActivate(items, index);
 
                         ChangeActiveItem(next, true);
                     }
-                    else
-                    {
-                        var deactivator = item as IDeactivate;
-                        if (deactivator != null)
-                            deactivator.Deactivate(true);
-                    }
+                    else ScreenExtensions.TryDeactivate(item, true);
 
                     items.Remove(item);
                 }
@@ -109,28 +97,49 @@ void CloseItemCore(T item)
                 /// <summary>
                 /// Determines the next item to activate based on the last active index.
                 /// </summary>
+                /// <param name="list">The list of possible active items.</param>
                 /// <param name="lastIndex">The index of the last active item.</param>
                 /// <returns>The next item to activate.</returns>
                 /// <remarks>Called after an active item is closed.</remarks>
-                protected virtual T DetermineNextItemToActivate(int lastIndex)
-                {
+                protected virtual T DetermineNextItemToActivate(IList<T> list, int lastIndex) {
                     var toRemoveAt = lastIndex - 1;
 
-                    if (toRemoveAt == -1 && items.Count > 1)
-                        return items[1];
-                    if (toRemoveAt > -1 && toRemoveAt < items.Count - 1)
-                        return items[toRemoveAt];
+                    if(toRemoveAt == -1 && list.Count > 1)
+                        return list[1];
+                    if(toRemoveAt > -1 && toRemoveAt < list.Count - 1)
+                        return list[toRemoveAt];
                     return default(T);
                 }
 
                 /// <summary>
                 /// Called to check whether or not this instance can close.
                 /// </summary>
-                /// <param name="callback">The implementer calls this action with the result of the close check.</param>
-                public override void CanClose(Action<bool> callback)
-                {
+                /// <param name="callback">The implementor calls this action with the result of the close check.</param>
+                public override void CanClose(Action<bool> callback) {
                     CloseStrategy.Execute(items, (canClose, closable) => {
-                        closable.Apply(CloseItemCore);
+                        if(!canClose && closable.Any()) {
+                            if(closable.Contains(ActiveItem)) {
+                                var list = items.ToList();
+                                var next = ActiveItem;
+                                do {
+                                    var previous = next;
+                                    next = DetermineNextItemToActivate(list, list.IndexOf(previous));
+                                    list.Remove(previous);
+                                } while(closable.Contains(next));
+
+                                var previousActive = ActiveItem;
+                                ChangeActiveItem(next, true);
+                                items.Remove(previousActive);
+
+                                var stillToClose = closable.ToList();
+                                stillToClose.Remove(previousActive);
+                                closable = stillToClose;
+                            }
+
+                            closable.OfType<IDeactivate>().Apply(x => x.Deactivate(true));
+                            items.RemoveRange(closable);
+                        }
+
                         callback(canClose);
                     });
                 }
@@ -138,27 +147,20 @@ public override void CanClose(Action<bool> callback)
                 /// <summary>
                 /// Called when activating.
                 /// </summary>
-                protected override void OnActivate()
-                {
-                    var activator = ActiveItem as IActivate;
-                    if (activator != null)
-                        activator.Activate();
+                protected override void OnActivate() {
+                    ScreenExtensions.TryActivate(ActiveItem);
                 }
 
                 /// <summary>
                 /// Called when deactivating.
                 /// </summary>
-                /// <param name="close">Indicates whether this instance will be closed.</param>
-                protected override void OnDeactivate(bool close)
-                {
-                    if (close)
+                /// <param name="close">Inidicates whether this instance will be closed.</param>
+                protected override void OnDeactivate(bool close) {
+                    if (close) {
                         items.OfType<IDeactivate>().Apply(x => x.Deactivate(true));
-                    else
-                    {
-                        var deactivator = ActiveItem as IDeactivate;
-                        if (deactivator != null)
-                            deactivator.Deactivate(false);
+                        items.Clear();
                     }
+                    else ScreenExtensions.TryDeactivate(ActiveItem, false);
                 }
 
                 /// <summary>
@@ -166,15 +168,13 @@ protected override void OnDeactivate(bool close)
                 /// </summary>
                 /// <param name="newItem"></param>
                 /// <returns>The item to be activated.</returns>
-                protected override T EnsureItem(T newItem)
-                {
-                    if (newItem == null)
-                        newItem = DetermineNextItemToActivate(ActiveItem != null ? items.IndexOf(ActiveItem) : 0);
-                    else
-                    {
+                protected override T EnsureItem(T newItem) {
+                    if(newItem == null)
+                        newItem = DetermineNextItemToActivate(items, ActiveItem != null ? items.IndexOf(ActiveItem) : 0);
+                    else {
                         var index = items.IndexOf(newItem);
 
-                        if (index == -1)
+                        if(index == -1)
                             items.Add(newItem);
                         else newItem = items[index];
                     }
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConventionManager.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConventionManager.cs
index dfd986c..6d6bf50 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConventionManager.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ConventionManager.cs
@@ -28,6 +28,18 @@ public static class ConventionManager
         /// </summary>
         public static IValueConverter BooleanToVisibilityConverter = new BooleanToVisibilityConverter();
 
+        /// <summary>
+        /// Indicates whether or not static properties should be included during convention name matching.
+        /// </summary>
+        /// <remarks>False by default.</remarks>
+        public static bool IncludeStaticProperties = false;
+
+        /// <summary>
+        /// Indicates whether or not the Content of ContentControls should be overwritten by conventional bindings.
+        /// </summary>
+        /// <remarks>False by default.</remarks>
+        public static bool OverwriteContent = false;
+
         /// <summary>
         /// The default DataTemplate used for ItemsControls when required.
         /// </summary>
@@ -39,7 +51,7 @@ public static class ConventionManager
 #endif
             "<DataTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' " +
                           "xmlns:cal='clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro'> " +
-                "<ContentControl cal:View.Model=\"{Binding}\" VerticalContentAlignment=\"Stretch\" HorizontalContentAlignment=\"Stretch\" />" +
+                "<ContentControl cal:View.Model=\"{Binding}\" VerticalContentAlignment=\"Stretch\" HorizontalContentAlignment=\"Stretch\" IsTabStop=\"False\" />" +
             "</DataTemplate>"
             );
 
@@ -61,7 +73,9 @@ public static class ConventionManager
         /// Changes the provided word from a plural form to a singular form.
         /// </summary>
         public static Func<string, string> Singularize = original =>{
-            return original.TrimEnd('s');
+            return original.EndsWith("ies") 
+                ? original.TrimEnd('s').TrimEnd('e').TrimEnd('i') + "y" 
+                : original.TrimEnd('s');
         };
 
         /// <summary>
@@ -119,9 +133,15 @@ public static class ConventionManager
         /// <summary>
         /// Determines whether a custom update source trigger should be applied to the binding.
         /// </summary>
-        public static Action<DependencyProperty, DependencyObject, Binding> ApplyUpdateSourceTrigger = (bindableProperty, element, binding) =>{
+        public static Action<DependencyProperty, DependencyObject, Binding, PropertyInfo> ApplyUpdateSourceTrigger = (bindableProperty, element, binding, info) =>{
 #if SILVERLIGHT
-            ApplySilverlightTriggers(element, bindableProperty, x => x.GetBindingExpression(bindableProperty));
+            ApplySilverlightTriggers(
+                element, 
+                bindableProperty, 
+                x => x.GetBindingExpression(bindableProperty),
+                info,
+                binding
+                );
 #else
             binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
 #endif
@@ -131,12 +151,7 @@ public static class ConventionManager
         /// Determines whether a particular dependency property already has a binding on the provided element.
         /// </summary>
         public static Func<FrameworkElement, DependencyProperty, bool> HasBinding = (element, property) => {
-            var exists = element.GetBindingExpression(property) != null;
-
-            if(exists)
-                Log.Info("Binding exists on {0}.", element.Name);
-
-            return exists;
+            return element.GetBindingExpression(property) != null;
         };
 
         /// <summary>
@@ -145,7 +160,7 @@ public static class ConventionManager
         public static Func<Type, string, PropertyInfo, FrameworkElement, ElementConvention, bool> SetBinding =
             (viewModelType, path, property, element, convention) => {
                 var bindableProperty = convention.GetBindableProperty(element);
-                if(HasBinding(element, bindableProperty))
+                if(bindableProperty == null || HasBinding(element, bindableProperty))
                     return false;
 
                 var binding = new Binding(path);
@@ -154,7 +169,7 @@ public static class ConventionManager
                 ApplyValueConverter(binding, bindableProperty, property);
                 ApplyStringFormat(binding, convention, property);
                 ApplyValidation(binding, viewModelType, property);
-                ApplyUpdateSourceTrigger(bindableProperty, element, binding);
+                ApplyUpdateSourceTrigger(bindableProperty, element, binding, property);
 
                 BindingOperations.SetBinding(element, bindableProperty, binding);
 
@@ -163,11 +178,14 @@ public static class ConventionManager
 
         static ConventionManager()
         {
+#if !WP7
+            AddElementConvention<DatePicker>(DatePicker.SelectedDateProperty, "SelectedDate", "SelectedDateChanged");
+#endif
 #if SILVERLIGHT
             AddElementConvention<HyperlinkButton>(HyperlinkButton.ContentProperty, "DataContext", "Click");
             AddElementConvention<PasswordBox>(PasswordBox.PasswordProperty, "Password", "PasswordChanged");
 #else
-            AddElementConvention<PasswordBox>(PasswordBox.DataContextProperty, "DataContext", "PasswordChanged");
+            AddElementConvention<PasswordBox>(null, "Password", "PasswordChanged");
             AddElementConvention<Hyperlink>(Hyperlink.DataContextProperty, "DataContext", "Click");
             AddElementConvention<RichTextBox>(RichTextBox.DataContextProperty, "DataContext", "TextChanged");
             AddElementConvention<Menu>(Menu.ItemsSourceProperty,"DataContext", "Click");
@@ -182,19 +200,25 @@ static ConventionManager()
             AddElementConvention<TabControl>(TabControl.ItemsSourceProperty, "ItemsSource", "SelectionChanged")
                 .ApplyBinding = (viewModelType, path, property, element, convention) => {
                     if(!SetBinding(viewModelType, path, property, element, convention))
-                        return;
+                        return false;
 
                     var tabControl = (TabControl)element;
-                    if(tabControl.ContentTemplate == null && tabControl.ContentTemplateSelector == null && property.PropertyType.IsGenericType) {
+                    if(tabControl.ContentTemplate == null 
+                        && tabControl.ContentTemplateSelector == null 
+                        && property.PropertyType.IsGenericType) {
                         var itemType = property.PropertyType.GetGenericArguments().First();
-                        if(!itemType.IsValueType && !typeof(string).IsAssignableFrom(itemType))
+                        if(!itemType.IsValueType && !typeof(string).IsAssignableFrom(itemType)){
                             tabControl.ContentTemplate = DefaultItemTemplate;
+                            Log.Info("ContentTemplate applied to {0}.", element.Name);
+                        }
                     }
 
                     ConfigureSelectedItem(element, Selector.SelectedItemProperty, viewModelType, path);
 
                     if(string.IsNullOrEmpty(tabControl.DisplayMemberPath))
                         ApplyHeaderTemplate(tabControl, TabControl.ItemTemplateProperty, viewModelType);
+
+                    return true;
                 };
             AddElementConvention<TabItem>(TabItem.ContentProperty, "DataContext", "DataContextChanged");
             AddElementConvention<Window>(Window.DataContextProperty, "DataContext", "Loaded");
@@ -205,33 +229,44 @@ static ConventionManager()
             AddElementConvention<ButtonBase>(ButtonBase.ContentProperty, "DataContext", "Click");
             AddElementConvention<TextBox>(TextBox.TextProperty, "Text", "TextChanged");
             AddElementConvention<TextBlock>(TextBlock.TextProperty, "Text", "DataContextChanged");
+            AddElementConvention<ProgressBar>(ProgressBar.ValueProperty, "Value", "ValueChanged");
             AddElementConvention<Selector>(Selector.ItemsSourceProperty, "SelectedItem", "SelectionChanged")
                 .ApplyBinding = (viewModelType, path, property, element, convention) => {
                     if (!SetBinding(viewModelType, path, property, element, convention))
-                        return;
+                        return false;
 
                     ConfigureSelectedItem(element, Selector.SelectedItemProperty,viewModelType, path);
-                    ConfigureItemsControl((ItemsControl)element, property);
+                    ApplyItemTemplate((ItemsControl)element, property);
+
+                    return true;
                 };
             AddElementConvention<ItemsControl>(ItemsControl.ItemsSourceProperty, "DataContext", "Loaded")
                 .ApplyBinding = (viewModelType, path, property, element, convention) => {
                     if (!SetBinding(viewModelType, path, property, element, convention))
-                        return;
+                        return false;
 
-                    ConfigureItemsControl((ItemsControl)element, property);
+                    ApplyItemTemplate((ItemsControl)element, property);
+
+                    return true;
                 };
             AddElementConvention<ContentControl>(ContentControl.ContentProperty, "DataContext", "Loaded").GetBindableProperty =
                 delegate(DependencyObject foundControl) {
                     var element = (ContentControl)foundControl;
+
+                    if (element.Content is DependencyObject && !OverwriteContent)
+                        return null;
 #if SILVERLIGHT
-                    return element.ContentTemplate == null && !(element.Content is DependencyObject)
-                        ? View.ModelProperty
-                        : ContentControl.ContentProperty;
+                    var useViewModel = element.ContentTemplate == null;
 #else
-                    return element.ContentTemplate == null && element.ContentTemplateSelector == null && !(element.Content is DependencyObject)
-                        ? View.ModelProperty
-                        : ContentControl.ContentProperty;
+                    var useViewModel = element.ContentTemplate == null && element.ContentTemplateSelector == null;
 #endif
+                    if (useViewModel) {
+                        Log.Info("ViewModel bound on {0}.", element.Name);
+                        return View.ModelProperty;
+                    }
+
+                    Log.Info("Content bound on {0}. Template or content was present.", element.Name);
+                    return ContentControl.ContentProperty;
                 };
             AddElementConvention<Shape>(Shape.VisibilityProperty, "DataContext", "MouseLeftButtonUp");
             AddElementConvention<FrameworkElement>(FrameworkElement.VisibilityProperty, "DataContext", "Loaded");
@@ -278,23 +313,33 @@ public static ElementConvention GetElementConvention(Type elementType)
             return propertyConvention ?? GetElementConvention(elementType.BaseType);
         }
 
-        static void ConfigureItemsControl(ItemsControl itemsControl, PropertyInfo property) {
-            if(string.IsNullOrEmpty(itemsControl.DisplayMemberPath)
-                && !HasBinding(itemsControl, ItemsControl.DisplayMemberPathProperty)
-                    && itemsControl.ItemTemplate == null
-                        && property.PropertyType.IsGenericType) {
+        /// <summary>
+        /// Attempts to apply the default item template to the items control.
+        /// </summary>
+        /// <param name="itemsControl">The items control.</param>
+        /// <param name="property">The collection property.</param>
+        public static void ApplyItemTemplate(ItemsControl itemsControl, PropertyInfo property) {
+            if (!string.IsNullOrEmpty(itemsControl.DisplayMemberPath)
+                || HasBinding(itemsControl, ItemsControl.DisplayMemberPathProperty)
+                    || itemsControl.ItemTemplate != null
+                        || !property.PropertyType.IsGenericType)
+                return;
+
 #if !WP7
-                var itemType = property.PropertyType.GetGenericArguments().First();
-                if(!itemType.IsValueType && !typeof(string).IsAssignableFrom(itemType))
+            var itemType = property.PropertyType.GetGenericArguments().First();
+            if (itemType.IsValueType || typeof(string).IsAssignableFrom(itemType))
+                return;
 #endif
+
 #if !SILVERLIGHT && !WP7
-                    if (itemsControl.ItemTemplateSelector == null)
-                        itemsControl.ItemTemplate = DefaultItemTemplate;
+            if (itemsControl.ItemTemplateSelector == null){
+                itemsControl.ItemTemplate = DefaultItemTemplate;
+                Log.Info("ItemTemplate applied to {0}.", itemsControl.Name);
+            }
 #else
-                    itemsControl.ItemTemplate = DefaultItemTemplate;
+            itemsControl.ItemTemplate = DefaultItemTemplate;
+            Log.Info("ItemTemplate applied to {0}.", itemsControl.Name);
 #endif
-
-            }
         }
 
         /// <summary>
@@ -316,6 +361,7 @@ public static ElementConvention GetElementConvention(Type elementType)
                 if (viewModelType.GetPropertyCaseInsensitive(potentialName) != null) {
                     var selectionPath = path.Replace(baseName, potentialName);
                     BindingOperations.SetBinding(selector, selectedItemProperty, new Binding(selectionPath) { Mode = BindingMode.TwoWay });
+                    Log.Info("SelectedItem binding applied to {0}.", selector.Name);
                     return;
                 }
             }
@@ -330,11 +376,11 @@ public static ElementConvention GetElementConvention(Type elementType)
         public static void ApplyHeaderTemplate(FrameworkElement element, DependencyProperty headerTemplateProperty, Type viewModelType) {
             var template = element.GetValue(headerTemplateProperty);
 
-            if (template != null
-                || !typeof(IHaveDisplayName).IsAssignableFrom(viewModelType))
+            if (template != null || !typeof(IHaveDisplayName).IsAssignableFrom(viewModelType))
                 return;
 
             element.SetValue(headerTemplateProperty, DefaultHeaderTemplate);
+            Log.Info("Header template applied to {0}.", element.Name);
         }
 
 #if SILVERLIGHT
@@ -342,13 +388,34 @@ public static ElementConvention GetElementConvention(Type elementType)
         /// Accounts for the lack of UpdateSourceTrigger in silverlight.
         /// </summary>
         /// <param name="element">The element to wire for change events on.</param>
-        /// <param name="dependencyProperty">The rproperty that is being bound.</param>
-        /// <param name="expressionSource">The source of the binding expression tht needs to be updated.</param>
-        public static void ApplySilverlightTriggers(DependencyObject element, DependencyProperty dependencyProperty, Func<FrameworkElement, BindingExpression> expressionSource)
-        {
+        /// <param name="dependencyProperty">The property that is being bound.</param>
+        /// <param name="expressionSource">Gets the the binding expression that needs to be updated.</param>
+        /// <param name="property">The property being bound to if available.</param>
+        /// <param name="binding">The binding if available.</param>
+        public static void ApplySilverlightTriggers(DependencyObject element, DependencyProperty dependencyProperty, Func<FrameworkElement, BindingExpression> expressionSource, PropertyInfo property, Binding binding){
             var textBox = element as TextBox;
             if (textBox != null && dependencyProperty == TextBox.TextProperty)
             {
+                if (property != null)
+                {
+                    var typeCode = Type.GetTypeCode(property.PropertyType);
+                    if (typeCode == TypeCode.Single || typeCode == TypeCode.Double || typeCode == TypeCode.Decimal)
+                    {
+                        binding.UpdateSourceTrigger = UpdateSourceTrigger.Explicit;
+                        textBox.KeyUp += delegate
+                        {
+                            var start = textBox.SelectionStart;
+                            var text = textBox.Text;
+
+                            expressionSource(textBox).UpdateSource();
+
+                            textBox.Text = text;
+                            textBox.SelectionStart = start;
+                        };
+                        return;
+                    }
+                }
+
                 textBox.TextChanged += delegate { expressionSource(textBox).UpdateSource(); };
                 return;
             }
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Coroutine.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Coroutine.cs
index 793343e..6a0266c 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Coroutine.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Coroutine.cs
@@ -13,27 +13,23 @@ public static class Coroutine {
         /// </summary>
         public static Func<IEnumerator<IResult>, IResult> CreateParentEnumerator = inner => new SequentialResult(inner);
 
-        /// <summary>
-        /// Executes a coroutine.
-        /// </summary>
-        /// <param name="coroutine">The coroutine to execute.</param>
-        public static void Execute(IEnumerator<IResult> coroutine) {
-            Execute(coroutine, new ActionExecutionContext());
-        }
-
         /// <summary>
         /// Executes a coroutine.
         /// </summary>
         /// <param name="coroutine">The coroutine to execute.</param>
         /// <param name="context">The context to execute the coroutine within.</param>
-        public static void Execute(IEnumerator<IResult> coroutine, ActionExecutionContext context) {
+        /// /// <param name="callback">The completion callback for the coroutine.</param>
+        public static void BeginExecute(IEnumerator<IResult> coroutine, ActionExecutionContext context = null, EventHandler<ResultCompletionEventArgs> callback = null) {
             Log.Info("Executing coroutine.");
 
             var enumerator = CreateParentEnumerator(coroutine);
             IoC.BuildUp(enumerator);
 
+            if(callback != null)
+                enumerator.Completed += callback;
             enumerator.Completed += Completed;
-            enumerator.Execute(context);
+
+            enumerator.Execute(context ?? new ActionExecutionContext());
         }
 
         /// <summary>
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/DefaultCloseStrategy.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/DefaultCloseStrategy.cs
index 3fb869a..3f1e246 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/DefaultCloseStrategy.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/DefaultCloseStrategy.cs
@@ -25,16 +25,14 @@ public interface ICloseStrategy<T>
     public class DefaultCloseStrategy<T> : ICloseStrategy<T>
     {
         List<T> closable;
-        IEnumerator<T> enumerator;
         bool finalResult;
-        Action<bool, IEnumerable<T>> callback;
         readonly bool closeConductedItemsWhenConductorCannotClose;
 
         /// <summary>
         /// Creates an instance of the class.
         /// </summary>
-        /// <param name="closeConductedItemsWhenConductorCannotClose">Indicates that even if all conducted items are not closable, those that are should be closed. The default is true.</param>
-        public DefaultCloseStrategy(bool closeConductedItemsWhenConductorCannotClose = true) {
+        /// <param name="closeConductedItemsWhenConductorCannotClose">Indicates that even if all conducted items are not closable, those that are should be closed. The default is FALSE.</param>
+        public DefaultCloseStrategy(bool closeConductedItemsWhenConductorCannotClose = false) {
             this.closeConductedItemsWhenConductorCannotClose = closeConductedItemsWhenConductorCannotClose;
         }
 
@@ -46,15 +44,13 @@ public class DefaultCloseStrategy<T> : ICloseStrategy<T>
         /// The bool indicates whether close can occur. The enumerable indicates which children should close if the parent cannot.</param>
         public void Execute(IEnumerable<T> toClose, Action<bool, IEnumerable<T>> callback)
         {
-            enumerator = toClose.GetEnumerator();
-            this.callback = callback;
             finalResult = true;
             closable = new List<T>();
 
-            Evaluate(true);
+            Evaluate(true, toClose.GetEnumerator(), callback);
         }
 
-        void Evaluate(bool result)
+        void Evaluate(bool result, IEnumerator<T> enumerator, Action<bool, IEnumerable<T>> callback)
         {
             finalResult = finalResult && result;
 
@@ -73,13 +69,13 @@ void Evaluate(bool result)
                         if(canClose)
                             closable.Add(current);
 
-                        Evaluate(canClose);
+                        Evaluate(canClose, enumerator, callback);
                     });
                 }
                 else
                 {
                     closable.Add(current);
-                    Evaluate(true);
+                    Evaluate(true, enumerator, callback);
                 }
             }
         }
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ElementConvention.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ElementConvention.cs
index 2998622..f8260eb 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ElementConvention.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ElementConvention.cs
@@ -33,7 +33,7 @@ public class ElementConvention
         /// Applies custom conventions for elements of this type.
         /// </summary>
         /// <remarks>Pass the view model type, property path, property instance, framework element and its convention.</remarks>
-        public Action<Type, string, PropertyInfo, FrameworkElement, ElementConvention> ApplyBinding =
+        public Func<Type, string, PropertyInfo, FrameworkElement, ElementConvention, bool> ApplyBinding =
             (viewModelType, path, property, element, convention) => ConventionManager.SetBinding(viewModelType, path, property, element, convention);
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/EventAggregator.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/EventAggregator.cs
index 27b5b84..6e3c92d 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/EventAggregator.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/EventAggregator.cs
@@ -1,104 +1,130 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Reflection;
 
     /// <summary>
-    /// Enables loosely-coupled publication of and subscription to events.
+    ///   Enables loosely-coupled publication of and subscription to events.
     /// </summary>
-    public interface IEventAggregator
-    {
+    public interface IEventAggregator {
         /// <summary>
-        /// Subscribes an instance to all events declared through implementations of <see cref="IHandle{T}"/>
+        ///   Subscribes an instance to all events declared through implementations of <see cref = "IHandle{T}" />
         /// </summary>
-        /// <param name="instance">The instance to subscribe for event publication.</param>
+        /// <param name = "instance">The instance to subscribe for event publication.</param>
         void Subscribe(object instance);
 
         /// <summary>
-        /// Unsubscribes the instance from all events.
+        ///   Unsubscribes the instance from all events.
         /// </summary>
-        /// <param name="instance">The instance to unsubscribe.</param>
+        /// <param name = "instance">The instance to unsubscribe.</param>
         void Unsubscribe(object instance);
 
         /// <summary>
-        /// Publishes a message.
+        ///   Publishes a message.
         /// </summary>
-        /// <typeparam name="T">The type of message being published.</typeparam>
-        /// <param name="message">The message instance.</param>
-        void Publish<T>(T message);
+        /// <param name = "message">The message instance.</param>
+        /// <param name="marshal">Allows the publisher to provide a custom thread marshaller for the message publication. The default uses the UI thread marshaller.</param>
+        void Publish(object message, Action<System.Action> marshal = null);
     }
 
     /// <summary>
     /// Enables loosely-coupled publication of and subscription to events.
     /// </summary>
-    public class EventAggregator : IEventAggregator
-    {
+    public class EventAggregator : IEventAggregator {
         static readonly ILog Log = LogManager.GetLog(typeof(EventAggregator));
-        readonly List<WeakReference> subscribers = new List<WeakReference>();
+        readonly List<Handler> handlers = new List<Handler>();
 
         /// <summary>
-        /// Subscribes an instance to all events declared through implementations of <see cref="IHandle{T}"/>
+        ///   Subscribes an instance to all events declared through implementations of <see cref = "IHandle{T}" />
         /// </summary>
-        /// <param name="instance">The instance to subscribe for event publication.</param>
-        public void Subscribe(object instance)
-        {
-            lock (subscribers)
-            {
-                if (subscribers.Any(reference => reference.Target == instance))
+        /// <param name = "instance">The instance to subscribe for event publication.</param>
+        public void Subscribe(object instance) {
+            lock(handlers) {
+                if(handlers.Any(x => x.Matches(instance)))
                     return;
 
                 Log.Info("Subscribing {0}.", instance);
-                subscribers.Add(new WeakReference(instance));
+                handlers.Add(new Handler(instance));
             }
         }
 
         /// <summary>
-        /// Unsubscribes the instance from all events.
+        ///  Unsubscribes the instance from all events.
         /// </summary>
-        /// <param name="instance">The instance to unsubscribe.</param>
-        public void Unsubscribe(object instance)
-        {
-            lock (subscribers)
-            {
-                var found = subscribers
-                    .FirstOrDefault(reference => reference.Target == instance);
-
-                if (found != null)
-                    subscribers.Remove(found);
+        /// <param name = "instance">The instance to unsubscribe.</param>
+        public void Unsubscribe(object instance) {
+            lock(handlers) {
+                var found = handlers.FirstOrDefault(x => x.Matches(instance));
+
+                if(found != null)
+                    handlers.Remove(found);
             }
         }
 
         /// <summary>
-        /// Publishes a message.
+        ///   Publishes a message.
         /// </summary>
-        /// <typeparam name="TMessage">The type of message being published.</typeparam>
-        /// <param name="message">The message instance.</param>
-        public void Publish<TMessage>(TMessage message)
-        {
-            WeakReference[] toNotify;
-            lock (subscribers)
-                toNotify = subscribers.ToArray();
-
-            Execute.OnUIThread(() =>{
+        /// <param name = "message">The message instance.</param>
+        /// <param name="marshal">Allows the publisher to provide a custom thread marshaller for the message publication. The default uses the UI thread marshaller.</param>
+        public void Publish(object message, Action<System.Action> marshal = null) {
+            Handler[] toNotify;
+            lock(handlers)
+                toNotify = handlers.ToArray();
+
+            if(marshal == null)
+                marshal = Execute.OnUIThread;
+
+            marshal(() => {
                 Log.Info("Publishing {0}.", message);
-                var dead = new List<WeakReference>();
+                var messageType = message.GetType();
 
-                foreach(var reference in toNotify)
-                {
-                    var target = reference.Target as IHandle<TMessage>;
+                var dead = toNotify
+                    .Where(handler => !handler.Handle(messageType, message))
+                    .ToList();
 
-                    if(target != null)
-                        target.Handle(message);
-                    else if(!reference.IsAlive)
-                        dead.Add(reference);
-                }
-                if(dead.Count > 0)
-                {
-                    lock(subscribers)
-                        dead.Apply(x => subscribers.Remove(x));
+                if(dead.Any()) {
+                    lock(handlers)
+                        dead.Apply(x => handlers.Remove(x));
                 }
             });
         }
+
+        class Handler {
+            readonly WeakReference reference;
+            readonly Dictionary<Type, MethodInfo> supportedHandlers = new Dictionary<Type, MethodInfo>();
+
+            public Handler(object handler) {
+                reference = new WeakReference(handler);
+
+                var interfaces = handler.GetType().GetInterfaces()
+                    .Where(x => typeof(IHandle).IsAssignableFrom(x) && x.IsGenericType);
+
+                foreach(var @interface in interfaces) {
+                    var type = @interface.GetGenericArguments()[0];
+                    var method = @interface.GetMethod("Handle");
+                    supportedHandlers[type] = method;
+                }
+            }
+
+            public bool Matches(object instance) {
+                return reference.Target == instance;
+            }
+
+            public bool Handle(Type messageType, object message) {
+                var target = reference.Target;
+                if(target == null)
+                    return false;
+
+                foreach(var pair in supportedHandlers) {
+                    if(pair.Key.IsAssignableFrom(messageType)) {
+                        pair.Value.Invoke(target, new[] { message });
+                        return true;
+                    }
+                }
+
+                return true;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Execute.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Execute.cs
index bc51ae3..a134a88 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Execute.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Execute.cs
@@ -1,6 +1,8 @@
 namespace Caliburn.Micro
 {
     using System;
+    using System.Reflection;
+    using System.Threading;
     using System.Windows;
     using System.Windows.Threading;
 
@@ -18,22 +20,51 @@ public static void InitializeWithDispatcher()
         {
 #if SILVERLIGHT
             var dispatcher = Deployment.Current.Dispatcher;
+
+            executor = action => {
+                if(dispatcher.CheckAccess())
+                    action();
+                else {
+                    var waitHandle = new ManualResetEvent(false);
+                    Exception exception = null;
+                    dispatcher.BeginInvoke(() => {
+                        try {
+                            action();
+                        }
+                        catch(Exception ex) {
+                            exception = ex;
+                        }
+                        waitHandle.Set();
+                    });
+                    waitHandle.WaitOne();
+                    if(exception != null)
+                        throw new TargetInvocationException("An error occurred while dispatching a call to the UI Thread", exception);
+                }
+            };
 #else
             var dispatcher = Dispatcher.CurrentDispatcher;
-#endif
-            executor = action =>{
+
+            executor = action => {
                 if(dispatcher.CheckAccess())
                     action();
-                else dispatcher.BeginInvoke(action);
+                else dispatcher.Invoke(action);
             };
+#endif
+
+        }
+
+        /// <summary>
+        /// Resets the executor to use a non-dispatcher-based action executor.
+        /// </summary>
+        public static void ResetWithoutDispatcher() {
+            executor = action => action();
         }
 
         /// <summary>
         /// Executes the action on the UI thread.
         /// </summary>
         /// <param name="action">The action to execute.</param>
-        public static void OnUIThread(this System.Action action)
-        {
+        public static void OnUIThread(this System.Action action) {
             executor(action);
         }
     }
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ExtensionMethods.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ExtensionMethods.cs
index 863452d..50bb669 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ExtensionMethods.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ExtensionMethods.cs
@@ -5,10 +5,6 @@
     using System.Linq;
     using System.Linq.Expressions;
     using System.Reflection;
-    using System.Windows;
-    using System.Windows.Controls;
-    using System.Windows.Media;
-    using Expression = System.Linq.Expressions.Expression;
 
     /// <summary>
     /// Generic extension methods used by the framework.
@@ -22,8 +18,7 @@ public static class ExtensionMethods
         /// <param name="member">The member to inspect for attributes.</param>
         /// <param name="inherit">Whether or not to search for inherited attributes.</param>
         /// <returns>The list of attributes found.</returns>
-        public static IEnumerable<T> GetAttributes<T>(this MemberInfo member, bool inherit)
-        {
+        public static IEnumerable<T> GetAttributes<T>(this MemberInfo member, bool inherit) {
             return Attribute.GetCustomAttributes(member, inherit).OfType<T>();
         }
 
@@ -39,8 +34,13 @@ public static IEnumerable<T> GetAttributes<T>(this MemberInfo member, bool inher
             if (type.IsInterface)
                 typeList.AddRange(type.GetInterfaces());
 
+            var flags = BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance;
+
+            if (ConventionManager.IncludeStaticProperties)
+                flags = flags | BindingFlags.Static;
+
             return typeList
-                .Select(interfaceType => interfaceType.GetProperty(propertyName, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance))
+                .Select(interfaceType => interfaceType.GetProperty(propertyName, flags))
                 .FirstOrDefault(property => property != null);
         }
 
@@ -50,9 +50,8 @@ public static IEnumerable<T> GetAttributes<T>(this MemberInfo member, bool inher
         /// <typeparam name="T">The enumerable item's type.</typeparam>
         /// <param name="enumerable">The elements to enumerate.</param>
         /// <param name="action">The action to apply to each item in the list.</param>
-        public static void Apply<T>(this IEnumerable<T> enumerable, Action<T> action)
-        {
-            foreach (var item in enumerable)
+        public static void Apply<T>(this IEnumerable<T> enumerable, Action<T> action) {
+            foreach(var item in enumerable)
                 action(item);
         }
 
@@ -61,118 +60,50 @@ public static void Apply<T>(this IEnumerable<T> enumerable, Action<T> action)
         /// </summary>
         /// <param name="expression">The expression to convert.</param>
         /// <returns>The member info.</returns>
-        public static MemberInfo GetMemberInfo(this Expression expression)
-        {
+        public static MemberInfo GetMemberInfo(this Expression expression) {
             var lambda = (LambdaExpression)expression;
 
             MemberExpression memberExpression;
-            if (lambda.Body is UnaryExpression)
-            {
+            if(lambda.Body is UnaryExpression) {
                 var unaryExpression = (UnaryExpression)lambda.Body;
                 memberExpression = (MemberExpression)unaryExpression.Operand;
             }
-            else memberExpression = (MemberExpression)lambda.Body;
+            else
+                memberExpression = (MemberExpression)lambda.Body;
 
             return memberExpression.Member;
         }
 
-        /// <summary>
-        /// Searches through the list of named elements looking for a case-insensitive match.
-        /// </summary>
-        /// <param name="elementsToSearch">The named elements to search through.</param>
-        /// <param name="name">The name to search for.</param>
-        /// <returns>The named element or null if not found.</returns>
-        public static FrameworkElement FindName(this IEnumerable<FrameworkElement> elementsToSearch, string name)
-        {
-            return elementsToSearch.FirstOrDefault(x => x.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
-        }
-
-        /// <summary>
-        /// Gets all the <see cref="FrameworkElement"/> instances with names in the scope.
-        /// </summary>
-        /// <returns>Named <see cref="FrameworkElement"/> instances in the provided scope.</returns>
-        /// <remarks>Pass in a <see cref="DependencyObject"/> and receive a list of named <see cref="FrameworkElement"/> instances in the same scope.</remarks>
-        public static Func<DependencyObject, IEnumerable<FrameworkElement>> GetNamedElementsInScope = elementInScope =>{
-            var root = elementInScope;
-            var previous = elementInScope;
-
-            while(true)
-            {
-                if(root == null)
-                {
-                    root = previous;
-                    break;
-                }
-                if(root is UserControl)
-                    break;
-
-                previous = root;
-                root = VisualTreeHelper.GetParent(previous);
-            }
+#if WP7
+		//Method missing in WP7 Linq
+
+		/// <summary>
+		/// Merges two sequences by using the specified predicate function.
+		/// </summary>
+		/// <typeparam name="TFirst">The type of the elements of the first input sequence.</typeparam>
+		/// <typeparam name="TSecond">The type of the elements of the second input sequence.</typeparam>
+		/// <typeparam name="TResult">The type of the elements of the result sequence.</typeparam>
+		/// <param name="first">The first sequence to merge.</param>
+		/// <param name="second">The second sequence to merge.</param>
+		/// <param name="resultSelector"> A function that specifies how to merge the elements from the two sequences.</param>
+		/// <returns>An System.Collections.Generic.IEnumerable&lt;T&gt; that contains merged elements of two input sequences.</returns>
+		public static IEnumerable<TResult> Zip<TFirst, TSecond, TResult>(this IEnumerable<TFirst> first, IEnumerable<TSecond> second, Func<TFirst, TSecond, TResult> resultSelector)
+		{
+			if (first == null)
+				throw new ArgumentNullException("first");
+			if (second == null)
+				throw new ArgumentNullException("second");
+			if (resultSelector == null)
+				throw new ArgumentNullException("resultSelector");
+
+			var enumFirst = first.GetEnumerator();
+			var enumSecond = second.GetEnumerator();
+
+			while (enumFirst.MoveNext() && enumSecond.MoveNext()) {
+				yield return resultSelector(enumFirst.Current, enumSecond.Current);
+			}
+		}
 
-            var descendants = new List<FrameworkElement>();
-            var queue = new Queue<DependencyObject>();
-            queue.Enqueue(root);
-
-            while(queue.Count > 0)
-            {
-                var current = queue.Dequeue();
-                var currentElement = current as FrameworkElement;
-
-                if(currentElement != null && !string.IsNullOrEmpty(currentElement.Name))
-                    descendants.Add(currentElement);
-
-                var childCount = VisualTreeHelper.GetChildrenCount(current);
-                if(childCount > 0)
-                {
-                    for(var i = 0; i < childCount; i++)
-                    {
-                        var childDo = VisualTreeHelper.GetChild(current, i);
-
-                        if(childDo is UserControl)
-                            continue;
-
-                        queue.Enqueue(childDo);
-                    }
-                }
-                else
-                {
-                    var contentControl = current as ContentControl;
-                    if(contentControl != null)
-                    {
-                        if(contentControl.Content != null
-                            && contentControl.Content is DependencyObject
-                                && !(contentControl.Content is UserControl))
-                            queue.Enqueue(contentControl.Content as DependencyObject);
-
-#if !SILVERLIGHT
-                        var headeredControl = contentControl as HeaderedContentControl;
-                        if (headeredControl != null && headeredControl.Header is DependencyObject && !(headeredControl.Header is UserControl)) {
-                            queue.Enqueue(headeredControl.Header as DependencyObject);
-                        }
-#endif
-                    }
-                    else
-                    {
-                        var itemsControl = current as ItemsControl;
-                        if(itemsControl != null)
-                        {
-                            itemsControl.Items.OfType<DependencyObject>()
-                                .Where(item => !(item is UserControl))
-                                .Apply(queue.Enqueue);
-
-#if !SILVERLIGHT
-                            var headeredControl = itemsControl as HeaderedItemsControl;
-                            if (headeredControl != null && headeredControl.Header is DependencyObject && !(headeredControl.Header is UserControl)) {
-                                queue.Enqueue(headeredControl.Header as DependencyObject);
-                            }
 #endif
-                        }
-                    }
-                }
-            }
-
-            return descendants;
-        };
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IChild.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IChild.cs
index eb42e87..000ffa7 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IChild.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IChild.cs
@@ -1,14 +1,25 @@
 namespace Caliburn.Micro
 {
+    /// <summary>
+    /// Denotes a node within a parent/child hierarchy.
+    /// </summary>
+    public interface IChild
+    {
+        /// <summary>
+        /// Gets or Sets the Parent
+        /// </summary>
+        object Parent { get; set; }
+    }
+
     /// <summary>
     /// Denotes a node within a parent/child hierarchy.
     /// </summary>
     /// <typeparam name="TParent">The type of parent.</typeparam>
-    public interface IChild<TParent>
+    public interface IChild<TParent> : IChild
     {
         /// <summary>
         /// Gets or Sets the Parent
         /// </summary>
-        TParent Parent { get; set; }
+        new TParent Parent { get; set; }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IConductor.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IConductor.cs
index 75caec7..148a3b0 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IConductor.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IConductor.cs
@@ -2,23 +2,58 @@
 {
     using System;
     using System.Collections;
+    using System.Collections.Generic;
 
     /// <summary>
-    /// Denotes an instance which conducts other objects by managing an ActiveItem and maintaining a strict lifecycle.
+    ///   Interface used to define an object associated to a collection of children.
     /// </summary>
-    /// <remarks>Conducted instances can opt-in to the lifecycle by implementing any of the following <see cref="IActivate"/>, <see cref="IDeactivate"/>, <see cref="IGuardClose"/></remarks>
-    public interface IConductor : INotifyPropertyChangedEx
+    public interface IParent
     {
         /// <summary>
-        /// The currently active item.
+        ///   Gets the children.
         /// </summary>
-        object ActiveItem { get; set; }
+        /// <returns>
+        ///   The collection of children.
+        /// </returns>
+        IEnumerable GetChildren();
+    }
 
+    /// <summary>
+    /// Interface used to define a specialized parent.
+    /// </summary>
+    /// <typeparam name="T">The type of children.</typeparam>
+#if NET
+    public interface IParent<out T> : IParent 
+#else
+    public interface IParent<T> : IParent       
+#endif
+    {
         /// <summary>
-        /// Gets all the items that are being conducted.
+        ///   Gets the children.
         /// </summary>
-        IEnumerable GetConductedItems();
+        /// <returns>
+        ///   The collection of children.
+        /// </returns>
+        new IEnumerable<T> GetChildren();
+    }
 
+    /// <summary>
+    /// Denotes an instance which maintains an active item.
+    /// </summary>
+    public interface IHaveActiveItem
+    {
+        /// <summary>
+        /// The currently active item.
+        /// </summary>
+        object ActiveItem { get; set; }
+    }
+
+    /// <summary>
+    /// Denotes an instance which conducts other objects by managing an ActiveItem and maintaining a strict lifecycle.
+    /// </summary>
+    /// <remarks>Conducted instances can optin to the lifecycle by impelenting any of the follosing <see cref="IActivate"/>, <see cref="IDeactivate"/>, <see cref="IGuardClose"/>.</remarks>
+    public interface IConductor : IParent, INotifyPropertyChangedEx
+    {
         /// <summary>
         /// Activates the specified item.
         /// </summary>
@@ -26,14 +61,23 @@ public interface IConductor : INotifyPropertyChangedEx
         void ActivateItem(object item);
 
         /// <summary>
-        /// Closes the specified item.
+        /// Deactivates the specified item.
         /// </summary>
         /// <param name="item">The item to close.</param>
-        void CloseItem(object item);
+        /// <param name="close">Indicates whether or not to close the item after deactivating it.</param>
+        void DeactivateItem(object item, bool close);
 
         /// <summary>
         /// Occurs when an activation request is processed.
         /// </summary>
         event EventHandler<ActivationProcessedEventArgs> ActivationProcessed;
     }
+
+    /// <summary>
+    /// An <see cref="IConductor"/> that also implements <see cref="IHaveActiveItem"/>.
+    /// </summary>
+    public interface IConductActiveItem : IConductor, IHaveActiveItem
+    {
+
+    }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IHaveParameters.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IHaveParameters.cs
new file mode 100644
index 0000000..c57cd1d
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IHaveParameters.cs
@@ -0,0 +1,11 @@
+namespace Caliburn.Micro {
+    /// <summary>
+    /// Indicates that a message is parameterized.
+    /// </summary>
+    public interface IHaveParameters {
+        /// <summary>
+        /// Represents the parameters of a message.
+        /// </summary>
+        AttachedCollection<Parameter> Parameters { get; }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IScreen.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IScreen.cs
index c36c89f..816ea94 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IScreen.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/IScreen.cs
@@ -52,7 +52,6 @@ public interface IClose {
         /// <summary>
         /// Tries to close this instance.
         /// </summary>
-        /// <returns><c>True</c> if the close operation was successfull, otherwise <c>false</c>.</returns>
         void TryClose();
     }
 
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Message.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Message.cs
index 2e8434a..cb2bd9a 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Message.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Message.cs
@@ -1,5 +1,8 @@
 namespace Caliburn.Micro
 {
+    using Caliburn.Micro;
+    using System.Collections.Generic;
+    using System.Linq;
     using System.Windows;
     using System.Windows.Interactivity;
 
@@ -15,6 +18,14 @@ public static class Message {
                 null
                 );
 
+        static readonly DependencyProperty MessageTriggersProperty =
+            DependencyProperty.RegisterAttached(
+                "MessageTriggers",
+                typeof(System.Windows.Interactivity.TriggerBase[]),
+                typeof(Message),
+                null
+                );
+
         /// <summary>
         /// Places a message handler on this element.
         /// </summary>
@@ -71,12 +82,18 @@ private static void OnAttachChanged(DependencyObject d, DependencyPropertyChange
             if(e.NewValue == e.OldValue)
                 return;
 
-            var text = e.NewValue as string;
-            if(string.IsNullOrEmpty(text))
-                return;
+            var messageTriggers = (System.Windows.Interactivity.TriggerBase[])d.GetValue(MessageTriggersProperty);
+            var allTriggers = Interaction.GetTriggers(d);
+
+            if(messageTriggers != null)
+                messageTriggers.Apply(x => allTriggers.Remove(x));
+
+            var newTriggers = Parser.Parse(d, e.NewValue as string).ToArray();
+            newTriggers.Apply(allTriggers.Add);
 
-            var triggers = Interaction.GetTriggers(d);
-            Parser.Parse(d, text).Apply(triggers.Add);
+            if(newTriggers.Length > 0)
+                d.SetValue(MessageTriggersProperty, newTriggers);
+            else d.ClearValue(MessageTriggersProperty);
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/MessageBinder.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/MessageBinder.cs
index 74f67de..a00a005 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/MessageBinder.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/MessageBinder.cs
@@ -1,9 +1,9 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Globalization;
     using System.Linq;
     using System.Reflection;
+    using System.Collections.Generic;
 
 #if !SILVERLIGHT
     using System.ComponentModel;
@@ -12,12 +12,24 @@
     /// <summary>
     /// A service that is capable of properly binding values to a method's parameters and creating instances of <see cref="IResult"/>.
     /// </summary>
-    public static class MessageBinder
-    {
+    public static class MessageBinder {
         /// <summary>
-        /// The special parameter values recognized by the message binder.
+        /// The special parameter values recognized by the message binder along with their resolvers.
         /// </summary>
-        public static readonly string[] SpecialValues = new[] { "$eventargs", "$datacontext", "$source" };
+        public static readonly Dictionary<string, Func<ActionExecutionContext, object>> SpecialValues =
+            new Dictionary<string, Func<ActionExecutionContext, object>>{
+                { "$eventargs", c => c.EventArgs },
+                { "$datacontext", c => c.Source.DataContext },
+                { "$source", c => c.Source },
+                { "$executioncontext", c => c },
+                { "$view", c => c.View }
+            };
+
+        /// <summary>
+        /// Custom converters used by the framework registered by detination type for which the will be selected.
+        /// The converter is passed the existing value to convert and a "context" object.
+        /// </summary>
+        public static readonly Dictionary<Type, Func<object, object, object>> CustomConverters = new Dictionary<Type, Func<object, object, object>>();
 
         /// <summary>
         /// Determines the parameters that a method should be invoked with.
@@ -25,82 +37,84 @@ public static class MessageBinder
         /// <param name="context">The action execution context.</param>
         /// <param name="requiredParameters">The parameters required to complete the invocation.</param>
         /// <returns>The actual parameter values.</returns>
-        public static object[] DetermineParameters(ActionExecutionContext context, ParameterInfo[] requiredParameters)
-        {
+        public static object[] DetermineParameters(ActionExecutionContext context, ParameterInfo[] requiredParameters) {
             var providedValues = context.Message.Parameters.Select(x => x.Value).ToArray();
-            var values = new object[requiredParameters.Length];
-
-            for(int i = 0; i < requiredParameters.Length; i++)
-            {
-                var value = providedValues[i];
-                var stringValue = value as string;
-                object potentialValue;
-
-                if (stringValue != null)
-                {
-                    switch (stringValue.ToLower(CultureInfo.InvariantCulture))
-                    {
-                        case "$eventargs":
-                            potentialValue = context.EventArgs;
-                            break;
-                        case "$datacontext":
-                            potentialValue = context.Source.DataContext;
-                            break;
-                        case "$source":
-                            potentialValue = context.Source;
-                            break;
-                        default:
-                            potentialValue = stringValue;
-                            break;
-                    }
-                }
-                else potentialValue = value;
+            var finalValues = new object[requiredParameters.Length];
+
+            for(int i = 0; i < requiredParameters.Length; i++) {
+                var parameterType = requiredParameters[i].ParameterType;
+                var parameterValue = providedValues[i];
+                var parameterAsString = parameterValue as string;
 
-                values[i] = CoerceValue(requiredParameters[i].ParameterType, potentialValue);
+                if(parameterAsString != null)
+                    finalValues[i] = CoerceValue(parameterType, EvaluateParameter(parameterAsString, parameterType, context), context);
+                else finalValues[i] = CoerceValue(parameterType, parameterValue, context);
             }
 
-            return values;
+            return finalValues;
         }
 
+        /// <summary>
+        /// Transforms the textual parameter into the actual parameter.
+        /// </summary>
+        public static Func<string, Type, ActionExecutionContext, object> EvaluateParameter = (text, parameterType, context) => {
+            var lookup = text.ToLower(CultureInfo.InvariantCulture);
+            Func<ActionExecutionContext, object> resolver;
+            return SpecialValues.TryGetValue(lookup, out resolver) ? resolver(context) : text;
+        };
+
         /// <summary>
         /// Coerces the provided value to the destination type.
         /// </summary>
         /// <param name="destinationType">The destination type.</param>
         /// <param name="providedValue">The provided value.</param>
+        /// <param name="context">An optional context value which can be used during conversion.</param>
         /// <returns>The coerced value.</returns>
-        public static object CoerceValue(Type destinationType, object providedValue)
-        {
-            if (providedValue == null) 
+        public static object CoerceValue(Type destinationType, object providedValue, object context) {
+            if(providedValue == null)
                 return GetDefaultValue(destinationType);
 
+            if (CustomConverters.ContainsKey(destinationType))
+                return CustomConverters[destinationType](providedValue, context);
+
             var providedType = providedValue.GetType();
 
-            if (destinationType.IsAssignableFrom(providedType))
+            if(destinationType.IsAssignableFrom(providedType))
                 return providedValue;
 
-            try
-            {
+            try {
                 var converter = TypeDescriptor.GetConverter(destinationType);
 
-                if (converter.CanConvertFrom(providedType))
+                if(converter.CanConvertFrom(providedType))
                     return converter.ConvertFrom(providedValue);
 
                 converter = TypeDescriptor.GetConverter(providedType);
 
-                if (converter.CanConvertTo(destinationType))
+                if(converter.CanConvertTo(destinationType))
                     return converter.ConvertTo(providedValue, destinationType);
+
+                if (destinationType.IsEnum) {
+                    var stringValue = providedValue as string;
+                    if(stringValue != null)
+                        return Enum.Parse(destinationType, stringValue, true);
+                    return Enum.ToObject(destinationType, providedValue);
+                }
+                
+                if(typeof(Guid).IsAssignableFrom(destinationType)) {
+                    var stringValue = providedValue as string;
+                    if(stringValue != null) {
+                        return new Guid(stringValue);
+                    }
+                }
             }
-            catch
-            {
+            catch {
                 return GetDefaultValue(destinationType);
             }
 
-            try
-            {
+            try {
                 return Convert.ChangeType(providedValue, destinationType, CultureInfo.CurrentUICulture);
             }
-            catch
-            {
+            catch {
                 return GetDefaultValue(destinationType);
             }
         }
@@ -110,8 +124,7 @@ public static object CoerceValue(Type destinationType, object providedValue)
         /// </summary>
         /// <param name="type">The type.</param>
         /// <returns>The default value.</returns>
-        public static object GetDefaultValue(Type type)
-        {
+        public static object GetDefaultValue(Type type) {
             return type.IsClass || type.IsInterface ? null : Activator.CreateInstance(type);
         }
     }
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Mouse.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Mouse.cs
new file mode 100644
index 0000000..8dc65e2
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Mouse.cs
@@ -0,0 +1,21 @@
+namespace Caliburn.Micro {
+    using System.Windows;
+
+    /// <summary>
+    /// A mouse helper utility.
+    /// </summary>
+    public static class Mouse {
+        /// <summary>
+        /// The current position of the mouse.
+        /// </summary>
+        public static Point Position { get; set; }
+
+        /// <summary>
+        /// Initializes the mouse helper with the UIElement to use in mouse tracking.
+        /// </summary>
+        /// <param name="element">The UIElement to use for mouse tracking.</param>
+        public static void Initialize(UIElement element) {
+            element.MouseMove += (s, e) => { Position = e.GetPosition(null); };
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/NameTransformer.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/NameTransformer.cs
new file mode 100644
index 0000000..dbffd65
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/NameTransformer.cs
@@ -0,0 +1,95 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text.RegularExpressions;
+
+    /// <summary>
+    ///  Class for managing the list of rules for doing name transformation.
+    /// </summary>
+    public class NameTransformer : BindableCollection<NameTransformer.Rule> {
+        /// <summary>
+        ///  Adds a transform using a single replacement value and a global filter pattern.
+        /// </summary>
+        /// <param name = "replacePattern">Regular expression pattern for replacing text</param>
+        /// <param name = "replaceValue">The replacement value.</param>
+        /// <param name = "globalFilterPattern">Regular expression pattern for global filtering</param>
+        public void AddRule(string replacePattern, string replaceValue, string globalFilterPattern = null) {
+            AddRule(replacePattern, new[] { replaceValue }, globalFilterPattern);
+        }
+
+        /// <summary>
+        ///  Adds a transform using a list of replacement values and a global filter pattern.
+        /// </summary>
+        /// <param name = "replacePattern">Regular expression pattern for replacing text</param>
+        /// <param name = "replaceValueList">The list of replacement values</param>
+        /// <param name = "globalFilterPattern">Regular expression pattern for global filtering</param>
+        public void AddRule(string replacePattern, IEnumerable<string> replaceValueList, string globalFilterPattern = null) {
+            Add(new Rule {
+                ReplacePattern = replacePattern,
+                ReplacementValues = replaceValueList,
+                GlobalFilterPattern = globalFilterPattern
+            });
+        }
+
+        /// <summary>
+        /// Gets the list of transformations for a given name.
+        /// </summary>
+        /// <param name = "source">The name to transform into the resolved name list</param>
+        /// <returns>The transformed names.</returns>
+        public IEnumerable<string> Transform(string source) {
+            return Transform(source, r => r);
+        }
+
+        /// <summary>
+        /// Gets the list of transformations for a given name.
+        /// </summary>
+        /// <param name = "source">The name to transform into the resolved name list</param>
+        /// <param name = "getReplaceString">A function to do a transform on each item in the ReplaceValueList prior to applying the regular expression transform</param>
+        /// <returns>The transformed names.</returns>
+        public IEnumerable<string> Transform(string source, Func<string, string> getReplaceString) {
+            var nameList = new List<string>();
+            var rules = this.Reverse();
+
+            foreach(var rule in rules) {
+                if(!string.IsNullOrEmpty(rule.GlobalFilterPattern) && !Regex.IsMatch(source, rule.GlobalFilterPattern)) {
+                    continue;
+                }
+
+                if(!Regex.IsMatch(source, rule.ReplacePattern)) {
+                    continue;
+                }
+
+                nameList.AddRange(
+                    rule.ReplacementValues
+                        .Select(getReplaceString)
+                        .Select(repString => Regex.Replace(source, rule.ReplacePattern, repString))
+                    );
+
+                break;
+            }
+
+            return nameList;
+        }
+
+        ///<summary>
+        /// A rule that describes a name transform.
+        ///</summary>
+        public class Rule {
+            /// <summary>
+            /// Regular expression pattern for global filtering
+            /// </summary>
+            public string GlobalFilterPattern;
+
+            /// <summary>
+            /// Regular expression pattern for replacing text
+            /// </summary>
+            public string ReplacePattern;
+
+            /// <summary>
+            /// The list of replacement values
+            /// </summary>
+            public IEnumerable<string> ReplacementValues;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Parameter.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Parameter.cs
index 2576c4f..ca99f93 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Parameter.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Parameter.cs
@@ -1,5 +1,6 @@
 namespace Caliburn.Micro
 {
+    using System;
     using System.ComponentModel;
     using System.Windows;
     using System.Windows.Interactivity;
@@ -21,7 +22,7 @@ public class Parameter : DependencyObject, IAttachedObject
                 );
 
         DependencyObject associatedObject;
-        ActionMessage owner;
+        WeakReference owner;
 
         /// <summary>
         /// Gets or sets the value of the parameter.
@@ -39,6 +40,12 @@ DependencyObject IAttachedObject.AssociatedObject
             get { return associatedObject; }
         }
 
+        ActionMessage Owner
+        {
+            get { return owner == null ? null : owner.Target as ActionMessage; }
+            set { owner = new WeakReference(value); }
+        }
+
         void IAttachedObject.Attach(DependencyObject dependencyObject)
         {
             associatedObject = dependencyObject;
@@ -55,15 +62,15 @@ void IAttachedObject.Detach()
         /// <param name="owner">The action message.</param>
         internal void MakeAwareOf(ActionMessage owner)
         {
-            this.owner = owner;
+            Owner = owner;
         }
 
         static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var parameter = (Parameter)d;
 
-            if(parameter.owner != null)
-                parameter.owner.UpdateAvailability();
+            if(parameter.Owner != null)
+                parameter.Owner.UpdateAvailability();
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Parser.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Parser.cs
index 9c02a43..87242ad 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Parser.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Parser.cs
@@ -9,13 +9,14 @@
     using System.Windows.Data;
     using EventTrigger = System.Windows.Interactivity.EventTrigger;
     using TriggerBase = System.Windows.Interactivity.TriggerBase;
+    using System.Text;
 
     /// <summary>
     /// Parses text into a fully functional set of <see cref="TriggerBase"/> instances with <see cref="ActionMessage"/>.
     /// </summary>
     public static class Parser
     {
-        static readonly Regex Regex = new Regex(@",(?=(?:[^']*'[^']*')*(?![^']*'))");
+        static readonly Regex LongFormatRegularExpression = new Regex(@"^[\s]*\[[^\]]*\][\s]*=[\s]*\[[^\]]*\][\s]*$");
 
         /// <summary>
         /// Parses the specified message text.
@@ -23,20 +24,24 @@ public static class Parser
         /// <param name="target">The target.</param>
         /// <param name="text">The message text.</param>
         /// <returns>The triggers parsed from the text.</returns>
-        public static IEnumerable<TriggerBase> Parse(DependencyObject target, string text)
-        {
+        public static IEnumerable<TriggerBase> Parse(DependencyObject target, string text) {
+            if(string.IsNullOrEmpty(text))
+                return new TriggerBase[0];
+
             var triggers = new List<TriggerBase>();
-            var items = text.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+            var messageTexts = Split(text, ';');
+
+            foreach (var messageText in messageTexts) {
+                var triggerPlusMessage = LongFormatRegularExpression.IsMatch(messageText) 
+                    ? Split(messageText, '=') 
+                    : new[] { null, messageText };
 
-            foreach(var messageText in items)
-            {
-                var triggerPlusMessage = messageText.Split('=');
-                string messageDetail = triggerPlusMessage.Last()
-                    .Replace("[", string.Empty)
-                    .Replace("]", string.Empty)
-                    .Trim();
+                var messageDetail = triggerPlusMessage.Last()
+                .Replace("[", string.Empty)
+                .Replace("]", string.Empty)
+                .Trim();
 
-                var trigger = CreateTrigger(target.GetType(), triggerPlusMessage);
+                var trigger = CreateTrigger(target, triggerPlusMessage.Length == 1 ? null : triggerPlusMessage[0]);
                 var message = CreateMessage(target, messageDetail);
 
                 trigger.Actions.Add(message);
@@ -46,69 +51,78 @@ public static IEnumerable<TriggerBase> Parse(DependencyObject target, string tex
             return triggers;
         }
 
-        static TriggerBase CreateTrigger(Type targetType, string[] triggerPlusMessage)
-        {
-            if(triggerPlusMessage.Length == 1)
-            {
-                var defaults = ConventionManager.GetElementConvention(targetType);
+        /// <summary>
+        /// The function used to generate a trigger.
+        /// </summary>
+        /// <remarks>The parameters passed to the method are the the target of the trigger and string representing the trigger.</remarks>
+        public static Func<DependencyObject, string, TriggerBase> CreateTrigger = (target, triggerText) => {
+            if(triggerText == null) {
+                var defaults = ConventionManager.GetElementConvention(target.GetType());
                 return defaults.CreateTrigger();
             }
 
-            var triggerDetail = triggerPlusMessage[0]
+            var triggerDetail = triggerText
                 .Replace("[", string.Empty)
                 .Replace("]", string.Empty)
                 .Replace("Event", string.Empty)
                 .Trim();
 
             return new EventTrigger { EventName = triggerDetail };
-        }
-
-        static ActionMessage CreateMessage(DependencyObject target, string messageText)
-        {
-            var message = new ActionMessage();
-            messageText = Regex.Replace(messageText, "^Action", string.Empty);
+        };
 
+        /// <summary>
+        /// Creates an instance of <see cref="ActionMessage"/> by parsing out the textual dsl.
+        /// </summary>
+        /// <param name="target">The target of the message.</param>
+        /// <param name="messageText">The textual message dsl.</param>
+        /// <returns>The created message.</returns>
+        public static System.Windows.Interactivity.TriggerAction CreateMessage(DependencyObject target, string messageText) {
             var openingParenthesisIndex = messageText.IndexOf('(');
-            if (openingParenthesisIndex < 0) openingParenthesisIndex = messageText.Length;
+            if(openingParenthesisIndex < 0)
+                openingParenthesisIndex = messageText.Length;
             var closingParenthesisIndex = messageText.LastIndexOf(')');
-            if (closingParenthesisIndex < 0) closingParenthesisIndex = messageText.Length;
+            if(closingParenthesisIndex < 0)
+                closingParenthesisIndex = messageText.Length;
 
             var core = messageText.Substring(0, openingParenthesisIndex).Trim();
+            var message = InterpretMessageText(target, core);
+            var withParameters = message as IHaveParameters;
+            if(withParameters != null) {
+                if(closingParenthesisIndex - openingParenthesisIndex > 1) {
+                    var paramString = messageText.Substring(openingParenthesisIndex + 1, closingParenthesisIndex - openingParenthesisIndex - 1);
+                    var parameters = SplitParameters(paramString);
 
-            message.MethodName = core;
-
-            if (closingParenthesisIndex - openingParenthesisIndex > 1)
-            {
-                var paramString = messageText.Substring(openingParenthesisIndex + 1,
-                    closingParenthesisIndex - openingParenthesisIndex - 1);
-
-                var parameters = Regex.Split(paramString);
-
-                foreach (var parameter in parameters)
-                {
-                    message.Parameters.Add(CreateParameter(target, parameter.Trim()));
+                    foreach(var parameter in parameters)
+                        withParameters.Parameters.Add(CreateParameter(target, parameter.Trim()));
                 }
             }
 
             return message;
         }
 
-        static Parameter CreateParameter(DependencyObject target, string parameter)
-        {
+        /// <summary>
+        /// Function used to parse a string identified as a message.
+        /// </summary>
+        public static Func<DependencyObject, string, System.Windows.Interactivity.TriggerAction> InterpretMessageText = (target, text) => {
+            return new ActionMessage { MethodName = Regex.Replace(text, "^Action", string.Empty).Trim() };
+        };
+        
+        /// <summary>
+        /// Function used to parse a string identified as a message parameter.
+        /// </summary>
+        public static Func<DependencyObject, string, Parameter> CreateParameter = (target, parameterText) => {
             var actualParameter = new Parameter();
 
-            if(parameter.StartsWith("'") && parameter.EndsWith("'"))
-                actualParameter.Value = parameter.Substring(1, parameter.Length - 2);
-            else if(MessageBinder.SpecialValues.Contains(parameter.ToLower()) || char.IsNumber(parameter[0]))
-                actualParameter.Value = parameter;
-            else if (target is FrameworkElement)
-            {
+            if(parameterText.StartsWith("'") && parameterText.EndsWith("'"))
+                actualParameter.Value = parameterText.Substring(1, parameterText.Length - 2);
+            else if(MessageBinder.SpecialValues.ContainsKey(parameterText.ToLower()) || char.IsNumber(parameterText[0]))
+                actualParameter.Value = parameterText;
+            else if(target is FrameworkElement) {
                 var fe = (FrameworkElement)target;
-                var nameAndBindingMode = parameter.Split(':').Select(x => x.Trim()).ToArray();
+                var nameAndBindingMode = parameterText.Split(':').Select(x => x.Trim()).ToArray();
                 var index = nameAndBindingMode[0].IndexOf('.');
 
-                RoutedEventHandler handler = null;
-                handler = (s, e) =>{
+                View.ExecuteOnLoad(fe, delegate {
                     BindParameter(
                         fe,
                         actualParameter,
@@ -116,23 +130,25 @@ static Parameter CreateParameter(DependencyObject target, string parameter)
                         index == -1 ? null : nameAndBindingMode[0].Substring(index + 1),
                         nameAndBindingMode.Length == 2 ? (BindingMode)Enum.Parse(typeof(BindingMode), nameAndBindingMode[1], true) : BindingMode.OneWay
                         );
-                    fe.Loaded -= handler;
-                };
-
-                if ((bool)fe.GetValue(View.IsLoadedProperty))
-                    handler(null, null);
-                else fe.Loaded += handler;
+                });
             }
 
             return actualParameter;
-        }
+        };
 
-        private static void BindParameter(FrameworkElement target, Parameter parameter, string elementName, string path, BindingMode bindingMode)
-        {
-            var element = elementName == "$this" 
-                ? target 
-                : ExtensionMethods.GetNamedElementsInScope(target).FindName(elementName);
-            if (element == null)
+        /// <summary>
+        /// Creates a binding on a <see cref="Parameter"/>.
+        /// </summary>
+        /// <param name="target">The target to which the message is applied.</param>
+        /// <param name="parameter">The parameter object.</param>
+        /// <param name="elementName">The name of the element to bind to.</param>
+        /// <param name="path">The path of the element to bind to.</param>
+        /// <param name="bindingMode">The binding mode to use.</param>
+        public static void BindParameter(FrameworkElement target, Parameter parameter, string elementName, string path, BindingMode bindingMode) {
+            var element = elementName == "$this"
+                ? target
+                : BindingScope.GetNamedElements(target).FindName(elementName);
+            if(element == null)
                 return;
 
             if(string.IsNullOrEmpty(path))
@@ -147,14 +163,109 @@ private static void BindParameter(FrameworkElement target, Parameter parameter,
             var expression = (BindingExpression)BindingOperations.SetBinding(parameter, Parameter.ValueProperty, binding);
 
             var field = element.GetType().GetField(path + "Property", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
-            if (field == null)
+            if(field == null)
                 return;
 
-            ConventionManager.ApplySilverlightTriggers(element, (DependencyProperty)field.GetValue(null), x => expression);
+            ConventionManager.ApplySilverlightTriggers(element, (DependencyProperty)field.GetValue(null), x => expression, null, null);
 #else
             binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
             BindingOperations.SetBinding(parameter, Parameter.ValueProperty, binding);
 #endif
         }
+
+        static string[] Split(string message, char separator) {
+            //Splits a string using the specified separator, if it is found outside of relevant places
+            //delimited by [ and ]
+            string str;
+            var list = new List<string>();
+            var builder = new StringBuilder();
+
+            int squareBrackets = 0;
+            foreach(var current in message) {
+                //Square brackets are used as delimiters, so only separators outside them count...
+                if(current == '[')
+                    squareBrackets++;
+                else if(current == ']')
+                    squareBrackets--;
+                else if(current == separator) {
+                    if(squareBrackets == 0) {
+                        str = builder.ToString();
+                        if(!string.IsNullOrEmpty(str))
+                            list.Add(builder.ToString());
+                        builder.Length = 0;
+                        continue;
+                    }
+                }
+
+                builder.Append(current);
+            }
+
+            str = builder.ToString();
+            if(!string.IsNullOrEmpty(str))
+                list.Add(builder.ToString());
+
+            return list.ToArray();
+        }
+
+        static string[] SplitParameters(string parameters) {
+            //Splits parameter string taking into account brackets...
+            var list = new List<string>();
+            var builder = new StringBuilder();
+
+            bool isInString = false;
+
+            int curlyBrackets = 0;
+            int squareBrackets = 0;
+            int roundBrackets = 0;
+            for(int i = 0; i < parameters.Length; i++) {
+                var current = parameters[i];
+
+                if(current == '"') {
+                    if(i == 0 || parameters[i - 1] != '\\')
+                        isInString = !isInString;
+                }
+
+                if(!isInString) {
+                    switch(current) {
+                        case '{':
+                            curlyBrackets++;
+                            break;
+                        case '}':
+                            curlyBrackets--;
+                            break;
+                        case '[':
+                            squareBrackets++;
+                            break;
+                        case ']':
+                            squareBrackets--;
+                            break;
+                        case '(':
+                            roundBrackets++;
+                            break;
+                        case ')':
+                            roundBrackets--;
+                            break;
+                        default:
+                            if(current == ',' && roundBrackets == 0 && squareBrackets == 0 && curlyBrackets == 0) {
+                                //The only commas to be considered as parameter separators are outside:
+                                //- Strings
+                                //- Square brackets (to ignore indexers)
+                                //- Parantheses (to ignore method invocations)
+                                //- Curly brackets (to ignore initializers and Bindings)
+                                list.Add(builder.ToString());
+                                builder.Length = 0;
+                                continue;
+                            }
+                            break;
+                    }
+                }
+
+                builder.Append(current);
+            }
+
+            list.Add(builder.ToString());
+
+            return list.ToArray();
+        }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Properties/AssemblyInfo.cs
index 67c70ea..58461af 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Properties/AssemblyInfo.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Properties/AssemblyInfo.cs
@@ -3,14 +3,14 @@
 using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Caliburn Micro")]
-[assembly: AssemblyDescription("A small, yet extremely powerful implementation of Caliburn.")]
+[assembly: AssemblyDescription("A small, yet powerful framework designed for WPF, Silverlight and WP7. It implements a variety of UI patterns for solving real-world problems. Patterns that are highlighted include MVVM (Presentation Model), MVP and MVC.")]
 [assembly: AssemblyProduct("Caliburn.Micro")]
 [assembly: AssemblyCompany("Blue Spire Consulting, Inc.")]
 [assembly: AssemblyCopyright("Copyright © 2010")]
 [assembly: ComVisible(false)]
 [assembly: Guid("6449e9cb-4d4d-4d79-8f73-71a2fc647109")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 
 [assembly: XmlnsDefinition("http://www.caliburnproject.org", "Caliburn.Micro")]
 [assembly: XmlnsPrefix("http://www.caliburnproject.org", "cal")]
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Screen.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Screen.cs
index c093ba4..0f5b4cf 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Screen.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/Screen.cs
@@ -1,107 +1,90 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
-    using System.Linq;
-    using System.Collections.Generic;
-    using System.Windows;
 
     /// <summary>
-    /// A base implementation of <see cref="IScreen"/>.
+    ///   A base implementation of <see cref = "IScreen" />.
     /// </summary>
-    public class Screen : PropertyChangedBase, IScreen, IChild<IConductor>, IViewAware
-    {
-        protected static readonly ILog Log = LogManager.GetLog(typeof(Screen));
+    public class Screen : ViewAware, IScreen, IChild {
+        static readonly ILog Log = LogManager.GetLog(typeof(Screen));
 
         bool isActive;
         bool isInitialized;
-        IConductor parent;
+        object parent;
         string displayName;
-        readonly Dictionary<object, object> views = new Dictionary<object, object>();
 
         /// <summary>
-        /// Creates an instance of the screen.
+        ///   Creates an instance of the screen.
         /// </summary>
-        public Screen()
-        {
+        public Screen() {
             DisplayName = GetType().FullName;
         }
 
         /// <summary>
-        /// Gets or Sets the Parent <see cref="IConductor"/>
+        ///   Gets or Sets the Parent <see cref = "IConductor" />
         /// </summary>
-        public IConductor Parent
-        {
+        public virtual object Parent {
             get { return parent; }
-            set
-            {
+            set {
                 parent = value;
                 NotifyOfPropertyChange("Parent");
             }
         }
 
         /// <summary>
-        /// Gets or Sets the Display Name
+        ///   Gets or Sets the Display Name
         /// </summary>
-        public string DisplayName
-        {
+        public virtual string DisplayName {
             get { return displayName; }
-            set
-            {
+            set {
                 displayName = value;
                 NotifyOfPropertyChange("DisplayName");
             }
         }
 
         /// <summary>
-        /// Indicates whether or not this instance is currently active.
+        ///   Indicates whether or not this instance is currently active.
         /// </summary>
-        public bool IsActive
-        {
+        public bool IsActive {
             get { return isActive; }
-            private set
-            {
+            private set {
                 isActive = value;
                 NotifyOfPropertyChange("IsActive");
             }
         }
 
         /// <summary>
-        /// Indicates whether or not this instance is currently initialized.
+        ///   Indicates whether or not this instance is currently initialized.
         /// </summary>
-        public bool IsInitialized
-        {
+        public bool IsInitialized {
             get { return isInitialized; }
-            private set
-            {
+            private set {
                 isInitialized = value;
                 NotifyOfPropertyChange("IsInitialized");
             }
         }
 
         /// <summary>
-        /// Raised after activation occurs.
+        ///   Raised after activation occurs.
         /// </summary>
         public event EventHandler<ActivationEventArgs> Activated = delegate { };
 
         /// <summary>
-        /// Raised before deactivation.
+        ///   Raised before deactivation.
         /// </summary>
         public event EventHandler<DeactivationEventArgs> AttemptingDeactivation = delegate { };
 
         /// <summary>
-        /// Raised after deactivation.
+        ///   Raised after deactivation.
         /// </summary>
         public event EventHandler<DeactivationEventArgs> Deactivated = delegate { };
 
-        void IActivate.Activate()
-        {
+        void IActivate.Activate() {
             if(IsActive)
                 return;
 
             var initialized = false;
 
-            if(!IsInitialized)
-            {
+            if(!IsInitialized) {
                 IsInitialized = initialized = true;
                 OnInitialize();
             }
@@ -110,27 +93,28 @@ void IActivate.Activate()
             Log.Info("Activating {0}.", this);
             OnActivate();
 
-            Activated(this, new ActivationEventArgs {
+            Activated(this, new ActivationEventArgs
+            {
                 WasInitialized = initialized
             });
         }
 
         /// <summary>
-        /// Called when initializing.
+        ///   Called when initializing.
         /// </summary>
         protected virtual void OnInitialize() {}
 
         /// <summary>
-        /// Called when activating.
+        ///   Called when activating.
         /// </summary>
         protected virtual void OnActivate() {}
 
-        void IDeactivate.Deactivate(bool close)
-        {
+        void IDeactivate.Deactivate(bool close) {
             if(!IsActive && !IsInitialized)
                 return;
 
-            AttemptingDeactivation(this, new DeactivationEventArgs {
+            AttemptingDeactivation(this, new DeactivationEventArgs
+            {
                 WasClosed = close
             });
 
@@ -138,125 +122,86 @@ void IDeactivate.Deactivate(bool close)
             Log.Info("Deactivating {0}.", this);
             OnDeactivate(close);
 
-            if(close)
-                Log.Info("Closed {0}.", this);
-
-            Deactivated(this, new DeactivationEventArgs {
+            Deactivated(this, new DeactivationEventArgs
+            {
                 WasClosed = close
             });
+
+            if(close) {
+                Views.Clear();
+                Log.Info("Closed {0}.", this);
+            }
         }
 
         /// <summary>
-        /// Called when deactivating.
+        ///   Called when deactivating.
         /// </summary>
-        /// <param name="close">Inidicates whether this instance will be closed.</param>
+        /// <param name = "close">Inidicates whether this instance will be closed.</param>
         protected virtual void OnDeactivate(bool close) {}
 
         /// <summary>
-        /// Called to check whether or not this instance can close.
+        ///   Called to check whether or not this instance can close.
         /// </summary>
-        /// <param name="callback">The implementor calls this action with the result of the close check.</param>
-        public virtual void CanClose(Action<bool> callback)
-        {
+        /// <param name = "callback">The implementor calls this action with the result of the close check.</param>
+        public virtual void CanClose(Action<bool> callback) {
             callback(true);
         }
 
-        /// <summary>
-        /// Attaches a view to this instance.
-        /// </summary>
-        /// <param name="view">The view.</param>
-        /// <param name="context">The context in which the view appears.</param>
-        public virtual void AttachView(object view, object context)
-        {
-            var loadWired = views.Values.Contains(view);
-            views[context ?? ViewLocator.DefaultContext] = view;
-
-            var element = view as FrameworkElement;
-            if(!loadWired && element != null)
-                element.Loaded += delegate { OnViewLoaded(view); };
-
-            if(!loadWired)
-                ViewAttached(this, new ViewAttachedEventArgs{ View = view, Context = context });
-        }
+        System.Action GetViewCloseAction(bool? dialogResult) {
+            var conductor = Parent as IConductor;
+            if(conductor != null)
+                return () => conductor.CloseItem(this);
 
-        /// <summary>
-        /// Called when an attached view's Loaded event fires.
-        /// </summary>
-        /// <param name="view"></param>
-        protected virtual void OnViewLoaded(object view) {}
+            foreach(var contextualView in Views.Values) {
+                var viewType = contextualView.GetType();
 
-        /// <summary>
-        /// Gets a view previously attached to this instance.
-        /// </summary>
-        /// <param name="context">The context denoting which view to retrieve.</param>
-        /// <returns>The view.</returns>
-        public virtual object GetView(object context)
-        {
-            object view;
-            views.TryGetValue(context ?? ViewLocator.DefaultContext, out view);
-            return view;
-        }
+                var closeMethod = viewType.GetMethod("Close");
+                if(closeMethod != null)
+                    return () => {
+#if !SILVERLIGHT
+                        if(dialogResult != null) {
+                            var resultProperty = contextualView.GetType().GetProperty("DialogResult");
+                            if (resultProperty != null)
+                                resultProperty.SetValue(contextualView, dialogResult, null);
+                        }
+#endif
 
-        /// <summary>
-        /// Raised when a view is attached.
-        /// </summary>
-        public event EventHandler<ViewAttachedEventArgs> ViewAttached = delegate { };
+                        closeMethod.Invoke(contextualView, null);
+                    };
+
+                var isOpenProperty = viewType.GetProperty("IsOpen");
+                if(isOpenProperty != null)
+                    return () => isOpenProperty.SetValue(contextualView, false, null);
+            }
+
+            return () => {
+                var ex = new NotSupportedException("TryClose requires a parent IConductor or a view with a Close method or IsOpen property.");
+                Log.Error(ex);
+                throw ex;
+            };
+        }
 
         /// <summary>
-        /// Tries to close this instance by asking its Parent to initiate shutdown or by asking its corresponding default view to close.
+        ///   Tries to close this instance by asking its Parent to initiate shutdown or by asking its corresponding view to close.
         /// </summary>
         public void TryClose() {
             Execute.OnUIThread(() => {
-                if(Parent != null)
-                    Parent.CloseItem(this);
-                else {
-                    var view = GetView(null);
-
-                    if(view == null) {
-                        var ex = new NotSupportedException("A Parent or default view is required.");
-                        Log.Error(ex);
-                        throw ex;
-                    }
-
-                    var method = view.GetType().GetMethod("Close");
-                    if(method != null) {
-                        method.Invoke(view, null);
-                        return;
-                    }
-
-                    var property = view.GetType().GetProperty("IsOpen");
-                    if(property != null) {
-                        property.SetValue(view, false, new object[] {});
-                        return;
-                    }
-
-                    var ex2 = new NotSupportedException("The default view does not support Close/IsOpen.");
-                    Log.Error(ex2);
-                    throw ex2;
-                }
+                var closeAction = GetViewCloseAction(null);
+                closeAction();
             });
         }
 
 #if !SILVERLIGHT
 
-        /// <summary>
-        /// Closes this instance by asking its Parent to initiate shutdown or by asking it's corresponding default view to close.
-        /// This overload also provides an opportunity to pass a dialog result to it's corresponding default view.
-        /// </summary>
-        /// <param name="dialogResult">The dialog result.</param>
-        public virtual void TryClose(bool? dialogResult)
-        {
+    /// <summary>
+    /// Closes this instance by asking its Parent to initiate shutdown or by asking it's corresponding view to close.
+    /// This overload also provides an opportunity to pass a dialog result to it's corresponding view.
+    /// </summary>
+    /// <param name="dialogResult">The dialog result.</param>
+        public virtual void TryClose(bool? dialogResult) {
             Execute.OnUIThread(() => {
-                var view = GetView(null);
-
-                if(view != null)
-                {
-                    var property = view.GetType().GetProperty("DialogResult");
-                    if(property != null)
-                        property.SetValue(view, dialogResult, null);
-                }
-
-                TryClose();
+                var closeAction = GetViewCloseAction(dialogResult);
+                closeAction();
             });
         }
 
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ScreenExtensions.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ScreenExtensions.cs
new file mode 100644
index 0000000..6ab18ba
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ScreenExtensions.cs
@@ -0,0 +1,103 @@
+namespace Caliburn.Micro
+{
+    using System;
+
+    /// <summary>
+    /// Hosts extension methods for <see cref="IScreen"/> classes.
+    /// </summary>
+    public static class ScreenExtensions
+    {
+        /// <summary>
+        /// Activates the item if it implements <see cref="IActivate"/>, otherwise does nothing.
+        /// </summary>
+        /// <param name="potentialActivatable">The potential activatable.</param>
+        public static void TryActivate(object potentialActivatable)
+        {
+            var activator = potentialActivatable as IActivate;
+            if (activator != null)
+                activator.Activate();
+        }
+
+        /// <summary>
+        /// Deactivates the item if it implements <see cref="IDeactivate"/>, otherwise does nothing.
+        /// </summary>
+        /// <param name="potentialDeactivatable">The potential deactivatable.</param>
+        /// <param name="close">Indicates whether or not to close the item after deactivating it.</param>
+        public static void TryDeactivate(object potentialDeactivatable, bool close)
+        {
+            var deactivator = potentialDeactivatable as IDeactivate;
+            if (deactivator != null)
+                deactivator.Deactivate(close);
+        }
+
+        /// <summary>
+        /// Closes the specified item.
+        /// </summary>
+        /// <param name="conductor">The conductor.</param>
+        /// <param name="item">The item to close.</param>
+        public static void CloseItem(this IConductor conductor, object item)
+        {
+            conductor.DeactivateItem(item, true);
+        }
+
+        /// <summary>
+        /// Closes the specified item.
+        /// </summary>
+        /// <param name="conductor">The conductor.</param>
+        /// <param name="item">The item to close.</param>
+        public static void CloseItem<T>(this ConductorBase<T> conductor, T item)
+        {
+            conductor.DeactivateItem(item, true);
+        }
+
+        ///<summary>
+        /// Activates a child whenever the specified parent is activated.
+        ///</summary>
+        ///<param name="child">The child to activate.</param>
+        ///<param name="parent">The parent whose activation triggers the child's activation.</param>
+        public static void ActivateWith(this IActivate child, IActivate parent) {
+            EventHandler<ActivationEventArgs> handler = (s, e) => child.Activate();
+            parent.Activated += handler;
+
+            var deactivator = parent as IDeactivate;
+            if(deactivator != null) {
+                EventHandler<DeactivationEventArgs> handler2 = null;
+                handler2 = (s, e) => {
+                    if (e.WasClosed) {
+                        parent.Activated -= handler;
+                        deactivator.Deactivated -= handler2;
+                    }
+                };
+                deactivator.Deactivated += handler2;
+            }
+        }
+
+        ///<summary>
+        /// Deactivates a child whenever the specified parent is deactivated.
+        ///</summary>
+        ///<param name="child">The child to deactivate.</param>
+        ///<param name="parent">The parent whose deactivation triggers the child's deactivation.</param>
+        public static void DeactivateWith(this IDeactivate child, IDeactivate parent) {
+            EventHandler<DeactivationEventArgs> handler = null;
+            handler = (s, e) => {
+                child.Deactivate(e.WasClosed);
+                if (e.WasClosed)
+                    parent.Deactivated -= handler;
+            };
+            parent.Deactivated += handler;
+        }
+
+        ///<summary>
+        /// Activates and Deactivates a child whenever the specified parent is Activated or Deactivated.
+        ///</summary>
+        ///<param name="child">The child to activate/deactivate.</param>
+        ///<param name="parent">The parent whose activation/deactivation triggers the child's activation/deactivation.</param>
+        public static void ConductWith<TChild, TParent>(this TChild child, TParent parent) 
+            where TChild : IActivate, IDeactivate
+            where TParent : IActivate, IDeactivate
+        {
+            child.ActivateWith(parent);
+            child.DeactivateWith(parent);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/SequentialResult.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/SequentialResult.cs
index abd2737..2938f43 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/SequentialResult.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/SequentialResult.cs
@@ -1,44 +1,38 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Collections.Generic;
 
     /// <summary>
-    /// An implementation of <see cref="IResult"/> that enables sequential execution of multiple results.
+    ///   An implementation of <see cref = "IResult" /> that enables sequential execution of multiple results.
     /// </summary>
-    public class SequentialResult : IResult
-    {
+    public class SequentialResult : IResult {
         readonly IEnumerator<IResult> enumerator;
         ActionExecutionContext context;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="SequentialResult"/> class.
+        ///   Initializes a new instance of the <see cref = "SequentialResult" /> class.
         /// </summary>
-        /// <param name="enumerator">The enumerator.</param>
-        public SequentialResult(IEnumerator<IResult> enumerator)
-        {
+        /// <param name = "enumerator">The enumerator.</param>
+        public SequentialResult(IEnumerator<IResult> enumerator) {
             this.enumerator = enumerator;
         }
 
         /// <summary>
-        /// Occurs when execution has completed.
+        ///   Occurs when execution has completed.
         /// </summary>
         public event EventHandler<ResultCompletionEventArgs> Completed = delegate { };
 
         /// <summary>
-        /// Executes the result using the specified context.
+        ///   Executes the result using the specified context.
         /// </summary>
-        /// <param name="context">The context.</param>
-        public void Execute(ActionExecutionContext context)
-        {
+        /// <param name = "context">The context.</param>
+        public void Execute(ActionExecutionContext context) {
             this.context = context;
             ChildCompleted(null, new ResultCompletionEventArgs());
         }
 
-        void ChildCompleted(object sender, ResultCompletionEventArgs args)
-        {
-            if(args.Error != null || args.WasCancelled)
-            {
+        void ChildCompleted(object sender, ResultCompletionEventArgs args) {
+            if(args.Error != null || args.WasCancelled) {
                 OnComplete(args.Error, args.WasCancelled);
                 return;
             }
@@ -48,17 +42,23 @@ void ChildCompleted(object sender, ResultCompletionEventArgs args)
             if(previous != null)
                 previous.Completed -= ChildCompleted;
 
-            if(enumerator.MoveNext())
-            {
-                try
-                {
+            var moveNextSucceeded = false;
+            try {
+                moveNextSucceeded = enumerator.MoveNext();
+            }
+            catch(Exception ex) {
+                OnComplete(ex, false);
+                return;
+            }
+
+            if(moveNextSucceeded) {
+                try {
                     var next = enumerator.Current;
                     IoC.BuildUp(next);
                     next.Completed += ChildCompleted;
                     next.Execute(context);
                 }
-                catch(Exception ex)
-                {
+                catch(Exception ex) {
                     OnComplete(ex, false);
                     return;
                 }
@@ -66,9 +66,9 @@ void ChildCompleted(object sender, ResultCompletionEventArgs args)
             else OnComplete(null, false);
         }
 
-        void OnComplete(Exception error, bool wasCancelled)
-        {
-            Completed(this, new ResultCompletionEventArgs { Error = error,  WasCancelled = wasCancelled });
+        void OnComplete(Exception error, bool wasCancelled) {
+            enumerator.Dispose();
+            Completed(this, new ResultCompletionEventArgs { Error = error, WasCancelled = wasCancelled });
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/View.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/View.cs
index 4c61224..14dffc8 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/View.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/View.cs
@@ -1,14 +1,23 @@
 namespace Caliburn.Micro
 {
+    using System;
     using System.Linq;
     using System.Windows;
+    using System.Windows.Controls;
     using System.Windows.Markup;
 
     /// <summary>
     /// Hosts attached properties related to view models.
     /// </summary>
-    public static class View
-    {
+    public static class View {
+        static readonly ILog Log = LogManager.GetLog(typeof(View));
+        static readonly ContentPropertyAttribute DefaultContentProperty = new ContentPropertyAttribute("Content");
+
+        /// <summary>
+        /// The default view context.
+        /// </summary>
+        public static readonly object DefaultContext = new object();
+
         /// <summary>
         /// A dependency property which allows the framework to track whether a certain element has already been loaded in certain scenarios.
         /// </summary>
@@ -20,6 +29,17 @@ public static class View
                 new PropertyMetadata(false)
                 );
 
+        /// <summary>
+        /// A dependency property which marks an element as a name scope root.
+        /// </summary>
+        public static readonly DependencyProperty IsScopeRootProperty =
+            DependencyProperty.RegisterAttached(
+                "IsScopeRoot",
+                typeof(bool),
+                typeof(View),
+                new PropertyMetadata(false)
+                );
+
         /// <summary>
         /// A dependency property which allows the override of convention application behavior.
         /// </summary>
@@ -31,6 +51,17 @@ public static class View
                 null
                 );
 
+        /// <summary>
+        /// A dependency property for assigning a context to a particular portion of the UI.
+        /// </summary>
+        public static readonly DependencyProperty ContextProperty =
+            DependencyProperty.RegisterAttached(
+                "Context",
+                typeof(object),
+                typeof(View),
+                new PropertyMetadata(OnContextChanged)
+                );
+
         /// <summary>
         /// A dependency property for attaching a model to the UI.
         /// </summary>
@@ -43,16 +74,77 @@ public static class View
                 );
 
         /// <summary>
-        /// A dependency property for assigning a context to a particular portion of the UI.
+        /// Used by the framework to indicate that this element was generated.
         /// </summary>
-        public static readonly DependencyProperty ContextProperty =
+        public static readonly DependencyProperty IsGeneratedProperty =
             DependencyProperty.RegisterAttached(
-                "Context",
-                typeof(object),
+                "IsGenerated",
+                typeof(bool),
                 typeof(View),
-                new PropertyMetadata(OnContextChanged)
+                new PropertyMetadata(false, null)
                 );
 
+        /// <summary>
+        /// Executes the handler immediately if the element is loaded, otherwise wires it to the Loaded event.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <param name="handler">The handler.</param>
+        /// <returns>true if the handler was executed immediately; false otherwise</returns>
+        public static bool ExecuteOnLoad(FrameworkElement element, RoutedEventHandler handler) {
+#if SILVERLIGHT
+            if((bool)element.GetValue(IsLoadedProperty))
+#else
+            if(element.IsLoaded)
+#endif
+            {
+                handler(element, new RoutedEventArgs());
+                return true;
+            }
+            else {
+                RoutedEventHandler loaded = null;
+                loaded = (s, e) => {
+#if SILVERLIGHT
+                    element.SetValue(IsLoadedProperty, true);
+#endif
+                    handler(s, e);
+                    element.Loaded -= loaded;
+                };
+
+                element.Loaded += loaded;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Used to retrieve the root, non-framework-created view.
+        /// </summary>
+        /// <param name="view">The view to search.</param>
+        /// <returns>The root element that was not created by the framework.</returns>
+        /// <remarks>In certain instances the services create UI elements.
+        /// For example, if you ask the window manager to show a UserControl as a dialog, it creates a window to host the UserControl in.
+        /// The WindowManager marks that element as a framework-created element so that it can determine what it created vs. what was intended by the developer.
+        /// Calling GetFirstNonGeneratedView allows the framework to discover what the original element was. 
+        /// </remarks>
+        public static Func<object, object> GetFirstNonGeneratedView = view => {
+            var dependencyObject = view as DependencyObject;
+            if(dependencyObject == null)
+                return view;
+
+            if((bool)dependencyObject.GetValue(IsGeneratedProperty)) {
+                if(dependencyObject is ContentControl)
+                    return ((ContentControl)dependencyObject).Content;
+
+                var type = dependencyObject.GetType();
+                var contentProperty = type.GetAttributes<ContentPropertyAttribute>(true)
+                                          .FirstOrDefault() ?? DefaultContentProperty;
+
+                return type.GetProperty(contentProperty.Name)
+                    .GetValue(dependencyObject, null);
+            }
+
+            return dependencyObject;
+        };
+
         /// <summary>
         /// Gets the convention application behavior.
         /// </summary>
@@ -123,8 +215,8 @@ private static void OnModelChanged(DependencyObject targetLocation, DependencyPr
                 var context = GetContext(targetLocation);
                 var view = ViewLocator.LocateForModel(args.NewValue, targetLocation, context);
 
-                ViewModelBinder.Bind(args.NewValue, view, context);
                 SetContentProperty(targetLocation, view);
+                ViewModelBinder.Bind(args.NewValue, view, context);
             }
             else SetContentProperty(targetLocation, args.NewValue);
         }
@@ -139,9 +231,9 @@ private static void OnContextChanged(DependencyObject targetLocation, Dependency
                 return;
 
             var view = ViewLocator.LocateForModel(model, targetLocation, e.NewValue);
-            ViewModelBinder.Bind(model, view, e.NewValue);
 
             SetContentProperty(targetLocation, view);
+            ViewModelBinder.Bind(model, view, e.NewValue);
         }
 
         private static void SetContentProperty(object targetLocation, object view)
@@ -155,12 +247,17 @@ private static void SetContentProperty(object targetLocation, object view)
 
         private static void SetContentPropertyCore(object targetLocation, object view)
         {
-            var type = targetLocation.GetType();
-            var contentProperty = type.GetAttributes<ContentPropertyAttribute>(true)
-                .FirstOrDefault() ?? new ContentPropertyAttribute("Content");
+            try {
+                var type = targetLocation.GetType();
+                var contentProperty = type.GetAttributes<ContentPropertyAttribute>(true)
+                    .FirstOrDefault() ?? DefaultContentProperty;
 
-            type.GetProperty(contentProperty.Name)
-                .SetValue(targetLocation, view, null);
+                type.GetProperty(contentProperty.Name)
+                    .SetValue(targetLocation, view, null);
+            }
+            catch(Exception e) {
+                Log.Error(e);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewAware.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewAware.cs
new file mode 100644
index 0000000..e84972c
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewAware.cs
@@ -0,0 +1,118 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections.Generic;
+    using System.Windows;
+
+    ///<summary>
+    ///  A base implementation of <see cref = "IViewAware" /> which is capable of caching views by context.
+    ///</summary>
+    public class ViewAware : PropertyChangedBase, IViewAware {
+        static readonly DependencyProperty PreviouslyAttachedProperty = DependencyProperty.RegisterAttached(
+            "PreviouslyAttached",
+            typeof(bool),
+            typeof(ViewAware),
+            null
+            );
+
+        /// <summary>
+        /// Indicates whether or not implementors of <see cref="IViewAware"/> should cache their views by default.
+        /// </summary>
+        public static bool CacheViewsByDefault = true;
+
+        bool cacheViews;
+
+        /// <summary>
+        ///   The view chache for this instance.
+        /// </summary>
+        protected readonly Dictionary<object, object> Views = new Dictionary<object, object>();
+
+        ///<summary>
+        /// Creates an instance of <see cref="ViewAware"/>.
+        ///</summary>
+        public ViewAware()
+            : this(CacheViewsByDefault) {}
+
+        ///<summary>
+        /// Creates an instance of <see cref="ViewAware"/>.
+        ///</summary>
+        ///<param name="cacheViews">Indicates whether or not this instance maintains a view cache.</param>
+        public ViewAware(bool cacheViews) {
+            CacheViews = cacheViews;
+        }
+
+        /// <summary>
+        ///   Raised when a view is attached.
+        /// </summary>
+        public event EventHandler<ViewAttachedEventArgs> ViewAttached = delegate { };
+
+        ///<summary>
+        ///  Indicates whether or not this instance maintains a view cache.
+        ///</summary>
+        protected bool CacheViews {
+            get { return cacheViews; }
+            set {
+                cacheViews = value;
+                if(!cacheViews)
+                    Views.Clear();
+            }
+        }
+
+        void IViewAware.AttachView(object view, object context) {
+            if (CacheViews)
+                Views[context ?? View.DefaultContext] = view;
+
+            var nonGeneratedView = View.GetFirstNonGeneratedView(view);
+
+            var element = nonGeneratedView as FrameworkElement;
+            if (element != null && !(bool)element.GetValue(PreviouslyAttachedProperty)) {
+                element.SetValue(PreviouslyAttachedProperty, true);
+                View.ExecuteOnLoad(element, (s, e) => {
+                    OnViewLoaded(s);
+#if WP7
+                    EventHandler layoutUpdated = null;
+                    layoutUpdated = (s2, e2) => {
+                        OnViewReady(s2);
+                        element.LayoutUpdated -= layoutUpdated;
+                    };
+                    element.LayoutUpdated += layoutUpdated;
+#endif
+                });
+            }
+
+            OnViewAttached(nonGeneratedView, context);
+            ViewAttached(this, new ViewAttachedEventArgs { View = nonGeneratedView, Context = context });
+        }
+
+        /// <summary>
+        /// Called when a view is attached.
+        /// </summary>
+        /// <param name="view">The view.</param>
+        /// <param name="context">The context in which the view appears.</param>
+        protected virtual void OnViewAttached(object view, object context) {}
+
+        /// <summary>
+        ///   Called when an attached view's Loaded event fires.
+        /// </summary>
+        /// <param name = "view"></param>
+        protected virtual void OnViewLoaded(object view) {}
+
+#if WP7
+        /// <summary>
+        ///   Called the first time the attached view's LayoutUpdated event fires after its Loaded event fires.
+        /// </summary>
+        /// <param name = "view"></param>
+        protected virtual void OnViewReady(object view) { }
+#endif
+
+        /// <summary>
+        ///   Gets a view previously attached to this instance.
+        /// </summary>
+        /// <param name = "context">The context denoting which view to retrieve.</param>
+        /// <returns>The view.</returns>
+        public virtual object GetView(object context = null) {
+            object view;
+            Views.TryGetValue(context ?? View.DefaultContext, out view);
+            return view;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewLocator.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewLocator.cs
index a1e7cd4..f6c101e 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewLocator.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewLocator.cs
@@ -1,7 +1,8 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Linq;
+    using System.Reflection;
+    using System.Text.RegularExpressions;
     using System.Windows;
     using System.Windows.Controls;
 
@@ -10,30 +11,66 @@
 #endif
 
     /// <summary>
-    /// A strategy for determining which view to use for a given model.
+    ///   A strategy for determining which view to use for a given model.
     /// </summary>
-    public static class ViewLocator
-    {
+    public static class ViewLocator {
+        static readonly ILog Log = LogManager.GetLog(typeof(ViewLocator));
+
+        ///<summary>
+        /// Used to transform names.
+        ///</summary>
+        public static NameTransformer NameTransformer = new NameTransformer();
+
         /// <summary>
-        /// The default view context.
+        ///   Separator used when resolving View names for context instances.
         /// </summary>
-        public static readonly object DefaultContext = new object();
-        static readonly ILog Log = LogManager.GetLog(typeof(ViewLocator));
+        public static string ContextSeparator = ".";
+
+        static ViewLocator() {
+            //Add to list by increasing order of specificity (i.e. less specific pattern to more specific pattern)
+
+            //NameTransformer.AddRule("ViewModel$", "View");         //less specific pattern
+            //NameTransformer.AddRule("PageViewModel$", "Page");     //more specific pattern
+            //Add more default transforms here. Can also be called from the bootstrapper for project-specific transforms.
+            //NameTransformer.AddRule("FormViewModel$", "Form");
+
+            NameTransformer.AddRule("Model$", string.Empty);
+            NameTransformer.AddRule("ViewModel$", "View");
+            NameTransformer.AddRule("PageViewModel$", "Page");
+
+            //Check for <Namespace>.ViewModels.<BaseName>ViewModel construct
+            NameTransformer.AddRule
+                (
+                    @"(?<namespace>(.*\.)*)ViewModels\.(?<basename>[A-Za-z]\w*)(?<suffix>ViewModel$)",
+                    @"${namespace}Views.${basename}View",
+                    @"(.*\.)*ViewModels\.[A-Za-z]\w*ViewModel$"
+                );
+
+            //Check for <Namespace>.ViewModels.<BaseName>PageViewModel construct
+            NameTransformer.AddRule
+                (
+                    @"(?<namespace>(.*\.)*)ViewModels\.(?<basename>[A-Za-z]\w*)(?<suffix>ViewModel$)",
+                    @"${namespace}Views.${basename}Page",
+                    @"(.*\.)*ViewModels\.[A-Za-z]\w*PageViewModel$"
+                );
+        }
 
         /// <summary>
-        /// Retrieves the view from the IoC container or tries to create it if not found.
+        ///   Retrieves the view from the IoC container or tries to create it if not found.
         /// </summary>
-        /// <remarks>Pass the type of view as a parameter and recieve an instance of the view.</remarks>
-        public static Func<Type, UIElement> GetOrCreateViewType = viewType =>{
+        /// <remarks>
+        ///   Pass the type of view as a parameter and recieve an instance of the view.
+        /// </remarks>
+        public static Func<Type, UIElement> GetOrCreateViewType = viewType => {
             var view = IoC.GetAllInstances(viewType)
-                .FirstOrDefault() as UIElement;
+                           .FirstOrDefault() as UIElement;
 
-            if (view != null) {
+            if(view != null) {
                 InitializeComponent(view);
                 return view;
             }
 
-            if (viewType.IsInterface || viewType.IsAbstract || !typeof(UIElement).IsAssignableFrom(viewType))
+            if(viewType.IsInterface || viewType.IsAbstract || !typeof(UIElement).IsAssignableFrom(viewType))
                 return new TextBlock { Text = string.Format("Cannot create {0}.", viewType.FullName) };
 
             view = (UIElement)Activator.CreateInstance(viewType);
@@ -42,40 +79,66 @@ public static class ViewLocator
         };
 
         /// <summary>
-        /// Locates the view for the specified model type.
+        ///   Locates the view type based on the specified model type.
         /// </summary>
         /// <returns>The view.</returns>
-        /// <remarks>Pass the model type, display location (or null) and the context instance (or null) as parameters and receive a view instance.</remarks>
-        public static Func<Type, DependencyObject, object, UIElement> LocateForModelType = (modelType, displayLocation, context) =>{
-            var viewTypeName = modelType.FullName.Replace("Model", string.Empty);
-            if(context != null)
-            {
-                viewTypeName = viewTypeName.Remove(viewTypeName.Length - 4, 4);
-                viewTypeName = viewTypeName + "." + context;
+        /// <remarks>
+        ///   Pass the model type, display location (or null) and the context instance (or null) as parameters and receive a view type.
+        /// </remarks>
+        public static Func<Type, DependencyObject, object, Type> LocateTypeForModelType = (modelType, displayLocation, context) => {
+            var viewTypeName = modelType.FullName.Substring(
+                0,
+                modelType.FullName.IndexOf("`") < 0
+                    ? modelType.FullName.Length
+                    : modelType.FullName.IndexOf("`")
+                );
+
+            Func<string, string> getReplaceString;
+            if (context == null) {
+                getReplaceString = r => { return r; };
+            }
+            else {
+                getReplaceString = r => {
+                    return Regex.Replace(r, Regex.IsMatch(r, "Page$") ? "Page$" : "View$", ContextSeparator + context);
+                };
             }
 
-            var viewType = (from assmebly in AssemblySource.Instance
-                            from type in assmebly.GetExportedTypes()
-                            where type.FullName == viewTypeName
+            var viewTypeList = NameTransformer.Transform(viewTypeName, getReplaceString);
+            var viewType = (from assembly in AssemblySource.Instance
+                            from type in assembly.GetExportedTypes()
+                            where viewTypeList.Contains(type.FullName)
                             select type).FirstOrDefault();
 
+            return viewType;
+        };
+
+        /// <summary>
+        ///   Locates the view for the specified model type.
+        /// </summary>
+        /// <returns>The view.</returns>
+        /// <remarks>
+        ///   Pass the model type, display location (or null) and the context instance (or null) as parameters and receive a view instance.
+        /// </remarks>
+        public static Func<Type, DependencyObject, object, UIElement> LocateForModelType = (modelType, displayLocation, context) => {
+            var viewType = LocateTypeForModelType(modelType, displayLocation, context);
+
             return viewType == null
-                ? new TextBlock { Text = string.Format("{0} not found.", viewTypeName) }
-                : GetOrCreateViewType(viewType);
+                       ? new TextBlock { Text = string.Format("Cannot find view for {0}.", modelType) }
+                       : GetOrCreateViewType(viewType);
         };
 
         /// <summary>
-        /// Locates the view for the specified model instance.
+        ///   Locates the view for the specified model instance.
         /// </summary>
         /// <returns>The view.</returns>
-        /// <remarks>Pass the model instance, display location (or null) and the context (or null) as parameters and receive a view instance.</remarks>
-        public static Func<object, DependencyObject, object, UIElement> LocateForModel = (model, displayLocation, context) =>{
+        /// <remarks>
+        ///   Pass the model instance, display location (or null) and the context (or null) as parameters and receive a view instance.
+        /// </remarks>
+        public static Func<object, DependencyObject, object, UIElement> LocateForModel = (model, displayLocation, context) => {
             var viewAware = model as IViewAware;
-            if(viewAware != null)
-            {
+            if(viewAware != null) {
                 var view = viewAware.GetView(context) as UIElement;
-                if(view != null)
-                {
+                if(view != null) {
 #if !SILVERLIGHT
                     var windowCheck = view as Window;
                     if (windowCheck == null || (!windowCheck.IsLoaded && !(new WindowInteropHelper(windowCheck).Handle == IntPtr.Zero)))
@@ -94,22 +157,17 @@ public static class ViewLocator
         };
 
         /// <summary>
-        /// When a view does not contain a code-behind file, we need to automatically call InitializeCompoent.
+        ///   When a view does not contain a code-behind file, we need to automatically call InitializeCompoent.
         /// </summary>
-        /// <param name="element">The element to initialize</param>
+        /// <param name = "element">The element to initialize</param>
         public static void InitializeComponent(object element) {
-            var initializeComponentMethod = element.GetType()
-                .GetMethod("InitializeComponent", System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
+            var method = element.GetType()
+                .GetMethod("InitializeComponent", BindingFlags.Public | BindingFlags.Instance);
 
-            if(initializeComponentMethod == null)
+            if(method == null)
                 return;
 
-            try {
-                initializeComponentMethod.Invoke(element, null);
-            }
-            catch(Exception ex) {
-                Log.Error(ex);
-            }
+            method.Invoke(element, null);
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewModelBinder.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewModelBinder.cs
index 22a637d..9df597b 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewModelBinder.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewModelBinder.cs
@@ -3,7 +3,6 @@
     using System;
     using System.Linq;
     using System.Collections.Generic;
-    using System.Reflection;
     using System.Windows;
     using System.Windows.Interactivity;
 #if WP7
@@ -40,8 +39,7 @@ public static class ViewModelBinder
         /// </summary>
         /// <param name="view">The view to check.</param>
         /// <returns>Whether or not conventions should be applied to the view.</returns>
-        public static bool ShouldApplyConventions(FrameworkElement view)
-        {
+        public static bool ShouldApplyConventions(FrameworkElement view) {
             var overriden = View.GetApplyConventions(view);
             return overriden.GetValueOrDefault(ApplyConventionsByDefault);
         }
@@ -49,75 +47,88 @@ public static bool ShouldApplyConventions(FrameworkElement view)
         /// <summary>
         /// Creates data bindings on the view's controls based on the provided properties.
         /// </summary>
-        /// <remarks>Parameters include named Elements to search through and the type of view model to determine conventions for.</remarks>
-        public static Action<IEnumerable<FrameworkElement>, Type> BindProperties = (namedElements, viewModelType) =>{
+        /// <remarks>Parameters include named Elements to search through and the type of view model to determine conventions for. Returns unmatched elements.</remarks>
+        public static Func<IEnumerable<FrameworkElement>, Type, IEnumerable<FrameworkElement>> BindProperties = (namedElements, viewModelType) => {
+            var unmatchedElements = new List<FrameworkElement>();
+
             foreach(var element in namedElements) {
                 var cleanName = element.Name.Trim('_');
                 var parts = cleanName.Split(new[] { '_' }, StringSplitOptions.RemoveEmptyEntries);
 
                 var property = viewModelType.GetPropertyCaseInsensitive(parts[0]);
+                var interpretedViewModelType = viewModelType;
 
-                for (int i = 1; i < parts.Length && property != null; i++) {
-                    property = property.PropertyType.GetPropertyCaseInsensitive(parts[i]);
+                for(int i = 1; i < parts.Length && property != null; i++) {
+                    interpretedViewModelType = property.PropertyType;
+                    property = interpretedViewModelType.GetPropertyCaseInsensitive(parts[i]);
                 }
 
-                if (property == null) {
-                    Log.Info("No convention applied to {0}.", element.Name);
+                if(property == null) {
+                    unmatchedElements.Add(element);
+                    Log.Info("Binding Convention Not Applied: Element {0} did not match a property.", element.Name);
                     continue;
                 }
 
                 var convention = ConventionManager.GetElementConvention(element.GetType());
-                if (convention == null) {
-                    Log.Warn("No conventions configured for {0}.", element.GetType());
+                if(convention == null) {
+                    unmatchedElements.Add(element);
+                    Log.Warn("Binding Convention Not Applied: No conventions configured for {0}.", element.GetType());
                     continue;
                 }
 
-                convention.ApplyBinding(
-                    parts.Length == 1 ? viewModelType : property.PropertyType,
+                var applied = convention.ApplyBinding(
+                    interpretedViewModelType,
                     cleanName.Replace('_', '.'),
                     property,
                     element,
                     convention
                     );
-                
-                Log.Info("Added convention binding for {0}.", element.Name);
+
+                if(applied)
+                    Log.Info("Binding Convention Applied: Element {0}.", element.Name);
+                else {
+                    Log.Info("Binding Convention Not Applied: Element {0} has existing binding.", element.Name);
+                    unmatchedElements.Add(element);
+                }
             }
+
+            return unmatchedElements;
         };
 
         /// <summary>
         /// Attaches instances of <see cref="ActionMessage"/> to the view's controls based on the provided methods.
         /// </summary>
-        /// <remarks>Parameters include the named elements to search through and the type of view model to determine conventions for.</remarks>
-        public static Action<IEnumerable<FrameworkElement>, Type> BindActions = (namedElements, viewModelType) =>{
+        /// <remarks>Parameters include the named elements to search through and the type of view model to determine conventions for. Returns unmatched elements.</remarks>
+        public static Func<IEnumerable<FrameworkElement>, Type, IEnumerable<FrameworkElement>> BindActions = (namedElements, viewModelType) => {
             var methods = viewModelType.GetMethods();
-            foreach(var method in methods)
-            {
-                var foundControl = namedElements.FindName(method.Name);
-                if(foundControl == null)
-                {
-                    Log.Info("No bindable control for action {0}.", method.Name);
+            var unmatchedElements = namedElements.ToList();
+
+            foreach(var method in methods) {
+                var foundControl = unmatchedElements.FindName(method.Name);
+                if(foundControl == null) {
+                    Log.Info("Action Convention Not Applied: No actionable element for {0}.", method.Name);
                     continue;
                 }
 
+                unmatchedElements.Remove(foundControl);
+
                 var triggers = Interaction.GetTriggers(foundControl);
-                if (triggers != null && triggers.Count > 0) {
-                    Log.Info("Interaction.Triggers already set on control {0}.", foundControl.Name);
+                if(triggers != null && triggers.Count > 0) {
+                    Log.Info("Action Convention Not Applied: Interaction.Triggers already set on {0}.", foundControl.Name);
                     continue;
                 }
 
                 var message = method.Name;
                 var parameters = method.GetParameters();
 
-                if(parameters.Length > 0)
-                {
+                if(parameters.Length > 0) {
                     message += "(";
 
-                    foreach(var parameter in parameters)
-                    {
+                    foreach(var parameter in parameters) {
                         var paramName = parameter.Name;
                         var specialValue = "$" + paramName.ToLower();
 
-                        if(MessageBinder.SpecialValues.Contains(specialValue))
+                        if(MessageBinder.SpecialValues.ContainsKey(specialValue))
                             paramName = specialValue;
 
                         message += paramName + ",";
@@ -127,11 +138,18 @@ public static bool ShouldApplyConventions(FrameworkElement view)
                     message += ")";
                 }
 
-                Log.Info("Added convention action for {0} as {1}.", method.Name, message);
+                Log.Info("Action Convention Applied: Action {0} on element {1}.", method.Name, message);
                 Message.SetAttach(foundControl, message);
             }
+
+            return unmatchedElements;
         };
 
+        /// <summary>
+        /// Allows the developer to add custom handling of named elements which were not matched by any default conventions.
+        /// </summary>
+        public static Action<IEnumerable<FrameworkElement>, Type> HandleUnmatchedElements = (elements, viewModelType) => {};
+
         /// <summary>
         /// Binds the specified viewModel to the view.
         /// </summary>
@@ -150,28 +168,29 @@ public static bool ShouldApplyConventions(FrameworkElement view)
             if ((bool)view.GetValue(ConventionsAppliedProperty))
                 return;
 
-#if WP7
-            var element = view as FrameworkElement;
-#else
-            var element = WindowManager.GetSignificantView(view) as FrameworkElement;
-#endif
+			var element = View.GetFirstNonGeneratedView(view) as FrameworkElement;
             if(element == null)
                 return;
 
             if(!ShouldApplyConventions(element))
             {
-                Log.Info("Skipping conventions {0} and {1}.", element, viewModel);
+                Log.Info("Skipping conventions for {0} and {1}.", element, viewModel);
                 return;
             }
 
             var viewModelType = viewModel.GetType();
-            var namedElements = ExtensionMethods.GetNamedElementsInScope(element);
-            var isLoaded = element.GetValue(View.IsLoadedProperty);
 
-            namedElements.Apply(x => x.SetValue(View.IsLoadedProperty, isLoaded));
+            var namedElements = BindingScope.GetNamedElements(element);
 
-            BindActions(namedElements, viewModelType);
-            BindProperties(namedElements, viewModelType);
+#if SILVERLIGHT
+            namedElements.Apply(x => x.SetValue(
+                View.IsLoadedProperty,
+                element.GetValue(View.IsLoadedProperty))
+                );
+#endif
+            namedElements = BindActions(namedElements, viewModelType);
+            namedElements = BindProperties(namedElements, viewModelType);
+            HandleUnmatchedElements(namedElements, viewModelType);
 #if WP7
             BindAppBar(view);
 #endif
@@ -190,7 +209,7 @@ public static bool ShouldApplyConventions(FrameworkElement view)
             foreach(var item in page.ApplicationBar.Buttons) {
                 var button = item as AppBarButton;
                 if (button == null)
-                    return;
+                    continue;
 
                 var parsedTrigger = Parser.Parse(view, button.Message).First();
                 var trigger = new AppBarButtonTrigger(button);
@@ -207,7 +226,7 @@ public static bool ShouldApplyConventions(FrameworkElement view)
             foreach (var item in page.ApplicationBar.MenuItems) {
                 var menuItem = item as AppBarMenuItem;
                 if (menuItem == null)
-                    return;
+					continue;
 
                 var parsedTrigger = Parser.Parse(view, menuItem.Message).First();
                 var trigger = new AppBarMenuItemTrigger(menuItem);
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewModelLocator.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewModelLocator.cs
index 093adef..4dd5db2 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewModelLocator.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/ViewModelLocator.cs
@@ -1,36 +1,154 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
+    using System.Linq;
+    using System.Text.RegularExpressions;
     using System.Windows;
 
     /// <summary>
-    /// A strategy for determining which view model to use for a given view.
+    ///   A strategy for determining which view model to use for a given view.
     /// </summary>
-    public static class ViewModelLocator
-    {
+    public static class ViewModelLocator {
+        ///<summary>
+        /// Used to transform names.
+        ///</summary>
+        public static readonly NameTransformer NameTransformer = new NameTransformer();
+
+        static ViewModelLocator() {
+            //Add to list by increasing order of specificity (i.e. less specific pattern to more specific pattern)
+
+            NameTransformer.AddRule(
+                @"(?<fullname>^.*$)",
+                @"${fullname}Model"
+                );
+
+            //Check for <Namespace>.<BaseName>View construct
+            NameTransformer.AddRule
+                (
+                    @"(?<namespace>(.*\.)*)(?<basename>[A-Za-z]\w*)(?<suffix>View$)",
+                    new[] {
+                        @"${namespace}${basename}ViewModel",
+                        @"${namespace}${basename}",
+                        @"${namespace}I${basename}ViewModel",
+                        @"${namespace}I${basename}"
+                    },
+                    @"(.*\.)*[A-Za-z]\w*View$"
+                );
+
+            //Check for <Namespace>.<BaseName>Page construct
+            //Add "View" synonyms below: (?<namespace>(.*\.)*)(?<basename>[A-Za-z]\w*)(?<suffix>(Page$)|(Form$)|(Screen$))"
+            NameTransformer.AddRule
+                (
+                    @"(?<namespace>(.*\.)*)(?<basename>[A-Za-z]\w*)(?<suffix>Page$)",
+                    new[] {
+                        @"${namespace}${basename}${suffix}ViewModel",
+                        @"${namespace}I${basename}${suffix}ViewModel"
+                    },
+                    @"(.*\.)*[A-Za-z]\w*Page$"
+                );
+
+            //Check for <Namespace>.Views.<BaseName>View construct
+            NameTransformer.AddRule
+                (
+                    @"(?<namespace>(.*\.)*)Views\.(?<basename>[A-Za-z]\w*)(?<suffix>View$)",
+                    new[] {
+                        @"${namespace}ViewModels.${basename}ViewModel",
+                        @"${namespace}ViewModels.${basename}",
+                        @"${namespace}ViewModels.I${basename}ViewModel",
+                        @"${namespace}ViewModels.I${basename}"
+                    },
+                    @"(.*\.)*Views\.[A-Za-z]\w*View$"
+                );
+
+            //Check for <Namespace>.Views.<BaseName><ViewSynonym> construct
+            //Add "View" synonyms below: (?<namespace>(.*\.)*)Views\.(?<basename>[A-Za-z]\w*)(?<suffix>(Page$)|(Form$)|(Screen$))"
+            NameTransformer.AddRule
+                (
+                    @"(?<namespace>(.*\.)*)Views\.(?<basename>[A-Za-z]\w*)(?<suffix>Page$)",
+                    new[] {
+                        @"${namespace}ViewModels.${basename}${suffix}ViewModel",
+                        @"${namespace}ViewModels.I${basename}${suffix}ViewModel"
+                    },
+                    @"(.*\.)*Views\.[A-Za-z]\w*Page$"
+                );
+        }
+
         /// <summary>
-        /// Locates the view model for the specified view type.
+        ///   Makes a type name into an interface name.
         /// </summary>
-        /// <returns>The view model.</returns>
-        /// <remarks>Pass the view type as a parameter and receive a view model instance.</remarks>
-        public static Func<Type, object> LocateForViewType = viewType =>{
+        /// <param name = "typeName">The part.</param>
+        /// <returns></returns>
+        public static string MakeInterface(string typeName) {
+            var suffix = string.Empty;
+            if(typeName.Contains("[[")) {
+                //generic type
+                var genericParStart = typeName.IndexOf("[[");
+                suffix = typeName.Substring(genericParStart);
+                typeName = typeName.Remove(genericParStart);
+            }
+
+            var index = typeName.LastIndexOf(".");
+            return typeName.Insert(index + 1, "I") + suffix;
+        }
+
+        /// <summary>
+        ///   Determines the view model type based on the specified view type.
+        /// </summary>
+        /// <returns>The view model type.</returns>
+        /// <remarks>
+        ///   Pass the view type and receive a view model type. Pass true for the second parameter to search for interfaces.
+        /// </remarks>
+        public static Func<Type, bool, Type> LocateTypeForViewType = (viewType, searchForInterface) => {
             var typeName = viewType.FullName;
 
-            if(!typeName.EndsWith("View"))
-                typeName += "View";
+            Func<string, string> getReplaceString;
+            if(searchForInterface) {
+                getReplaceString = r => { return r; };
+            }
+            else {
+                getReplaceString = r => {
+                    return Regex.IsMatch(r, @"I\${basename}") ? String.Empty : r;
+                };
+            }
+
+            var viewModelTypeList = NameTransformer.Transform(typeName, getReplaceString);
+            var viewModelType = (from assembly in AssemblySource.Instance
+                                 from type in assembly.GetExportedTypes()
+                                 where viewModelTypeList.Contains(type.FullName)
+                                 select type).FirstOrDefault();
+
+
+            return viewModelType;
+        };
+
+        /// <summary>
+        ///   Locates the view model for the specified view type.
+        /// </summary>
+        /// <returns>The view model.</returns>
+        /// <remarks>
+        ///   Pass the view type as a parameter and receive a view model instance.
+        /// </remarks>
+        public static Func<Type, object> LocateForViewType = viewType => {
+            var viewModelType = LocateTypeForViewType(viewType, false);
 
-            var viewModelName = typeName.Replace("View", "ViewModel");
-            var key = viewModelName.Substring(viewModelName.LastIndexOf(".") + 1);
+            if(viewModelType != null) {
+                var viewModel = IoC.GetInstance(viewModelType, null);
+                if(viewModel != null) {
+                    return viewModel;
+                }
+            }
 
-            return IoC.GetInstance(null, key);
+            viewModelType = LocateTypeForViewType(viewType, true);
+            return IoC.GetInstance(viewModelType, null);
         };
 
         /// <summary>
-        /// Locates the view model for the specified view instance.
+        ///   Locates the view model for the specified view instance.
         /// </summary>
         /// <returns>The view model.</returns>
-        /// <remarks>Pass the view instance as a parameters and receive a view model instance.</remarks>
-        public static Func<object, object> LocateForView = view =>{
+        /// <remarks>
+        ///   Pass the view instance as a parameters and receive a view model instance.
+        /// </remarks>
+        public static Func<object, object> LocateForView = view => {
             if(view == null)
                 return null;
 
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/WindowManager.cs b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/WindowManager.cs
index fae42c1..231f6f6 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/WindowManager.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.Silverlight/WindowManager.cs
@@ -1,9 +1,11 @@
 namespace Caliburn.Micro
 {
     using System;
+    using System.Collections.Generic;
     using System.ComponentModel;
     using System.Windows;
     using System.Windows.Controls;
+    using System.Windows.Controls.Primitives;
     using System.Windows.Data;
 
     /// <summary>
@@ -17,6 +19,22 @@ public interface IWindowManager
         /// <param name="rootModel">The root model.</param>
         /// <param name="context">The context.</param>
         void ShowDialog(object rootModel, object context = null);
+
+        /// <summary>
+        /// Shows a toast notification for the specified model.
+        /// </summary>
+        /// <param name="rootModel">The root model.</param>
+        /// <param name="durationInMilliseconds">How long the notification should appear for.</param>
+        /// <param name="context">The context.</param>
+        void ShowNotification(object rootModel, int durationInMilliseconds, object context = null);
+
+        /// <summary>
+        /// Shows a popup at the current mouse position.
+        /// </summary>
+        /// <param name="rootModel">The root model.</param>
+        /// <param name="context">The view context.</param>
+        /// <param name="settings">The optional popup settings.</param>
+        void ShowPopup(object rootModel, object context = null, IDictionary<string, object> settings = null);
     }
 
     /// <summary>
@@ -24,38 +42,12 @@ public interface IWindowManager
     /// </summary>
     public class WindowManager : IWindowManager
     {
-        static readonly DependencyProperty IsElementGeneratedProperty =
-            DependencyProperty.RegisterAttached(
-                "IsElementGenerated",
-                typeof(bool),
-                typeof(WindowManager),
-                new PropertyMetadata(false, null)
-                );
-
-        /// <summary>
-        /// Used to retrieve the root, non-framework-created view.
-        /// </summary>
-        /// <param name="view">The view to search.</param>
-        /// <returns>The root element that was not created by the framework.</returns>
-        /// <remarks>In certain instances the WindowManager creates UI elements in order to display windows.
-        /// For example, if you ask the window manager to show a UserControl as a dialog, it creates a window to host the UserControl in.
-        /// The WindowManager marks that element as a framework-created element so that it can determine what it created vs. what was intended by the developer.
-        /// Calling GetSignificantView allows the framework to discover what the original element was. 
-        /// </remarks>
-        public static DependencyObject GetSignificantView(DependencyObject view)
-        {
-            if((bool)view.GetValue(IsElementGeneratedProperty))
-                return (DependencyObject)((ContentControl)view).Content;
-
-            return view;
-        }
-
         /// <summary>
         /// Shows a modal dialog for the specified model.
         /// </summary>
         /// <param name="rootModel">The root model.</param>
         /// <param name="context">The context.</param>
-        public void ShowDialog(object rootModel, object context = null)
+        public virtual void ShowDialog(object rootModel, object context = null)
         {
             var view = EnsureWindow(rootModel, ViewLocator.LocateForModel(rootModel, null, context));
             ViewModelBinder.Bind(rootModel, view, context);
@@ -72,14 +64,101 @@ public void ShowDialog(object rootModel, object context = null)
             view.Show();
         }
 
-        static ChildWindow EnsureWindow(object model, object view)
+        /// <summary>
+        /// Shows a toast notification for the specified model.
+        /// </summary>
+        /// <param name="rootModel">The root model.</param>
+        /// <param name="durationInMilliseconds">How long the notification should appear for.</param>
+        /// <param name="context">The context.</param>
+        public virtual void ShowNotification(object rootModel, int durationInMilliseconds, object context = null)
+        {
+            var window = new NotificationWindow();
+            var view = ViewLocator.LocateForModel(rootModel, window, context);
+
+            ViewModelBinder.Bind(rootModel, view, null);
+            window.Content = (FrameworkElement)view;
+
+            var activator = rootModel as IActivate;
+            if (activator != null)
+                activator.Activate();
+
+            var deactivator = rootModel as IDeactivate;
+            if(deactivator != null)
+                window.Closed += delegate { deactivator.Deactivate(true); };
+
+            window.Show(durationInMilliseconds);
+        }
+
+        /// <summary>
+        /// Shows a popup at the current mouse position.
+        /// </summary>
+        /// <param name="rootModel">The root model.</param>
+        /// <param name="context">The view context.</param>
+        /// <param name="settings">The optional popup settings.</param>
+        public virtual void ShowPopup(object rootModel, object context = null, IDictionary<string, object> settings = null)
+        {
+            var popup = CreatePopup(rootModel, settings);
+            var view = ViewLocator.LocateForModel(rootModel, popup, context);
+
+            popup.Child = view;
+            popup.SetValue(View.IsGeneratedProperty, true);
+
+            ViewModelBinder.Bind(rootModel, popup, null);
+
+            var activatable = rootModel as IActivate;
+            if (activatable != null)
+                activatable.Activate();
+
+            var deactivator = rootModel as IDeactivate;
+            if (deactivator != null)
+                popup.Closed += delegate { deactivator.Deactivate(true); };
+
+            popup.IsOpen = true;
+            popup.CaptureMouse();
+        }
+
+        /// <summary>
+        /// Creates a popup for hosting a popup window.
+        /// </summary>
+        /// <param name="rootModel">The model.</param>
+        /// <param name="settings">The optional popup settings.</param>
+        /// <returns>The popup.</returns>
+        protected virtual Popup CreatePopup(object rootModel, IDictionary<string, object> settings)
+        {
+            var popup = new Popup {
+                HorizontalOffset = Mouse.Position.X,
+                VerticalOffset = Mouse.Position.Y
+            };
+
+            if (settings != null) {
+                var type = popup.GetType();
+
+                foreach (var pair in settings)
+                {
+                    var propertyInfo = type.GetProperty(pair.Key);
+
+                    if(propertyInfo != null)
+                        propertyInfo.SetValue(popup, pair.Value, null);
+                }
+            }
+
+            return popup;
+        }
+
+        /// <summary>
+        /// Ensures that the view is a <see cref="ChildWindow"/> or is wrapped by one.
+        /// </summary>
+        /// <param name="model">The view model.</param>
+        /// <param name="view">The view.</param>
+        /// <returns>The window.</returns>
+        protected virtual ChildWindow EnsureWindow(object model, object view)
         {
             var window = view as ChildWindow;
 
             if(window == null)
             {
                 window = new ChildWindow { Content = view };
-                window.SetValue(IsElementGeneratedProperty, true);
+                window.SetValue(View.IsGeneratedProperty, true);
             }
 
             return window;
@@ -126,9 +205,12 @@ class WindowConductor {
             }
 
             void Deactivated(object sender, DeactivationEventArgs e) {
+                if(!e.WasClosed)
+                    return;
+
                 ((IDeactivate)model).Deactivated -= Deactivated;
 
-                if(!e.WasClosed || deactivatingFromView)
+                if (deactivatingFromView)
                     return;
 
                 deactivateFromViewModel = true;
@@ -139,6 +221,9 @@ class WindowConductor {
             }
 
             void Closing(object sender, CancelEventArgs e) {
+                if (e.Cancel)
+                    return;
+
                 var guard = (IGuardClose)model;
 
                 if (actuallyClosing)
@@ -150,13 +235,15 @@ class WindowConductor {
                 bool runningAsync = false, shouldEnd = false;
 
                 guard.CanClose(canClose => {
-                    if(runningAsync && canClose) {
-                        actuallyClosing = true;
-                        view.Close();
-                    }
-                    else e.Cancel = !canClose;
+                    Execute.OnUIThread(() => {
+                        if(runningAsync && canClose) {
+                            actuallyClosing = true;
+                            view.Close();
+                        }
+                        else e.Cancel = !canClose;
 
-                    shouldEnd = true;
+                        shouldEnd = true;
+                    });
                 });
 
                 if (shouldEnd)
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/AppSettingsStorageMechanism.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/AppSettingsStorageMechanism.cs
new file mode 100644
index 0000000..11785d7
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/AppSettingsStorageMechanism.cs
@@ -0,0 +1,91 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections.Generic;
+    using System.IO.IsolatedStorage;
+
+    /// <summary>
+    /// Stores data in the application settings.
+    /// </summary>
+    public class AppSettingsStorageMechanism : IStorageMechanism {
+        readonly IPhoneContainer container;
+        List<string> keys;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AppSettingsStorageMechanism"/> class.
+        /// </summary>
+        /// <param name="container">The container.</param>
+        public AppSettingsStorageMechanism(IPhoneContainer container) {
+            this.container = container;
+        }
+
+        /// <summary>
+        /// Indicates what storage modes this mechanism provides.
+        /// </summary>
+        /// <param name="mode">The storage mode to check.</param>
+        /// <returns>
+        /// Whether or not it is supported.
+        /// </returns>
+        public bool Supports(StorageMode mode) {
+            return (mode & StorageMode.Permanent) == StorageMode.Permanent;
+        }
+
+        /// <summary>
+        /// Begins the storage transaction.
+        /// </summary>
+        public void BeginStoring() {
+            keys = new List<string>();
+        }
+
+        /// <summary>
+        /// Stores the value with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="data">The data.</param>
+        public void Store(string key, object data) {
+            if (!IsolatedStorageSettings.ApplicationSettings.Contains(key)) {
+                keys.Add(key);
+            }
+
+            IsolatedStorageSettings.ApplicationSettings[key] = data;
+        }
+
+        /// <summary>
+        /// Ends the storage transaction.
+        /// </summary>
+        public void EndStoring() {
+            IsolatedStorageSettings.ApplicationSettings.Save();
+        }
+
+        public bool TryGet(string key, out object value) {
+            return IsolatedStorageSettings.ApplicationSettings.TryGetValue(key, out value);
+        }
+
+        /// <summary>
+        /// Deletes the data with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        public void Delete(string key) {
+            IsolatedStorageSettings.ApplicationSettings.Remove(key);
+        }
+
+        /// <summary>
+        /// Clears the data stored in the last storage transaction.
+        /// </summary>
+        public void ClearLastSession() {
+            if (keys != null) {
+                keys.Apply(x => IsolatedStorageSettings.ApplicationSettings.Remove(x));
+                keys = null;
+            }
+        }
+
+        /// <summary>
+        /// Registers service with the storage mechanism as a singleton.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="implementation">The implementation.</param>
+        public void RegisterSingleton(Type service, string key, Type implementation) {
+            container.RegisterWithAppSettings(service, key, implementation);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/Caliburn.Micro.WP7.Extensions.csproj b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/Caliburn.Micro.WP7.Extensions.csproj
new file mode 100644
index 0000000..163e420
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/Caliburn.Micro.WP7.Extensions.csproj
@@ -0,0 +1,92 @@
+<?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>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4C378193-CF03-4B85-8F2A-B1C00B1720DB}</ProjectGuid>
+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Caliburn.Micro</RootNamespace>
+    <AssemblyName>Caliburn.Micro.Extensions</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightApplication>false</SilverlightApplication>
+    <ValidateXaml>true</ValidateXaml>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\bin\WP7\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT WP7</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\bin\WP7\Debug\Caliburn.Micro.Extensions.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\bin\WP7\Release\</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT WP7</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\bin\WP7\Release\Caliburn.Micro.Extensions.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Phone" />
+    <Reference Include="System.Windows" />
+    <Reference Include="system" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Net" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ContainerExtensions.cs" />
+    <Compile Include="IPhoneContainer.cs" />
+    <Compile Include="AppSettingsStorageMechanism.cs" />
+    <Compile Include="NavigationExtensions.cs" />
+    <Compile Include="StorageInstruction.cs" />
+    <Compile Include="StorageInstructionBuilder.cs" />
+    <Compile Include="IStorageMechanism.cs" />
+    <Compile Include="IStorageHandler.cs" />
+    <Compile Include="StorageHandler.cs" />
+    <Compile Include="PhoneContainer.cs" />
+    <Compile Include="PhoneStateStorageMechanism.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SimpleContainer.cs" />
+    <Compile Include="StorageInstructionExtensions.cs" />
+    <Compile Include="StorageMode.cs" />
+    <Compile Include="StorageCoordinator.cs" />
+    <Compile Include="TaskCompleted.cs" />
+    <Compile Include="TaskExecutionRequested.cs" />
+    <Compile Include="TaskExtensionMethods.cs" />
+    <Compile Include="TaskController.cs" />
+    <Compile Include="UriBuilder.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Caliburn.Micro.WP7\Caliburn.Micro.WP7.csproj">
+      <Project>{1AA45CEC-DF5D-49F7-B4E9-8CC32BCBD49C}</Project>
+      <Name>Caliburn.Micro.WP7</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
+  <ProjectExtensions />
+  <!-- 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/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/ContainerExtensions.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/ContainerExtensions.cs
new file mode 100644
index 0000000..cfb6f06
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/ContainerExtensions.cs
@@ -0,0 +1,108 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Linq;
+    using System.Reflection;
+
+    /// <summary>
+    /// Extension methods for the <see cref="SimpleContainer"/>.
+    /// </summary>
+    public static class ContainerExtensions {
+        /// <summary>
+        /// Registers a singleton.
+        /// </summary>
+        /// <typeparam name="TImplementation">The type of the implementation.</typeparam>
+        /// <param name="container">The container.</param>
+        /// <returns>The container.</returns>
+        public static SimpleContainer Singleton<TImplementation>(this SimpleContainer container) {
+            container.RegisterSingleton(typeof(TImplementation), null, typeof(TImplementation));
+            return container;
+        }
+
+        /// <summary>
+        /// Registers a singleton.
+        /// </summary>
+        /// <typeparam name="TService">The type of the service.</typeparam>
+        /// <typeparam name="TImplementation">The type of the implementation.</typeparam>
+        /// <param name="container">The container.</param>
+        /// <returns>The container.</returns>
+        public static SimpleContainer Singleton<TService, TImplementation>(this SimpleContainer container)
+            where TImplementation : TService {
+            container.RegisterSingleton(typeof(TService), null, typeof(TImplementation));
+            return container;
+        }
+
+        /// <summary>
+        /// Registers an service to be created on each request.
+        /// </summary>
+        /// <typeparam name="TService">The type of the service.</typeparam>
+        /// <typeparam name="TImplementation">The type of the implementation.</typeparam>
+        /// <param name="container">The container.</param>
+        /// <returns>The container.</returns>
+        public static SimpleContainer PerRequest<TService, TImplementation>(this SimpleContainer container)
+            where TImplementation : TService {
+            container.RegisterPerRequest(typeof(TService), null, typeof(TImplementation));
+            return container;
+        }
+
+        /// <summary>
+        /// Registers an service to be created on each request.
+        /// </summary>
+        /// <typeparam name="TImplementation">The type of the implementation.</typeparam>
+        /// <param name="container">The container.</param>
+        /// <returns>The container.</returns>
+        public static SimpleContainer PerRequest<TImplementation>(this SimpleContainer container) {
+            container.RegisterPerRequest(typeof(TImplementation), null, typeof(TImplementation));
+            return container;
+        }
+
+        /// <summary>
+        /// Registers an instance with the container.
+        /// </summary>
+        /// <typeparam name="TService">The type of the service.</typeparam>
+        /// <param name="container">The container.</param>
+        /// <param name="instance">The instance.</param>
+        /// <returns>The container.</returns>
+        public static SimpleContainer Instance<TService>(this SimpleContainer container, TService instance) {
+            container.RegisterInstance(typeof(TService), null, instance);
+            return container;
+        }
+
+        /// <summary>
+        /// Registers a custom service handler with the container.
+        /// </summary>
+        /// <typeparam name="TService">The type of the service.</typeparam>
+        /// <param name="container">The container.</param>
+        /// <param name="handler">The handler.</param>
+        /// <returns>The container.</returns>
+        public static SimpleContainer Handler<TService>(this SimpleContainer container, Func<object> handler) {
+            container.RegisterHandler(typeof(TService), null, handler);
+            return container;
+        }
+
+        /// <summary>
+        /// Registers all specified types in an assembly as singletong in the container.
+        /// </summary>
+        /// <typeparam name="TService">The type of the service.</typeparam>
+        /// <param name="container">The container.</param>
+        /// <param name="assembly">The assembly.</param>
+        /// <param name="filter">The type filter.</param>
+        /// <returns>The container.</returns>
+        public static SimpleContainer AllTypesOf<TService>(this SimpleContainer container, Assembly assembly, Func<Type, bool> filter = null) {
+            if(filter == null)
+                filter = type => true;
+
+            var types = from type in assembly.GetTypes()
+                        where typeof(TService).IsAssignableFrom(type)
+                              && !type.IsAbstract
+                              && !type.IsInterface
+                              && filter(type)
+                        select type;
+
+            foreach(var type in types) {
+                container.RegisterSingleton(typeof(TService), null, type);
+            }
+
+            return container;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IPhoneContainer.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IPhoneContainer.cs
new file mode 100644
index 0000000..f459440
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IPhoneContainer.cs
@@ -0,0 +1,29 @@
+namespace Caliburn.Micro {
+    using System;
+
+    /// <summary>
+    /// Defines an interface through which the storage system can communicate with an IoC container.
+    /// </summary>
+    public interface IPhoneContainer {
+        /// <summary>
+        /// Occurs when a new instance is created.
+        /// </summary>
+        event Action<object> Activated;
+
+        /// <summary>
+        /// Registers the service as a singleton stored in the phone state.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="phoneStateKey">The phone state key.</param>
+        /// <param name="implementation">The implementation.</param>
+        void RegisterWithPhoneService(Type service, string phoneStateKey, Type implementation);
+
+        /// <summary>
+        /// Registers the service as a singleton stored in the app settings.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="appSettingsKey">The app settings key.</param>
+        /// <param name="implementation">The implementation.</param>
+        void RegisterWithAppSettings(Type service, string appSettingsKey, Type implementation);
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IStorageHandler.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IStorageHandler.cs
new file mode 100644
index 0000000..80016a4
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IStorageHandler.cs
@@ -0,0 +1,40 @@
+namespace Caliburn.Micro {
+    /// <summary>
+    /// Handles the storage of an object instance.
+    /// </summary>
+    public interface IStorageHandler {
+        /// <summary>
+        /// Gets or sets the coordinator.
+        /// </summary>
+        /// <value>
+        /// The coordinator.
+        /// </value>
+        StorageCoordinator Coordinator { get; set; }
+
+        /// <summary>
+        /// Overrided by inheritors to configure the handler for use.
+        /// </summary>
+        void Configure();
+
+        /// <summary>
+        /// Indicates whether the specified instance can be stored by this handler.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <returns></returns>
+        bool Handles(object instance);
+
+        /// <summary>
+        /// Saves the specified instance.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <param name="mode">The mode.</param>
+        void Save(object instance, StorageMode mode);
+
+        /// <summary>
+        /// Restores the specified instance.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <param name="mode">The mode.</param>
+        void Restore(object instance, StorageMode mode);
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IStorageMechanism.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IStorageMechanism.cs
new file mode 100644
index 0000000..f6c325a
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/IStorageMechanism.cs
@@ -0,0 +1,59 @@
+namespace Caliburn.Micro {
+    using System;
+
+    /// <summary>
+    /// Implemented by classes that know how to store data.
+    /// </summary>
+    public interface IStorageMechanism {
+        /// <summary>
+        /// Indicates what storage modes this mechanism provides.
+        /// </summary>
+        /// <param name="mode">The storage mode to check.</param>
+        /// <returns>Whether or not it is supported.</returns>
+        bool Supports(StorageMode mode);
+
+        /// <summary>
+        /// Begins the storage transaction.
+        /// </summary>
+        void BeginStoring();
+
+        /// <summary>
+        /// Stores the value with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="data">The data.</param>
+        void Store(string key, object data);
+
+        /// <summary>
+        /// Ends the storage transaction.
+        /// </summary>
+        void EndStoring();
+
+        /// <summary>
+        /// Tries to get the data previously stored with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        /// <returns>true if found; false otherwise</returns>
+        bool TryGet(string key, out object value);
+
+        /// <summary>
+        /// Deletes the data with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        void Delete(string key);
+
+        /// <summary>
+        /// Clears the data stored in the last storage transaction.
+        /// </summary>
+        void ClearLastSession();
+
+        /// <summary>
+        /// Registers service with the storage mechanism as a singleton.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="implementation">The implementation.</param>
+        void RegisterSingleton(Type service, string key, Type implementation);
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/NavigationExtensions.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/NavigationExtensions.cs
new file mode 100644
index 0000000..4e20d75
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/NavigationExtensions.cs
@@ -0,0 +1,16 @@
+namespace Caliburn.Micro {
+    /// <summary>
+    /// Extension methods related to navigation.
+    /// </summary>
+    public static class NavigationExtensions {
+        /// <summary>
+        /// Creates a Uri builder based on a view model type.
+        /// </summary>
+        /// <typeparam name="TViewModel">The type of the view model.</typeparam>
+        /// <param name="navigationService">The navigation service.</param>
+        /// <returns>The builder.</returns>
+        public static UriBuilder<TViewModel> UriFor<TViewModel>(this INavigationService navigationService) {
+            return new UriBuilder<TViewModel>().AttachTo(navigationService);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/PhoneContainer.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/PhoneContainer.cs
new file mode 100644
index 0000000..b40b396
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/PhoneContainer.cs
@@ -0,0 +1,87 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.IO.IsolatedStorage;
+    using System.Linq;
+    using System.Windows.Controls;
+
+    /// <summary>
+    /// A custom IoC container which integrates with the phone and properly registers all Caliburn.Micro services.
+    /// </summary>
+    public class PhoneContainer : SimpleContainer, IPhoneContainer {
+        readonly Frame rootFrame;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PhoneContainer"/> class.
+        /// </summary>
+        /// <param name="rootFrame">The root frame.</param>
+        public PhoneContainer(Frame rootFrame) {
+            this.rootFrame = rootFrame;
+        }
+
+        /// <summary>
+        /// Registers the service as a singleton stored in the phone state.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="phoneStateKey">The phone state key.</param>
+        /// <param name="implementation">The implementation.</param>
+        public void RegisterWithPhoneService(Type service, string phoneStateKey, Type implementation) {
+            RegisterHandler(service, null, () => {
+                var phoneService = (IPhoneService)GetInstance(typeof(IPhoneService), null);
+
+                if(phoneService.State.ContainsKey(phoneStateKey ?? service.FullName)) {
+                    return phoneService.State[phoneStateKey ?? service.FullName];
+                }
+
+                return BuildInstance(implementation);
+            });
+        }
+
+        /// <summary>
+        /// Registers the service as a singleton stored in the app settings.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="appSettingsKey">The app settings key.</param>
+        /// <param name="implementation">The implementation.</param>
+        public void RegisterWithAppSettings(Type service, string appSettingsKey, Type implementation) {
+            RegisterHandler(service, null, () => {
+                if(IsolatedStorageSettings.ApplicationSettings.Contains(appSettingsKey ?? service.FullName)) {
+                    return IsolatedStorageSettings.ApplicationSettings[appSettingsKey ?? service.FullName];
+                }
+
+                return BuildInstance(implementation);
+            });
+        }
+
+        /// <summary>
+        /// Registers the Caliburn.Micro services with the container.
+        /// </summary>
+        /// <param name="treatViewAsLoaded">if set to <c>true</c> [treat view as loaded].</param>
+        public void RegisterPhoneServices(bool treatViewAsLoaded = false) {
+            var toSearch = AssemblySource.Instance.ToArray().Union(new[] { typeof(IStorageMechanism).Assembly });
+
+            foreach (var assembly in toSearch) {
+                this.AllTypesOf<IStorageMechanism>(assembly);
+                this.AllTypesOf<IStorageHandler>(assembly);
+            }
+
+            var phoneService = new PhoneApplicationServiceAdapter(rootFrame);
+            var navigationService = new FrameAdapter(rootFrame, treatViewAsLoaded);
+
+            RegisterInstance(typeof(SimpleContainer), null, this);
+            RegisterInstance(typeof(PhoneContainer), null, this);
+            RegisterInstance(typeof(IPhoneContainer), null, this);
+            RegisterInstance(typeof(INavigationService), null, navigationService);
+            RegisterInstance(typeof(IPhoneService), null, phoneService);
+            RegisterSingleton(typeof(IEventAggregator), null, typeof(EventAggregator));
+            RegisterSingleton(typeof(IWindowManager), null, typeof(WindowManager));
+
+            RegisterSingleton(typeof(StorageCoordinator), null, typeof(StorageCoordinator));
+            var coordinator = (StorageCoordinator)GetInstance(typeof(StorageCoordinator), null);
+            coordinator.Start();
+
+            RegisterSingleton(typeof(TaskController), null, typeof(TaskController));
+            var taskController = (TaskController)GetInstance(typeof(TaskController), null);
+            taskController.Start();
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/PhoneStateStorageMechanism.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/PhoneStateStorageMechanism.cs
new file mode 100644
index 0000000..ccbb0d5
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/PhoneStateStorageMechanism.cs
@@ -0,0 +1,98 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Stores data in the phone state.
+    /// </summary>
+    public class PhoneStateStorageMechanism : IStorageMechanism {
+        readonly IPhoneContainer container;
+        readonly IPhoneService phoneService;
+        List<string> keys;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PhoneStateStorageMechanism"/> class.
+        /// </summary>
+        /// <param name="container">The container.</param>
+        /// <param name="phoneService">The phone service.</param>
+        public PhoneStateStorageMechanism(IPhoneContainer container, IPhoneService phoneService) {
+            this.container = container;
+            this.phoneService = phoneService;
+        }
+
+        /// <summary>
+        /// Indicates what storage modes this mechanism provides.
+        /// </summary>
+        /// <param name="mode">The storage mode to check.</param>
+        /// <returns>
+        /// Whether or not it is supported.
+        /// </returns>
+        public bool Supports(StorageMode mode) {
+            return (mode & StorageMode.Temporary) == StorageMode.Temporary;
+        }
+
+        /// <summary>
+        /// Begins the storage transaction.
+        /// </summary>
+        public void BeginStoring() {
+            keys = new List<string>();
+        }
+
+        /// <summary>
+        /// Stores the value with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="data">The data.</param>
+        public void Store(string key, object data) {
+            if(!phoneService.State.ContainsKey(key))
+                keys.Add(key);
+
+            phoneService.State[key] = data;
+        }
+
+        /// <summary>
+        /// Ends the storage transaction.
+        /// </summary>
+        public void EndStoring() { }
+
+        /// <summary>
+        /// Tries to get the data previously stored with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        /// <returns>
+        /// true if found; false otherwise
+        /// </returns>
+        public bool TryGet(string key, out object value) {
+            return phoneService.State.TryGetValue(key, out value);
+        }
+
+        /// <summary>
+        /// Deletes the data with the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        public void Delete(string key) {
+            phoneService.State.Remove(key);
+        }
+
+        /// <summary>
+        /// Clears the data stored in the last storage transaction.
+        /// </summary>
+        public void ClearLastSession() {
+            if(keys != null) {
+                keys.Apply(x => phoneService.State.Remove(x));
+                keys = null;
+            }
+        }
+
+        /// <summary>
+        /// Registers service with the storage mechanism as a singleton.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="implementation">The implementation.</param>
+        public void RegisterSingleton(Type service, string key, Type implementation) {
+            container.RegisterWithPhoneService(service, key, implementation);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..ac50a82
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows.Markup;
+
+[assembly: AssemblyTitle("Caliburn.Micro.Extensions")]
+[assembly: AssemblyDescription("Extensions to the core Caliburn.Micro framework.")]
+[assembly: AssemblyProduct("Caliburn.Micro.Extensions")]
+[assembly: AssemblyCompany("Blue Spire Consulting, Inc.")]
+[assembly: AssemblyCopyright("Copyright © 2010")]
+[assembly: ComVisible(false)]
+[assembly: Guid("76ae9648-d7f5-495b-b59f-b3bc2bd0a579")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
+
+[assembly: XmlnsDefinition("http://www.caliburnproject.org", "Caliburn.Micro")]
+[assembly: XmlnsPrefix("http://www.caliburnproject.org", "cal")]
+
+#if !SILVERLIGHT
+[assembly: CLSCompliant(true)]
+#endif
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/SimpleContainer.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/SimpleContainer.cs
new file mode 100644
index 0000000..1d2c1e0
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/SimpleContainer.cs
@@ -0,0 +1,187 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Reflection;
+
+    /// <summary>
+    /// A simple IoC container.
+    /// </summary>
+    public class SimpleContainer {
+        readonly List<ContainerEntry> entries = new List<ContainerEntry>();
+
+        /// <summary>
+        /// Registers the instance.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="implementation">The implementation.</param>
+        public void RegisterInstance(Type service, string key, object implementation) {
+            RegisterHandler(service, key, () => implementation);
+        }
+
+        /// <summary>
+        /// Registers the class so that a new instance is created on every request.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="implementation">The implementation.</param>
+        public void RegisterPerRequest(Type service, string key, Type implementation) {
+            RegisterHandler(service, key, () => BuildInstance(implementation));
+        }
+
+        /// <summary>
+        /// Registers the class so that it is created once, on first request, and the same instance is returned to all requestors thereafter.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="implementation">The implementation.</param>
+        public void RegisterSingleton(Type service, string key, Type implementation) {
+            object singleton = null;
+            RegisterHandler(service, key, () => singleton ?? (singleton = BuildInstance(implementation)));
+        }
+
+        /// <summary>
+        /// Registers a custom handler for serving requests from the container.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="handler">The handler.</param>
+        public void RegisterHandler(Type service, string key, Func<object> handler) {
+            GetOrCreateEntry(service, key).Add(handler);
+        }
+
+        /// <summary>
+        /// Requests an instance.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <param name="key">The key.</param>
+        /// <returns>The instance, or null if a handler is not found.</returns>
+        public object GetInstance(Type service, string key) {
+            var entry = GetEntry(service, key);
+            if (entry != null) {
+                return entry.Single()();
+            }
+
+            if(typeof(Delegate).IsAssignableFrom(service)) {
+                var typeToCreate = service.GetGenericArguments()[0];
+                var factoryFactoryType = typeof(FactoryFactory<>).MakeGenericType(typeToCreate);
+                var factoryFactoryHost = Activator.CreateInstance(factoryFactoryType);
+                var factoryFactoryMethod = factoryFactoryType.GetMethod("Create");
+                return factoryFactoryMethod.Invoke(factoryFactoryHost, new object[] { this });
+            }
+
+            if(typeof(IEnumerable).IsAssignableFrom(service)) {
+                var listType = service.GetGenericArguments()[0];
+                var instances = GetAllInstances(listType).ToList();
+                var array = Array.CreateInstance(listType, instances.Count);
+
+                for(var i = 0; i < array.Length; i++) {
+                    array.SetValue(instances[i], i);
+                }
+
+                return array;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Requests all instances of a given type.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        /// <returns>All the instances or an empty enumerable if none are found.</returns>
+        public IEnumerable<object> GetAllInstances(Type service) {
+            var entry = GetEntry(service, null);
+            return entry != null ? entry.Select(x => x()) : new object[0];
+        }
+
+        /// <summary>
+        /// Pushes dependencies into an existing instance based on interface properties with setters.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        public void BuildUp(object instance) {
+            var injectables = from property in instance.GetType().GetProperties()
+                              where property.CanRead && property.CanWrite && property.PropertyType.IsInterface
+                              select property;
+
+            injectables.Apply(x => {
+                var injection = GetAllInstances(x.PropertyType);
+                if (injection.Any()) {
+                    x.SetValue(instance, injection.First(), null);
+                }
+            });
+        }
+
+        ContainerEntry GetOrCreateEntry(Type service, string key) {
+            var entry = GetEntry(service, key);
+            if(entry == null) {
+                entry = new ContainerEntry { Service = service, Key = key };
+                entries.Add(entry);
+            }
+
+            return entry;
+        }
+
+        ContainerEntry GetEntry(Type service, string key) {
+            return service == null
+                       ? entries.Where(x => x.Key == key).FirstOrDefault()
+                       : entries.Where(x => x.Service == service && x.Key == key).FirstOrDefault();
+        }
+
+        /// <summary>
+        /// Actually does the work of creating the instance and satisfying it's constructor dependencies.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns></returns>
+        protected object BuildInstance(Type type) {
+            var args = DetermineConstructorArgs(type);
+            return ActivateInstance(type, args);
+        }
+
+        /// <summary>
+        /// Creates an instance of the type with the specified constructor arguments.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="args">The constructor args.</param>
+        /// <returns>The created instance.</returns>
+        protected virtual object ActivateInstance(Type type, object[] args) {
+            var instance = args.Length > 0 ? Activator.CreateInstance(type, args) : Activator.CreateInstance(type);
+            Activated(instance);
+            return instance;
+        }
+
+        /// <summary>
+        /// Occurs when a new instance is created.
+        /// </summary>
+        public event Action<object> Activated = delegate { };
+
+        object[] DetermineConstructorArgs(Type implementation) {
+            var args = new List<object>();
+            var constructor = SelectEligibleConstructor(implementation);
+
+            if(constructor != null)
+                args.AddRange(constructor.GetParameters().Select(info => GetInstance(info.ParameterType, null)));
+
+            return args.ToArray();
+        }
+
+        static ConstructorInfo SelectEligibleConstructor(Type type) {
+            return (from c in type.GetConstructors()
+                    orderby c.GetParameters().Length descending
+                    select c).FirstOrDefault();
+        }
+
+        class ContainerEntry : List<Func<object>> {
+            public string Key;
+            public Type Service;
+        }
+
+        class FactoryFactory<T> {
+            public Func<T> Create(SimpleContainer container) {
+                return () => (T)container.GetInstance(typeof(T), null);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageCoordinator.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageCoordinator.cs
new file mode 100644
index 0000000..ec3e298
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageCoordinator.cs
@@ -0,0 +1,138 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.Phone.Shell;
+
+    /// <summary>
+    /// Coordinates the saving and loading of objects based on application lifecycle events.
+    /// </summary>
+    public class StorageCoordinator {
+        readonly List<IStorageHandler> handlers = new List<IStorageHandler>();
+        readonly IPhoneContainer container;
+        readonly IPhoneService phoneService;
+        readonly List<IStorageMechanism> storageMechanisms;
+        readonly List<WeakReference> tracked = new List<WeakReference>();
+        StorageMode currentRestoreMode = StorageMode.Permanent;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageCoordinator"/> class.
+        /// </summary>
+        /// <param name="container">The container.</param>
+        /// <param name="phoneService">The phone service.</param>
+        /// <param name="storageMechanisms">The storage mechanisms.</param>
+        /// <param name="handlers">The handlers.</param>
+        public StorageCoordinator(IPhoneContainer container, IPhoneService phoneService, IEnumerable<IStorageMechanism> storageMechanisms, IEnumerable<IStorageHandler> handlers) {
+            this.container = container;
+            this.phoneService = phoneService;
+            this.storageMechanisms = storageMechanisms.ToList();
+
+            handlers.Apply(x => AddStorageHandler(x));
+
+            phoneService.Resurrecting += () => currentRestoreMode = StorageMode.Any;
+            phoneService.Continuing += () => storageMechanisms.Apply(x => x.ClearLastSession());
+        }
+
+        /// <summary>
+        /// Starts monitoring application and container events.
+        /// </summary>
+        public void Start() {
+            phoneService.Closing += OnClosing;
+            phoneService.Deactivated += OnDeactivated;
+            container.Activated += OnContainerActivated;
+        }
+
+        /// <summary>
+        /// Stops monitoring application and container events.
+        /// </summary>
+        public void Stop() {
+            phoneService.Closing -= OnClosing;
+            phoneService.Deactivated -= OnDeactivated;
+            container.Activated -= OnContainerActivated;
+        }
+
+        /// <summary>
+        /// Gets the storage mechanism.
+        /// </summary>
+        /// <typeparam name="T">The type of storage mechanism to get.</typeparam>
+        /// <returns>The storage mechanism.</returns>
+        public T GetStorageMechanism<T>() where T : IStorageMechanism {
+            return storageMechanisms.OfType<T>().FirstOrDefault();
+        }
+
+        /// <summary>
+        /// Adds the storage mechanism.
+        /// </summary>
+        /// <param name="storageMechanism">The storage mechanism.</param>
+        public void AddStorageMechanism(IStorageMechanism storageMechanism) {
+            storageMechanisms.Add(storageMechanism);
+        }
+
+        /// <summary>
+        /// Adds the storage handler.
+        /// </summary>
+        /// <param name="handler">The handler.</param>
+        /// <returns>Itself</returns>
+        public StorageCoordinator AddStorageHandler(IStorageHandler handler) {
+            handler.Coordinator = this;
+            handler.Configure();
+            handlers.Add(handler);
+            return this;
+        }
+
+        /// <summary>
+        /// Gets the storage handler for a paricular instance.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <returns>The storage handler.</returns>
+        public IStorageHandler GetStorageHandlerFor(object instance) {
+            return handlers.FirstOrDefault(x => x.Handles(instance));
+        }
+
+        /// <summary>
+        /// Saves all monitored instances according to the provided mode.
+        /// </summary>
+        /// <param name="saveMode">The save mode.</param>
+        public void Save(StorageMode saveMode) {
+            var toSave = tracked.Select(x => x.Target).Where(x => x != null);
+            var mechanisms = storageMechanisms.Where(x => x.Supports(saveMode));
+
+            mechanisms.Apply(x => x.BeginStoring());
+
+            foreach(var item in toSave) {
+                var handler = GetStorageHandlerFor(item);
+                handler.Save(item, saveMode);
+            }
+
+            mechanisms.Apply(x => x.EndStoring());
+        }
+
+        /// <summary>
+        /// Restores the specified instance.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <param name="restoreMode">The restore mode.</param>
+        public void Restore(object instance, StorageMode restoreMode = StorageMode.Automatic) {
+            var handler = GetStorageHandlerFor(instance);
+            if (handler == null) {
+                return;
+            }
+
+            tracked.Add(new WeakReference(instance));
+
+            handler.Restore(instance, restoreMode == StorageMode.Automatic ? currentRestoreMode : restoreMode);
+        }
+
+        void OnDeactivated(object sender, DeactivatedEventArgs e) {
+            Save(StorageMode.Any);
+        }
+
+        void OnClosing(object sender, ClosingEventArgs e) {
+            Save(StorageMode.Permanent);
+        }
+
+        void OnContainerActivated(object instance) {
+            Restore(instance);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageHandler.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageHandler.cs
new file mode 100644
index 0000000..76371cc
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageHandler.cs
@@ -0,0 +1,162 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq.Expressions;
+    using System.Reflection;
+
+    /// <summary>
+    /// Handles the storage of a pariticular class.
+    /// </summary>
+    /// <typeparam name="T">The type that this class handles.</typeparam>
+    public abstract class StorageHandler<T> : IStorageHandler {
+        readonly List<StorageInstruction<T>> instructions = new List<StorageInstruction<T>>();
+        Func<T, object> getId = instance => null;
+
+        /// <summary>
+        /// Provides a mechanism for obtaining an instance's unique id.
+        /// </summary>
+        /// <param name="getter">The getter.</param>
+        public void Id(Func<T, object> getter) {
+            getId = getter;
+        }
+
+        /// <summary>
+        /// Gets or sets the coordinator.
+        /// </summary>
+        /// <value>
+        /// The coordinator.
+        /// </value>
+        public StorageCoordinator Coordinator { get; set; }
+
+        /// <summary>
+        /// Overrided by inheritors to configure the handler for use.
+        /// </summary>
+        public abstract void Configure();
+
+        /// <summary>
+        /// Instructs the handler to store the entire object graph, rather than individual properties.
+        /// </summary>
+        /// <typeparam name="TService">The type of the service.</typeparam>
+        /// <param name="storageKey">The optional storage key.</param>
+        /// <returns>The builder.</returns>
+        public StorageInstructionBuilder<T> EntireGraph<TService>(string storageKey = "ObjectGraph") {
+            return AddInstruction().Configure(x => {
+                x.Key = storageKey;
+                x.Save = (instance, getKey, mode) => x.StorageMechanism.Store(getKey(), instance);
+                x.Restore = (instance, getKey, mode) => { };
+                x.PropertyChanged += (s, e) => {
+                    if(e.PropertyName == "StorageMechanism" && x.StorageMechanism != null) {
+                        x.StorageMechanism.RegisterSingleton(typeof(TService), GetKey(default(T), x.Key), typeof(T));
+                    }
+                };
+            });
+        }
+
+        /// <summary>
+        /// Instructs the handler to store a property.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <returns>The builder.</returns>
+        public StorageInstructionBuilder<T> Property(Expression<Func<T, object>> property) {
+            var info = (PropertyInfo)property.GetMemberInfo();
+
+            return AddInstruction().Configure(x => {
+                x.Key = info.Name;
+                x.Save = (instance, getKey, mode) => x.StorageMechanism.Store(getKey(), info.GetValue(instance, null));
+                x.Restore = (instance, getKey, mode) => {
+                    object value;
+                    var key = getKey();
+                    if(x.StorageMechanism.TryGet(key, out value)) {
+                        info.SetValue(instance, value, null);
+                        x.StorageMechanism.Delete(key);
+                    }
+                };
+            });
+        }
+
+        /// <summary>
+        /// Instructs the handler to store a child object's properties.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <returns>The builder.</returns>
+        /// <remarks>This assumes that the parent instance provides the child instance, but that the child instance's properties are handled by a unique handler.</remarks>
+        public StorageInstructionBuilder<T> Child(Expression<Func<T, object>> property) {
+            var info = (PropertyInfo)property.GetMemberInfo();
+
+            return AddInstruction().Configure(x => {
+                x.Key = info.Name;
+                x.Save = (instance, getKey, mode) => {
+                    var child = info.GetValue(instance, null);
+                    if(child == null)
+                        return;
+
+                    var handler = Coordinator.GetStorageHandlerFor(child);
+                    handler.Save(child, mode);
+                };
+                x.Restore = (instance, getKey, mode) => {
+                    var child = info.GetValue(instance, null);
+                    if(child == null)
+                        return;
+
+                    var handler = Coordinator.GetStorageHandlerFor(child);
+                    handler.Restore(child, mode);
+                };
+            });
+        }
+
+        /// <summary>
+        /// Adds a new storage instruction.
+        /// </summary>
+        /// <returns>The builder.</returns>
+        public StorageInstructionBuilder<T> AddInstruction() {
+            var instruction = new StorageInstruction<T> { Owner = this };
+            instructions.Add(instruction);
+            return new StorageInstructionBuilder<T>(instruction);
+        }
+
+        /// <summary>
+        /// Uses this handler to save a particular instance using instructions that support the provided mode.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <param name="mode">The storage mode.</param>
+        public virtual void Save(T instance, StorageMode mode) {
+            foreach(var instruction in instructions) {
+                var key = instruction.Key;
+                if (instruction.StorageMechanism.Supports(mode)) {
+                    instruction.Save(instance, () => GetKey(instance, key), mode);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Uses this handler to restore a particular instance using instructions that support the provided mode.
+        /// </summary>
+        /// <param name="instance">The instance.</param>
+        /// <param name="mode">The mode.</param>
+        public virtual void Restore(T instance, StorageMode mode) {
+            foreach(var instruction in instructions) {
+                var key = instruction.Key;
+                if (instruction.StorageMechanism.Supports(mode)) {
+                    instruction.Restore(instance, () => GetKey(instance, key), mode);
+                }
+            }
+        }
+
+        string GetKey(T instance, string detailKey) {
+            var id = getId(instance);
+            return typeof(T).FullName + (id == null ? "" : "_" + id) + "_" + detailKey;
+        }
+
+        bool IStorageHandler.Handles(object instance) {
+            return instance is T;
+        }
+
+        void IStorageHandler.Save(object instance, StorageMode mode) {
+            Save((T)instance, mode);
+        }
+
+        void IStorageHandler.Restore(object instance, StorageMode mode) {
+            Restore((T)instance, mode);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstruction.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstruction.cs
new file mode 100644
index 0000000..a9b7bd3
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstruction.cs
@@ -0,0 +1,85 @@
+namespace Caliburn.Micro {
+    using System;
+
+    /// <summary>
+    /// An instruction for saving/loading data.
+    /// </summary>
+    /// <typeparam name="T">The model type.</typeparam>
+    public class StorageInstruction<T> : PropertyChangedBase {
+        IStorageHandler owner;
+        IStorageMechanism storageMechanism;
+        string key;
+        Action<T, Func<string>, StorageMode> save;
+        Action<T, Func<string>, StorageMode> restore;
+
+        /// <summary>
+        /// Gets or sets the owner.
+        /// </summary>
+        /// <value>
+        /// The owner.
+        /// </value>
+        public IStorageHandler Owner {
+            get { return owner; }
+            set {
+                owner = value;
+                NotifyOfPropertyChange("Owner");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the storage mechanism.
+        /// </summary>
+        /// <value>
+        /// The storage mechanism.
+        /// </value>
+        public IStorageMechanism StorageMechanism {
+            get { return storageMechanism; }
+            set {
+                storageMechanism = value;
+                NotifyOfPropertyChange("StorageMechanism");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the persistence key.
+        /// </summary>
+        /// <value>
+        /// The key.
+        /// </value>
+        public string Key {
+            get { return key; }
+            set {
+                key = value;
+                NotifyOfPropertyChange("Key");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the save action.
+        /// </summary>
+        /// <value>
+        /// The save action.
+        /// </value>
+        public Action<T, Func<string>, StorageMode> Save {
+            get { return save; }
+            set {
+                save = value;
+                NotifyOfPropertyChange("Save");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the restore action.
+        /// </summary>
+        /// <value>
+        /// The restore action.
+        /// </value>
+        public Action<T, Func<string>, StorageMode> Restore {
+            get { return restore; }
+            set {
+                restore = value;
+                NotifyOfPropertyChange("Restore");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstructionBuilder.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstructionBuilder.cs
new file mode 100644
index 0000000..99be8be
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstructionBuilder.cs
@@ -0,0 +1,29 @@
+namespace Caliburn.Micro {
+    using System;
+
+    /// <summary>
+    /// Used to create a fluent interface for building up a storage instruction.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class StorageInstructionBuilder<T> {
+        readonly StorageInstruction<T> storageInstruction;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StorageInstructionBuilder&lt;T&gt;"/> class.
+        /// </summary>
+        /// <param name="storageInstruction">The storage instruction.</param>
+        public StorageInstructionBuilder(StorageInstruction<T> storageInstruction) {
+            this.storageInstruction = storageInstruction;
+        }
+
+        /// <summary>
+        /// Configures the instruction with the specified behavior.
+        /// </summary>
+        /// <param name="configure">The configuration callback.</param>
+        /// <returns>Itself</returns>
+        public StorageInstructionBuilder<T> Configure(Action<StorageInstruction<T>> configure) {
+            configure(storageInstruction);
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstructionExtensions.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstructionExtensions.cs
new file mode 100644
index 0000000..8f3f8fc
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageInstructionExtensions.cs
@@ -0,0 +1,134 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Linq;
+    using System.Windows;
+
+    /// <summary>
+    /// Extension methods for configuring storage instructions.
+    /// </summary>
+    public static class StorageInstructionExtensions {
+        /// <summary>
+        /// Stores the data in the transient phone State.
+        /// </summary>
+        /// <typeparam name="T">The model type.</typeparam>
+        /// <param name="builder">The builder.</param>
+        /// <returns>The builder.</returns>
+        public static StorageInstructionBuilder<T> InPhoneState<T>(this StorageInstructionBuilder<T> builder) {
+            return builder.Configure(x => { x.StorageMechanism = x.Owner.Coordinator.GetStorageMechanism<PhoneStateStorageMechanism>(); });
+        }
+
+        /// <summary>
+        /// Stores the data in the permanent ApplicationSettings.
+        /// </summary>
+        /// <typeparam name="T">The model type.</typeparam>
+        /// <param name="builder">The builder.</param>
+        /// <returns>The builder.</returns>
+        public static StorageInstructionBuilder<T> InAppSettings<T>(this StorageInstructionBuilder<T> builder) {
+            return builder.Configure(x => { x.StorageMechanism = x.Owner.Coordinator.GetStorageMechanism<AppSettingsStorageMechanism>(); });
+        }
+
+        /// <summary>
+        /// Restores the data when IActivate.Activated is raised.
+        /// </summary>
+        /// <typeparam name="T">The model type.</typeparam>
+        /// <param name="builder">The builder.</param>
+        /// <returns>The builder.</returns>
+        public static StorageInstructionBuilder<T> RestoreAfterActivation<T>(this StorageInstructionBuilder<T> builder)
+            where T : IActivate {
+            return builder.Configure(x => {
+                var original = x.Restore;
+
+                x.Restore = (instance, getKey, mode) => {
+                    if(instance.IsActive)
+                        original(instance, getKey, mode);
+                    else {
+                        EventHandler<ActivationEventArgs> onActivate = null;
+                        onActivate = (s, e) => {
+                            original(instance, getKey, mode);
+                            instance.Activated -= onActivate;
+                        };
+                        instance.Activated += onActivate;
+                    }
+                };
+            });
+        }
+
+        /// <summary>
+        /// Restores the data after view's Loaded event is raised.
+        /// </summary>
+        /// <typeparam name="T">The model type.</typeparam>
+        /// <param name="builder">The builder.</param>
+        /// <returns>The builder.</returns>
+        public static StorageInstructionBuilder<T> RestoreAfterViewLoad<T>(this StorageInstructionBuilder<T> builder)
+            where T : IViewAware {
+            return builder.Configure(x => {
+                var original = x.Restore;
+
+                x.Restore = (instance, getKey, mode) => {
+                    EventHandler<ViewAttachedEventArgs> onViewAttached = null;
+                    onViewAttached = (s, e) => {
+                        var fe = (FrameworkElement)e.View;
+                        View.ExecuteOnLoad(fe, (s2, e2) => { original(instance, getKey, mode); });
+                        instance.ViewAttached -= onViewAttached;
+                    };
+                    instance.ViewAttached += onViewAttached;
+                };
+            });
+        }
+
+        /// <summary>
+        /// Restores the data after view's LayoutUpdated event is raised.
+        /// </summary>
+        /// <typeparam name="T">The model type.</typeparam>
+        /// <param name="builder">The builder.</param>
+        /// <returns>The builder.</returns>
+        public static StorageInstructionBuilder<T> RestoreAfterViewReady<T>(this StorageInstructionBuilder<T> builder)
+            where T : IViewAware {
+            return builder.Configure(x => {
+                var original = x.Restore;
+
+                x.Restore = (instance, getKey, mode) => {
+                    EventHandler<ViewAttachedEventArgs> onViewAttached = null;
+                    onViewAttached = (s, e) => {
+                        var fe = (FrameworkElement)e.View;
+                        instance.ViewAttached -= onViewAttached;
+                        EventHandler handler = null;
+                        handler = (s2, e2) => {
+                            original(instance, getKey, mode);
+                            fe.LayoutUpdated -= handler;
+                        };
+                        fe.LayoutUpdated += handler;
+                    };
+                    instance.ViewAttached += onViewAttached;
+                };
+            });
+        }
+
+        /// <summary>
+        /// Stores the index of the Conductor's ActiveItem.
+        /// </summary>
+        /// <typeparam name="T">The model type.</typeparam>
+        /// <param name="handler">The handler.</param>
+        /// <returns>The builder.</returns>
+        public static StorageInstructionBuilder<T> ActiveItemIndex<T>(this StorageHandler<T> handler)
+            where T : IParent, IHaveActiveItem, IActivate {
+            return handler.AddInstruction().Configure(x => {
+                x.Key = "ActiveItemIndex";
+                x.Save = (instance, getKey, mode) => {
+                    var children = instance.GetChildren().OfType<object>().ToList();
+                    x.StorageMechanism.Store(getKey(), children.IndexOf(instance.ActiveItem));
+                };
+                x.Restore = (instance, getKey, mode) => {
+                    object value;
+                    var key = getKey();
+                    if(x.StorageMechanism.TryGet(key, out value)) {
+                        var children = instance.GetChildren().OfType<object>().ToList();
+                        var index = Convert.ToInt32(value);
+                        instance.ActiveItem = children[index];
+                        x.StorageMechanism.Delete(key);
+                    }
+                };
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageMode.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageMode.cs
new file mode 100644
index 0000000..3d7a49d
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/StorageMode.cs
@@ -0,0 +1,26 @@
+namespace Caliburn.Micro {
+    using System;
+
+    /// <summary>
+    /// The mode used to save/restore data.
+    /// </summary>
+    [Flags]
+    public enum StorageMode {
+        /// <summary>
+        /// Automatic Determine the Mode
+        /// </summary>
+        Automatic = 0,
+        /// <summary>
+        /// Use Temporary storage.
+        /// </summary>
+        Temporary = 2,
+        /// <summary>
+        /// Use Permenent storage.
+        /// </summary>
+        Permanent = 4,
+        /// <summary>
+        /// Use any storage mechanism available.
+        /// </summary>
+        Any = Temporary | Permanent
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskCompleted.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskCompleted.cs
new file mode 100644
index 0000000..45d7721
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskCompleted.cs
@@ -0,0 +1,17 @@
+namespace Caliburn.Micro {
+    /// <summary>
+    /// A message which is published when a task completes.
+    /// </summary>
+    /// <typeparam name="TTaskEventArgs">The type of the task event args.</typeparam>
+    public class TaskCompleted<TTaskEventArgs> {
+        /// <summary>
+        /// Optional state provided by the original sender.
+        /// </summary>
+        public object State;
+
+        /// <summary>
+        /// The results of the task.
+        /// </summary>
+        public TTaskEventArgs Result;
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskController.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskController.cs
new file mode 100644
index 0000000..03ef380
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskController.cs
@@ -0,0 +1,133 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Threading;
+    using Microsoft.Phone.Shell;
+    using Microsoft.Phone.Tasks;
+
+    /// <summary>
+    /// Handles <see cref="TaskExecutionRequested"/> messages and ensures that the property handler receives the completion message.
+    /// </summary>
+    public class TaskController : IHandle<TaskExecutionRequested> {
+        const string TaskTypeKey = "Caliburn.Micro.TaskType";
+        const string TaskSateKey = "Caliburn.Micro.TaskState";
+        readonly IPhoneService phoneService;
+        readonly IEventAggregator events;
+        TaskExecutionRequested request;
+        bool isResurrecting;
+        object continueWithMessage;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TaskController"/> class.
+        /// </summary>
+        /// <param name="phoneService">The phone service.</param>
+        /// <param name="events">The event aggregator.</param>
+        public TaskController(IPhoneService phoneService, IEventAggregator events) {
+            this.phoneService = phoneService;
+            this.events = events;
+        }
+
+        /// <summary>
+        /// Starts monitoring for task requests and controlling completion messages.
+        /// </summary>
+        public void Start() {
+            phoneService.Deactivated += OnDeactivated;
+            phoneService.Resurrected += OnResurrected;
+            phoneService.Continued += OnContinued;
+            events.Subscribe(this);
+        }
+
+        /// <summary>
+        /// Stops monitoring for task requests and controlling completion messages.
+        /// </summary>
+        public void Stop() {
+            phoneService.Deactivated -= OnDeactivated;
+            phoneService.Resurrected -= OnResurrected;
+            phoneService.Continued -= OnContinued;
+            events.Unsubscribe(this);
+        }
+
+        void IHandle<TaskExecutionRequested>.Handle(TaskExecutionRequested message) {
+            var taskType = message.Task.GetType();
+            var @event = taskType.GetEvent("Completed");
+
+            if(@event != null) {
+                request = message;
+                @event.AddEventHandler(message.Task, Delegate.CreateDelegate(@event.EventHandlerType, this, "OnTaskComplete"));
+            }
+
+            var showMethod = taskType.GetMethod("Show");
+            showMethod.Invoke(message.Task, null);
+        }
+
+        void OnDeactivated(object sender, DeactivatedEventArgs e) {
+            if(request == null)
+                return;
+
+            PhoneApplicationService.Current.State[TaskTypeKey] = request.Task.GetType().FullName;
+            PhoneApplicationService.Current.State[TaskSateKey] = request.State ?? string.Empty;
+        }
+
+        void OnContinued() {
+            if(continueWithMessage == null) {
+                return;
+            }
+
+            events.Publish(continueWithMessage);
+            continueWithMessage = null;
+        }
+
+        void OnResurrected() {
+            if (!PhoneApplicationService.Current.State.ContainsKey(TaskTypeKey)) {
+                return;
+            }
+
+            isResurrecting = true;
+
+            var taskTypeName = (string)PhoneApplicationService.Current.State[TaskTypeKey];
+            PhoneApplicationService.Current.State.Remove(TaskTypeKey);
+
+            object taskState;
+            if(!PhoneApplicationService.Current.State.TryGetValue(TaskSateKey, out taskState))
+                taskState = null;
+            else PhoneApplicationService.Current.State.Remove(TaskSateKey);
+
+            var taskType = typeof(TaskEventArgs).Assembly.GetType(taskTypeName);
+            var taskInstance = Activator.CreateInstance(taskType);
+
+            request = new TaskExecutionRequested {
+                State = taskState,
+                Task = taskInstance
+            };
+
+            var @event = taskType.GetEvent("Completed");
+            @event.AddEventHandler(taskInstance, Delegate.CreateDelegate(@event.EventHandlerType, this, "OnTaskComplete"));
+        }
+
+        void OnTaskComplete(object sender, EventArgs e) {
+            var genericMessageType = typeof(TaskCompleted<>);
+            var argsType = e.GetType();
+            var messageType = genericMessageType.MakeGenericType(argsType);
+            var message = Activator.CreateInstance(messageType);
+
+            if (request.State != null) {
+                messageType.GetField("State").SetValue(message, request.State);
+            }
+
+            messageType.GetField("Result").SetValue(message, e);
+            request = null;
+
+            if(isResurrecting) {
+                ThreadPool.QueueUserWorkItem(state => {
+                    Thread.Sleep(500);
+                    Execute.OnUIThread(() => {
+                        events.Publish(message);
+                        isResurrecting = false;
+                    });
+                });
+            }
+            else {
+                continueWithMessage = message;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskExecutionRequested.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskExecutionRequested.cs
new file mode 100644
index 0000000..22304d2
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskExecutionRequested.cs
@@ -0,0 +1,16 @@
+namespace Caliburn.Micro {
+    /// <summary>
+    /// A message that is published to signify a components request for the execution of a particular task.
+    /// </summary>
+    public class TaskExecutionRequested {
+        /// <summary>
+        /// Optional state to be passed along to the task completion message.
+        /// </summary>
+        public object State;
+
+        /// <summary>
+        /// The task instance.
+        /// </summary>
+        public object Task;
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskExtensionMethods.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskExtensionMethods.cs
new file mode 100644
index 0000000..1c83e3b
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/TaskExtensionMethods.cs
@@ -0,0 +1,29 @@
+namespace Caliburn.Micro {
+    using System;
+
+    /// <summary>
+    /// Extension methods related to phone tasks.
+    /// </summary>
+    public static class TaskExtensionMethods {
+        /// <summary>
+        /// Creates a task and publishes it using the <see cref="EventAggregator"/>.
+        /// </summary>
+        /// <typeparam name="TTask">The task to create.</typeparam>
+        /// <param name="events">The event aggregator.</param>
+        /// <param name="configure">Optional configuration for the task.</param>
+        /// <param name="state">Optional state to be passed along to the task completion message.</param>
+        public static void RequestTask<TTask>(this IEventAggregator events, Action<TTask> configure = null, object state = null)
+            where TTask : new() {
+            var task = new TTask();
+
+            if(configure != null) {
+                configure(task);
+            }
+
+            events.Publish(new TaskExecutionRequested {
+                State = state,
+                Task = task
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/UriBuilder.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/UriBuilder.cs
new file mode 100644
index 0000000..545afeb
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7.Extensions/UriBuilder.cs
@@ -0,0 +1,89 @@
+namespace Caliburn.Micro {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Linq.Expressions;
+    using System.Reflection;
+    using System.Windows;
+
+    /// <summary>
+    /// Builds a Uri in a strongly typed fashion, based on a ViewModel.
+    /// </summary>
+    /// <typeparam name="TViewModel"></typeparam>
+    public class UriBuilder<TViewModel> {
+        readonly Dictionary<string, string> queryString = new Dictionary<string, string>();
+        readonly string entryAssemblyName;
+        INavigationService navigationService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UriBuilder&lt;TViewModel&gt;"/> class.
+        /// </summary>
+        public UriBuilder() {
+            entryAssemblyName = GetAssemblyName(Application.Current.GetType().Assembly);
+        }
+
+        /// <summary>
+        /// Adds a query string parameter to the Uri.
+        /// </summary>
+        /// <typeparam name="TValue">The type of the value.</typeparam>
+        /// <param name="property">The property.</param>
+        /// <param name="value">The property value.</param>
+        /// <returns>Itself</returns>
+        public UriBuilder<TViewModel> WithParam<TValue>(Expression<Func<TViewModel, TValue>> property, TValue value) {
+            queryString[property.GetMemberInfo().Name] = value.ToString();
+            return this;
+        }
+
+        /// <summary>
+        /// Attaches a navigation servies to this builder.
+        /// </summary>
+        /// <param name="navigationService">The navigation service.</param>
+        /// <returns>Itself</returns>
+        public UriBuilder<TViewModel> AttachTo(INavigationService navigationService) {
+            this.navigationService = navigationService;
+            return this;
+        }
+
+        /// <summary>
+        /// Navigates to the Uri represented by this builder.
+        /// </summary>
+        public void Navigate() {
+            var pageName = DeterminePageName();
+            var qs = BuildQueryString();
+            var uri = new Uri(pageName + qs, UriKind.Relative);
+
+            if(navigationService == null) {
+                throw new Exception("Cannot navigate without attaching an INavigationService. Call AttachTo first.");
+            }
+
+            navigationService.Navigate(uri);
+        }
+
+        string DeterminePageName() {
+            var page = ViewLocator.LocateTypeForModelType(typeof(TViewModel), null, null);
+            var pageAssemblyName = GetAssemblyName(page.Assembly);
+            var pageName = page.FullName.Replace(pageAssemblyName, "").Replace(".", "/") + ".xaml";
+
+            if(!entryAssemblyName.Equals(pageAssemblyName)) {
+                return "/" + pageAssemblyName + ";component" + pageName;
+            }
+
+            return pageName;
+        }
+
+        string BuildQueryString() {
+            if(queryString.Count < 1) {
+                return string.Empty;
+            }
+
+            var result = queryString
+                .Aggregate("?", (current, pair) => current + (pair.Key + "=" + pair.Value + "&"));
+
+            return result.Remove(result.Length - 1);
+        }
+
+        static string GetAssemblyName(Assembly assembly) {
+            return assembly.FullName.Remove(assembly.FullName.IndexOf(","));
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/Caliburn.Micro.WP7.csproj b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/Caliburn.Micro.WP7.csproj
index 27962a8..be1687f 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/Caliburn.Micro.WP7.csproj
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/Caliburn.Micro.WP7.csproj
@@ -23,24 +23,24 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>Bin\Debug</OutputPath>
+    <OutputPath>..\..\bin\WP7\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;SILVERLIGHT WP7</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Bin\Debug\Caliburn.Micro.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\WP7\Debug\Caliburn.Micro.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>Bin\Release</OutputPath>
+    <OutputPath>..\..\bin\WP7\Release\</OutputPath>
     <DefineConstants>TRACE;SILVERLIGHT WP7</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>Bin\Release\Caliburn.Micro.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\WP7\Release\Caliburn.Micro.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Phone" />
@@ -71,6 +71,9 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\BindableCollection.cs">
       <Link>BindableCollection.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\BindingScope.cs">
+      <Link>BindingScope.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\BooleanToVisibilityConverter.cs">
       <Link>BooleanToVisibilityConverter.cs</Link>
     </Compile>
@@ -83,6 +86,12 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\ConductorBase.cs">
       <Link>ConductorBase.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\ConductorBaseWithActiveItem.cs">
+      <Link>ConductorBaseWithActiveItem.cs</Link>
+    </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\ConductorWithCollectionAllActive.cs">
+      <Link>ConductorWithCollectionAllActive.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\ConductorWithCollectionOneActive.cs">
       <Link>ConductorWithCollectionOneActive.cs</Link>
     </Compile>
@@ -116,6 +125,9 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\IHandle.cs">
       <Link>IHandle.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\IHaveParameters.cs">
+      <Link>IHaveParameters.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\IoC.cs">
       <Link>IoC.cs</Link>
     </Compile>
@@ -137,6 +149,9 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\MessageBinder.cs">
       <Link>MessageBinder.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\NameTransformer.cs">
+      <Link>NameTransformer.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\Parameter.cs">
       <Link>Parameter.cs</Link>
     </Compile>
@@ -152,6 +167,9 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\Screen.cs">
       <Link>Screen.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\ScreenExtensions.cs">
+      <Link>ScreenExtensions.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\SequentialResult.cs">
       <Link>SequentialResult.cs</Link>
     </Compile>
@@ -161,6 +179,9 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\View.cs">
       <Link>View.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\ViewAware.cs">
+      <Link>ViewAware.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\ViewLocator.cs">
       <Link>ViewLocator.cs</Link>
     </Compile>
@@ -173,20 +194,14 @@
     <Compile Include="ActionDelegate.cs" />
     <Compile Include="AttachedCollection.cs" />
     <Compile Include="CustomAppBar.cs" />
-    <Compile Include="IConfigureTask.cs" />
-    <Compile Include="ILaunchChooser.cs" />
-    <Compile Include="ILaunchTask.cs" />
     <Compile Include="INavigationService.cs" />
-    <Compile Include="InstanceActivator.cs" />
     <Compile Include="IPhoneService.cs" />
-    <Compile Include="ITombstone.cs" />
     <Compile Include="PhoneBootstrapper.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SurviveTombstone.cs" />
-    <Compile Include="TaskLaunchEventArgs.cs" />
     <Compile Include="Tuple.cs" />
+    <Compile Include="WindowManager.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/IConfigureTask.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/IConfigureTask.cs
deleted file mode 100644
index 9b9732e..0000000
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/IConfigureTask.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Caliburn.Micro
-{
-    /// <summary>
-    /// Enables a class to configure the task which it has requested execution for.
-    /// </summary>
-    /// <typeparam name="TTask">The type of task to be configured.</typeparam>
-    public interface IConfigureTask<TTask>
-    {
-        /// <summary>
-        /// Configures the task.
-        /// </summary>
-        /// <param name="task">The task.</param>
-        void ConfigureTask(TTask task);
-    }
-}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ILaunchChooser.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ILaunchChooser.cs
deleted file mode 100644
index ffacb22..0000000
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ILaunchChooser.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Caliburn.Micro
-{
-    using Microsoft.Phone.Tasks;
-
-    /// <summary>
-    /// Implemented by classes that request the execution of a chooser.
-    /// </summary>
-    /// <typeparam name="TResult">The result that is returned from the chooser.</typeparam>
-    public interface ILaunchChooser<TResult> : ILaunchTask
-        where TResult : TaskEventArgs
-    {
-        /// <summary>
-        /// Called to handle the result returned by the chooser.
-        /// </summary>
-        /// <param name="result">The chooser's result.</param>
-        void Handle(TResult result);
-    }
-}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ILaunchTask.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ILaunchTask.cs
deleted file mode 100644
index f100a86..0000000
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ILaunchTask.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Caliburn.Micro
-{
-    using System;
-
-    /// <summary>
-    /// Implemented by classes that request the execution of a class.
-    /// </summary>
-    public interface ILaunchTask
-    {
-        /// <summary>
-        /// Raised to signal the request for task execution.
-        /// </summary>
-        event EventHandler<TaskLaunchEventArgs> TaskLaunchRequested;
-    }
-}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/INavigationService.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/INavigationService.cs
index e7ee96f..9ea26c1 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/INavigationService.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/INavigationService.cs
@@ -4,6 +4,7 @@
     using System.Windows;
     using System.Windows.Controls;
     using System.Windows.Navigation;
+    using Microsoft.Phone.Controls;
 
     /// <summary>
     /// Implemented by services that provide <see cref="Uri"/> based navigation.
@@ -30,6 +31,11 @@ public interface INavigationService : INavigate
         /// </summary>
         Uri CurrentSource { get; }
 
+		/// <summary>
+		/// The current content.
+		/// </summary>
+		object CurrentContent { get; }
+
         /// <summary>
         /// Stops the loading process.
         /// </summary>
@@ -77,16 +83,19 @@ public interface INavigationService : INavigate
     public class FrameAdapter : INavigationService
     {
         readonly Frame frame;
+        readonly bool treatViewAsLoaded;
 
         /// <summary>
         /// Creates an instance of <see cref="FrameAdapter"/>
         /// </summary>
         /// <param name="frame">The frame to represent as a <see cref="INavigationService"/>.</param>
-        public FrameAdapter(Frame frame)
+        /// <param name="treatViewAsLoaded">Tells the frame adapter to assume that the view has already been loaded by the time OnNavigated is called. This is necessary when using the TransitionFrame.</param>
+        public FrameAdapter(Frame frame, bool treatViewAsLoaded = false)
         {
             this.frame = frame;
-            this.frame.Navigated += OnNavigated;
+            this.treatViewAsLoaded = treatViewAsLoaded;
             this.frame.Navigating += OnNavigating;
+            this.frame.Navigated += OnNavigated;
         }
 
         /// <summary>
@@ -94,30 +103,27 @@ public FrameAdapter(Frame frame)
         /// </summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event args.</param>
-        protected virtual void OnNavigating(object sender, NavigatingCancelEventArgs e)
-        {
+        protected virtual void OnNavigating(object sender, NavigatingCancelEventArgs e) {
             var fe = frame.Content as FrameworkElement;
-            if (fe == null)
+            if(fe == null)
                 return;
 
             var guard = fe.DataContext as IGuardClose;
-            if(guard != null && !e.Uri.IsAbsoluteUri)
-            {
+            if(guard != null && !e.Uri.IsAbsoluteUri) {
                 bool shouldCancel = false;
-                guard.CanClose(result =>{
+                guard.CanClose(result => {
                     shouldCancel = !result;
                 });
 
-                if(shouldCancel)
-                {
+                if(shouldCancel) {
                     e.Cancel = true;
                     return;
                 }
             }
 
             var deactivator = fe.DataContext as IDeactivate;
-            if (deactivator != null)
-                deactivator.Deactivate(e.Uri.IsAbsoluteUri);
+            if(deactivator != null)
+                deactivator.Deactivate(false);
         }
 
         /// <summary>
@@ -125,46 +131,54 @@ protected virtual void OnNavigating(object sender, NavigatingCancelEventArgs e)
         /// </summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event args.</param>
-        protected virtual void OnNavigated(object sender, NavigationEventArgs e)
-        {
-            if (e.Uri.IsAbsoluteUri)
+        protected virtual void OnNavigated(object sender, NavigationEventArgs e) {
+            if(e.Uri.IsAbsoluteUri || e.Content == null)
                 return;
 
             ViewLocator.InitializeComponent(e.Content);
 
             var viewModel = ViewModelLocator.LocateForView(e.Content);
-            if (viewModel == null)
+            if(viewModel == null)
                 return;
 
-            ViewModelBinder.Bind(viewModel, (DependencyObject)e.Content, null);
+            var page = e.Content as PhoneApplicationPage;
+            if(page == null)
+                throw new ArgumentException("View '" + e.Content.GetType().FullName + "' should inherit from PhoneApplicationPage or one of its descendents.");
+
+            if(treatViewAsLoaded)
+                page.SetValue(View.IsLoadedProperty, true);
 
-            TryInjectQueryString(viewModel, e.Content);
+            ViewModelBinder.Bind(viewModel, page, null);
+
+            TryInjectQueryString(viewModel, page);
 
             var activator = viewModel as IActivate;
-            if (activator != null)
+            if(activator != null)
                 activator.Activate();
+
+            GC.Collect();
         }
 
         /// <summary>
         /// Attempts to inject query string parameters from the view into the view model.
         /// </summary>
         /// <param name="viewModel">The view model.</param>
-        /// <param name="view">The view.</param>
-        protected virtual void TryInjectQueryString(object viewModel, object view) 
+        /// <param name="page">The page.</param>
+        protected virtual void TryInjectQueryString(object viewModel, Page page) 
         {
-            var page = view as Page;
-            if (page == null)
-                return;
-
             var viewModelType = viewModel.GetType();
 
             foreach(var pair in page.NavigationContext.QueryString)
             {
-                var property = viewModelType.GetProperty(pair.Key);
+                var property = viewModelType.GetPropertyCaseInsensitive(pair.Key);
                 if(property == null)
                     continue;
 
-                property.SetValue(viewModel, MessageBinder.CoerceValue(property.PropertyType, pair.Value), null);
+                property.SetValue(
+                    viewModel, 
+                    MessageBinder.CoerceValue(property.PropertyType, pair.Value, page.NavigationContext), 
+                    null
+                    );
             }
         }
 
@@ -201,6 +215,15 @@ public Uri CurrentSource
             get { return frame.CurrentSource; }
         }
 
+		/// <summary>
+		/// The current content.
+		/// </summary>
+		public object CurrentContent
+		{
+			get { return frame.Content; }
+		}
+
+
         /// <summary>
         /// Stops the loading process.
         /// </summary>
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/IPhoneService.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/IPhoneService.cs
index 5c6cd7d..37d6e4e 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/IPhoneService.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/IPhoneService.cs
@@ -1,111 +1,192 @@
-namespace Caliburn.Micro
-{
+namespace Caliburn.Micro {
     using System;
     using System.Collections.Generic;
+    using System.Windows.Controls;
+    using System.Windows.Navigation;
+    using Microsoft.Phone.Controls;
     using Microsoft.Phone.Shell;
 
     /// <summary>
-    /// Implemented by services that provide access to the basic phone capabilities.
+    ///   Implemented by services that provide access to the basic phone capabilities.
     /// </summary>
-    public interface IPhoneService
-    {
+    public interface IPhoneService {
         /// <summary>
-        /// The state that is persisted during the tombstoning process.
+        ///   The state that is persisted during the tombstoning process.
         /// </summary>
         IDictionary<string, object> State { get; }
 
         /// <summary>
-        /// Gets the mode in which the application was started.
+        ///   Gets the mode in which the application was started.
         /// </summary>
         StartupMode StartupMode { get; }
 
         /// <summary>
-        /// Occurs when a fresh instance of the application is launching.
+        ///   Occurs when a fresh instance of the application is launching.
         /// </summary>
         event EventHandler<LaunchingEventArgs> Launching;
 
         /// <summary>
-        /// Occurs when a previously tombstoned instance is resurrected.
+        ///   Occurs when a previously paused/tombstoned app is resumed/resurrected.
         /// </summary>
         event EventHandler<ActivatedEventArgs> Activated;
 
         /// <summary>
-        /// Occurs when the application is being tombstoned.
+        ///   Occurs when the application is being paused or tombstoned.
         /// </summary>
         event EventHandler<DeactivatedEventArgs> Deactivated;
 
         /// <summary>
-        /// Occurs when the application is closing.
+        ///   Occurs when the application is closing.
         /// </summary>
         event EventHandler<ClosingEventArgs> Closing;
+
+        /// <summary>
+        ///   Occurs when the app is continuing from a temporarily paused state.
+        /// </summary>
+        event System.Action Continuing;
+
+        /// <summary>
+        ///   Occurs after the app has continued from a temporarily paused state.
+        /// </summary>
+        event System.Action Continued;
+
+        /// <summary>
+        ///   Occurs when the app is "resurrecting" from a tombstoned state.
+        /// </summary>
+        event System.Action Resurrecting;
+
+        /// <summary>
+        ///   Occurs after the app has "resurrected" from a tombstoned state.
+        /// </summary>
+        event System.Action Resurrected;
+
+        /// <summary>
+        ///   Gets or sets whether user idle detection is enabled.
+        /// </summary>
+        IdleDetectionMode UserIdleDetectionMode { get; set; }
+
+        /// <summary>
+        ///   Gets or sets whether application idle detection is enabled.
+        /// </summary>
+        IdleDetectionMode ApplicationIdleDetectionMode { get; set; }
     }
 
     /// <summary>
-    /// An implementation of <see cref="IPhoneService"/> that adapts <see cref="PhoneApplicationService"/>.
+    ///   An implementation of <see cref = "IPhoneService" /> that adapts <see cref = "PhoneApplicationService" />.
     /// </summary>
-    public class PhoneApplicationServiceAdapter : IPhoneService
-    {
-        readonly PhoneApplicationService phoneService;
+    public class PhoneApplicationServiceAdapter : IPhoneService {
+        readonly PhoneApplicationService service;
+        bool isResurrecting = true;
+
+        /// <summary>
+        ///   Creates an instance of <see cref = "PhoneApplicationServiceAdapter" />.
+        /// </summary>
+        public PhoneApplicationServiceAdapter(Frame rootFrame) {
+            service = PhoneApplicationService.Current;
+            service.Launching += delegate { isResurrecting = false; };
+            service.Activated += delegate {
+                if(isResurrecting) {
+                    Resurrecting();
+                    NavigatedEventHandler onNavigated = null;
+                    onNavigated = (s2, e2) => {
+                        Resurrected();
+                        rootFrame.Navigated -= onNavigated;
+                    };
+                    rootFrame.Navigated += onNavigated;
+                    isResurrecting = false;
+                }
+                else {
+                    Continuing();
+                    NavigatedEventHandler onNavigated = null;
+                    onNavigated = (s2, e2) => {
+                        Continued();
+                        rootFrame.Navigated -= onNavigated;
+                    };
+                    rootFrame.Navigated += onNavigated;
+                }
+            };
+        }
+
+        /// <summary>
+        ///   The state that is persisted during the tombstoning process.
+        /// </summary>
+        public IDictionary<string, object> State {
+            get { return service.State; }
+        }
 
         /// <summary>
-        /// Creates an instance of <see cref="PhoneApplicationServiceAdapter"/>.
+        ///   Gets the mode in which the application was started.
         /// </summary>
-        /// <param name="phoneService">The <see cref="PhoneApplicationService"/> to adapt.</param>
-        public PhoneApplicationServiceAdapter(PhoneApplicationService phoneService)
-        {
-            this.phoneService = phoneService;
+        public StartupMode StartupMode {
+            get { return service.StartupMode; }
         }
 
         /// <summary>
-        /// The state that is persisted during the tombstoning process.
+        ///   Occurs when a fresh instance of the application is launching.
         /// </summary>
-        public IDictionary<string, object> State
-        {
-            get { return phoneService.State; }
+        public event EventHandler<LaunchingEventArgs> Launching {
+            add { service.Launching += value; }
+            remove { service.Launching -= value; }
         }
 
         /// <summary>
-        /// Gets the mode in which the application was started.
+        ///   Occurs when a previously paused/tombstoned application instance is resumed/resurrected.
         /// </summary>
-        public StartupMode StartupMode
-        {
-            get { return phoneService.StartupMode; }
+        public event EventHandler<ActivatedEventArgs> Activated {
+            add { service.Activated += value; }
+            remove { service.Activated -= value; }
         }
 
         /// <summary>
-        /// Occurs when a fresh instance of the application is launching.
+        ///   Occurs when the application is being paused or tombstoned.
         /// </summary>
-        public event EventHandler<LaunchingEventArgs> Launching
-        {
-            add { phoneService.Launching += value; }
-            remove { phoneService.Launching -= value; }
+        public event EventHandler<DeactivatedEventArgs> Deactivated {
+            add { service.Deactivated += value; }
+            remove { service.Deactivated -= value; }
         }
 
         /// <summary>
-        /// Occurs when a previously tombstoned application instance is resurrected.
+        ///   Occurs when the application is closing.
         /// </summary>
-        public event EventHandler<ActivatedEventArgs> Activated
-        {
-            add { phoneService.Activated += value; }
-            remove { phoneService.Activated -= value; }
+        public event EventHandler<ClosingEventArgs> Closing {
+            add { service.Closing += value; }
+            remove { service.Closing -= value; }
         }
 
         /// <summary>
-        /// Occurs when the application is being tombstoned.
+        ///   Occurs when the app is continuing from a temporarily paused state.
+        /// </summary>
+        public event System.Action Continuing = delegate { };
+
+        /// <summary>
+        ///   Occurs after the app has continued from a temporarily paused state.
+        /// </summary>
+        public event System.Action Continued = delegate { };
+
+        /// <summary>
+        ///   Occurs when the app is "resurrecting" from a tombstoned state.
+        /// </summary>
+        public event System.Action Resurrecting = delegate { };
+
+        /// <summary>
+        ///   Occurs after the app has "resurrected" from a tombstoned state.
+        /// </summary>
+        public event System.Action Resurrected = delegate { };
+
+        /// <summary>
+        ///   Gets or sets whether user idle detection is enabled.
         /// </summary>
-        public event EventHandler<DeactivatedEventArgs> Deactivated
-        {
-            add { phoneService.Deactivated += value; }
-            remove { phoneService.Deactivated -= value; }
+        public IdleDetectionMode UserIdleDetectionMode {
+            get { return service.UserIdleDetectionMode; }
+            set { service.UserIdleDetectionMode = value; }
         }
 
         /// <summary>
-        /// Occurs when the application is closing.
+        ///   Gets or sets whether application idle detection is enabled.
         /// </summary>
-        public event EventHandler<ClosingEventArgs> Closing
-        {
-            add { phoneService.Closing += value; }
-            remove { phoneService.Closing -= value; }
+        public IdleDetectionMode ApplicationIdleDetectionMode {
+            get { return service.ApplicationIdleDetectionMode; }
+            set { service.ApplicationIdleDetectionMode = value; }
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ITombstone.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ITombstone.cs
deleted file mode 100644
index c091214..0000000
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/ITombstone.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Caliburn.Micro
-{
-    using System.Reflection;
-
-    /// <summary>
-    /// Specifies how to save/load a particular class or property.
-    /// </summary>
-    public interface ITombstone
-    {
-        /// <summary>
-        /// Tombstones the class/property.
-        /// </summary>
-        /// <param name="phoneService">An instance of the phone service.</param>
-        /// <param name="owner">The owner of the property or null if it is the root.</param>
-        /// <param name="property">The property to persist or null if the value is the root.</param>
-        /// <param name="value">The value to persist.</param>
-        /// <param name="rootKey">The key to use for persistance.</param>
-        void Tombstone(IPhoneService phoneService, object owner, PropertyInfo property, object value, string rootKey);
-
-        /// <summary>
-        /// Resurrects the class/property.
-        /// </summary>
-        /// <param name="phoneService">An instance of the phone service.</param>
-        /// <param name="owner">The owner of the property or null if it is the root.</param>
-        /// <param name="property">The property to resurrect or null if the value is the root.</param>
-        /// <param name="value">The value to resurrect.</param>
-        /// <param name="rootKey">The key to use for resurrection.</param>
-        void Resurrect(IPhoneService phoneService, object owner, PropertyInfo property, object value, string rootKey);
-    }
-}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/InstanceActivator.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/InstanceActivator.cs
deleted file mode 100644
index d5b26c0..0000000
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/InstanceActivator.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-namespace Caliburn.Micro
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-    using System.Windows;
-    using System.Windows.Navigation;
-    using Microsoft.Phone.Shell;
-    using Microsoft.Phone.Tasks;
-
-    /// <summary>
-    /// Designed to be plugged into an IoC Container, this class inspects instances to determine if they need access to the launcher/chooser mechanism.
-    /// </summary>
-    public class InstanceActivator
-    {
-        readonly Func<Type, object> getInstance;
-        readonly List<ITaskManager> taskManagers = new List<ITaskManager>();
-        readonly List<WeakReference> createdInstances = new List<WeakReference>();
-        bool needsResurrection = true;
-
-        /// <summary>
-        /// Creates an instance of the <see cref="InstanceActivator"/>
-        /// </summary>
-        /// <param name="getInstance">A factory method which should take a <see cref="Type"/> and return an instance of that type from the IoC container.</param>
-        /// <param name="bootstrapper">The bootstrapper.</param>
-        public InstanceActivator(PhoneBootstrapper bootstrapper, Func<Type, object> getInstance)
-        {
-            this.getInstance = getInstance;
-
-            bootstrapper.PhoneService.Launching += delegate {
-                needsResurrection = false;
-                createdInstances.Clear();
-            };
-
-            bootstrapper.ResurrectionComplete += delegate {
-                foreach (var reference in createdInstances) {
-                    var instance = reference.Target;
-
-                    if (instance != null)
-                        taskManagers.Apply(x => x.CheckForTaskCompletion(instance));
-                }
-
-                needsResurrection = false;
-                createdInstances.Clear();
-            };
-        }
-
-        /// <summary>
-        /// Tells the activator that the application should expect requests for a particular type of Chooser.
-        /// </summary>
-        /// <typeparam name="TChooser">The type of chooser to handle request for.</typeparam>
-        /// <typeparam name="TResult">The type of result returned by the chooser.</typeparam>
-        public void InstallChooser<TChooser, TResult>()
-            where TChooser : ChooserBase<TResult>, new()
-            where TResult : TaskEventArgs
-        {
-            var manager = new ChooserManager<TChooser, TResult>(this, (IPhoneService)getInstance(typeof(IPhoneService)));
-            taskManagers.Add(manager);
-
-            var navService = (INavigationService)getInstance(typeof(INavigationService));
-            NavigatedEventHandler handler = null;
-            handler = (s, e) =>{
-                manager.PrepareToReceiveCallbacks();
-                navService.Navigated -= handler;
-            };
-            navService.Navigated += handler;
-        }
-
-        /// <summary>
-        /// Tells the activator that the application should expexct requests for a particular type of Task.
-        /// </summary>
-        /// <typeparam name="TLauncher">The type of task to handle the request for.</typeparam>
-        public void InstallLauncher<TLauncher>()
-            where TLauncher : new()
-        {
-            taskManagers.Add(new LauncherManager<TLauncher>());
-        }
-
-        /// <summary>
-        /// Activates the specified instance by inspecting and optionally wiring for chooser/launcher requests. Additionally, inspected instances will be
-        /// forwarded any Chooser results that are pending for them.
-        /// </summary>
-        /// <param name="instance">The instance to activate.</param>
-        /// <returns>The instance that was activated.</returns>
-        public object ActivateInstance(object instance)
-        {
-            TestForTaskLauncher(instance);
-
-            if (needsResurrection)
-                createdInstances.Add(new WeakReference(instance));
-
-            return instance;
-        }
-
-        void TestForTaskLauncher(object instance)
-        {
-            var launcher = instance as ILaunchTask;
-            if(launcher == null)
-                return;
-
-            launcher.TaskLaunchRequested += (s, e) =>{
-                foreach(var taskManager in taskManagers)
-                {
-                    taskManager.TryLaunchTask(launcher, e);
-                }
-            };
-        }
-
-        protected virtual string GetKey(object instance, string qualifier)
-        {
-            var key = instance.GetType().AssemblyQualifiedName;
-
-            var displayNamed = instance as IHaveDisplayName;
-            if(displayNamed != null)
-                key += "|" + displayNamed.DisplayName;
-
-            if(!string.IsNullOrEmpty(qualifier))
-                key += "|" + qualifier;
-
-            return key;
-        }
-
-        interface ITaskManager
-        {
-            void TryLaunchTask(ILaunchTask launcher, TaskLaunchEventArgs args);
-            void CheckForTaskCompletion(object potentialHandler);
-        }
-
-        class LauncherManager<TTask> : ITaskManager
-            where TTask : new()
-        {
-            readonly MethodInfo showMethod;
-            readonly TTask task;
-
-            public LauncherManager()
-            {
-                task = new TTask();
-                showMethod = typeof(TTask).GetMethod("Show", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
-            }
-
-            public void TryLaunchTask(ILaunchTask launcher, TaskLaunchEventArgs args)
-            {
-                if (!typeof(TTask).IsAssignableFrom(args.TaskType))
-                    return;
-
-                var configurator = launcher as IConfigureTask<TTask>;
-                if (configurator != null)
-                    configurator.ConfigureTask(task);
-
-                showMethod.Invoke(task, null);
-            }
-
-            public void CheckForTaskCompletion(object potentialHandler) { }
-        }
-
-        class ChooserManager<TChooser, TResult> : ITaskManager
-            where TChooser : ChooserBase<TResult>, new()
-            where TResult : TaskEventArgs
-        {
-            readonly InstanceActivator activator;
-            readonly IPhoneService phoneService;
-            readonly List<WeakReference> toCheck = new List<WeakReference>();
-            TChooser chooser;
-            bool eventHandled;
-            bool eventRaised;
-            TResult lastResult;
-            bool handledActivate;
-
-            public ChooserManager(InstanceActivator activator, IPhoneService phoneService)
-            {
-                this.activator = activator;
-                this.phoneService = phoneService;
-            }
-
-            static string StateKey
-            {
-                get { return typeof(TChooser).AssemblyQualifiedName; }
-            }
-
-            public void TryLaunchTask(ILaunchTask launcher, TaskLaunchEventArgs args) {
-                eventHandled = false;
-                if(!typeof(TChooser).IsAssignableFrom(args.TaskType))
-                    return;
-
-                var configurator = launcher as IConfigureTask<TChooser>;
-                if(configurator != null)
-                    configurator.ConfigureTask(chooser);
-
-                phoneService.State[StateKey] = activator.GetKey(launcher, string.Empty);
-                toCheck.Clear();
-                toCheck.Add(new WeakReference(launcher));
-                chooser.Show();
-            }
-
-            public void CheckForTaskCompletion(object potentialHandler)
-            {
-                if(eventHandled)
-                    return;
-
-                var handler = potentialHandler as ILaunchChooser<TResult>;
-                if(handler == null)
-                    return;
-
-                object storedClientId;
-                if(!phoneService.State.TryGetValue(StateKey, out storedClientId))
-                    return;
-
-                if(eventRaised)
-                    TryHandleAtLatestTime(handler, storedClientId);
-                else toCheck.Add(new WeakReference(handler));
-            }
-
-            public void PrepareToReceiveCallbacks()
-            {
-                chooser = new TChooser();
-                chooser.Completed += OnChooserCompleted;
-            }
-
-            void OnChooserCompleted(object sender, TResult e)
-            {
-                if (phoneService.StartupMode == StartupMode.Launch || handledActivate) {
-                    toCheck.Select(weakReference => weakReference.Target)
-                        .OfType<ILaunchChooser<TResult>>()
-                        .First().Handle(e);
-                    eventHandled = true;
-                    toCheck.Clear();
-                    return;
-                }
-
-                handledActivate = true;
-                lastResult = e;
-                eventRaised = true;
-
-                object storedClientId;
-                if(!phoneService.State.TryGetValue(StateKey, out storedClientId))
-                    return;
-
-                foreach(var weakReference in toCheck)
-                {
-                    var handler = weakReference.Target as ILaunchChooser<TResult>;
-                    if(handler == null)
-                        continue;
-
-                    TryHandleAtLatestTime(handler, storedClientId);
-                }
-
-                toCheck.Clear();
-            }
-
-            void TryHandleAtLatestTime(ILaunchChooser<TResult> handler, object storedClientId)
-            {
-                var viewAware = handler as IViewAware;
-                if(viewAware != null)
-                {
-                    var defaultView = viewAware.GetView(ViewLocator.DefaultContext);
-
-                    if(defaultView == null)
-                        HandleViewAware(handler, viewAware, storedClientId);
-                    else
-                        HandleView(defaultView, storedClientId, handler);
-                }
-                else HandleActivatable(handler, storedClientId);
-            }
-
-            void HandleViewAware(ILaunchChooser<TResult> handler, IViewAware viewAware, object storedClientId)
-            {
-                EventHandler<ViewAttachedEventArgs> onViewAttached = null;
-                onViewAttached = (s, e) =>{
-                    HandleView(e.View, storedClientId, handler);
-                    viewAware.ViewAttached -= onViewAttached;
-                };
-                viewAware.ViewAttached += onViewAttached;
-            }
-
-            void HandleView(object view, object storedClientId, ILaunchChooser<TResult> handler)
-            {
-                var frameworkElement = view as FrameworkElement;
-
-                RoutedEventHandler onLoaded = null;
-                onLoaded = (s, e) =>{
-                    if(!eventHandled && string.Compare(storedClientId.ToString(), activator.GetKey(handler, string.Empty)) == 0)
-                    {
-                        handler.Handle(lastResult);
-                        lastResult = null;
-                        eventHandled = true;
-                    }
-
-                    frameworkElement.Loaded -= onLoaded;
-                };
-
-                if(frameworkElement != null)
-                    frameworkElement.Loaded += onLoaded;
-                else onLoaded(null, null);
-            }
-
-            void HandleActivatable(ILaunchChooser<TResult> handler, object storedClientId)
-            {
-                var activatable = handler as IActivate;
-                EventHandler<ActivationEventArgs> onActivate = null;
-
-                onActivate = (s, e) =>{
-                    if(!eventHandled && e.WasInitialized && string.Compare(storedClientId.ToString(), activator.GetKey(handler, string.Empty)) == 0)
-                    {
-                        handler.Handle(lastResult);
-                        lastResult = null;
-                        eventHandled = true;
-                    }
-
-                    if(activatable != null)
-                        activatable.Activated -= onActivate;
-                };
-
-                if(activatable != null && !activatable.IsActive)
-                    activatable.Activated += onActivate;
-                else
-                {
-                    onActivate(null, new ActivationEventArgs {
-                        WasInitialized = true
-                    });
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/PhoneBootstrapper.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/PhoneBootstrapper.cs
index 9fda0ad..babd934 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/PhoneBootstrapper.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/PhoneBootstrapper.cs
@@ -1,9 +1,5 @@
 namespace Caliburn.Micro
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Windows;
     using System.Windows.Navigation;
     using Microsoft.Phone.Controls;
     using Microsoft.Phone.Shell;
@@ -13,13 +9,8 @@
     /// </summary>
     public class PhoneBootstrapper : Bootstrapper
     {
-        protected bool PhoneApplicationInitialized;
-        bool isResurrecting = true;
-
-        /// <summary>
-        /// The phone application services.
-        /// </summary>
-        public PhoneApplicationService PhoneService { get; private set; }
+        bool phoneApplicationInitialized;
+        PhoneApplicationService phoneService;
 
         /// <summary>
         /// The root frame used for navigation.
@@ -29,29 +20,27 @@ public class PhoneBootstrapper : Bootstrapper
         /// <summary>
         /// Provides an opportunity to hook into the application object.
         /// </summary>
-        protected override void PrepareApplication()
-        {
+        protected override void PrepareApplication() {
             base.PrepareApplication();
 
-            PhoneService = new PhoneApplicationService();
-            PhoneService.Activated += OnActivate;
-            PhoneService.Deactivated += OnDeactivate;
-            PhoneService.Launching += OnLaunch;
-            PhoneService.Closing += OnClose;
+            phoneService = new PhoneApplicationService();
+            phoneService.Activated += OnActivate;
+            phoneService.Deactivated += OnDeactivate;
+            phoneService.Launching += OnLaunch;
+            phoneService.Closing += OnClose;
 
-            Application.ApplicationLifetimeObjects.Add(PhoneService);
+            Application.ApplicationLifetimeObjects.Add(phoneService);
 
-            if (PhoneApplicationInitialized)
+            if (phoneApplicationInitialized)
                 return;
 
             RootFrame = CreatePhoneApplicationFrame();
             RootFrame.Navigated += OnNavigated;
 
-            PhoneApplicationInitialized = true;
+            phoneApplicationInitialized = true;
         }
 
-        void OnNavigated(object sender, NavigationEventArgs e)
-        {
+        void OnNavigated(object sender, NavigationEventArgs e) {
             if (Application.RootVisual != RootFrame)
                 Application.RootVisual = RootFrame;
         }
@@ -67,111 +56,21 @@ void OnNavigated(object sender, NavigationEventArgs e)
         /// <summary>
         /// Occurs when a fresh instance of the application is launching.
         /// </summary>
-        protected virtual void OnLaunch(object sender, LaunchingEventArgs e) {
-            isResurrecting = false;
-        }
+        protected virtual void OnLaunch(object sender, LaunchingEventArgs e) { }
 
         /// <summary>
-        /// Occurs when the application is closing.
+        /// Occurs when a previously tombstoned or paused application is resurrected/resumed.
         /// </summary>
-        protected virtual void OnClose(object sender, ClosingEventArgs e) { }
+        protected virtual void OnActivate(object sender, ActivatedEventArgs e) { }
 
         /// <summary>
-        /// Occurs when the application is being tombstoned.
+        /// Occurs when the application is being tombstoned or paused.
         /// </summary>
-        protected virtual void OnDeactivate(object sender, DeactivatedEventArgs e)
-        {
-            Tombstone(SelectInstancesToTombstone());
-        }
+        protected virtual void OnDeactivate(object sender, DeactivatedEventArgs e) { }
 
         /// <summary>
-        /// Occurs when a previously tombstoned application instance is resurrected.
-        /// </summary>
-        protected virtual void OnActivate(object sender, ActivatedEventArgs e)
-        {
-            if (isResurrecting) {
-                NavigatedEventHandler onNavigated = null;
-                onNavigated = (s2, e2) => {
-                    Resurrect(SelectInstancesToResurrect());
-                    RootFrame.Navigated -= onNavigated;
-                };
-                RootFrame.Navigated += onNavigated;
-            }
-
-            isResurrecting = false;
-        }
-
-        /// <summary>
-        /// Selects all instance which require some sort of persistence before tombstoning.
-        /// </summary>
-        /// <returns>The list of instances to be persisted.</returns>
-        protected virtual IEnumerable<object> SelectInstancesToTombstone()
-        {
-            var fe = RootFrame.Content as FrameworkElement;
-            if (fe != null && fe.DataContext != null)
-                return new [] { fe.DataContext };
-            return new object[0];
-        }
-
-        /// <summary>
-        /// Selects all instance which require some sort of re-hydration after tombstoning.
-        /// </summary>
-        /// <returns>The list of instances to be re-hydrated.</returns>
-        protected virtual IEnumerable<object> SelectInstancesToResurrect()
-        {
-            var fe = RootFrame.Content as FrameworkElement;
-            if (fe != null && fe.DataContext != null)
-                return new [] { fe.DataContext };
-            return new object[0];
-        }
-
-        /// <summary>
-        /// Persists the specified instances before tombstoning.
-        /// </summary>
-        /// <param name="instances">The instances to persist.</param>
-        protected virtual void Tombstone(IEnumerable<object> instances)
-        {
-            var phoneService = (IPhoneService)IoC.GetAllInstances(typeof(IPhoneService))
-                .FirstOrDefault() ?? new PhoneApplicationServiceAdapter(PhoneService);
-
-            foreach(var instance in instances)
-            {
-                var persister = instance.GetType().GetAttributes<ITombstone>(true)
-                    .FirstOrDefault();
-
-                if (persister == null)
-                    continue;
-
-                persister.Tombstone(phoneService, null, null, instance, null);
-            }
-        }
-
-        /// <summary>
-        /// Occurs after resurrection has completed.
-        /// </summary>
-        public event EventHandler ResurrectionComplete = delegate { }; 
-
-        /// <summary>
-        /// Resurrects the instances after activation.
+        /// Occurs when the application is closing.
         /// </summary>
-        /// <param name="instances">The instances to resurrect.</param>
-        protected virtual void Resurrect(IEnumerable<object> instances)
-        {
-            var phoneService = (IPhoneService)IoC.GetAllInstances(typeof(IPhoneService))
-                .FirstOrDefault() ?? new PhoneApplicationServiceAdapter(PhoneService);
-
-            foreach(var instance in instances)
-            {
-                var persister = instance.GetType().GetAttributes<ITombstone>(true)
-                    .FirstOrDefault();
-
-                if (persister == null)
-                    continue;
-
-                persister.Resurrect(phoneService, null, null, instance, null);
-            }
-
-            ResurrectionComplete(this, EventArgs.Empty);
-        }
+        protected virtual void OnClose(object sender, ClosingEventArgs e) { }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/Properties/AssemblyInfo.cs
index 67c70ea..58461af 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/Properties/AssemblyInfo.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/Properties/AssemblyInfo.cs
@@ -3,14 +3,14 @@
 using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Caliburn Micro")]
-[assembly: AssemblyDescription("A small, yet extremely powerful implementation of Caliburn.")]
+[assembly: AssemblyDescription("A small, yet powerful framework designed for WPF, Silverlight and WP7. It implements a variety of UI patterns for solving real-world problems. Patterns that are highlighted include MVVM (Presentation Model), MVP and MVC.")]
 [assembly: AssemblyProduct("Caliburn.Micro")]
 [assembly: AssemblyCompany("Blue Spire Consulting, Inc.")]
 [assembly: AssemblyCopyright("Copyright © 2010")]
 [assembly: ComVisible(false)]
 [assembly: Guid("6449e9cb-4d4d-4d79-8f73-71a2fc647109")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 
 [assembly: XmlnsDefinition("http://www.caliburnproject.org", "Caliburn.Micro")]
 [assembly: XmlnsPrefix("http://www.caliburnproject.org", "cal")]
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/SurviveTombstone.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/SurviveTombstone.cs
deleted file mode 100644
index 29ba756..0000000
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/SurviveTombstone.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-namespace Caliburn.Micro
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-
-    /// <summary>
-    /// A basic implementation of <see cref="ITombstone"/>.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property)]
-    public class SurviveTombstone : Attribute, ITombstone
-    {
-        ///<summary>
-        /// Indicates that the entire value of the attributed property should be stored in the phone state.
-        ///</summary>
-        public bool SerializeComplexType { get; set; }
-
-        /// <summary>
-        /// Tombstones the class/property.
-        /// </summary>
-        /// <param name="phoneService">An instance of the phone service.</param>
-        /// <param name="owner">The owner of the property or null if it is the root.</param>
-        /// <param name="property">The property to persist or null if the value is the root.</param>
-        /// <param name="value">The value to persist.</param>
-        /// <param name="rootKey">The key to use for persistance.</param>
-        public virtual void Tombstone(IPhoneService phoneService, object owner, PropertyInfo property, object value, string rootKey)
-        {
-            if(value == null)
-                return;
-
-            var type = value.GetType();
-
-            if(IsComplexType(type))
-            {
-                var key = GetStateKey(value, rootKey);
-                var conductor = value as IConductor;
-                if(conductor != null)
-                {
-                    var items = conductor.GetConductedItems().OfType<object>().ToList();
-                    phoneService.State[key + "|ActiveItemIndex"] = items.IndexOf(conductor.ActiveItem);
-
-                    GetPersistableItems(items, key)
-                        .Apply(x => x.Item2.Tombstone(phoneService, value, null, x.Item1, x.Item3));
-                }
-
-                GetPersistableProperties(value, key)
-                    .Apply(x => x.Item2.Tombstone(phoneService, value, x.Item1, x.Item1.GetValue(value, null), x.Item3));
-            }
-            else phoneService.State[rootKey] = value;
-        }
-
-        /// <summary>
-        /// Resurrects the class/property.
-        /// </summary>
-        /// <param name="phoneService">An instance of the phone service.</param>
-        /// <param name="owner">The owner of the property or null if it is the root.</param>
-        /// <param name="property">The property to resurrect or null if the value is the root.</param>
-        /// <param name="value">The value to resurrect.</param>
-        /// <param name="rootKey">The key to use for resurrection.</param>
-        public virtual void Resurrect(IPhoneService phoneService, object owner, PropertyInfo property, object value, string rootKey)
-        {
-            var type = property == null ? value.GetType() : property.PropertyType;
-
-            if(IsComplexType(type))
-            {
-                if(value == null)
-                    return;
-
-                var key = GetStateKey(value, rootKey);
-
-                var conductor = value as IConductor;
-                if(conductor != null)
-                {
-                    var items = conductor.GetConductedItems().OfType<object>().ToList();
-                    var conductorId = key + "|ActiveItemIndex";
-
-                    if(phoneService.State.ContainsKey(conductorId))
-                    {
-                        var index = Convert.ToInt32(phoneService.State[conductorId]);
-
-                        if (index > 0 && index < items.Count)
-                            conductor.ActivateItem(items[index]);
-                    }
-                    else
-                        conductor.ActivateItem(items.FirstOrDefault());
-
-                    GetPersistableItems(items, key)
-                        .Apply(x => x.Item2.Resurrect(phoneService, value, null, x.Item1, x.Item3));
-                }
-
-                GetPersistableProperties(value, key)
-                    .Apply(x => x.Item2.Resurrect(
-                        phoneService,
-                        value,
-                        x.Item1,
-                        IsComplexType(x.Item1.PropertyType) ? x.Item1.GetValue(value, null) : null,
-                        x.Item3
-                        )
-                    );
-            }
-            else
-            {
-                object persisted;
-                if(phoneService.State.TryGetValue(rootKey, out persisted))
-                    property.SetValue(owner, persisted, null);
-            }
-        }
-
-        /// <summary>
-        /// Determines if the type is a complex type.
-        /// </summary>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        protected virtual bool IsComplexType(Type type)
-        {
-            return !SerializeComplexType && (type.IsClass || type.IsInterface) && !typeof(string).IsAssignableFrom(type);
-        }
-
-        /// <summary>
-        /// Returns the persistable items from the collection.
-        /// </summary>
-        /// <param name="items">The items to inspect.</param>
-        /// <param name="key">The root persistence key.</param>
-        /// <returns>A list of tuples containing the item, its persister and the key to use during persistence.</returns>
-        protected virtual IEnumerable<Tuple<object, ITombstone, string>> GetPersistableItems(List<object> items, string key)
-        {
-            return items.Select((x, i) =>{
-                var persister = x.GetType().GetAttributes<ITombstone>(true).FirstOrDefault();
-                return persister != null ? new Tuple<object, ITombstone, string>(x, persister, key + "|" + i) : null;
-            }).Where(x => x != null);
-        }
-
-        /// <summary>
-        /// Gets all the persistable properties of the instance.
-        /// </summary>
-        /// <param name="instance">The instance to inspect for persistable properties.</param>
-        /// <param name="key">The root persistence key.</param>
-        /// <returns>A list of tuples containing, the property, its persister and the key to use during persistence.</returns>
-        protected virtual IEnumerable<Tuple<PropertyInfo, ITombstone, string>> GetPersistableProperties(object instance, string key)
-        {
-            return from property in instance.GetType().GetProperties()
-                   let attribute = property.GetAttributes<ITombstone>(true).FirstOrDefault()
-                   where attribute != null
-                   select new Tuple<PropertyInfo, ITombstone, string>(property, attribute, key + "|" + property.Name);
-        }
-
-        /// <summary>
-        /// Determines the persistence key for the instance.
-        /// </summary>
-        /// <param name="instance">The instance to determine the key for.</param>
-        /// <param name="rootKey">The root key.</param>
-        /// <returns>The key.</returns>
-        protected virtual string GetStateKey(object instance, string rootKey)
-        {
-            var key = string.IsNullOrEmpty(rootKey) ? string.Empty : rootKey + "|";
-            return key + instance.GetType().Name;
-        }
-    }
-}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/TaskLaunchEventArgs.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/TaskLaunchEventArgs.cs
deleted file mode 100644
index 5dfced6..0000000
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/TaskLaunchEventArgs.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace Caliburn.Micro
-{
-    using System;
-
-    /// <summary>
-    /// Used by InstanceActivator to carry event specific information when task launch is requested.
-    /// </summary>
-    public class TaskLaunchEventArgs : EventArgs
-    {
-        /// <summary>
-        /// The type of task to launch.
-        /// </summary>
-        public Type TaskType { get; set; }
-
-        /// <summary>
-        /// Creates an instance of the event args.
-        /// </summary>
-        /// <typeparam name="TTask">The type of task to launch.</typeparam>
-        /// <returns>The event args.</returns>
-        public static TaskLaunchEventArgs For<TTask>()
-        {
-            return new TaskLaunchEventArgs {
-                TaskType = typeof(TTask)
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WP7/WindowManager.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/WindowManager.cs
new file mode 100644
index 0000000..8668729
--- /dev/null
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WP7/WindowManager.cs
@@ -0,0 +1,507 @@
+namespace Caliburn.Micro
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.Linq;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Controls.Primitives;
+    using System.Windows.Markup;
+    using System.Windows.Media;
+    using System.Windows.Media.Animation;
+    using Microsoft.Phone.Controls;
+    using Microsoft.Phone.Shell;
+    using System.Threading;
+
+    /// <summary>
+    ///   A service that manages windows.
+    /// </summary>
+    public interface IWindowManager
+    {
+        /// <summary>
+        ///   Shows a modal dialog for the specified model.
+        /// </summary>
+        /// <param name = "rootModel">The root model.</param>
+        /// <param name = "context">The context.</param>
+        void ShowDialog(object rootModel, object context = null);
+
+        /// <summary>
+        ///   Shows a popup at the current mouse position.
+        /// </summary>
+        /// <param name = "rootModel">The root model.</param>
+        /// <param name = "context">The view context.</param>
+        /// <param name = "settings">The optional popup settings.</param>
+        void ShowPopup(object rootModel, object context = null, IDictionary<string, object> settings = null);
+    }
+
+    /// <summary>
+    ///   A service that manages windows.
+    /// </summary>
+    public class WindowManager : IWindowManager
+    {
+
+        /// <summary>
+        /// Predicate used to determine whether a page being navigated is actually a system dialog, which should 
+        /// cause a temporary dialog disappearance.
+        /// </summary>
+        /// <remarks>
+        /// The default implementation just take into account DatePicker and TimePicker pages from WP7 toolkit.
+        /// </remarks>
+        /// /// <param name = "uri">The destination page to check</param>
+        public static Func<Uri, bool> IsSystemDialogNavigation = uri => { 
+            return uri != null && uri.ToString().StartsWith("/Microsoft.Phone.Controls.Toolkit"); 
+        };
+
+        /// <summary>
+        ///   Shows a modal dialog for the specified model.
+        /// </summary>
+        /// <param name = "rootModel">The root model.</param>
+        /// <param name = "context">The context.</param>
+        public virtual void ShowDialog(object rootModel, object context = null)
+        {
+            var navigationSvc = IoC.Get<INavigationService>();
+
+            var host = new DialogHost(navigationSvc);
+            var view = ViewLocator.LocateForModel(rootModel, host, context);
+            host.Content = view;
+            host.SetValue(View.IsGeneratedProperty, true);
+
+            ViewModelBinder.Bind(rootModel, host, null);
+            host.SetActionTarget(rootModel);
+
+            var activatable = rootModel as IActivate;
+            if (activatable != null)
+                activatable.Activate();
+
+            var deactivator = rootModel as IDeactivate;
+            if (deactivator != null)
+                host.Closed += delegate { deactivator.Deactivate(true); };
+
+            host.Open();
+        }
+
+        /// <summary>
+        ///   Shows a popup at the current mouse position.
+        /// </summary>
+        /// <param name = "rootModel">The root model.</param>
+        /// <param name = "context">The view context.</param>
+        /// <param name = "settings">The optional popup settings.</param>
+        public virtual void ShowPopup(object rootModel, object context = null, IDictionary<string, object> settings = null)
+        {
+            var popup = CreatePopup(rootModel, settings);
+            var view = ViewLocator.LocateForModel(rootModel, popup, context);
+
+            popup.Child = view;
+            popup.SetValue(View.IsGeneratedProperty, true);
+
+            ViewModelBinder.Bind(rootModel, popup, null);
+
+            var activatable = rootModel as IActivate;
+            if (activatable != null)
+                activatable.Activate();
+
+            var deactivator = rootModel as IDeactivate;
+            if (deactivator != null)
+                popup.Closed += delegate { deactivator.Deactivate(true); };
+
+            popup.IsOpen = true;
+        }
+
+        /// <summary>
+        ///   Creates a popup for hosting a popup window.
+        /// </summary>
+        /// <param name = "rootModel">The model.</param>
+        /// <param name = "settings">The optional popup settings.</param>
+        /// <returns>The popup.</returns>
+        protected virtual Popup CreatePopup(object rootModel, IDictionary<string, object> settings)
+        {
+            var popup = new Popup();
+
+            if (settings != null)
+            {
+                var type = popup.GetType();
+
+                foreach (var pair in settings)
+                {
+                    var propertyInfo = type.GetProperty(pair.Key);
+
+                    if (propertyInfo != null)
+                        propertyInfo.SetValue(popup, pair.Value, null);
+                }
+            }
+
+            return popup;
+        }
+
+        [ContentProperty("Content")]
+        internal class DialogHost : FrameworkElement
+        {
+
+
+
+
+
+
+            INavigationService navigationSvc;
+            PhoneApplicationPage currentPage;
+
+
+            Popup hostPopup;
+            bool isOpen = false;
+            ContentControl viewContainer;
+            Border pageFreezingLayer;
+            Border maskingLayer;
+            IElementPlacementAnimator elementPlacementAnimator;
+            Dictionary<IApplicationBarIconButton, bool> appBarButtonsStatus = new Dictionary<IApplicationBarIconButton, bool>();
+            bool appBarMenuEnabled;
+
+            public DialogHost(INavigationService navigationSvc)
+            {
+                this.navigationSvc = navigationSvc;
+
+                this.currentPage = navigationSvc.CurrentContent as PhoneApplicationPage;
+                if (this.currentPage == null)
+                    throw new InvalidOperationException(
+                        string.Format("In order to use ShowDialog the view currently loaded in the application frame ({0})"
+                                      + " should inherit from PhoneApplicationPage or one of its descendents.", navigationSvc.CurrentContent.GetType()));
+
+
+                navigationSvc.Navigating += OnNavigating;
+                navigationSvc.Navigated += OnNavigated;
+
+                CreateUIElements();
+                elementPlacementAnimator = CreateElementsAnimator();
+            }
+
+            public EventHandler Closed = delegate { };
+
+
+            public void SetActionTarget(object target)
+            {
+                Action.SetTarget(viewContainer, target);
+            }
+
+            public virtual UIElement Content
+            {
+                get { return (UIElement)viewContainer.Content; }
+                set { viewContainer.Content = value; }
+            }
+
+            public void Open()
+            {
+                if (isOpen)
+                    return;
+                isOpen = true;
+
+                if (currentPage.ApplicationBar != null)
+                {
+                    DisableAppBar();
+                }
+
+                ArrangePlacement();
+
+
+                currentPage.BackKeyPress += CurrentPageBackKeyPress;
+                currentPage.OrientationChanged += CurrentPageOrientationChanged;
+
+                hostPopup.IsOpen = true;
+            }
+
+            public void Close()
+            {
+                Close(reopenOnBackNavigation: false);
+            }
+
+            void Close(bool reopenOnBackNavigation)
+            {
+                if (!isOpen)
+                    return;
+                isOpen = false;
+
+                elementPlacementAnimator.Exit(() => { hostPopup.IsOpen = false; });
+
+                if (currentPage.ApplicationBar != null)
+                {
+                    RestoreAppBar();
+                }
+
+
+                currentPage.BackKeyPress -= CurrentPageBackKeyPress;
+                currentPage.OrientationChanged -= CurrentPageOrientationChanged;
+
+                if (!reopenOnBackNavigation)
+                {
+                    navigationSvc.Navigating -= OnNavigating;
+                    navigationSvc.Navigated -= OnNavigated;
+
+
+                    Closed(this, EventArgs.Empty);
+                }
+            }
+
+            protected virtual IElementPlacementAnimator CreateElementsAnimator()
+            {
+                return new DefaultElementPlacementAnimator(maskingLayer, viewContainer);
+            }
+
+            protected virtual void CreateUIElements()
+            {
+                viewContainer = new ContentControl
+                {
+                    HorizontalContentAlignment = HorizontalAlignment.Stretch,
+                    VerticalContentAlignment = VerticalAlignment.Top,
+                };
+                maskingLayer = new Border
+                {
+                    Child = viewContainer,
+                    Background = new SolidColorBrush(Color.FromArgb(170, 0, 0, 0)),
+                    VerticalAlignment = VerticalAlignment.Top,
+                    HorizontalAlignment = HorizontalAlignment.Left
+                };
+                pageFreezingLayer = new Border
+                {
+                    Background = new SolidColorBrush(Colors.Transparent),
+                    Width = Application.Current.Host.Content.ActualWidth,
+                    Height = Application.Current.Host.Content.ActualHeight
+                };
+
+                var panel = new Canvas();
+                panel.Children.Add(pageFreezingLayer);
+                panel.Children.Add(maskingLayer);
+
+                hostPopup = new Popup { Child = panel };
+            }
+
+            void DisableAppBar()
+            {
+                appBarMenuEnabled = currentPage.ApplicationBar.IsMenuEnabled;
+                appBarButtonsStatus.Clear();
+                currentPage.ApplicationBar.Buttons.Cast<IApplicationBarIconButton>()
+                    .Apply(b =>
+                    {
+                        appBarButtonsStatus.Add(b, b.IsEnabled);
+                        b.IsEnabled = false;
+                    });
+
+                currentPage.ApplicationBar.IsMenuEnabled = false;
+            }
+
+            void RestoreAppBar()
+            {
+                currentPage.ApplicationBar.IsMenuEnabled = appBarMenuEnabled;
+                currentPage.ApplicationBar.Buttons.Cast<IApplicationBarIconButton>()
+                    .Apply(b =>
+                    {
+                        bool status;
+                        if (appBarButtonsStatus.TryGetValue(b, out status))
+                            b.IsEnabled = status;
+                    });
+            }
+
+            void ArrangePlacement()
+            {
+                maskingLayer.Dispatcher.BeginInvoke(() =>
+                {
+                    var placement = new ElementPlacement
+                    {
+                        Transform = (Transform)currentPage.TransformToVisual(null),
+                        Orientation = currentPage.Orientation,
+                        Size = new Size(currentPage.ActualWidth, currentPage.ActualHeight)
+                    };
+
+                    elementPlacementAnimator.AnimateTo(placement);
+                });
+            }
+
+
+            Uri currentPageUri;
+            void OnNavigating(object sender, System.Windows.Navigation.NavigatingCancelEventArgs e)
+            {
+                if (WindowManager.IsSystemDialogNavigation(e.Uri))
+                    currentPageUri = navigationSvc.CurrentSource;
+            }
+            void OnNavigated(object sender, System.Windows.Navigation.NavigationEventArgs e)
+            {
+
+                if (WindowManager.IsSystemDialogNavigation(e.Uri))
+                {
+                    Close(reopenOnBackNavigation: currentPageUri != null);
+                }
+                else if (e.Uri.Equals(currentPageUri))
+                {
+                    currentPageUri = null;
+                    //refreshes the page instance
+                    this.currentPage = (PhoneApplicationPage)navigationSvc.CurrentContent;
+
+                    Open();
+                }
+                else
+                {
+                    Close(reopenOnBackNavigation: false);
+                }
+            }
+
+
+            void CurrentPageBackKeyPress(object sender, CancelEventArgs e)
+            {
+                e.Cancel = true;
+                Close();
+            }
+
+            void CurrentPageOrientationChanged(object sender, OrientationChangedEventArgs e)
+            {
+                ArrangePlacement();
+            }
+
+            public class ElementPlacement
+            {
+                public Transform Transform;
+                public PageOrientation Orientation;
+                public Size Size;
+
+                public double AngleFromDefault
+                {
+                    get
+                    {
+                        if ((Orientation & PageOrientation.Landscape) == 0)
+                            return 0;
+                        return Orientation == PageOrientation.LandscapeRight ? 90 : -90;
+                    }
+                }
+            }
+
+            public interface IElementPlacementAnimator
+            {
+                void Enter(ElementPlacement initialPlacement);
+                void AnimateTo(ElementPlacement newPlacement);
+                void Exit(System.Action onCompleted);
+            }
+
+            public class DefaultElementPlacementAnimator : IElementPlacementAnimator
+            {
+                FrameworkElement maskingLayer;
+                FrameworkElement viewContainer;
+                Storyboard storyboard = new Storyboard();
+                ElementPlacement currentPlacement;
+
+                public DefaultElementPlacementAnimator(FrameworkElement maskingLayer, FrameworkElement viewContainer)
+                {
+                    this.maskingLayer = maskingLayer;
+                    this.viewContainer = viewContainer;
+                }
+
+                public void Enter(ElementPlacement initialPlacement)
+                {
+                    currentPlacement = initialPlacement;
+
+                    //size
+                    maskingLayer.Width = currentPlacement.Size.Width;
+                    maskingLayer.Height = currentPlacement.Size.Height;
+
+                    //position and orientation
+                    maskingLayer.RenderTransform = currentPlacement.Transform;
+
+                    //enter animation
+                    var projection = new PlaneProjection { CenterOfRotationY = 0.1 };
+                    viewContainer.Projection = projection;
+                    AddDoubleAnimation(projection, "RotationX", from: -90, to: 0, ms: 400);
+                    AddDoubleAnimation(maskingLayer, "Opacity", from: 0, to: 1, ms: 400);
+
+                    storyboard.Begin();
+                }
+
+                public void AnimateTo(ElementPlacement newPlacement)
+                {
+
+                    storyboard.Stop();
+                    storyboard.Children.Clear();
+
+
+                    if (currentPlacement == null)
+                    {
+                        Enter(newPlacement);
+                        return;
+                    }
+
+
+                    //size
+                    AddDoubleAnimation(maskingLayer, "Width", from: currentPlacement.Size.Width, to: newPlacement.Size.Width, ms: 200);
+                    AddDoubleAnimation(maskingLayer, "Height", from: currentPlacement.Size.Height, to: newPlacement.Size.Height, ms: 200);
+
+                    //rotation at orientation change
+                    var transformGroup = new TransformGroup();
+                    var rotation = new RotateTransform
+                    {
+                        CenterX = Application.Current.Host.Content.ActualWidth / 2,
+                        CenterY = Application.Current.Host.Content.ActualHeight / 2
+                    };
+                    transformGroup.Children.Add(newPlacement.Transform);
+                    transformGroup.Children.Add(rotation);
+                    maskingLayer.RenderTransform = transformGroup;
+                    AddDoubleAnimation(rotation, "Angle", from: newPlacement.AngleFromDefault - currentPlacement.AngleFromDefault, to: 0.0);
+
+                    //slight fading at orientation change
+                    AddFading(maskingLayer);
+
+                    currentPlacement = newPlacement;
+                    storyboard.Begin();
+                }
+
+                public void Exit(System.Action onCompleted)
+                {
+                    storyboard.Stop();
+                    storyboard.Children.Clear();
+
+                    //exit animation
+                    var projection = new PlaneProjection { CenterOfRotationY = 0.1 };
+                    viewContainer.Projection = projection;
+                    AddDoubleAnimation(projection, "RotationX", from: 0, to: 90, ms: 250);
+                    AddDoubleAnimation(maskingLayer, "Opacity", from: 1, to: 0, ms: 350);
+
+                    EventHandler handler = null;
+                    handler = new EventHandler((o, e) =>
+                    {
+                        storyboard.Completed -= handler;
+                        onCompleted();
+                        currentPlacement = null;
+                    });
+                    storyboard.Completed += handler;
+                    storyboard.Begin();
+                }
+
+                void AddDoubleAnimation(DependencyObject target, string property, double from, double to, int ms = 500)
+                {
+                    var timeline = new DoubleAnimation
+                    {
+                        From = from,
+                        To = to,
+                        EasingFunction = new ExponentialEase { EasingMode = EasingMode.EaseOut, Exponent = 4 },
+                        Duration = new Duration(TimeSpan.FromMilliseconds(ms))
+                    };
+
+                    Storyboard.SetTarget(timeline, target);
+                    Storyboard.SetTargetProperty(timeline, new PropertyPath(property));
+                    storyboard.Children.Add(timeline);
+                }
+
+                void AddFading(FrameworkElement target)
+                {
+                    var timeline = new DoubleAnimationUsingKeyFrames
+                    {
+                        Duration = new Duration(TimeSpan.FromMilliseconds(500))
+                    };
+                    timeline.KeyFrames.Add(new LinearDoubleKeyFrame { Value = 1, KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromMilliseconds(0)) });
+                    timeline.KeyFrames.Add(new LinearDoubleKeyFrame { Value = 0.5, KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromMilliseconds(150)) });
+                    timeline.KeyFrames.Add(new LinearDoubleKeyFrame { Value = 1, KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromMilliseconds(300)) });
+
+                    Storyboard.SetTarget(timeline, target);
+                    Storyboard.SetTargetProperty(timeline, new PropertyPath("Opacity"));
+                    storyboard.Children.Add(timeline);
+                }
+            }
+
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Caliburn.Micro.WPF.csproj b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Caliburn.Micro.WPF.csproj
index 03d696c..79456f7 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Caliburn.Micro.WPF.csproj
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Caliburn.Micro.WPF.csproj
@@ -12,25 +12,32 @@
     <AssemblyName>Caliburn.Micro</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\WPF\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Caliburn.Micro.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\WPF\Debug\Caliburn.Micro.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\WPF\Release\</OutputPath>
     <DefineConstants>TRACE;NET</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Caliburn.Micro.XML</DocumentationFile>
+    <DocumentationFile>..\..\bin\WPF\Release\Caliburn.Micro.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>Caliburn.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
@@ -63,6 +70,9 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\BindableCollection.cs">
       <Link>BindableCollection.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\BindingScope.cs">
+      <Link>BindingScope.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\BooleanToVisibilityConverter.cs">
       <Link>BooleanToVisibilityConverter.cs</Link>
     </Compile>
@@ -75,6 +85,12 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\ConductorBase.cs">
       <Link>ConductorBase.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\ConductorBaseWithActiveItem.cs">
+      <Link>ConductorBaseWithActiveItem.cs</Link>
+    </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\ConductorWithCollectionAllActive.cs">
+      <Link>ConductorWithCollectionAllActive.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\ConductorWithCollectionOneActive.cs">
       <Link>ConductorWithCollectionOneActive.cs</Link>
     </Compile>
@@ -108,6 +124,9 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\IHandle.cs">
       <Link>IHandle.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\IHaveParameters.cs">
+      <Link>IHaveParameters.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\IoC.cs">
       <Link>IoC.cs</Link>
     </Compile>
@@ -129,6 +148,9 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\MessageBinder.cs">
       <Link>MessageBinder.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\NameTransformer.cs">
+      <Link>NameTransformer.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\Parser.cs">
       <Link>Parser.cs</Link>
     </Compile>
@@ -141,12 +163,18 @@
     <Compile Include="..\Caliburn.Micro.Silverlight\Screen.cs">
       <Link>Screen.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\ScreenExtensions.cs">
+      <Link>ScreenExtensions.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\SequentialResult.cs">
       <Link>SequentialResult.cs</Link>
     </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\View.cs">
       <Link>View.cs</Link>
     </Compile>
+    <Compile Include="..\Caliburn.Micro.Silverlight\ViewAware.cs">
+      <Link>ViewAware.cs</Link>
+    </Compile>
     <Compile Include="..\Caliburn.Micro.Silverlight\ViewLocator.cs">
       <Link>ViewLocator.cs</Link>
     </Compile>
@@ -161,6 +189,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WindowManager.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Caliburn.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Caliburn.snk b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Caliburn.snk
new file mode 100644
index 0000000..fed9681
Binary files /dev/null and b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Caliburn.snk differ
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Parameter.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Parameter.cs
index c03ce9a..0acb206 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Parameter.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Parameter.cs
@@ -1,5 +1,6 @@
 namespace Caliburn.Micro
 {
+    using System;
     using System.ComponentModel;
     using System.Windows;
     using System.Windows.Interactivity;
@@ -21,7 +22,7 @@ public class Parameter : Freezable, IAttachedObject
                 );
 
         DependencyObject associatedObject;
-        ActionMessage owner;
+        WeakReference owner;
 
         /// <summary>
         /// Gets or sets the value of the parameter.
@@ -43,6 +44,12 @@ DependencyObject IAttachedObject.AssociatedObject
             }
         }
 
+        ActionMessage Owner
+        {
+            get { return owner == null ? null : owner.Target as ActionMessage; }
+            set { owner = new WeakReference(value); }
+        }
+
         void IAttachedObject.Attach(DependencyObject dependencyObject)
         {
             WritePreamble();
@@ -72,15 +79,15 @@ protected override Freezable CreateInstanceCore()
         /// <param name="owner">The action message.</param>
         internal void MakeAwareOf(ActionMessage owner)
         {
-            this.owner = owner;
+            Owner = owner;
         }
 
         static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var parameter = (Parameter)d;
 
-            if (parameter.owner != null)
-                parameter.owner.UpdateAvailability();
+            if (parameter.Owner != null)
+                parameter.Owner.UpdateAvailability();
         }
     }
 }
\ No newline at end of file
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Properties/AssemblyInfo.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Properties/AssemblyInfo.cs
index 0e9ad23..2f11297 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Properties/AssemblyInfo.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/Properties/AssemblyInfo.cs
@@ -4,14 +4,14 @@
 using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Caliburn Micro")]
-[assembly: AssemblyDescription("A small, yet extremely powerful implementation of Caliburn.")]
+[assembly: AssemblyDescription("A small, yet powerful framework designed for WPF, Silverlight and WP7. It implements a variety of UI patterns for solving real-world problems. Patterns that are highlighted include MVVM (Presentation Model), MVP and MVC.")]
 [assembly: AssemblyProduct("Caliburn.Micro")]
 [assembly: AssemblyCompany("Blue Spire Consulting, Inc.")]
 [assembly: AssemblyCopyright("Copyright © 2010")]
 [assembly: ComVisible(false)]
 [assembly: Guid("6449e9cb-4d4d-4d79-8f73-71a2fc647109")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 
 [assembly: XmlnsDefinition("http://www.caliburnproject.org", "Caliburn.Micro")]
 [assembly: XmlnsPrefix("http://www.caliburnproject.org", "cal")]
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/WindowManager.cs b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/WindowManager.cs
index a28562c..2fd4e47 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.WPF/WindowManager.cs
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.WPF/WindowManager.cs
@@ -1,10 +1,14 @@
 namespace Caliburn.Micro
 {
     using System;
+    using System.Collections.Generic;
     using System.ComponentModel;
     using System.Windows;
     using System.Windows.Controls;
+    using System.Windows.Controls.Primitives;
     using System.Windows.Data;
+    using System.Linq;
+    using System.Windows.Navigation;
 
     /// <summary>
     /// A service that manages windows.
@@ -20,11 +24,19 @@ public interface IWindowManager
         bool? ShowDialog(object rootModel, object context = null);
 
         /// <summary>
-        /// Shows a window for the specified model.
+        /// Shows a non-modal window for the specified model.
         /// </summary>
         /// <param name="rootModel">The root model.</param>
         /// <param name="context">The context.</param>
-        void Show(object rootModel, object context = null);
+        void ShowWindow(object rootModel, object context = null);
+
+        /// <summary>
+        /// Shows a popup at the current mouse position.
+        /// </summary>
+        /// <param name="rootModel">The root model.</param>
+        /// <param name="context">The view context.</param>
+        /// <param name="settings">The optional popup settings.</param>
+        void ShowPopup(object rootModel, object context = null, IDictionary<string, object> settings = null);
     }
 
     /// <summary>
@@ -32,39 +44,13 @@ public interface IWindowManager
     /// </summary>
     public class WindowManager : IWindowManager
     {
-        static readonly DependencyProperty IsElementGeneratedProperty =
-            DependencyProperty.RegisterAttached(
-                "IsElementGenerated",
-                typeof(bool),
-                typeof(WindowManager),
-                new PropertyMetadata(false, null)
-                );
-
-        /// <summary>
-        /// Used to retrieve the root, non-framework-created view.
-        /// </summary>
-        /// <param name="view">The view to search.</param>
-        /// <returns>The root element that was not created by the framework.</returns>
-        /// <remarks>In certain instances the WindowManager creates UI elements in order to display windows.
-        /// For example, if you ask the window manager to show a UserControl as a dialog, it creates a window to host the UserControl in.
-        /// The WindowManager marks that element as a framework-created element so that it can determine what it created vs. what was intended by the developer.
-        /// Calling GetSignificantView allows the framework to discover what the original element was. 
-        /// </remarks>
-        public static DependencyObject GetSignificantView(DependencyObject view)
-        {
-            if ((bool)view.GetValue(IsElementGeneratedProperty))
-                return (DependencyObject)((ContentControl)view).Content;
-
-            return view;
-        }
-
         /// <summary>
         /// Shows a modal dialog for the specified model.
         /// </summary>
         /// <param name="rootModel">The root model.</param>
         /// <param name="context">The context.</param>
         /// <returns>The dialog result.</returns>
-        public bool? ShowDialog(object rootModel, object context = null)
+        public virtual bool? ShowDialog(object rootModel, object context = null)
         {
             return CreateWindow(rootModel, true, context).ShowDialog();
         }
@@ -74,12 +60,88 @@ public static DependencyObject GetSignificantView(DependencyObject view)
         /// </summary>
         /// <param name="rootModel">The root model.</param>
         /// <param name="context">The context.</param>
-        public void Show(object rootModel, object context = null)
-        {
-            CreateWindow(rootModel, false, context).Show();
+        public virtual void ShowWindow(object rootModel, object context = null) {
+            NavigationWindow navWindow = null;
+
+            if(Application.Current != null && Application.Current.MainWindow != null)
+                navWindow = Application.Current.MainWindow as NavigationWindow;
+
+            if(navWindow != null) {
+                var window = CreatePage(rootModel, context);
+                navWindow.Navigate(window);
+            }
+            else {
+                CreateWindow(rootModel, false, context).Show();
+            }
+        }
+
+        /// <summary>
+        /// Shows a popup at the current mouse position.
+        /// </summary>
+        /// <param name="rootModel">The root model.</param>
+        /// <param name="context">The view context.</param>
+        /// <param name="settings">The optional popup settings.</param>
+        public virtual void ShowPopup(object rootModel, object context = null, IDictionary<string, object> settings = null) {
+            var popup = CreatePopup(rootModel, settings);
+            var view = ViewLocator.LocateForModel(rootModel, popup, context);
+
+            popup.Child = view;
+            popup.SetValue(View.IsGeneratedProperty, true);
+
+            ViewModelBinder.Bind(rootModel, popup, null);
+
+            var activatable = rootModel as IActivate;
+            if (activatable != null)
+                activatable.Activate();
+
+            var deactivator = rootModel as IDeactivate;
+            if (deactivator != null)
+                popup.Closed += delegate { deactivator.Deactivate(true); };
+
+            popup.IsOpen = true;
+            popup.CaptureMouse();
+        }
+
+        /// <summary>
+        /// Creates a popup for hosting a popup window.
+        /// </summary>
+        /// <param name="rootModel">The model.</param>
+        /// <param name="settings">The optional popup settings.</param>
+        /// <returns>The popup.</returns>
+        protected virtual Popup CreatePopup(object rootModel, IDictionary<string, object> settings) {
+            var popup = new Popup();
+
+            if(settings != null) {
+                var type = popup.GetType();
+
+                foreach(var pair in settings) {
+                    var propertyInfo = type.GetProperty(pair.Key);
+
+                    if (propertyInfo != null)
+                        propertyInfo.SetValue(popup, pair.Value, null);
+                }
+
+                if (!settings.ContainsKey("PlacementTarget") && !settings.ContainsKey("Placement"))
+                    popup.Placement = PlacementMode.MousePoint;
+                if (!settings.ContainsKey("AllowsTransparency"))
+                    popup.AllowsTransparency = true;
+            }
+            else {
+                popup.AllowsTransparency = true;
+                popup.Placement = PlacementMode.MousePoint;
+            }
+
+            return popup;
         }
 
-        Window CreateWindow(object rootModel, bool isDialog, object context)
+        /// <summary>
+        /// Creates a window.
+        /// </summary>
+        /// <param name="rootModel">The view model.</param>
+        /// <param name="isDialog">Whethor or not the window is being shown as a dialog.</param>
+        /// <param name="context">The view context.</param>
+        /// <returns>The window.</returns>
+        protected virtual Window CreateWindow(object rootModel, bool isDialog, object context)
         {
             var view = EnsureWindow(rootModel, ViewLocator.LocateForModel(rootModel, null, context), isDialog);
             ViewModelBinder.Bind(rootModel, view, context);
@@ -96,38 +158,107 @@ Window CreateWindow(object rootModel, bool isDialog, object context)
             return view;
         }
 
-        static Window EnsureWindow(object model, object view, bool isDialog)
+        /// <summary>
+        /// Makes sure the view is a window is is wrapped by one.
+        /// </summary>
+        /// <param name="model">The view model.</param>
+        /// <param name="view">The view.</param>
+        /// <param name="isDialog">Whethor or not the window is being shown as a dialog.</param>
+        /// <returns>The window.</returns>
+        protected virtual Window EnsureWindow(object model, object view, bool isDialog)
         {
             var window = view as Window;
 
-            if (window == null)
-            {
+            if (window == null) {
                 window = new Window {
                     Content = view,
                     SizeToContent = SizeToContent.WidthAndHeight
                 };
 
-                window.SetValue(IsElementGeneratedProperty, true);
+                window.SetValue(View.IsGeneratedProperty, true);
 
-                if (Application.Current != null
-                   && Application.Current.MainWindow != null
-                    && Application.Current.MainWindow != window)
+                var owner = InferOwnerOf(window);
+                if (owner != null)
                 {
                     window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                    window.Owner = Application.Current.MainWindow;
+                    window.Owner = owner;
+                }
+                else
+                {
+                    window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
                 }
-                else window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
             }
-            else if (Application.Current != null
-                   && Application.Current.MainWindow != null)
+            else
             {
-                if (Application.Current.MainWindow != window && isDialog)
-                    window.Owner = Application.Current.MainWindow;
+                var owner = InferOwnerOf(window);
+                if (owner != null && isDialog)
+                    window.Owner = owner;
             }
 
             return window;
         }
 
+        /// <summary>
+        /// Infers the owner of the window.
+        /// </summary>
+        /// <param name="window">The window to whose owner needs to be determined.</param>
+        /// <returns>The owner.</returns>
+        protected virtual Window InferOwnerOf(Window window)
+        {
+            if(Application.Current == null)
+                return null;
+
+            var active = Application.Current.Windows.OfType<Window>()
+                .Where(x => x.IsActive)
+                .FirstOrDefault();
+            active = active ?? Application.Current.MainWindow;
+            return active == window ? null : active;
+        }
+
+        /// <summary>
+        /// Creates the page.
+        /// </summary>
+        /// <param name="rootModel">The root model.</param>
+        /// <param name="context">The context.</param>
+        /// <returns></returns>
+        public virtual Page CreatePage(object rootModel, object context) {
+            var view = EnsurePage(rootModel, ViewLocator.LocateForModel(rootModel, null, context));
+            ViewModelBinder.Bind(rootModel, view, context);
+
+            var haveDisplayName = rootModel as IHaveDisplayName;
+            if (haveDisplayName != null && !ConventionManager.HasBinding(view, Page.TitleProperty)) {
+                var binding = new Binding("DisplayName") { Mode = BindingMode.TwoWay };
+                view.SetBinding(Page.TitleProperty, binding);
+            }
+
+            var activatable = rootModel as IActivate;
+            if(activatable != null)
+                activatable.Activate();
+
+            var deactivatable = rootModel as IDeactivate;
+            if(deactivatable != null)
+                view.Unloaded += (s, e) => deactivatable.Deactivate(true);
+
+            return view;
+        }
+
+        /// <summary>
+        /// Ensures the view is a page or provides one.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        /// <param name="view">The view.</param>
+        /// <returns></returns>
+        protected virtual Page EnsurePage(object model, object view) {
+            var page = view as Page;
+
+            if(page == null) {
+                page = new Page { Content = view };
+                page.SetValue(View.IsGeneratedProperty, true);
+            }
+
+            return page;
+        }
+
         class WindowConductor
         {
             bool deactivatingFromView;
@@ -174,9 +305,12 @@ void Closed(object sender, EventArgs e)
 
             void Deactivated(object sender, DeactivationEventArgs e)
             {
+                if (!e.WasClosed)
+                    return;
+
                 ((IDeactivate)model).Deactivated -= Deactivated;
 
-                if (!e.WasClosed || deactivatingFromView)
+                if (deactivatingFromView)
                     return;
 
                 deactivateFromViewModel = true;
@@ -188,6 +322,9 @@ void Deactivated(object sender, DeactivationEventArgs e)
 
             void Closing(object sender, CancelEventArgs e)
             {
+                if (e.Cancel)
+                    return;
+
                 var guard = (IGuardClose)model;
 
                 if (actuallyClosing)
@@ -198,16 +335,16 @@ void Closing(object sender, CancelEventArgs e)
 
                 bool runningAsync = false, shouldEnd = false;
 
-                guard.CanClose(canClose =>
-                {
-                    if (runningAsync && canClose)
-                    {
-                        actuallyClosing = true;
-                        view.Close();
-                    }
-                    else e.Cancel = !canClose;
-
-                    shouldEnd = true;
+                guard.CanClose(canClose => {
+                    Execute.OnUIThread(() => {
+                        if(runningAsync && canClose) {
+                            actuallyClosing = true;
+                            view.Close();
+                        }
+                        else e.Cancel = !canClose;
+
+                        shouldEnd = true;
+                    });
                 });
 
                 if (shouldEnd)
diff --git a/code/Caliburn.Micro/src/Caliburn.Micro.sln b/code/Caliburn.Micro/src/Caliburn.Micro.sln
index bad4923..dc3982e 100644
--- a/code/Caliburn.Micro/src/Caliburn.Micro.sln
+++ b/code/Caliburn.Micro/src/Caliburn.Micro.sln
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.WPF", "Calib
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.WP7", "Caliburn.Micro.WP7\Caliburn.Micro.WP7.csproj", "{1AA45CEC-DF5D-49F7-B4E9-8CC32BCBD49C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.WP7.Extensions", "Caliburn.Micro.WP7.Extensions\Caliburn.Micro.WP7.Extensions.csproj", "{4C378193-CF03-4B85-8F2A-B1C00B1720DB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,6 +49,16 @@ Global
 		{1AA45CEC-DF5D-49F7-B4E9-8CC32BCBD49C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1AA45CEC-DF5D-49F7-B4E9-8CC32BCBD49C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1AA45CEC-DF5D-49F7-B4E9-8CC32BCBD49C}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/code/Caliburn.Micro/src/Caliburn.snk b/code/Caliburn.Micro/src/Caliburn.snk
new file mode 100644
index 0000000..fed9681
Binary files /dev/null and b/code/Caliburn.Micro/src/Caliburn.snk differ
diff --git a/code/CaliburnMicroTalkSamples/BasicLogging/ShellViewModel.cs b/code/CaliburnMicroTalkSamples/BasicLogging/ShellViewModel.cs
index 0ef9f94..c887a73 100644
--- a/code/CaliburnMicroTalkSamples/BasicLogging/ShellViewModel.cs
+++ b/code/CaliburnMicroTalkSamples/BasicLogging/ShellViewModel.cs
@@ -5,11 +5,12 @@ namespace BasicLogging
 {
     public class ShellViewModel : Screen
     {
+        static readonly ILog Log = LogManager.GetLog(typeof(ShellViewModel));
+
         public string NotOnTheView { get; set; }
 
         public void LogAWarning()
         {
-            // Screen includes a protected static readonly Log field
             Log.Warn("Barabarians are at the gate!");
         }
 
diff --git a/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/ClientBin/Caliburn.Micro.Coroutines.External.xap b/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/ClientBin/Caliburn.Micro.Coroutines.External.xap
index 6e501e1..d6d83bc 100644
Binary files a/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/ClientBin/Caliburn.Micro.Coroutines.External.xap and b/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/ClientBin/Caliburn.Micro.Coroutines.External.xap differ
diff --git a/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/ClientBin/Caliburn.Micro.Coroutines.xap b/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/ClientBin/Caliburn.Micro.Coroutines.xap
index 39e576a..b82a24f 100644
Binary files a/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/ClientBin/Caliburn.Micro.Coroutines.xap and b/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/ClientBin/Caliburn.Micro.Coroutines.xap differ
diff --git a/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/bin/Host.dll b/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/bin/Host.dll
index 60be6c5..eab03bd 100644
Binary files a/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/bin/Host.dll and b/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/bin/Host.dll differ
diff --git a/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/bin/Host.pdb b/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/bin/Host.pdb
index 5287402..79a8644 100644
Binary files a/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/bin/Host.pdb and b/code/CaliburnMicroTalkSamples/Caliburn.Micro.Coroutine/Host/bin/Host.pdb differ
diff --git a/code/CaliburnMicroTalkSamples/CaliburnMicroTalkSamples.sln b/code/CaliburnMicroTalkSamples/CaliburnMicroTalkSamples.sln
index 53b11a8..febd2a7 100644
--- a/code/CaliburnMicroTalkSamples/CaliburnMicroTalkSamples.sln
+++ b/code/CaliburnMicroTalkSamples/CaliburnMicroTalkSamples.sln
@@ -3,32 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caliburn.Micro", "Caliburn.Micro", "{94E88BFA-C6DB-4F8F-8BB2-AD4F5252BBD4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GameLibrary", "GameLibrary", "{7DE84DA1-A870-4959-8272-9BFFDD2CFDFF}"
-EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "GameLibrary.Silverlight.Web", "GameLibrary\GameLibrary.Silverlight.Web", "{09D22CF8-5FEF-4392-B722-A59B16257BE2}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
-		Debug.AspNetCompiler.VirtualPath = "/GameLibrary.Silverlight.Web"
-		Debug.AspNetCompiler.PhysicalPath = "GameLibrary\GameLibrary.Silverlight.Web\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\GameLibrary.Silverlight.Web\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/GameLibrary.Silverlight.Web"
-		Release.AspNetCompiler.PhysicalPath = "GameLibrary\GameLibrary.Silverlight.Web\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\GameLibrary.Silverlight.Web\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "2457"
-		DefaultWebSiteLanguage = "Visual C#"
-		ProjOutputReferences = "{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}|ClientBin|false;"
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameLibrary.Silverlight", "GameLibrary\GameLibrary.Silverlight\GameLibrary.Silverlight.csproj", "{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Silverlight", "..\Caliburn.Micro\src\Caliburn.Micro.Silverlight\Caliburn.Micro.Silverlight.csproj", "{621E300A-8F39-4C6F-8E36-28C5A412A500}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.WP7", "..\Caliburn.Micro\src\Caliburn.Micro.WP7\Caliburn.Micro.WP7.csproj", "{1AA45CEC-DF5D-49F7-B4E9-8CC32BCBD49C}"
@@ -38,13 +12,10 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Docs", "_Docs", "{67088779-BE22-4F3C-870A-7B11EEE04210}"
 	ProjectSection(SolutionItems) = preProject
 		..\..\Caliburn.Micro Documentation.docx = ..\..\Caliburn.Micro Documentation.docx
-		..\..\CaliburnMicro.pptx = ..\..\CaliburnMicro.pptx
 		CoroutineNote.txt = CoroutineNote.txt
 		Notes about the code.txt = Notes about the code.txt
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WP7Proofs", "WP7Proofs", "{87661B3A-C0FA-467B-A08E-22C490A6945F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "One trick ponies", "One trick ponies", "{E32C307F-C01A-40BE-A6F4-E55C550759C0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManyViewModels", "ManyViewModels\ManyViewModels.csproj", "{A14E0B02-39F8-42A2-97E9-DDBBEE35AD12}"
@@ -57,23 +28,37 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicConfigurationActionsAn
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicLogging", "BasicLogging\BasicLogging.csproj", "{CFDB4418-1CFA-40F8-A6C6-004F466B574F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.BubblingAction", "Caliburn.Micro.BubblingAction\Caliburn.Micro.BubblingAction.csproj", "{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Official Samples", "Official Samples", "{6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.BubblingAction", "..\Caliburn.Micro\samples\Caliburn.Micro.BubblingAction\Caliburn.Micro.BubblingAction\Caliburn.Micro.BubblingAction.csproj", "{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Hello", "..\Caliburn.Micro\samples\Caliburn.Micro.Hello\Caliburn.Micro.Hello\Caliburn.Micro.Hello.csproj", "{726EF716-D323-4393-8C02-335E4565BA10}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloEventAggregator", "..\Caliburn.Micro\samples\Caliburn.Micro.HelloEventAggregator\Caliburn.Micro.HelloEventAggregator\Caliburn.Micro.HelloEventAggregator.csproj", "{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloParameters", "Caliburn.Micro.HelloParameters\Caliburn.Micro.HelloParameters.csproj", "{5A877653-5063-42E4-B95B-7C4176013D78}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloMef", "..\Caliburn.Micro\samples\Caliburn.Micro.HelloMef\Caliburn.Micro.HelloMef\Caliburn.Micro.HelloMef.csproj", "{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.SimpleNavigation", "Caliburn.Micro.SimpleNavigation\Caliburn.Micro.SimpleNavigation.csproj", "{EF8546AF-1D38-4F3F-AF88-942ECE42C565}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloExplicitAction", "..\Caliburn.Micro\samples\Caliburn.Micro.HelloExplicitAction\Caliburn.Micro.HelloExplicitAction\Caliburn.Micro.HelloExplicitAction.csproj", "{392A795C-167B-4EF0-A450-3C707B65BF34}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Coroutines", "Coroutines", "{3F6BB855-0422-4CEE-B688-F28E4B4E66AD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloParameters", "..\Caliburn.Micro\samples\Caliburn.Micro.HelloParameters\Caliburn.Micro.HelloParameters\Caliburn.Micro.HelloParameters.csproj", "{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Caliburn.Micro.Coroutine\Host\Host.csproj", "{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloScreens", "..\Caliburn.Micro\samples\Caliburn.Micro.HelloScreens\Caliburn.Micro.HelloScreens\Caliburn.Micro.HelloScreens.csproj", "{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Coroutines.External", "Caliburn.Micro.Coroutine\Caliburn.Micro.Coroutines.External\Caliburn.Micro.Coroutines.External.csproj", "{2400BC51-BF6A-4225-80A6-BC639ED73033}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloWindowManager", "..\Caliburn.Micro\samples\Caliburn.Micro.HelloWindowManager\Caliburn.Micro.HelloWindowManager\Caliburn.Micro.HelloWindowManager.csproj", "{250F5661-596A-4D8A-9F45-6B76AEC79E3A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Coroutines", "Caliburn.Micro.Coroutine\Caliburn.Micro.Coroutines\Caliburn.Micro.Coroutines.csproj", "{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloWindowManagerWP7", "..\Caliburn.Micro\samples\Caliburn.Micro.HelloWindowManagerWP7\Caliburn.Micro.HelloWindowManagerWP7\Caliburn.Micro.HelloWindowManagerWP7.csproj", "{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloWP7", "Caliburn.Micro.HelloWP7\Caliburn.Micro.HelloWP7.csproj", "{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.HelloWP7", "..\Caliburn.Micro\samples\Caliburn.Micro.HelloWP7\Caliburn.Micro.HelloWP7\Caliburn.Micro.HelloWP7.csproj", "{BC67A641-95A3-4674-9B39-D2A39B33292E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wp7PageLifecycleLogging", "Wp7PageLifecycleLogging\Wp7PageLifecycleLogging.csproj", "{A3238335-40FD-4519-8372-4AFFBA80E89A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.SimpleMDI", "..\Caliburn.Micro\samples\Caliburn.Micro.SimpleMDI\Caliburn.Micro.SimpleMDI\Caliburn.Micro.SimpleMDI.csproj", "{50D9F822-15E6-4492-BD89-DF350566ADBF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.SimpleNavigation", "..\Caliburn.Micro\samples\Caliburn.Micro.SimpleNavigation\Caliburn.Micro.SimpleNavigation\Caliburn.Micro.SimpleNavigation.csproj", "{EF8546AF-1D38-4F3F-AF88-942ECE42C565}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.ViewFirst", "..\Caliburn.Micro\samples\Caliburn.Micro.ViewFirst\Caliburn.Micro.ViewFirst\Caliburn.Micro.ViewFirst.csproj", "{3B15ECA5-A872-42CB-A4C6-D12D100284CC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameLibrary", "..\Caliburn.Micro\samples\GameLibrary\GameLibrary\GameLibrary.csproj", "{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.WP7.Extensions", "..\Caliburn.Micro\src\Caliburn.Micro.WP7.Extensions\Caliburn.Micro.WP7.Extensions.csproj", "{4C378193-CF03-4B85-8F2A-B1C00B1720DB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -85,24 +70,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2}.Release|x86.ActiveCfg = Debug|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D}.Release|x86.ActiveCfg = Release|Any CPU
 		{621E300A-8F39-4C6F-8E36-28C5A412A500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{621E300A-8F39-4C6F-8E36-28C5A412A500}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{621E300A-8F39-4C6F-8E36-28C5A412A500}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -193,56 +160,76 @@ Global
 		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5A877653-5063-42E4-B95B-7C4176013D78}.Release|x86.ActiveCfg = Release|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|x86.ActiveCfg = Release|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D}.Release|x86.ActiveCfg = Release|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2400BC51-BF6A-4225-80A6-BC639ED73033}.Release|x86.ActiveCfg = Release|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56}.Release|x86.ActiveCfg = Release|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{726EF716-D323-4393-8C02-335E4565BA10}.Release|x86.ActiveCfg = Release|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C}.Release|x86.ActiveCfg = Release|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{392A795C-167B-4EF0-A450-3C707B65BF34}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC}.Release|x86.ActiveCfg = Release|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D}.Release|x86.ActiveCfg = Release|Any CPU
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Debug|x86.ActiveCfg = Debug|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Debug|x86.Build.0 = Debug|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Release|Any CPU.ActiveCfg = Release|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Release|Mixed Platforms.Build.0 = Release|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Release|x86.ActiveCfg = Release|x86
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A}.Release|x86.Build.0 = Release|x86
 		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -257,20 +244,70 @@ Global
 		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
 		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27}.Release|x86.ActiveCfg = Release|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{A3238335-40FD-4519-8372-4AFFBA80E89A}.Release|x86.ActiveCfg = Release|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{BC67A641-95A3-4674-9B39-D2A39B33292E}.Release|x86.ActiveCfg = Release|Any CPU
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Debug|x86.ActiveCfg = Debug|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Debug|x86.Build.0 = Debug|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Release|Any CPU.ActiveCfg = Release|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Release|Mixed Platforms.Build.0 = Release|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Release|x86.ActiveCfg = Release|x86
+		{50D9F822-15E6-4492-BD89-DF350566ADBF}.Release|x86.Build.0 = Release|x86
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565}.Release|x86.ActiveCfg = Release|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC}.Release|x86.ActiveCfg = Release|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -279,20 +316,25 @@ Global
 		{621E300A-8F39-4C6F-8E36-28C5A412A500} = {94E88BFA-C6DB-4F8F-8BB2-AD4F5252BBD4}
 		{1AA45CEC-DF5D-49F7-B4E9-8CC32BCBD49C} = {94E88BFA-C6DB-4F8F-8BB2-AD4F5252BBD4}
 		{B633FE8C-B40E-4122-A763-F94C8B1A70F8} = {94E88BFA-C6DB-4F8F-8BB2-AD4F5252BBD4}
-		{09D22CF8-5FEF-4392-B722-A59B16257BE2} = {7DE84DA1-A870-4959-8272-9BFFDD2CFDFF}
-		{CF1930DA-CFB8-4B2A-9C3D-EC92C9EBF52D} = {7DE84DA1-A870-4959-8272-9BFFDD2CFDFF}
-		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27} = {87661B3A-C0FA-467B-A08E-22C490A6945F}
-		{A3238335-40FD-4519-8372-4AFFBA80E89A} = {87661B3A-C0FA-467B-A08E-22C490A6945F}
+		{4C378193-CF03-4B85-8F2A-B1C00B1720DB} = {94E88BFA-C6DB-4F8F-8BB2-AD4F5252BBD4}
 		{A14E0B02-39F8-42A2-97E9-DDBBEE35AD12} = {E32C307F-C01A-40BE-A6F4-E55C550759C0}
 		{11283010-2AA9-4718-B898-CF06A54E31B2} = {E32C307F-C01A-40BE-A6F4-E55C550759C0}
 		{4255C155-65C7-42EA-BB23-6F7050989C83} = {E32C307F-C01A-40BE-A6F4-E55C550759C0}
 		{5D08068B-0EC4-4CB1-8BD7-786A392950A8} = {E32C307F-C01A-40BE-A6F4-E55C550759C0}
 		{CFDB4418-1CFA-40F8-A6C6-004F466B574F} = {E32C307F-C01A-40BE-A6F4-E55C550759C0}
-		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1} = {E32C307F-C01A-40BE-A6F4-E55C550759C0}
-		{5A877653-5063-42E4-B95B-7C4176013D78} = {E32C307F-C01A-40BE-A6F4-E55C550759C0}
-		{EF8546AF-1D38-4F3F-AF88-942ECE42C565} = {E32C307F-C01A-40BE-A6F4-E55C550759C0}
-		{71B3BB3D-2B4F-4A3F-A0F9-8F697EE6054D} = {3F6BB855-0422-4CEE-B688-F28E4B4E66AD}
-		{2400BC51-BF6A-4225-80A6-BC639ED73033} = {3F6BB855-0422-4CEE-B688-F28E4B4E66AD}
-		{A7C0657A-0B1D-4E72-97A1-E616A9E07D56} = {3F6BB855-0422-4CEE-B688-F28E4B4E66AD}
+		{3777F0C7-CD1D-4964-AF3F-FFCBF61AA9B1} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{726EF716-D323-4393-8C02-335E4565BA10} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{2CA84F43-5B28-4D73-9ABF-89DEB46E8EFF} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{B8A16D6F-26E6-42F2-8F6E-6A085BE6F00C} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{392A795C-167B-4EF0-A450-3C707B65BF34} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{C8E92113-42DB-4831-B1A5-2B2CA9E8C5AC} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{FE5DC5CB-D16A-4A4C-A0E5-92CB9C55C94D} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{250F5661-596A-4D8A-9F45-6B76AEC79E3A} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{9A32B445-66C0-4F2B-8FA4-7A5666D76B27} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{BC67A641-95A3-4674-9B39-D2A39B33292E} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{50D9F822-15E6-4492-BD89-DF350566ADBF} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{EF8546AF-1D38-4F3F-AF88-942ECE42C565} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{3B15ECA5-A872-42CB-A4C6-D12D100284CC} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
+		{477DEB3C-8B90-4C0D-9A3D-2644F123A84C} = {6C4F72FC-61F5-4044-88EF-7D00C7C76F2A}
 	EndGlobalSection
 EndGlobal
diff --git a/code/CaliburnMicroTalkSamples/CustomizingTheBootstrapperForMEF/ShellView.xaml b/code/CaliburnMicroTalkSamples/CustomizingTheBootstrapperForMEF/ShellView.xaml
index b5d490e..e33f8d0 100644
--- a/code/CaliburnMicroTalkSamples/CustomizingTheBootstrapperForMEF/ShellView.xaml
+++ b/code/CaliburnMicroTalkSamples/CustomizingTheBootstrapperForMEF/ShellView.xaml
@@ -7,9 +7,6 @@
              d:DesignHeight="300"
              d:DesignWidth="300">
 	<StackPanel>
-		<Button x:Name="SayHello"
-		        Content="Click Me" />
-
 		<ContentControl x:Name="ActiveView"></ContentControl>
 	</StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/code/CaliburnMicroTalkSamples/CustomizingTheBootstrapperForMEF/ShellViewModel.cs b/code/CaliburnMicroTalkSamples/CustomizingTheBootstrapperForMEF/ShellViewModel.cs
index 6fe4427..8db44bb 100644
--- a/code/CaliburnMicroTalkSamples/CustomizingTheBootstrapperForMEF/ShellViewModel.cs
+++ b/code/CaliburnMicroTalkSamples/CustomizingTheBootstrapperForMEF/ShellViewModel.cs
@@ -10,9 +10,5 @@ public class ShellViewModel : PropertyChangedBase, IShell
         [Import(typeof (WidgetViewModel))]
         public object ActiveView { get; set; }
 
-        public void SayHello()
-        {
-            MessageBox.Show(string.Format("Hello there")); // Just for the sample. Not a great thing to do.
-        }
     }
 }
\ No newline at end of file
diff --git a/code/CaliburnMicroTalkSamples/GameLibrary/GameLibrary.Silverlight.Web/ClientBin/GameLibrary.xap b/code/CaliburnMicroTalkSamples/GameLibrary/GameLibrary.Silverlight.Web/ClientBin/GameLibrary.xap
index 0aadd5d..59d5d74 100644
Binary files a/code/CaliburnMicroTalkSamples/GameLibrary/GameLibrary.Silverlight.Web/ClientBin/GameLibrary.xap and b/code/CaliburnMicroTalkSamples/GameLibrary/GameLibrary.Silverlight.Web/ClientBin/GameLibrary.xap differ
diff --git a/code/CaliburnMicroTalkSamples/Notes about the code.txt b/code/CaliburnMicroTalkSamples/Notes about the code.txt
index a67f240..7e3e65b 100644
--- a/code/CaliburnMicroTalkSamples/Notes about the code.txt	
+++ b/code/CaliburnMicroTalkSamples/Notes about the code.txt	
@@ -1,8 +1,8 @@
 The solution is broken into several solution folders:
 
-1) The “Caliburn.Micro” solution folder contains the full source for Caliburn.Micro broken into three projects: one targeting Silverlight, another Windows Phone 7 and the third WPF.  
+1) The “Caliburn.Micro” solution folder contains the full source for Caliburn.Micro broken into four projects: one targeting Silverlight, one targetting WPF and the other two are for Windows Phone
 
-In my real applications I include the Caliburn.Micro source and take a project reference. The codebase code is small, and comes in handy to see exactly what Caliburn.Micro is doing on your behalf.
+In my real applications I include the Caliburn.Micro source and take a project reference. The codebase code is small, and it comes in handy to see exactly what Caliburn.Micro is doing on your behalf.
 
 2) The “GameLibrary” solution folder contains the source for a rich sample app that excercises many of Caliburn.Micros features. Rob Eisenberg built the original GameLibrary sample for his MIX10 talk “Build your own MVVM framework” (*) as a way of showing off some of Caliburn’s neatest features in a small, easy-to-digest codebase. The talk and the mini-framework were well received. The GameLibrary’s framework namespace became the seed for Caliburn.Micro. After Caliburn.Micro was released Marco Amendola ported the original GameLibrary to Caliburn.Micro and released it in his fork of Caliburn.Micro (**). Great recursive story! The “GameLibrary” in this solution is based on Marco’s port.
 * Rob’s excellent MIX10 talk http://live.visitmix.com/MIX10/Sessions/EX15
@@ -10,4 +10,3 @@ In my real applications I include the Caliburn.Micro source and take a project r
 
 3) The “One trick ponies” solution folder includes samples that demonstrate one concept.
 
-4) The “WP7 Proofs” solution folder includes a Windows Phone 7 project that Rob Eisenberg wrote to demonstrate the WP7 Tombstoning/Resurrection features of Caliburn.Micro.
diff --git a/code/CaliburnMicroTalkSamples/PubSubFun/ViewModels/PrimitiveFanViewModel.cs b/code/CaliburnMicroTalkSamples/PubSubFun/ViewModels/PrimitiveFanViewModel.cs
index 86daae7..501dd4c 100644
--- a/code/CaliburnMicroTalkSamples/PubSubFun/ViewModels/PrimitiveFanViewModel.cs
+++ b/code/CaliburnMicroTalkSamples/PubSubFun/ViewModels/PrimitiveFanViewModel.cs
@@ -4,11 +4,14 @@
 
 namespace PubSubFun.ViewModels
 {
-    public class PrimitiveFanViewModel : PropertyChangedBase, IHandle<CoolNumberNews>, IHandle<CoolStringNews>
+    public class PrimitiveFanViewModel : PropertyChangedBase, 
+        IHandle<CoolNumberNews>, 
+        IHandle<CoolStringNews>
     {
         public PrimitiveFanViewModel()
         {
-            IoC.Get<IEventAggregator>().Subscribe(this);
+            var eventAggregator = IoC.Get<IEventAggregator>();
+            eventAggregator.Subscribe(this);
         }
 
         public string TheNews { get; set; }