diff --git a/src/Boxes.Integration/Boxes.Integration.csproj b/src/Boxes.Integration/Boxes.Integration.csproj
index 9f60dc8..b2f1f9b 100644
--- a/src/Boxes.Integration/Boxes.Integration.csproj
+++ b/src/Boxes.Integration/Boxes.Integration.csproj
@@ -47,14 +47,14 @@
   <ItemGroup>
     <Compile Include="Extensions\ISetupBoxesExtension.cs" />
     <Compile Include="Extensions\IBoxesExtensionWithSetup.cs" />
+    <Compile Include="Factories\IIocSetup.cs" />
     <Compile Include="InternalIoc\IInternalContainer.cs" />
     <Compile Include="InternalIoc\Registration.cs" />
     <Compile Include="InternalContainerExtensions.cs" />
     <Compile Include="InternalIoc\InternalInternalContainer.cs" />
     <Compile Include="Setup\Filters\DefaultTypeRegistrationFilter.cs" />
-    <Compile Include="Setup\IApplicationContainerSetup.cs" />
     <Compile Include="Setup\IRegistrationTaskMapper.cs" />
-    <Compile Include="Setup\ITenantContainerSetup.cs" />
+    <Compile Include="Setup\DefaultContainerSetup.cs" />
     <Compile Include="Exceptions\ServiceTypeDoesNotMatchInstanceException.cs" />
     <Compile Include="Exceptions\FailedTrustException.cs" />
     <Compile Include="Trust\Contexts\BoxesExtensions\AssemblyFromPackageTrustContext.cs" />
@@ -68,7 +68,7 @@
     <Compile Include="Factories\FuncCreateLoader.cs" />
     <Compile Include="Factories\ICreateLoader.cs" />
     <Compile Include="Factories\IDependencyResolverFactory.cs" />
-    <Compile Include="Factories\IIoCFactory.cs" />
+    <Compile Include="Factories\IIocFactory.cs" />
     <Compile Include="Factories\LoaderFactory.cs" />
     <Compile Include="ObjectExtensions.cs" />
     <Compile Include="Process\TopologicalProcessOrder.cs" />
diff --git a/src/Boxes.Integration/BoxesWrapperBase.cs b/src/Boxes.Integration/BoxesWrapperBase.cs
index aee09ab..705735f 100644
--- a/src/Boxes.Integration/BoxesWrapperBase.cs
+++ b/src/Boxes.Integration/BoxesWrapperBase.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 namespace Boxes.Integration
 {
-    using System;
     using Boxes.Tasks;
     using Discovering;
     using Factories;
@@ -23,25 +22,33 @@ namespace Boxes.Integration
     using Tasks;
     using Trust;
 
+    /// <summary>
+    /// this wrapper of boxes.core, this will integrate the features of boxes with an IoC container
+    /// </summary>
+    /// <typeparam name="TBuilder">the type used to build registrations</typeparam>
+    /// <typeparam name="TContainer">the type of the container, this will be used to resolve the instances</typeparam>
+    /// <remarks>
+    /// do not remove the TContainer this is used with the extension methods and with the other classes in the system</remarks>
     public abstract class BoxesWrapperBase<TBuilder, TContainer> : IBoxesWrapper<TBuilder>
     {
-        //TODO: look at disabling registrations http://ayende.com/blog/2792/introducing-monorail-hotswap 
+        //TODO: look at disabling registrations (controllable in a module) 
+        //http://ayende.com/blog/2792/introducing-monorail-hotswap 
         //issue is around the containers, a subset allow to deletions of registrations
         //an other way is to restart the app and only register the required packages with the IoC
         //the second way can be supported by coding a module
         //favored way, use of child container, will need to re-initialise the container (delete, create a new one)
 
-        //TODO: migrations
+        //TODO: migrations (possible in a module)
         //updates of a module will require a restart, currently the Loaders do not support 
         //app domains. they do offer a level of isolation
 
-        //TODO: Multi-tenancy
+        //TODO: Multi-tenancy (possible in a module)
         //use child containers to handle tenants. implement a IProcess (consider PLinq) to register
         //the correct packages with the correct child container.
 
-        //TODO: consider how to admin an application
+        //TODO: consider how to admin an application (need feedback)
 
-        //TODO: events
+        //TODO: events (possible in a module)
 
         private IPackageScanner _defaultPackageScanner;
         private ILoader _loader;
@@ -55,6 +62,16 @@ protected BoxesWrapperBase()
             PackageRegistry = new PackageRegistry();
             _extensionRunner = new TaskRunner<Package>(new ExtendBoxesTask(_internalContainer));
             _loaderFactory = new LoaderFactory();
+
+            //setup the internal IoC
+            _internalContainer.Add<IProcessOrder, TopologicalProcessOrder>();
+            _internalContainer.Add(typeof(IIocSetup<>), typeof(IocSetup<>));
+            _internalContainer.Add<ITrustManager, TrustManager>();
+
+            _internalContainer.Add<LoaderFactory, LoaderFactory>();
+            _internalContainer.setInstance(typeof(LoaderFactory), _loaderFactory);
+
+            Initialize(_internalContainer);
         }
 
         public PackageRegistry PackageRegistry { get; private set; }
@@ -97,29 +114,11 @@ public virtual void Dispose()
         {
             _internalContainer.Dispose();
         }
-        
-    }
-
-
-    public class App
-    {
-        public void Main()
-        {
-            //IBoxesWrapper<> boxes = null;
-            ////boxes.BoxesIntegrationSetup
-            ////how do we want to configure?
-
-            //boxes.Setup<IsolatedLoader>(new PackageScanner("folder"));
-            //boxes.DiscoverPackages();
-            //boxes.LoadPackages();
-
-
-
-            //boxes.EnablePackages("", "", "", "", ""); //auto detect the tenant
-            //boxes.DependencyResolver.Resolve<Object>();
-        }
 
+        /// <summary>
+        /// setup boxes integration with the IoC implementation (register types with the internal IoC)
+        /// </summary>
+        protected abstract void Initialize(IInternalContainer internalContainer);
 
     }
-
 }
\ No newline at end of file
diff --git a/src/Boxes.Integration/Factories/FuncCreateLoader.cs b/src/Boxes.Integration/Factories/FuncCreateLoader.cs
index 407cdb9..cd2ff9a 100644
--- a/src/Boxes.Integration/Factories/FuncCreateLoader.cs
+++ b/src/Boxes.Integration/Factories/FuncCreateLoader.cs
@@ -14,7 +14,7 @@
 namespace Boxes.Integration.Factories
 {
     using System;
-    using Boxes.Loading;
+    using Loading;
 
     /// <summary>
     /// creates a Loader, based on a Func which is passed in via the ctor
diff --git a/src/Boxes.Integration/Factories/IIoCFactory.cs b/src/Boxes.Integration/Factories/IIoCFactory.cs
index a79084c..9335297 100644
--- a/src/Boxes.Integration/Factories/IIoCFactory.cs
+++ b/src/Boxes.Integration/Factories/IIoCFactory.cs
@@ -16,7 +16,7 @@ namespace Boxes.Integration.Factories
     /// <summary>
     /// create instances of containers as required
     /// </summary>
-    public interface IIoCFactory<TBuilder, TContainer>
+    public interface IIocFactory<TBuilder, TContainer>
     {
 
         /// <summary>
diff --git a/src/Boxes.Integration/Factories/IIocSetup.cs b/src/Boxes.Integration/Factories/IIocSetup.cs
new file mode 100644
index 0000000..701d75f
--- /dev/null
+++ b/src/Boxes.Integration/Factories/IIocSetup.cs
@@ -0,0 +1,51 @@
+// Copyright 2012 - 2013 dbones.co.uk (David Rundle)
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+namespace Boxes.Integration.Factories
+{
+    /// <summary>
+    /// A Setup to use with the IoC (this should be injected into the <see cref="IIocFactory{TBuilder,TContainer}"/>)
+    /// </summary>
+    /// <typeparam name="TBuilder">the IoC setup</typeparam>
+    public interface IIocSetup<in TBuilder>
+    {
+        /// <summary>
+        /// configure the main container
+        /// </summary>
+        /// <param name="builder">the main container builder, (this should be before any registrations)</param>
+        void Configure(TBuilder builder);
+
+        /// <summary>
+        /// configure a child container
+        /// </summary>
+        /// <param name="builder">the child builder, (this should be before any registrations)</param>
+        void ConfigureChild(TBuilder builder);
+    }
+
+    /// <summary>
+    /// does nothing, vanilla setup of the ioc
+    /// </summary>
+    /// <typeparam name="TBuilder"></typeparam>
+    public class IocSetup<TBuilder> : IIocSetup<TBuilder>
+    {
+        public void Configure(TBuilder builder)
+        {
+            
+        }
+
+        public void ConfigureChild(TBuilder builder)
+        {
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Boxes.Integration/IBoxesWrapper.cs b/src/Boxes.Integration/IBoxesWrapper.cs
index 3b20aad..e907980 100644
--- a/src/Boxes.Integration/IBoxesWrapper.cs
+++ b/src/Boxes.Integration/IBoxesWrapper.cs
@@ -68,22 +68,6 @@ public interface IBoxesWrapper<TBuilder> : IDisposable
     /// </summary>
     public static class BoxesWrapperExtensions
     {
-        /// <summary>
-        /// A mechanism to handle type registration with the Tenant(s) IoC container.
-        /// </summary>
-        public static ITenantContainerSetup<TBuilder> Registrations<TBuilder>(this IBoxesWrapper<TBuilder> boxes)
-        {
-            return boxes.GetService<ITenantContainerSetup<TBuilder>>();
-        }
-
-        /// <summary>
-        /// A mechanism to handle type registration with the underlying Global/Parent IoC container.
-        /// </summary>
-        public static IApplicationContainerSetup<TBuilder> GlobalRegistrations<TBuilder>(this IBoxesWrapper<TBuilder> boxes)
-        {
-            return boxes.GetService<IApplicationContainerSetup<TBuilder>>();
-        }
-
         /// <summary>
         /// the trust manager being used by boxes.
         /// </summary>
diff --git a/src/Boxes.Integration/InternalContainerExtensions.cs b/src/Boxes.Integration/InternalContainerExtensions.cs
index ac6194a..9a8b4db 100644
--- a/src/Boxes.Integration/InternalContainerExtensions.cs
+++ b/src/Boxes.Integration/InternalContainerExtensions.cs
@@ -18,7 +18,7 @@ namespace Boxes.Integration
     /// <summary>
     /// some extensions for the internal container
     /// </summary>
-    internal static class InternalContainerExtensions
+    public static class InternalContainerExtensions
     {
         public static void Add<TContract, TService>(this IInternalContainer internalContainer) where TService : TContract
         {
diff --git a/src/Boxes.Integration/InternalIoc/IInternalContainer.cs b/src/Boxes.Integration/InternalIoc/IInternalContainer.cs
index 043c923..b5fa176 100644
--- a/src/Boxes.Integration/InternalIoc/IInternalContainer.cs
+++ b/src/Boxes.Integration/InternalIoc/IInternalContainer.cs
@@ -18,7 +18,7 @@ namespace Boxes.Integration.InternalIoc
     /// <summary>
     /// A simple internal container, which will manage the services available in Boxes.
     /// </summary>
-    internal interface IInternalContainer : IDisposable
+    public interface IInternalContainer : IDisposable
     {
         void Add(Type contract, Type service);
         
diff --git a/src/Boxes.Integration/InternalIoc/InternalInternalContainer.cs b/src/Boxes.Integration/InternalIoc/InternalInternalContainer.cs
index 70361ed..dd4f01d 100644
--- a/src/Boxes.Integration/InternalIoc/InternalInternalContainer.cs
+++ b/src/Boxes.Integration/InternalIoc/InternalInternalContainer.cs
@@ -72,7 +72,7 @@ public object Resolve(Type contract)
                 {
                     //no support for list or lazy, this is a simple internalContainer
                     Type[] genericArguments = contract.GetGenericArguments();
-                    getServiceType = r => r.Service.MakeGenericType(genericArguments);
+                    getServiceType = r => r.Service.IsGenericType ? r.Service.MakeGenericType(genericArguments) : r.Service;
                     contract = contract.GetGenericTypeDefinition();
                 }
                 else
diff --git a/src/Boxes.Integration/Setup/ITenantContainerSetup.cs b/src/Boxes.Integration/Setup/DefaultContainerSetup.cs
similarity index 68%
rename from src/Boxes.Integration/Setup/ITenantContainerSetup.cs
rename to src/Boxes.Integration/Setup/DefaultContainerSetup.cs
index e2a41fa..3ed4aba 100644
--- a/src/Boxes.Integration/Setup/ITenantContainerSetup.cs
+++ b/src/Boxes.Integration/Setup/DefaultContainerSetup.cs
@@ -13,16 +13,19 @@
 // limitations under the License.
 namespace Boxes.Integration.Setup
 {
+    //TODO:move into the base/default module
+
     /// <summary>
     /// the tenants container setup
     /// </summary>
     /// <typeparam name="TBuilder">the ioc builder class</typeparam>
-    public interface ITenantContainerSetup<TBuilder> : IContainerSetup<TBuilder> { }
+    public interface IDefaultContainerSetup<TBuilder> : IContainerSetup<TBuilder> { }
 
 
-    public class TenantContainerSetup<TBuilder> : ContainerSetupBase<TBuilder>, ITenantContainerSetup<TBuilder>
+    public class DefaultContainerSetup<TBuilder> : ContainerSetupBase<TBuilder>, IDefaultContainerSetup<TBuilder>
     {
-        public TenantContainerSetup(IRegistrationTaskMapper<TBuilder> registrationTaskMapper) : base(registrationTaskMapper)
+        public DefaultContainerSetup(IRegistrationTaskMapper<TBuilder> registrationTaskMapper)
+            : base(registrationTaskMapper)
         {
         }
     }
diff --git a/src/Boxes.Integration/Setup/IApplicationContainerSetup.cs b/src/Boxes.Integration/Setup/IApplicationContainerSetup.cs
deleted file mode 100644
index cb5ad25..0000000
--- a/src/Boxes.Integration/Setup/IApplicationContainerSetup.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012 - 2013 dbones.co.uk (David Rundle)
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-namespace Boxes.Integration.Setup
-{
-    /// <summary>
-    /// the global container setup
-    /// </summary>
-    /// <typeparam name="TBuilder">the ioc builder class</typeparam>
-    public interface IApplicationContainerSetup<TBuilder> : IContainerSetup<TBuilder>{}
-}
\ No newline at end of file
diff --git a/src/Boxes.Integration/Setup/IContainerSetup.cs b/src/Boxes.Integration/Setup/IContainerSetup.cs
index 3983c0c..d870a88 100644
--- a/src/Boxes.Integration/Setup/IContainerSetup.cs
+++ b/src/Boxes.Integration/Setup/IContainerSetup.cs
@@ -54,12 +54,6 @@ public interface IContainerSetup : IBoxesExtensionWithSetup
         /// <param name="packageName">name of the package</param>
         /// <returns>null if there is not filter</returns>
         ITypeRegistrationFilter GetTypeRegistrationFilter(string packageName);
-
-
-        //void RegisterPreProcessTask(IBoxesTask<ProcessPackageContext> task);
-
-
-        //void RegisterProcessTask(IBoxesTask<ProcessPackageContext> task);
     }
 
 
@@ -72,12 +66,7 @@ public interface IContainerSetup<TBuilder> : IContainerSetup
         /// all the registration to run the types through
         /// </summary>
         IEnumerable<IBoxesTask<RegistrationContext<TBuilder>>> Registrations { get; }
-
-        //IEnumerable<IBoxesTask<ProcessPackageContext>> PreProcessTasks { get; }
-
-        //IEnumerable<IBoxesTask<ProcessPackageContext>> ProcessTasks { get; } 
-
-
-        
     }
+
+    
 }
\ No newline at end of file
diff --git a/src/Boxes.Integration/Setup/RegistrationContext.cs b/src/Boxes.Integration/Setup/RegistrationContext.cs
index d5ffb37..7fbfd88 100644
--- a/src/Boxes.Integration/Setup/RegistrationContext.cs
+++ b/src/Boxes.Integration/Setup/RegistrationContext.cs
@@ -15,8 +15,7 @@ namespace Boxes.Integration.Setup
 {
     using System;
 
-    //TODO: keep an eye on this class, look at some profiling
-
+    //TODO: keep an eye on the use of this class, look at some profiling
 
     /// <summary>
     /// the context for the registration