diff --git a/README.md b/README.md
new file mode 100644
index 0000000..b400fd3
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# Overview
+
+These are the PHP bindings for the WebDriver API in Selenium 2. It's designed to work with PHPUnit and includes some built-ins for running tests at Sauce Labs.
+
+For more information, see:
+* [Selenium](http://code.google.com/p/selenium/)
+* [PHPUnit](https://github.com/sebastianbergmann/phpunit/)
+* [Sauce Labs](https://saucelabs.com/)
+
+# Usage
+
+See the included SampleTest.php. Start up the Selenium 2 standalone server (http://code.google.com/p/selenium/downloads/list) and run the test with:
+
+    phpunit SampleTest.php
+
+Make sure phpunit is in your path!
+
+# Tests
+
+What's code without tests? Run the tests with:
+
+    phpunit WebDriverSelectorTest.php
\ No newline at end of file
diff --git a/SampleTest.php b/SampleTest.php
new file mode 100644
index 0000000..253e625
--- /dev/null
+++ b/SampleTest.php
@@ -0,0 +1,55 @@
+<?php
+
+require_once 'WebDriver.php';
+require_once 'WebDriver/Driver.php';
+require_once 'WebDriver/MockDriver.php';
+require_once 'WebDriver/WebElement.php';
+
+class SampleTest extends PHPUnit_Framework_TestCase {
+  protected $driver;
+  
+  public function setUp() {
+    // Choose one of the following
+    
+    // For tests running at Sauce Labs
+//     $this->driver = WebDriver_Driver::InitAtSauce("my-sauce-username", "my-sauce-api-key", "WINDOWS", "firefox", "3.6");
+//     $sauce_job_name = get_class($this);
+//     $this->driver->set_sauce_context("name", $sauce_job_name);
+    
+    // For a mock driver (for debugging)
+//     $this->driver = new WebDriver_MockDriver();
+
+    // For a local driver
+    $this->driver = WebDriver_Driver::InitAtLocal("4444", "firefox");
+  }
+  
+  // Forward calls to main driver 
+  public function __call($name, $arguments) {
+    if (method_exists($this->driver, $name)) {
+      return call_user_func_array(array($this->driver, $name), $arguments);
+    }
+  }
+
+  public function test() {
+    $this->load("http://seleniumhq.org/");
+    $this->assert_title("Selenium web application testing system");
+    $this->get_element("css=h2")->assert_text("Get started with Selenium!");
+    
+    $this->get_element("id=q")->send_keys("webdriver");
+    $this->get_element("id=submit")->click();
+    
+    $first_result = $this->get_element("css=a.gs-title")->get_text();
+  }
+  
+  public function tearDown() {
+    if ($this->driver) {
+      if ($this->hasFailed()) {
+        $this->driver->set_sauce_context("passed", false);
+      } else {
+        $this->driver->set_sauce_context("passed", true);
+      }
+      $this->driver->quit();
+    }
+    parent::tearDown();
+  }
+}
\ No newline at end of file
diff --git a/WebDriver.php b/WebDriver.php
new file mode 100644
index 0000000..a5f9102
--- /dev/null
+++ b/WebDriver.php
@@ -0,0 +1,109 @@
+<?php
+
+class WebDriver {
+  public static function Curl($http_type, $full_url, $payload = null) {
+    $curl = curl_init($full_url);
+    curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $http_type);
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
+    curl_setopt($curl, CURLOPT_HEADER, TRUE);
+    if (($http_type === "POST" || $http_type === "PUT") && $payload !== null) {
+      curl_setopt($curl, CURLOPT_POSTFIELDS, $payload);
+    }
+    WebDriver::LogDebug($http_type, $full_url, $payload);
+    $full_response = curl_exec($curl);
+    WebDriver::LogDebug($full_response);
+    curl_close($curl);
+    $response_parts = explode("\r\n\r\n", $full_response, 2);
+    $response['header'] = $response_parts[0];
+    if (!empty($response_parts[1])) {
+      $response['body'] = $response_parts[1];
+    }
+    return $response;
+  }
+
+  public static function ParseLocator($locator) {
+    $se1_to_se2 = array(
+      "identifier" => "id",
+      "id" => "id",
+      "name" => "name",
+      "xpath" => "xpath",
+      "link" => "link text",
+      "css" => "css selector",
+        // The dom selector in Se1 isn't in Se2
+        // Se2 has 4 new selectors
+        "partial link text",
+        "tag name",
+        "class",
+        "class name"      
+    );
+    
+    $locator_parts = explode("=", $locator, 2);
+    if (array_key_exists($locator_parts[0], $se1_to_se2) && $locator_parts[1]) { // Explicit Se1 selector
+      $strategy = $se1_to_se2[$locator_parts[0]];
+      $value = $locator_parts[1];
+    } else if (in_array($locator_parts[0], $se1_to_se2) && $locator_parts[1]) { // Explicit Se2 selector
+      $strategy = $locator_parts[0];
+      $value = $locator_parts[1];
+    } else { // Guess the selector based on Se1
+      if (substr($locator, 0, 2) === "//") {
+        $strategy = "xpath";
+        $value = $locator;
+      } else if (substr($locator, 0, 9) === "document." || substr($locator, 0, 4) === "dom=") {
+        throw new Exception("DOM selectors aren't supported in WebDriver: $locator");
+      } else { // Fall back to id
+        $strategy = "id";
+        $value = $locator;
+      }
+    }
+    return array("using" => $strategy, "value" => $value);
+  }
+
+  public static function GetJSONValue($curl_response, $attribute = null) {
+    if (!isset($curl_response['body'])) {
+      throw new Exception("Response had no body\n{$curl_response['header']}");
+    }
+    $array = json_decode(trim($curl_response['body']), true);
+    if ($array === null) {
+      throw new Exception("Body could not be decoded as JSON\n{$curl_response['body']}");
+    }
+    if (!isset($array["value"])) {
+      throw new Exception("JSON had no value\n" . print_r($array, true));
+    }
+    if ($attribute === null) {
+      $rv = $array["value"];
+    } else {
+      if (isset($array["value"][$attribute])) {
+        $rv = $array["value"][$attribute];
+      } else if (is_array($array["value"])) {
+        $rv = array();
+        foreach ($array["value"] as $a_value) {
+          if (isset($a_value[$attribute])) {
+            $rv[] = $a_value[$attribute];
+          } else {
+            throw new Exception("JSON value did not have attribute $attribute\n" . $array["value"]["message"]);
+          }
+        }
+      } else {
+        throw new Exception("JSON value did not have attribute $attribute\n" . $array["value"]["message"]);
+      }
+    }
+    return $rv;
+  }
+  
+  public static function LogDebug() {
+    if (defined('kFestDebug') && kFestDebug) {
+      $non_null = array_filter(func_get_args());
+      $strings = 0;
+      foreach ($non_null as $argument) {
+        if (is_string($argument)) {
+          $strings++;
+        }
+      }
+      if ($strings == sizeof($non_null)) {
+        echo implode(" - ", $non_null) . "\n";
+      } else {
+        print_r(func_get_args());
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/WebDriver/Driver.php b/WebDriver/Driver.php
new file mode 100644
index 0000000..9b0e2aa
--- /dev/null
+++ b/WebDriver/Driver.php
@@ -0,0 +1,509 @@
+<?php
+
+class WebDriver_Driver {
+  protected $session_id;
+  protected $server_url;
+  private static $status_codes = array(
+    0 => array("Success", " The command executed successfully."),
+    7 => array("NoSuchElement", " An element could not be located on the page using the given search parameters."),
+    8 => array("NoSuchFrame", " A request to switch to a frame could not be satisfied because the frame could not be found."),
+    9 => array("UnknownCommand", " The requested resource could not be found, or a request was received using an HTTP method that is not supported by the mapped resource."),
+    10 => array("StaleElementReference", " An element command failed because the referenced element is no longer attached to the DOM."),
+    11 => array("ElementNotVisible", " An element command could not be completed because the element is not visible on the page."),
+    12 => array("InvalidElementState", " An element command could not be completed because the element is in an invalid state (e.g. attempting to click a disabled element)."),
+    13 => array("UnknownError", " An unknown server-side error occurred while processing the command."),
+    15 => array("ElementIsNotSelectable", " An attempt was made to select an element that cannot be selected."),
+    17 => array("JavaScriptError", " An error occurred while executing user supplied JavaScript."),
+    19 => array("XPathLookupError", " An error occurred while searching for an element by XPath."),
+    23 => array("NoSuchWindow", " A request to switch to a different window could not be satisfied because the window could not be found."),
+    24 => array("InvalidCookieDomain", " An illegal attempt was made to set a cookie under a different domain than the current page."),
+    25 => array("UnableToSetCookie", " A request to set a cookie's value could not be satisfied."),
+    28 => array("Timeout", " A command did not complete before its timeout expired."),
+  );
+  
+  protected function __construct($server_url, $capabilities) {
+    $this->server_url = $server_url;
+    
+    $payload = array("desiredCapabilities" => $capabilities);
+    $response = $this->execute("POST", "/session", $payload);
+    
+    // Parse out session id
+    preg_match("/\nLocation:.*\/(.*)\n/", $response['header'], $matches);
+    if (count($matches) > 0) {
+      $this->session_id = trim($matches[1]);
+    } else {
+      $message = "Did not get a session id from $server_url\n";
+      if (!empty($response['body'])) {
+        $message .= $response['body'];
+      } else if (!empty($response['header'])) {
+        $message .= $response['header'];
+      } else {
+        $message .= "No response from server.";
+      }
+      throw new Exception($message);
+    }
+  }
+  
+  public static function InitAtSauce($sauce_username, $sauce_key, $os, $browser, $version = false) {
+    $capabilities = array(
+      'javascriptEnabled' => true,
+      'platform' => strtoupper($os),
+      'browserName' => $browser,
+    );
+    if ($version) {
+      $capabilities["version"] = $version;
+    }
+    return new WebDriver_Driver("http://" . $sauce_username . ":" . $sauce_key . "@ondemand.saucelabs.com:80/wd/hub", $capabilities);
+  }
+  
+  public static function InitAtLocal($port, $browser) {
+    $capabilities = array(
+      'javascriptEnabled' => true,
+      'browserName' => $browser,
+    );
+    if (strcasecmp($browser, "iphone") == 0 || strcasecmp($browser, "android") == 0) {
+      return new WebDriver_Driver("http://localhost:$port/hub", $capabilities);
+    } else {
+      return new WebDriver_Driver("http://localhost:$port/wd/hub", $capabilities);
+    }
+  }
+  
+  public function running_at_sauce() {
+    return (strpos($this->server_url, "saucelabs.com") !== false);
+  }
+  
+  public function sauce_url() {
+    if ($this->running_at_sauce()) {
+      return "https://saucelabs.com/jobs/{$this->session_id}";
+    } else {
+      return false;
+    }
+  }
+  
+  public function execute($http_type, $relative_url, $payload = null) {
+    if ($payload !== null) {
+      $payload = json_encode($payload);
+    }
+    $relative_url = str_replace(':sessionId', $this->session_id, $relative_url);
+    $full_url = $this->server_url . $relative_url;
+    $response = WebDriver::Curl($http_type, $full_url, $payload);
+    if (isset($response['body'])) {
+      $this->check_response_status($response['body'], $payload);
+    }
+    return $response;
+  }
+  
+  private function check_response_status($body, $payload) {
+    $array = json_decode(trim($body), true);
+    if (!is_null($array)) {
+      $response_status_code = $array["status"];
+      if (!self::$status_codes[$response_status_code]) {
+        throw new Exception("Unknown status code $response_status_code returned from server.\n$body");
+      }
+      if ($response_status_code != 0) {
+        $message = $response_status_code . " - " . self::$status_codes[$response_status_code][0] . " - " . self::$status_codes[$response_status_code][1] . "\n";
+        $message .= "Payload: " . print_r($payload, true) . "\n";
+        if (isset($array['value']['message'])) {
+          $message .= "Message: " . $array['value']['message'] . "\n";
+        } else {
+          $message .= "Response: " . $body . "\n";
+        }
+        throw new Exception($message);
+      }
+    }
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId
+  public function quit() {
+    $this->execute("DELETE", "/session/:sessionId");
+  }
+  
+  /********************************************************************
+   * Getters
+   */
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId
+  public function get_capabilities() {
+    $response = $this->execute("GET", "/session/:sessionId");
+    return WebDriver::GetJSONValue($response);
+  }
+
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/url
+  public function get_url() {
+    $response = $this->execute("GET", "/session/:sessionId/url");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/title
+  public function get_title() {
+    $response = $this->execute("GET", "/session/:sessionId/title");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/source
+  public function get_source() {
+    $response = $this->execute("GET", "/session/:sessionId/source");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  public function get_text() {
+    $tries = $this->running_at_sauce() ? 3 : 1; // Sauce Labs has trouble with this tag sometimes, so we give it a couple tries
+    for ($i = 1; $i <= $tries; $i++) {
+      try {
+        $result = $this->get_element("tag name=body")->get_text();
+        break;
+      } catch (Exception $e) {
+        // try again
+      }
+    }
+    if (!isset($result)) {
+      throw new Exception("Could not get body text after $tries tries");
+    }
+    return $result;
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/screenshot
+  public function get_screenshot() {
+    $response = $this->execute("GET", "/session/:sessionId/screenshot");
+    $base64_encoded_png = WebDriver::GetJSONValue($response);
+    return base64_decode($base64_encoded_png);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/ime/available_engines
+  // Not supported as of Selenium 2.0b3
+  public function get_all_ime_engines() {
+    $response = $this->execute("GET", "/session/:sessionId/ime/available_engines");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/ime/active_engine
+  // Not supported as of Selenium 2.0b3
+  public function get_ime_engine() {
+    $response = $this->execute("GET", "/session/:sessionId/ime/active_engine");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/ime/activated
+  // Not supported as of Selenium 2.0b3
+  public function is_ime_active() {
+    $response = $this->execute("GET", "/session/:sessionId/ime/activated");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element
+  public function get_element($locator) {
+    $payload = WebDriver::ParseLocator($locator);
+    $response = $this->execute("POST", "/session/:sessionId/element", $payload);
+    $element_id = WebDriver::GetJSONValue($response, "ELEMENT");
+    return new WebDriver_WebElement($this, $element_id, $locator);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/elements
+  public function get_all_elements($locator) {
+    $payload = WebDriver::ParseLocator($locator);
+    $response = $this->execute("POST", "/session/:sessionId/elements", $payload);
+    $element_ids = WebDriver::GetJSONValue($response, "ELEMENT");
+    $elements = array();
+    foreach ($element_ids as $element_id) {
+      $elements[] = new WebDriver_WebElement($this, $element_id, $locator);
+    }
+    return $elements;
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/active
+  public function get_active_element() {
+    $response = $this->execute("POST", "/session/:sessionId/element/active");
+    $element_id = WebDriver::GetJSONValue($response, "ELEMENT");
+    return new WebDriver_WebElement($this, $element_id, "active=true");
+  }
+  
+  public function is_element_present($locator) {
+    try {
+      $this->get_element($locator);
+      $is_element_present = true;
+    } catch (Exception $e) {
+      $is_element_present = false;
+    }
+    return $is_element_present;
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/window_handle
+  public function get_window_handle() {
+    $response = $this->execute("GET", "/session/:sessionId/window_handle");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/window_handles
+  public function get_all_window_handles() {
+    $response = $this->execute("GET", "/session/:sessionId/window_handles");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/speed
+  // Not supported as of Selenium 2.0b3
+  public function get_input_speed() {
+    $response = $this->execute("GET", "/session/:sessionId/speed");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/cookie
+  public function get_all_cookies() {
+    $response = $this->execute("GET", "/session/:sessionId/cookie");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  public function get_cookie($name, $property = null) {
+    $all_cookies = $this->get_cookies();
+    foreach ($all_cookies as $cookie) {
+      if ($cookie['name'] == $name) {
+        if (is_null($property)) {
+          return $cookie;
+        } else {
+          return $cookie[$property];
+        }
+      }
+    }
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/orientation
+  // Not supported in iPhone as of Selenium 2.0b3
+  private function get_orientation() {
+    $response = $this->execute("GET", "/session/:sessionId/orientation");
+    return WebDriver::GetJSONValue($response);
+  }
+  public function is_landscape()  { return $this->get_orientation() == "LANDSCAPE"; }
+  public function is_portrait()   { return $this->get_orientation() == "PORTRAIT"; }
+
+  /********************************************************************
+   * Setters
+   */
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/timeouts/async_script
+  public function set_async_timeout($milliseconds) {
+    $payload = array("ms" => $milliseconds);
+    $this->execute("POST", "/session/:sessionId/timeouts/async_script", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/timeouts/implicit_wait
+  public function set_implicit_wait($milliseconds) {
+    $payload = array("ms" => $milliseconds);
+    $this->execute("POST", "/session/:sessionId/timeouts/implicit_wait", $payload);
+  }
+
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/url
+  public function load($url) {
+    $payload = array("url" => $url);
+    $this->execute("POST", "/session/:sessionId/url", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/forward
+  public function go_forward() {
+    $this->execute("POST", "/session/:sessionId/forward");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/back
+  public function go_back() {
+    $this->execute("POST", "/session/:sessionId/back");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/refresh
+  public function refresh() {
+    $this->execute("POST", "/session/:sessionId/refresh");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/window
+  public function select_window($window_title) {
+    $all_window_handles = $this->get_all_window_handles();
+    $all_titles = array();
+    $current_title = "";
+    foreach ($all_window_handles as $window_handle) {
+      $payload = array("name" => $window_handle);
+      $this->execute("POST", "/session/:sessionId/window", $payload);
+      $current_title = $this->get_title();
+      $all_titles[] = $current_title;
+      if ($current_title == $window_title) {
+        break;
+      }
+    }
+    if ($current_title != $window_title) {
+      throw new Exception("Could not find window with title <$window_title>. Found " . count($all_titles) . " windows: " . implode("; ", $all_titles));
+    }
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/window
+  public function close_window() {
+    $this->execute("DELETE", "/session/:sessionId/window");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/ime/deactivate
+  // Not supported as of Selenium 2.0b3
+  public function deactivate_ime() {
+    $this->execute("POST", "/session/:sessionId/ime/deactivate");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/ime/activate
+  // Not supported as of Selenium 2.0b3
+  public function activate_ime() {
+    $this->execute("POST", "/session/:sessionId/ime/activate");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/frame
+  public function select_frame($identifier) {
+    $payload = array("id" => $identifier);
+    $this->execute("POST", "/session/:sessionId/frame", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/cookie
+  public function set_cookie($name, $value, $path = null, $domain = null, $secure = false, $expiry = null) {
+    $payload = array(
+      'cookie' => array(
+        'name' => $name,
+        'value' => $value,
+        'secure' => $secure, // The documentation says this is optional, but selenium server 2.0b1 throws a NullPointerException if it's not provided
+      )
+    );
+    if (!is_null($path)) {
+      $payload['cookie']['path'] = $path;
+    }
+    if (!is_null($domain)) {
+      $payload['cookie']['domain'] = $domain;
+    }
+    if (!is_null($expiry)) {
+      $payload['cookie']['expiry'] = $expiry;
+    }
+    $this->execute("POST", "/session/:sessionId/cookie", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/cookie
+  public function delete_all_cookies() {
+    $this->execute("DELETE", "/session/:sessionId/cookie");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/cookie/:name
+  public function delete_cookie($name) {
+    $this->execute("DELETE", "/session/:sessionId/cookie/" . $name);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/execute
+  public function execute_js_sync($javascript, $arguments = array()) {
+    $payload = array(
+      "script" => $javascript,
+      "args" => $arguments,
+    );
+    return $this->execute("POST", "/session/:sessionId/execute", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/execute_async
+  public function execute_js_async($javascript, $arguments = array()) {
+    $payload = array(
+      "script" => $javascript,
+      "args" => $arguments,
+    );
+    return $this->execute("POST", "/session/:sessionId/execute_async", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/speed
+  // Not supported as of Selenium 2.0b3
+  public function set_input_speed($speed) {
+    $payload = array("speed" => $speed);
+    $this->execute("POST", "/session/:sessionId/speed", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/modifier
+  private function send_modifier($modifier_code, $is_down) {
+    $payload = array(
+      'value' => $modifier_code,
+      'isdown' => $is_down
+    );
+    $this->execute("POST", "/session/:sessionId/modifier", $payload);
+  }
+  public function ctrl_down()     { send_modifier("U+E009", true); }
+  public function ctrl_up()       { send_modifier("U+E009", false); }
+  public function shift_down()    { send_modifier("U+E008", true); }
+  public function shift_up()      { send_modifier("U+E008", false); }
+  public function alt_down()      { send_modifier("U+E00A", true); }
+  public function alt_up()        { send_modifier("U+E00A", false); }
+  public function command_down()  { send_modifier("U+E03D", true); }
+  public function command_up()    { send_modifier("U+E03D", false); }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/orientation
+  // Not supported as of Selenium 2.0b3
+  private function set_orientation($new_orientation) {
+    $payload = array("orientation", $new_orientation);
+    $this->execute("POST", "/session/:sessionId/orientation", $payload);
+  }
+  public function rotate_landscape()  { $this->set_orientation("LANDSCAPE"); }
+  public function rotate_portrait()   { $this->set_orientation("PORTRAIT"); }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/moveto
+  public function move_cursor($right, $down) {
+    $payload = array(
+      "xoffset" => $right,
+      "yoffset" => $down
+    );
+    $this->execute("POST", "/session/:sessionId/moveto", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/click
+  private function click_mouse($button) {
+    $payload = array("button" => $button);
+    $this->execute("POST", "/session/:sessionId/click", $payload);
+  }
+  public function click()         { $this->click_mouse(0); }
+  public function middle_click()  { $this->click_mouse(1); }
+  public function right_click()   { $this->click_mouse(2); }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/buttondown
+  public function click_and_hold() {
+    $this->execute("POST", "/session/:sessionId/buttondown");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/buttonup
+  public function release_click() {
+    $this->execute("POST", "/session/:sessionId/buttonup");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/doubleclick
+  public function double_click() {
+    $this->execute("POST", "/session/:sessionId/doubleclick");
+  }
+  
+  // See https://saucelabs.com/docs/sauce-ondemand#alternative-annotation-methods
+  public function set_sauce_context($field, $value) {
+    if ($this->running_at_sauce()) {
+      $payload = json_encode(array($field => $value));
+      $url_parts = parse_url($this->server_url);
+      WebDriver::Curl("PUT", "http://" . $url_parts['user'] . ":" . $url_parts['pass'] . "@saucelabs.com/rest/v1/" . $url_parts['user'] . "/jobs/" . $this->session_id, $payload);
+    }
+  }
+  
+  /********************************************************************
+   * Asserters
+   */
+
+  public function assert_url($expected_url) {
+    PHPUnit_Framework_Assert::assertEquals($expected_url, $this->get_url(), "Failed asserting that URL is <$expected_url>.");
+  }
+  
+  public function assert_title($expected_title) {
+    PHPUnit_Framework_Assert::assertEquals($expected_title, $this->get_title(), "Failed asserting that title is <$expected_title>.");
+  }
+  
+  public function assert_element_present($element_locator) {
+    PHPUnit_Framework_Assert::assertTrue($this->is_element_present($element_locator), "Failed asserting that <$element_locator> is present");
+  }
+  
+  public function assert_element_not_present($element_locator) {
+    PHPUnit_Framework_Assert::assertFalse($this->is_element_present($element_locator), "Failed asserting that <$element_locator> is not present");
+  }
+  
+  public function assert_string_present($expected_string) {
+    $page_text = $this->get_text();
+    PHPUnit_Framework_Assert::assertContains($expected_string, $page_text, "Failed asserting that page text contains <$expected_string>.\n$page_text");
+  }
+  
+  public function assert_string_not_present($expected_missing_string) {
+    $page_text = $this->get_text();
+    PHPUnit_Framework_Assert::assertNotContains($expected_missing_string, $page_text, "Failed asserting that page text does not contain <$expected_missing_string>.\n$page_text");
+  }
+}
diff --git a/WebDriver/MockDriver.php b/WebDriver/MockDriver.php
new file mode 100644
index 0000000..dbae4d0
--- /dev/null
+++ b/WebDriver/MockDriver.php
@@ -0,0 +1,27 @@
+<?php
+
+class WebDriver_MockDriver extends WebDriver_Driver {
+  private $next_element_id;
+  
+  public function __construct() {
+    try {
+      parent::__construct("http://localhost/wd/hub");
+    } catch (Exception $e) {
+      // Will fail because there's no session id. Ignore.
+    }
+    $this->session_id = "314159265";
+    $this->next_element_id = 0;
+  }
+  
+  public function get_url() {
+    return true;
+  }
+  
+  public function get_title() {
+    return true;
+  }
+  
+  public function get_element($locator) {
+    return new WebDriver_WebElement($this, $this->next_element_id++, $locator);
+  }
+}
diff --git a/WebDriver/WebElement.php b/WebDriver/WebElement.php
new file mode 100644
index 0000000..5e87274
--- /dev/null
+++ b/WebDriver/WebElement.php
@@ -0,0 +1,257 @@
+<?php
+
+class WebDriver_WebElement {
+  private $driver;
+  private $element_id;
+  private $locator;
+  
+  public function __construct($driver, $element_id, $locator) {
+    $this->driver = $driver;
+    $this->element_id = $element_id;
+    $this->locator = $locator;
+  }
+  
+  private function execute($http_type, $relative_url, $payload = null) {
+    return $this->driver->execute($http_type, "/session/:sessionId/element/" . $this->element_id . $relative_url, $payload);
+  }
+
+
+  /********************************************************************
+   * Getters
+   */
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id
+  public function describe() {
+    $response = $this->execute("GET", "");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/text
+  public function get_text() {
+    $response = $this->execute("GET", "/text");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/value
+  public function get_value() {
+    $response = $this->execute("GET", "/value");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/displayed
+  public function is_visible() {
+    $response = $this->execute("GET", "/displayed");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/enabled
+  public function is_enabled() {
+    $response = $this->execute("GET", "/enabled");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/selected
+  public function is_selected() {
+    $response = $this->execute("GET", "/selected");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/element
+  public function get_next_element($locator) {
+    $payload = WebDriver::ParseLocator($locator);
+    $response = $this->execute("POST", "/element", $payload);
+    $next_element_id = WebDriver::GetJSONValue($response, "ELEMENT");
+    return new WebDriver_WebElement($this->driver, $next_element_id, $locator);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/elements
+  public function get_all_next_elements($locator) {
+    $payload = WebDriver::ParseLocator($locator);
+    $response = $this->execute("POST", "/elements", $payload);
+    $all_element_ids = WebDriver::GetJSONValue($response, "ELEMENT");
+    $all_elements = array();
+    foreach ($all_element_ids as $element_id) {
+      $all_elements[] = new WebDriver_WebElement($this->driver, $element_id, $locator);
+    }
+    return $all_elements;
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/name
+  public function get_tag_name() {
+    $this->execute("GET", "/name");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/attribute/:name
+  public function get_attribute_value($attribute_name) {
+    $response = $this->execute("GET", "/attribute/" . $attribute_name);
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/equals/:other
+  public function is_same_element_as($other_element_id) {
+    $response = $this->execute("GET", "/equals/" . $other_element_id);
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/location
+  public function get_location() {
+    $response = $this->execute("GET", "/location");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/size
+  public function get_size() {
+    $response = $this->execute("GET", "/size");
+    return WebDriver::GetJSONValue($response);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/css/:propertyName
+  public function get_css_value($property_name) {
+    $response = $this->execute("GET", "/css/" . $property_name);
+    return WebDriver::GetJSONValue($response);
+  }
+
+  /********************************************************************
+   * Getters for <select> elements
+   */
+  
+  public function get_selected() {
+    // See http://code.google.com/p/selenium/issues/detail?id=1518
+    try {
+      return $this->get_next_element("css=option[selected]"); // Does not work in IE8
+    } catch (Exception $e) {
+      return $this->get_next_element("css=option[selected='selected']"); // Does not work in IE7
+    }
+  }
+  
+  public function get_options() {
+    return $this->get_all_next_elements("tag name=option");
+  }
+  
+  /********************************************************************
+   * Setters
+   */
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/click
+  public function click() {
+    $this->execute("POST", "/click");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/submit
+  public function submit() {
+    $this->execute("POST", "/submit");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/clear
+  public function clear() {
+    $this->execute("POST", "/clear");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/hover
+  // Not supported as of Selenium 2.0b3
+  public function hover() {
+    $this->execute("POST", "/hover");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/selected
+  public function select() {
+    $this->execute("POST", "/selected");
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/toggle
+  public function toggle() {
+    $response = $this->execute("POST", "/toggle");
+    return WebDriver::GetJSONValue($response);
+  }
+
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/value
+  public function send_keys($keys) {
+    $payload = array("value" => preg_split('//u', $keys, -1, PREG_SPLIT_NO_EMPTY));
+    $this->execute("POST", "/value", $payload);
+  }
+  
+  public function type_random() {
+    $this->send_keys(Fest::RandomString());
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/drag
+  public function drag_and_drop($pixels_right, $pixels_down) {
+    $payload = array(
+      "x" => $pixels_right,
+      "y" => $pixels_down
+    );
+    $this->execute("POST", "/drag", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/moveto
+  public function move_cursor_to_center() {
+    $payload = array("element" => $element_id);
+    $this->driver->execute("POST", "/session/:sessionId/moveto", $payload);
+  }
+  
+  // See http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/moveto
+  public function move_cursor_relative($right, $down) {
+    $payload = array(
+      "element" => $element_id,
+      "xoffset" => $right,
+      "yoffset" => $down,
+    );
+    $this->driver_execute("POST", "/session/:sessionId/moveto", $payload);
+  }
+  
+  /********************************************************************
+   * Setters for <select> elements
+   */
+
+  public function select_label($label) {
+    $option_element = $this->get_next_element("xpath=//option[text()='" . $label . "']");
+    $option_element->select();
+  }
+  
+  public function select_value($value) {
+    $option_element = $this->get_next_element("xpath=//option[@value='" . $value . "']");
+    $option_element->select();
+  }
+  
+  public function select_index($index) {
+    $option_element = $this->get_next_element("xpath=//option[" . $index . "]");
+    $option_element->select();
+  }
+  
+  public function select_random() {
+    $all_elements = $this->get_options();
+    $new_index = rand(1, count($all_elements));
+    $this->select_index($new_index);
+  }
+  
+  /********************************************************************
+   * Asserters
+   */
+
+  public function assert_visible() {
+    PHPUnit_Framework_Assert::assertTrue($this->is_visible(), "Failed asserting that <{$this->locator}> is visible.");
+  }
+  
+  public function assert_hidden() {
+    PHPUnit_Framework_Assert::assertFalse($this->is_visible(), "Failed asserting that <{$this->locator}> is hidden.");
+  }
+
+  public function assert_enabled() {
+    PHPUnit_Framework_Assert::assertTrue($this->is_enabled(), "Failed asserting that <{$this->locator}> is enabled.");
+  }
+  
+  public function assert_disabled() {
+    PHPUnit_Framework_Assert::assertFalse($this->is_enabled(), "Failed asserting that <{$this->locator}> is disabled.");
+  }
+  
+  public function assert_text($expected_text) {
+    $actual_text = $this->get_text();
+    PHPUnit_Framework_Assert::assertEquals($expected_text, $actual_text, "Failed asserting that <{$this->locator}>'s text is <$expected_text>.");
+  } 
+
+  public function assert_value($expected_value) {
+    $actual_value = $this->get_value();
+    PHPUnit_Framework_Assert::assertEquals($expected_value, $actual_value, "Failed asserting that <{$this->locator}>'s value is <$expected_value>.");
+  }
+}
diff --git a/WebDriverSelectorTest.php b/WebDriverSelectorTest.php
new file mode 100644
index 0000000..41b9079
--- /dev/null
+++ b/WebDriverSelectorTest.php
@@ -0,0 +1,52 @@
+<?php
+
+require_once 'WebDriver.php';
+
+class WebDriverSelectorTest extends PHPUnit_Framework_TestCase {
+  public function valid_selectors() {
+    return array(
+      array("identifier=some_id", "id", "some_id"),
+      array("id=some_other_id", "id", "some_other_id"),
+      array("name=some_name", "name", "some_name"),
+      array("xpath=//div[@class='some_class']", "xpath", "//div[@class='some_class']"),
+      array("link=Click here", "link text", "Click here"),
+      array("link=1 + 2 = 3", "link text", "1 + 2 = 3"),
+      array("link text=Click here", "link text", "Click here"),
+      array("link text=2+2=4", "link text", "2+2=4"),
+      array("css=a.person_link", "css selector", "a.person_link"),
+      array("css selector=div#main", "css selector", "div#main"),
+      array("partial link text=nvite someon", "partial link text", "nvite someon"),
+      array("tag name=li", "tag name", "li"),
+      array("class=admin-msg", "class", "admin-msg"),
+      array("class name=success-msg", "class name", "success-msg"),
+      array("//table//td", "xpath", "//table//td"),
+      array("//table[@class='edit']", "xpath", "//table[@class='edit']"),
+      array("fakelocator=qwerqwer", "id", "fakelocator=qwerqwer"),
+      array("asdfasdf", "id", "asdfasdf")
+    );
+  }
+  
+  /**
+   * @dataProvider valid_selectors
+   */
+  public function test_valid_selectors($input, $expected_using, $expected_value) {
+    $actual = WebDriver::ParseLocator($input);
+    $this->assertEquals($actual["using"], $expected_using);
+    $this->assertEquals($actual["value"], $expected_value);
+  }
+  
+  public function invalid_selectors() {
+    return array(
+      array("dom=document.images[5]"),
+      array("document.forms['myForm']")
+    );
+  }
+  
+  /**
+   * @dataProvider invalid_selectors
+   * @expectedException Exception
+   */
+  public function test_invalid_selectors($input) {
+    WebDriver::ParseLocator($input);
+  }
+}