diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fd5204b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,183 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Roslyn cache directories
+*.ide/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings 
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# If using the old MSBuild-Integrated Package Restore, uncomment this:
+#!**/packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
diff --git a/AppBoot/iQuarc.AppBoot.UnitTests/BootstrapperTests.cs b/AppBoot/iQuarc.AppBoot.UnitTests/BootstrapperTests.cs
index cf7d887..1cb3549 100644
--- a/AppBoot/iQuarc.AppBoot.UnitTests/BootstrapperTests.cs
+++ b/AppBoot/iQuarc.AppBoot.UnitTests/BootstrapperTests.cs
@@ -43,6 +43,7 @@ public void Run_RegistrationBehaviorReturnsOneService_TypeRegistered()
 			IRegistrationBehavior regBehaviorStub = GetRegBehaviorStub(testSi);
 
 			Mock<IDependencyContainer> containerMock = GetFakeContainer();
+			
 			Bootstrapper bootstrapper = GetTargetWithAssembly(containerMock);
 			bootstrapper.AddRegistrationBehavior(regBehaviorStub);
 
@@ -51,12 +52,16 @@ public void Run_RegistrationBehaviorReturnsOneService_TypeRegistered()
 			containerMock.Verify(c => c.RegisterService(testSi), Times.AtLeastOnce);
 		}
 
-		private Bootstrapper GetTargetWithAssemblyAndFakeContainer()
+		[Fact]
+		public void Dispose_DisposableDependencyContainer_DisposesContainer()
 		{
-			Assembly[] assemblies = {typeof (BootstrapperTests).Assembly};
-			IDependencyContainer container = GetFakeContainer().Object;
+			Mock<IDependencyContainer> containerMock = GetFakeContainer();
+			Mock<IDisposable> disposable = containerMock.As<IDisposable>();
 
-			return new Bootstrapper(assemblies, container);
+			Bootstrapper bootstrapper = GetTargetWithAssembly(containerMock);
+
+			bootstrapper.Dispose();
+			disposable.Verify(c => c.Dispose(), Times.Once);
 		}
 
 		private static Bootstrapper GetTarget(Mock<IDependencyContainer> fakeContainer)
@@ -91,6 +96,9 @@ private static Mock<IDependencyContainer> GetFakeContainer(IServiceLocator servi
 
 			Mock<IDependencyContainer> containerStub = new Mock<IDependencyContainer>();
 			containerStub.Setup(c => c.AsServiceLocator).Returns(serviceLocator);
+
+			containerStub.As<IDisposable>();
+
 			return containerStub;
 		}
 
diff --git a/AppBoot/iQuarc.AppBoot.UnitTests/ConventionRegistrationBehaviorTests.cs b/AppBoot/iQuarc.AppBoot.UnitTests/ConventionRegistrationBehaviorTests.cs
new file mode 100644
index 0000000..6f4b472
--- /dev/null
+++ b/AppBoot/iQuarc.AppBoot.UnitTests/ConventionRegistrationBehaviorTests.cs
@@ -0,0 +1,122 @@
+using System.Linq;
+using iQuarc.xUnitEx;
+using Xunit;
+
+namespace iQuarc.AppBoot.UnitTests
+{
+    public class ConventionRegistrationBehaviorTests
+    {
+        private readonly ServiceEqualityComparer comparer = new ServiceEqualityComparer();
+
+        [Fact]
+        public void GetServicesFrom_TwoConventionsForType_BothExported()
+        {
+            ConventionRegistrationBehavior conventions = GetTarget();
+            conventions.ForType<MyService>().Export(b => b.AsContractName("Configuration 1"));
+            conventions.ForType<MyService>().Export(b => b.AsContractName("Configuration 2"));
+
+            conventions.GetServicesFrom(typeof (MyService));
+
+            var services = conventions.GetServicesFrom(typeof (MyService));
+
+            ServiceInfo[] expected =
+            {
+                new ServiceInfo(typeof (MyService), typeof (MyService), "Configuration 1", Lifetime.Instance),
+                new ServiceInfo(typeof (MyService), typeof (MyService), "Configuration 2", Lifetime.Instance)
+            };
+            AssertEx.AreEquivalent(services, comparer.Equals, expected);
+        }
+
+        [Fact]
+        public void GetServicesFrom_NoConventions_NothingExported()
+        {
+            ConventionRegistrationBehavior conventions = GetTarget();
+
+            conventions.GetServicesFrom(typeof (MyService));
+
+            ServiceInfo[] services = conventions.GetServicesFrom(typeof (MyService)).ToArray();
+            Assert.Equal(0, services.Length);
+        }
+
+        [Fact]
+        public void ForType_ConfigurationForMatchingType_OneMatches()
+        {
+            ConventionRegistrationBehavior behavior = GetTarget();
+
+            ServiceBuilder serviceBuilder = behavior.ForType<MyService>();
+
+            Assert.True(serviceBuilder.IsMatch(typeof (MyService)));
+        }
+
+        [Fact]
+        public void ForType_ConfigurationForNonMatchingType_MatchIsFalse()
+        {
+            ConventionRegistrationBehavior behavior = GetTarget();
+
+            ServiceBuilder serviceBuilder = behavior.ForType<MyService>();
+
+            Assert.False(serviceBuilder.IsMatch(typeof (MyOtherService)));
+        }
+
+        [Fact]
+        public void ForTypesDerivedFrom_ConfigurationWithBaseAndInheritedTypes_MatchIsTrue()
+        {
+            ConventionRegistrationBehavior behavior = GetTarget();
+
+            ServiceBuilder serviceBuilder = behavior.ForTypesDerivedFrom<MyBaseService>();
+
+            Assert.True(serviceBuilder.IsMatch(typeof (MyService)));
+        }
+
+        [Fact]
+        public void ForTypesDerivedFrom_ConfigurationUnrelatedTypes_MatchIsFalse()
+        {
+            ConventionRegistrationBehavior behavior = GetTarget();
+
+            ServiceBuilder serviceBuilder = behavior.ForTypesDerivedFrom<MyService>();
+
+            Assert.False(serviceBuilder.IsMatch(typeof (MyOtherService)));
+        }
+
+		[Fact]
+		public void ForTypesMatching_ConfigurationWithServiceSuffix_MatchIsTrue()
+		{
+			ConventionRegistrationBehavior behavior = GetTarget();
+
+			ServiceBuilder serviceBuilder = behavior.ForTypesMatching(t => t.Name.EndsWith("Service"));
+
+			Assert.True(serviceBuilder.IsMatch(typeof(MyService)));
+		}
+
+		[Fact]
+		public void ForTypesMatching_ConfigurationWithNoServiceSuffix_MatchIsFalse()
+		{
+			ConventionRegistrationBehavior behavior = GetTarget();
+
+			ServiceBuilder serviceBuilder = behavior.ForTypesMatching(t => t.Name.EndsWith("Service"));
+
+			Assert.False(serviceBuilder.IsMatch(typeof(Repository)));
+		}
+
+        private class MyService : MyBaseService
+        {
+        }
+
+        private class MyOtherService
+        {
+        }
+
+        private class MyBaseService
+        {
+        }
+
+		private class Repository
+		{
+		}
+
+        private static ConventionRegistrationBehavior GetTarget()
+        {
+            return new ConventionRegistrationBehavior();
+        }
+    }
+}
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot.UnitTests/ServiceBuilderTests.cs b/AppBoot/iQuarc.AppBoot.UnitTests/ServiceBuilderTests.cs
new file mode 100644
index 0000000..bb5bf60
--- /dev/null
+++ b/AppBoot/iQuarc.AppBoot.UnitTests/ServiceBuilderTests.cs
@@ -0,0 +1,189 @@
+using System.Collections.Generic;
+using System.Linq;
+using iQuarc.xUnitEx;
+using Xunit;
+
+namespace iQuarc.AppBoot.UnitTests
+{
+	public class ServiceBuilderTests
+	{
+		private readonly ServiceEqualityComparer comparer = new ServiceEqualityComparer();
+
+		[Fact]
+		public void GetServicesFrom_NoExportConfiguration_RegisterService()
+		{
+			ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.Export();
+
+            List<ServiceInfo> services = builder.GetServicesFrom(typeof(MyService)).ToList();
+			Assert.Equal(1, services.Count);
+		}
+
+		[Fact]
+		public void GetServicesFrom_NoExportConfiguration_RegisterSameTypeAsContract()
+		{
+            ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.Export();
+
+            ServiceInfo service = builder.GetServicesFrom(typeof(MyService)).First();
+
+            ServiceInfo expected = new ServiceInfo(typeof(MyService), typeof(MyService), Lifetime.Instance);
+
+			Assert.Equal(expected, service, comparer);
+		}
+
+		[Fact]
+		public void GetServicesFrom_ConfigureContractType_RegisterContractType()
+		{
+            ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.Export(c => c.AsContractType<IMyService1>());
+
+            ServiceInfo service = builder.GetServicesFrom(typeof(MyService)).First();
+
+            ServiceInfo expected = new ServiceInfo(typeof(MyService), typeof(IMyService1), Lifetime.Instance);
+
+			Assert.Equal(expected, service, comparer);
+		}
+
+		[Fact]
+		public void GetServicesFrom_ConfigureContractName_RegisterContractName()
+		{
+            ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.Export(c => c.AsContractName("MyContract"));
+
+            ServiceInfo service = builder.GetServicesFrom(typeof(MyService)).First();
+
+            ServiceInfo expected = new ServiceInfo(typeof(MyService), typeof(MyService), "MyContract", Lifetime.Instance);
+
+			Assert.Equal(expected, service, comparer);
+		}
+
+		[Fact]
+		public void GetServicesFrom_ConfigureLifetime_RegisterLifetime()
+		{
+            ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.Export(c => c.WithLifetime(Lifetime.Application));
+
+            ServiceInfo service = builder.GetServicesFrom(typeof(MyService)).First();
+
+            ServiceInfo expected = new ServiceInfo(typeof(MyService), typeof(MyService), Lifetime.Application);
+
+			Assert.Equal(expected, service, comparer);
+		}
+
+	    [Fact]
+	    public void GetServicesFrom_ExportInterfacesNoInterfaces_NothingRegistered()
+	    {
+	        ServiceBuilder builder = new ServiceBuilder(t => t == typeof (MyOtherService));
+	        builder.ExportInterfaces();
+
+	        ServiceInfo[] service = builder.GetServicesFrom(typeof (MyOtherService)).ToArray();
+
+	        Assert.Equal(0, service.Length);
+	    }
+
+	    [Fact]
+		public void GetServicesFrom_ExportInterfacesMultipleInterfaces_RegisterMultipleContractTypes()
+		{
+			ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.ExportInterfaces();
+
+			List<ServiceInfo> services = builder.GetServicesFrom(typeof(MyService)).ToList();
+
+			ServiceInfo[] expected = 
+			{
+				new ServiceInfo(typeof (MyService), typeof (IMyService1), Lifetime.Instance),
+				new ServiceInfo(typeof (MyService), typeof (IMyService2), Lifetime.Instance),
+			};
+
+			AssertEx.AreEquivalent(services, comparer.Equals, expected);
+		}
+
+		[Fact]
+		public void GetServicesFrom_ExportInterfacesWithFilter_RegisterContractType()
+		{
+			ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.ExportInterfaces(x => x == typeof(IMyService2));
+
+			List<ServiceInfo> services = builder.GetServicesFrom(typeof(MyService)).ToList();
+
+			ServiceInfo expected = new ServiceInfo(typeof (MyService), typeof (IMyService2), Lifetime.Instance);
+
+			AssertEx.AreEquivalent(services, comparer.Equals, expected);
+		}
+
+		[Fact]
+		public void GetServicesFrom_ExportInterfacesMultipleInterfacesWithExportConfig_RegisterConfig()
+		{
+			ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.ExportInterfaces(c => true, b => b.WithLifetime(Lifetime.Application));
+
+			List<ServiceInfo> services = builder.GetServicesFrom(typeof(MyService)).ToList();
+
+			ServiceInfo[] expected = 
+			{
+				new ServiceInfo(typeof (MyService), typeof (IMyService1), Lifetime.Application),
+				new ServiceInfo(typeof (MyService), typeof (IMyService2), Lifetime.Application),
+			};
+
+			AssertEx.AreEquivalent(services, comparer.Equals, expected);
+		}
+
+        [Fact]
+        public void GetServicesFrom_MultipleConfigurations_AllConfigurationsExported()
+        {
+            ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+            builder.Export(c => c.AsContractType<IMyService1>());
+            builder.Export(c => c.AsContractType<IMyService2>());
+
+            var services = builder.GetServicesFrom(typeof(MyService));
+
+
+            ServiceInfo[] expected = new[]
+	        {
+	            new ServiceInfo(typeof (MyService), typeof (IMyService1), Lifetime.Instance),
+	            new ServiceInfo(typeof (MyService), typeof (IMyService2), Lifetime.Instance),
+	        };
+            AssertEx.AreEquivalent(services, comparer.Equals, expected);
+        }
+
+	    [Fact]
+	    public void GetServicesFrom_ExportBuilderWithMultipleConfigs_AllConfigurationsExported()
+	    {
+	        ServiceBuilder builder = new ServiceBuilder(t => t == typeof (MyService));
+	        builder.Export(c => c.AsContractType<IMyService1>().AsContractName("IMyService1").WithLifetime(Lifetime.Application));
+
+	        var services = builder.GetServicesFrom(typeof (MyService));
+
+
+	        ServiceInfo[] expected = {new ServiceInfo(typeof (MyService), typeof (IMyService1), "IMyService1", Lifetime.Application)};
+	        AssertEx.AreEquivalent(services, comparer.Equals, expected);
+	    }
+
+		[Fact]
+		public void GetServicesFrom_NoTypeMatch_DoesNotExport()
+		{
+			ServiceBuilder builder = new ServiceBuilder(t => t == typeof(MyService));
+			builder.Export();
+
+			ServiceInfo actual = builder.GetServicesFrom(typeof(IMyService1)).FirstOrDefault();
+
+			Assert.Null(actual);
+		}
+
+		private class MyService : IMyService1, IMyService2
+		{
+		}
+
+		internal interface IMyService1
+		{
+		}
+
+		internal interface IMyService2
+		{
+		}
+
+        private class MyOtherService
+        { }
+	}
+}
diff --git a/AppBoot/iQuarc.AppBoot.UnitTests/ServiceEqualityComparer.cs b/AppBoot/iQuarc.AppBoot.UnitTests/ServiceEqualityComparer.cs
new file mode 100644
index 0000000..d6a0f14
--- /dev/null
+++ b/AppBoot/iQuarc.AppBoot.UnitTests/ServiceEqualityComparer.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace iQuarc.AppBoot.UnitTests
+{
+	internal class ServiceEqualityComparer : IEqualityComparer<ServiceInfo>
+	{
+		public bool Equals(ServiceInfo x, ServiceInfo y)
+		{
+			return x.ContractName == y.ContractName &&
+			       x.From == y.From &&
+			       x.To == y.To &&
+			       x.InstanceLifetime == y.InstanceLifetime;
+		}
+
+		public int GetHashCode(ServiceInfo obj)
+		{
+			return obj.GetHashCode();
+		}
+	}
+}
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot.UnitTests/ServiceRegistrationBehaviorTests.cs b/AppBoot/iQuarc.AppBoot.UnitTests/ServiceRegistrationBehaviorTests.cs
index 7066107..75deab6 100644
--- a/AppBoot/iQuarc.AppBoot.UnitTests/ServiceRegistrationBehaviorTests.cs
+++ b/AppBoot/iQuarc.AppBoot.UnitTests/ServiceRegistrationBehaviorTests.cs
@@ -100,12 +100,4 @@ private class MyDoubleService : IMyService
 		{
 		}
 	}
-
-	public static class Extensions
-	{
-		public static T[] AsArray<T>(this T o)
-		{
-			return new[] {o};
-		}
-	}
 }
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot.UnitTests/app.config b/AppBoot/iQuarc.AppBoot.UnitTests/app.config
new file mode 100644
index 0000000..4fc378d
--- /dev/null
+++ b/AppBoot/iQuarc.AppBoot.UnitTests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot.UnitTests/iQuarc.AppBoot.UnitTests.csproj b/AppBoot/iQuarc.AppBoot.UnitTests/iQuarc.AppBoot.UnitTests.csproj
index cf2bdc5..7580ec9 100644
--- a/AppBoot/iQuarc.AppBoot.UnitTests/iQuarc.AppBoot.UnitTests.csproj
+++ b/AppBoot/iQuarc.AppBoot.UnitTests/iQuarc.AppBoot.UnitTests.csproj
@@ -42,11 +42,14 @@
     <Reference Include="iQuarc.xUnitEx">
       <HintPath>..\packages\iQuarc.xUnitEx.1.0.0.0\lib\net35\iQuarc.xUnitEx.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="xunit">
@@ -63,12 +66,16 @@
   </Choose>
   <ItemGroup>
     <Compile Include="BootstrapperTests.RegisterBehaviors.cs" />
+    <Compile Include="ConventionRegistrationBehaviorTests.cs" />
     <Compile Include="RegistrationsCatalogTests.cs" />
+    <Compile Include="ServiceEqualityComparer.cs" />
     <Compile Include="ServiceRegistrationBehaviorTests.cs" />
     <Compile Include="BootstrapperTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ServiceBuilderTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/AppBoot/iQuarc.AppBoot.UnitTests/packages.config b/AppBoot/iQuarc.AppBoot.UnitTests/packages.config
index 0819a72..faafa01 100644
--- a/AppBoot/iQuarc.AppBoot.UnitTests/packages.config
+++ b/AppBoot/iQuarc.AppBoot.UnitTests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="iQuarc.SystemEx" version="1.0.0.0" targetFramework="net45" />
   <package id="iQuarc.xUnitEx" version="1.0.0.0" targetFramework="net45" />
-  <package id="Moq" version="4.2.1312.1622" targetFramework="net45" />
+  <package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
   <package id="xunit" version="1.9.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot.Unity.ExplorationTests/iQuarc.AppBoot.Unity.ExploratoryTests.csproj b/AppBoot/iQuarc.AppBoot.Unity.ExplorationTests/iQuarc.AppBoot.Unity.ExploratoryTests.csproj
index 249fb3a..fffd0ef 100644
--- a/AppBoot/iQuarc.AppBoot.Unity.ExplorationTests/iQuarc.AppBoot.Unity.ExploratoryTests.csproj
+++ b/AppBoot/iQuarc.AppBoot.Unity.ExplorationTests/iQuarc.AppBoot.Unity.ExploratoryTests.csproj
@@ -39,13 +39,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\iQuarc.xUnitEx.1.0.0.0\lib\net35\iQuarc.xUnitEx.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Practices.Unity, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Unity.3.0.1304.1\lib\Net45\Microsoft.Practices.Unity.dll</HintPath>
+      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Unity.3.0.1304.1\lib\Net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
+      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
diff --git a/AppBoot/iQuarc.AppBoot.Unity.ExplorationTests/packages.config b/AppBoot/iQuarc.AppBoot.Unity.ExplorationTests/packages.config
index 80b22f1..d418a2e 100644
--- a/AppBoot/iQuarc.AppBoot.Unity.ExplorationTests/packages.config
+++ b/AppBoot/iQuarc.AppBoot.Unity.ExplorationTests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="iQuarc.xUnitEx" version="1.0.0.0" targetFramework="net45" />
-  <package id="Unity" version="3.0.1304.1" targetFramework="net45" />
+  <package id="Unity" version="3.5.1404.0" targetFramework="net45" />
   <package id="xunit" version="1.9.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot/Container/ConventionRegistrationBehavior.cs b/AppBoot/iQuarc.AppBoot/Container/ConventionRegistrationBehavior.cs
new file mode 100644
index 0000000..e4c17c2
--- /dev/null
+++ b/AppBoot/iQuarc.AppBoot/Container/ConventionRegistrationBehavior.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace iQuarc.AppBoot
+{
+	public class ConventionRegistrationBehavior : IRegistrationBehavior
+	{
+		private readonly IList<ServiceBuilder> builders = new List<ServiceBuilder>();
+
+		public IEnumerable<ServiceInfo> GetServicesFrom(Type type)
+		{
+			IEnumerable<ServiceInfo> services = builders.SelectMany(x => x.GetServicesFrom(type));
+			return services;
+		}
+
+		public ServiceBuilder ForType(Type type)
+		{
+			ServiceBuilder builder = CreateServiceBuilder(x => x == type);
+			builders.Add(builder);
+			return builder;
+		}
+
+		[SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Convenience call")]
+		public ServiceBuilder ForType<T>()
+		{
+			return this.ForType(typeof (T));
+		}
+
+		public ServiceBuilder ForTypesDerivedFrom(Type type)
+		{
+			ServiceBuilder builder = CreateServiceBuilder(x => type.IsAssignableFrom(x));
+			builders.Add(builder);
+			return builder;
+		}
+
+		[SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Convenience call")]
+		public ServiceBuilder ForTypesDerivedFrom<T>()
+		{
+			return ForTypesDerivedFrom(typeof (T));
+		}
+
+		public ServiceBuilder ForTypesMatching(Predicate<Type> typeFilter)
+		{
+			ServiceBuilder builder = CreateServiceBuilder(typeFilter);
+			builders.Add(builder);
+			return builder;
+		}
+
+
+		private static ServiceBuilder CreateServiceBuilder(Predicate<Type> typeFilter)
+		{
+			return new ServiceBuilder(typeFilter);
+		}
+	}
+}
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot/Container/ExportBuilder.cs b/AppBoot/iQuarc.AppBoot/Container/ExportBuilder.cs
new file mode 100644
index 0000000..ac2ebc8
--- /dev/null
+++ b/AppBoot/iQuarc.AppBoot/Container/ExportBuilder.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace iQuarc.AppBoot
+{
+	public class ExportBuilder
+	{
+		private Type contractType;
+		private string contractName;
+		private Lifetime life = Lifetime.Instance;
+
+		public ExportBuilder AsContractName(string name)
+		{
+			this.contractName = name;
+			return this;
+		}
+
+		public ExportBuilder AsContractType(Type type)
+		{
+			this.contractType = type;
+			return this;
+		}
+
+		[SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Convenience call")]
+		public ExportBuilder AsContractType<T>()
+		{
+			return AsContractType(typeof (T));
+		}
+
+		public ExportBuilder WithLifetime(Lifetime lifetime)
+		{
+			this.life = lifetime;
+			return this;
+		}
+
+		internal ServiceInfo GetServiceInfo(Type type)
+		{
+			return new ServiceInfo(type, contractType ?? type, contractName, life);
+		}
+	}
+}
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot/Container/ServiceBuilder.cs b/AppBoot/iQuarc.AppBoot/Container/ServiceBuilder.cs
new file mode 100644
index 0000000..f8e175a
--- /dev/null
+++ b/AppBoot/iQuarc.AppBoot/Container/ServiceBuilder.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace iQuarc.AppBoot
+{
+	public class ServiceBuilder
+	{
+		private readonly Predicate<Type> filter;
+		private readonly IList<ExportConfig> configs = new List<ExportConfig>(); 
+
+		internal ServiceBuilder(Predicate<Type> filter)
+		{
+			this.filter = filter;
+		}
+
+		public void Export()
+		{
+			this.Export(c => {});
+		}
+
+		public void Export(Action<ExportBuilder> exportConfiguration)
+		{
+			RegisterConfig(new ExportConfig { ContractsProvider = t => new[] { t }, ExportConfiguration = exportConfiguration });
+		}
+
+		public void ExportInterfaces()
+		{
+			this.ExportInterfaces(x => true);
+		}
+
+		public void ExportInterfaces(Predicate<Type> interfaceFilter)
+		{
+			this.ExportInterfaces(interfaceFilter, c => {});
+		}
+
+		public void ExportInterfaces(Predicate<Type> interfaceFilter, Action<ExportBuilder> exportConfiguration)
+		{
+			Func<Type, IEnumerable<Type>> interfaces = t => t.GetInterfaces().Where(x => interfaceFilter(x));
+
+			RegisterConfig(new ExportConfig { ExportConfiguration = exportConfiguration, ContractsProvider = interfaces });
+		}
+
+	    public bool IsMatch(Type type)
+	    {
+	        return filter(type);
+	    }
+
+	    internal IEnumerable<ServiceInfo> GetServicesFrom(Type type)
+		{
+			if (!IsMatch(type))
+				yield break;
+
+			foreach (ExportConfig config in configs)
+			{
+				IEnumerable<Type> contracts = config.ContractsProvider(type);
+
+				foreach (Type contract in contracts)
+				{
+					ExportBuilder builder = new ExportBuilder();
+					builder.AsContractType(contract);
+
+					config.ExportConfiguration(builder);
+
+					yield return builder.GetServiceInfo(type);
+				}
+			}
+		}
+
+	    private void RegisterConfig(ExportConfig config)
+		{
+			this.configs.Add(config);
+		}
+
+	    private class ExportConfig
+		{
+			internal Action<ExportBuilder> ExportConfiguration { get; set; }
+
+			internal Func<Type, IEnumerable<Type>> ContractsProvider { get; set; } 
+		}
+	}
+}
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot/GlobalSuppressions.cs b/AppBoot/iQuarc.AppBoot/GlobalSuppressions.cs
new file mode 100644
index 0000000..0b11a84
Binary files /dev/null and b/AppBoot/iQuarc.AppBoot/GlobalSuppressions.cs differ
diff --git a/AppBoot/iQuarc.AppBoot/Properties/AssemblyInfo.cs b/AppBoot/iQuarc.AppBoot/Properties/AssemblyInfo.cs
index 051f9c4..8528636 100644
--- a/AppBoot/iQuarc.AppBoot/Properties/AssemblyInfo.cs
+++ b/AppBoot/iQuarc.AppBoot/Properties/AssemblyInfo.cs
@@ -45,5 +45,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot/app.config b/AppBoot/iQuarc.AppBoot/app.config
new file mode 100644
index 0000000..4fc378d
--- /dev/null
+++ b/AppBoot/iQuarc.AppBoot/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/AppBoot/iQuarc.AppBoot/iQuarc.AppBoot.csproj b/AppBoot/iQuarc.AppBoot/iQuarc.AppBoot.csproj
index d1caaba..765ef3c 100644
--- a/AppBoot/iQuarc.AppBoot/iQuarc.AppBoot.csproj
+++ b/AppBoot/iQuarc.AppBoot/iQuarc.AppBoot.csproj
@@ -35,16 +35,18 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Unity.3.0.1304.1\lib\Net45\Microsoft.Practices.Unity.dll</HintPath>
+      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Unity.3.0.1304.1\lib\Net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity">
+      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity.Configuration">
+      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention">
+      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -57,8 +59,12 @@
   <ItemGroup>
     <Compile Include="Application.cs" />
     <Compile Include="Bootstrapper.cs" />
+    <Compile Include="Container\ConventionRegistrationBehavior.cs" />
+    <Compile Include="Container\ExportBuilder.cs" />
     <Compile Include="Container\ServiceAttribute.cs" />
+    <Compile Include="Container\ServiceBuilder.cs" />
     <Compile Include="Container\ServiceRegistrationBehavior.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="IDependencyContainer.cs" />
     <Compile Include="IModule.cs" />
     <Compile Include="Container\IRegistrationBehavior.cs" />
@@ -72,6 +78,7 @@
     <Compile Include="UnityContainerAdapter.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Application.cd" />
     <None Include="iQuarc.AppBoot.nuspec" />
     <None Include="make-package.bat" />
diff --git a/AppBoot/iQuarc.AppBoot/iQuarc.AppBoot.nuspec b/AppBoot/iQuarc.AppBoot/iQuarc.AppBoot.nuspec
index 6f5d194..d2f3418 100644
--- a/AppBoot/iQuarc.AppBoot/iQuarc.AppBoot.nuspec
+++ b/AppBoot/iQuarc.AppBoot/iQuarc.AppBoot.nuspec
@@ -9,7 +9,7 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<summary>$description$</summary>
 		<description>$description$</description>
-		<releaseNotes>Basic functionality for hiding the DI Container and for defining a modular application.</releaseNotes>
+		<releaseNotes>Adds registrations by convention support.</releaseNotes>
 		<copyright>Copyright 2014</copyright>
 		<tags>Dependency Injection Modularity Bootstrap Configuration</tags>
 		<licenseUrl>https://raw.githubusercontent.com/iQuarc/AppBoot/master/MIT.md</licenseUrl>
diff --git a/AppBoot/iQuarc.AppBoot/packages.config b/AppBoot/iQuarc.AppBoot/packages.config
index 1a6f383..2a12d3e 100644
--- a/AppBoot/iQuarc.AppBoot/packages.config
+++ b/AppBoot/iQuarc.AppBoot/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
   <package id="iQuarc.SystemEx" version="1.0.0.0" targetFramework="net45" />
-  <package id="Unity" version="3.0.1304.1" targetFramework="net45" />
+  <package id="Unity" version="3.5.1404.0" targetFramework="net45" />
 </packages>
\ No newline at end of file