diff --git a/src/HPCloud.php b/src/HPCloud.php
deleted file mode 100644
index d33a781..0000000
--- a/src/HPCloud.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * @file
- * HP Cloud configuration.
- *
- * This file contains the HP Cloud autoloader. It also automatically
- * register the HPCloud stream wrappers.
- */
diff --git a/src/HPCloud/Bootstrap.php b/src/HPCloud/Bootstrap.php
new file mode 100644
index 0000000..b986b41
--- /dev/null
+++ b/src/HPCloud/Bootstrap.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * @file
+ * HP Cloud configuration.
+ *
+ * This file contains the HP Cloud autoloader. It also automatically
+ * register the HPCloud stream wrappers.
+ */
+
+namespace HPCloud;
+
+/**
+ * Bootstrapping services.
+ *
+ * There is no requirement that this class be used. HPCloud is
+ * built to be flexible, and any individual component can be
+ * used directly, with one caveat: No explicit `require` or
+ * `include` calls are made. See the "autoloaders" discussion
+ * below.
+ *
+ * This class provides the following services:
+ *
+ * - Stream Wrappers: This class can initialize a set of stream
+ *   wrappers which will make certain HPCloud services available
+ *   through the core PHP stream support.
+ * - Autoloader: It provides a special-purpose autoloader that can
+ *   load the HPCloud classes, but which will not interfere with
+ *   other autoloading facilities.
+ *
+ * AUTOLOADING
+ *
+ * The structure of the HPCloud file hierarchy is PSR-0 compliant.
+ * This means that you can use any standard PSR-0 classloader to
+ * load all of the classes here.
+ *
+ * That said, many projects rely upon packages to handle their own
+ * class loading. To provide this, this package contains a custom
+ * classloader that will load JUST the HPCloud classes. See
+ * the Bootstrap::useAutoloader() static method.
+ *
+ * STREAM WRAPPERS
+ *
+ * Stream wrappers allow you to use the built-in file manipulation
+ * functions in PHP to interact with other services. Specifically,
+ * the HPCloud stream wrappers allow you to use built-in file commands
+ * to access Object Storage (Swift) and other HPCloud services using
+ * commands like file_get_contents() and fopen().
+ *
+ * It's awesome. Trust me.
+ */
+class Bootstrap {
+
+  /**
+   * The directory where HPCloud is located.
+   */
+  public static $basedir = __DIR__;
+
+  /**
+   * Add the autoloader to PHP's autoloader list.
+   *
+   * This will add the internal special-purpose
+   * autoloader to the list of autoloaders that PHP will
+   * leverage to resolve class paths.
+   *
+   * Because HPCloud is PSR-0 compliant, any
+   * full PSR-0 classloader should be capable of loading
+   * these classes witout issue. You may prefer to use
+   * a standard PSR-0 loader instead of this one.
+   */
+  public static function useAutoloader() {
+    spl_autoload_register(__NAMESPACE__ . '\Bootstrap::autoload');
+  }
+
+  /**
+   * HPCloud autoloader.
+   *
+   * An implementation of a PHP autoload function. Use
+   * HPCloud::useAutoloader() if you want PHP to automatically
+   * load classes using this autoloader.
+   *
+   * This is a special-purpose autoloader for loading
+   * only the HPCloud classes. It will not attempt to
+   * autoload anything outside of the \HPCloud namespace.
+   *
+   * Because this is a special-purpose autoloader, it
+   * should be safe to use with other special-purpose
+   * autoloaders (and also projects that don't
+   * rely upon autoloaders).
+   *
+   * @param string $klass
+   *   The fully qualified name of the class to be autoloaded.
+   */
+  public static function autoload($klass) {
+    $components = explode('\\', $klass);
+    if (empty($components[0])) {
+      array_shift($components);
+    }
+
+    // This class loader ONLY loads
+    // our classes. A general purpose
+    // classloader should be used for
+    // more sophisticated needs.
+    if ($components[0] != 'HPCloud') {
+      return;
+    }
+
+    // We need the path up to, but not including, the root HPCloud dir:
+    $local_path = substr(self::$basedir, 0, strrpos(self::$basedir, '/HPCloud'));
+
+
+    array_unshift($components, $local_path);
+    $path = implode(DIRECTORY_SEPARATOR, $components) . '.php';
+
+    if (file_exists($path)) {
+      require $path;
+      return;
+    }
+  }
+}
diff --git a/src/HPCloud/Transport/PHPStreamTransport.php b/src/HPCloud/Transport/PHPStreamTransport.php
index dd5d652..d784e4e 100644
--- a/src/HPCloud/Transport/PHPStreamTransport.php
+++ b/src/HPCloud/Transport/PHPStreamTransport.php
@@ -50,7 +50,7 @@ class PHPStreamTransport implements Transporter {
   public function doRequest($uri, $method = 'GET', $headers = array(), $body = '') {
     $cxt = $this->buildStreamContext($method, $headers, $body);
 
-    $res = @fopen($uri, 'r', FALSE, $cxt);
+    $res = @fopen($uri, 'rb', FALSE, $cxt);
 
     // If there is an error, we try to react
     // intelligently.
@@ -64,12 +64,9 @@ class PHPStreamTransport implements Transporter {
 
     $metadata = stream_get_meta_data($res);
 
-    print_r($metadata);
-
-    print fread($res, $metadata['unread_bytes']);
-
-    fclose($res);
+    $response = new Response($res, $metadata);
 
+    return $response;
   }
 
   /**
@@ -131,15 +128,25 @@ class PHPStreamTransport implements Transporter {
    *
    * @param array $headers
    *   An associative array of header names to header values.
-   * @return
+   * @return string
    *   A string containing formatted headers.
    */
   protected function smashHeaders($headers) {
+
+    if (empty($headers)) {
+      return;
+    }
+
     $buffer = array();
     foreach ($headers as $name => $value) {
-      $buffer[] = sprintf("%s: %s", $name, urlencode($value));
+      // $buffer[] = sprintf("%s: %s", $name, urlencode($value));
+      $buffer[] = sprintf("%s: %s", $name, $value);
     }
-    return implode("\r\n", $buffer);
+    $headerStr = implode("\r\n", $buffer);
+
+    print $headerStr;
+
+    return $headerStr . "\r\n";
   }
 
   /**
@@ -155,7 +162,7 @@ class PHPStreamTransport implements Transporter {
       'http' => array(
         'protocol_version' => $this->httpVersion,
         'method' => strtoupper($method),
-        'headers' => $this->smashHeaders($headers),
+        'header' => $this->smashHeaders($headers),
         'user_agent' => Transporter::HTTP_USER_AGENT . self::HTTP_USER_AGENT_SUFFIX,
       ),
     );
diff --git a/test/AuthTest.php b/test/AuthTest.php
index 0cbdedd..c5d1b19 100644
--- a/test/AuthTest.php
+++ b/test/AuthTest.php
@@ -6,8 +6,11 @@
  * You can run the test with `php test/AuthTest.php username key`.
  */
 
-require_once 'src/HPCloud/Transport/Transporter.php';
-require_once 'src/HPCloud/Transport/PHPStreamTransport.php';
+//require_once 'src/HPCloud/Transport/Transporter.php';
+//require_once 'src/HPCloud/Transport/PHPStreamTransport.php';
+require_once 'src/HPCloud/Bootstrap.php';
+
+\HPCloud\Bootstrap::useAutoloader();
 
 $usage = "php $0 ID KEY URL";
 
@@ -30,4 +33,4 @@ $t = new \HPCloud\Transport\PHPStreamTransport();
 $res = $t->doRequest($uri, 'GET', $headers);
 
 
-//print_r($res);
+print_r($res);