diff --git a/ChangeLog b/ChangeLog
index ef775313..e9e6423e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
                    Selenium Grid ChangeLog
                   =========================
 
+Summary of changes from 1.1.0 to 1.1.0.1
+========================================
+
+* Adding WebDriver and Selenium 2.0a6 support
+
 Summary of changes from 1.0.8 to 1.1.0
 ======================================
 
diff --git a/Selenium Grid.ipr b/Selenium Grid.ipr
index ce8c400c..8b17d5f0 100644
--- a/Selenium Grid.ipr	
+++ b/Selenium Grid.ipr	
@@ -53,6 +53,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
           <option name="INDENT_SIZE" value="4" />
@@ -62,6 +63,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="xml">
           <option name="INDENT_SIZE" value="4" />
@@ -71,6 +73,7 @@
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
       </value>
     </option>
@@ -122,7 +125,9 @@
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
     <option name="MAXIMUM_HEAP_SIZE" value="128" />
   </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="file://$PROJECT_DIR$/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/WebDriverCommand.java" charset="UTF-8" />
+  </component>
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
@@ -187,7 +192,7 @@
         <inspection_tool class="ClassReferencesSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="ClassUnconnectedToPackage" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="ClassWithMultipleLoggers" enabled="true" level="WARNING" enabled_by_default="true">
-          <option name="loggerClassName" value="java.util.logging.Logger" />
+          <option name="loggerNamesString" value="java.util.logging.Logger,org.slf4j.Logger,org.apache.commons.logging.Log,org.apache.log4j.Logger" />
         </inspection_tool>
         <inspection_tool class="ClassWithTooManyDependencies" enabled="true" level="WARNING" enabled_by_default="true">
           <option name="limit" value="10" />
@@ -253,8 +258,11 @@
         </inspection_tool>
         <inspection_tool class="InstanceVariableUninitializedUse" enabled="true" level="WARNING" enabled_by_default="true">
           <option name="m_ignorePrimitives" value="false" />
+          <option name="annotationNamesString" value="" />
+        </inspection_tool>
+        <inspection_tool class="InstanceofChain" enabled="true" level="WARNING" enabled_by_default="true">
+          <option name="ignoreInstanceofOnLibraryClasses" value="false" />
         </inspection_tool>
-        <inspection_tool class="InstanceofChain" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="InstanceofInterfaces" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="InstanceofThis" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="JDBCExecuteWithNonConstantString" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -282,6 +290,8 @@
         </inspection_tool>
         <inspection_tool class="MethodOnlyUsedFromInnerClass" enabled="true" level="WARNING" enabled_by_default="true">
           <option name="ignoreMethodsAccessedFromAnonymousClass" value="false" />
+          <option name="ignoreStaticMethodsFromNonStaticInnerClass" value="false" />
+          <option name="onlyReportStaticMethods" value="false" />
         </inspection_tool>
         <inspection_tool class="MethodOverloadsParentMethod" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="MethodOverridesPackageLocalMethod" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -289,7 +299,9 @@
         <inspection_tool class="MethodOverridesStaticMethod" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="MethodWithMultipleLoops" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="MissingDeprecatedAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
-        <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
+        <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true">
+          <option name="ignoreObjectMethods" value="true" />
+        </inspection_tool>
         <inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">
           <option name="m_requireAnnotationsFirst" value="true" />
         </inspection_tool>
@@ -299,7 +311,9 @@
         <inspection_tool class="ModuleWithTooManyClasses" enabled="true" level="WARNING" enabled_by_default="true">
           <option name="limit" value="100" />
         </inspection_tool>
-        <inspection_tool class="MultipleDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+        <inspection_tool class="MultipleDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
+          <option name="ignoreForLoopDeclarations" value="true" />
+        </inspection_tool>
         <inspection_tool class="MultipleTopLevelClassesInFile" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="NativeMethods" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="NestedAssignment" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -325,7 +339,7 @@
         <inspection_tool class="NonThreadSafeLazyInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="NoopMethodInAbstractClass" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="ObsoleteCollection" enabled="true" level="WARNING" enabled_by_default="true">
-          <option name="ignoreLibraryArguments" value="false" />
+          <option name="ignoreRequiredObsoleteCollectionTypes" value="false" />
         </inspection_tool>
         <inspection_tool class="OverlyStrongTypeCast" enabled="true" level="WARNING" enabled_by_default="true">
           <option name="ignoreInMatchingInstanceof" value="false" />
@@ -432,6 +446,7 @@
           <option name="useRighthandTypeAsWeakestTypeInAssignments" value="true" />
           <option name="useParameterizedTypeForCollectionMethods" value="true" />
           <option name="doNotWeakenToJavaLangObject" value="true" />
+          <option name="onlyWeakentoInterface" value="true" />
         </inspection_tool>
         <inspection_tool class="TypeParameterHidesVisibleType" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="UnnecessarilyQualifiedStaticUsage" enabled="true" level="WARNING" enabled_by_default="true">
@@ -439,7 +454,9 @@
           <option name="m_ignoreStaticMethodCalls" value="false" />
           <option name="m_ignoreStaticAccessFromStaticContext" value="false" />
         </inspection_tool>
-        <inspection_tool class="UnnecessaryBlockStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+        <inspection_tool class="UnnecessaryBlockStatement" enabled="true" level="WARNING" enabled_by_default="true">
+          <option name="ignoreSwitchBranches" value="false" />
+        </inspection_tool>
         <inspection_tool class="UnnecessaryConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="UnnecessaryEnumModifier" enabled="true" level="WARNING" enabled_by_default="true" />
         <inspection_tool class="UnnecessaryFinalOnParameter" enabled="true" level="WARNING" enabled_by_default="true">
@@ -472,12 +489,13 @@
     <option name="PROJECT_PROFILE" value="Project Default" />
     <option name="USE_PROJECT_PROFILE" value="true" />
     <version value="1.0" />
-    <list size="5">
+    <list size="6">
       <item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM" />
-      <item index="1" class="java.lang.String" itemvalue="INFO" />
-      <item index="2" class="java.lang.String" itemvalue="TYPO" />
-      <item index="3" class="java.lang.String" itemvalue="WARNING" />
-      <item index="4" class="java.lang.String" itemvalue="ERROR" />
+      <item index="1" class="java.lang.String" itemvalue="WEAK WARNING" />
+      <item index="2" class="java.lang.String" itemvalue="INFO" />
+      <item index="3" class="java.lang.String" itemvalue="TYPO" />
+      <item index="4" class="java.lang.String" itemvalue="WARNING" />
+      <item index="5" class="java.lang.String" itemvalue="ERROR" />
     </list>
   </component>
   <component name="JavadocGenerationManager">
@@ -621,6 +639,9 @@
   <component name="ProjectDetails">
     <option name="projectName" value="Selenium Grid" />
   </component>
+  <component name="ProjectDictionaryState">
+    <dictionary name="swozniak" />
+  </component>
   <component name="ProjectKey">
     <option name="state" value="project:///Users/ph7/Projects/Selenium-Grid/Selenium Grid.ipr" />
   </component>
@@ -636,8 +657,12 @@
       <module fileurl="file://$PROJECT_DIR$/examples/java-testng/TestNG Example.iml" filepath="$PROJECT_DIR$/examples/java-testng/TestNG Example.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/Tools.iml" filepath="$PROJECT_DIR$/tools/Tools.iml" />
       <module fileurl="file://$PROJECT_DIR$/infrastructure/webserver/WebServer.iml" filepath="$PROJECT_DIR$/infrastructure/webserver/WebServer.iml" />
+      <module fileurl="file://$PROJECT_DIR$/integration-tests/integration-tests.iml" filepath="$PROJECT_DIR$/integration-tests/integration-tests.iml" />
     </modules>
   </component>
+  <component name="ProjectResources">
+    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/target/classes" />
   </component>
@@ -661,6 +686,20 @@
         <entry key="$PROJECT_DIR$">
           <value>
             <SvnBranchConfiguration>
+              <option name="branchMap">
+                <map>
+                  <entry key="https://svn.seleniumhq.org/svn/selenium-grid/tags">
+                    <value>
+                      <list />
+                    </value>
+                  </entry>
+                  <entry key="https://svn.seleniumhq.org/svn/selenium-grid/website">
+                    <value>
+                      <list />
+                    </value>
+                  </entry>
+                </map>
+              </option>
               <option name="branchUrls">
                 <list>
                   <option value="https://svn.seleniumhq.org/svn/selenium-grid/tags" />
@@ -681,9 +720,10 @@
   </component>
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
   <component name="libraryTable">
-    <library name="Selenium Java Client Driver">
+    <library name="Commons">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/vendor/selenium-server-1.0.3-standalone.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/junit-4.7.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/commons-logging-1.1.1.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
@@ -697,19 +737,15 @@
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="Unit Testing">
+    <library name="Hub Resources">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/vendor/jmock-junit4-2.2.0.jar!/" />
-        <root url="jar://$PROJECT_DIR$/vendor/objenesis-1.0.jar!/" />
-        <root url="jar://$PROJECT_DIR$/vendor/jbehave-1.0.1.jar!/" />
-        <root url="jar://$PROJECT_DIR$/vendor/jmock-2.2.0.jar!/" />
-        <root url="jar://$PROJECT_DIR$/vendor/jmock-legacy-2.2.0.jar!/" />
-        <root url="jar://$PROJECT_DIR$/vendor/mockito-all-1.8.4.jar!/" />
-        <root url="jar://$PROJECT_DIR$/vendor/cglib-nodep-2.1_3.jar!/" />
-        <root url="jar://$PROJECT_DIR$/vendor/proxytoys-0.2.1.jar!/" />
+        <root url="file://$PROJECT_DIR$/hub/src/main/java" />
+        <root url="file://$PROJECT_DIR$/hub/src/test/unit/java" />
+        <root url="file://$PROJECT_DIR$/hub/src/main/java" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
+      <jarDirectory url="file://$PROJECT_DIR$/hub/src/main/java" recursive="false" />
     </library>
     <library name="Jetty">
       <CLASSES>
@@ -720,55 +756,69 @@
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="Selenium Remote Control">
+    <library name="JSON">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/vendor/selenium-server-1.0.3-standalone.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/json.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="Web">
+    <library name="JUnit">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/hub/lib/freemarker-2.3.16.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/junit-4.7.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="Yaml">
+    <library name="Selenium Java Client Driver">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/vendor/jyaml-1.3.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/selenium-java-2.0b1.jar!/" />
       </CLASSES>
       <JAVADOC />
-      <SOURCES />
+      <SOURCES>
+        <root url="jar://$PROJECT_DIR$/vendor/selenium-java-2.0b1-srcs.jar!/" />
+      </SOURCES>
     </library>
-    <library name="Hub Resources">
+    <library name="Selenium Remote Control">
       <CLASSES>
-        <root url="file://$PROJECT_DIR$/hub/src/main/java" />
-        <root url="file://$PROJECT_DIR$/hub/src/test/unit/java" />
-        <root url="file://$PROJECT_DIR$/hub/src/main/java" />
+        <root url="jar://$PROJECT_DIR$/vendor/selenium-server-standalone-2.0b1.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES>
+        <root url="file://D:/Selenium/remote/server/src/java" />
+      </SOURCES>
+    </library>
+    <library name="TestNG">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/vendor/testng-5.7-jdk15.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
-      <jarDirectory url="file://$PROJECT_DIR$/hub/src/main/java" recursive="false" />
     </library>
-    <library name="Commons">
+    <library name="Unit Testing">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/vendor/junit-4.7.jar!/" />
-        <root url="jar://$PROJECT_DIR$/vendor/commons-logging-1.1.1.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/jmock-junit4-2.2.0.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/objenesis-1.0.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/jbehave-1.0.1.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/jmock-2.2.0.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/jmock-legacy-2.2.0.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/mockito-all-1.8.4.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/cglib-nodep-2.1_3.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/proxytoys-0.2.1.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="TestNG">
+    <library name="Web">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/vendor/testng-5.7-jdk15.jar!/" />
+        <root url="jar://$PROJECT_DIR$/hub/lib/freemarker-2.3.16.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="JUnit">
+    <library name="Yaml">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/vendor/junit-4.7.jar!/" />
+        <root url="jar://$PROJECT_DIR$/vendor/jyaml-1.3.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />
diff --git a/agent/Agent.iml b/agent/Agent.iml
index fb7ddfba..27f5481b 100644
--- a/agent/Agent.iml
+++ b/agent/Agent.iml
@@ -14,6 +14,9 @@
     <orderEntry type="module" module-name="WebServer" />
     <orderEntry type="library" name="Commons" level="project" />
     <orderEntry type="module" module-name="Core" />
+    <orderEntry type="library" name="Selenium Java Client Driver" level="project" />
+    <orderEntry type="module" module-name="Remote Control" />
+    <orderEntry type="library" name="Selenium Remote Control" level="project" />
   </component>
   <component name="RSpecModuleSettingsStorage">
     <RSPEC_MODULE_SETTINGS_STORAGE_ID NAME="RSPEC_SUPPORT_TYPE" VALUE="NONE" />
diff --git a/agent/build.xml b/agent/build.xml
index 5e48174d..c03e8ff6 100755
--- a/agent/build.xml
+++ b/agent/build.xml
@@ -1,70 +1,71 @@
 <project name="Selenium Grid Agent" default="package-standalone" basedir=".">
 
-  <description>Selenium Grid Agent</description>
+    <description>Selenium Grid Agent</description>
 
-  <property name="rootdir" value="${basedir}/.."/>
-  <property file="${rootdir}/project.properties"/>
-  <property name="name" value="Selenium Grid Agent"/>
-  <property name="artifact" value="selenium-grid-agent"/>
-  <property name="version" value="SNAPSHOT"/>
-  <property name="selenium.version" value="Set Me"/>
+    <property name="rootdir" value="${basedir}/.."/>
+    <property file="${rootdir}/project.properties"/>
+    <property name="name" value="Selenium Grid Agent"/>
+    <property name="artifact" value="selenium-grid-agent"/>
+    <property name="version" value="SNAPSHOT"/>
+    <property name="selenium.version" value="Set Me"/>
 
-  
-  <import file="${rootdir}/lib/build/common-build.xml" />
 
-  <path id="compile.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="servlet-api-2.5-20081211.jar"/>
-      <include name="commons-logging-1.1.1.jar"/>
+    <import file="${rootdir}/lib/build/common-build.xml"/>
 
-        <include name="cobertura-1.9.jar"/>
-        <include name="log4j-1.2.9.jar"/>
-        <include name="asm-2.2.1.jar"/>
-        <include name="asm-tree-2.2.1.jar"/>
-        <include name="jakarta-oro-2.0.8.jar"/>
-      
-    </fileset>
-    <pathelement location="${rootdir}/infrastructure/core/target/classes"/>
-    <pathelement location="${rootdir}/infrastructure/webserver/target/classes"/>    
-    <pathelement path="${java.class.path}/"/>
-  </path>
+    <path id="compile.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="servlet-api-2.5-20081211.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
 
-  <path id="runtime.classpath">
-      <fileset dir="${rootdir}/vendor">
-        <include name="jetty-6.1.24.jar"/>
-        <include name="jetty-util-6.1.24.jar"/>
-        <include name="servlet-api-2.5-20081211.jar"/>
-        <include name="commons-httpclient-3.1.jar"/>
-        <include name="commons-codec-1.4.jar"/>
-        <include name="commons-logging-1.1.1.jar"/>
-      </fileset>
-      <pathelement location="${rootdir}/infrastructure/core/target/classes"/>
-      <pathelement location="${rootdir}/infrastructure/webserver/target/classes"/>
-      <pathelement location="${build.output}"/>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-  
-  <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
-    <package-standalone-jar main-class="com.thoughtworks.selenium.grid.agent.AgentServer">
-      <dependencies>
-        <zipfileset src="${rootdir}/infrastructure/core/target/dist/lib/selenium-grid-core-${version}.jar"/>
-        <zipfileset src="${rootdir}/infrastructure/webserver/target/dist/lib/selenium-grid-webserver-${version}.jar"/>
-        <zipfileset src="${rootdir}/vendor/jetty-6.1.24.jar"/>
-        <zipfileset src="${rootdir}/vendor/jetty-util-6.1.24.jar"/>
-        <zipfileset src="${rootdir}/vendor/servlet-api-2.5-20081211.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-httpclient-3.1.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-codec-1.4.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
-      </dependencies>
-    </package-standalone-jar>
-  </target>
+            <include name="cobertura-1.9.4.1.jar"/>
+            <include name="log4j-1.2.9.jar"/>
+            <include name="asm-2.2.1.jar"/>
+            <include name="asm-tree-2.2.1.jar"/>
+            <include name="jakarta-oro-2.0.8.jar"/>
 
-  <target name="run" description="Launch a remote control">
-    <java classpathref="runtime.classpath"
-          classname="com.thoughtworks.selenium.grid.agent.AgentServer"
-          fork="true"
-          failonerror="true">
-    </java>
-  </target>
+        </fileset>
+        <pathelement location="${rootdir}/infrastructure/core/target/classes"/>
+        <pathelement location="${rootdir}/infrastructure/webserver/target/classes"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <path id="runtime.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="jetty-6.1.24.jar"/>
+            <include name="jetty-util-6.1.24.jar"/>
+            <include name="servlet-api-2.5-20081211.jar"/>
+            <include name="commons-httpclient-3.1.jar"/>
+            <include name="commons-codec-1.4.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
+        </fileset>
+        <pathelement location="${rootdir}/infrastructure/core/target/classes"/>
+        <pathelement location="${rootdir}/infrastructure/webserver/target/classes"/>
+        <pathelement location="${build.output}"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
+        <package-standalone-jar main-class="com.thoughtworks.selenium.grid.agent.AgentServer">
+            <dependencies>
+                <zipfileset src="${rootdir}/infrastructure/core/target/dist/lib/selenium-grid-core-${version}.jar"/>
+                <zipfileset
+                        src="${rootdir}/infrastructure/webserver/target/dist/lib/selenium-grid-webserver-${version}.jar"/>
+                <zipfileset src="${rootdir}/vendor/jetty-6.1.24.jar"/>
+                <zipfileset src="${rootdir}/vendor/jetty-util-6.1.24.jar"/>
+                <zipfileset src="${rootdir}/vendor/servlet-api-2.5-20081211.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-httpclient-3.1.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-codec-1.4.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
+            </dependencies>
+        </package-standalone-jar>
+    </target>
+
+    <target name="run" description="Launch a remote control">
+        <java classpathref="runtime.classpath"
+              classname="com.thoughtworks.selenium.grid.agent.AgentServer"
+              fork="true"
+              failonerror="true">
+        </java>
+    </target>
 
 </project>
diff --git a/agent/src/test/functional/java/com/thoughtworks/selenium/grid/agent/JMVMLauncherTest.java b/agent/src/test/functional/java/com/thoughtworks/selenium/grid/agent/JMVMLauncherTest.java
index 7a30d26d..a9e9915b 100644
--- a/agent/src/test/functional/java/com/thoughtworks/selenium/grid/agent/JMVMLauncherTest.java
+++ b/agent/src/test/functional/java/com/thoughtworks/selenium/grid/agent/JMVMLauncherTest.java
@@ -1,11 +1,12 @@
 package com.thoughtworks.selenium.grid.agent;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import java.io.IOException;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class JMVMLauncherTest {
     public static final int SECOND = 1000;
 
@@ -16,7 +17,7 @@ public void canLaunchAnAgentAndStopIt() throws IOException, InterruptedException
         final JVMHandle handle;
 
         classpath = new Classpath();
-        classpath.add("/Users/ph7/Projects/Selenium Grid/agent/target/dist/lib/selenium-grid-agent-standalone-1.0.2.jar");
+        classpath.add("d:\\SeleniumGrid_Sponte\\selenium-grid\\agent\\target\\dist\\lib\\selenium-grid-agent-standalone-1.0.2.jar");
         launcher = new JVMLauncher(classpath, "com.thoughtworks.selenium.grid.agent.AgentServer");
         handle = launcher.launchNewJVM();
         assertTrue(handle.alive());
@@ -26,21 +27,23 @@ public void canLaunchAnAgentAndStopIt() throws IOException, InterruptedException
         assertFalse(handle.alive());
     }
 
-    
+
     @Test
-    public void canCaptureProcessOutut() throws IOException { 
+    public void canCaptureProcessOutut() throws IOException, InterruptedException {
         final Classpath classpath;
         final JVMLauncher launcher;
         final JVMHandle handle;
 
         classpath = new Classpath();
-        classpath.add("/Users/ph7/Projects/Selenium Grid/vendor/selenium-server-1.0-SNAPSHOT.jar");
-        classpath.add("/Users/ph7/Projects/Selenium Grid/remote-control/target/dist/lib/selenium-grid-remote-control-standalone-1.0.2.jar");
+        classpath.add(String.format("/Users/swozniak/Documents/git-projects/selenium-grid/vendor/selenium-server-standalone-%s.jar", "2.0b1"));
+        classpath.add(String.format("/Users/swozniak/Documents/git-projects/selenium-grid/remote-control/target/dist/lib/selenium-grid-remote-control-standalone-%s.jar", "1.1.0.2-SPONTE-SNAPSHOT"));
+
         launcher = new JVMLauncher(classpath, "com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher");
         handle = launcher.launchNewJVM();
         assertTrue(handle.alive());
+        Thread.sleep(1 * SECOND);
         handle.waitForProg(System.out);
     }
 
-    
+
 }
diff --git a/build.xml b/build.xml
index 9556b257..169838b9 100755
--- a/build.xml
+++ b/build.xml
@@ -1,179 +1,187 @@
 <project name="Selenium Grid Distribution" basedir=".">
 
-  <description>Selenium Grid Distribution</description>
-  <property file="${basedir}/project.properties"/>
-  <property name="artifact" value="selenium-grid"/>
-  <property name="version" value="SNAPSHOT"/>
-
-  <property file="${basedir}/project.properties"/>
-
-  <import file="${basedir}/lib/build/common-build.xml" />
-  
-  <target name="sanity-check" description="Check that building tools are been installed and configured properly">
-    <property environment="env"/>
-
-    <echo>${ant.version}</echo>
-    <condition property="ant-7">
-      <antversion atleast="1.7.0"/>
-    </condition>
-    <fail message="You need Ant 1.7 or newer" unless="ant-7"/>
-
-    <echo>Java ${ant.java.version}</echo>
-    <condition property="java-5">
-      <not><matches pattern="^1\.[0-4]" string="${ant.java.version}"/></not>
-    </condition>
-    <fail message="Your must use Java 1.5 or newer. You are currrenltly using '${ant.java.version}'." unless="java-5"/>
-
-    <echo/>
-    <echo>******************************************************</echo>
-    <echo>Congratulations, your setup looks good. Happy hacking!</echo>
-    <echo>******************************************************</echo>
-    <echo/>
-    <echo>You can build the whole project by running 'ant dist'</echo>
-
-  </target>
-
-  <target name="ci:core" depends="clean, dist" description="Continuous Integration : Build and Unit Tests"/>
-  <target name="ci:metrics" depends="clean, metrics" description="Continuous Integration : Build and Unit Tests"/>
-  <target name="ci:demo" depends="clean, dist-bin, automated-demo" description="Continuous Integration : Demo"/>
-  <target name="ci:functionals" depends="clean, dist-bin, automated-ruby-example" description="Continuous Integration : Functional Tests"/>
-
-  <target name="clean" description="clean all generated artifacts">
-    <build-subprojects target="clean"/>
-    <delete dir="${dist}"/>
-    <delete dir="target"/>
-  </target>
-
-  <target name="build" description="Package subprojects">
-    <build-subprojects target="build"/>
-  </target>
-
-  <target name="dist" depends="dist-bin" description="Build binary and source distributions"/>
-
-  <target name="build-bin-dist" description="Package subprojects">
-
-    <build-subprojects target="dist"/>
-
-    <mkdir dir="${dist}/${artifact}-${version}"/>
-    <copy todir="${dist}/${artifact}-${version}/vendor" overwrite="true">
-      <fileset file="${basedir}/vendor/testng-5.7-jdk15.jar"/>
-      <fileset file="${basedir}/vendor/selenium-java-client-driver-${selenium.version}.jar"/>
-      <fileset file="${basedir}/vendor/selenium-server-${selenium.version}-standalone.jar"/>
-      <fileset file="${basedir}/vendor/commons-logging-1.1.1.jar"/>
-    </copy>
-    <copy todir="${dist}/${artifact}-${version}/lib" overwrite="true">
-      <fileset dir="${basedir}/hub/target/dist/lib"/>
-      <fileset dir="${basedir}/remote-control/target/dist/lib"/>
-      <fileset dir="${basedir}/tools/target/dist/lib"/>
-      <fileset dir="${basedir}/lib" includes="ruby/**/*.rb"/>
-      <fileset dir="${basedir}/lib" includes="build/common-build.xml"/>
-      <fileset dir="${basedir}/demo/target/dist/lib"/>
-      <fileset file="${basedir}/lib/testng.policy"/>
-    </copy>
-    <copy todir="${dist}/${artifact}-${version}" overwrite="true">
-      <fileset dir="${basedir}">
-        <include name="project.properties"/>
-        <include name="examples/**/*"/>
-        <exclude name="**/tmp/*"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${dist}/${artifact}-${version}/sample-scripts"/>
-    <copy todir="${dist}/${artifact}-${version}/sample-scripts" overwrite="true">
-      <fileset dir="${basedir}/src/scripts">
-        <include name="*.sh"/>
-        <include name="*.rb"/>
-        <include name="*.osascript"/>
-      </fileset>
-    </copy>
-    <copy todir="${dist}/${artifact}-${version}" overwrite="true">
-      <fileset dir="${basedir}/src/scripts" includes="build.xml"/>
-      <fileset dir="${basedir}/src/scripts" includes="Rakefile"/>
-      <fileset dir="${basedir}/src/scripts" includes="Capfile"/>
-      <fileset dir="${basedir}/src/configuration" includes="*.yml"/>
-      <fileset dir="${basedir}">
-        <include name="doc/**/*"/>
-        <exclude name="doc/**/iMac.jpeg"/>
-        <exclude name="doc/**/macbookpro.jpg"/>
-        <exclude name="doc/**/DELL Server.jpg"/>
-        <exclude name="doc/**/applelogo.png"/>
-        <include name="README"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${dist}/${artifact}-${version}/log"/>
-  </target>
-
-  <target name="dist-bin" depends="build-bin-dist" description="Package binary distribution">
-    <zip destfile="${dist}/selenium-grid-${version}-bin.zip">
-      <fileset dir="${dist}" includes="${artifact}-${version}/**/*"/>
-    </zip>
-  </target>
-
-  <target name="pmd-analysis" description="Uses PMD to perform static analysis of the code">
-    <build-subprojects target="pmd-analysis"/>
-  </target>
-
-  <target name="coverage-analysis" description="Uses Cobertura to perform code coverage analysis">
-    <build-subprojects target="coverage-analysis"/>
-  </target>
-
-  <target name="metrics" depends="coverage-analysis, pmd-analysis, aggregate-reports"/>
-  
-  <macrodef name="copyreports">
-    <attribute name="project" />
-    <sequential>
-      <mkdir dir="${metrics.reports}/@{project}"/>
-      <copy todir="${metrics.reports}/@{project}" overwrite="true">
-        <fileset dir="${basedir}/@{project}/target/metrics" includes="**/*"/>
-      </copy>
-    </sequential>
-  </macrodef>
-
-  <target name="aggregate-reports" description="Aggregates subproject reports">
-    <copyreports project="infrastructure/core"/>
-    <copyreports project="infrastructure/webserver"/>
-    <copyreports project="hub"/>
-    <copyreports project="remote-control"/>
-    <copyreports project="agent"/>
-    <copyreports project="tools"/>
-    <copy todir="${metrics.reports}" overwrite="true">
-      <fileset dir="src/reports" includes="**/*"/>
-    </copy>
-  </target>
-
-  <target name="acceptance-tests" description="Test a new distribution" 
-          depends="automated-demo, automated-java-example, automated-ruby-example">
-  </target>
-
-  <target name="automated-demo" description="Fully Automated Demo (for continuous integration)">
-      <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
-          <arg value="--trace"/>
-          <arg value="ci:demo"/>
-      </exec>
-  </target>
-
-  <target name="automated-java-example">
-    <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
-      <arg value="all:restart"/>
-    </exec>
-    <waitfor maxwait="10" maxwaitunit="second">
-      <socket server="localhost" port="4444"/>
-    </waitfor>
-    <exec executable="ant" dir="${dist}/selenium-grid-${version}/examples/java-testng" failonerror="true">
-      <arg value="run"/>
-    </exec>
-    <exec executable="ant" dir="${dist}/selenium-grid-${version}/examples/java-testng" failonerror="true">
-      <arg value="run-in-sequence"/>
-    </exec>
-    <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
-        <arg value="all:stop"/>
-    </exec>
-  </target>
+    <description>Selenium Grid Distribution</description>
+    <property file="${basedir}/project.properties"/>
+    <property name="artifact" value="selenium-grid"/>
+    <property name="version" value="SNAPSHOT"/>
+
+    <property file="${basedir}/project.properties"/>
+
+    <import file="${basedir}/lib/build/common-build.xml"/>
+
+    <target name="sanity-check" description="Check that building tools are been installed and configured properly">
+        <property environment="env"/>
+
+        <echo>${ant.version}</echo>
+        <condition property="ant-7">
+            <antversion atleast="1.7.0"/>
+        </condition>
+        <fail message="You need Ant 1.7 or newer" unless="ant-7"/>
+
+        <echo>Java ${ant.java.version}</echo>
+        <condition property="java-5">
+            <not>
+                <matches pattern="^1\.[0-4]" string="${ant.java.version}"/>
+            </not>
+        </condition>
+        <fail message="Your must use Java 1.5 or newer. You are currrenltly using '${ant.java.version}'."
+              unless="java-5"/>
+
+        <echo/>
+        <echo>******************************************************</echo>
+        <echo>Congratulations, your setup looks good. Happy hacking!</echo>
+        <echo>******************************************************</echo>
+        <echo/>
+        <echo>You can build the whole project by running 'ant dist'</echo>
+
+    </target>
+
+    <target name="ci:core" depends="clean, dist" description="Continuous Integration : Build and Unit Tests"/>
+    <target name="ci:metrics" depends="clean, metrics" description="Continuous Integration : Build and Unit Tests"/>
+    <target name="ci:demo" depends="clean, dist-bin, automated-demo" description="Continuous Integration : Demo"/>
+    <target name="ci:functionals" depends="clean, dist-bin, automated-ruby-example"
+            description="Continuous Integration : Functional Tests"/>
+
+    <target name="clean" description="clean all generated artifacts">
+        <build-subprojects target="clean"/>
+        <delete dir="${dist}"/>
+        <delete dir="target"/>
+    </target>
+
+    <target name="build" description="Package subprojects">
+        <build-subprojects target="build"/>
+    </target>
+
+    <target name="dist" depends="dist-bin" description="Build binary and source distributions"/>
+
+    <target name="build-bin-dist" description="Package subprojects">
+
+        <build-subprojects target="dist"/>
+
+        <mkdir dir="${dist}/${artifact}-${version}"/>
+        <copy todir="${dist}/${artifact}-${version}/vendor" overwrite="true">
+            <fileset file="${basedir}/vendor/testng-5.7-jdk15.jar"/>
+            <fileset file="${basedir}/vendor/selenium-java-${selenium.version}.jar"/>
+            <fileset file="${basedir}/vendor/selenium-server-standalone-${selenium.version}.jar"/>
+            <fileset file="${basedir}/vendor/commons-logging-1.1.1.jar"/>
+        </copy>
+        <copy todir="${dist}/${artifact}-${version}/lib" overwrite="true">
+            <fileset dir="${basedir}/hub/target/dist/lib"/>
+            <fileset dir="${basedir}/remote-control/target/dist/lib"/>
+            <fileset dir="${basedir}/tools/target/dist/lib"/>
+            <fileset dir="${basedir}/lib" includes="ruby/**/*.rb"/>
+            <fileset dir="${basedir}/lib" includes="build/common-build.xml"/>
+            <fileset dir="${basedir}/demo/target/dist/lib"/>
+            <fileset file="${basedir}/lib/testng.policy"/>
+        </copy>
+        <copy todir="${dist}/${artifact}-${version}" overwrite="true">
+            <fileset dir="${basedir}">
+                <include name="project.properties"/>
+                <include name="examples/**/*"/>
+                <exclude name="**/tmp/*"/>
+            </fileset>
+        </copy>
+        <mkdir dir="${dist}/${artifact}-${version}/sample-scripts"/>
+        <copy todir="${dist}/${artifact}-${version}/sample-scripts" overwrite="true">
+            <fileset dir="${basedir}/src/scripts">
+                <include name="*.sh"/>
+                <include name="*.rb"/>
+                <include name="*.osascript"/>
+            </fileset>
+        </copy>
+        <copy todir="${dist}/${artifact}-${version}" overwrite="true">
+            <fileset dir="${basedir}/src/scripts" includes="build.xml"/>
+            <fileset dir="${basedir}/src/scripts" includes="Rakefile"/>
+            <fileset dir="${basedir}/src/scripts" includes="Capfile"/>
+            <fileset dir="${basedir}/src/configuration" includes="*.yml"/>
+            <fileset dir="${basedir}">
+                <include name="doc/**/*"/>
+                <exclude name="doc/**/iMac.jpeg"/>
+                <exclude name="doc/**/macbookpro.jpg"/>
+                <exclude name="doc/**/DELL Server.jpg"/>
+                <exclude name="doc/**/applelogo.png"/>
+                <include name="README"/>
+            </fileset>
+        </copy>
+        <mkdir dir="${dist}/${artifact}-${version}/log"/>
+        <mkdir dir="${dist}/${artifact}-${version}/pid"/>
+        <propertyfile file="${dist}/${artifact}-${version}/project.properties">
+            <entry key="version" type="string" operation="=" value="${version}"/>
+        </propertyfile>
+    </target>
+
+    <target name="dist-bin" depends="build-bin-dist" description="Package binary distribution">
+        <zip destfile="${dist}/selenium-grid-${version}-bin.zip">
+            <fileset dir="${dist}" includes="${artifact}-${version}/**/*"/>
+        </zip>
+    </target>
+
+    <target name="pmd-analysis" description="Uses PMD to perform static analysis of the code">
+        <build-subprojects target="pmd-analysis"/>
+    </target>
+
+    <target name="coverage-analysis" description="Uses Cobertura to perform code coverage analysis">
+        <build-subprojects target="coverage-analysis"/>
+    </target>
+
+    <target name="metrics" depends="coverage-analysis, pmd-analysis, aggregate-reports"/>
+
+    <macrodef name="copyreports">
+        <attribute name="project"/>
+        <sequential>
+            <mkdir dir="${metrics.reports}/@{project}"/>
+            <copy todir="${metrics.reports}/@{project}" overwrite="true">
+                <fileset dir="${basedir}/@{project}/target/metrics" includes="**/*"/>
+            </copy>
+        </sequential>
+    </macrodef>
+
+    <target name="aggregate-reports" description="Aggregates subproject reports">
+        <copyreports project="infrastructure/core"/>
+        <copyreports project="infrastructure/webserver"/>
+        <copyreports project="hub"/>
+        <copyreports project="remote-control"/>
+        <copyreports project="agent"/>
+        <copyreports project="tools"/>
+        <copy todir="${metrics.reports}" overwrite="true">
+            <fileset dir="src/reports" includes="**/*"/>
+        </copy>
+    </target>
+
+    <target name="acceptance-tests" description="Test a new distribution"
+            depends="automated-demo, automated-java-example, automated-ruby-example">
+    </target>
+
+    <target name="automated-demo" description="Fully Automated Demo (for continuous integration)">
+        <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
+            <arg value="--trace"/>
+            <arg value="ci:demo"/>
+        </exec>
+    </target>
+
+    <target name="automated-java-example">
+        <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
+            <arg value="all:restart"/>
+        </exec>
+        <waitfor maxwait="10" maxwaitunit="second">
+            <socket server="localhost" port="4444"/>
+        </waitfor>
+        <exec executable="ant" dir="${dist}/selenium-grid-${version}/examples/java-testng" failonerror="true">
+            <arg value="run"/>
+        </exec>
+        <exec executable="ant" dir="${dist}/selenium-grid-${version}/examples/java-testng" failonerror="true">
+            <arg value="run-in-sequence"/>
+        </exec>
+        <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
+            <arg value="all:stop"/>
+        </exec>
+    </target>
 
     <target name="automated-ruby-example" description="Fully Automated Ruby Example (for continuous integration)">
-      <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
-          <arg value="--trace"/>
-          <arg value="ci:ruby-example"/>
-      </exec>
+        <exec executable="${rake}" dir="${dist}/selenium-grid-${version}" failonerror="true">
+            <arg value="--trace"/>
+            <arg value="ci:ruby-example"/>
+        </exec>
     </target>
 
 </project>
diff --git a/demo/build.xml b/demo/build.xml
index 90a71ef9..3d833cba 100755
--- a/demo/build.xml
+++ b/demo/build.xml
@@ -1,131 +1,131 @@
 <project name="Selenium Grid Demo" default="package-standalone" basedir=".">
 
-  <description>Selenium Grid Demo</description>
-
-  <property name="rootdir" value="${basedir}/.."/>
-  <property file="${rootdir}/project.properties"/>
-  <property name="name" value="Selenium Grid Demo"/>
-  <property name="artifact" value="selenium-grid-demo"/>
-  <property name="version" value="SNAPSHOT"/>
-  <property name="selenium.version" value="SET ME"/>
-
-  <import file="${rootdir}/lib/build/common-build.xml" />
-
-  <property name="webSite" value="http://images.google.com" />
-  <property name="seleniumHost" value="localhost" />
-  <property name="seleniumPort" value="4444" />
-  <property name="browser" value="*firefox" />
-  
-  <path id="demo.classpath">
-    <pathelement location="${rootdir}/vendor/selenium-java-client-driver-${selenium.version}.jar"/>
-    <pathelement location="${rootdir}/vendor/testng-5.7-jdk15.jar"/>
-    <pathelement location="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
-    <pathelement location="${basedir}/../tools/target/classes"/>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-
-  <path id="compile.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="selenium-java-client-driver-${selenium.version}.jar"/>
-      <include name="testng-5.7-jdk15.jar"/>
-      <include name="commons-logging-1.1.1.jar"/>
-    </fileset>
-    <pathelement location="${rootdir}/tools/target/classes"/>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-
-  <path id="demo.runtime.classpath">
-    <path refid="demo.classpath"/>
-    <pathelement location="${rootdir}/vendor/testng-5.7-jdk15.jar"/>
-    <pathelement location="${build.output}" />
-  </path>
-
-  <target name="test" depends="compile"/>
-
-  <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
-    <package-standalone-jar main-class="">
-      <dependencies>
-        <zipfileset src="${basedir}/../tools/target/dist/lib/selenium-grid-tools-${version}.jar"/>
-        <zipfileset src="${rootdir}/vendor/selenium-java-client-driver-${selenium.version}.jar"/>
-        <zipfileset src="${rootdir}/vendor/testng-5.7-jdk15.jar"/>
-      </dependencies>
-    </package-standalone-jar>
-  </target>
-  
-  <target name="run-demo-in-sequence"
-          description="Run Selenium tests one by one">
-    <java classpathref="demo.runtime.classpath"
-        classname="org.testng.TestNG"
-        failonerror="true"
-        >
-      <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
-      <sysproperty key="webSite" value="${webSite}" />
-      <sysproperty key="seleniumHost" value="${seleniumHost}" />
-      <sysproperty key="seleniumPort" value="${seleniumPort}" />
-      <sysproperty key="browser" value="${browser}" />
-      <arg value="-suitename" />
-      <arg value="Selenium Grid Demo In Sequence" />
-      <arg value="-d" />
-      <arg value="${basedir}/target/reports" />
-      <arg value="-testclass"/>
-      <arg value="com.thoughtworks.selenium.grid.demo.WebTestForASingleBrowser"/>
-    </java>
-  </target>
-
-  <target name="run-demo-in-parallel"
-          description="Run Selenium tests in parallel">
-    <java classpathref="demo.runtime.classpath"
-        classname="org.testng.TestNG"
-        failonerror="true">
-
-      <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
-      <sysproperty key="webSite" value="${webSite}" />
-      <sysproperty key="seleniumHost" value="${seleniumHost}" />
-      <sysproperty key="seleniumPort" value="${seleniumPort}" />
-      <sysproperty key="browser" value="${browser}" />
-      <arg value="-d" />
-      <arg value="${basedir}/target/reports" />
-      <arg value="-suitename" />
-      <arg value="Selenium Grid Demo In Parallel" />
-      <arg value="-parallel"/>
-      <arg value="methods"/>
-      <arg value="-threadcount"/>
-      <arg value="10"/>
-      <arg value="-testclass"/>
-      <arg value="com.thoughtworks.selenium.grid.demo.WebTestForASingleBrowser"/>
-    </java>
-  </target>
-
-  <target name="run-demo-for-multiple-environments"
-          description="Run Selenium tests in parallel for multiple environments">
-    <java classpathref="demo.runtime.classpath"
-        classname="org.testng.TestNG"
-        failonerror="true"
-
-        >
-      <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
-      <sysproperty key="webSite" value="${webSite}" />
-      <sysproperty key="seleniumHost" value="${seleniumHost}" />
-      <sysproperty key="seleniumPort" value="${seleniumPort}" />
-      <sysproperty key="firstEnvironment" value="Firefox on Windows" />
-      <sysproperty key="secondEnvironment" value="Firefox on Windows" />
-      <sysproperty key="thirdEnvironment" value="Firefox on OS X" />
-
-      <arg value="-d" />
-      <arg value="${basedir}/target/reports" />
-      <arg value="-suitename" />
-      <arg value="Selenium Grid Demo In Parallel For Multiple Environments" />
-      <arg value="-parallel"/>
-      <arg value="methods"/>
-      <arg value="-threadcount"/>
-      <arg value="10"/>
-      <arg value="-testclass"/>
-      <arg value="com.thoughtworks.selenium.grid.demo.WebTestInvolvingMultiEnvironments"/>
-    </java>
-  </target>
-    
-
-  <target name="build" depends="compile"/>
-  <target name="coverage-analysis" />
+    <description>Selenium Grid Demo</description>
+
+    <property name="rootdir" value="${basedir}/.."/>
+    <property file="${rootdir}/project.properties"/>
+    <property name="name" value="Selenium Grid Demo"/>
+    <property name="artifact" value="selenium-grid-demo"/>
+    <property name="version" value="SNAPSHOT"/>
+    <property name="selenium.version" value="SET ME"/>
+
+    <import file="${rootdir}/lib/build/common-build.xml"/>
+
+    <property name="webSite" value="http://images.google.com"/>
+    <property name="seleniumHost" value="localhost"/>
+    <property name="seleniumPort" value="4444"/>
+    <property name="browser" value="*firefox"/>
+
+    <path id="demo.classpath">
+        <pathelement location="${rootdir}/vendor/selenium-java-${selenium.version}.jar"/>
+        <pathelement location="${rootdir}/vendor/testng-5.7-jdk15.jar"/>
+        <pathelement location="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
+        <pathelement location="${basedir}/../tools/target/classes"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <path id="compile.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="selenium-java-${selenium.version}.jar"/>
+            <include name="testng-5.7-jdk15.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
+        </fileset>
+        <pathelement location="${rootdir}/tools/target/classes"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <path id="demo.runtime.classpath">
+        <path refid="demo.classpath"/>
+        <pathelement location="${rootdir}/vendor/testng-5.7-jdk15.jar"/>
+        <pathelement location="${build.output}"/>
+    </path>
+
+    <target name="test" depends="compile"/>
+
+    <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
+        <package-standalone-jar main-class="">
+            <dependencies>
+                <zipfileset src="${basedir}/../tools/target/dist/lib/selenium-grid-tools-${version}.jar"/>
+                <zipfileset src="${rootdir}/vendor/selenium-java-${selenium.version}.jar"/>
+                <zipfileset src="${rootdir}/vendor/testng-5.7-jdk15.jar"/>
+            </dependencies>
+        </package-standalone-jar>
+    </target>
+
+    <target name="run-demo-in-sequence"
+            description="Run Selenium tests one by one">
+        <java classpathref="demo.runtime.classpath"
+              classname="org.testng.TestNG"
+              failonerror="true"
+                >
+            <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
+            <sysproperty key="webSite" value="${webSite}"/>
+            <sysproperty key="seleniumHost" value="${seleniumHost}"/>
+            <sysproperty key="seleniumPort" value="${seleniumPort}"/>
+            <sysproperty key="browser" value="${browser}"/>
+            <arg value="-suitename"/>
+            <arg value="Selenium Grid Demo In Sequence"/>
+            <arg value="-d"/>
+            <arg value="${basedir}/target/reports"/>
+            <arg value="-testclass"/>
+            <arg value="com.thoughtworks.selenium.grid.demo.WebTestForASingleBrowser"/>
+        </java>
+    </target>
+
+    <target name="run-demo-in-parallel"
+            description="Run Selenium tests in parallel">
+        <java classpathref="demo.runtime.classpath"
+              classname="org.testng.TestNG"
+              failonerror="true">
+
+            <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
+            <sysproperty key="webSite" value="${webSite}"/>
+            <sysproperty key="seleniumHost" value="${seleniumHost}"/>
+            <sysproperty key="seleniumPort" value="${seleniumPort}"/>
+            <sysproperty key="browser" value="${browser}"/>
+            <arg value="-d"/>
+            <arg value="${basedir}/target/reports"/>
+            <arg value="-suitename"/>
+            <arg value="Selenium Grid Demo In Parallel"/>
+            <arg value="-parallel"/>
+            <arg value="methods"/>
+            <arg value="-threadcount"/>
+            <arg value="10"/>
+            <arg value="-testclass"/>
+            <arg value="com.thoughtworks.selenium.grid.demo.WebTestForASingleBrowser"/>
+        </java>
+    </target>
+
+    <target name="run-demo-for-multiple-environments"
+            description="Run Selenium tests in parallel for multiple environments">
+        <java classpathref="demo.runtime.classpath"
+              classname="org.testng.TestNG"
+              failonerror="true"
+
+                >
+            <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
+            <sysproperty key="webSite" value="${webSite}"/>
+            <sysproperty key="seleniumHost" value="${seleniumHost}"/>
+            <sysproperty key="seleniumPort" value="${seleniumPort}"/>
+            <sysproperty key="firstEnvironment" value="Firefox on Windows"/>
+            <sysproperty key="secondEnvironment" value="Firefox on Windows"/>
+            <sysproperty key="thirdEnvironment" value="Firefox on OS X"/>
+
+            <arg value="-d"/>
+            <arg value="${basedir}/target/reports"/>
+            <arg value="-suitename"/>
+            <arg value="Selenium Grid Demo In Parallel For Multiple Environments"/>
+            <arg value="-parallel"/>
+            <arg value="methods"/>
+            <arg value="-threadcount"/>
+            <arg value="10"/>
+            <arg value="-testclass"/>
+            <arg value="com.thoughtworks.selenium.grid.demo.WebTestInvolvingMultiEnvironments"/>
+        </java>
+    </target>
+
+
+    <target name="build" depends="compile"/>
+    <target name="coverage-analysis"/>
 
 </project>
diff --git a/demo/src/main/java/com/thoughtworks/selenium/grid/demo/GoogleImageTestBase.java b/demo/src/main/java/com/thoughtworks/selenium/grid/demo/GoogleImageTestBase.java
index fc62dc02..fa29b5c7 100644
--- a/demo/src/main/java/com/thoughtworks/selenium/grid/demo/GoogleImageTestBase.java
+++ b/demo/src/main/java/com/thoughtworks/selenium/grid/demo/GoogleImageTestBase.java
@@ -10,7 +10,7 @@ public abstract class GoogleImageTestBase {
 
     public static final String TIMEOUT = "120000";
 
-    
+
     protected void runFlickrScenario(String searchString) {
         session().setTimeout(TIMEOUT);
         session().open("/");
@@ -18,11 +18,8 @@ protected void runFlickrScenario(String searchString) {
         session().type("q", searchString);
         session().click("btnG");
         session().waitForPageToLoad(TIMEOUT);
-        session().click("rptgl");
-        session().click("imgsz_l");
-        session().click("imgtype_photo");
-        session().click("btnG");
-        session().waitForPageToLoad(TIMEOUT);
+        session().click("isz_l");
+        session().click("itp_photo");
     }
 
 }
diff --git a/examples/java-testng/build.xml b/examples/java-testng/build.xml
index 977cb414..345eeba7 100755
--- a/examples/java-testng/build.xml
+++ b/examples/java-testng/build.xml
@@ -1,90 +1,90 @@
 <project name="Selenium Grid Java Example" default="run" basedir=".">
 
-  <description>Selenium Grid Java Example</description>
+    <description>Selenium Grid Java Example</description>
 
-  <property name="rootdir" value="${basedir}/../.."/>
-  <property file="${rootdir}/project.properties"/>
-  <property name="name" value="Selenium Grid Demo"/>
-  <property name="artifact" value="selenium-grid-demo"/>
-  <property name="version" value="SNAPSHOT"/>
-  <property name="selenium.version" value="SET ME"/>
+    <property name="rootdir" value="${basedir}/../.."/>
+    <property file="${rootdir}/project.properties"/>
+    <property name="name" value="Selenium Grid Demo"/>
+    <property name="artifact" value="selenium-grid-demo"/>
+    <property name="version" value="SNAPSHOT"/>
+    <property name="selenium.version" value="SET ME"/>
 
-  <property name="build.src" location="src"/>
+    <property name="build.src" location="src"/>
 
-  <import file="${rootdir}/lib/build/common-build.xml" />
+    <import file="${rootdir}/lib/build/common-build.xml"/>
 
-  <property name="webSite" value="http://images.google.com" />
-  <property name="seleniumHost" value="localhost" />
-  <property name="seleniumPort" value="4444" />
-  <property name="browser" value="*firefox" />
+    <property name="webSite" value="http://images.google.com"/>
+    <property name="seleniumHost" value="localhost"/>
+    <property name="seleniumPort" value="4444"/>
+    <property name="browser" value="*firefox"/>
 
-  <path id="compile.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="selenium-java-client-driver-${selenium.version}.jar"/>
-      <include name="testng-5.7-jdk15.jar"/>
-      <include name="commons-logging-1.1.1.jar"/>
-    </fileset>
-    <pathelement location="${rootdir}/tools/target/classes"/>
-    <pathelement location="${rootdir}/tools/target/dist/lib/selenium-grid-tools-standalone-${version}.jar"/>
-    <pathelement location="${rootdir}/lib/selenium-grid-tools-standalone-${version}.jar"/>
-    <pathelement path="${java.class.path}/"/>
-  </path>
+    <path id="compile.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="selenium-java-${selenium.version}.jar"/>
+            <include name="testng-5.7-jdk15.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
+        </fileset>
+        <pathelement location="${rootdir}/tools/target/classes"/>
+        <pathelement location="${rootdir}/tools/target/dist/lib/selenium-grid-tools-standalone-${version}.jar"/>
+        <pathelement location="${rootdir}/lib/selenium-grid-tools-standalone-${version}.jar"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
 
-  <path id="runtime.classpath">
-    <path refid="compile.classpath"/>
-    <pathelement path="${build.output}/"/>
-  </path>
+    <path id="runtime.classpath">
+        <path refid="compile.classpath"/>
+        <pathelement path="${build.output}/"/>
+    </path>
 
-  <target name="run" depends="compile" description="Run Selenium tests in parallel (20 threads)">
-    <echo>${seleniumHost}</echo>
-    <java classpathref="runtime.classpath"
-        classname="org.testng.TestNG"
-        failonerror="true">
+    <target name="run" depends="compile" description="Run Selenium tests in parallel (20 threads)">
+        <echo>${seleniumHost}</echo>
+        <java classpathref="runtime.classpath"
+              classname="org.testng.TestNG"
+              failonerror="true">
 
-      <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
-      <sysproperty key="webSite" value="${webSite}" />
-      <sysproperty key="seleniumHost" value="${seleniumHost}" />
-      <sysproperty key="seleniumPort" value="${seleniumPort}" />
-      <sysproperty key="browser" value="${browser}" />
-      <arg value="-d" />
-      <arg value="${basedir}/target/reports" />
-      <arg value="-suitename" />
-      <arg value="Selenium Grid Java Sample Test Suite" />
-      <arg value="-parallel"/>
-      <arg value="methods"/>
-      <arg value="-threadcount"/>
-      <arg value="15"/>
-      <arg value="testng.xml"/>
-    </java>
+            <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
+            <sysproperty key="webSite" value="${webSite}"/>
+            <sysproperty key="seleniumHost" value="${seleniumHost}"/>
+            <sysproperty key="seleniumPort" value="${seleniumPort}"/>
+            <sysproperty key="browser" value="${browser}"/>
+            <arg value="-d"/>
+            <arg value="${basedir}/target/reports"/>
+            <arg value="-suitename"/>
+            <arg value="Selenium Grid Java Sample Test Suite"/>
+            <arg value="-parallel"/>
+            <arg value="methods"/>
+            <arg value="-threadcount"/>
+            <arg value="15"/>
+            <arg value="testng.xml"/>
+        </java>
 
-  </target>
+    </target>
 
-  <target name="run-in-sequence" depends="compile" description="Run Selenium tests in sequence">
-    <echo>${seleniumHost}</echo>
-    <java classpathref="runtime.classpath"
-        classname="org.testng.TestNG"
-        failonerror="true">
+    <target name="run-in-sequence" depends="compile" description="Run Selenium tests in sequence">
+        <echo>${seleniumHost}</echo>
+        <java classpathref="runtime.classpath"
+              classname="org.testng.TestNG"
+              failonerror="true">
 
-      <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
-      <sysproperty key="webSite" value="${webSite}" />
-      <sysproperty key="seleniumHost" value="${seleniumHost}" />
-      <sysproperty key="seleniumPort" value="${seleniumPort}" />
-      <sysproperty key="browser" value="${browser}" />
-      <arg value="-d" />
-      <arg value="${basedir}/target/reports" />
-      <arg value="-suitename" />
-      <arg value="Selenium Grid Java Sample Test Suite" />
-      <arg value="-parallel"/>
-      <arg value="methods"/>
-      <arg value="-threadcount"/>
-      <arg value="20"/>
-      <arg value="testng-slow.xml"/>
-    </java>
+            <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
+            <sysproperty key="webSite" value="${webSite}"/>
+            <sysproperty key="seleniumHost" value="${seleniumHost}"/>
+            <sysproperty key="seleniumPort" value="${seleniumPort}"/>
+            <sysproperty key="browser" value="${browser}"/>
+            <arg value="-d"/>
+            <arg value="${basedir}/target/reports"/>
+            <arg value="-suitename"/>
+            <arg value="Selenium Grid Java Sample Test Suite"/>
+            <arg value="-parallel"/>
+            <arg value="methods"/>
+            <arg value="-threadcount"/>
+            <arg value="20"/>
+            <arg value="testng-slow.xml"/>
+        </java>
 
-  </target>
+    </target>
+
+    <target name="build" depends="compile"/>
+    <target name="dist" depends="build"/>
+    <target name="coverage-analysis"/>
 
-  <target name="build" depends="compile"/>
-  <target name="dist" depends="build"/>
-  <target name="coverage-analysis" />
-  
 </project>
diff --git a/examples/ruby/Rakefile b/examples/ruby/Rakefile
index 32b8fd93..c823f84e 100644
--- a/examples/ruby/Rakefile
+++ b/examples/ruby/Rakefile
@@ -12,7 +12,7 @@ gem "rspec", "=1.1.8"
 require 'rake'
 require 'spec/rake/spectask'
 
-gem "selenium-client", "=1.2.7"
+gem "selenium-client", "=1.2.18"
 require "selenium/rake/tasks"
 
 # Make sure we pick up the reporter from the appropriate selenium-client
diff --git a/hub/Hub.iml b/hub/Hub.iml
index 5201f548..1de57b89 100644
--- a/hub/Hub.iml
+++ b/hub/Hub.iml
@@ -18,6 +18,8 @@
     <orderEntry type="library" name="Hub Resources" level="project" />
     <orderEntry type="library" name="Commons" level="project" />
     <orderEntry type="module" module-name="Core" />
+    <orderEntry type="library" name="JSON" level="project" />
+    <orderEntry type="library" name="HttpClient" level="project" />
   </component>
   <component name="RSpecModuleSettingsStorage">
     <RSPEC_MODULE_SETTINGS_STORAGE_ID NAME="RSPEC_SUPPORT_TYPE" VALUE="NONE" />
diff --git a/hub/build.xml b/hub/build.xml
index c4e9e025..4d6f9081 100755
--- a/hub/build.xml
+++ b/hub/build.xml
@@ -1,52 +1,78 @@
 <project name="Selenium Grid Hub" default="package-standalone" basedir=".">
 
-  <description>Selenium Grid Hub</description>
-
-  <property name="rootdir" value="${basedir}/.."/>
-  <property file="${rootdir}/project.properties"/>
-  <property name="name" value="Selenium Grid Hub"/>
-  <property name="artifact" value="selenium-grid-hub"/>
-  <property name="version" value="SNAPSHOT"/>
-
-  <import file="${rootdir}/lib/build/common-build.xml" />
-  
-  <path id="compile.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="jetty-6.1.24.jar"/>
-      <include name="jetty-util-6.1.24.jar"/>
-      <include name="jyaml-1.3.jar"/>
-      <include name="commons-logging-1.1.1.jar"/>
-      <include name="commons-httpclient-3.1.jar"/>
-      <include name="commons-codec-1.4.jar"/>
-      <include name="servlet-api-2.5-20081211.jar"/>
-    </fileset>
-    <fileset dir="${basedir}/lib">
-      <include name="freemarker-2.3.16.jar"/>
-    </fileset>
-    <pathelement location="${rootdir}/infrastructure/core/target/classes"/>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-
-  <path id="junit.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="commons-httpclient-3.1.jar"/>
-    </fileset>
-  </path>
-
-  <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
-    <package-standalone-jar main-class="com.thoughtworks.selenium.grid.hub.HubServer">
-      <dependencies>
-        <zipfileset src="${rootdir}/infrastructure/core/target/dist/lib/selenium-grid-core-${version}.jar"/>
-        <zipfileset src="${basedir}/lib/freemarker-2.3.16.jar"/>
-        <zipfileset src="${rootdir}/vendor/jetty-6.1.24.jar"/>
-        <zipfileset src="${rootdir}/vendor/jetty-util-6.1.24.jar"/>
-        <zipfileset src="${rootdir}/vendor/servlet-api-2.5-20081211.jar"/>
-        <zipfileset src="${rootdir}/vendor/jyaml-1.3.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-httpclient-3.1.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-codec-1.4.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
-      </dependencies>
-    </package-standalone-jar>
-  </target>
+    <description>Selenium Grid Hub</description>
+
+    <property name="rootdir" value="${basedir}/.."/>
+    <property file="${rootdir}/project.properties"/>
+    <property name="name" value="Selenium Grid Hub"/>
+    <property name="artifact" value="selenium-grid-hub"/>
+    <property name="version" value="SNAPSHOT"/>
+
+    <import file="${rootdir}/lib/build/common-build.xml"/>
+
+    <path id="compile.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="jetty-6.1.24.jar"/>
+            <include name="jetty-util-6.1.24.jar"/>
+            <include name="jyaml-1.3.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
+            <include name="commons-httpclient-3.1.jar"/>
+            <include name="commons-codec-1.4.jar"/>
+            <include name="servlet-api-2.5-20081211.jar"/>
+            <include name="json.jar"/>
+        </fileset>
+        <fileset dir="${basedir}/lib">
+            <include name="freemarker-2.3.16.jar"/>
+        </fileset>
+        <pathelement location="${rootdir}/infrastructure/core/target/classes"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+
+    <path id="runtime.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="selenium-server-standalone-*.jar"/>
+        </fileset>
+        <!-- Selenium Server must be first in classpath -->
+        <fileset dir="${dist}/lib">
+            <include name="selenium-grid-hub-standalone-${version}.jar"/>
+        </fileset>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <path id="junit.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="commons-httpclient-3.1.jar"/>
+        </fileset>
+    </path>
+
+    <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
+        <package-standalone-jar main-class="com.thoughtworks.selenium.grid.hub.HubServer">
+            <dependencies>
+                <zipfileset src="${rootdir}/infrastructure/core/target/dist/lib/selenium-grid-core-${version}.jar"/>
+                <zipfileset src="${basedir}/lib/freemarker-2.3.16.jar"/>
+                <zipfileset src="${rootdir}/vendor/jetty-6.1.24.jar"/>
+                <zipfileset src="${rootdir}/vendor/jetty-util-6.1.24.jar"/>
+                <zipfileset src="${rootdir}/vendor/servlet-api-2.5-20081211.jar"/>
+                <zipfileset src="${rootdir}/vendor/jyaml-1.3.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-httpclient-3.1.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-codec-1.4.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
+                <zipfileset src="${rootdir}/vendor/json.jar"/>
+            </dependencies>
+        </package-standalone-jar>
+    </target>
+
+    <target name="run" description="Launch selenium hub">
+        <echo message="Running selenium hub"/>
+        <java classpathref="runtime.classpath"
+              classname="com.thoughtworks.selenium.grid.hub.HubServer"
+              fork="true"
+              failonerror="true">
+            <arg value="-port 5555"/>
+            <arg value="5555"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,address=5005,suspend=n"/>
+        </java>
+    </target>
 
 </project>
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HeartbeatServlet.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HeartbeatServlet.java
index f86fb00e..6ee10170 100644
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HeartbeatServlet.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HeartbeatServlet.java
@@ -3,12 +3,11 @@
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 import java.io.IOException;
-import java.text.ParseException;
 
 /**
  * Provides feedback that the Hub is still up and running
@@ -35,8 +34,8 @@ protected boolean registeredRemoteControl(String host, String port) {
         final RemoteControlProxy remoteControl;
 
         try {
-          remoteControl = new RemoteControlProxy(host, Integer.parseInt(port), "dummy", null);
-        } catch(NumberFormatException e) {
+            remoteControl = new RemoteControlProxy(host, Integer.parseInt(port), "dummy", null);
+        } catch (NumberFormatException e) {
             return false;
         }
         return remoteControlPool().isRegistered(remoteControl);
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java
index 8cb538e1..708cbceb 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java
@@ -1,9 +1,12 @@
 package com.thoughtworks.selenium.grid.hub;
 
 import com.thoughtworks.selenium.grid.HttpParameters;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.NewBrowserSessionCommand;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.SeleneseCommand;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.TestCompleteCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.IDriverCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium.NewBrowserSessionCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium.SeleneseCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium.TestCompleteCommand;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * Parse HTTP commands targeting a Remote Control
@@ -12,29 +15,35 @@ public class HttpCommandParser {
 
     public static final String NEW_BROWSER_SESSION = "getNewBrowserSession";
     private static final String TEST_COMPLETE = "testComplete";
+    private final HttpServletRequest request;
     private final HttpParameters parameters;
 
-    public HttpCommandParser(HttpParameters parameters) {
-        this.parameters = parameters;
+    public HttpCommandParser(HttpServletRequest request) {
+        this.request = request;
+        if (null != request) {
+            this.parameters = new HttpParameters(request.getParameterMap());
+        } else {
+            this.parameters = null;
+        }
     }
 
-    public SeleneseCommand parse(EnvironmentManager environmentManager) {
-        final String command = parameters.get("cmd");
+    public IDriverCommand parse(EnvironmentManager environmentManager) {
+        final String command = parameters().get("cmd");
         if (command.equals(NEW_BROWSER_SESSION)) {
             final Environment environment;
             final String environmentName;
 
-            environmentName = parameters.get("1");
+            environmentName = parameters().get("1");
             environment = environmentManager.environment(environmentName);
             if (null == environment) {
                 throw new CommandParsingException("ERROR: Unknown environment '" + environmentName + "'");
             }
             parameters.put("1", environment.browser());
-            return new NewBrowserSessionCommand(environment, parameters);
+            return new NewBrowserSessionCommand(environment, request);
         } else if (command.equals(TEST_COMPLETE)) {
-            return new TestCompleteCommand(retrieveSessionId(parameters), parameters);
+            return new TestCompleteCommand(retrieveSessionId(), request);
         } else {
-            return new SeleneseCommand(retrieveSessionId(parameters), parameters);
+            return new SeleneseCommand(retrieveSessionId(), request);
         }
     }
 
@@ -42,7 +51,7 @@ public HttpParameters parameters() {
         return parameters;
     }
 
-    protected String retrieveSessionId(HttpParameters parameters) {
+    protected String retrieveSessionId() {
         final String sessionId = parameters.get("sessionId");
         if (null == sessionId) {
             throw new CommandParsingException("ERROR: No sessionId provided. Most likely your original newBrowserSession command failed.");
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServer.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServer.java
index 4ad511df..66dbcc31 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServer.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServer.java
@@ -28,6 +28,7 @@ public static void main(String[] args) throws Exception {
         server.setHandler(contexts);
 
         root = new Context(contexts, "/", Context.SESSIONS);
+        root.addServlet(new ServletHolder(new WebDriverServlet()), "/wd/*");
         root.addServlet(new ServletHolder(new HubServlet()), "/selenium-server/driver/*");
         root.addServlet(new ServletHolder(new ConsoleServlet()), "/console");
         root.addServlet(new ServletHolder(new RegistrationServlet()), "/registration-manager/register");
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java
index e86d9b62..747137f9 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java
@@ -3,7 +3,7 @@
 import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.SeleneseCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.IDriverCommand;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -37,25 +37,24 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
         final HttpParameters parameters;
 
         registry = HubRegistry.registry();
-        parameters = requestParameters(request);
-        remoteControlResponse = forward(parameters, registry.remoteControlPool(), registry.environmentManager());
+        remoteControlResponse = forward(request, registry.remoteControlPool(), registry.environmentManager());
         reply(response, remoteControlResponse);
     }
 
-    protected Response forward(HttpParameters parameters, DynamicRemoteControlPool pool, EnvironmentManager environmentManager) throws IOException {
-        final SeleneseCommand command;
+    protected Response forward(HttpServletRequest request, DynamicRemoteControlPool pool, EnvironmentManager environmentManager) throws IOException {
+        final IDriverCommand command;
         final Response response;
 
-        LOGGER.info("Processing '" + parameters.toString() + "'");
+        LOGGER.info("Processing '" + request.toString() + "'");
         try {
-            command = new HttpCommandParser(parameters).parse(environmentManager);
+            command = new HttpCommandParser(request).parse(environmentManager);
             response = command.execute(pool);
         } catch (CommandParsingException e) {
-            LOGGER.error("Failed to parse '" + parameters.toString() + "' : " + e.getMessage());
+            LOGGER.error("Failed to parse '" + request.toString() + "' : " + e.getMessage());
             return new Response(e.getMessage());
         } catch (NoSuchEnvironmentException e) {
             LOGGER.error("Could not find any remote control providing the '" + e.environment() +
-                         "' environment. Please make sure you started some remote controls which registered as offering this environment.");
+                    "' environment. Please make sure you started some remote controls which registered as offering this environment.");
             return new Response(e.getMessage());
         } catch (NoSuchSessionException e) {
             LOGGER.error(e.getMessage());
@@ -66,8 +65,7 @@ protected Response forward(HttpParameters parameters, DynamicRemoteControlPool p
         if (responseBody.length() > 128) {
             final int truncated = responseBody.length() - 128;
             LOGGER.info(String.format("Responding with %d / %s...[%d characters truncated]", response.statusCode(), responseBody.substring(0, 128), truncated));
-        }
-        else {
+        } else {
             LOGGER.info(String.format("Responding with %d / %s", response.statusCode(), responseBody));
         }
 
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/WebDriverHttpCommandParser.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/WebDriverHttpCommandParser.java
new file mode 100644
index 00000000..2f4cf7f7
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/WebDriverHttpCommandParser.java
@@ -0,0 +1,118 @@
+package com.thoughtworks.selenium.grid.hub;
+
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.IDriverCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver.NewBrowserSessionCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver.TestCompleteCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver.WebDriverCommand;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Parse HTTP commands targeting a Remote Control
+ */
+public class WebDriverHttpCommandParser {
+
+    public static final String NEW_BROWSER_SESSION = "/wd/hub/session";
+    private static final String TEST_COMPLETE = "/wd/hub/session/\\d+";
+    private final HttpServletRequest request;
+
+    public WebDriverHttpCommandParser(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    public IDriverCommand parse(EnvironmentManager environmentManager) {
+        if (IsNewBrowserSessionRequest(request)) {
+            final Environment environment;
+            final String environmentName;
+
+            environmentName = GetEnvironmentName(request);
+            environment = environmentManager.environment(environmentName);
+            if (null == environment) {
+                throw new CommandParsingException("ERROR: Unknown environment '" + environmentName + "'");
+            }
+            return new NewBrowserSessionCommand(environment, request);
+        } else if (IsTestCompleteRequest(request)) {
+            return new TestCompleteCommand(getSessionId(), request);
+        } else {
+            return new WebDriverCommand(getSessionId(), request);
+        }
+    }
+
+    private String GetEnvironmentName(HttpServletRequest request) {
+        JSONObject jsonObject;
+        JSONObject parameters;
+        StringBuilder environmentName = new StringBuilder();
+        try {
+            jsonObject = new JSONObject(GetRequestBody(request));
+            parameters = jsonObject.getJSONObject("desiredCapabilities");
+            environmentName.append(parameters.getString("browserName").toLowerCase());
+            environmentName.append(" on ");
+            environmentName.append(parameters.getString("platform").toLowerCase());
+        } catch (JSONException e) {
+            throw new CommandParsingException("Error parsing JSON: " + GetRequestBody(request));
+        }
+        return environmentName.toString();
+    }
+
+    private String GetRequestBody(HttpServletRequest request) {
+        StringBuilder body = new StringBuilder();
+        String line;
+        try {
+            BufferedReader reader = request.getReader();
+            while (null != (line = reader.readLine())) {
+                body.append(line);
+            }
+            reader.close();
+        } catch (IOException e) {
+            body.append("");
+        }
+        return body.toString();
+    }
+
+    private boolean IsNewBrowserSessionRequest(HttpServletRequest request) {
+        if (request.getRequestURI().equals(NEW_BROWSER_SESSION)) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean IsTestCompleteRequest(HttpServletRequest request) {
+        if (Pattern.compile(TEST_COMPLETE).matcher(request.getRequestURI()).matches() &&
+                request.getMethod().equals("DELETE")) {
+            return true;
+        }
+        return false;
+    }
+
+    public HttpParameters parameters() {
+        return new HttpParameters(request.getParameterMap());
+    }
+
+    protected String getSessionId() {
+        final String sessionId = GetSessionId(request);
+        if (null == sessionId) {
+            throw new CommandParsingException("ERROR: No sessionId provided. Most likely your original newBrowserSession command failed.");
+        }
+        return sessionId;
+    }
+
+    private String GetSessionId(HttpServletRequest request) {
+        String requestUri = request.getRequestURI();
+        String returnString = null;
+        Pattern pattern = Pattern.compile("/wd/hub/session/(\\d+).*", Pattern.CASE_INSENSITIVE);
+        Matcher matcher = pattern.matcher(requestUri);
+        if (matcher.matches()) {
+            returnString = matcher.group(1);
+        }
+        return returnString;
+    }
+
+
+}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/WebDriverServlet.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/WebDriverServlet.java
new file mode 100644
index 00000000..3686fb3b
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/WebDriverServlet.java
@@ -0,0 +1,104 @@
+package com.thoughtworks.selenium.grid.hub;
+
+import com.thoughtworks.selenium.grid.GridRequestWrapper;
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.IDriverCommand;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * Main entry point for the Hub and the Selenium Farm.
+ * Load balance selense requests accross a farm of remote control.
+ */
+public class WebDriverServlet extends HttpServlet {
+
+    private final static Log LOGGER = LogFactory.getLog(HubServer.class);
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        process(request, response);
+    }
+
+    protected void doDelete(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        process(request, response);
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        process(request, response);
+    }
+
+    protected void process(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        final Response remoteControlResponse;
+
+        final HubRegistry registry;
+        final HttpParameters parameters;
+
+        request = new GridRequestWrapper(request);
+
+        registry = HubRegistry.registry();
+        remoteControlResponse = forward(request, registry.remoteControlPool(), registry.environmentManager());
+        reply(response, remoteControlResponse);
+    }
+
+    protected Response forward(HttpServletRequest request, DynamicRemoteControlPool pool, EnvironmentManager environmentManager) throws IOException {
+        final IDriverCommand command;
+        final Response response;
+
+        LOGGER.info("Processing '" + request.toString() + "'");
+        try {
+            command = new WebDriverHttpCommandParser(request).parse(environmentManager);
+            response = command.execute(pool);
+        } catch (CommandParsingException e) {
+            LOGGER.error("Failed to parse '" + request.toString() + "' : " + e.getMessage());
+            return new Response(e.getMessage());
+        } catch (NoSuchEnvironmentException e) {
+            LOGGER.error("Could not find any remote control providing the '" + e.environment() +
+                    "' environment. Please make sure you started some remote controls which registered as offering this environment.");
+            return new Response(e.getMessage());
+        } catch (NoSuchSessionException e) {
+            LOGGER.error(e.getMessage());
+            return new Response(e.getMessage());
+        }
+
+        final String responseBody = response.body();
+        if (responseBody.length() > 256) {
+            final int truncated = responseBody.length() - 256;
+            LOGGER.info(String.format("Responding with %d / %s... [%d characters truncated]", response.statusCode(), responseBody.substring(0, 256), truncated));
+        } else {
+            LOGGER.info(String.format("Responding with %d / %s", response.statusCode(), responseBody));
+        }
+
+        return response;
+    }
+
+    protected void reply(HttpServletResponse response, Response remoteControlResponse) throws IOException {
+        int statusCode = remoteControlResponse.statusCode();
+        String body = remoteControlResponse.body();
+        response.setStatus(statusCode);
+
+        if (statusCode != 204) {
+            response.setContentType("application/json");
+            response.setCharacterEncoding("UTF-8");
+            response.getWriter().print(body);
+        }
+
+    }
+
+    @SuppressWarnings({"unchecked"})
+    protected HttpParameters requestParameters(HttpServletRequest request) {
+        final HttpParameters parameters;
+        parameters = new HttpParameters(request.getParameterMap());
+        return parameters;
+    }
+
+}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/RegistrationServlet.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/RegistrationServlet.java
index 190d2080..9cabc7ad 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/RegistrationServlet.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/RegistrationServlet.java
@@ -1,7 +1,7 @@
 package com.thoughtworks.selenium.grid.hub.management;
 
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -20,7 +20,7 @@ public class RegistrationServlet extends RegistrationManagementServlet {
 
     protected void process(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
-        final RemoteControlProxy newRemoteControl;
+        final IRemoteControlProxy newRemoteControl;
         final DynamicRemoteControlPool pool;
 
         LOGGER.info("Registering new remote control...");
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/RemoteControlParser.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/RemoteControlParser.java
index 9c93b1ac..76e2a21c 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/RemoteControlParser.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/RemoteControlParser.java
@@ -1,14 +1,15 @@
 package com.thoughtworks.selenium.grid.hub.management;
 
 import com.thoughtworks.selenium.grid.HttpClient;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
 
 import javax.servlet.http.HttpServletRequest;
 
 public class RemoteControlParser {
 
-    public static RemoteControlProxy parse(HttpServletRequest request) {
-        final RemoteControlProxy remoteControl;
+    public static IRemoteControlProxy parse(HttpServletRequest request) {
+        final IRemoteControlProxy remoteControl;
         final String portParameter;
         final String environment;
         final String host;
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/UnregistrationServlet.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/UnregistrationServlet.java
index 47980042..dbc0a650 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/UnregistrationServlet.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/UnregistrationServlet.java
@@ -1,7 +1,7 @@
 package com.thoughtworks.selenium.grid.hub.management;
 
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -17,7 +17,7 @@ public class UnregistrationServlet extends RegistrationManagementServlet {
     private static final Log logger = LogFactory.getLog(UnregistrationServlet.class);
 
     protected void process(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        final RemoteControlProxy newRemoteControl;
+        final IRemoteControlProxy newRemoteControl;
         final DynamicRemoteControlPool pool;
 
         logger.info("Unregistering remote control...");
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/DynamicRemoteControlPool.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/DynamicRemoteControlPool.java
index b04d9cb6..41fec960 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/DynamicRemoteControlPool.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/DynamicRemoteControlPool.java
@@ -8,17 +8,17 @@
  */
 public interface DynamicRemoteControlPool extends RemoteControlPool {
 
-    void register(RemoteControlProxy newRemoteControl);
+    void register(IRemoteControlProxy newRemoteControl);
 
-    boolean unregister(RemoteControlProxy remoteControl);
+    boolean unregister(IRemoteControlProxy remoteControl);
 
-    boolean isRegistered(RemoteControlProxy remoteControl);
+    boolean isRegistered(IRemoteControlProxy remoteControl);
 
-    List<RemoteControlProxy> allRegisteredRemoteControls();
+    List<IRemoteControlProxy> allRegisteredRemoteControls();
 
-    List<RemoteControlProxy> availableRemoteControls();
+    List<IRemoteControlProxy> availableRemoteControls();
 
-    List<RemoteControlProxy> reservedRemoteControls();
+    List<IRemoteControlProxy> reservedRemoteControls();
 
     void unregisterAllUnresponsiveRemoteControls();
 
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPool.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPool.java
index b6c2e77d..d07560bd 100644
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPool.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPool.java
@@ -6,13 +6,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -25,10 +19,10 @@ public class GlobalRemoteControlPool implements DynamicRemoteControlPool {
     private final ConcurrentMap<String, RemoteControlSession> remoteControlsBySessionIds = new ConcurrentHashMap<String, RemoteControlSession>();
     private final ConcurrentMap<String, RemoteControlProvisioner> provisionersByEnvironment = new ConcurrentHashMap<String, RemoteControlProvisioner>();
 
-    public void register(RemoteControlProxy newRemoteControl) {
+    public void register(IRemoteControlProxy newRemoteControl) {
         final RemoteControlProvisioner provisioner;
 
-        synchronized(provisionersByEnvironment) {
+        synchronized (provisionersByEnvironment) {
             if (null == getProvisioner(newRemoteControl.environment())) {
                 createNewProvisionerForEnvironment(newRemoteControl.environment());
             }
@@ -37,10 +31,10 @@ public void register(RemoteControlProxy newRemoteControl) {
         }
     }
 
-    public boolean unregister(RemoteControlProxy remoteControl) {
+    public boolean unregister(IRemoteControlProxy remoteControl) {
         final boolean status;
 
-        synchronized(provisionersByEnvironment) {
+        synchronized (provisionersByEnvironment) {
             synchronized (remoteControlsBySessionIds) {
                 Set<RemoteControlSession> sessionsToRemove = new HashSet<RemoteControlSession>();
 
@@ -60,9 +54,9 @@ public boolean unregister(RemoteControlProxy remoteControl) {
         return status;
     }
 
-    public RemoteControlProxy reserve(Environment environment) {
+    public IRemoteControlProxy reserve(Environment environment) {
         final RemoteControlProvisioner provisioner;
-        
+
         provisioner = getProvisioner(environment.name());
         if (null == provisioner) {
             throw new NoSuchEnvironmentException(environment.name());
@@ -70,9 +64,9 @@ public RemoteControlProxy reserve(Environment environment) {
         return provisioner.reserve();
     }
 
-    public void associateWithSession(RemoteControlProxy remoteControl, String sessionId) {
+    public void associateWithSession(IRemoteControlProxy remoteControl, String sessionId) {
         LOGGER.info("Associating session id='" + sessionId + "' =>" + remoteControl
-                    + " for environment " + remoteControl.environment());
+                + " for environment " + remoteControl.environment());
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug("Asssociating " + sessionId + " => " + remoteControl);
         }
@@ -89,18 +83,18 @@ public void associateWithSession(RemoteControlProxy remoteControl, String sessio
         }
     }
 
-    public RemoteControlProxy retrieve(String sessionId) {
+    public IRemoteControlProxy retrieve(String sessionId) {
         return getRemoteControlForSession(sessionId);
     }
 
-    public void release(RemoteControlProxy remoteControl) {
+    public void release(IRemoteControlProxy remoteControl) {
         getProvisioner(remoteControl.environment()).release(remoteControl);
     }
 
     public void releaseForSession(String sessionId) {
         LOGGER.info("Releasing pool for session id='" + sessionId + "'");
 
-        final RemoteControlProxy remoteControl;
+        final IRemoteControlProxy remoteControl;
         remoteControl = getRemoteControlForSession(sessionId);
 
         synchronized (remoteControlsBySessionIds) {
@@ -110,10 +104,10 @@ public void releaseForSession(String sessionId) {
         getProvisioner(remoteControl.environment()).release(remoteControl);
     }
 
-    public List<RemoteControlProxy> availableRemoteControls() {
-        final List<RemoteControlProxy> availableRemoteControls;
+    public List<IRemoteControlProxy> availableRemoteControls() {
+        final List<IRemoteControlProxy> availableRemoteControls;
 
-        availableRemoteControls = new LinkedList<RemoteControlProxy>();
+        availableRemoteControls = new LinkedList<IRemoteControlProxy>();
         for (RemoteControlProvisioner provisioner : provisionersByEnvironment.values()) {
             availableRemoteControls.addAll(provisioner.availableRemoteControls());
         }
@@ -121,10 +115,10 @@ public List<RemoteControlProxy> availableRemoteControls() {
         return availableRemoteControls;
     }
 
-    public List<RemoteControlProxy> reservedRemoteControls() {
-        final List<RemoteControlProxy> reservedRemoteControls;
+    public List<IRemoteControlProxy> reservedRemoteControls() {
+        final List<IRemoteControlProxy> reservedRemoteControls;
 
-        reservedRemoteControls = new LinkedList<RemoteControlProxy>();
+        reservedRemoteControls = new LinkedList<IRemoteControlProxy>();
         for (RemoteControlProvisioner provisioner : provisionersByEnvironment.values()) {
             reservedRemoteControls.addAll(provisioner.reservedRemoteControls());
         }
@@ -132,11 +126,11 @@ public List<RemoteControlProxy> reservedRemoteControls() {
         return reservedRemoteControls;
     }
 
-    public List<RemoteControlProxy> allRegisteredRemoteControls() {
-        final List<RemoteControlProxy> allRemoteControls;
+    public List<IRemoteControlProxy> allRegisteredRemoteControls() {
+        final List<IRemoteControlProxy> allRemoteControls;
 
-        allRemoteControls = new LinkedList<RemoteControlProxy>();
-        synchronized(provisionersByEnvironment) {
+        allRemoteControls = new LinkedList<IRemoteControlProxy>();
+        synchronized (provisionersByEnvironment) {
             for (RemoteControlProvisioner provisioner : provisionersByEnvironment.values()) {
                 allRemoteControls.addAll(provisioner.allRemoteControls());
             }
@@ -145,7 +139,7 @@ public List<RemoteControlProxy> allRegisteredRemoteControls() {
         return allRemoteControls;
     }
 
-    public boolean isRegistered(RemoteControlProxy remoteControl) {
+    public boolean isRegistered(IRemoteControlProxy remoteControl) {
         for (RemoteControlProvisioner provisioner : provisionersByEnvironment.values()) {
             if (provisioner.contains(remoteControl)) {
                 return true;
@@ -158,7 +152,7 @@ public RemoteControlProvisioner getProvisioner(String environment) {
         return provisionersByEnvironment.get(environment);
     }
 
-    protected RemoteControlProxy getRemoteControlForSession(String sessionId) {
+    protected IRemoteControlProxy getRemoteControlForSession(String sessionId) {
         final RemoteControlSession session;
 
         session = getRemoteControlSession(sessionId);
@@ -195,12 +189,12 @@ protected void createNewProvisionerForEnvironment(String environemntName) {
     }
 
     public void unregisterAllUnresponsiveRemoteControls() {
-        for (RemoteControlProxy rc : allRegisteredRemoteControls()) {
+        for (IRemoteControlProxy rc : allRegisteredRemoteControls()) {
             unregisterRemoteControlIfUnreliable(rc);
         }
     }
 
-    protected void unregisterRemoteControlIfUnreliable(RemoteControlProxy rc) {
+    protected void unregisterRemoteControlIfUnreliable(IRemoteControlProxy rc) {
         if (rc.unreliable()) {
             LOGGER.warn("Unregistering unreliable RC " + rc);
             unregister(rc);
@@ -231,7 +225,7 @@ public Set<RemoteControlSession> iteratorSafeRemoteControlSessions() {
 
     public void recycleSessionIfIdleForTooLong(RemoteControlSession session, double maxIdleTimeInSeconds) {
         final int maxIdleTImeInMilliseconds;
-        
+
         maxIdleTImeInMilliseconds = (int) (maxIdleTimeInSeconds * 1000);
         if (session.innactiveForMoreThan(maxIdleTImeInMilliseconds)) {
             LOGGER.warn("Releasing session IDLE for more than " + maxIdleTimeInSeconds + " seconds: " + session);
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/IRemoteControlProxy.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/IRemoteControlProxy.java
new file mode 100644
index 00000000..30a3ba2a
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/IRemoteControlProxy.java
@@ -0,0 +1,52 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol;
+
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.RemoteControlMode;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: stanw
+ * Date: 14-Oct-2010
+ * Time: 09:53:53
+ * To change this template use File | Settings | File Templates.
+ */
+public interface IRemoteControlProxy {
+    public String host();
+
+    public int port();
+
+    public String environment();
+
+    public String remoteControlPingURL();
+
+    public String remoteControlDriverURL();
+
+    public String remoteControlURLFor(String path);
+
+    public Response forward(HttpServletRequest request) throws IOException;
+
+    public String toString();
+
+    public boolean equals(Object other);
+
+    public int hashCode();
+
+    public boolean sessionInProgress();
+
+    public void registerNewSession();
+
+    public void unregisterSession();
+
+    public void terminateSession(String sessionId);
+
+    public boolean canHandleNewSession();
+
+    public boolean unreliable();
+
+    void setRequest(HttpServletRequest request);
+
+    void setMode(RemoteControlMode webDriver);
+}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlPool.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlPool.java
index 8d55f6d6..cb11295e 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlPool.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlPool.java
@@ -10,12 +10,12 @@ public interface RemoteControlPool {
     /**
      * Gain exclusive access to a remote control it is released.
      *
-     * @param environment  Environment that the remote control must provide. Should not be null.
+     * @param environment Environment that the remote control must provide. Should not be null.
      * @return Reserved remote control. Never null.
-     * @see RemoteControlPool#release(RemoteControlProxy)
+     * @see RemoteControlPool#release(com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy)
      * @see RemoteControlPool#releaseForSession(String)
      */
-    RemoteControlProxy reserve(Environment environment);
+    IRemoteControlProxy reserve(Environment environment);
 
     /**
      * Associates a reserved remote control with a Selenese session id. Once associated
@@ -25,29 +25,29 @@ public interface RemoteControlPool {
      * @param sessionId     Id of the session to associate the remote control with. Should not be null.
      * @see RemoteControlPool#retrieve(String)
      */
-    void associateWithSession(RemoteControlProxy remoteControl, String sessionId);
+    void associateWithSession(IRemoteControlProxy remoteControl, String sessionId);
 
     /**
      * Returns the remote control associated with a specific Selenese session.
      *
-     * @param sessionId  Id of the Selenese session. Should not be null.
+     * @param sessionId Id of the Selenese session. Should not be null.
      * @return Associated remote control.
      */
-    RemoteControlProxy retrieve(String sessionId);
+    IRemoteControlProxy retrieve(String sessionId);
 
     /**
      * Release a remote control that was previously reserved, so it can be used to serve other
      * Selenese sessions.
      *
-     * @param remoteControl  Previously reserved remote control. Should not be null.
+     * @param remoteControl Previously reserved remote control. Should not be null.
      */
-    void release(RemoteControlProxy remoteControl);
+    void release(IRemoteControlProxy remoteControl);
 
     /**
      * Release a remote control that was previously reserved, so it can be used to serve other
      * Selenese sessions.
      *
-     * @param sessionId  Id of the selenese session the remote control is associated with. Should not be null.
+     * @param sessionId Id of the selenese session the remote control is associated with. Should not be null.
      */
     void releaseForSession(String sessionId);
 
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProvisioner.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProvisioner.java
index fe17b60f..7153fa8e 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProvisioner.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProvisioner.java
@@ -23,17 +23,17 @@
 public class RemoteControlProvisioner {
 
     private static final Log LOGGER = LogFactory.getLog(RemoteControlProvisioner.class);
-    private final List<RemoteControlProxy> remoteControls;
+    private final List<IRemoteControlProxy> remoteControls;
     private final Lock remoteControlListLock;
     private final Condition remoteControlAvailable;
 
     public RemoteControlProvisioner() {
-        remoteControls = new LinkedList<RemoteControlProxy>();
+        remoteControls = new LinkedList<IRemoteControlProxy>();
         remoteControlListLock = new ReentrantLock();
         remoteControlAvailable = remoteControlListLock.newCondition();
     }
 
-    public RemoteControlProxy reserve() {
+    public IRemoteControlProxy reserve() {
         remoteControlListLock.lock();
 
         try {
@@ -41,7 +41,7 @@ public RemoteControlProxy reserve() {
                 return null;
             }
 
-            RemoteControlProxy remoteControl = blockUntilARemoteControlIsAvailableOrRequestTimesOut();
+            IRemoteControlProxy remoteControl = blockUntilARemoteControlIsAvailableOrRequestTimesOut();
             if (null == remoteControl) {
                 LOGGER.info("Timed out waiting for a remote control for environment.");
                 return null;
@@ -67,7 +67,7 @@ public RemoteControlProxy reserve() {
         }
     }
 
-    public void release(RemoteControlProxy remoteControl) {
+    public void release(IRemoteControlProxy remoteControl) {
         remoteControlListLock.lock();
 
         try {
@@ -79,7 +79,7 @@ public void release(RemoteControlProxy remoteControl) {
         }
     }
 
-    public void add(RemoteControlProxy newRemoteControl) {
+    public void add(IRemoteControlProxy newRemoteControl) {
         remoteControlListLock.lock();
 
         try {
@@ -93,19 +93,21 @@ public void add(RemoteControlProxy newRemoteControl) {
         }
     }
 
-    /** Not Thread-safe */
-    public boolean contains(RemoteControlProxy remoteControl) {
+    /**
+     * Not Thread-safe
+     */
+    public boolean contains(IRemoteControlProxy remoteControl) {
         return remoteControls.contains(remoteControl);
     }
 
-    public void tearDownExistingRemoteControl(RemoteControlProxy newRemoteControl) {
-        final RemoteControlProxy oldRemoteControl;
+    public void tearDownExistingRemoteControl(IRemoteControlProxy newRemoteControl) {
+        final IRemoteControlProxy oldRemoteControl;
 
         oldRemoteControl = remoteControls.get(remoteControls.indexOf(newRemoteControl));
         remoteControls.remove(oldRemoteControl);
     }
 
-    public boolean remove(RemoteControlProxy remoteControl) {
+    public boolean remove(IRemoteControlProxy remoteControl) {
         remoteControlListLock.lock();
 
         try {
@@ -120,16 +122,16 @@ public boolean remove(RemoteControlProxy remoteControl) {
      *
      * @return All available remote controls. Never null.
      */
-    public List<RemoteControlProxy> availableRemoteControls() {
-        final LinkedList<RemoteControlProxy> availableremoteControls;
+    public List<IRemoteControlProxy> availableRemoteControls() {
+        final LinkedList<IRemoteControlProxy> availableremoteControls;
 
-        availableremoteControls = new LinkedList<RemoteControlProxy>();
-        for (RemoteControlProxy remoteControl : remoteControls) {
+        availableremoteControls = new LinkedList<IRemoteControlProxy>();
+        for (IRemoteControlProxy remoteControl : remoteControls) {
             if (remoteControl.canHandleNewSession()) {
                 availableremoteControls.add(remoteControl);
             }
         }
-        return Arrays.asList(availableremoteControls.toArray(new RemoteControlProxy[availableremoteControls.size()]));
+        return Arrays.asList(availableremoteControls.toArray(new IRemoteControlProxy[availableremoteControls.size()]));
     }
 
     /**
@@ -137,20 +139,20 @@ public List<RemoteControlProxy> availableRemoteControls() {
      *
      * @return All reserved remote controls. Never null.
      */
-    public List<RemoteControlProxy> reservedRemoteControls() {
-        final LinkedList<RemoteControlProxy> reservedRemoteControls;
+    public List<IRemoteControlProxy> reservedRemoteControls() {
+        final LinkedList<IRemoteControlProxy> reservedRemoteControls;
 
-        reservedRemoteControls = new LinkedList<RemoteControlProxy>();
-        for (RemoteControlProxy remoteControl : remoteControls) {
+        reservedRemoteControls = new LinkedList<IRemoteControlProxy>();
+        for (IRemoteControlProxy remoteControl : remoteControls) {
             if (remoteControl.sessionInProgress()) {
                 reservedRemoteControls.add(remoteControl);
             }
         }
-        return Arrays.asList(reservedRemoteControls.toArray(new RemoteControlProxy[reservedRemoteControls.size()]));
+        return Arrays.asList(reservedRemoteControls.toArray(new IRemoteControlProxy[reservedRemoteControls.size()]));
     }
 
-    protected RemoteControlProxy blockUntilARemoteControlIsAvailableOrRequestTimesOut() {
-        RemoteControlProxy availableRemoteControl;
+    protected IRemoteControlProxy blockUntilARemoteControlIsAvailableOrRequestTimesOut() {
+        IRemoteControlProxy availableRemoteControl;
 
         while (true) {
             try {
@@ -173,8 +175,8 @@ protected RemoteControlProxy blockUntilARemoteControlIsAvailableOrRequestTimesOu
      *
      * @return Next Available remote control. Null if none is available.
      */
-    protected RemoteControlProxy findNextAvailableRemoteControl() {
-        for (RemoteControlProxy remoteControl : remoteControls) {
+    protected IRemoteControlProxy findNextAvailableRemoteControl() {
+        for (IRemoteControlProxy remoteControl : remoteControls) {
             if (remoteControl.canHandleNewSession()) {
                 return remoteControl;
             }
@@ -182,13 +184,12 @@ protected RemoteControlProxy findNextAvailableRemoteControl() {
         return null;
     }
 
-  /**
-   * Wait for a remote control to be available or timeout while waiting.
-   *
-   * @return Indicates whether the request timed out.
-   * 
-   * @throws InterruptedException
-   */
+    /**
+     * Wait for a remote control to be available or timeout while waiting.
+     *
+     * @return Indicates whether the request timed out.
+     * @throws InterruptedException
+     */
     protected boolean waitForARemoteControlToBeAvailable() throws InterruptedException {
         final Double maxWaitTime = HubRegistry.registry().gridConfiguration().getHub().getNewSessionMaxWaitTimeInSeconds();
 
@@ -205,11 +206,11 @@ protected void signalThatARemoteControlHasBeenMadeAvailable() {
     }
 
 
-    public List<RemoteControlProxy> allRemoteControls() {
-        final LinkedList<RemoteControlProxy> allRemoteControls;
+    public List<IRemoteControlProxy> allRemoteControls() {
+        final LinkedList<IRemoteControlProxy> allRemoteControls;
 
-        allRemoteControls = new LinkedList<RemoteControlProxy>();
-        for (RemoteControlProxy remoteControl : remoteControls) {
+        allRemoteControls = new LinkedList<IRemoteControlProxy>();
+        for (IRemoteControlProxy remoteControl : remoteControls) {
             allRemoteControls.add(remoteControl);
         }
 
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProxy.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProxy.java
index de6c8847..4d95fe70 100755
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProxy.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProxy.java
@@ -4,9 +4,11 @@
 import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.HubServer;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.RemoteControlMode;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +16,7 @@
 /**
  * Local interface to a real remote control running somewhere in the grid.
  */
-public class RemoteControlProxy {
+public class RemoteControlProxy implements IRemoteControlProxy {
 
     private static final Log LOGGER = LogFactory.getLog(HubServer.class);
 
@@ -27,6 +29,8 @@ public class RemoteControlProxy {
     private final int port;
     private int failedHeartbeatCount;
 
+    private RemoteControlMode mode;
+    private HttpServletRequest request;
 
     public RemoteControlProxy(String host, int port, String environment, HttpClient httpClient) {
         if (null == host) {
@@ -67,8 +71,44 @@ public String remoteControlURLFor(String path) {
         return "http://" + host + ":" + port + "/selenium-server/" + path;
     }
 
-    public Response forward(HttpParameters parameters) throws IOException {
-        return httpClient.post(remoteControlDriverURL(), parameters);
+    public String remoteWebDriverControlDriverURL(String requestPath) {
+        return "http://" + host + ":" + port + requestPath;
+    }
+
+    public Response forward(HttpServletRequest request) throws IOException {
+        if (IsWebDriverRequest(request)) {
+            String requestMethod = request.getMethod();
+            if (requestMethod.equals("POST")) {
+                return httpClient.postWebDriverRequest(remoteWebDriverControlDriverURL(request.getRequestURI()), request);
+            } else if (requestMethod.equals("DELETE")) {
+                return httpClient.deleteWebDriverRequest(remoteWebDriverControlDriverURL(request.getRequestURI()), request);
+            } else if (requestMethod.equals("PUT")) {
+                return httpClient.putWebDriverRequest(remoteWebDriverControlDriverURL(request.getRequestURI()), request);
+            } else {
+                return httpClient.getWebDriverRequest(remoteWebDriverControlDriverURL(request.getRequestURI()), request);
+            }
+        } else {
+            return httpClient.post(remoteControlDriverURL(), GetHttpParametersFromHttpServletRequest(request));
+        }
+    }
+
+    private HttpParameters GetHttpParametersFromHttpServletRequest(HttpServletRequest request) {
+        if (request == null) {
+            return new HttpParameters(new HashMap<String, String[]>() {
+            });
+        }
+        return new HttpParameters(request.getParameterMap());
+    }
+
+    private boolean IsWebDriverRequest(HttpServletRequest request) {
+        if (request == null) {
+            return false;
+        }
+        String requestUri = (String) request.getRequestURI();
+        if (requestUri != null && requestUri.startsWith("/wd/hub")) {
+            return true;
+        }
+        return false;
     }
 
     public String toString() {
@@ -113,12 +153,16 @@ public void unregisterSession() {
     }
 
     public void terminateSession(String sessionId) {
+        // WebDriver request does not need this
+        if (IsWebDriverRequest(request)) {
+            return;
+        }
         try {
             Map<String, String[]> params = new HashMap<String, String[]>();
-            params.put("cmd", new String[] { "testComplete" });
-            params.put("sessionId", new String[] { sessionId });
+            params.put("cmd", new String[]{"testComplete"});
+            params.put("sessionId", new String[]{sessionId});
 
-            forward(new HttpParameters(params));
+            forward(this.request);
         }
         catch (IOException e) {
             LOGGER.warn("Exception telling remote control to kill its session:" + e.getMessage());
@@ -126,10 +170,10 @@ public void terminateSession(String sessionId) {
     }
 
     public boolean canHandleNewSession() {
-        return  !sessionInProgress();
+        return !sessionInProgress();
     }
 
-	public boolean unreliable() {
+    public boolean unreliable() {
         final Response response;
 
         try {
@@ -143,8 +187,7 @@ public boolean unreliable() {
 
                 failedHeartbeatCount++;
                 return unreliable();
-            }
-            else {
+            } else {
                 failedHeartbeatCount = 0;
                 return true;
             }
@@ -158,8 +201,7 @@ public boolean unreliable() {
 
                 failedHeartbeatCount++;
                 return unreliable();
-            }
-            else {
+            } else {
                 failedHeartbeatCount = 0;
                 return true;
             }
@@ -169,4 +211,12 @@ public boolean unreliable() {
         return false;
     }
 
+    public void setRequest(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    public void setMode(RemoteControlMode controlMode) {
+        this.mode = controlMode;
+    }
+
 }
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSession.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSession.java
index e20eb665..408197d3 100644
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSession.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSession.java
@@ -6,11 +6,11 @@
  * Selenium Session in progress
  */
 public class RemoteControlSession {
-    private final RemoteControlProxy remoteControl;
+    private final IRemoteControlProxy remoteControl;
     private long lastActiveAt;
     private final String sessionId;
 
-    public RemoteControlSession(String sessionId, RemoteControlProxy remoteControl) {
+    public RemoteControlSession(String sessionId, IRemoteControlProxy remoteControl) {
         this.sessionId = sessionId;
         this.remoteControl = remoteControl;
         updateLastActiveAt();
@@ -20,7 +20,7 @@ public String sessionId() {
         return sessionId;
     }
 
-    public RemoteControlProxy remoteControl() {
+    public IRemoteControlProxy remoteControl() {
         return remoteControl;
     }
 
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/IDriverCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/IDriverCommand.java
new file mode 100644
index 00000000..2cec67f8
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/IDriverCommand.java
@@ -0,0 +1,27 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
+
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: stanw
+ * Date: 13-Oct-2010
+ * Time: 09:57:22
+ * To change this template use File | Settings | File Templates.
+ */
+public interface IDriverCommand {
+    public String sessionId();
+
+    public HttpParameters parameters();
+
+    public HttpServletRequest request();
+
+    public Response execute(RemoteControlPool pool) throws IOException;
+
+    public String parseSessionId(String string);
+}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/RemoteControlMode.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/RemoteControlMode.java
new file mode 100644
index 00000000..916dae44
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/RemoteControlMode.java
@@ -0,0 +1,13 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: stanw
+ * Date: 14-Oct-2010
+ * Time: 11:24:25
+ * To change this template use File | Settings | File Templates.
+ */
+public enum RemoteControlMode {
+    Selenium,
+    WebDriver
+}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommand.java
deleted file mode 100755
index 0c4df4c4..00000000
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
-
-import com.thoughtworks.selenium.grid.HttpParameters;
-import com.thoughtworks.selenium.grid.Response;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-
-import java.io.IOException;
-
-/**
- * Generic Selenese command
- */
-public class SeleneseCommand {
-
-    private final String sessionId;
-    private final HttpParameters parameters;
-
-    public SeleneseCommand(String sessionId, HttpParameters parameters) {
-        this.sessionId = sessionId;
-        this.parameters = parameters;
-    }
-
-    public String sessionId() {
-        return sessionId;
-    }
-
-    public HttpParameters parameters() {
-        return parameters;
-    }
-
-    public Response execute(RemoteControlPool pool) throws IOException {
-        final RemoteControlProxy remoteControl;
-        final Response response;
-
-        if (null == sessionId) {
-            return new Response("Selenium Driver error: No sessionId provided for command '" + parameters.toString() + "'");
-        }
-        remoteControl = pool.retrieve(sessionId());
-        pool.updateSessionLastActiveAt(sessionId);
-        response = remoteControl.forward(parameters());
-        pool.updateSessionLastActiveAt(sessionId);
-
-        return response;
-    }
-
-}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/NewBrowserSessionCommand.java
old mode 100755
new mode 100644
similarity index 84%
rename from hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommand.java
rename to hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/NewBrowserSessionCommand.java
index 2594be8b..4e49cdb4
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommand.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/NewBrowserSessionCommand.java
@@ -1,17 +1,16 @@
-package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium;
 
-import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.Environment;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.net.ProtocolException;
 
 /**
  * Selenese command requesting a new session for a specific browser/environment.
@@ -23,13 +22,13 @@ public class NewBrowserSessionCommand extends SeleneseCommand {
     private static final Log logger = LogFactory.getLog(NewBrowserSessionCommand.class);
     private final Environment environment;
 
-    public NewBrowserSessionCommand(Environment environment, HttpParameters parameters) {
-        super(null, parameters);
+    public NewBrowserSessionCommand(Environment environment, HttpServletRequest request) {
+        super(null, request);
         this.environment = environment;
     }
 
     public Response execute(RemoteControlPool pool) throws IOException {
-        RemoteControlProxy remoteControl;
+        IRemoteControlProxy remoteControl;
         final String sessionId;
         final Response response;
 
@@ -40,7 +39,7 @@ public Response execute(RemoteControlPool pool) throws IOException {
             return new Response(message);
         }
         try {
-            response = remoteControl.forward(parameters());
+            response = remoteControl.forward(request());
             sessionId = parseSessionId(response.body());
             if (null == sessionId) {
                 pool.release(remoteControl);
@@ -57,8 +56,8 @@ public Response execute(RemoteControlPool pool) throws IOException {
         }
     }
 
-    protected String parseSessionId(String responseBody) {
-        final Matcher matcher = SESSION_ID_PATTERN.matcher(responseBody);        
+    public String parseSessionId(String responseBody) {
+        final Matcher matcher = SESSION_ID_PATTERN.matcher(responseBody);
         if (matcher.matches()) {
             return matcher.group(1);
         }
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/SeleneseCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/SeleneseCommand.java
new file mode 100644
index 00000000..b775d9e7
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/SeleneseCommand.java
@@ -0,0 +1,62 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium;
+
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.IDriverCommand;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * Generic Selenese command
+ */
+public class SeleneseCommand implements IDriverCommand {
+
+    private final String sessionId;
+    private HttpServletRequest request;
+    private final HttpParameters parameters;
+
+    public SeleneseCommand(String sessionId, HttpServletRequest request) {
+        this.sessionId = sessionId;
+        this.request = request;
+        if (null != request) {
+            this.parameters = new HttpParameters(request.getParameterMap());
+        } else {
+            this.parameters = null;
+        }
+    }
+
+    public String sessionId() {
+        return sessionId;
+    }
+
+    public HttpParameters parameters() {
+        return parameters;
+    }
+
+    public HttpServletRequest request() {
+        return request;
+    }
+
+    public Response execute(RemoteControlPool pool) throws IOException {
+        final IRemoteControlProxy remoteControl;
+        final Response response;
+
+        if (null == sessionId) {
+            return new Response("Selenium Driver error: No sessionId provided for command '" + parameters().toString() + "'");
+        }
+        remoteControl = pool.retrieve(sessionId());
+        pool.updateSessionLastActiveAt(sessionId);
+        response = remoteControl.forward(request());
+        pool.updateSessionLastActiveAt(sessionId);
+
+        return response;
+    }
+
+    public String parseSessionId(String string) {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/TestCompleteCommand.java
old mode 100755
new mode 100644
similarity index 70%
rename from hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommand.java
rename to hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/TestCompleteCommand.java
index 0e9abcf6..0ed755cb
--- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommand.java
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/TestCompleteCommand.java
@@ -1,9 +1,9 @@
-package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium;
 
-import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**
@@ -11,8 +11,8 @@
  */
 public class TestCompleteCommand extends SeleneseCommand {
 
-    public TestCompleteCommand(String sessionId, HttpParameters parameters) {
-        super(sessionId, parameters);
+    public TestCompleteCommand(String sessionId, HttpServletRequest request) {
+        super(sessionId, request);
     }
 
 
@@ -20,7 +20,7 @@ public Response execute(RemoteControlPool pool) throws IOException {
         try {
             return super.execute(pool);
         } finally {
-          pool.releaseForSession(sessionId());
+            pool.releaseForSession(sessionId());
         }
     }
 
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/NewBrowserSessionCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/NewBrowserSessionCommand.java
new file mode 100644
index 00000000..d90c7594
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/NewBrowserSessionCommand.java
@@ -0,0 +1,64 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver;
+
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.Environment;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.RemoteControlMode;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * Selenese command requesting a new session for a specific browser/environment.
+ * Marks the start of a new Selenese session.
+ */
+public class NewBrowserSessionCommand extends WebDriverCommand {
+
+    private static final Log logger = LogFactory.getLog(NewBrowserSessionCommand.class);
+    private final Environment environment;
+
+    public NewBrowserSessionCommand(Environment environment, HttpServletRequest request) {
+        super(null, request);
+        this.environment = environment;
+    }
+
+    public Response execute(RemoteControlPool pool) throws IOException {
+        IRemoteControlProxy remoteControl;
+        final String sessionId;
+        final Response response;
+
+        remoteControl = pool.reserve(environment);
+        if (null == remoteControl) {
+            final String message = "No available remote control for environment '" + environment.name() + "'";
+            logger.warn(message);
+            return new Response(message);
+        }
+        remoteControl.setRequest(request());
+        remoteControl.setMode(RemoteControlMode.WebDriver);
+        try {
+            response = remoteControl.forward(request());
+            sessionId = parseSessionId(response);
+            if (null == sessionId) {
+                pool.release(remoteControl);
+                return new Response("Could not retrieve a new session");
+            }
+            pool.associateWithSession(remoteControl, sessionId);
+            pool.updateSessionLastActiveAt(sessionId);
+
+            return response;
+        } catch (Exception e) {
+            logger.error("Problem while requesting new browser session", e);
+            pool.release(remoteControl);
+            return new Response(e.getMessage());
+        }
+    }
+
+
+    public Environment environment() {
+        return environment;
+    }
+
+}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/TestCompleteCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/TestCompleteCommand.java
new file mode 100644
index 00000000..6dd17941
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/TestCompleteCommand.java
@@ -0,0 +1,26 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver;
+
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * Selenese command marking the end of a Selenese session.
+ */
+public class TestCompleteCommand extends WebDriverCommand {
+
+    public TestCompleteCommand(String sessionId, HttpServletRequest request) {
+        super(sessionId, request);
+    }
+
+    public Response execute(RemoteControlPool pool) throws IOException {
+        try {
+            return super.execute(pool);
+        } finally {
+            pool.releaseForSession(sessionId());
+        }
+    }
+
+}
diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/WebDriverCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/WebDriverCommand.java
new file mode 100644
index 00000000..6ddc1208
--- /dev/null
+++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/WebDriverCommand.java
@@ -0,0 +1,79 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver;
+
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.IDriverCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.RemoteControlMode;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+/**
+ * Generic Selenese command
+ */
+public class WebDriverCommand implements IDriverCommand {
+
+    private static final Pattern SESSION_ID_PATTERN = Pattern.compile("/wd/hub/session/(\\d+)");
+
+    private final String sessionId;
+    private final HttpServletRequest request;
+    private final HttpParameters parameters;
+
+    public WebDriverCommand(String sessionId, HttpServletRequest request) {
+        this.sessionId = sessionId;
+        this.request = request;
+        if (null != request) {
+            this.parameters = new HttpParameters(request.getParameterMap());
+        } else {
+            this.parameters = null;
+        }
+    }
+
+    public String sessionId() {
+        return sessionId;
+    }
+
+    public HttpServletRequest request() {
+        return request;
+    }
+
+    public HttpParameters parameters() {
+        return parameters;
+    }
+
+    public Response execute(RemoteControlPool pool) throws IOException {
+        final IRemoteControlProxy remoteControl;
+        final Response response;
+
+        if (null == sessionId) {
+            return new Response("Selenium Driver error: No sessionId provided for command '" + parameters().toString() + "'");
+        }
+        remoteControl = pool.retrieve(sessionId());
+        remoteControl.setMode(RemoteControlMode.WebDriver);
+        remoteControl.setRequest(request());
+        pool.updateSessionLastActiveAt(sessionId);
+        response = remoteControl.forward(request());
+        pool.updateSessionLastActiveAt(sessionId);
+
+        return response;
+    }
+
+    public String parseSessionId(String string) {
+        JSONObject jsonObject;
+        try {
+            jsonObject = new JSONObject(string);
+            return jsonObject.getString("sessionId");
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public String parseSessionId(Response response) {
+        return parseSessionId(response.body());
+    }
+}
diff --git a/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java b/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java
index 5479dda5..79f2159b 100755
--- a/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java
+++ b/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java
@@ -2,28 +2,32 @@
 
 import com.thoughtworks.selenium.grid.HttpClient;
 import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.MockHelper;
 import com.thoughtworks.selenium.grid.Response;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 import org.junit.Test;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
 public class SeleniumRCProxyIntegrationTest {
 
-	private static final int VALID_PORT = 5555;
+    private static final int VALID_PORT = 5555;
 
-	@Test
-	public void forwardGetNewBrowserSessionToRemoteControl() throws IOException {
-		HttpClient client = new HttpClient();
-		RemoteControlProxy proxy = new RemoteControlProxy("localhost", VALID_PORT, "env", client);
-		HttpParameters parameters = new HttpParameters();
-		parameters.put("cmd", "getNewBrowserSession");
-		parameters.put("1", "*firefox");
-		parameters.put("2", "http://www.google.com");
-		Response response = proxy.forward(parameters);
-		assertEquals(200, response.statusCode());
-		assertTrue(response.body().startsWith("OK,"));
-	}
+    @Test
+    public void forwardGetNewBrowserSessionToRemoteControl() throws IOException {
+        HttpClient client = new HttpClient();
+        RemoteControlProxy proxy = new RemoteControlProxy("localhost", VALID_PORT, "env", client);
+        HttpParameters parameters = new HttpParameters();
+        parameters.put("cmd", "getNewBrowserSession");
+        parameters.put("1", "*firefox");
+        parameters.put("2", "http://www.google.com");
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+        Response response = proxy.forward(request);
+        assertEquals(200, response.statusCode());
+        assertTrue(response.body().startsWith("OK,"));
+    }
 
 }
\ No newline at end of file
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/AssertionHelper.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/AssertionHelper.java
index c3ed19da..16b04adf 100644
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/AssertionHelper.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/AssertionHelper.java
@@ -1,18 +1,21 @@
 package com.thoughtworks.selenium.grid;
 
+import org.jbehave.classmock.UsingClassMock;
+
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 
+
 /**
  * Helper Class for Custom Assertions.
  */
-public class AssertionHelper {
+public class AssertionHelper extends UsingClassMock {
 
     public static void assertNotEquals(Object anObject, Object theOther) {
         if (null == anObject) {
             assertFalse(null == theOther);
         } else {
-          assertFalse(anObject.equals(theOther));
+            assertFalse(anObject.equals(theOther));
         }
     }
 
@@ -24,4 +27,5 @@ public static void assertDistinctHashCodes(Object anObject, Object another) {
         assertNotEquals(anObject.hashCode(), another.hashCode());
     }
 
+
 }
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/MockHelper.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/MockHelper.java
new file mode 100644
index 00000000..ad18fd34
--- /dev/null
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/MockHelper.java
@@ -0,0 +1,34 @@
+package com.thoughtworks.selenium.grid;
+
+import org.jbehave.classmock.UsingClassMock;
+import org.jbehave.core.minimock.UsingMiniMock;
+import org.jbehave.core.mock.Mock;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+
+
+/**
+ * Helper Class for Custom Assertions.
+ */
+public class MockHelper extends UsingClassMock {
+
+    public static HttpServletRequest GetMockHttpServletRequest() {
+        UsingMiniMock miniMock = new UsingMiniMock();
+        Mock request = new UsingMiniMock().mock(HttpServletRequest.class);
+        request.stubs("getParameterMap").will(miniMock.returnValue(new HashMap<String, String[]>()));
+        return (HttpServletRequest) request;
+    }
+
+    public static HttpServletRequest GetMockRequestWithParameters(HttpParameters parameters) {
+        UsingMiniMock miniMock = new UsingMiniMock();
+        Mock request = miniMock.mock(HttpServletRequest.class);
+        HashMap params = new HashMap<String, String[]>();
+        for (String name : parameters.names()) {
+            params.put(name, new String[]{parameters.get(name)});
+        }
+        request.stubs("getParameterMap").will(miniMock.returnValue(params));
+        return (HttpServletRequest) request;
+    }
+
+}
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HeartbeatServletTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HeartbeatServletTest.java
index 7fe3e487..de9328ff 100644
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HeartbeatServletTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HeartbeatServletTest.java
@@ -1,7 +1,5 @@
 package com.thoughtworks.selenium.grid.hub;
 
-import static junit.framework.Assert.assertEquals;
-
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
 import org.jbehave.classmock.UsingClassMock;
@@ -13,6 +11,8 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import static junit.framework.Assert.assertEquals;
+
 
 public class HeartbeatServletTest extends UsingClassMock {
 
@@ -65,7 +65,7 @@ public void replyWritesOKOnServletResponseWhenHubIsRegistered() throws IOExcepti
         servletResponse.expects("getWriter").will(returnValue(new PrintWriter(writer)));
         pool = mock(DynamicRemoteControlPool.class);
         pool.expects("isRegistered").with(eq(new RemoteControlProxy("a host", 1234, "", null))).will(returnValue(true));
-        
+
         new HeartbeatServlet() {
             @Override
             protected DynamicRemoteControlPool remoteControlPool() {
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HttpCommandParserTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HttpCommandParserTest.java
index 64bf4a51..8159170b 100755
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HttpCommandParserTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HttpCommandParserTest.java
@@ -1,68 +1,81 @@
 package com.thoughtworks.selenium.grid.hub;
 
 import com.thoughtworks.selenium.grid.HttpParameters;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.NewBrowserSessionCommand;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.SeleneseCommand;
-import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.TestCompleteCommand;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import com.thoughtworks.selenium.grid.MockHelper;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.IDriverCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium.NewBrowserSessionCommand;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium.TestCompleteCommand;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
 
 public class HttpCommandParserTest extends UsingClassMock {
 
     @Test
     public void parametersReturnsTheRequestParametersProvidedToTheConstructor() {
-      HttpParameters parameters = new HttpParameters();
-      assertEquals(parameters, new HttpCommandParser(parameters).parameters());
+        HttpParameters parameters = new HttpParameters();
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+        assertEquals(parameters, new HttpCommandParser(request).parameters());
     }
 
+
     @Test
     public void returnsARemoteControlCommandWithHttpRequestQueryStringForAGenericRequest() {
-      HttpParameters parameters = new HttpParameters();
-      parameters.put("cmd", "generic");
-      parameters.put("sessionId", "1234");
+        HttpParameters parameters = new HttpParameters();
+        parameters.put("cmd", "generic");
+        parameters.put("sessionId", "1234");
 
-      SeleneseCommand command = new HttpCommandParser(parameters).parse(null);
-      assertEquals("generic", command.parameters().get("cmd"));
-      assertEquals("1234", command.parameters().get("sessionId"));
-      assertEquals("1234", command.sessionId());
-        }
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+
+        IDriverCommand command = new HttpCommandParser(request).parse(null);
+        assertEquals("generic", command.parameters().get("cmd"));
+        assertEquals("1234", command.parameters().get("sessionId"));
+        assertEquals("1234", command.sessionId());
+    }
 
     @Test
     public void returnsARemoteControlCommandWithMatchingHttpParametersForAGenericRequest() {
-      HttpParameters parameters = new HttpParameters();
-      parameters.put("cmd", "generic");
-      parameters.put("sessionId", "1234");
-
-      SeleneseCommand command = new HttpCommandParser(parameters).parse(null);
-      assertEquals("generic", command.parameters().get("cmd"));
-      assertEquals("1234", command.parameters().get("sessionId"));
+        HttpParameters parameters = new HttpParameters();
+        parameters.put("cmd", "generic");
+        parameters.put("sessionId", "1234");
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+
+        IDriverCommand command = new HttpCommandParser(request).parse(null);
+        assertEquals("generic", command.parameters().get("cmd"));
+        assertEquals("1234", command.parameters().get("sessionId"));
     }
 
     @Test
     public void returnsARemoteControlCommandWithMatchingSessionIdForAGenericRequest() {
-      HttpParameters parameters = new HttpParameters();
-      parameters.put("cmd", "generic");
-      parameters.put("sessionId", "1234");
+        HttpParameters parameters = new HttpParameters();
+        parameters.put("cmd", "generic");
+        parameters.put("sessionId", "1234");
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
 
-      SeleneseCommand command = new HttpCommandParser(parameters).parse(null);
-      assertEquals("1234", command.sessionId());
+        IDriverCommand command = new HttpCommandParser(request).parse(null);
+        assertEquals("1234", command.sessionId());
     }
 
     @Test
     public void returnsTestCompleteCommandForTestCompleteRequests() {
-      HttpParameters parameters = new HttpParameters();
-      parameters.put("cmd", "testComplete");
-      parameters.put("sessionId", "1234");
-
-      SeleneseCommand command = new HttpCommandParser(parameters).parse(null);
-      assertTrue(command instanceof TestCompleteCommand);
-      assertEquals("testComplete", command.parameters().get("cmd"));
-      assertEquals("1234", command.parameters().get("sessionId"));
-      assertEquals("1234", command.sessionId());
+        HttpParameters parameters = new HttpParameters();
+        parameters.put("cmd", "testComplete");
+        parameters.put("sessionId", "1234");
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+
+        IDriverCommand command = new HttpCommandParser(request).parse(null);
+        assertTrue(command instanceof TestCompleteCommand);
+        assertEquals("testComplete", command.parameters().get("cmd"));
+        assertEquals("1234", command.parameters().get("sessionId"));
+        assertEquals("1234", command.sessionId());
     }
 
 
@@ -73,22 +86,66 @@ public void returnsNewBrowserSessionCommandForNewSessionRequests() {
         final Mock environmentManager;
         final Environment expectedEnvironment;
         final HttpParameters parameters;
-        final SeleneseCommand command;
+        final IDriverCommand command;
 
         parameters = new HttpParameters();
         parameters.put("cmd", "getNewBrowserSession");
         parameters.put("1", "an environment name");
         parameters.put("2", "http://seleniumhq.org");
+        expectedEnvironment = new Environment("", "an environment name");
+        environmentManager = mock(EnvironmentManager.class);
+        environmentManager.expects("environment").with("an environment name").will(returnValue(expectedEnvironment));
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+
+        command = new HttpCommandParser(request).parse((EnvironmentManager) environmentManager);
+        assertEquals(true, command instanceof NewBrowserSessionCommand);
+        browserSessionCommand = (NewBrowserSessionCommand) command;
+
+        assertEquals("getNewBrowserSession", browserSessionCommand.parameters().get("cmd"));
+        assertEquals("an environment name", browserSessionCommand.parameters().get("1"));
+        assertEquals("http://seleniumhq.org", browserSessionCommand.parameters().get("2"));
+
+        assertEquals(expectedEnvironment, browserSessionCommand.environment());
+
+        verifyMocks();
+    }
+
+
+    @SuppressWarnings({"ConstantConditions"})
+    @Test
+    @Ignore
+    public void returnsNewBrowserSessionCommandForNewSessionRequestsAndOverwritesEnvironmentName() {
+        final NewBrowserSessionCommand browserSessionCommand;
+        final Mock environmentManager;
+        final Environment expectedEnvironment;
+        final IDriverCommand command;
+
+
+        Mock parameters = mock(HttpParameters.class);
+
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters((HttpParameters) parameters);
+        parameters.stubs("HttpParameters").with(request).will(returnValue(parameters));
+        parameters.stubs("get").with("cmd").will(returnValue("getNewBrowserSession"));
+        parameters.stubs("get").with("1").will(returnValue("an environment name"));
+        parameters.stubs("get").with("2").will(returnValue("http://seleniumhq.org"));
+        HashMap hm = new HashMap<String, String[]>();
+        hm.put("cmd", new String[]{"getNewBrowserSession"});
+        hm.put("1", new String[]{"an environment name"});
+        hm.put("2", new String[]{"http://seleniumhq.org"});
+        parameters.stubs("names").will(returnValue(hm.keySet()));
+
+        parameters.expects("put").with("1", "aBrowser");
+
         expectedEnvironment = new Environment("", "aBrowser");
         environmentManager = mock(EnvironmentManager.class);
         environmentManager.expects("environment").with("an environment name").will(returnValue(expectedEnvironment));
 
-        command = new HttpCommandParser(parameters).parse((EnvironmentManager) environmentManager);
+        command = new HttpCommandParser(request).parse((EnvironmentManager) environmentManager);
         assertEquals(true, command instanceof NewBrowserSessionCommand);
         browserSessionCommand = (NewBrowserSessionCommand) command;
 
         assertEquals("getNewBrowserSession", browserSessionCommand.parameters().get("cmd"));
-        assertEquals("aBrowser", browserSessionCommand.parameters().get("1"));
+        assertEquals("an environment name", browserSessionCommand.parameters().get("1"));
         assertEquals("http://seleniumhq.org", browserSessionCommand.parameters().get("2"));
 
         assertEquals(expectedEnvironment, browserSessionCommand.environment());
@@ -96,7 +153,6 @@ public void returnsNewBrowserSessionCommandForNewSessionRequests() {
         verifyMocks();
     }
 
-    
     @Test(expected = CommandParsingException.class)
     public void executeThrowsCommandParsingExceptionForNewBrowserSessionWhenEnvironmentIsNotKnown() {
         final Mock environmentManager;
@@ -108,8 +164,9 @@ public void executeThrowsCommandParsingExceptionForNewBrowserSessionWhenEnvironm
         parameters.put("2", "http://seleniumhq.org");
         environmentManager = mock(EnvironmentManager.class);
         environmentManager.expects("environment").with("an unknown environment name").will(returnValue(null));
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
 
-        new HttpCommandParser(parameters).parse((EnvironmentManager) environmentManager);
+        new HttpCommandParser(request).parse((EnvironmentManager) environmentManager);
         verifyMocks();
     }
 
@@ -122,7 +179,9 @@ public void executeThrowsCommandParsingExceptionForAGenericSeleneseCommandWhenSe
         parameters.put("cmd", "genericCommand");
         environmentManager = mock(EnvironmentManager.class);
 
-        new HttpCommandParser(parameters).parse((EnvironmentManager) environmentManager);
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+
+        new HttpCommandParser(request).parse((EnvironmentManager) environmentManager);
         verifyMocks();
     }
 
@@ -135,9 +194,11 @@ public void executeThrowsCommandParsingExceptionForTestCompleteCommandWhenSessio
         parameters.put("cmd", "testComplete");
         environmentManager = mock(EnvironmentManager.class);
 
-        new HttpCommandParser(parameters).parse((EnvironmentManager) environmentManager);
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+
+        new HttpCommandParser(request).parse((EnvironmentManager) environmentManager);
         verifyMocks();
     }
 
-    
+
 }
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java
index fe0905a1..3205c3ab 100755
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java
@@ -1,11 +1,11 @@
 package com.thoughtworks.selenium.grid.hub;
 
 import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.MockHelper;
 import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import org.apache.commons.httpclient.Header;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
@@ -18,15 +18,18 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
 
 public class HubServletTest extends UsingClassMock {
-    
+
     @Test
     public void replySetContentTypeAsPlainText() throws IOException {
         final Response remoteControlResponse;
         final Mock servletResponse;
 
-        remoteControlResponse = new Response(123, "");
+        remoteControlResponse = new Response(123, "", new Header[]{});
         servletResponse = mock(HttpServletResponse.class);
         servletResponse.expects("setContentType").with("text/plain");
         servletResponse.expects("getWriter").will(returnValue(new PrintWriter(new StringWriter(100))));
@@ -40,7 +43,7 @@ public void replySetCharacterEncodingToUTF8() throws IOException {
         final Response remoteControlResponse;
         final Mock servletResponse;
 
-        remoteControlResponse = new Response(123, "");
+        remoteControlResponse = new Response(123, "", new Header[]{});
         servletResponse = mock(HttpServletResponse.class);
         servletResponse.expects("setCharacterEncoding").with("UTF-8");
         servletResponse.expects("getWriter").will(returnValue(new PrintWriter(new StringWriter(100))));
@@ -54,7 +57,7 @@ public void replySetStatusFromRemoteControlOnTheServletResponse() throws IOExcep
         final Response remoteControlResponse;
         final Mock servletResponse;
 
-        remoteControlResponse = new Response(123, "");
+        remoteControlResponse = new Response(123, "", new Header[]{});
         servletResponse = mock(HttpServletResponse.class);
         servletResponse.expects("setStatus").with(123);
         servletResponse.expects("getWriter").will(returnValue(new PrintWriter(new StringWriter(100))));
@@ -69,7 +72,7 @@ public void replyWriteRemoteControlResponseOnServletResponseAsPlainText() throws
         final Response remoteControlResponse;
         final Mock servletResponse;
 
-        remoteControlResponse = new Response(0, "some response message");
+        remoteControlResponse = new Response(0, "some response message", new Header[]{});
         servletResponse = mock(HttpServletResponse.class);
         servletResponse.expects("getWriter").will(returnValue(new PrintWriter(writer)));
 
@@ -95,12 +98,14 @@ public void forwardExecuteTheSeleneseCommandOnTheAppropriateRemoteControl() thro
         pool = mock(DynamicRemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         environmentManager = mock(EnvironmentManager.class);
-        response = new Response(0, "");
+        response = new Response(0, "", new Header[]{});
+
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(requestParameters);
 
         pool.expects("retrieve").with("a session id").will(returnValue(remoteControl));
-        remoteControl.expects("forward").with(eq(requestParameters)).will(returnValue(response));
+        remoteControl.expects("forward").with(request).will(returnValue(response));
 
-        assertEquals(response, servlet.forward(requestParameters, (DynamicRemoteControlPool) pool, (EnvironmentManager) environmentManager));
+        assertEquals(response, servlet.forward((HttpServletRequest) request, (DynamicRemoteControlPool) pool, (EnvironmentManager) environmentManager));
         verifyMocks();
     }
 
@@ -120,9 +125,11 @@ public void forwardReturnAnErrorMessageWhenACommandParsingExceptionIsThrown() th
         pool = mock(DynamicRemoteControlPool.class);
         environmentManager = mock(EnvironmentManager.class);
 
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(requestParameters);
+
         pool.expects("retrieve").with("a session id").will(throwException(new CommandParsingException("an error message")));
 
-        response = servlet.forward(requestParameters, (DynamicRemoteControlPool) pool, (EnvironmentManager) environmentManager);
+        response = servlet.forward((HttpServletRequest) request, (DynamicRemoteControlPool) pool, (EnvironmentManager) environmentManager);
         assertEquals(200, response.statusCode());
         assertEquals("ERROR: an error message", response.body());
         verifyMocks();
@@ -144,12 +151,14 @@ public void forwardReturnAnErrorMessageWhenANoSuchEnvironmentExceptionIsThrown()
         pool = mock(DynamicRemoteControlPool.class);
         environmentManager = mock(EnvironmentManager.class);
 
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(requestParameters);
+
         pool.expects("retrieve").with("a session id").will(throwException(new NoSuchEnvironmentException("an environment")));
 
-        response = servlet.forward(requestParameters, (DynamicRemoteControlPool) pool, (EnvironmentManager) environmentManager);
+        response = servlet.forward((HttpServletRequest) request, (DynamicRemoteControlPool) pool, (EnvironmentManager) environmentManager);
         assertEquals(200, response.statusCode());
         assertTrue(response.body().startsWith(
-            "ERROR: Could not find any remote control providing the 'an environment' environment"));
+                "ERROR: Could not find any remote control providing the 'an environment' environment"));
         verifyMocks();
     }
 
@@ -161,7 +170,7 @@ public void requestParametersReturnsAdaptedRequestParameters() {
         final Mock request;
 
         parameterMap = new HashMap<String, String[]>();
-        parameterMap.put("a name", new String[] { "a value"});
+        parameterMap.put("a name", new String[]{"a value"});
         request = mock(HttpServletRequest.class);
         request.expects("getParameterMap").will(returnValue(parameterMap));
         servlet = new HubServlet();
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/RemoteControlParserTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/RemoteControlParserTest.java
index be1a9f6d..e19563d5 100755
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/RemoteControlParserTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/RemoteControlParserTest.java
@@ -1,19 +1,20 @@
 package com.thoughtworks.selenium.grid.hub.management;
 
-import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import static junit.framework.Assert.assertEquals;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.IRemoteControlProxy;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
 
 import javax.servlet.http.HttpServletRequest;
 
+import static junit.framework.Assert.assertEquals;
+
 public class RemoteControlParserTest extends UsingClassMock {
 
     @Test
     public void parseReturnsARemoteControlWhoseHostMatchHttpParameter() {
         final Mock httpRequest;
-        final RemoteControlProxy remoteControl;
+        final IRemoteControlProxy remoteControl;
 
         httpRequest = mock(HttpServletRequest.class);
         httpRequest.expects("getParameter").with("host").will(returnValue("some.host.com"));
@@ -27,7 +28,7 @@ public void parseReturnsARemoteControlWhoseHostMatchHttpParameter() {
     @Test
     public void parseReturnsARemoteControlWhosePortMatchHttpParameter() {
         final Mock httpRequest;
-        final RemoteControlProxy remoteControl;
+        final IRemoteControlProxy remoteControl;
 
         httpRequest = mock(HttpServletRequest.class);
         httpRequest.expects("getParameter").with("port").will(returnValue("1234"));
@@ -41,7 +42,7 @@ public void parseReturnsARemoteControlWhosePortMatchHttpParameter() {
     @Test
     public void parseReturnsARemoteControlWhoseEnvironmentMatchHttpParameter() {
         final Mock httpRequest;
-        final RemoteControlProxy remoteControl;
+        final IRemoteControlProxy remoteControl;
 
         httpRequest = mock(HttpServletRequest.class);
         httpRequest.expects("getParameter").with("environment").will(returnValue("an environment"));
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/UnregistrationServletTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/UnregistrationServletTest.java
index 5bf7b7ba..a348167d 100755
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/UnregistrationServletTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/UnregistrationServletTest.java
@@ -3,7 +3,6 @@
 import com.thoughtworks.selenium.grid.hub.HubRegistry;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import static junit.framework.Assert.assertSame;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
@@ -12,6 +11,8 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+import static junit.framework.Assert.assertSame;
+
 public class UnregistrationServletTest extends UsingClassMock {
 
     @Test
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleControllerTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleControllerTest.java
index cfe22c42..bd847791 100755
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleControllerTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleControllerTest.java
@@ -6,8 +6,6 @@
 import com.thoughtworks.selenium.grid.hub.management.console.mvc.Page;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertSame;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
@@ -18,6 +16,9 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertSame;
+
 public class ConsoleControllerTest extends UsingClassMock {
 
     @Test
@@ -134,7 +135,7 @@ public void rendersIndexPage() throws IOException {
         response.stubs("getWriter").will(returnValue(mock(PrintWriter.class)));
         remoteControls = new RemoteControlProxy[]{new RemoteControlProxy("a host", 0, "an environment", null)};
         page = new Page("index.html");
-        page.set("environments", new Environment[] { new Environment("a environment", "a browser")});
+        page.set("environments", new Environment[]{new Environment("a environment", "a browser")});
         page.set("availableRemoteControls", remoteControls);
         page.set("reservedRemoteControls", remoteControls);
 
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java
index 170c0df0..02dfcc4e 100755
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java
@@ -1,24 +1,21 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol;
 
 import com.thoughtworks.selenium.grid.HttpClient;
+import com.thoughtworks.selenium.grid.MockHelper;
 import com.thoughtworks.selenium.grid.hub.Environment;
 import com.thoughtworks.selenium.grid.hub.EnvironmentManager;
 import com.thoughtworks.selenium.grid.hub.NoSuchEnvironmentException;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
-
 import com.thoughtworks.selenium.grid.hub.NoSuchSessionException;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
-import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 
 import java.util.Date;
 import java.util.List;
 
+import static junit.framework.Assert.*;
+import static org.junit.Assert.assertNotNull;
+
 
 public class GlobalRemoteControlPoolTest extends UsingClassMock {
 
@@ -98,7 +95,7 @@ public void onceUnregisteredARemoteControlIsNotAssociatedWithAnyExistingSession(
         try {
             pool.retrieve("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
 
@@ -139,8 +136,8 @@ public RemoteControlProvisioner getProvisioner(String environment) {
         try {
             pool.reserve(new Environment("an environment", ""));
             fail("did not catch NoSuchEnvironmentException as expected");
-        } catch(NoSuchEnvironmentException e) {
-            assertEquals("an environment", e.environment());  
+        } catch (NoSuchEnvironmentException e) {
+            assertEquals("an environment", e.environment());
         }
     }
 
@@ -149,7 +146,7 @@ public void getRemoteControlRaisesNoSuchSessionExceptionWhenNoRemoteControlHasBe
         try {
             new GlobalRemoteControlPool().retrieve("unknown session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("unknown session id", e.sessionId());
         }
     }
@@ -187,9 +184,10 @@ public void associateWithSessionKeepsTrackOfEachSessionIndependently() {
     @Test
     public void afterReleaseForSessionARemoteControlIsNotAssociatedWithASessionAnymore() {
         final RemoteControlProxy remoteControl;
-        final GlobalRemoteControlPool pool;                                                
+        final GlobalRemoteControlPool pool;
 
         remoteControl = new HealthyRemoteControl("", 0, "an environment", new HttpClient());
+        remoteControl.setRequest(MockHelper.GetMockHttpServletRequest());
         pool = new GlobalRemoteControlPool();
         pool.register(remoteControl);
         pool.reserve(new Environment("an environment", ""));
@@ -200,7 +198,7 @@ public void afterReleaseForSessionARemoteControlIsNotAssociatedWithASessionAnymo
         try {
             pool.retrieve("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
     }
@@ -217,6 +215,7 @@ public void releaseForSessionReleasesTheRemoteControlOnTheProvisioner() {
         final GlobalRemoteControlPool pool;
 
         remoteControl = new RemoteControlProxy("", 0, "an environment", new HttpClient());
+        remoteControl.setRequest(MockHelper.GetMockHttpServletRequest());
         provisioner = mock(RemoteControlProvisioner.class);
         pool = new GlobalRemoteControlPool() {
             public RemoteControlProvisioner getProvisioner(String environment) {
@@ -233,7 +232,7 @@ public RemoteControlProvisioner getProvisioner(String environment) {
         try {
             pool.retrieve("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
 
@@ -262,7 +261,7 @@ public RemoteControlProvisioner getProvisioner(String environment) {
         try {
             pool.retrieve("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
 
@@ -303,7 +302,7 @@ public void getPoolForSessionRaisesNoSuchSessionExceptionWhenNoPoolHaveBeenAssoc
         try {
             new GlobalRemoteControlPool().getRemoteControlForSession("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
     }
@@ -314,6 +313,7 @@ public void aRemoteControlIsNotAssociatedWithTheSessionAfterCallingReleaseForSes
         final GlobalRemoteControlPool pool;
 
         remoteControl = new HealthyRemoteControl("host", 0, "an environment", new HttpClient());
+        remoteControl.setRequest(MockHelper.GetMockHttpServletRequest());
         pool = new GlobalRemoteControlPool();
 
         pool.register(remoteControl);
@@ -324,7 +324,7 @@ public void aRemoteControlIsNotAssociatedWithTheSessionAfterCallingReleaseForSes
         try {
             pool.getRemoteControlForSession("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
     }
@@ -365,14 +365,14 @@ public void availableRemoteControlsReturnAnEmptyArrayWhenThereIsNoEnvironment()
     public void availableRemoteControlsReturnAvailableRemoteControlsForAllEnvironments() {
         final HealthyRemoteControl anotherRCForTheSecondEnvironment;
         final HealthyRemoteControl aRCForAnotherEnvironment;
-        final List<RemoteControlProxy> availableRemoteControls;
+        final List<IRemoteControlProxy> availableRemoteControls;
         final EnvironmentManager environmentManager;
         final Environment firstEnvironment;
         final Environment secondEnvironment;
         final GlobalRemoteControlPool pool;
         final HealthyRemoteControl aRC;
 
-        
+
         environmentManager = new EnvironmentManager();
         firstEnvironment = new Environment("first environment", "*chrome");
         secondEnvironment = new Environment("second environment", "*chrome");
@@ -396,7 +396,7 @@ public void availableRemoteControlsReturnAvailableRemoteControlsForAllEnvironmen
 
     @Test
     public void availableRemoteControlsDoNotReturnReservedRemoteControls() {
-        final List<RemoteControlProxy> availableRemoteControls;
+        final List<IRemoteControlProxy> availableRemoteControls;
         final EnvironmentManager environmentManager;
         final Environment anEnvironment;
         final GlobalRemoteControlPool pool;
@@ -455,7 +455,7 @@ public void reservedRemoteControlsReturnAnEmptyArrayWhenThereIsNoEnvironment() {
     public void reservedRemoteControlsReturnsReservedRemoteControlsForAllEnvironemnt() {
         final HealthyRemoteControl anotherRCForTheSecondEnvironment;
         final HealthyRemoteControl aRCForAnotherEnvironment;
-        final List<RemoteControlProxy> reservedRemoteControls;
+        final List<IRemoteControlProxy> reservedRemoteControls;
         final EnvironmentManager environmentManager;
         final Environment firstEnvironment;
         final Environment secondEnvironment;
@@ -491,7 +491,7 @@ public void reservedRemoteControlsReturnsReservedRemoteControlsForAllEnvironemnt
 
     @Test
     public void reservedRemoteControlsDoNotReturnAvailableRemoteControls() {
-        final List<RemoteControlProxy> reservedRemoteControls;
+        final List<IRemoteControlProxy> reservedRemoteControls;
         final EnvironmentManager environmentManager;
         final Environment anEnvironment;
         final GlobalRemoteControlPool pool;
@@ -549,7 +549,7 @@ public void allRegisteredRemoteControlsReturnAnEmptyArrayWhenThereIsNoEnvironmen
     public void allRegisteredRemoteControlsReturnAllAvailableRemoteControlsForAllEnvironmentsWhenNoneAreReserved() {
         final HealthyRemoteControl anotherRCForTheSecondEnvironment;
         final HealthyRemoteControl aRCForAnotherEnvironment;
-        final List<RemoteControlProxy> allRegisteredRemoteControls;
+        final List<IRemoteControlProxy> allRegisteredRemoteControls;
         final EnvironmentManager environmentManager;
         final Environment firstEnvironment;
         final Environment secondEnvironment;
@@ -580,7 +580,7 @@ public void allRegisteredRemoteControlsReturnAllAvailableRemoteControlsForAllEnv
 
     @Test
     public void allRegisteredRemoteControlsReturnsAvailableAndReservedRemoteControls() {
-        final List<RemoteControlProxy> allRegisteredRemoteControls;
+        final List<IRemoteControlProxy> allRegisteredRemoteControls;
         final EnvironmentManager environmentManager;
         final Environment anEnvironment;
         final GlobalRemoteControlPool pool;
@@ -607,7 +607,7 @@ public void allRegisteredRemoteControlsReturnsAvailableAndReservedRemoteControls
 
     @Test
     public void allRegisteredRemoteControlsReturnsAllReservedRemoteControls() {
-        final List<RemoteControlProxy> allRegisteredRemoteControls;
+        final List<IRemoteControlProxy> allRegisteredRemoteControls;
         final EnvironmentManager environmentManager;
         final Environment anEnvironment;
         final GlobalRemoteControlPool pool;
@@ -694,6 +694,7 @@ public void recycleSessionIfIdleForTooLongDoesReleaseTheSessionWhenIdleForTooLon
         final Mock httpClient = mock(HttpClient.class);
         httpClient.stubs("post");
         aRC = new HealthyRemoteControl("host", 4444, "an environment", (HttpClient) httpClient);
+        aRC.setRequest(MockHelper.GetMockHttpServletRequest());
 
         pool = new GlobalRemoteControlPool();
         pool.register(aRC);
@@ -707,7 +708,7 @@ public void recycleSessionIfIdleForTooLongDoesReleaseTheSessionWhenIdleForTooLon
         try {
             pool.getRemoteControlForSession("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
     }
@@ -738,6 +739,7 @@ public void recycleSessionIfIdleForTooLongConvertTheMaxIdleIntervalFromSecondsTo
         final Mock httpClient = mock(HttpClient.class);
         httpClient.stubs("post");
         aRC = new HealthyRemoteControl("host", 4444, "an environment", (HttpClient) httpClient);
+        aRC.setRequest(MockHelper.GetMockHttpServletRequest());
 
         pool = new GlobalRemoteControlPool();
         pool.register(aRC);
@@ -752,7 +754,7 @@ public void recycleSessionIfIdleForTooLongConvertTheMaxIdleIntervalFromSecondsTo
         try {
             pool.getRemoteControlForSession("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
     }
@@ -779,6 +781,7 @@ public void recycleAllSessionsIdleForTooLongDoesReleaseRemoteControlsAssociatedW
         final Mock httpClient = mock(HttpClient.class);
         httpClient.stubs("post");
         rc = new HealthyRemoteControl("host", 4444, "an environment", (HttpClient) httpClient);
+        rc.setRequest(MockHelper.GetMockHttpServletRequest());
 
         pool = new GlobalRemoteControlPool();
         pool.register(rc);
@@ -791,7 +794,7 @@ public void recycleAllSessionsIdleForTooLongDoesReleaseRemoteControlsAssociatedW
         try {
             pool.getRemoteControlForSession("a session id");
             fail("did not catch NoSuchSessionException as expected");
-        } catch(NoSuchSessionException e) {
+        } catch (NoSuchSessionException e) {
             assertEquals("a session id", e.sessionId());
         }
     }
@@ -860,7 +863,7 @@ public void isRegisteredReturnsTrueWhenRemoteControlHasNeverBeenRegistered() {
         final GlobalRemoteControlPool pool;
 
         pool = new GlobalRemoteControlPool();
-        assertFalse(pool.isRegistered( new RemoteControlProxy("", 0, "an environment", null)));
+        assertFalse(pool.isRegistered(new RemoteControlProxy("", 0, "an environment", null)));
     }
 
     @Test
@@ -878,5 +881,5 @@ public void isRegisteredReturnsTrueWhenRemoteControlAreRegisteredWithMultipleEnv
         assertTrue(pool.isRegistered(aRemoteControl));
         assertTrue(pool.isRegistered(anotherRemoteControl));
     }
-    
+
 }
\ No newline at end of file
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProvisionerTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProvisionerTest.java
index 03f6bc91..f6786284 100755
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProvisionerTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProvisionerTest.java
@@ -1,15 +1,12 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol;
 
 import com.thoughtworks.selenium.grid.hub.ConcurrentAction;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static org.junit.Assert.assertSame;
-
 import com.thoughtworks.selenium.grid.hub.HubRegistry;
 import org.junit.Test;
 
+import static junit.framework.Assert.*;
+import static org.junit.Assert.assertSame;
+
 public class RemoteControlProvisionerTest {
 
     @Test
@@ -22,34 +19,34 @@ public void onceAddedARemoteControlIsPartOfTheAvailableList() {
         assertTrue(provisioner.availableRemoteControls().contains(remoteControl));
     }
 
-	@Test
-	public void whenAddingTwoRemoteControlsThatAreEqualsTheFirstIsReplacedByTheSecond() {
-		final RemoteControlProvisioner provisioner;
-        final RemoteControlProxy availableRc;
+    @Test
+    public void whenAddingTwoRemoteControlsThatAreEqualsTheFirstIsReplacedByTheSecond() {
+        final RemoteControlProvisioner provisioner;
+        final IRemoteControlProxy availableRc;
 
-		provisioner = new RemoteControlProvisioner();
+        provisioner = new RemoteControlProvisioner();
 
-		RemoteControlProxy oldRC = new RemoteControlProxy("a", 0, "", null);
-		RemoteControlProxy newRC = new RemoteControlProxy("a", 0, "", null);
+        RemoteControlProxy oldRC = new RemoteControlProxy("a", 0, "", null);
+        RemoteControlProxy newRC = new RemoteControlProxy("a", 0, "", null);
 
-		provisioner.add(oldRC);
-		provisioner.add(newRC);
+        provisioner.add(oldRC);
+        provisioner.add(newRC);
 
         availableRc = provisioner.findNextAvailableRemoteControl();
         assertSame(newRC, availableRc);
-	}
+    }
 
-	@Test
-	public void whenReplacingRemoteControlFirstRemoveAllRegisteredSessions() {
+    @Test
+    public void whenReplacingRemoteControlFirstRemoveAllRegisteredSessions() {
         final RemoteControlProvisioner provisioner;
 
         provisioner = new RemoteControlProvisioner();
-		RemoteControlProxy oldRC = new RemoteControlProxy("a", 0, "", null);
+        RemoteControlProxy oldRC = new RemoteControlProxy("a", 0, "", null);
         RemoteControlProxy newRC = new RemoteControlProxy("a", 0, "", null);
 
-	    oldRC.registerNewSession();
+        oldRC.registerNewSession();
 
-		assertTrue(oldRC.sessionInProgress());
+        assertTrue(oldRC.sessionInProgress());
 
         provisioner.add(oldRC);
         provisioner.add(newRC);
@@ -57,15 +54,15 @@ public void whenReplacingRemoteControlFirstRemoveAllRegisteredSessions() {
         assertEquals(0, provisioner.reservedRemoteControls().size());
         assertEquals(1, provisioner.availableRemoteControls().size());
         assertEquals(newRC,
-                     provisioner.availableRemoteControls().get(0));
-		assertFalse(newRC.sessionInProgress());
+                provisioner.availableRemoteControls().get(0));
+        assertFalse(newRC.sessionInProgress());
     }
 
     @Test
     public void multipleRemoteControlsCanBeAdded() {
         final RemoteControlProvisioner provisioner;
-        final RemoteControlProxy firstRemoteControl;
-        final RemoteControlProxy secondRemoteControl;
+        final IRemoteControlProxy firstRemoteControl;
+        final IRemoteControlProxy secondRemoteControl;
 
         provisioner = new RemoteControlProvisioner();
         firstRemoteControl = new RemoteControlProxy("a", 0, "", null);
@@ -81,7 +78,7 @@ public void multipleRemoteControlsCanBeAdded() {
     @Test
     public void onceRemovedARemoteControlIsNotPartOfTheAvailableList() {
         final RemoteControlProvisioner provisioner = new RemoteControlProvisioner();
-        final RemoteControlProxy remoteControl = new RemoteControlProxy("", 0, "", null);
+        final IRemoteControlProxy remoteControl = new RemoteControlProxy("", 0, "", null);
         provisioner.add(remoteControl);
 
         provisioner.remove(remoteControl);
@@ -91,8 +88,8 @@ public void onceRemovedARemoteControlIsNotPartOfTheAvailableList() {
     @Test
     public void removeOnlyRemovesASpecificRemoteControl() {
         final RemoteControlProvisioner provisioner = new RemoteControlProvisioner();
-        final RemoteControlProxy firstRemoteControl = new HealthyRemoteControl("a", 0, "", null);
-        final RemoteControlProxy secondRemoteControl = new HealthyRemoteControl("b", 0, "", null);
+        final IRemoteControlProxy firstRemoteControl = new HealthyRemoteControl("a", 0, "", null);
+        final IRemoteControlProxy secondRemoteControl = new HealthyRemoteControl("b", 0, "", null);
         provisioner.add(firstRemoteControl);
         provisioner.add(secondRemoteControl);
 
@@ -110,7 +107,7 @@ public void removeReturnsFalseForARemoteControlThanHasNeverBeenAdded() {
     @Test
     public void removeReturnsTrueForAnAvailableRemoteControl() {
         final RemoteControlProvisioner provisioner = new RemoteControlProvisioner();
-        final RemoteControlProxy remoteControl = new RemoteControlProxy("", 0, "", null);
+        final IRemoteControlProxy remoteControl = new RemoteControlProxy("", 0, "", null);
         provisioner.add(remoteControl);
 
         assertTrue(provisioner.remove(remoteControl));
@@ -119,7 +116,7 @@ public void removeReturnsTrueForAnAvailableRemoteControl() {
     @Test
     public void removeReturnsTrueForAReservedRemoteControl() {
         final RemoteControlProvisioner provisioner = new RemoteControlProvisioner();
-        final RemoteControlProxy remoteControl = new HealthyRemoteControl("", 0, "", null);
+        final IRemoteControlProxy remoteControl = new HealthyRemoteControl("", 0, "", null);
         provisioner.add(remoteControl);
         provisioner.reserve();
 
@@ -363,7 +360,7 @@ public void releaseMakesAReservedRemoteControlAvailable() {
 
     @Test
     public void reservedRemoteControlsReturnsAnEmptyArrayWhenNoneHaveBeenAdded() {
-      assertTrue(new RemoteControlProvisioner().reservedRemoteControls().isEmpty());
+        assertTrue(new RemoteControlProvisioner().reservedRemoteControls().isEmpty());
     }
 
     @Test
@@ -385,10 +382,10 @@ public void reservedRemoteControlsReturnsARemoteControlThatHaveBeenReserved() {
         assertEquals(1, provisioner.reservedRemoteControls().size());
         assertTrue(provisioner.reservedRemoteControls().contains(remoteControl));
     }
-    
+
     @Test
     public void availableRemoteControlsReturnsAnEmptyArrayWhenNoneHaveBeenAdded() {
-      assertTrue(new RemoteControlProvisioner().availableRemoteControls().isEmpty());
+        assertTrue(new RemoteControlProvisioner().availableRemoteControls().isEmpty());
     }
 
     @Test
@@ -403,7 +400,7 @@ public void availableRemoteControlsReturnsARemoteControlThanHasBeenAdded() {
 
     @Test
     public void allRemoteControlsReturnsAnEmptyArrayWhenNoneHaveBeenAdded() {
-      assertTrue(new RemoteControlProvisioner().allRemoteControls().isEmpty());
+        assertTrue(new RemoteControlProvisioner().allRemoteControls().isEmpty());
     }
 
     @Test
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProxyTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProxyTest.java
index 8d675cd7..a63ba9dd 100755
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProxyTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlProxyTest.java
@@ -1,21 +1,19 @@
 package com.thoughtworks.selenium.grid.hub.remotecontrol;
 
-import static com.thoughtworks.selenium.grid.AssertionHelper.assertDistinctHashCodes;
-import static com.thoughtworks.selenium.grid.AssertionHelper.assertNotEquals;
-import static com.thoughtworks.selenium.grid.AssertionHelper.assertSameHashCode;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
 import com.thoughtworks.selenium.grid.HttpClient;
 import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.MockHelper;
 import com.thoughtworks.selenium.grid.Response;
+import org.apache.commons.httpclient.Header;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+import static com.thoughtworks.selenium.grid.AssertionHelper.*;
+import static junit.framework.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class RemoteControlProxyTest {
 
@@ -114,25 +112,26 @@ public void remoteControlPingURLTargetsTheBlankPage() {
         final RemoteControlProxy proxy = new RemoteControlProxy("localhost", 5555, "", null);
         assertEquals("http://localhost:5555/selenium-server/heartbeat", proxy.remoteControlPingURL());
     }
-	
+
     @Test
     public void forwardReturnsTheResponseOfTheSeleniumRC() throws IOException {
-        final RemoteControlProxy proxy;
+        final IRemoteControlProxy proxy;
         final Response expectedResponse;
         final HttpParameters parameters;
-        
+
         HttpClient client = mock(HttpClient.class);
         parameters = new HttpParameters();
-        expectedResponse = new Response(0, "");
+        HttpServletRequest request = MockHelper.GetMockRequestWithParameters(parameters);
+        expectedResponse = new Response(0, "", new Header[]{});
         when(client.post("http://foo:10/selenium-server/driver/", parameters)).thenReturn(expectedResponse);
         proxy = new RemoteControlProxy("foo", 10, "", (HttpClient) client);
-        assertEquals(expectedResponse, proxy.forward(parameters));
+        assertEquals(expectedResponse, proxy.forward(request));
     }
 
     @Test
     public void toStringMethodReturnsAHumanFriendlyDescriptionWithServerAndPortInformation() {
         assertEquals("[RemoteControlProxy grid.thoughtworks.org:4444#false]",
-                     new RemoteControlProxy("grid.thoughtworks.org", 4444, "", null).toString());
+                new RemoteControlProxy("grid.thoughtworks.org", 4444, "", null).toString());
     }
 
     @Test
@@ -161,7 +160,7 @@ public void aRemoteControlsIsNotEqualToItself() {
     @Test
     public void twoRemoteControlsAreEqualIfTheirHostAndPortMatch() {
         assertEquals(new RemoteControlProxy("a.host.com", 24, "", new HttpClient()),
-                     new RemoteControlProxy("a.host.com", 24, "", new HttpClient()));
+                new RemoteControlProxy("a.host.com", 24, "", new HttpClient()));
     }
 
     @Test
@@ -187,7 +186,7 @@ public void twoRemoteControlsAreNotEqualIfTheirPortsDoNotMatch() {
     @Test
     public void twoRemoteControlsHaveTheSameHashcodeIfTheirHostAndPortMatch() {
         assertSameHashCode(new RemoteControlProxy("a.host.com", 24, "", new HttpClient()),
-                           new RemoteControlProxy("a.host.com", 24, "", new HttpClient()));
+                new RemoteControlProxy("a.host.com", 24, "", new HttpClient()));
     }
 
     @Test
@@ -216,7 +215,7 @@ public void unreliableReturnsFalseWhenTheResponseIsSuccessful() throws IOExcepti
         final Response successfulResponse;
 
         HttpClient client = mock(HttpClient.class);
-        successfulResponse = new Response(200, "");
+        successfulResponse = new Response(200, "", new Header[]{});
         when(client.get("http://foo:10/selenium-server/heartbeat")).thenReturn(successfulResponse);
         proxy = new RemoteControlProxy("foo", 10, "", (HttpClient) client);
         proxy.registerNewSession();
@@ -227,15 +226,15 @@ public void unreliableReturnsFalseWhenTheResponseIsSuccessful() throws IOExcepti
     public void unreliableReturnsTrueWhenTheResponseIsA500() throws IOException {
         final RemoteControlProxy proxy;
         final Response badResponse;
-        
+
         HttpClient client = mock(HttpClient.class);
-        badResponse = new Response(500, "");
+        badResponse = new Response(500, "", new Header[]{});
         when(client.get("http://foo:10/selenium-server/heartbeat")).thenReturn(badResponse);
         proxy = new RemoteControlProxy("foo", 10, "", (HttpClient) client);
         proxy.registerNewSession();
         assertTrue(proxy.unreliable());
     }
-    
+
     @Test
     public void unreliableReturnsTrueWhenTheRemoteControlCannotBeReached() throws IOException {
         final RemoteControlProxy proxy;
@@ -246,22 +245,22 @@ public void unreliableReturnsTrueWhenTheRemoteControlCannotBeReached() throws IO
         proxy.registerNewSession();
         assertTrue(proxy.unreliable());
     }
-	
+
     @Test
     public void unreliableReturnsFalseWhenTheRemoteControlCannotBeReachedAtFirstButRecovers() throws IOException {
         final RemoteControlProxy proxy;
         final Response successfulResponse;
 
         HttpClient client = mock(HttpClient.class);
-        successfulResponse = new Response(200, "");
+        successfulResponse = new Response(200, "", new Header[]{});
         when(client.get("http://foo:10/selenium-server/heartbeat"))
-    		.thenThrow(new RuntimeException())
-    		.thenReturn(successfulResponse);
+                .thenThrow(new RuntimeException())
+                .thenReturn(successfulResponse);
         proxy = new RemoteControlProxy("foo", 10, "", (HttpClient) client);
         proxy.registerNewSession();
         assertFalse(proxy.unreliable());
     }
-	
+
     @Test
     public void unreliableReturnsFalseWhenTheResponseIsA500ThenA200() throws IOException {
         final RemoteControlProxy proxy;
@@ -269,12 +268,12 @@ public void unreliableReturnsFalseWhenTheResponseIsA500ThenA200() throws IOExcep
         final Response successfulResponse;
 
         HttpClient client = mock(HttpClient.class);
-        badResponse = new Response(500, "");
-        successfulResponse = new Response(200, "");
+        badResponse = new Response(500, "", new Header[]{});
+        successfulResponse = new Response(200, "", new Header[]{});
         when(client.get("http://foo:10/selenium-server/heartbeat")).thenReturn(badResponse, successfulResponse);
         proxy = new RemoteControlProxy("foo", 10, "", (HttpClient) client);
         proxy.registerNewSession();
         assertFalse(proxy.unreliable());
     }
-	
+
 }
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/NewBrowserSessionCommandTest.java
old mode 100755
new mode 100644
similarity index 82%
rename from hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommandTest.java
rename to hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/NewBrowserSessionCommandTest.java
index 353b3856..0d9adc0a
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommandTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/NewBrowserSessionCommandTest.java
@@ -1,4 +1,4 @@
-package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium;
 
 import com.thoughtworks.selenium.grid.HttpParameters;
 import com.thoughtworks.selenium.grid.Response;
@@ -6,12 +6,15 @@
 import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import static junit.framework.Assert.assertEquals;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.HashMap;
+
+import static junit.framework.Assert.assertEquals;
 
 
 public class NewBrowserSessionCommandTest extends UsingClassMock {
@@ -52,14 +55,14 @@ public void executeReserveAndThenAssociateARemoteControlWithTheSession() throws
         final Response expectedResponse;
         final Environment environment;
         final HttpParameters parameters;
+        HttpServletRequest theRequest = getMockHttpServletRequest();
 
         expectedResponse = new Response(0, "OK,1234");
-        parameters = new HttpParameters();
         pool = mock(DynamicRemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         environment = new Environment("an environment", "*browser");
-        command = new NewBrowserSessionCommand(environment, parameters);
-        remoteControl.expects("forward").with(parameters).will(returnValue(expectedResponse));
+        command = new NewBrowserSessionCommand(environment, theRequest);
+        remoteControl.expects("forward").with(command.request()).will(returnValue(expectedResponse));
         pool.expects("reserve").with(environment).will(returnValue(remoteControl));
         pool.expects("associateWithSession").with(anything(), eq("1234"));  // TODO with(remoteControl, ...)
 
@@ -74,13 +77,14 @@ public void executeReturnsAnErrorResponseWhenSessionCannotBeCreated() throws IOE
         final Environment environment;
         final Mock pool;
         final Response response;
+        HttpServletRequest theRequest = getMockHttpServletRequest();
 
         pool = mock(DynamicRemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         environment = new Environment("an environment", "*browser");
-        command = new NewBrowserSessionCommand(environment, new HttpParameters());
+        command = new NewBrowserSessionCommand(environment, theRequest);
         pool.expects("reserve").with(environment).will(returnValue(remoteControl));
-        remoteControl.expects("forward").with(command.parameters()).will(returnValue(new Response(500, "")));
+        remoteControl.expects("forward").with(command.request()).will(returnValue(new Response(500, "")));
 
         response = command.execute((RemoteControlPool) pool);
         assertEquals(200, response.statusCode());
@@ -95,11 +99,12 @@ public void executeReleaseRemoteControlWhenSessionCannotBeCreated() throws IOExc
         final Mock remoteControl;
         final Response response;
         final Mock pool;
+        HttpServletRequest theRequest = getMockHttpServletRequest();
 
         pool = mock(DynamicRemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         environment = new Environment("an environment", "*browser");
-        command = new NewBrowserSessionCommand(environment, new HttpParameters());
+        command = new NewBrowserSessionCommand(environment, theRequest);
         pool.stubs("reserve").will(returnValue(remoteControl));
         pool.expects("release").with(remoteControl);
         remoteControl.stubs("forward").will(returnValue(new Response(500, "")));
@@ -113,17 +118,19 @@ public void executeReleaseRemoteControlWhenSessionCannotBeCreated() throws IOExc
     @SuppressWarnings({"ThrowableInstanceNeverThrown"})
     @Test
     public void executeReturnsAnErrorResponseWhenThereIsANetworkError() throws IOException {
+        String helloWorld = "Hello World";
         final NewBrowserSessionCommand command;
         final Environment environment;
         final Mock remoteControl;
         final Response response;
         final Mock pool;
+        HttpServletRequest theRequest = getMockHttpServletRequest();
 
         pool = mock(DynamicRemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         environment = new Environment("an environment", "*browser");
-        command = new NewBrowserSessionCommand(environment, new HttpParameters());
-        remoteControl.expects("forward").with(command.parameters()).will(throwException(new IOException("an error message")));
+        command = new NewBrowserSessionCommand(environment, theRequest);
+        remoteControl.expects("forward").with(command.request()).will(throwException(new IOException("an error message")));
         pool.expects("reserve").with(environment).will(returnValue(remoteControl));
         pool.stubs("release").with(remoteControl);
 
@@ -133,6 +140,12 @@ public void executeReturnsAnErrorResponseWhenThereIsANetworkError() throws IOExc
         verifyMocks();
     }
 
+    private HttpServletRequest getMockHttpServletRequest() {
+        Mock servletRequest = mock(HttpServletRequest.class);
+        servletRequest.stubs("getParameterMap").will(returnValue(new HashMap()));
+        return (HttpServletRequest) servletRequest;
+    }
+
     @SuppressWarnings({"ThrowableInstanceNeverThrown"})
     @Test
     public void executeReleasesReservedRemoteControlAndReturnsAnErrorResponseWhenThereIsANetworkError() throws IOException {
@@ -140,11 +153,12 @@ public void executeReleasesReservedRemoteControlAndReturnsAnErrorResponseWhenThe
         final Mock remoteControl;
         final Environment environment;
         final Mock pool;
+        HttpServletRequest theRequest = getMockHttpServletRequest();
 
         pool = mock(DynamicRemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         environment = new Environment("an environment", "*browser");
-        command = new NewBrowserSessionCommand(environment, new HttpParameters());
+        command = new NewBrowserSessionCommand(environment, theRequest);
         remoteControl.stubs("forward").will(throwException(new IOException("an error message")));
         pool.stubs("reserve").will(returnValue(remoteControl));
         pool.expects("release").with(remoteControl);
@@ -177,11 +191,12 @@ public void executeCallsUpdateSessionLastActiveAtWithTheSession() throws IOExcep
         final Mock remoteControl;
         final Mock pool;
         final Environment environment;
+        HttpServletRequest theRequest = getMockHttpServletRequest();
 
         pool = mock(DynamicRemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         environment = new Environment("an environment", "*browser");
-        command = new NewBrowserSessionCommand(environment, new HttpParameters());
+        command = new NewBrowserSessionCommand(environment, theRequest);
         remoteControl.stubs("forward").will(returnValue(new Response(0, "OK,1234")));
         pool.stubs("reserve").will(returnValue(remoteControl));
         pool.stubs("associateWithSession");
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/SeleneseCommandTest.java
old mode 100755
new mode 100644
similarity index 64%
rename from hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommandTest.java
rename to hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/SeleneseCommandTest.java
index 592d75a9..be426d93
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommandTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/SeleneseCommandTest.java
@@ -1,24 +1,28 @@
-package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium;
 
 import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.MockHelper;
 import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import static junit.framework.Assert.assertEquals;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.HashMap;
+
+import static junit.framework.Assert.assertEquals;
 
 
 public class SeleneseCommandTest extends UsingClassMock {
 
-
     @Test
     public void parametersReturnsTheParametersProvidedToConstructor() {
+        HttpServletRequest theRequest = (HttpServletRequest) mock(HttpServletRequest.class);
         HttpParameters theParameters = new HttpParameters();
-        assertEquals(theParameters, new SeleneseCommand("", theParameters).parameters());
+        assertEquals(theParameters, new SeleneseCommand("", theRequest).parameters());
     }
 
     @Test
@@ -32,18 +36,20 @@ public void executeForwardsTheRequestToTheRemoteControl() throws Exception {
         final SeleneseCommand command;
         final Response expectedResponse;
         final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
 
-        command = new SeleneseCommand("a session id", new HttpParameters());
+        command = new SeleneseCommand("a session id", theRequest);
         expectedResponse = new Response(0, "");
         remoteControl = mock(RemoteControlProxy.class);
         pool = mock(RemoteControlPool.class);
         pool.expects("retrieve").with("a session id").will(returnValue(remoteControl));
-        remoteControl.expects("forward").with(command.parameters()).will(returnValue(expectedResponse));
+        remoteControl.expects("forward").with(command.request()).will(returnValue(expectedResponse));
 
         assertEquals(expectedResponse, command.execute((RemoteControlPool) pool));
         verifyMocks();
     }
 
+
     @Test
     public void executeReturnsAnErrorResponseWhenNoSessionIdIsProvided() throws IOException {
         final HttpParameters parameters;
@@ -51,7 +57,8 @@ public void executeReturnsAnErrorResponseWhenNoSessionIdIsProvided() throws IOEx
 
         parameters = new HttpParameters();
         parameters.put("foo", "bar");
-        response = new SeleneseCommand(null, parameters).execute(null);
+        HttpServletRequest theRequest = GetMockRequestWithParameters(parameters);
+        response = new SeleneseCommand(null, theRequest).execute(null);
         assertEquals("ERROR: Selenium Driver error: No sessionId provided for command 'foo => \"bar\"'", response.body());
     }
 
@@ -61,17 +68,29 @@ public void executeUpdatesTheSessionLastActiveAt() throws Exception {
         final SeleneseCommand command;
         final Response expectedResponse;
         final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
 
-        command = new SeleneseCommand("a session id", new HttpParameters());
+        command = new SeleneseCommand("a session id", theRequest);
         expectedResponse = new Response(0, "");
         remoteControl = mock(RemoteControlProxy.class);
         pool = mock(RemoteControlPool.class);
         pool.stubs("retrieve").with("a session id").will(returnValue(remoteControl));
-        remoteControl.stubs("forward").with(command.parameters()).will(returnValue(expectedResponse));
+        remoteControl.stubs("forward").with(command.request()).will(returnValue(expectedResponse));
         pool.expects("updateSessionLastActiveAt").with("a session id").times(2);
 
         command.execute((RemoteControlPool) pool);
         verifyMocks();
     }
 
+
+    private HttpServletRequest GetMockRequestWithParameters(HttpParameters parameters) {
+        Mock request = mock(HttpServletRequest.class);
+        HashMap params = new HashMap<String, String[]>();
+        for (String name : parameters.names()) {
+            params.put(name, new String[]{parameters.get(name)});
+        }
+        request.stubs("getParameterMap").will(returnValue(params));
+        return (HttpServletRequest) request;
+    }
+
 }
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/TestCompleteCommandTest.java
old mode 100755
new mode 100644
similarity index 74%
rename from hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommandTest.java
rename to hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/TestCompleteCommandTest.java
index 2080756b..f012f043
--- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommandTest.java
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/selenium/TestCompleteCommandTest.java
@@ -1,16 +1,18 @@
-package com.thoughtworks.selenium.grid.hub.remotecontrol.commands;
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.selenium;
 
-import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.MockHelper;
 import com.thoughtworks.selenium.grid.Response;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
 import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
-import static junit.framework.Assert.assertEquals;
 import org.jbehave.classmock.UsingClassMock;
 import org.jbehave.core.mock.Mock;
 import org.junit.Test;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
+import static junit.framework.Assert.assertEquals;
+
 
 public class TestCompleteCommandTest extends UsingClassMock {
 
@@ -20,13 +22,14 @@ public void executeReleasesTheRemoteControlWhenRemoteCallIsSuccessful() throws I
         final Response expectedResponse;
         final Mock remoteControl;
         final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
 
-        command = new TestCompleteCommand("a session id", new HttpParameters());
+        command = new TestCompleteCommand("a session id", theRequest);
         expectedResponse = new Response(0, "");
         pool = mock(RemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         pool.expects("retrieve").with("a session id").will(returnValue(remoteControl));
-        remoteControl.expects("forward").with(command.parameters()).will(returnValue(expectedResponse));
+        remoteControl.expects("forward").with(command.request()).will(returnValue(expectedResponse));
         pool.expects("releaseForSession").with("a session id");
 
         assertEquals(expectedResponse, command.execute((RemoteControlPool) pool));
@@ -39,12 +42,13 @@ public void executeReleasesTheRemoteControlWhenRemoteCallFailsAndThereIsASession
         final TestCompleteCommand command;
         final Mock remoteControl;
         final Mock pool;
-        
-        command = new TestCompleteCommand("a session id", new HttpParameters());
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        command = new TestCompleteCommand("a session id", theRequest);
         pool = mock(RemoteControlPool.class);
         remoteControl = mock(RemoteControlProxy.class);
         pool.expects("retrieve").with("a session id").will(returnValue(remoteControl));
-        remoteControl.expects("forward").with(command.parameters()).will(throwException(new IOException()));
+        remoteControl.expects("forward").with(command.request()).will(throwException(new IOException()));
         pool.expects("releaseForSession").with("a session id");
         command.execute((RemoteControlPool) pool);
         verifyMocks();
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/NewBrowserSessionCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/NewBrowserSessionCommandTest.java
new file mode 100644
index 00000000..3c6229de
--- /dev/null
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/NewBrowserSessionCommandTest.java
@@ -0,0 +1,204 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver;
+
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.MockHelper;
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.Environment;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
+import org.apache.commons.httpclient.Header;
+import org.jbehave.classmock.UsingClassMock;
+import org.jbehave.core.mock.Mock;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+import static junit.framework.Assert.assertEquals;
+
+
+public class NewBrowserSessionCommandTest extends UsingClassMock {
+
+    @Test
+    public void environmentReturnsTheEnvironmentProvidedInTheConstructor() {
+        final Environment anEnvironment;
+
+        anEnvironment = new Environment("", null);
+        assertEquals(anEnvironment, new NewBrowserSessionCommand(anEnvironment, null).environment());
+    }
+
+    @Test
+    public void sessionIdIsAlwaysNull() {
+        assertEquals(null, new NewBrowserSessionCommand(null, null).sessionId());
+    }
+
+    @Test
+    public void parseSessionIdReturnsTheSessionIdWhenResponseIsSuccessful() {
+        assertEquals("22207", new NewBrowserSessionCommand(null, null).parseSessionId("{ sessionId: 22207 }"));
+    }
+
+    @Test
+    public void parseSessionIdReturnsNullWhenResponseIsNotSuccessful() {
+        assertEquals(null, new NewBrowserSessionCommand(null, null).parseSessionId(""));
+    }
+
+    @Test
+    public void executeReserveAndThenAssociateARemoteControlWithTheSession() throws IOException {
+        final NewBrowserSessionCommand command;
+        final Mock remoteControl;
+        final Mock pool;
+        final Response expectedResponse;
+        final Environment environment;
+        final HttpParameters parameters;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        final Header[] headers = new Header[]{new Header("Location", "/wd/hub/session/1234")};
+
+        expectedResponse = new Response(0, "{ sessionId: 1234 }", headers);
+        pool = mock(DynamicRemoteControlPool.class);
+        remoteControl = mock(RemoteControlProxy.class);
+        environment = new Environment("an environment", "*browser");
+        command = new NewBrowserSessionCommand(environment, theRequest);
+        remoteControl.expects("forward").with(command.request()).will(returnValue(expectedResponse));
+        pool.expects("reserve").with(environment).will(returnValue(remoteControl));
+        pool.expects("associateWithSession").with(anything(), eq("1234"));  // TODO with(remoteControl, ...)
+
+        assertEquals(expectedResponse, command.execute((RemoteControlPool) pool));
+        verifyMocks();
+    }
+
+    @Test
+    public void executeReturnsAnErrorResponseWhenSessionCannotBeCreated() throws IOException {
+        final NewBrowserSessionCommand command;
+        final Mock remoteControl;
+        final Environment environment;
+        final Mock pool;
+        final Response response;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        pool = mock(DynamicRemoteControlPool.class);
+        remoteControl = mock(RemoteControlProxy.class);
+        environment = new Environment("an environment", "*browser");
+        command = new NewBrowserSessionCommand(environment, theRequest);
+        pool.expects("reserve").with(environment).will(returnValue(remoteControl));
+        remoteControl.expects("forward").with(command.request()).will(returnValue(new Response(500, "")));
+
+        response = command.execute((RemoteControlPool) pool);
+        assertEquals(200, response.statusCode());
+        assertEquals("ERROR: Could not retrieve a new session", response.body());
+        verifyMocks();
+    }
+
+    @Test
+    public void executeReleaseRemoteControlWhenSessionCannotBeCreated() throws IOException {
+        final NewBrowserSessionCommand command;
+        final Environment environment;
+        final Mock remoteControl;
+        final Response response;
+        final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        pool = mock(DynamicRemoteControlPool.class);
+        remoteControl = mock(RemoteControlProxy.class);
+        environment = new Environment("an environment", "*browser");
+        command = new NewBrowserSessionCommand(environment, theRequest);
+        pool.stubs("reserve").will(returnValue(remoteControl));
+        pool.expects("release").with(remoteControl);
+        remoteControl.stubs("forward").will(returnValue(new Response(500, "")));
+
+        response = command.execute((RemoteControlPool) pool);
+        assertEquals(200, response.statusCode());
+        assertEquals("ERROR: Could not retrieve a new session", response.body());
+        verifyMocks();
+    }
+
+    @SuppressWarnings({"ThrowableInstanceNeverThrown"})
+    @Test
+    public void executeReturnsAnErrorResponseWhenThereIsANetworkError() throws IOException {
+        String helloWorld = "Hello World";
+        final NewBrowserSessionCommand command;
+        final Environment environment;
+        final Mock remoteControl;
+        final Response response;
+        final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        pool = mock(DynamicRemoteControlPool.class);
+        remoteControl = mock(RemoteControlProxy.class);
+        environment = new Environment("an environment", "*browser");
+        command = new NewBrowserSessionCommand(environment, theRequest);
+        remoteControl.expects("forward").with(command.request()).will(throwException(new IOException("an error message")));
+        pool.expects("reserve").with(environment).will(returnValue(remoteControl));
+        pool.stubs("release").with(remoteControl);
+
+        response = command.execute((RemoteControlPool) pool);
+        assertEquals(200, response.statusCode());
+        assertEquals("ERROR: an error message", response.body());
+        verifyMocks();
+    }
+
+
+    @SuppressWarnings({"ThrowableInstanceNeverThrown"})
+    @Test
+    public void executeReleasesReservedRemoteControlAndReturnsAnErrorResponseWhenThereIsANetworkError() throws IOException {
+        final NewBrowserSessionCommand command;
+        final Mock remoteControl;
+        final Environment environment;
+        final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        pool = mock(DynamicRemoteControlPool.class);
+        remoteControl = mock(RemoteControlProxy.class);
+        environment = new Environment("an environment", "*browser");
+        command = new NewBrowserSessionCommand(environment, theRequest);
+        remoteControl.stubs("forward").will(throwException(new IOException("an error message")));
+        pool.stubs("reserve").will(returnValue(remoteControl));
+        pool.expects("release").with(remoteControl);
+
+        command.execute((RemoteControlPool) pool);
+        verifyMocks();
+    }
+
+    @Test
+    public void executeReturnsAnErrorResponseWhenNoRemoteControlCanBeReserved() throws IOException {
+        final NewBrowserSessionCommand command;
+        final Environment environment;
+        final Response response;
+        final Mock pool;
+
+        pool = mock(DynamicRemoteControlPool.class);
+        environment = new Environment("an environment", "*browser");
+        command = new NewBrowserSessionCommand(environment, MockHelper.GetMockHttpServletRequest());
+        pool.expects("reserve").with(environment).will(returnValue(null));
+
+        response = command.execute((RemoteControlPool) pool);
+        assertEquals(200, response.statusCode());
+        assertEquals("ERROR: No available remote control for environment 'an environment'", response.body());
+        verifyMocks();
+    }
+
+    @Test
+    public void executeCallsUpdateSessionLastActiveAtWithTheSession() throws IOException {
+        final NewBrowserSessionCommand command;
+        final Mock remoteControl;
+        final Mock pool;
+        final Environment environment;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        final Header[] headers = new Header[]{new Header("Location", "/wd/hub/session/1234")};
+
+        pool = mock(DynamicRemoteControlPool.class);
+        remoteControl = mock(RemoteControlProxy.class);
+        environment = new Environment("an environment", "*browser");
+        command = new NewBrowserSessionCommand(environment, theRequest);
+        remoteControl.stubs("forward").will(returnValue(new Response(0, "{ sessionId: 1234 }", headers)));
+        pool.stubs("reserve").will(returnValue(remoteControl));
+        pool.stubs("associateWithSession");
+        pool.expects("updateSessionLastActiveAt").with(eq("1234"));
+
+        command.execute((RemoteControlPool) pool);
+        verifyMocks();
+    }
+
+}
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/TestCompleteCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/TestCompleteCommandTest.java
new file mode 100644
index 00000000..5f56ba30
--- /dev/null
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/TestCompleteCommandTest.java
@@ -0,0 +1,57 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver;
+
+import com.thoughtworks.selenium.grid.MockHelper;
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
+import org.jbehave.classmock.UsingClassMock;
+import org.jbehave.core.mock.Mock;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+import static junit.framework.Assert.assertEquals;
+
+
+public class TestCompleteCommandTest extends UsingClassMock {
+
+    @Test
+    public void executeReleasesTheRemoteControlWhenRemoteCallIsSuccessful() throws IOException {
+        final TestCompleteCommand command;
+        final Response expectedResponse;
+        final Mock remoteControl;
+        final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        command = new TestCompleteCommand("a session id", theRequest);
+        expectedResponse = new Response(0, "");
+        pool = mock(RemoteControlPool.class);
+        remoteControl = mock(RemoteControlProxy.class);
+        pool.expects("retrieve").with("a session id").will(returnValue(remoteControl));
+        remoteControl.expects("forward").with(command.request()).will(returnValue(expectedResponse));
+        pool.expects("releaseForSession").with("a session id");
+
+        assertEquals(expectedResponse, command.execute((RemoteControlPool) pool));
+        verifyMocks();
+    }
+
+    @SuppressWarnings({"ThrowableInstanceNeverThrown"})
+    @Test(expected = IOException.class)
+    public void executeReleasesTheRemoteControlWhenRemoteCallFailsAndThereIsASession() throws IOException {
+        final TestCompleteCommand command;
+        final Mock remoteControl;
+        final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        command = new TestCompleteCommand("a session id", theRequest);
+        pool = mock(RemoteControlPool.class);
+        remoteControl = mock(RemoteControlProxy.class);
+        pool.expects("retrieve").with("a session id").will(returnValue(remoteControl));
+        remoteControl.expects("forward").with(command.request()).will(throwException(new IOException()));
+        pool.expects("releaseForSession").with("a session id");
+        command.execute((RemoteControlPool) pool);
+        verifyMocks();
+    }
+
+}
diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/WebDriverCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/WebDriverCommandTest.java
new file mode 100644
index 00000000..a814dfa3
--- /dev/null
+++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/webdriver/WebDriverCommandTest.java
@@ -0,0 +1,96 @@
+package com.thoughtworks.selenium.grid.hub.remotecontrol.commands.webdriver;
+
+import com.thoughtworks.selenium.grid.HttpParameters;
+import com.thoughtworks.selenium.grid.MockHelper;
+import com.thoughtworks.selenium.grid.Response;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool;
+import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy;
+import org.jbehave.classmock.UsingClassMock;
+import org.jbehave.core.mock.Mock;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+
+import static junit.framework.Assert.assertEquals;
+
+
+public class WebDriverCommandTest extends UsingClassMock {
+
+    @Test
+    public void parametersReturnsTheParametersProvidedToConstructor() {
+        HttpServletRequest theRequest = (HttpServletRequest) mock(HttpServletRequest.class);
+        HttpParameters theParameters = new HttpParameters();
+        assertEquals(theParameters, new WebDriverCommand("", theRequest).parameters());
+    }
+
+    @Test
+    public void sessionIdReturnsTheSessionIdProvidedToConstructor() {
+        assertEquals("a session id", new WebDriverCommand("a session id", null).sessionId());
+    }
+
+    @Test
+    public void executeForwardsTheRequestToTheRemoteControl() throws Exception {
+        final Mock remoteControl;
+        final WebDriverCommand command;
+        final Response expectedResponse;
+        final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        command = new WebDriverCommand("a session id", theRequest);
+        expectedResponse = new Response(0, "");
+        remoteControl = mock(RemoteControlProxy.class);
+        pool = mock(RemoteControlPool.class);
+        pool.expects("retrieve").with("a session id").will(returnValue(remoteControl));
+        remoteControl.expects("forward").with(command.request()).will(returnValue(expectedResponse));
+
+        assertEquals(expectedResponse, command.execute((RemoteControlPool) pool));
+        verifyMocks();
+    }
+
+
+    @Test
+    public void executeReturnsAnErrorResponseWhenNoSessionIdIsProvided() throws IOException {
+        final HttpParameters parameters;
+        final Response response;
+
+        parameters = new HttpParameters();
+        parameters.put("foo", "bar");
+        HttpServletRequest theRequest = GetMockRequestWithParameters(parameters);
+        response = new WebDriverCommand(null, theRequest).execute(null);
+        assertEquals("ERROR: Selenium Driver error: No sessionId provided for command 'foo => \"bar\"'", response.body());
+    }
+
+    @Test
+    public void executeUpdatesTheSessionLastActiveAt() throws Exception {
+        final Mock remoteControl;
+        final WebDriverCommand command;
+        final Response expectedResponse;
+        final Mock pool;
+        HttpServletRequest theRequest = MockHelper.GetMockHttpServletRequest();
+
+        command = new WebDriverCommand("a session id", theRequest);
+        expectedResponse = new Response(0, "");
+        remoteControl = mock(RemoteControlProxy.class);
+        pool = mock(RemoteControlPool.class);
+        pool.stubs("retrieve").with("a session id").will(returnValue(remoteControl));
+        remoteControl.stubs("forward").with(command.request()).will(returnValue(expectedResponse));
+        pool.expects("updateSessionLastActiveAt").with("a session id").times(2);
+
+        command.execute((RemoteControlPool) pool);
+        verifyMocks();
+    }
+
+
+    private HttpServletRequest GetMockRequestWithParameters(HttpParameters parameters) {
+        Mock request = mock(HttpServletRequest.class);
+        HashMap params = new HashMap<String, String[]>();
+        for (String name : parameters.names()) {
+            params.put(name, new String[]{parameters.get(name)});
+        }
+        request.stubs("getParameterMap").will(returnValue(params));
+        return (HttpServletRequest) request;
+    }
+
+}
diff --git a/infrastructure/core/Core.iml b/infrastructure/core/Core.iml
index 4e8d86e4..b62e7b6d 100644
--- a/infrastructure/core/Core.iml
+++ b/infrastructure/core/Core.iml
@@ -12,6 +12,7 @@
     <orderEntry type="library" name="Commons" level="project" />
     <orderEntry type="library" name="Yaml" level="project" />
     <orderEntry type="library" name="HttpClient" level="project" />
+    <orderEntry type="library" name="Jetty" level="project" />
   </component>
   <component name="RSpecModuleSettingsStorage">
     <RSPEC_MODULE_SETTINGS_STORAGE_ID NAME="RSPEC_SUPPORT_TYPE" VALUE="NONE" />
diff --git a/infrastructure/core/build.xml b/infrastructure/core/build.xml
index 2b28ade8..1423a5da 100755
--- a/infrastructure/core/build.xml
+++ b/infrastructure/core/build.xml
@@ -1,27 +1,28 @@
 <project name="Selenium Grid Core" default="package" basedir=".">
 
-  <description>Selenium Grid Core</description>
+    <description>Selenium Grid Core</description>
 
-  <property name="rootdir" value="${basedir}/../.."/>
-  <property file="${rootdir}/project.properties"/>
-  <property name="name" value="Selenium Grid Core"/>
-  <property name="artifact" value="selenium-grid-core"/>
-  <property name="version" value="SNAPSHOT"/>
+    <property name="rootdir" value="${basedir}/../.."/>
+    <property file="${rootdir}/project.properties"/>
+    <property name="name" value="Selenium Grid Core"/>
+    <property name="artifact" value="selenium-grid-core"/>
+    <property name="version" value="SNAPSHOT"/>
 
-  <property name="build.src" location="src/main"/>
+    <property name="build.src" location="src/main"/>
 
-  <import file="${rootdir}/lib/build/common-build.xml" />
+    <import file="${rootdir}/lib/build/common-build.xml"/>
 
-  <path id="compile.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="jyaml-1.3.jar"/>
-      <include name="commons-httpclient-3.1.jar"/>
-      <include name="commons-codec-1.4.jar"/>
-      <include name="commons-logging-1.1.1.jar"/>
-    </fileset>
-    <pathelement path="${java.class.path}/"/>
-  </path>
+    <path id="compile.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="jyaml-1.3.jar"/>
+            <include name="commons-httpclient-3.1.jar"/>
+            <include name="commons-codec-1.4.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
+            <include name="servlet-api-2.5-20081211.jar"/>
+        </fileset>
+        <pathelement path="${java.class.path}/"/>
+    </path>
 
-  <target name="dist" depends="package"/>
+    <target name="dist" depends="package"/>
 
 </project>
diff --git a/infrastructure/core/src/main/com/thoughtworks/selenium/grid/GridRequestWrapper.java b/infrastructure/core/src/main/com/thoughtworks/selenium/grid/GridRequestWrapper.java
new file mode 100644
index 00000000..dddbdad2
--- /dev/null
+++ b/infrastructure/core/src/main/com/thoughtworks/selenium/grid/GridRequestWrapper.java
@@ -0,0 +1,60 @@
+package com.thoughtworks.selenium.grid;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.*;
+
+public class GridRequestWrapper extends HttpServletRequestWrapper {
+    private final String body;
+
+    public GridRequestWrapper(HttpServletRequest request) throws IOException {
+        super(request);
+        StringBuilder stringBuilder = new StringBuilder();
+        BufferedReader bufferedReader = null;
+        try {
+            InputStream inputStream = request.getInputStream();
+            if (inputStream != null) {
+                bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+                char[] charBuffer = new char[128];
+                int bytesRead = -1;
+                while ((bytesRead = bufferedReader.read(charBuffer)) > 0) {
+                    stringBuilder.append(charBuffer, 0, bytesRead);
+                }
+            } else {
+                stringBuilder.append("");
+            }
+        } catch (IOException ex) {
+            throw ex;
+        } finally {
+            if (bufferedReader != null) {
+                try {
+                    bufferedReader.close();
+                } catch (IOException ex) {
+                    throw ex;
+                }
+            }
+        }
+        body = stringBuilder.toString();
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body.getBytes());
+        ServletInputStream servletInputStream = new ServletInputStream() {
+            public int read() throws IOException {
+                return byteArrayInputStream.read();
+            }
+        };
+        return servletInputStream;
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(this.getInputStream()));
+    }
+
+    public String getBody() {
+        return this.body;
+    }
+}
\ No newline at end of file
diff --git a/infrastructure/core/src/main/com/thoughtworks/selenium/grid/HttpClient.java b/infrastructure/core/src/main/com/thoughtworks/selenium/grid/HttpClient.java
index 85a53320..d8ce33bc 100755
--- a/infrastructure/core/src/main/com/thoughtworks/selenium/grid/HttpClient.java
+++ b/infrastructure/core/src/main/com/thoughtworks/selenium/grid/HttpClient.java
@@ -1,12 +1,16 @@
 package com.thoughtworks.selenium.grid;
 
+import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.util.Enumeration;
 
 
 /**
@@ -47,17 +51,149 @@ protected PostMethod buildPostMethod(String url, HttpParameters parameters) {
     }
 
     protected Response request(HttpMethod method) throws IOException {
-        final int statusCode;
-        final String body;
+        int statusCode;
+        String body;
 
         try {
             statusCode = client.executeMethod(method);
-            body = new String(method.getResponseBody(), "utf-8");
+            if (statusCode == HttpStatus.SC_MOVED_PERMANENTLY || statusCode == HttpStatus.SC_MOVED_TEMPORARILY) {
+                method.releaseConnection();
+
+                HttpMethod postMethod = redirectMethod((PostMethod) method);
+                statusCode = client.executeMethod(postMethod);
+                method = postMethod;
+            }
+            if (statusCode == HttpStatus.SC_NO_CONTENT) {
+                body = "";
+            } else {
+                body = new String(method.getResponseBody(), "utf-8");
+            }
             logger.debug("Remote Control replied with '" + statusCode + " / '" + body + "'");
-            return new Response(statusCode, body);
+            return new Response(statusCode, body, method.getResponseHeaders());
         } finally {
             method.releaseConnection();
         }
     }
 
+    private HttpMethod redirectMethod(PostMethod postMethod) {
+        GetMethod method = new GetMethod(postMethod.getResponseHeader("Location").getValue());
+        for (Header header : postMethod.getRequestHeaders()) {
+            method.addRequestHeader(header);
+        }
+        return method;
+    }
+
+    public Response postWebDriverRequest(String url, HttpServletRequest request) throws IOException {
+        return request(convertHttpServletRequestToPostMethod(url, request));
+    }
+
+
+    public Response deleteWebDriverRequest(String url, HttpServletRequest request) throws IOException {
+        return request(convertHttpServletRequestToDeleteMethod(url, request));
+    }
+
+    public Response putWebDriverRequest(String url, HttpServletRequest request) throws IOException {
+        return request(convertHttpServletRequestToPutMethod(url, request));
+    }
+
+    public Response getWebDriverRequest(String url, HttpServletRequest request) throws IOException {
+        return request(convertHttpServletRequestToGetMethod(url, request));
+    }
+
+    private PostMethod convertHttpServletRequestToPostMethod(String url, HttpServletRequest request) {
+        PostMethod postMethod = new PostMethod(url);
+
+        for (Enumeration headers = request.getHeaderNames(); headers.hasMoreElements();) {
+            String headerName = (String) headers.nextElement();
+            String headerValue = (String) request.getHeader(headerName);
+            postMethod.addRequestHeader(headerName, headerValue);
+        }
+
+        postMethod.removeRequestHeader("Host");
+        postMethod.addRequestHeader("Host", request.getRequestURL().toString());
+
+        for (Enumeration names = request.getParameterNames(); names.hasMoreElements();) {
+            String paramName = (String) names.nextElement();
+            String paramValue = (String) request.getParameter(paramName);
+            postMethod.addParameter(paramName, paramValue);
+        }
+
+        StringBuilder requestBody = new StringBuilder();
+        try {
+            BufferedReader reader = request.getReader();
+            String line;
+            while (null != (line = reader.readLine())) {
+                requestBody.append(line);
+            }
+            reader.close();
+        } catch (IOException e) {
+            requestBody.append("");
+        }
+
+        postMethod.setRequestEntity(new StringRequestEntity(requestBody.toString()));
+
+        return postMethod;
+    }
+
+    private GetMethod convertHttpServletRequestToGetMethod(String url, HttpServletRequest request) {
+        GetMethod method = new GetMethod(url);
+
+        for (Enumeration headers = request.getHeaderNames(); headers.hasMoreElements();) {
+            String headerName = (String) headers.nextElement();
+            String headerValue = (String) request.getHeader(headerName);
+            method.addRequestHeader(headerName, headerValue);
+        }
+
+        method.removeRequestHeader("Host");
+        method.addRequestHeader("Host", request.getRequestURL().toString());
+
+        return method;
+    }
+
+
+    private DeleteMethod convertHttpServletRequestToDeleteMethod(String url, HttpServletRequest request) {
+        DeleteMethod method = new DeleteMethod(url);
+
+        for (Enumeration headers = request.getHeaderNames(); headers.hasMoreElements();) {
+            String headerName = (String) headers.nextElement();
+            String headerValue = (String) request.getHeader(headerName);
+            method.addRequestHeader(headerName, headerValue);
+        }
+
+        method.removeRequestHeader("Host");
+        method.addRequestHeader("Host", request.getRequestURL().toString());
+
+        return method;
+    }
+
+
+    private PutMethod convertHttpServletRequestToPutMethod(String url, HttpServletRequest request) {
+        PutMethod method = new PutMethod(url);
+
+        for (Enumeration headers = request.getHeaderNames(); headers.hasMoreElements();) {
+            String headerName = (String) headers.nextElement();
+            String headerValue = (String) request.getHeader(headerName);
+            method.addRequestHeader(headerName, headerValue);
+        }
+
+        method.removeRequestHeader("Host");
+        method.addRequestHeader("Host", request.getRequestURL().toString());
+
+        StringBuilder requestBody = new StringBuilder();
+        try {
+            BufferedReader reader = request.getReader();
+            String line;
+            while (null != (line = reader.readLine())) {
+                requestBody.append(line);
+            }
+            reader.close();
+        } catch (IOException e) {
+            requestBody.append("");
+        }
+
+        method.setRequestEntity(new StringRequestEntity(requestBody.toString()));
+
+        return method;
+    }
+
 }
diff --git a/infrastructure/core/src/main/com/thoughtworks/selenium/grid/HttpParameters.java b/infrastructure/core/src/main/com/thoughtworks/selenium/grid/HttpParameters.java
index f9fd17e5..ec63b61f 100755
--- a/infrastructure/core/src/main/com/thoughtworks/selenium/grid/HttpParameters.java
+++ b/infrastructure/core/src/main/com/thoughtworks/selenium/grid/HttpParameters.java
@@ -23,6 +23,10 @@ public HttpParameters() {
         this.parameterMap = new HashMap<String, String[]>();
     }
 
+    public boolean equals(Object other) {
+        return this.names().equals(((HttpParameters) other).names());
+    }
+
     public String get(String name) {
         final String[] values = parameterMap.get(name);
         if (null == values || 0 == values.length) {
@@ -55,8 +59,8 @@ public String toString() {
             builder.append("\", ");
         }
         if (!parameterMap.isEmpty()) {
-          builder.deleteCharAt(builder.length() - 1);
-          builder.deleteCharAt(builder.length() - 1);
+            builder.deleteCharAt(builder.length() - 1);
+            builder.deleteCharAt(builder.length() - 1);
         }
 
         return builder.toString();
diff --git a/infrastructure/core/src/main/com/thoughtworks/selenium/grid/Response.java b/infrastructure/core/src/main/com/thoughtworks/selenium/grid/Response.java
index 2fdf3356..97dbba43 100755
--- a/infrastructure/core/src/main/com/thoughtworks/selenium/grid/Response.java
+++ b/infrastructure/core/src/main/com/thoughtworks/selenium/grid/Response.java
@@ -1,25 +1,62 @@
 package com.thoughtworks.selenium.grid;
 
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HttpMethod;
+
+import java.io.IOException;
+
 
 public class Response {
 
     private final int statusCode;
-    private final String body;
+    private String body;
+    private final Header[] headers;
 
+    public Response() {
+        this("");
+    }
 
     public Response(String errorMessage) {
-        this(200, "ERROR: " + errorMessage);
+        this(200, "ERROR: " + errorMessage, new Header[]{});
     }
 
     public Response(int statusCode, String body) {
+        this(statusCode, body, new Header[]{});
+    }
+
+    public Response(HttpMethod method) {
+        this.statusCode = method.getStatusCode();
+        try {
+            this.body = method.getResponseBodyAsString();
+        } catch (IOException e) {
+            this.body = "";
+        }
+        this.headers = method.getResponseHeaders();
+    }
+
+    public Response(int statusCode, String body, Header[] headers) {
         this.statusCode = statusCode;
         this.body = body;
+        this.headers = headers;
     }
 
     public int statusCode() {
         return statusCode;
     }
 
+    public Header[] headers() {
+        return this.headers;
+    }
+
+    public Header getHeader(String name) {
+        for (Header header : this.headers) {
+            if (header.getName().equals(name)) {
+                return header;
+            }
+        }
+        return null;
+    }
+
     public String body() {
         return body;
     }
diff --git a/infrastructure/core/src/main/grid_configuration.yml b/infrastructure/core/src/main/grid_configuration.yml
index 379badd3..4df54874 100755
--- a/infrastructure/core/src/main/grid_configuration.yml
+++ b/infrastructure/core/src/main/grid_configuration.yml
@@ -1,5 +1,7 @@
 hub:
    port: 4444
+   remoteControlPollingIntervalInSeconds: 60
+   sessionMaxIdleTimeInSeconds: 150
    environments:
        - name:    "*firefox"
          browser: "*firefox"
@@ -9,3 +11,20 @@ hub:
          browser: "*iehta"
        - name:    "*safari"
          browser: "*safari"
+       # webdriver environments
+       - name:    "internet explorer on windows"
+         browser: "InternetExplorer"
+       - name:    "firefox on windows"
+         browser: "Firefox"
+       - name:    "firefox on any"
+         browser: "Firefox"
+       - name:    "htmlunit on any"
+         browser: "HtmlUnit"
+       - name:    "chrome on any"
+         browser: "Chrome"
+       - name:    "chrome on windows"
+         browser: "Chrome"
+       - name:    "safari on any"
+         browser: "Safari"
+       - name:    "safari on windows"
+         browser: "Safari"
\ No newline at end of file
diff --git a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpClientTest.java b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpClientTest.java
index acb209a7..ab4c6312 100755
--- a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpClientTest.java
+++ b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpClientTest.java
@@ -1,7 +1,5 @@
 package com.thoughtworks.selenium.grid;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
@@ -12,6 +10,9 @@
 import java.io.IOException;
 import java.net.ConnectException;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
 
 public class HttpClientTest extends UsingClassMock {
 
@@ -78,7 +79,7 @@ public void requestReleasesTheConnectionOnTheGetMethodWhenAProblemOccurs() throw
     @Test
     public void buildPostMethodUsesURLProvidedAsAParameter() throws IOException {
         final PostMethod postmethod;
-        
+
         postmethod = new HttpClient().buildPostMethod("http://a.url/somwhere", new HttpParameters());
         assertEquals("http://a.url/somwhere", postmethod.getURI().toString());
     }
@@ -101,7 +102,7 @@ public void getReturnTheResultOfAGetRequestWithTheURLPassedAsAParameter() throws
         final HttpClient httpClient;
         final Response expectedResponse;
 
-        expectedResponse = new Response(null);
+        expectedResponse = new Response();
         httpClient = new HttpClient(null) {
 
             protected Response request(HttpMethod method) throws IOException {
@@ -109,7 +110,7 @@ protected Response request(HttpMethod method) throws IOException {
                 assertEquals("http://a.url/", method.getURI().toString());
                 return expectedResponse;
             }
-            
+
         };
         assertEquals(expectedResponse, httpClient.get("http://a.url/"));
 
@@ -120,7 +121,7 @@ public void postReturnTheResultOfAPostRequestWithTheURLPassedAsAParameter() thro
         final HttpClient httpClient;
         final Response expectedResponse;
 
-        expectedResponse = new Response(null);
+        expectedResponse = new Response();
         httpClient = new HttpClient(null) {
 
             protected Response request(HttpMethod method) throws IOException {
@@ -139,7 +140,7 @@ public void postReturnTheResultOfAPostRequestWithTheParametersPassedAsArgument()
         final HttpParameters parameters;
         final HttpClient httpClient;
 
-        expectedResponse = new Response(null);
+        expectedResponse = new Response();
         httpClient = new HttpClient(null) {
 
             protected Response request(HttpMethod method) throws IOException {
@@ -163,12 +164,12 @@ public void postReturnTheResultOfAPostRequestAsUTF8FormEncodingEncoding() throws
         final Response expectedResponse;
         final HttpClient httpClient;
 
-        expectedResponse = new Response(null);
+        expectedResponse = new Response();
         httpClient = new HttpClient(null) {
 
             protected Response request(HttpMethod method) throws IOException {
                 assertEquals("application/x-www-form-urlencoded; ; charset=UTF-8",
-                             method.getRequestHeader("Content-Type").getValue());
+                        method.getRequestHeader("Content-Type").getValue());
                 return expectedResponse;
             }
 
diff --git a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/ResponseTest.java b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/ResponseTest.java
index 4a8ff382..4ef6da5f 100755
--- a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/ResponseTest.java
+++ b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/ResponseTest.java
@@ -1,6 +1,7 @@
 package com.thoughtworks.selenium.grid;
 
 import junit.framework.Assert;
+import org.apache.commons.httpclient.Header;
 import org.junit.Test;
 
 
@@ -8,22 +9,22 @@ public class ResponseTest {
 
     @Test
     public void defaultStatusCodeIs200() {
-       Assert.assertEquals(200, new Response("").statusCode());
+        Assert.assertEquals(200, new Response("").statusCode());
     }
 
     @Test
     public void bodyIsAnErrorMessageWhenNoStatusIsProvided() {
-       Assert.assertEquals("ERROR: a message", new Response("a message").body());
+        Assert.assertEquals("ERROR: a message", new Response("a message").body());
     }
 
     @Test
     public void statusCodeReturnsTheOneProvidedInTheConstructor() {
-       Assert.assertEquals(123, new Response(123, "").statusCode());
+        Assert.assertEquals(123, new Response(123, "", new Header[]{}).statusCode());
     }
 
     @Test
     public void bodyReturnsTheOneProvidedInTheConstructor() {
-       Assert.assertEquals("some content", new Response(0, "some content").body());
+        Assert.assertEquals("some content", new Response(0, "some content", new Header[]{}).body());
     }
 
 }
diff --git a/infrastructure/webserver/WebServer.iml b/infrastructure/webserver/WebServer.iml
index 1b74e973..cc9911b0 100644
--- a/infrastructure/webserver/WebServer.iml
+++ b/infrastructure/webserver/WebServer.iml
@@ -14,6 +14,24 @@
     <orderEntry type="module" module-name="Core" />
     <orderEntry type="library" name="Web" level="project" />
     <orderEntry type="library" name="Jetty" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/plugins/testng/lib/testng-jdk15.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.7.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
   <component name="RSpecModuleSettingsStorage">
     <RSPEC_MODULE_SETTINGS_STORAGE_ID NAME="RSPEC_SUPPORT_TYPE" VALUE="NONE" />
diff --git a/integration-tests/tests/com/sponte/selenium/grid/integration/HubServerThread.java b/integration-tests/tests/com/sponte/selenium/grid/integration/HubServerThread.java
new file mode 100644
index 00000000..cc9f7d79
--- /dev/null
+++ b/integration-tests/tests/com/sponte/selenium/grid/integration/HubServerThread.java
@@ -0,0 +1,28 @@
+package com.sponte.selenium.grid.integration;
+
+import com.thoughtworks.selenium.grid.hub.HubServer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: swozniak
+ * Date: Nov 28, 2010
+ * Time: 11:55:57 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class HubServerThread extends Thread {
+
+    private static Log logger = LogFactory.getLog(HubServerThread.class);
+
+    public void run() {
+        try {
+            String[] args = new String[]{"-Dport=4455"};
+            HubServer.main(args);
+        } catch (Exception e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        }
+        logger.info("Running hub server");
+    }
+
+}
diff --git a/integration-tests/tests/com/sponte/selenium/grid/integration/RemoteClientThread.java b/integration-tests/tests/com/sponte/selenium/grid/integration/RemoteClientThread.java
new file mode 100644
index 00000000..0e2da45f
--- /dev/null
+++ b/integration-tests/tests/com/sponte/selenium/grid/integration/RemoteClientThread.java
@@ -0,0 +1,28 @@
+package com.sponte.selenium.grid.integration;
+
+import com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: swozniak
+ * Date: Nov 28, 2010
+ * Time: 11:59:36 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class RemoteClientThread extends Thread {
+
+    private static Log logger = LogFactory.getLog(RemoteClientThread.class);
+
+    public void run() {
+        try {
+            String[] args = new String[]{"-port", "4433", "-hubPollerIntervalInSeconds", "180", "-env", "firefox on any"};
+            SelfRegisteringRemoteControlLauncher.main(args);
+        } catch (Exception e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        }
+        logger.info("Starting remote client test");
+    }
+
+}
diff --git a/lib/build/common-build.xml b/lib/build/common-build.xml
index 9be11c39..78cb8dbf 100755
--- a/lib/build/common-build.xml
+++ b/lib/build/common-build.xml
@@ -1,291 +1,293 @@
 <project name="Selenium Grid Common Build Tasks">
 
-  <description>Selenium Grid Common Build Tasks</description>
-
-  <tstamp/>
-
-  <property name="build.src" location="src/main/java"/>
-  <property name="build.output" location="target/classes"/>
-  <property name="dist" location="${basedir}/target/dist"/>
-  <property name="test.src" location="src/test/unit/java"/>
-  <property name="test.functional.output" location="target/test-functional-classes"/>
-  <property name="test.functional.src" location="src/test/functional"/>
-  <property name="test.output" location="target/test-classes"/>
-  <property name="test.reports" location="target/test-reports"/>
-  <property name="metrics.reports" location="target/metrics"/>
-  <property name="metrics.pmd.reports" location="${metrics.reports}/pmd"/>
-  <property name="metrics.coverage.reports" location="${metrics.reports}/coverage"/>
-  <property environment="env"/>
-
-  <path id="mocking.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="jbehave-1.0.1.jar"/>
-      <include name="jmock-junit4-2.2.0.jar"/>
-      <include name="jmock-legacy-2.2.0.jar"/>
-      <include name="proxytoys-0.2.1.jar"/>
-      <include name="objenesis-1.0.jar"/>
-      <include name="jmock-2.2.0.jar"/>
-      <include name="cglib-nodep-2.1_3.jar"/>
-      <include name="mockito-all-1.8.4.jar"/>
-    </fileset>
-  </path>
-
-  <path id="junit.core.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="junit-4.7.jar"/>
-    </fileset>
-    <pathelement location="${build.output}"/>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-
-  <path id="junit.classpath" />
-  
-  <path id="unit-testing.classpath">
-    <path refid="compile.classpath"/>
-    <path refid="junit.core.classpath"/>
-    <path refid="junit.classpath"/>
-    <path refid="mocking.classpath"/>
-    <path refid="cobertura.classpath"/>
-    <pathelement location="${build.output}"/>
-    <pathelement location="${test.output}"/>
-  </path>
-
-  <path id="functional-testing.classpath">
-    <path refid="compile.classpath"/>
-    <path refid="junit.core.classpath"/>
-    <path refid="junit.classpath"/>
-    <path refid="mocking.classpath"/>
-    <path refid="cobertura.classpath"/>
-    <pathelement location="${build.output}"/>
-    <pathelement location="${test.functional.output}"/>
-  </path>
-
-  <path id="pmd.classpath">
-      <fileset dir="${rootdir}/vendor">
-        <include name="pmd-4.2.2.jar"/>
-        <include name="jaxen-1.1.1.jar"/>
-        <include name="asm-3.1.jar"/>
-      </fileset>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-
-  <path id="cobertura.classpath">
-      <fileset dir="${rootdir}/vendor">
-        <include name="cobertura-1.9.jar"/>
-        <include name="log4j-1.2.9.jar"/>
-        <include name="asm-2.2.1.jar"/>
-        <include name="asm-tree-2.2.1.jar"/>
-        <include name="jakarta-oro-2.0.8.jar"/>
-      </fileset>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-
-  <target name="package-standalone" depends="package"/>
-  <target name="build" depends="test"/>
-  <target name="dist" depends="package-standalone"/>
-
-  <target name="clean" description="Remove generated artifacts">
-    <delete dir="target"/>
-  </target>
-
-  <target name="compile" description="compile the source ">
-    <mkdir dir="${build.output}"/>
-    <javac srcdir="${build.src}"
-           destdir="${build.output}"
-           debug="true"
-           source="1.5"
-           target="1.5">
-      <classpath refid="compile.classpath"/>
-    </javac>
-    <copy todir="${build.output}" verbose="true">
-      <fileset dir="${build.src}" includes="**/*.html"/>
-      <fileset dir="${build.src}" includes="**/*.yml"/>
-      <fileset dir="${build.src}" includes="**/heartbeat"/>
-    </copy>
-  </target>
-
-  <target name="compile-unit-tests" depends="compile" description="compile tests">
-    <mkdir dir="${test.output}"/>
-    <mkdir dir="${test.reports}"/>
-
-    <javac srcdir="${test.src}"
-           destdir="${test.output}"
-           excludes="**/package.html"
-           source="1.5"
-           target="1.5"
-           debug="true"
-           deprecation="true">
-      <classpath refid="unit-testing.classpath"/>
-    </javac>
-  </target>
-
-  <macrodef name="run-unit-tests">
-    <element name="options" optional="true"/>
-    <sequential>
-      <mkdir dir="${test.output}"/>
-      <mkdir dir="${test.reports}"/>
-
-      <copy todir="${test.output}" verbose="true">
-        <fileset dir="${test.src}" includes="**/*.html"/>
-      </copy>
-      <junit printSummary="no" haltonerror="true" haltonfailure="true" fork="true" dir="${test.reports}">
-        <options/>
-        <classpath refid="unit-testing.classpath"/>
-        <formatter type="xml"/>
-        <formatter type="plain"/>
-        <batchtest todir="${test.reports}">
-          <fileset dir="${test.src}">
-            <include name="**/*Test.java"/>
-          </fileset>
-        </batchtest>
-      </junit>
-    </sequential>
-  </macrodef>
-
-  <target name="compile-functional-tests" depends="compile" description="compile tests">
-    <mkdir dir="${test.functional.output}"/>
-    <mkdir dir="${test.reports}"/>
-
-    <javac srcdir="${test.functional.src}"
-           destdir="${test.functional.output}"
-           excludes="**/package.html"
-           source="1.5"
-           target="1.5"
-           debug="true"
-           deprecation="true">
-      <classpath refid="functional-testing.classpath"/>
-    </javac>
-  </target>
-
-  <macrodef name="run-functional-tests">
-    <element name="options" optional="true"/>
-    <sequential>
-      <mkdir dir="${test.functional.output}"/>
-      <mkdir dir="${test.reports}"/>
-
-      <copy todir="${test.functional.output}" verbose="true">
-        <fileset dir="${test.functional.src}" includes="**/*.html"/>
-      </copy>
-      <junit printSummary="no" haltonerror="true" haltonfailure="true" fork="true" dir="${test.reports}">
-        <options/>
-        <classpath refid="functional-testing.classpath"/>
-        <formatter type="xml"/>
-        <formatter type="plain"/>
-        <batchtest todir="${test.reports}">
-          <fileset dir="${test.functional.src}">
-            <include name="**/*Test.java"/>
-          </fileset>
-        </batchtest>
-      </junit>
-    </sequential>
-  </macrodef>
-
-  <target name="test-unit" depends="compile, compile-unit-tests" description="run unit tests">
-    <run-unit-tests/>
-  </target>
-
-  <target name="test-functional" depends="compile" if="${test.functional.src.exists}"
-          description="run functional tests">
-    <antcall target="compile-functional-tests" />
-    <run-functional-tests />
-  </target>
-
-  <target name="test" depends="test-unit" description="run unit and functional tests" >
-    <available file="${test.functional.src}" property="test.functional.src.exists" />
-    <antcall target="test-functional" />
-  </target>
-
-  <target name="package" depends="test" description="Package as a jar">
-    <mkdir dir="${dist}/lib"/>
-    <jar jarfile="${dist}/lib/${artifact}-${version}.jar" basedir="${build.output}">
-      <manifest>
-        <attribute name="Main-Class" value="com.thoughtworks.selenium.grid.hub.HubServer"/>
-        <attribute name="Built-By" value="OpenQA.org"/>
-        <attribute name="Build-Time" value="${DSTAMP}${TSTAMP}"/>
-        <section name="common">
-          <attribute name="Specification-Title" value="${name}"/>
-          <attribute name="Specification-Version" value="${version}"/>
-          <attribute name="Specification-Vendor" value="OpenQA.org"/>
-        </section>
-      </manifest>
-    </jar>
-  </target>
-
-  <macrodef name="package-standalone-jar">
-    <attribute name="main-class"/>
-    <element name="dependencies" optional="yes"/>
-    <sequential>
-      <tstamp/>
-      <mkdir dir="${dist}/lib"/>
-      <jar jarfile="${dist}/lib/${artifact}-standalone-${version}.jar">
-        <manifest>
-          <attribute name="Main-Class" value="@{main-class}"/>
-          <attribute name="Built-By" value="OpenQA.org"/>
-          <attribute name="Build-Time" value="${DSTAMP}${TSTAMP}"/>
-          <section name="common">
-            <attribute name="Specification-Title" value="${name}"/>
-            <attribute name="Specification-Version" value="${version}"/>
-            <attribute name="Specification-Vendor" value="OpenQA.org"/>
-          </section>
-        </manifest>
-        <zipfileset src="${dist}/lib/${artifact}-${version}.jar"/>
-        <dependencies/>
-      </jar>
-    </sequential>
-  </macrodef>
-  
-  <target name="pmd-analysis" description="Performs Code Analysis using PMD Inspection Tool">
-    <echo message="Performing analysis code using PMD"/>
-    <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
-    <mkdir dir="${metrics.pmd.reports}"/>
-    <pmd shortFilenames="true">
-      <ruleset>lib/build/pmd-ruleset.xml</ruleset>
-      <formatter type="html" toFile="${metrics.pmd.reports}/pmd_report.html"
-                 linkPrefix="http://pmd.sourceforge.net/xref/"/>
-      <fileset dir="${build.src}">
-        <include name="**/*.java"/>
-      </fileset>
-    </pmd>
-  </target>
-
-  <target name="coverage-analysis" depends="compile, compile-unit-tests" description="Gather code coverage metrics">
-    <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
-
-    <delete file="${build.output}/cobertura.ser" />
-    
-    <cobertura-instrument datafile="${build.output}/cobertura.ser">
-      <fileset dir="${build.output}">
-        <include name="**/*.class"/>
-      </fileset>
-    </cobertura-instrument>
-
-    <run-unit-tests>
-      <options>
-        <sysproperty key="net.sourceforge.cobertura.datafile" file="${build.output}/cobertura.ser" />
-        <classpath refid="cobertura.classpath"/>
-      </options>
-    </run-unit-tests>
-
-    <cobertura-report srcdir="${build.src}" destdir="${metrics.coverage.reports}" datafile="${build.output}/cobertura.ser"/>
-  </target>
-
-  <macrodef name="build-subprojects">
-    <attribute name="target"/>
-    <sequential>
-      <subant target="@{target}">
-        <filelist dir=".">
-          <file name="infrastructure/core/build.xml"/>
-          <file name="infrastructure/webserver/build.xml"/>
-          <file name="hub/build.xml"/>
-          <file name="agent/build.xml"/>
-          <file name="remote-control/build.xml"/>
-          <file name="tools/build.xml"/>
-          <file name="demo/build.xml"/>
-          <file name="examples/java-testng/build.xml"/>
-          <file name="regression-tests"/>
-        </filelist>
-      </subant>
-    </sequential>
-  </macrodef>
+    <description>Selenium Grid Common Build Tasks</description>
+
+    <tstamp/>
+
+    <property name="build.src" location="src/main/java"/>
+    <property name="build.output" location="target/classes"/>
+    <property name="dist" location="${basedir}/target/dist"/>
+    <property name="test.src" location="src/test/unit/java"/>
+    <property name="test.functional.output" location="target/test-functional-classes"/>
+    <property name="test.functional.src" location="src/test/functional/java"/>
+    <property name="test.output" location="target/test-classes"/>
+    <property name="test.reports" location="target/test-reports"/>
+    <property name="metrics.reports" location="target/metrics"/>
+    <property name="metrics.pmd.reports" location="${metrics.reports}/pmd"/>
+    <property name="metrics.coverage.reports" location="${metrics.reports}/coverage"/>
+    <property environment="env"/>
+
+    <path id="mocking.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="jbehave-1.0.1.jar"/>
+            <include name="jmock-junit4-2.2.0.jar"/>
+            <include name="jmock-legacy-2.2.0.jar"/>
+            <include name="proxytoys-0.2.1.jar"/>
+            <include name="objenesis-1.0.jar"/>
+            <include name="jmock-2.2.0.jar"/>
+            <include name="cglib-nodep-2.1_3.jar"/>
+            <include name="mockito-all-1.8.4.jar"/>
+        </fileset>
+    </path>
+
+    <path id="junit.core.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="junit-4.7.jar"/>
+        </fileset>
+        <pathelement location="${build.output}"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <path id="junit.classpath"/>
+
+    <path id="unit-testing.classpath">
+        <path refid="compile.classpath"/>
+        <path refid="junit.core.classpath"/>
+        <path refid="junit.classpath"/>
+        <path refid="mocking.classpath"/>
+        <path refid="cobertura.classpath"/>
+        <pathelement location="${build.output}"/>
+        <pathelement location="${test.output}"/>
+    </path>
+
+    <path id="functional-testing.classpath">
+        <path refid="compile.classpath"/>
+        <path refid="junit.core.classpath"/>
+        <path refid="junit.classpath"/>
+        <path refid="mocking.classpath"/>
+        <path refid="cobertura.classpath"/>
+        <pathelement location="${build.output}"/>
+        <pathelement location="${test.functional.output}"/>
+    </path>
+
+    <path id="pmd.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="pmd-4.2.2.jar"/>
+            <include name="jaxen-1.1.1.jar"/>
+            <include name="asm-3.1.jar"/>
+        </fileset>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <path id="cobertura.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="cobertura-1.9.4.1.jar"/>
+            <include name="log4j-1.2.9.jar"/>
+            <include name="asm-2.2.1.jar"/>
+            <include name="asm-tree-2.2.1.jar"/>
+            <include name="jakarta-oro-2.0.8.jar"/>
+        </fileset>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <target name="package-standalone" depends="package"/>
+    <target name="build" depends="test"/>
+    <target name="dist" depends="package-standalone"/>
+
+    <target name="clean" description="Remove generated artifacts">
+        <delete dir="target"/>
+    </target>
+
+    <target name="compile" description="compile the source ">
+        <mkdir dir="${build.output}"/>
+        <javac srcdir="${build.src}"
+               destdir="${build.output}"
+               debug="true"
+               source="1.5"
+               target="1.5">
+            <classpath refid="compile.classpath"/>
+        </javac>
+        <copy todir="${build.output}" verbose="true">
+            <fileset dir="${build.src}" includes="**/*.html"/>
+            <fileset dir="${build.src}" includes="**/*.yml"/>
+            <fileset dir="${build.src}" includes="**/heartbeat"/>
+        </copy>
+    </target>
+
+    <target name="compile-unit-tests" depends="compile" description="compile tests">
+        <mkdir dir="${test.output}"/>
+        <mkdir dir="${test.reports}"/>
+
+        <javac srcdir="${test.src}"
+               destdir="${test.output}"
+               excludes="**/package.html"
+               source="1.5"
+               target="1.5"
+               debug="true"
+               deprecation="true">
+            <classpath refid="unit-testing.classpath"/>
+        </javac>
+    </target>
+
+    <macrodef name="run-unit-tests">
+        <element name="options" optional="true"/>
+        <sequential>
+            <mkdir dir="${test.output}"/>
+            <mkdir dir="${test.reports}"/>
+
+            <copy todir="${test.output}" verbose="true">
+                <fileset dir="${test.src}" includes="**/*.html"/>
+            </copy>
+            <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="${test.reports}">
+                <options/>
+                <classpath refid="unit-testing.classpath"/>
+                <formatter type="xml"/>
+                <formatter type="plain"/>
+                <batchtest todir="${test.reports}">
+                    <fileset dir="${test.src}">
+                        <include name="**/*Test.java"/>
+                    </fileset>
+                </batchtest>
+            </junit>
+        </sequential>
+    </macrodef>
+
+    <target name="compile-functional-tests" depends="compile" description="compile tests">
+        <mkdir dir="${test.functional.output}"/>
+        <mkdir dir="${test.reports}"/>
+
+        <javac srcdir="${test.functional.src}"
+               destdir="${test.functional.output}"
+               excludes="**/package.html"
+               source="1.5"
+               target="1.5"
+               debug="true"
+               deprecation="true">
+            <classpath refid="functional-testing.classpath"/>
+        </javac>
+    </target>
+
+    <macrodef name="run-functional-tests">
+        <element name="options" optional="true"/>
+        <sequential>
+            <mkdir dir="${test.functional.output}"/>
+            <mkdir dir="${test.reports}"/>
+
+            <copy todir="${test.functional.output}" verbose="true">
+                <fileset dir="${test.functional.src}" includes="**/*.html"/>
+            </copy>
+            <echo message="${test.functional.src}"/>
+            <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="${test.reports}">
+                <options/>
+                <classpath refid="functional-testing.classpath"/>
+                <formatter type="xml"/>
+                <formatter type="plain"/>
+                <batchtest todir="${test.reports}">
+                    <fileset dir="${test.functional.src}">
+                        <include name="**/*Test.java"/>
+                    </fileset>
+                </batchtest>
+            </junit>
+        </sequential>
+    </macrodef>
+
+    <target name="test-unit" depends="compile, compile-unit-tests" description="run unit tests">
+        <run-unit-tests/>
+    </target>
+
+    <target name="test-functional" depends="compile" if="${test.functional.src.exists}"
+            description="run functional tests">
+        <antcall target="compile-functional-tests"/>
+        <run-functional-tests/>
+    </target>
+
+    <target name="test" depends="test-unit" description="run unit and functional tests">
+        <available file="${test.functional.src}" property="test.functional.src.exists"/>
+        <antcall target="test-functional"/>
+    </target>
+
+    <target name="package" depends="test" description="Package as a jar">
+        <mkdir dir="${dist}/lib"/>
+        <jar jarfile="${dist}/lib/${artifact}-${version}.jar" basedir="${build.output}">
+            <manifest>
+                <attribute name="Main-Class" value="com.thoughtworks.selenium.grid.hub.HubServer"/>
+                <attribute name="Built-By" value="OpenQA.org"/>
+                <attribute name="Build-Time" value="${DSTAMP}${TSTAMP}"/>
+                <section name="common">
+                    <attribute name="Specification-Title" value="${name}"/>
+                    <attribute name="Specification-Version" value="${version}"/>
+                    <attribute name="Specification-Vendor" value="OpenQA.org"/>
+                </section>
+            </manifest>
+        </jar>
+    </target>
+
+    <macrodef name="package-standalone-jar">
+        <attribute name="main-class"/>
+        <element name="dependencies" optional="yes"/>
+        <sequential>
+            <tstamp/>
+            <mkdir dir="${dist}/lib"/>
+            <jar jarfile="${dist}/lib/${artifact}-standalone-${version}.jar">
+                <manifest>
+                    <attribute name="Main-Class" value="@{main-class}"/>
+                    <attribute name="Built-By" value="OpenQA.org"/>
+                    <attribute name="Build-Time" value="${DSTAMP}${TSTAMP}"/>
+                    <section name="common">
+                        <attribute name="Specification-Title" value="${name}"/>
+                        <attribute name="Specification-Version" value="${version}"/>
+                        <attribute name="Specification-Vendor" value="OpenQA.org"/>
+                    </section>
+                </manifest>
+                <zipfileset src="${dist}/lib/${artifact}-${version}.jar"/>
+                <dependencies/>
+            </jar>
+        </sequential>
+    </macrodef>
+
+    <target name="pmd-analysis" description="Performs Code Analysis using PMD Inspection Tool">
+        <echo message="Performing analysis code using PMD"/>
+        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
+        <mkdir dir="${metrics.pmd.reports}"/>
+        <pmd shortFilenames="true">
+            <ruleset>lib/build/pmd-ruleset.xml</ruleset>
+            <formatter type="html" toFile="${metrics.pmd.reports}/pmd_report.html"
+                       linkPrefix="http://pmd.sourceforge.net/xref/"/>
+            <fileset dir="${build.src}">
+                <include name="**/*.java"/>
+            </fileset>
+        </pmd>
+    </target>
+
+    <target name="coverage-analysis" depends="compile, compile-unit-tests" description="Gather code coverage metrics">
+        <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
+
+        <delete file="${build.output}/cobertura.ser"/>
+
+        <cobertura-instrument datafile="${build.output}/cobertura.ser">
+            <fileset dir="${build.output}">
+                <include name="**/*.class"/>
+            </fileset>
+        </cobertura-instrument>
+
+        <run-unit-tests>
+            <options>
+                <sysproperty key="net.sourceforge.cobertura.datafile" file="${build.output}/cobertura.ser"/>
+                <classpath refid="cobertura.classpath"/>
+            </options>
+        </run-unit-tests>
+
+        <cobertura-report srcdir="${build.src}" destdir="${metrics.coverage.reports}"
+                          datafile="${build.output}/cobertura.ser"/>
+    </target>
+
+    <macrodef name="build-subprojects">
+        <attribute name="target"/>
+        <sequential>
+            <subant target="@{target}">
+                <filelist dir=".">
+                    <file name="infrastructure/core/build.xml"/>
+                    <file name="infrastructure/webserver/build.xml"/>
+                    <file name="hub/build.xml"/>
+                    <file name="agent/build.xml"/>
+                    <file name="remote-control/build.xml"/>
+                    <file name="tools/build.xml"/>
+                    <file name="demo/build.xml"/>
+                    <file name="examples/java-testng/build.xml"/>
+                    <file name="regression-tests"/>
+                </filelist>
+            </subant>
+        </sequential>
+    </macrodef>
 
 </project>
diff --git a/project.properties b/project.properties
index f7ca32a8..2dff1573 100755
--- a/project.properties
+++ b/project.properties
@@ -1,4 +1,3 @@
-version=1.1.0-SNAPSHOT
-selenium.version=1.0.3
+version=1.1.0.4-SPONTE-SNAPSHOT
+selenium.version=2.0b3
 rake=rake
-
diff --git a/regression-tests/build.xml b/regression-tests/build.xml
index edcd00b6..a130d312 100755
--- a/regression-tests/build.xml
+++ b/regression-tests/build.xml
@@ -1,60 +1,60 @@
 <project name="Selenium Grid Regression Tests" default="run" basedir=".">
 
-  <description>Selenium Grid Regression Tests</description>
-
-  <property name="rootdir" value="${basedir}/.."/>
-  <property file="${rootdir}/project.properties"/>
-  <property name="name" value="Selenium Grid Demo"/>
-  <property name="artifact" value="selenium-grid-demo"/>
-  <property name="version" value="SNAPSHOT"/>
-  <property name="selenium.version" value="SET ME"/>
-
-  <property name="build.src" location="src/"/>
-  <import file="${rootdir}/lib/build/common-build.xml" />
-
-  <property name="webSite" value="http://www.amazon.com" />
-  <property name="seleniumHost" value="localhost" />
-  <property name="seleniumPort" value="4444" />
-  <property name="browser" value="*firefox" />
-
-  <path id="compile.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="selenium-java-client-driver-${selenium.version}.jar"/>
-      <include name="testng-5.7-jdk15.jar"/>
-      <include name="commons-logging-1.1.1.jar"/>
-    </fileset>
-    <pathelement location="${rootdir}/tools/target/classes"/>
-    <pathelement location="${rootdir}/tools/target/dist/lib/selenium-grid-tools-standalone-${version}.jar"/>
-    <pathelement location="${rootdir}/vendor/selenium-grid-tools-standalone-${version}.jar"/>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-
-  <path id="runtime.classpath">
-    <path refid="compile.classpath"/>
-    <pathelement path="${build.output}/"/>
-  </path>
-
-  <target name="run" depends="compile" description="Run Selenium Regression Tests">
-    <echo>${seleniumHost}</echo>
-    <java classpathref="runtime.classpath"
-        classname="org.testng.TestNG"
-        failonerror="true">
-
-      <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
-      <sysproperty key="seleniumHost" value="${seleniumHost}" />
-      <sysproperty key="seleniumPort" value="${seleniumPort}" />
-      <sysproperty key="browser" value="${browser}" />
-      <arg value="-d" />
-      <arg value="${basedir}/target/reports" />
-      <arg value="-suitename" />
-      <arg value="Selenium Grid Regression Test Suite" />
-      <arg value="testng.xml"/>
-    </java>
-
-  </target>
-
-  <target name="build" depends="compile"/>
-  <target name="dist" depends="build"/>
-  <target name="coverage-analysis" />
+    <description>Selenium Grid Regression Tests</description>
+
+    <property name="rootdir" value="${basedir}/.."/>
+    <property file="${rootdir}/project.properties"/>
+    <property name="name" value="Selenium Grid Demo"/>
+    <property name="artifact" value="selenium-grid-demo"/>
+    <property name="version" value="SNAPSHOT"/>
+    <property name="selenium.version" value="SET ME"/>
+
+    <property name="build.src" location="src/"/>
+    <import file="${rootdir}/lib/build/common-build.xml"/>
+
+    <property name="webSite" value="http://www.amazon.com"/>
+    <property name="seleniumHost" value="localhost"/>
+    <property name="seleniumPort" value="4444"/>
+    <property name="browser" value="*firefox"/>
+
+    <path id="compile.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="selenium-java-${selenium.version}.jar"/>
+            <include name="testng-5.7-jdk15.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
+        </fileset>
+        <pathelement location="${rootdir}/tools/target/classes"/>
+        <pathelement location="${rootdir}/tools/target/dist/lib/selenium-grid-tools-standalone-${version}.jar"/>
+        <pathelement location="${rootdir}/vendor/selenium-grid-tools-standalone-${version}.jar"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <path id="runtime.classpath">
+        <path refid="compile.classpath"/>
+        <pathelement path="${build.output}/"/>
+    </path>
+
+    <target name="run" depends="compile" description="Run Selenium Regression Tests">
+        <echo>${seleniumHost}</echo>
+        <java classpathref="runtime.classpath"
+              classname="org.testng.TestNG"
+              failonerror="true">
+
+            <sysproperty key="java.security.policy" file="${rootdir}/lib/testng.policy"/>
+            <sysproperty key="seleniumHost" value="${seleniumHost}"/>
+            <sysproperty key="seleniumPort" value="${seleniumPort}"/>
+            <sysproperty key="browser" value="${browser}"/>
+            <arg value="-d"/>
+            <arg value="${basedir}/target/reports"/>
+            <arg value="-suitename"/>
+            <arg value="Selenium Grid Regression Test Suite"/>
+            <arg value="testng.xml"/>
+        </java>
+
+    </target>
+
+    <target name="build" depends="compile"/>
+    <target name="dist" depends="build"/>
+    <target name="coverage-analysis"/>
 
 </project>
diff --git a/remote-control/build.xml b/remote-control/build.xml
index 22fc4dec..02ead47d 100755
--- a/remote-control/build.xml
+++ b/remote-control/build.xml
@@ -1,101 +1,162 @@
 <project name="Selenium Grid Remote Control" default="package-standalone" basedir=".">
 
-  <description>Selenium Grid Remote Control</description>
-
-  <property name="rootdir" value="${basedir}/.."/>
-  <property file="${rootdir}/project.properties"/>
-  <property name="name" value="Selenium Grid Remote Control"/>
-  <property name="artifact" value="selenium-grid-remote-control"/>
-  <property name="version" value="SNAPSHOT"/>
-  <property name="selenium.version" value="Set Me"/>
-
-  
-  <import file="${rootdir}/lib/build/common-build.xml" />
-
-  <path id="compile.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="selenium-server-${selenium.version}-standalone.jar"/>
-    </fileset>
-    <fileset dir="${rootdir}/vendor">
-      <include name="commons-httpclient-3.1.jar"/>
-      <include name="commons-codec-1.4.jar"/>
-      <include name="commons-logging-1.1.1.jar"/>
-    </fileset>
-    <pathelement location="${rootdir}/infrastructure/core/target/classes"/>    
-    <pathelement path="${java.class.path}/"/>
-  </path>
-
-  <path id="runtime.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="selenium-server-*.jar"/>
-    </fileset>
-    <!-- Selenium Server must be first in classpath -->
-    <fileset dir="${dist}/lib">
-      <include name="selenium-grid-remote-control-standalone-${version}.jar"/>
-    </fileset>
-    <pathelement path="${java.class.path}/"/>
-  </path>
-  
-  <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
-    <package-standalone-jar main-class="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher">
-      <dependencies>
-        <zipfileset src="${rootdir}/infrastructure/core/target/dist/lib/selenium-grid-core-${version}.jar"/>          
-        <zipfileset src="${rootdir}/vendor/jetty-6.1.24.jar"/>
-        <zipfileset src="${rootdir}/vendor/jetty-util-6.1.24.jar"/>
-        <zipfileset src="${rootdir}/vendor/servlet-api-2.5-20081211.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-httpclient-3.1.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-codec-1.4.jar"/>
-        <zipfileset src="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
-      </dependencies>
-    </package-standalone-jar>
-  </target>
-
-  <property name="host" value="localhost"/>
-  <property name="port" value="5555"/>
-  <property name="hubURL" value="http://localhost:4444"/>
-  <property name="environment" value="*firefox"/>
-  <property name="hubPollerIntervalInSeconds" value="30"/>
-  <property name="seleniumArgs" value=""/>
-  <target name="run" description="Launch a remote control">
-    <java classpathref="runtime.classpath"
-          classname="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher"
-          fork="true"
-          failonerror="true">
-
-      <sysproperty key="http.proxyHost" value="${http.proxyHost}"/>
-      <sysproperty key="http.proxyPort" value="${http.proxyPort}"/>
-      <sysproperty key="https.proxyHost" value="${https.proxyHost}"/>
-      <sysproperty key="https.proxyPort" value="${https.proxyPort}"/>
-
-      <arg value="-port"/>
-      <arg value="${port}"/>
-      <arg value="-host"/>
-      <arg value="${host}"/>
-      <arg value="-hubURL"/>
-      <arg value="${hubURL}"/>
-      <arg value="-env"/>
-      <arg value="${environment}"/>
-      <arg value="-hubPollerIntervalInSeconds"/>
-      <arg value="${hubPollerIntervalInSeconds}"/>
-      <arg line="${seleniumArgs}"/>
-    </java>
-  </target>
-
-  <target name="run-echo" description="Launch a echo remote control">
-    <java classpathref="runtime.classpath"
-          classname="com.thoughtworks.selenium.grid.remotecontrol.instrumentation.EchoRemoteControl"
-          fork="true"
-          failonerror="true">
-      <arg value="-port"/>
-      <arg value="${port}"/>
-      <arg value="-host"/>
-      <arg value="${host}"/>
-      <arg value="-hubURL"/>
-      <arg value="${hubURL}"/>
-      <arg value="-env"/>
-      <arg value="${environment}"/>
-      <arg line="${seleniumArgs}"/>
-    </java>
-  </target>
+    <description>Selenium Grid Remote Control</description>
+
+    <property name="rootdir" value="${basedir}/.."/>
+    <property file="${rootdir}/project.properties"/>
+    <property name="name" value="Selenium Grid Remote Control"/>
+    <property name="artifact" value="selenium-grid-remote-control"/>
+    <property name="version" value="SNAPSHOT"/>
+    <property name="selenium.version" value="Set Me"/>
+
+
+    <import file="${rootdir}/lib/build/common-build.xml"/>
+
+    <path id="compile.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="selenium-server-standalone-${selenium.version}.jar"/>
+        </fileset>
+        <fileset dir="${rootdir}/vendor">
+            <include name="commons-httpclient-3.1.jar"/>
+            <include name="commons-codec-1.4.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
+        </fileset>
+        <pathelement location="${rootdir}/infrastructure/core/target/classes"/>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <path id="runtime.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="selenium-server-standalone-*.jar"/>
+        </fileset>
+        <!-- Selenium Server must be first in classpath -->
+        <fileset dir="${dist}/lib">
+            <include name="selenium-grid-remote-control-standalone-${version}.jar"/>
+        </fileset>
+        <pathelement path="${java.class.path}/"/>
+    </path>
+
+    <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
+        <package-standalone-jar
+                main-class="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher">
+            <dependencies>
+                <zipfileset src="${rootdir}/infrastructure/core/target/dist/lib/selenium-grid-core-${version}.jar"/>
+                <zipfileset src="${rootdir}/vendor/jetty-6.1.24.jar"/>
+                <zipfileset src="${rootdir}/vendor/jetty-util-6.1.24.jar"/>
+                <zipfileset src="${rootdir}/vendor/servlet-api-2.5-20081211.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-httpclient-3.1.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-codec-1.4.jar"/>
+                <zipfileset src="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
+            </dependencies>
+        </package-standalone-jar>
+    </target>
+
+    <property name="host" value="localhost"/>
+    <property name="port" value="5555"/>
+    <property name="hubURL" value="http://localhost:4444"/>
+    <property name="environment" value="*firefox"/>
+    <property name="hubPollerIntervalInSeconds" value="30"/>
+    <property name="seleniumArgs" value=""/>
+    <target name="run" description="Launch a remote control">
+        <java classpathref="runtime.classpath"
+              classname="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher"
+              fork="true"
+              failonerror="true">
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,address=5007,suspend=n"/>
+
+            <arg value="-port"/>
+            <arg value="${port}"/>
+            <arg value="-host"/>
+            <arg value="${host}"/>
+            <arg value="-hubURL"/>
+            <arg value="${hubURL}"/>
+            <arg value="-env"/>
+            <arg value="${environment}"/>
+            <arg value="-hubPollerIntervalInSeconds"/>
+            <arg value="${hubPollerIntervalInSeconds}"/>
+            <arg line="${seleniumArgs}"/>
+        </java>
+    </target>
+
+    <target name="run-webdriver-ie" description="Launch a remote control using webdriver environment">
+        <java classpathref="runtime.classpath"
+              classname="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher"
+              fork="true"
+              failonerror="true">
+
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,address=5008,suspend=n"/>
+            <arg value="-port"/>
+            <arg value="7778"/>
+            <arg value="-host"/>
+            <arg value="${host}"/>
+            <arg value="-hubURL"/>
+            <arg value="${hubURL}"/>
+            <arg value="-env"/>
+            <arg value="internet explorer on windows"/>
+            <arg value="-hubPollerIntervalInSeconds"/>
+            <arg value="${hubPollerIntervalInSeconds}"/>
+            <arg line="${seleniumArgs}"/>
+        </java>
+    </target>
+
+    <target name="run-webdriver-ff-on-any" description="Launch a remote control using webdriver environment">
+        <java classpathref="runtime.classpath"
+              classname="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher"
+              fork="true"
+              failonerror="true">
+
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,address=5009,suspend=n"/>
+            <arg value="-port"/>
+            <arg value="7779"/>
+            <arg value="-host"/>
+            <arg value="${host}"/>
+            <arg value="-hubURL"/>
+            <arg value="${hubURL}"/>
+            <arg value="-env"/>
+            <arg value="firefox on any"/>
+            <arg value="-hubPollerIntervalInSeconds"/>
+            <arg value="${hubPollerIntervalInSeconds}"/>
+            <arg line="${seleniumArgs}"/>
+        </java>
+    </target>
+
+
+    <target name="run-webdriver-htmlunit" description="Launch a remote control using webdriver environment">
+        <java classpathref="runtime.classpath"
+              classname="com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher"
+              fork="true"
+              failonerror="true">
+
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,address=5007,suspend=n"/>
+            <arg value="-port"/>
+            <arg value="7777"/>
+            <arg value="-host"/>
+            <arg value="${host}"/>
+            <arg value="-hubURL"/>
+            <arg value="${hubURL}"/>
+            <arg value="-env"/>
+            <arg value="htmlunit on any"/>
+            <arg value="-hubPollerIntervalInSeconds"/>
+            <arg value="${hubPollerIntervalInSeconds}"/>
+            <arg line="${seleniumArgs}"/>
+        </java>
+    </target>
+
+    <target name="run-echo" description="Launch a echo remote control">
+        <java classpathref="runtime.classpath"
+              classname="com.thoughtworks.selenium.grid.remotecontrol.instrumentation.EchoRemoteControl"
+              fork="true"
+              failonerror="true">
+            <arg value="-port"/>
+            <arg value="${port}"/>
+            <arg value="-host"/>
+            <arg value="${host}"/>
+            <arg value="-hubURL"/>
+            <arg value="${hubURL}"/>
+            <arg value="-env"/>
+            <arg value="${environment}"/>
+            <arg line="${seleniumArgs}"/>
+        </java>
+    </target>
 
 </project>
diff --git a/src/configuration/grid_configuration.yml b/src/configuration/grid_configuration.yml
index fd6ade5f..4df54874 100755
--- a/src/configuration/grid_configuration.yml
+++ b/src/configuration/grid_configuration.yml
@@ -1,44 +1,30 @@
 hub:
    port: 4444
-   remoteControlPollingIntervalInSeconds: 180
-   sessionMaxIdleTimeInSeconds: 300
+   remoteControlPollingIntervalInSeconds: 60
+   sessionMaxIdleTimeInSeconds: 150
    environments:
-       - name:    "Firefox on Windows"
-         browser: "*firefox"
-       - name:    "Firefox on OS X"
-         browser: "*firefox"
-       - name:    "Firefox on Linux"
-         browser: "*firefox"
-       - name:    "IE on Windows"
-         browser: "*iehta"
-       - name:    "Safari on OS X"
-         browser: "*safari"
-
        - name:    "*firefox"
          browser: "*firefox"
-       - name:    "*firefox2"
-         browser: "*firefox2"
-       - name:    "*firefox3"
-         browser: "*firefox3"
-       - name:    "*chrome"
-         browser: "*chrome"
        - name:    "*iexplore"
          browser: "*iexplore"
        - name:    "*iehta"
          browser: "*iehta"
        - name:    "*safari"
          browser: "*safari"
-       - name:    "*opera"
-         browser: "*opera"
-       - name:    "*googlechrome"
-         browser: "*googlechrome"
-       - name:    "*firefoxproxy"
-         browser: "*firefoxproxy"
-       - name:    "*pifirefox"
-         browser: "*pifirefox"
-       - name:    "*iexploreproxy"
-         browser: "*iexploreproxy"
-       - name:    "*piiexplore"
-         browser: "*piiexplore"
-       - name:    "*safariproxy"
-         browser: "*safariproxy"
+       # webdriver environments
+       - name:    "internet explorer on windows"
+         browser: "InternetExplorer"
+       - name:    "firefox on windows"
+         browser: "Firefox"
+       - name:    "firefox on any"
+         browser: "Firefox"
+       - name:    "htmlunit on any"
+         browser: "HtmlUnit"
+       - name:    "chrome on any"
+         browser: "Chrome"
+       - name:    "chrome on windows"
+         browser: "Chrome"
+       - name:    "safari on any"
+         browser: "Safari"
+       - name:    "safari on windows"
+         browser: "Safari"
\ No newline at end of file
diff --git a/tools/build.xml b/tools/build.xml
index 98452bb4..0b262837 100755
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -1,31 +1,31 @@
 <project name="Selenium Grid Tools" default="package" basedir=".">
 
-  <description>Selenium Grid Automation Tools</description>
+    <description>Selenium Grid Automation Tools</description>
 
-  <property name="rootdir" value="${basedir}/.."/>
-  <property file="${rootdir}/project.properties"/>
-  <property name="name" value="Selenium Grid Tools"/>
-  <property name="artifact" value="selenium-grid-tools"/>
-  <property name="version" value="SNAPSHOT"/>
+    <property name="rootdir" value="${basedir}/.."/>
+    <property file="${rootdir}/project.properties"/>
+    <property name="name" value="Selenium Grid Tools"/>
+    <property name="artifact" value="selenium-grid-tools"/>
+    <property name="version" value="SNAPSHOT"/>
 
-  <property name="build.src" location="src/main"/>
+    <property name="build.src" location="src/main"/>
 
-  <import file="${rootdir}/lib/build/common-build.xml" />
+    <import file="${rootdir}/lib/build/common-build.xml"/>
 
-  <path id="compile.classpath">
-    <fileset dir="${rootdir}/vendor">
-      <include name="selenium-java-client-driver-${selenium.version}.jar"/>
-      <include name="commons-logging-1.1.1.jar"/>      
-    </fileset>
-    <pathelement path="${java.class.path}/"/>
-  </path>
+    <path id="compile.classpath">
+        <fileset dir="${rootdir}/vendor">
+            <include name="selenium-java-${selenium.version}.jar"/>
+            <include name="commons-logging-1.1.1.jar"/>
+        </fileset>
+        <pathelement path="${java.class.path}/"/>
+    </path>
 
-  <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
-    <package-standalone-jar main-class="">
-      <dependencies>
-        <zipfileset src="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
-      </dependencies>
-    </package-standalone-jar>
-  </target>
+    <target name="package-standalone" depends="package" description="Package as a jar including all dependencies">
+        <package-standalone-jar main-class="">
+            <dependencies>
+                <zipfileset src="${rootdir}/vendor/commons-logging-1.1.1.jar"/>
+            </dependencies>
+        </package-standalone-jar>
+    </target>
 
 </project>
diff --git a/vendor/json.jar b/vendor/json.jar
new file mode 100644
index 00000000..020ccf74
Binary files /dev/null and b/vendor/json.jar differ
diff --git a/vendor/selenium-java-2.0b3.jar b/vendor/selenium-java-2.0b3.jar
new file mode 100644
index 00000000..9326de59
Binary files /dev/null and b/vendor/selenium-java-2.0b3.jar differ
diff --git a/vendor/selenium-java-client-driver-1.0.3.jar b/vendor/selenium-java-client-driver-1.0.3.jar
deleted file mode 100644
index 4a126985..00000000
Binary files a/vendor/selenium-java-client-driver-1.0.3.jar and /dev/null differ
diff --git a/vendor/selenium-server-1.0.3-standalone.jar b/vendor/selenium-server-standalone-2.0b3.jar
similarity index 58%
rename from vendor/selenium-server-1.0.3-standalone.jar
rename to vendor/selenium-server-standalone-2.0b3.jar
index 004d7dac..d512a9ee 100644
Binary files a/vendor/selenium-server-1.0.3-standalone.jar and b/vendor/selenium-server-standalone-2.0b3.jar differ