diff --git a/akka-cluster/pom.xml b/akka-cluster/pom.xml
index 24be269969..abf62fe317 100644
--- a/akka-cluster/pom.xml
+++ b/akka-cluster/pom.xml
@@ -20,11 +20,11 @@
       <artifactId>scala-library</artifactId>
       <version>${scala.version}</version>
     </dependency>
-    <!--<dependency>
-      <artifactId>akka-kernel</artifactId>
-      <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>-->
+    <dependency>
+      <groupId>org.scala-tools</groupId>
+      <artifactId>javautils</artifactId>
+      <version>2.7.4-0.1</version>
+    </dependency>
     <dependency>
       <artifactId>akka-actors</artifactId>
       <groupId>${project.groupId}</groupId>
@@ -36,7 +36,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>njgroups</groupId>
+      <groupId>jgroups</groupId>
       <artifactId>jgroups</artifactId>
       <version>2.8.0.CR7</version>
     </dependency>
diff --git a/akka-cluster/src/main/scala/Cluster.scala b/akka-cluster/src/main/scala/Cluster.scala
new file mode 100644
index 0000000000..88987a79a6
--- /dev/null
+++ b/akka-cluster/src/main/scala/Cluster.scala
@@ -0,0 +1,130 @@
+package se.scalablesolutions.akka.cluster
+
+import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.actor.Actor
+import se.scalablesolutions.akka.util.Logging
+import org.jgroups.{JChannel,View,Address,Message,ExtendedMembershipListener,Receiver,SetStateEvent}
+import se.scalablesolutions.akka.serialization.Serializer.Protobuf
+import se.scalablesolutions.akka.config.ScalaConfig.RemoteAddress
+import scala.collection.immutable.{Map,HashMap,HashSet}
+import org.jgroups.util.Util
+import se.scalablesolutions.akka.nio.RemoteServer
+import se.scalablesolutions.akka.cluster.Cluster.{DeregisterLocalNode, RegisterLocalNode, Node}
+
+abstract class ClusterActor(name : String) extends Actor {
+  // def clusterSpawn[T <: Actor](clazz : Class[T]) : T
+   def members : List[Node]
+}
+
+object Cluster {
+
+      case class RegisterLocalNode(server : RemoteAddress)
+      case class DeregisterLocalNode(server : RemoteAddress)
+      case class Node(endpoints : List[RemoteAddress])
+
+      lazy val impl : Option[ClusterActor] = {
+        config.getString("akka.remote.cluster.actor") map ( name => {
+             Class.forName(name)
+                       .getDeclaredConstructor(Array(classOf[String]): _*)
+                       .newInstance(config.getString("akka.remote.cluster.name") getOrElse "default")
+                       .asInstanceOf[ClusterActor]
+        })
+      }
+
+      //def registerLocalNode(server : RemoteAddress)   : Unit = impl.foreach(_ ! RegisterLocalNode(server))
+      //def deregisterLocalNode(server : RemoteAddress) : Unit = impl.foreach(_ ! DeregisterLocalNode(server))
+}
+
+object JGroupsClusterActor {
+    //Message types
+    case object PapersPlease
+    case class Papers(addresses : List[RemoteAddress])
+    case object Block
+    case object Unblock
+    case class Zombie(address : Address)
+}
+
+class JGroupsClusterActor(name : String) extends ClusterActor(name)
+{
+    import JGroupsClusterActor._
+    import org.scala_tools.javautils.Implicits._
+    private var local   : Node              = Node(Nil)
+    private var channel : JChannel          = null
+    private var remotes : Map[Address,Node] = Map()
+  
+    override def init(config : AnyRef) = {
+      remotes = new HashMap[Address,Node]
+      val me  = this
+      channel = new JChannel {
+        setReceiver(new Receiver with ExtendedMembershipListener {
+          def getState : Array[Byte]               = null
+          def setState(state : Array[Byte]) : Unit = ()
+          def receive(msg : Message)        : Unit = me ! msg
+          def viewAccepted(view : View)     : Unit = me ! view
+          def suspect(a : Address)          : Unit = me ! Zombie(a)
+          def block                         : Unit = me ! Block
+          def unblock                       : Unit = me ! Unblock
+        })
+      }
+      channel connect name
+    }
+
+    protected def serializer = Protobuf
+
+    private def broadcast[T <: AnyRef](recipients : Iterable[Address],msg : T) : Unit = {
+        for(r <- recipients)
+            channel.send(new Message(r,null,serializer out msg))
+    }
+
+    private def broadcast[T <: AnyRef](msg : T) : Unit = channel.send(new Message(null,null,serializer out msg))
+
+   override def receive = {
+      case Zombie(x) => { //Ask the presumed zombie for papers and prematurely treat it as dead
+                          broadcast(x :: Nil,PapersPlease)
+                          remotes = remotes - x
+                        }
+
+      case v : View  => {
+           log debug v.printDetails
+           //Not present in the cluster anymore = presumably zombies
+           //Nodes we have no prior knowledge existed = unknowns
+           val members = Set[Address]() ++ v.getMembers.asScala
+           val zombies = Set[Address]() ++ remotes.keySet.filter( members contains _ )
+           val unknown : Set[Address] = members -- remotes.keySet
+
+           //Tell the zombies and unknowns to provide papers and prematurely treat them as dead
+           broadcast(zombies ++ unknown, PapersPlease)
+           remotes = remotes -- zombies
+          }
+
+      case m : Message if m.getSrc != channel.getAddress => {
+            ( serializer in(m.getRawBuffer,None) ) match {
+                case PapersPlease => broadcast(m.getSrc :: Nil,Papers(local.endpoints))
+                case Papers(x)    => remotes = remotes + (m.getSrc -> Node(x))
+                case unknown      => log debug unknown.toString
+            }
+          }
+
+      case DeregisterLocalNode(s) => {
+           log debug "DeregisterLocalNode"+s
+           local = Node(local.endpoints - s)
+           broadcast(Papers(local.endpoints))
+          }
+
+      case RegisterLocalNode(s)   => {
+           log debug "RegisterLocalNode"+s
+           local = Node(local.endpoints + s)
+           broadcast(Nil,Papers(local.endpoints))
+          }
+      
+      case Block                    => log debug "Asked to block" //TODO HotSwap to a buffering body
+      case Unblock                  => log debug "Asked to unblock" //TODO HotSwap back and flush the buffer
+    }
+
+    def members = remotes.values.toList
+
+    override def shutdown = {
+      remotes = Map()
+      channel.close
+    }
+}
\ No newline at end of file
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 97d7a86a0f..04c8f37128 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -37,6 +37,10 @@
     zlib-compression-level = 6  # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
 
     <server>
+      <cluster>
+        name = "default"
+        actor = "se.scalablesolutions.akka.cluster.JGroupsClusterActor"
+      </cluster>
       service = on
       hostname = "localhost"
       port = 9999