diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2cc42fbfc..044b3158f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1,170 +1,191 @@
 <?php
 
 /**
  * This file is automatically generated. Use 'phutil_mapper.php' to rebuild it.
  * @generated
  */
 
 phutil_register_library_map(array(
   'class' =>
   array(
     'Aphront404Response' => 'aphront/response/404',
     'AphrontApplicationConfiguration' => 'aphront/applicationconfiguration',
     'AphrontController' => 'aphront/controller',
     'AphrontDatabaseConnection' => 'storage/connection/base',
     'AphrontDefaultApplicationConfiguration' => 'aphront/default/configuration',
     'AphrontDefaultApplicationController' => 'aphront/default/controller',
     'AphrontDialogResponse' => 'aphront/response/dialog',
     'AphrontDialogView' => 'view/dialog',
     'AphrontErrorView' => 'view/form/error',
     'AphrontFileResponse' => 'aphront/response/file',
     'AphrontFormControl' => 'view/form/control/base',
     'AphrontFormFileControl' => 'view/form/control/file',
     'AphrontFormSelectControl' => 'view/form/control/select',
     'AphrontFormStaticControl' => 'view/form/control/static',
     'AphrontFormSubmitControl' => 'view/form/control/submit',
     'AphrontFormTextAreaControl' => 'view/form/control/textarea',
     'AphrontFormTextControl' => 'view/form/control/text',
     'AphrontFormView' => 'view/form/base',
     'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql',
     'AphrontNullView' => 'view/null',
     'AphrontPageView' => 'view/page/base',
     'AphrontPanelView' => 'view/layout/panel',
     'AphrontQueryConnectionException' => 'storage/exception/connection',
     'AphrontQueryConnectionLostException' => 'storage/exception/connectionlost',
     'AphrontQueryCountException' => 'storage/exception/count',
     'AphrontQueryException' => 'storage/exception/base',
     'AphrontQueryObjectMissingException' => 'storage/exception/objectmissing',
     'AphrontQueryParameterException' => 'storage/exception/parameter',
     'AphrontQueryRecoverableException' => 'storage/exception/recoverable',
     'AphrontRedirectResponse' => 'aphront/response/redirect',
     'AphrontRequest' => 'aphront/request',
     'AphrontResponse' => 'aphront/response/base',
+    'AphrontSideNavView' => 'view/layout/sidenav',
     'AphrontTableView' => 'view/control/table',
     'AphrontURIMapper' => 'aphront/mapper',
     'AphrontView' => 'view/base',
     'AphrontWebpageResponse' => 'aphront/response/webpage',
+    'ConduitAPIMethod' => 'applications/conduit/method/base',
+    'ConduitAPIRequest' => 'applications/conduit/protocol/request',
+    'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/upload',
+    'ConduitException' => 'applications/conduit/protocol/exception',
     'DifferentialAction' => 'applications/differential/constants/action',
     'DifferentialChangeType' => 'applications/differential/constants/changetype',
     'DifferentialLintStatus' => 'applications/differential/constants/lintstatus',
     'DifferentialRevisionStatus' => 'applications/differential/constants/revisionstatus',
     'DifferentialUnitStatus' => 'applications/differential/constants/unitstatus',
     'LiskDAO' => 'storage/lisk/dao',
+    'PhabricatorConduitAPIController' => 'applications/conduit/controller/api',
+    'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/connectionlog',
+    'PhabricatorConduitConsoleController' => 'applications/conduit/controller/console',
+    'PhabricatorConduitController' => 'applications/conduit/controller/base',
+    'PhabricatorConduitDAO' => 'applications/conduit/storage/base',
+    'PhabricatorConduitLogController' => 'applications/conduit/controller/log',
+    'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/methodcalllog',
     'PhabricatorController' => 'applications/base/controller/base',
     'PhabricatorDirectoryCategory' => 'applications/directory/storage/category',
     'PhabricatorDirectoryCategoryDeleteController' => 'applications/directory/controller/categorydelete',
     'PhabricatorDirectoryCategoryEditController' => 'applications/directory/controller/categoryedit',
     'PhabricatorDirectoryCategoryListController' => 'applications/directory/controller/categorylist',
     'PhabricatorDirectoryController' => 'applications/directory/controller/base',
     'PhabricatorDirectoryDAO' => 'applications/directory/storage/base',
     'PhabricatorDirectoryItem' => 'applications/directory/storage/item',
     'PhabricatorDirectoryItemDeleteController' => 'applications/directory/controller/itemdelete',
     'PhabricatorDirectoryItemEditController' => 'applications/directory/controller/itemedit',
     'PhabricatorDirectoryItemListController' => 'applications/directory/controller/itemlist',
     'PhabricatorDirectoryMainController' => 'applications/directory/controller/main',
     'PhabricatorFile' => 'applications/files/storage/file',
     'PhabricatorFileController' => 'applications/files/controller/base',
     'PhabricatorFileDAO' => 'applications/files/storage/base',
     'PhabricatorFileListController' => 'applications/files/controller/list',
     'PhabricatorFileStorageBlob' => 'applications/files/storage/storageblob',
     'PhabricatorFileUploadController' => 'applications/files/controller/upload',
     'PhabricatorFileViewController' => 'applications/files/controller/view',
     'PhabricatorLiskDAO' => 'applications/base/storage/lisk',
     'PhabricatorPHID' => 'applications/phid/storage/phid',
     'PhabricatorPHIDAllocateController' => 'applications/phid/controller/allocate',
     'PhabricatorPHIDController' => 'applications/phid/controller/base',
     'PhabricatorPHIDDAO' => 'applications/phid/storage/base',
     'PhabricatorPHIDListController' => 'applications/phid/controller/list',
     'PhabricatorPHIDType' => 'applications/phid/storage/type',
     'PhabricatorPHIDTypeEditController' => 'applications/phid/controller/typeedit',
     'PhabricatorPHIDTypeListController' => 'applications/phid/controller/typelist',
     'PhabricatorPeopleController' => 'applications/people/controller/base',
     'PhabricatorPeopleEditController' => 'applications/people/controller/edit',
     'PhabricatorPeopleListController' => 'applications/people/controller/list',
     'PhabricatorPeopleProfileController' => 'applications/people/controller/profile',
     'PhabricatorStandardPageView' => 'view/page/standard',
     'PhabricatorUser' => 'applications/people/storage/user',
     'PhabricatorUserDAO' => 'applications/people/storage/base',
   ),
   'function' =>
   array(
     '_qsprintf_check_scalar_type' => 'storage/qsprintf',
     '_qsprintf_check_type' => 'storage/qsprintf',
     'qsprintf' => 'storage/qsprintf',
     'queryfx' => 'storage/queryfx',
     'queryfx_all' => 'storage/queryfx',
     'queryfx_one' => 'storage/queryfx',
     'vqsprintf' => 'storage/qsprintf',
     'vqueryfx' => 'storage/queryfx',
     'xsprintf_query' => 'storage/qsprintf',
   ),
   'requires_class' =>
   array(
     'Aphront404Response' => 'AphrontResponse',
     'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
     'AphrontDefaultApplicationController' => 'AphrontController',
     'AphrontDialogResponse' => 'AphrontResponse',
     'AphrontDialogView' => 'AphrontView',
     'AphrontErrorView' => 'AphrontView',
     'AphrontFileResponse' => 'AphrontResponse',
     'AphrontFormControl' => 'AphrontView',
     'AphrontFormFileControl' => 'AphrontFormControl',
     'AphrontFormSelectControl' => 'AphrontFormControl',
     'AphrontFormStaticControl' => 'AphrontFormControl',
     'AphrontFormSubmitControl' => 'AphrontFormControl',
     'AphrontFormTextAreaControl' => 'AphrontFormControl',
     'AphrontFormTextControl' => 'AphrontFormControl',
     'AphrontFormView' => 'AphrontView',
     'AphrontMySQLDatabaseConnection' => 'AphrontDatabaseConnection',
     'AphrontNullView' => 'AphrontView',
     'AphrontPageView' => 'AphrontView',
     'AphrontPanelView' => 'AphrontView',
     'AphrontQueryConnectionException' => 'AphrontQueryException',
     'AphrontQueryConnectionLostException' => 'AphrontQueryRecoverableException',
     'AphrontQueryCountException' => 'AphrontQueryException',
     'AphrontQueryObjectMissingException' => 'AphrontQueryException',
     'AphrontQueryParameterException' => 'AphrontQueryException',
     'AphrontQueryRecoverableException' => 'AphrontQueryException',
     'AphrontRedirectResponse' => 'AphrontResponse',
+    'AphrontSideNavView' => 'AphrontView',
     'AphrontTableView' => 'AphrontView',
     'AphrontWebpageResponse' => 'AphrontResponse',
+    'ConduitAPI_file_upload_Method' => 'ConduitAPIMethod',
+    'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
+    'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
+    'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
+    'PhabricatorConduitController' => 'PhabricatorController',
+    'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorConduitLogController' => 'PhabricatorConduitController',
+    'PhabricatorConduitMethodCallLog' => 'PhabricatorConduitDAO',
     'PhabricatorController' => 'AphrontController',
     'PhabricatorDirectoryCategory' => 'PhabricatorDirectoryDAO',
     'PhabricatorDirectoryCategoryDeleteController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryCategoryEditController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryCategoryListController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryController' => 'PhabricatorController',
     'PhabricatorDirectoryDAO' => 'PhabricatorLiskDAO',
     'PhabricatorDirectoryItem' => 'PhabricatorDirectoryDAO',
     'PhabricatorDirectoryItemDeleteController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryItemEditController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryItemListController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryMainController' => 'PhabricatorDirectoryController',
     'PhabricatorFile' => 'PhabricatorFileDAO',
     'PhabricatorFileController' => 'PhabricatorController',
     'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
     'PhabricatorFileListController' => 'PhabricatorFileController',
     'PhabricatorFileStorageBlob' => 'PhabricatorFileDAO',
     'PhabricatorFileUploadController' => 'PhabricatorFileController',
     'PhabricatorFileViewController' => 'PhabricatorFileController',
     'PhabricatorLiskDAO' => 'LiskDAO',
     'PhabricatorPHID' => 'PhabricatorPHIDDAO',
     'PhabricatorPHIDAllocateController' => 'PhabricatorPHIDController',
     'PhabricatorPHIDController' => 'PhabricatorController',
     'PhabricatorPHIDDAO' => 'PhabricatorLiskDAO',
     'PhabricatorPHIDListController' => 'PhabricatorPHIDController',
     'PhabricatorPHIDType' => 'PhabricatorPHIDDAO',
     'PhabricatorPHIDTypeEditController' => 'PhabricatorPHIDController',
     'PhabricatorPHIDTypeListController' => 'PhabricatorPHIDController',
     'PhabricatorPeopleController' => 'PhabricatorController',
     'PhabricatorPeopleEditController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
     'PhabricatorStandardPageView' => 'AphrontPageView',
     'PhabricatorUser' => 'PhabricatorUserDAO',
     'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
   ),
   'requires_interface' =>
   array(
   ),
 ));
diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
index da2ab26f6..bed40f15f 100644
--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
@@ -1,121 +1,127 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 /**
  * @group aphront
  */
 class AphrontDefaultApplicationConfiguration
   extends AphrontApplicationConfiguration {
 
   public function getApplicationName() {
     return 'aphront-default';
   }
 
   public function getURIMap() {
     return array(
       '/repository/' => array(
         '$'                     => 'RepositoryListController',
         'new/$'                 => 'RepositoryEditController',
         'edit/(?<id>\d+)/$'     => 'RepositoryEditController',
         'delete/(?<id>\d+)/$'   => 'RepositoryDeleteController',
       ),
       '/' => array(
         '$'                     => 'PhabricatorDirectoryMainController',
       ),
       '/directory/' => array(
         'item/$'
           => 'PhabricatorDirectoryItemListController',
         'item/edit/(?:(?<id>\d+)/)?$'
           => 'PhabricatorDirectoryItemEditController',
         'item/delete/(?<id>\d+)/'
           => 'PhabricatorDirectoryItemDeleteController',
         'category/$'
           => 'PhabricatorDirectoryCategoryListController',
         'category/edit/(?:(?<id>\d+)/)?$'
           => 'PhabricatorDirectoryCategoryEditController',
         'category/delete/(?<id>\d+)/'
           => 'PhabricatorDirectoryCategoryDeleteController',
       ),
       '/file/' => array(
         '$' => 'PhabricatorFileListController',
         'upload/$' => 'PhabricatorFileUploadController',
         '(?<view>info)/(?<phid>[^/]+)/' => 'PhabricatorFileViewController',
         '(?<view>view)/(?<phid>[^/]+)/' => 'PhabricatorFileViewController',
         '(?<view>download)/(?<phid>[^/]+)/' => 'PhabricatorFileViewController',
       ),
       '/phid/' => array(
         '$' => 'PhabricatorPHIDListController',
         'type/$' => 'PhabricatorPHIDTypeListController',
         'type/edit/(?:(?<id>\d+)/)?$' => 'PhabricatorPHIDTypeEditController',
         'new/$' => 'PhabricatorPHIDAllocateController',
       ),
       '/people/' => array(
         '$' => 'PhabricatorPeopleListController',
         'edit/(?:(?<username>\w+)/)?$' => 'PhabricatorPeopleEditController',
       ),
       '/p/(?<username>\w+)/$' => 'PhabricatorPeopleProfileController',
+      '/conduit/' => array(
+        '$' => 'PhabricatorConduitConsoleController',
+        'method/(?<method>[^/]+)$' => 'PhabricatorConduitConsoleController',
+        'log/$' => 'PhabricatorConduitLogController',
+      ),
+      '/api/(?<method>[^/]+)$' => 'PhabricatorConduitAPIController',
       '.*' => 'AphrontDefaultApplicationController',
     );
   }
 
   public function buildRequest() {
     $request = new AphrontRequest($this->getHost(), $this->getPath());
     $request->setRequestData($_GET + $_POST);
     return $request;
   }
 
   public function handleException(Exception $ex) {
 
     $class    = phutil_escape_html(get_class($ex));
     $message  = phutil_escape_html($ex->getMessage());
 
     $content =
       '<div class="aphront-unhandled-exception">'.
         '<h1>Unhandled Exception "'.$class.'": '.$message.'</h1>'.
         '<code>'.phutil_escape_html((string)$ex).'</code>'.
       '</div>';
 
     $view = new PhabricatorStandardPageView();
     $view->appendChild($content);
 
     $response = new AphrontWebpageResponse();
     $response->setContent($view->render());
 
     return $response;
   }
 
   public function willSendResponse(AphrontResponse $response) {
     $request = $this->getRequest();
     if ($response instanceof AphrontDialogResponse) {
       if (!$request->isAjax()) {
         $view = new PhabricatorStandardPageView();
         $view->appendChild(
           '<div style="padding: 2em 0;">'.
             $response->buildResponseString().
           '</div>');
         $response = new AphrontWebpageResponse();
         $response->setContent($view->render());
         return $response;
       }
     }
 
     return $response;
   }
 
 
 }
diff --git a/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
new file mode 100644
index 000000000..c259cf455
--- /dev/null
+++ b/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
@@ -0,0 +1,185 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitAPIController
+  extends PhabricatorConduitController {
+
+  private $method;
+
+  public function willProcessRequest(array $data) {
+    $this->method = $data['method'];
+    return $this;
+  }
+
+  public function processRequest() {
+    $time_start = microtime(true);
+    $request = $this->getRequest();
+
+    $method = $this->method;
+
+    $method_class = ConduitAPIMethod::getClassNameFromAPIMethodName($method);
+    $api_request = null;
+
+    $log = new PhabricatorConduitMethodCallLog();
+    $log->setMethod($method);
+    $metadata = array();
+
+    try {
+
+      if (!class_exists($method_class)) {
+        throw new Exception(
+          "Unable to load the implementation class for method '{$method}'. ".
+          "You may have misspelled the method, need to define ".
+          "'{$method_class}', or need to run 'arc build'.");
+      }
+
+      // Fake out checkModule, the class has already been autoloaded by the
+      // class_exists() call above.
+      $method_handler = newv($method_class, array());
+
+      if (isset($_REQUEST['params']) && is_array($_REQUEST['params'])) {
+        $params_post = $request->getArr('params');
+        foreach ($params_post as $key => $value) {
+          $params_post[$key] = json_decode($value);
+        }
+        $params = $params_post;
+      } else {
+        $params_json = $request->getStr('params');
+        if (!strlen($params_json)) {
+          $params = array();
+        } else {
+          $params = json_decode($params_json);
+          if (!is_array($params)) {
+            throw new Exception(
+              "Invalid parameter information was passed to method ".
+              "'{$method}', could not decode JSON serialization.");
+          }
+        }
+      }
+
+      $metadata = idx($params, '__conduit__', array());
+      unset($params['__conduit__']);
+
+      $api_request = new ConduitAPIRequest($params);
+
+      try {
+        $result = $method_handler->executeMethod($api_request);
+        $error_code = null;
+        $error_info = null;
+      } catch (ConduitException $ex) {
+        $result = null;
+        $error_code = $ex->getMessage();
+        $error_info = $method_handler->getErrorDescription($error_code);
+      }
+    } catch (Exception $ex) {
+      $result = null;
+      $error_code = 'ERR-CONDUIT-CORE';
+      $error_info = $ex->getMessage();
+    }
+
+    $time_end = microtime(true);
+
+    $connection_id = null;
+    if (idx($metadata, 'connectionID')) {
+      $connection_id = $metadata['connectionID'];
+    } else if (($method == 'conduit.connect') && $result) {
+      $connection_id = idx($result, 'connectionID');
+    }
+
+    $log->setConnectionID($connection_id);
+    $log->setError((string)$error_code);
+    $log->setDuration(1000000 * ($time_end - $time_start));
+    $log->save();
+
+    $result = array(
+      'result'      => $result,
+      'error_code'  => $error_code,
+      'error_info'  => $error_info,
+    );
+
+    switch ($request->getStr('output')) {
+      case 'human':
+        return $this->buildHumanReadableResponse(
+          $method,
+          $api_request,
+          $result);
+      case 'json':
+      default:
+        return id(new AphrontFileResponse())
+          ->setMimeType('application/json')
+          ->setContent(json_encode($result));
+    }
+  }
+
+  private function buildHumanReadableResponse(
+    $method,
+    ConduitAPIRequest $request = null,
+    $result = null) {
+
+    $param_rows = array();
+    $param_rows[] = array('Method', phutil_escape_html($method));
+    if ($request) {
+      foreach ($request->getAllParameters() as $key => $value) {
+        $param_rows[] = array(
+          phutil_escape_html($key),
+          phutil_escape_html(json_encode($value)),
+        );
+      }
+    }
+
+    $param_table = new AphrontTableView($param_rows);
+    $param_table->setColumnClasses(
+      array(
+        'header',
+        'wide',
+      ));
+
+    $result_rows = array();
+    foreach ($result as $key => $value) {
+      $result_rows[] = array(
+        phutil_escape_html($key),
+        phutil_escape_html(json_encode($value)),
+      );
+    }
+
+    $result_table = new AphrontTableView($result_rows);
+    $result_table->setColumnClasses(
+      array(
+        'header',
+        'wide',
+      ));
+
+    $param_panel = new AphrontPanelView();
+    $param_panel->setHeader('Method Parameters');
+    $param_panel->appendChild($param_table);
+
+    $result_panel = new AphrontPanelView();
+    $result_panel->setHeader('Method Result');
+    $result_panel->appendChild($result_table);
+
+    return $this->buildStandardPageResponse(
+      array(
+        $param_panel,
+        $result_panel,
+      ),
+      array(
+        'title' => 'Method Call Result',
+      ));
+  }
+
+}
diff --git a/src/applications/conduit/controller/api/__init__.php b/src/applications/conduit/controller/api/__init__.php
new file mode 100644
index 000000000..1e6db7a2b
--- /dev/null
+++ b/src/applications/conduit/controller/api/__init__.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'aphront/response/file');
+phutil_require_module('phabricator', 'applications/conduit/controller/base');
+phutil_require_module('phabricator', 'applications/conduit/method/base');
+phutil_require_module('phabricator', 'applications/conduit/protocol/request');
+phutil_require_module('phabricator', 'applications/conduit/storage/methodcalllog');
+phutil_require_module('phabricator', 'view/control/table');
+phutil_require_module('phabricator', 'view/layout/panel');
+
+phutil_require_module('phutil', 'markup');
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorConduitAPIController.php');
diff --git a/src/applications/conduit/controller/base/PhabricatorConduitController.php b/src/applications/conduit/controller/base/PhabricatorConduitController.php
new file mode 100644
index 000000000..48f75e5c5
--- /dev/null
+++ b/src/applications/conduit/controller/base/PhabricatorConduitController.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class PhabricatorConduitController extends PhabricatorController {
+
+  public function buildStandardPageResponse($view, array $data) {
+    $page = new PhabricatorStandardPageView();
+
+    $page->setApplicationName('Conduit');
+    $page->setBaseURI('/conduit/');
+    $page->setTitle(idx($data, 'title'));
+    $page->setTabs(
+      array(
+        'console' => array(
+          'href' => '/conduit/',
+          'name' => 'Console',
+        ),
+        'logs' => array(
+          'href' => '/conduit/log/',
+          'name' => 'Logs',
+        ),
+      ),
+      idx($data, 'tab'));
+    $page->setGlyph("\xE2\x87\xB5");
+    $page->appendChild($view);
+
+    $response = new AphrontWebpageResponse();
+    return $response->setContent($page->render());
+  }
+
+}
diff --git a/src/applications/conduit/controller/base/__init__.php b/src/applications/conduit/controller/base/__init__.php
new file mode 100644
index 000000000..6dd4aa380
--- /dev/null
+++ b/src/applications/conduit/controller/base/__init__.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'aphront/response/webpage');
+phutil_require_module('phabricator', 'applications/base/controller/base');
+phutil_require_module('phabricator', 'view/page/standard');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorConduitController.php');
diff --git a/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
new file mode 100644
index 000000000..8af6ac3b6
--- /dev/null
+++ b/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
@@ -0,0 +1,181 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitConsoleController
+  extends PhabricatorConduitController {
+
+  private $method;
+
+  public function willProcessRequest(array $data) {
+    $this->method = idx($data, 'method');
+  }
+
+  public function processRequest() {
+    $methods = $this->getAllMethods();
+    if (empty($methods[$this->method])) {
+      $this->method = key($methods);
+    }
+
+    $method_class = $methods[$this->method];
+    PhutilSymbolLoader::loadClass($method_class);
+    $method_object = newv($method_class, array());
+
+
+    $error_description = array();
+    $error_types = $method_object->defineErrorTypes();
+    if ($error_types) {
+      $error_description[] = '<ul>';
+      foreach ($error_types as $error => $meaning) {
+        $error_description[] =
+          '<li>'.
+            '<strong>'.phutil_escape_html($error).':</strong> '.
+            phutil_escape_html($meaning).
+          '</li>';
+      }
+      $error_description[] = '</ul>';
+      $error_description = implode("\n", $error_description);
+    } else {
+      $error_description = "This method does not raise any specific errors.";
+    }
+
+    $form = new AphrontFormView();
+    $form
+      ->setAction('/api/'.$this->method)
+      ->appendChild(
+        id(new AphrontFormStaticControl())
+          ->setLabel('Description')
+          ->setValue(
+            phutil_escape_html($method_object->getMethodDescription())))
+      ->appendChild(
+        id(new AphrontFormStaticControl())
+          ->setLabel('Returns')
+          ->setValue(
+            phutil_escape_html($method_object->defineReturnType())))
+      ->appendChild(
+        id(new AphrontFormStaticControl())
+          ->setLabel('Errors')
+          ->setValue($error_description))
+      ->appendChild(
+        '<p class="aphront-form-instructions">Enter parameters using '.
+        '<strong>JSON</strong>. For instance, to enter a list, type: '.
+        '<tt>["apple", "banana", "cherry"]</tt>');
+
+    $params = $method_object->defineParamTypes();
+    foreach ($params as $param => $desc) {
+      $form->appendChild(
+        id(new AphrontFormTextControl())
+          ->setLabel($param)
+          ->setName("params[{$param}]")
+          ->setCaption($desc));
+    }
+
+    $form
+      ->appendChild(
+        id(new AphrontFormSelectControl())
+          ->setLabel('Output Format')
+          ->setName('output')
+          ->setOptions(
+            array(
+              'human' => 'Human Readable',
+              'json'  => 'JSON',
+            )))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue('Call Method'));
+
+    $panel = new AphrontPanelView();
+    $panel->setHeader('Conduit API: '.phutil_escape_html($this->method));
+    $panel->appendChild($form);
+    $panel->setWidth(AphrontPanelView::WIDTH_WIDE);
+
+    $view = new AphrontSideNavView();
+    foreach ($this->buildNavItems() as $item) {
+      $view->addNavItem($item);
+    }
+
+    $view->appendChild($panel);
+
+    return $this->buildStandardPageResponse(
+      array($view),
+      array(
+        'title' => 'Conduit Console',
+        'tab'   => 'console',
+      ));
+  }
+
+  private function buildNavItems() {
+    $classes = $this->getAllMethodImplementationClasses();
+    $method_names = array();
+    foreach ($classes as $method_class) {
+      $method_name = ConduitAPIMethod::getAPIMethodNameFromClassName(
+        $method_class);
+      $method_names[] = array(
+        'full_name'   => $method_name,
+        'group_name'  => reset(explode('.', $method_name)),
+      );
+    }
+    $method_names = igroup($method_names, 'group_name');
+    ksort($method_names);
+
+    $items = array();
+    foreach ($method_names as $group => $methods) {
+      $items[] = phutil_render_tag(
+        'a',
+        array(
+        ),
+        phutil_escape_html($group));
+      foreach ($methods as $method) {
+        $method_name = $method['full_name'];
+        $selected = ($method_name == $this->method);
+        $items[] = phutil_render_tag(
+          'a',
+          array(
+            'class' => $selected ? 'aphront-side-nav-selected' : null,
+            'href'  => '/conduit/method/'.$method_name,
+          ),
+          '<span style="padding-left: 1em;">'.
+            phutil_escape_html($method_name).
+          '</span>');
+      }
+      $items[] = '<hr />';
+    }
+    // Pop off the last '<hr />'.
+    array_pop($items);
+
+    return $items;
+  }
+
+  private function getAllMethods() {
+    $classes = $this->getAllMethodImplementationClasses();
+    $methods = array();
+    foreach ($classes as $class) {
+      $name = ConduitAPIMethod::getAPIMethodNameFromClassName($class);
+      $methods[$name] = $class;
+    }
+    return $methods;
+  }
+
+  private function getAllMethodImplementationClasses() {
+    $classes = id(new PhutilSymbolLoader())
+      ->setAncestorClass('ConduitAPIMethod')
+      ->setType('class')
+      ->selectSymbolsWithoutLoading();
+    return array_values(ipull($classes, 'name'));
+  }
+
+}
diff --git a/src/applications/conduit/controller/console/__init__.php b/src/applications/conduit/controller/console/__init__.php
new file mode 100644
index 000000000..43e8fc4f1
--- /dev/null
+++ b/src/applications/conduit/controller/console/__init__.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/controller/base');
+phutil_require_module('phabricator', 'applications/conduit/method/base');
+phutil_require_module('phabricator', 'view/form/base');
+phutil_require_module('phabricator', 'view/form/control/submit');
+phutil_require_module('phabricator', 'view/form/control/text');
+phutil_require_module('phabricator', 'view/layout/panel');
+phutil_require_module('phabricator', 'view/layout/sidenav');
+
+phutil_require_module('phutil', 'markup');
+phutil_require_module('phutil', 'symbols');
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorConduitConsoleController.php');
diff --git a/src/applications/conduit/controller/log/PhabricatorConduitLogController.php b/src/applications/conduit/controller/log/PhabricatorConduitLogController.php
new file mode 100644
index 000000000..0b9433cb1
--- /dev/null
+++ b/src/applications/conduit/controller/log/PhabricatorConduitLogController.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitLogController extends PhabricatorConduitController {
+
+  public function processRequest() {
+
+    return $this->buildStandardPageResponse('stuff', array(
+      'title' => 'Conduit Logs',
+      'tab'   => 'logs',
+      ));
+  }
+}
diff --git a/src/applications/conduit/controller/log/__init__.php b/src/applications/conduit/controller/log/__init__.php
new file mode 100644
index 000000000..cbe5f7c47
--- /dev/null
+++ b/src/applications/conduit/controller/log/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/controller/base');
+
+
+phutil_require_source('PhabricatorConduitLogController.php');
diff --git a/src/applications/conduit/method/base/ConduitAPIMethod.php b/src/applications/conduit/method/base/ConduitAPIMethod.php
new file mode 100644
index 000000000..8ddfa136a
--- /dev/null
+++ b/src/applications/conduit/method/base/ConduitAPIMethod.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class ConduitAPIMethod {
+
+  abstract public function getMethodDescription();
+  abstract public function defineParamTypes();
+  abstract public function defineReturnType();
+  abstract public function defineErrorTypes();
+  abstract protected function execute(ConduitAPIRequest $request);
+
+  public function __construct() {
+
+  }
+
+  public function getErrorDescription($error_code) {
+    return idx($this->defineErrorTypes(), $error_code, 'Unknown Error');
+  }
+
+  public function executeMethod(ConduitAPIRequest $request) {
+    return $this->execute($request);
+  }
+
+  public function getAPIMethodName() {
+    return self::getAPIMethodNameFromClassName(get_class($this));
+  }
+
+  public static function getClassNameFromAPIMethodName($method_name) {
+    $method_fragment = str_replace('.', '_', $method_name);
+    return 'ConduitAPI_'.$method_fragment.'_Method';
+  }
+
+  public static function getAPIMethodNameFromClassName($class_name) {
+    $match = null;
+    $is_valid = preg_match(
+      '/^ConduitAPI_(.*)_Method$/',
+      $class_name,
+      $match);
+    if (!$is_valid) {
+      throw new Exception(
+        "Parameter '{$class_name}' is not a valid Conduit API method class.");
+    }
+    $method_fragment = $match[1];
+    return str_replace('_', '.', $method_fragment);
+  }
+
+}
diff --git a/src/applications/conduit/method/base/__init__.php b/src/applications/conduit/method/base/__init__.php
new file mode 100644
index 000000000..f7268ea66
--- /dev/null
+++ b/src/applications/conduit/method/base/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('ConduitAPIMethod.php');
diff --git a/src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php b/src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php
new file mode 100644
index 000000000..308852418
--- /dev/null
+++ b/src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class ConduitAPI_file_upload_Method extends ConduitAPIMethod {
+
+  public function getMethodDescription() {
+    return "Upload a file to the server.";
+  }
+
+  public function defineParamTypes() {
+    return array(
+      'data_base64' => 'required nonempty base64-bytes',
+      'name' => 'optional string',
+    );
+  }
+
+  public function defineReturnType() {
+    return 'nonempty guid';
+  }
+
+  public function defineErrorTypes() {
+    return array(
+    );
+  }
+
+  protected function execute(ConduitAPIRequest $request) {
+    $data = $request->getValue('data_base64');
+    $name = $request->getValue('name');
+    $data = base64_decode($data, $strict = true);
+
+    $file = PhabricatorFile::newFromFileData(
+      $data,
+      array(
+        'name' => $name
+      ));
+    return $file->getPHID();
+  }
+
+}
diff --git a/src/applications/conduit/method/file/upload/__init__.php b/src/applications/conduit/method/file/upload/__init__.php
new file mode 100644
index 000000000..5b0c10c04
--- /dev/null
+++ b/src/applications/conduit/method/file/upload/__init__.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/method/base');
+phutil_require_module('phabricator', 'applications/files/storage/file');
+
+
+phutil_require_source('ConduitAPI_file_upload_Method.php');
diff --git a/src/applications/conduit/protocol/exception/ConduitException.php b/src/applications/conduit/protocol/exception/ConduitException.php
new file mode 100644
index 000000000..069d0a8ab
--- /dev/null
+++ b/src/applications/conduit/protocol/exception/ConduitException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class ConduitException extends Exception {
+}
diff --git a/src/applications/conduit/protocol/exception/__init__.php b/src/applications/conduit/protocol/exception/__init__.php
new file mode 100644
index 000000000..eebf6eb98
--- /dev/null
+++ b/src/applications/conduit/protocol/exception/__init__.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+
+phutil_require_source('ConduitException.php');
diff --git a/src/applications/conduit/protocol/request/ConduitAPIRequest.php b/src/applications/conduit/protocol/request/ConduitAPIRequest.php
new file mode 100644
index 000000000..1f33ce0d5
--- /dev/null
+++ b/src/applications/conduit/protocol/request/ConduitAPIRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class ConduitAPIRequest {
+
+  protected $params;
+
+  public function __construct(array $params) {
+    $this->params = $params;
+  }
+
+  public function getValue($key) {
+    return $this->params[$key];
+  }
+
+  public function getAllParameters() {
+    return $this->params;
+  }
+
+}
diff --git a/src/applications/conduit/protocol/request/__init__.php b/src/applications/conduit/protocol/request/__init__.php
new file mode 100644
index 000000000..5aa52afcf
--- /dev/null
+++ b/src/applications/conduit/protocol/request/__init__.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+
+phutil_require_source('ConduitAPIRequest.php');
diff --git a/src/applications/conduit/storage/base/PhabricatorConduitDAO.php b/src/applications/conduit/storage/base/PhabricatorConduitDAO.php
new file mode 100644
index 000000000..15b79793f
--- /dev/null
+++ b/src/applications/conduit/storage/base/PhabricatorConduitDAO.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class PhabricatorConduitDAO extends PhabricatorLiskDAO {
+
+  public function getApplicationName() {
+    return 'conduit';
+  }
+
+}
diff --git a/src/applications/conduit/storage/base/__init__.php b/src/applications/conduit/storage/base/__init__.php
new file mode 100644
index 000000000..fc4cb60fd
--- /dev/null
+++ b/src/applications/conduit/storage/base/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/base/storage/lisk');
+
+
+phutil_require_source('PhabricatorConduitDAO.php');
diff --git a/src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php b/src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php
new file mode 100644
index 000000000..e1de62be0
--- /dev/null
+++ b/src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitConnectionLog extends PhabricatorConduitDAO {
+
+  protected $client;
+  protected $clientVersion;
+  protected $clientDescription;
+  protected $username;
+
+}
diff --git a/src/applications/conduit/storage/connectionlog/__init__.php b/src/applications/conduit/storage/connectionlog/__init__.php
new file mode 100644
index 000000000..7e2c11cfb
--- /dev/null
+++ b/src/applications/conduit/storage/connectionlog/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/storage/base');
+
+
+phutil_require_source('PhabricatorConduitConnectionLog.php');
diff --git a/src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php b/src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php
new file mode 100644
index 000000000..7a79d47ad
--- /dev/null
+++ b/src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitMethodCallLog extends PhabricatorConduitDAO {
+
+  protected $connectionID;
+  protected $method;
+  protected $error;
+  protected $duration;
+
+}
diff --git a/src/applications/conduit/storage/methodcalllog/__init__.php b/src/applications/conduit/storage/methodcalllog/__init__.php
new file mode 100644
index 000000000..2e4beff08
--- /dev/null
+++ b/src/applications/conduit/storage/methodcalllog/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/storage/base');
+
+
+phutil_require_source('PhabricatorConduitMethodCallLog.php');
diff --git a/src/view/layout/panel/AphrontPanelView.php b/src/view/layout/panel/AphrontPanelView.php
index 105be6159..2672002d5 100755
--- a/src/view/layout/panel/AphrontPanelView.php
+++ b/src/view/layout/panel/AphrontPanelView.php
@@ -1,79 +1,80 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 final class AphrontPanelView extends AphrontView {
 
   const WIDTH_FULL = 'full';
   const WIDTH_FORM = 'form';
+  const WIDTH_WIDE = 'wide';
 
   private $createButton;
   private $header;
   private $width;
 
   public function setCreateButton($create_button, $href) {
 
     $this->createButton = phutil_render_tag(
       'a',
       array(
         'href' => $href,
         'class' => 'create-button button green',
       ),
       $create_button);
 
     return $this;
   }
 
   public function setHeader($header) {
     $this->header = $header;
     return $this;
   }
 
   public function setWidth($width) {
     $this->width = $width;
     return $this;
   }
 
   public function render() {
     if ($this->header !== null) {
       $header = '<h1>'.$this->header.'</h1>';
     } else {
       $header = null;
     }
 
     if ($this->createButton !== null) {
       $button = $this->createButton;
     } else {
       $button = null;
     }
 
     $table = $this->renderChildren();
 
     $class = array('aphront-panel-view');
     if ($this->width) {
       $class[] = 'aphront-panel-width-'.$this->width;
     }
 
     return
       '<div class="'.implode(' ', $class).'">'.
         $button.
         $header.
         $table.
       '</div>';
   }
 
 }
diff --git a/src/view/layout/sidenav/AphrontSideNavView.php b/src/view/layout/sidenav/AphrontSideNavView.php
new file mode 100755
index 000000000..c0ababfad
--- /dev/null
+++ b/src/view/layout/sidenav/AphrontSideNavView.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+final class AphrontSideNavView extends AphrontView {
+
+  protected $items = array();
+
+  public function addNavItem($item) {
+    $this->items[] = $item;
+    return $this;
+  }
+
+  public function render() {
+    $view = new AphrontNullView();
+    $view->appendChild($this->items);
+
+    return
+      '<table class="aphront-side-nav-view">'.
+        '<tr>'.
+          '<th class="aphront-side-nav-navigation">'.
+            $view->render().
+          '</th>'.
+          '<td class="aphront-side-nav-content">'.
+            $this->renderChildren().
+          '</td>'.
+        '</tr>'.
+      '</table>';
+  }
+
+}
diff --git a/src/view/layout/sidenav/__init__.php b/src/view/layout/sidenav/__init__.php
new file mode 100644
index 000000000..b32c493b6
--- /dev/null
+++ b/src/view/layout/sidenav/__init__.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'view/base');
+phutil_require_module('phabricator', 'view/null');
+
+
+phutil_require_source('AphrontSideNavView.php');
diff --git a/webroot/rsrc/css/base.css b/webroot/rsrc/css/base.css
index f305a544c..b09d20776 100644
--- a/webroot/rsrc/css/base.css
+++ b/webroot/rsrc/css/base.css
@@ -1,534 +1,595 @@
 html {
   overflow-y: scroll;
 }
 
 body, div, dl, dt, dd, ul, ol, li,
 h1, h2, h3, h4, h5, h6,
 pre, form, fieldset,
 p, blockquote, th, td, button {
   margin: 0;
   padding: 0;
   outline: 0;
   border: 0;
 }
 
 html {
   padding-bottom: 16em;
 }
 
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
 
 fieldset, img {
   border: 0;
 }
 
 address, caption, cite, code, dfn, th, var {
   font-style: normal;
   font-weight: normal;
 }
 
 ol, ul {
   list-style: none;
 }
 
 caption, th {
   text-align: left;
 }
 
 td, th {
   vertical-align: top;
 }
 
 h1, h2, h3, h4, h5, h6 {
   font-size: 100%;
   font-weight: bold;
 }
 
 body {
   font: 13px/1.231 'lucida grande', tahoma, verdana, arial, sans-serif;
   background:   #ACACAC;
   direction: ltr;
   text-align: left;
   unicode-bidi: embed;
   *font-size: small;
 }
 
 select, input, button, textarea, button {
   font: 99% 'lucida grande', tahoma, verdana, arial, clean, sans-serif;
 }
 
 table {
   font-size: inherit;
   font: 100%;
 }
 
 h1 {
   font-size: 16px;
 }
 
 h2 {
   font-size: 14px;
 }
 
 a {
   -moz-outline-style: none;
   text-decoration: none;
   cursor: pointer;
 }
 
 a:visited {
   color: #3b5998;
 }
 
 a:link {
   color: #3b5998;
 }
 
 a:hover {
   text-decoration: underline;
 }
 
 img {
   display: block;
 }
 
 /******************************************************************************/
 
 /* Buttons */
 
 /******************************************************************************/
 
 button,
 a.button,
 a.button:visited,
 input.inputsubmit {
   background: #5e77aa url('/rsrc/image/sprite.png') 0 0 repeat-x;
   border: 1px solid #29447e;
   border-bottom-color: #1a356e;
   color: #fff;
   cursor: pointer;
   font-weight: bold;
   text-align: center;
   white-space: nowrap;
   display: inline-block;
   font-size: 13px;
   overflow: visible;
   padding: 2px 8px 3px 8px;
   line-height: 18px;
   vertical-align: baseline;
   width: auto;
   box-shadow: 0px 1px 0px rgba(0,0,0,.12);
   -moz-box-shadow: 0px 1px 0px rgba(0,0,0,.12);
   -webkit-box-shadow: 0px 1px 0px rgba(0,0,0,.12);
 }
 
 button {
   *padding: 2px 4px 1px 8px;
   _padding-right: 6px;
 }
 
 a.button,
 a.button:visited {
   *padding: 3px 8px 4px;
 }
 
 /* Buttons with images (full size only) */
 button.icon,
 a.icon,
 a.icon:visited {
   padding-left: 0;
   position: relative;
   text-indent: 29px;
 }
 
 /* Fix for IE7 within table cells ? */
 td button {
   *width: 100%;
   *padding-right: 8px;
 }
 
 button:active,
 a.button:active {
   background-color: #4f6aa3;
   background-position: 0 -100px;
   border-bottom-color: #29447e;
 }
 
 button.green,
 a.green,
 a.green:visited {
   background-color: #6da952;
   background-position: 0 -50px;
   border: 1px solid #3b6e22;
   border-bottom-color: #2c5a15;
 }
 
 button.green:active,
 a.green:active {
   background-color: #5e9d43;
   background-position: 0 -150px;
   border-bottom-color: #3b6e22;
 }
 
 button.grey,
 input.inputaux,
 a.grey,
 a.grey:visited,
 a.button.disabled,
 button.disabled {
   background-color: #e4e5e5;
   background-position: 0 -250px;
   border: 1px solid #999;
   border-bottom-color: #888;
   color: #333;
   box-shadow: 0px 1px 0px rgba(0,0,0,.07);
   -moz-box-shadow: 0px 1px 0px rgba(0,0,0,.07);
   -webkit-box-shadow: 0px 1px 0px rgba(0,0,0,.07);
 }
 
 a.disabled,
 button.disabled {
   filter:alpha(opacity=50);
   -moz-opacity:0.5;
   -khtml-opacity: 0.5;
   opacity: 0.5;
 }
 
 button.grey:active,
 a.grey:active,
 button.grey_active {
   background-color: #dddddd;
   background-position: 0 -200px;
   border-bottom-color: #999;
 }
 
 button:active::-moz-focus-inner,
 button:focus::-moz-focus-inner {
   border-color: #405071;
 }
 
 button.green:active::-moz-focus-inner,
 button.green:focus::-moz-focus-inner {
   border-color: #4c713b;
 }
 
 button.grey:active::-moz-focus-inner,
 button.grey:focus::-moz-focus-inner {
   border-color: #666;
 }
 
 a.button:hover {
   text-decoration: none;
 }
 
 button.small,
 a.small,
 a.small:visited {
   padding: 2px 7px;
   height: auto;
   font-size: 11px;
   line-height: 16px;
 }
 
 
 /******************************************************************************/
 
 /* Aphront */
 
 /******************************************************************************/
 
 .aphront-standard-page {
   background: #ffffff;
   border-bottom: 1px solid #888888;
   font-size: 14px;
 
   -webkit-box-shadow: 0 0 6px #000;
   -mox-box-shadow:    0 0 6px #000;
   box-shadow:         0 0 6px #000;
 }
 
 .aphront-standard-header {
   background: #003366;
   color: white;
   padding: 1em 1em 0.5em 1em;
   overflow: hidden;
   position: relative;
 }
 
 .aphront-standard-header a { 
   color: white;
 }
 
 .aphront-standard-header .aphront-head-tabs {
   padding: 0 1em;
   font-size: 13px;
   font-weight: bold;
 }
 
 .aphront-standard-header .aphront-head-tabs a {
   border-bottom: 3px solid transparent;
   padding: 0.5em 0.75em;
   position: relative;
   bottom: 2px;
 }
 
 .aphront-standard-header .aphront-head-tabs a.aphront-selected-tab {
   border-bottom-color: #cccccc;
 }
 
 .aphront-standard-header .aphront-head-appname {
   padding: 0 1em;
   text-transform: uppercase;
 }
 
 
 .aphront-directory-list {
   margin: 1em 3% 8em;
 }
 
 .aphront-directory-category h1 {
   border-bottom: 1px solid #cccccc;
   margin-bottom: .5em;
   padding-bottom: .1em;
 }
 
 .aphront-directory-list h2 {
   font-size: 14px;
   font-weight: bold;
   padding: 0;
   margin: 0;
 }
 
 .aphront-directory-list p {
   color: #444444;
   font-size: 12px;
   padding: .05em .5em .5em;
 }
 
 .aphront-directory-category {
   padding: 10px;
   width: 300px;
   float: left;
 }
 
 .aphront-directory-group {
   padding: 0 .5em 3em;
 }
 
 
 .aphront-panel-view {
   background: #f3f3f3;
   border: 1px solid #c0c0c0;
   border-width: 1px 0 0;
   padding: 1em 2em;
   margin: 1em 2em;
 }
 
 .aphront-panel-view h1 {
   font-size:        14px;
   font-weight:      bold;
   padding:          2px 0 8px;
 }
 
 .aphront-panel-view a.create-button {
   float: right;
 }
 
 .aphront-panel-width-form {
   width: 720px;
   margin-right: auto;
   margin-left: auto;
 }
 
+.aphront-panel-width-wide {
+  width: 1080px;
+  margin-right: auto;
+  margin-left: auto;
+}  
+
 .aphront-table-view {
   width:            100%;
   border-collapse:  collapse;
   background:       #fdfdfd;
   border:           1px solid #003366;
 }
 
 .aphront-table-view tr.alt {
   background:       #efefef;
 }
 
 .aphront-table-view th {
   font-size: 12px;
   font-weight: bold;
   padding: 4px 8px;
   background: #003366;
   color: white;
   white-space: nowrap;
 }
 
 .aphront-table-view td.header {
   padding:          4px 8px;
   background:       #3b5998;
   color:            white;
   white-space:      nowrap;
   text-align:       right;
 }
 
 .aphront-table-view td {
   vertical-align:   top;
   padding:          4px 8px;
   font-size:        11px;
   white-space:      nowrap;
 }
 
 .aphront-table-view td.action {
   padding-top: 1px;
   padding-bottom: 1px;
 }
 
 .aphront-table-view td.larger {
   font-size:        14px;
 }
 
 .aphront-table-view td.pri {
   font-weight:      bold;
 }
 
 .aphront-table-view td.wide {
   white-space:      normal;
   width:            100%;
 }
 
 .aphront-table-view td.right {
   text-align:       right;
 }
 
 .aphront-table-view td.mono {
   font-family:      "Monaco", monospace;
   font-size:        10px;
 }  
 
 .aphront-table-view tr.no-data td {
   padding:    1em;
   text-align: center;
   color:      #888888;
   font-style: italic;
 }
 
 
 /******************************************************************************/
 
 /* forms */
 
 /******************************************************************************/
 
 .aphront-form-view {
   background: #e7e7e7;
   border: 1px solid #c4c4c4;
   padding: 1em;
 }
 
 .aphront-form-view label {
   padding-top: 4px;
   width: 14%;
   float: left;
   text-align: right;
   font-weight: bold;
   font-size: 13px;
   color: #666666;
 }
 
 .aphront-form-input {
   margin-left: 15%;
   margin-right: 25%;
   width: 60%;
 }
 
 .aphront-form-error {
   width: 23%;
   float: right;
   color: #aa0000;
   font-weight: bold;
   padding-top: 4px;
 }
 
 .aphront-form-input input,
 .aphront-form-input textarea {
   font-size: 12px;
   width: 100%;
 }
 
 .aphront-form-input textarea {
   height: 12em;
 }
 
 .aphront-form-control {
   padding: 4px;
 }
 
 .aphront-form-control-submit button,
 .aphront-form-control-submit a.button {
   float: right;
   margin: 1em 0 0em 2%;
 }
 
 .aphront-form-view .aphront-form-caption {
   font-size: 11px;
   color: #444444;
   text-align: right;
   clear: both;
   margin-right: 25%;
   margin-left: 15%;
 }
 
 .aphront-error-view {
   width: 720px;
   margin: 1em auto;
   border: 1px solid #aa0000;
   padding: 1em;
   background: #f9b9bc;
 }
 
+.aphront-form-instructions {
+  margin: 2em 3%;
+}
 
+.aphront-form-control-static .aphront-form-input {
+  padding-top: 4px;
+  font-size: 13px;
+}
 
 /******************************************************************************/
 
 /* dialog */
 
 /******************************************************************************/
 
 
 .aphront-dialog-view {
   width: 480px;
   padding: 8px;
   background: #666;
   margin: auto;
 }
 
 .aphront-dialog-head {
   background:   #003366;
   border:       none;
   font-size:    15px;
   padding:      5px 12px 6px;
   color:        #ffffff;
 }
   
 
 .aphront-dialog-body {
   background: #ffffff;
   padding: 16px 12px;
   border: none;
   overflow: hidden;
 }
 
 .aphront-dialog-tail {
   border: none;
   background: #ededed;
   padding: 0.5em;
   text-align: right;
 }
 
 .aphront-dialog-tail button,
 .aphront-dialog-tail a.button {
   float: right;
   margin-left: .5em;
 }
 
 
+
+/******************************************************************************/
+
+/* side nav */
+
+/******************************************************************************/
+
+
+table.aphront-side-nav-view {
+  width: 100%;
+}
+
+td.aphront-side-nav-content {
+  width: 100%;
+}
+
+th.aphront-side-nav-navigation {
+  border-right: 1px solid #bbbbbb;
+}
+
+th.aphront-side-nav-navigation a {
+  display: block;
+  margin: 0 0 2px;
+  min-width: 150px;
+  padding: 3px 8px 3px 24px;
+  font-weight: bold;
+  white-space: nowrap;
+  text-decoration: none;
+}
+
+th.aphront-side-nav-navigation a:hover {
+  text-decoration: none;
+  background:     #f3f3f9;
+}
+
+th.aphront-side-nav-navigation hr {
+  height:         1px;
+  background:     #eeeeee;
+  border:         0px;
+  margin:         12px 0px;
+}
+
+th.aphront-side-nav-navigation a.aphront-side-nav-selected,
+th.aphront-side-nav-navigation a.aphront-side-nav-selected:hover {
+  background:     #d8dfea;
+}
+
+  
\ No newline at end of file