Index: ejb3/.classpath
===================================================================
--- ejb3/.classpath	(revision 76999)
+++ ejb3/.classpath	(working copy)
@@ -21,5 +21,6 @@
 	<classpathentry kind="lib" path="/thirdparty/org/jboss/ws/lib/jbossws-spi.jar" sourcepath="/thirdparty/org/jboss/ws/lib/jbossws-spi-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-core.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers.jar" sourcepath="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>
Index: ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	(revision 76999)
+++ ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	(working copy)
@@ -27,6 +27,8 @@
 import javax.management.MBeanServer;
 
 import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.beans.metadata.api.annotations.Start;
+import org.jboss.beans.metadata.api.annotations.Stop;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
@@ -37,6 +39,9 @@
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.cache.CacheFactoryRegistry;
 import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
+import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
+import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
+import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
 import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
 import org.jboss.ejb3.pool.PoolFactoryRegistry;
 import org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry;
@@ -334,4 +339,52 @@
          log.warn("Failed to destroy deployment " + deployment, e);
       }
    }
+
+   /**
+    * LifeCycle Start
+    * 
+    * Responsible for Binding an MC-based EJB3 Registrar Object Store
+    * 
+    * @author ALR
+    * @throws Throwable
+    */
+   @Start
+   public void start() throws Throwable
+   {
+      // Bind an EJB3 Registrar Implementation if not already bound
+      if (!Ejb3RegistrarLocator.isRegistrarBound())
+      {
+         // Obtain the Kernel
+         Kernel sanders = this.kernel;
+         assert sanders != null : Kernel.class.getSimpleName() + " must be provided in order to bind "
+               + Ejb3Registrar.class.getSimpleName();
+
+         // Create an EJB3 Registrar
+         Ejb3Registrar registrar = new Ejb3McRegistrar(sanders);
+
+         // Bind Registrar to the Locator
+         Ejb3RegistrarLocator.bindRegistrar(registrar);
+         
+         // Log
+         log.debug("Bound " + Ejb3Registrar.class.getSimpleName() + " to static "
+               + Ejb3RegistrarLocator.class.getSimpleName());
+      }
+   }
+   
+   /**
+    * LifeCycle Stop
+    * 
+    * Responsible for Unbinding the MC-based EJB3 Registrar Object Store
+    * 
+    * @throws Throwable
+    */
+   @Stop
+   public void stop() throws Throwable
+   {
+      // If bound
+      if (Ejb3RegistrarLocator.isRegistrarBound())
+      {
+         Ejb3RegistrarLocator.unbindRegistrar();
+      }
+   }
 }
Index: ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml	(revision 76999)
+++ ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml	(working copy)
@@ -293,5 +293,40 @@
          </parameter>
       </uninstall>
    </bean>
+
+   <!-- 
+    
+    JNDI Registrars
+    
+    
+    The JNDI Registrar is responsible for all JNDI Bindings for
+    an EJB.  Its constructor takes the following arguments, in order:
+    
+    javax.naming.Context (JNDI Context into which to bind objects)
+    org.jboss.ejb3.proxy.spi.registry.ProxyFactoryRegistry (Implementation of ProxyFactoryRegistry)
+    String statelessSessionProxyObjectFactoryType The JNDI ObjectFactory implementation to use for SLSB
+    ...more later when SFSB, @Service, MDB Implemented
+    
+  -->
+
+  <!-- SLSB JNDI Registrar -->
+  <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
+    class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatelessSessionRegistrar">
+    <constructor>
+      <parameter>
+        org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
+      </parameter>
+    </constructor>
+  </bean>
+
+  <!-- SFSB JNDI Registrar -->
+  <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
+    class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
+    <constructor>
+      <parameter>
+        org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
+      </parameter>
+    </constructor>
+  </bean>
    
 </deployment>
Index: ejb3/build.xml
===================================================================
--- ejb3/build.xml	(revision 76999)
+++ ejb3/build.xml	(working copy)
@@ -114,6 +114,7 @@
          <path refid="dom4j.dom4j.classpath"/>
          <path refid="jboss.integration.classpath"/>
          <path refid="jboss.jboss.ejb3.cache.classpath"/>
+         <path refid="jboss.jboss.ejb3.common.classpath"/>
          <path refid="jboss.jboss.ejb3.core.classpath"/>
          <path refid="jboss.jboss.ejb3.ext.api.classpath" />
          <path refid="jboss.jboss.ejb3.ext.api.impl.classpath" />
Index: thirdparty/pom.xml
===================================================================
--- thirdparty/pom.xml	(revision 76999)
+++ thirdparty/pom.xml	(working copy)
@@ -444,6 +444,15 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.ejb3</groupId>
+              <artifactId>jboss-ejb3-common</artifactId>
+              <classifier>client</classifier>
+              <mapping>
+                <componentId>jboss.jboss-ejb3-common</componentId>
+                <artifactId>jboss-ejb3-common-client</artifactId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss.ejb3</groupId>
               <artifactId>jboss-ejb3-core</artifactId>
               <mapping>
                 <componentId>jboss.jboss-ejb3-core</componentId>
@@ -495,6 +504,22 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.ejb3</groupId>
+              <artifactId>jboss-ejb3-proxy</artifactId>
+              <mapping>
+                <componentId>jboss.jboss-ejb3-proxy</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss.ejb3</groupId>
+              <artifactId>jboss-ejb3-proxy</artifactId>
+              <classifier>client</classifier>
+              <mapping>
+                <componentId>jboss.jboss-ejb3-proxy</componentId>
+                <artifactId>jboss-ejb3-proxy-client</artifactId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss.ejb3</groupId>
               <artifactId>jboss-ejb3-security</artifactId>
               <mapping>
                 <componentId>jboss.jboss-ejb3-security</componentId>
@@ -1288,6 +1313,11 @@
       <groupId>org.jboss.integration</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
+     <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-common</artifactId>
+      <classifier>client</classifier>
+    </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-core</artifactId>
@@ -1299,6 +1329,11 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-proxy</artifactId>
+      <classifier>client</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-security</artifactId>
       <classifier>client</classifier>
     </dependency>
Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml	(revision 76999)
+++ component-matrix/pom.xml	(working copy)
@@ -40,7 +40,10 @@
     <version.jboss.messaging>1.4.1.CR1</version.jboss.messaging>
     <version.jboss.web>2.1.1.CR5</version.jboss.web>
     <version.org.jboss.aop>2.0.0.CR15</version.org.jboss.aop>
-    <version.org.jboss.ejb3>0.1.10</version.org.jboss.ejb3>
+    <version.org.jboss.ejb3>0.1.12-SNAPSHOT</version.org.jboss.ejb3>
+    <version.org.jboss.ejb3.common.client>0.1.6-SNAPSHOT</version.org.jboss.ejb3.common.client>
+    <version.org.jboss.ejb3.proxy.client>0.1.1-SNAPSHOT</version.org.jboss.ejb3.proxy.client>
+    <version.org.jboss.ejb3.security.client>0.13.0</version.org.jboss.ejb3.security.client>
     <version.org.jboss.jpa>0.1.1</version.org.jboss.jpa>
     <version.org.jboss.reflect>2.0.0.Beta13</version.org.jboss.reflect>
     <version.org.jboss.mdr>2.0.0.Beta16</version.org.jboss.mdr>
@@ -473,7 +476,7 @@
       <dependency>
         <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-remoting-aspects</artifactId>
-        <version>1.0.0.Beta1</version>
+        <version>1.0.1.CR3</version>
         <exclusions>
           <exclusion>
             <groupId>org.jboss.aop</groupId>
@@ -1307,6 +1310,13 @@
         <artifactId>jboss-deployers-vfs-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.jboss.ejb3</groupId>
+        <artifactId>jboss-ejb3-common</artifactId>
+        <version>${version.org.jboss.ejb3.common.client}</version>
+        <classifier>client</classifier>
+      </dependency>
       
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
@@ -1452,11 +1462,18 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+    
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
+        <artifactId>jboss-ejb3-proxy</artifactId>
+        <version>${version.org.jboss.ejb3.proxy.client}</version>
+        <classifier>client</classifier>
+      </dependency>
+ 
+      <dependency>
+        <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-security</artifactId>
-        <version>0.13.0</version>
+        <version>${version.org.jboss.ejb3.security.client}</version>
         <classifier>client</classifier>
         <exclusions>
           <exclusion>
Index: build/build-distr.xml
===================================================================
--- build/build-distr.xml	(revision 76999)
+++ build/build-distr.xml	(working copy)
@@ -174,6 +174,8 @@
                excludes="*-sources.jar, *-javadoc.jar"/>
       <fileset dir="${jboss.jboss.ejb3.metadata.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar"/>
+      <fileset dir="${jboss.jboss.ejb3.proxy.lib}" includes="*.jar"
+               excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
       <fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
        <fileset dir="${jboss.jboss.ejb3.transactions.lib}" includes="*.jar"
@@ -207,6 +209,7 @@
       <fileset dir="${jboss.jboss.ejb3.ext.api.impl.lib}" includes="*.jar" excludes="*sources.jar"/>
       <fileset dir="${jboss.jboss.ejb3.common.lib}" includes="*-client.jar" excludes="*sources.jar"/>
       <fileset dir="${jboss.jboss.ejb3.core.lib}" includes="*-client.jar" excludes="*sources.jar"/>
+      <fileset dir="${jboss.jboss.ejb3.proxy.lib}" includes="*-client.jar" excludes="*sources.jar"/>
       <fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*-client.jar" excludes="*sources.jar"/>
     </copy>
   </target>