diff --git a/kernel/src/main/scala/State.scala b/kernel/src/main/scala/State.scala
new file mode 100755
index 0000000000..ba125d6ebf
--- /dev/null
+++ b/kernel/src/main/scala/State.scala
@@ -0,0 +1,82 @@
+/**
+ * Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.kernel
+
+import se.scalablesolutions.akka.collection._
+import scala.collection.mutable.{HashMap}
+
+sealed trait State[K, V] {
+  def put(key: K, value: V)
+  def remove(key: K)
+  def get(key: K): V
+  def contains(key: K): Boolean
+  def elements: Iterator[(K, V)]
+  def size: Int
+  def clear
+}
+
+sealed trait TransactionalState[K, V] extends State[K, V] { this: HashState[K, V] =>
+  private[kernel] var snapshot = state
+  private[kernel] val unitOfWork = new HashMap[K, V]
+
+  private[kernel] def record = {
+    snapshot = state
+    unitOfWork.clear
+  }
+
+  abstract override def put(key: K, value: V) = {
+    super.put(key, value)
+    unitOfWork += key -> value
+  }
+
+  abstract override def remove(key: K) = {
+    super.remove(key)
+    unitOfWork -= key
+  }
+}
+
+final class HashState[K, V] extends State[K, V] {
+  private[kernel] var state = new HashTrie[K, V]
+
+  override def put(key: K, value: V) = {
+    state = state.update(key, value)
+  }
+
+  override def remove(key: K) = {
+    state = state - key
+  }
+
+  def get(key: K): V = state.get(key).getOrElse { throw new NoSuchElementException("No value for key [" + key + "]") }
+
+  def contains(key: K): Boolean = state.contains(key)
+ 
+  def elements: Iterator[(K, V)] = state.elements
+
+  def size: Int = state.size
+
+  def clear = state = new HashTrie[K, V]
+}
+
+//class VectorState[T] {
+//  private[kernel] var state: Vector[T] = EmptyVector
+//  private[kernel] var snapshot = state
+//  private[kernel] var unitOfWork: List[T] = Nil
+//
+//  private[kernel] def record = {
+//    snapshot = state
+//    unitOfWork = Nil
+//  }
+//
+//  def add(elem: T): VectorState[T] = {
+//    state = state + elem
+//    unitOfWork ::= elem
+//  }
+//
+//  def get(index: Int): T = state(index)
+//
+//  def size: Int = state.size
+//}
+//
+//