diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1bb27137cc..09e6f6c6de 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -60,6 +60,14 @@ phutil_register_library_map(array(
     'PhabricatorDirectoryItemListController' => 'applications/directory/controller/itemlist',
     'PhabricatorDirectoryMainController' => 'applications/directory/controller/main',
     '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',
     'PhabricatorStandardPageView' => 'view/page/standard',
   ),
   'function' =>
@@ -114,6 +122,14 @@ phutil_register_library_map(array(
     'PhabricatorDirectoryItemListController' => 'PhabricatorDirectoryController',
     'PhabricatorDirectoryMainController' => 'PhabricatorDirectoryController',
     'PhabricatorLiskDAO' => 'LiskDAO',
+    'PhabricatorPHID' => 'PhabricatorPHIDDAO',
+    'PhabricatorPHIDAllocateController' => 'PhabricatorPHIDController',
+    'PhabricatorPHIDController' => 'PhabricatorController',
+    'PhabricatorPHIDDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorPHIDListController' => 'PhabricatorPHIDController',
+    'PhabricatorPHIDType' => 'PhabricatorPHIDDAO',
+    'PhabricatorPHIDTypeEditController' => 'PhabricatorPHIDController',
+    'PhabricatorPHIDTypeListController' => 'PhabricatorPHIDController',
     'PhabricatorStandardPageView' => 'AphrontPageView',
   ),
   'requires_interface' =>
diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
index f73dda95f0..4765cf56e6 100644
--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
@@ -35,18 +35,27 @@ class AphrontDefaultApplicationConfiguration
         'delete/(?<id>\d+)/$'   => 'RepositoryDeleteController',
       ),
       '/' => array(
-        '$'                     => 'AphrontDirectoryMainController',
+        '$'                     => 'PhabricatorDirectoryMainController',
       ),
       '/directory/' => array(
-        'item/$'                      => 'AphrontDirectoryItemListController',
-        'item/edit/(?:(?<id>\d+)/)?$' => 'AphrontDirectoryItemEditController',
-        'item/delete/(?<id>\d+)/'     => 'AphrontDirectoryItemDeleteController',
+        'item/$'
+          => 'PhabricatorDirectoryItemListController',
+        'item/edit/(?:(?<id>\d+)/)?$'
+          => 'PhabricatorDirectoryItemEditController',
+        'item/delete/(?<id>\d+)/'
+          => 'PhabricatorDirectoryItemDeleteController',
         'category/$'
-          => 'AphrontDirectoryCategoryListController',
+          => 'PhabricatorDirectoryCategoryListController',
         'category/edit/(?:(?<id>\d+)/)?$'
-          => 'AphrontDirectoryCategoryEditController',
+          => 'PhabricatorDirectoryCategoryEditController',
         'category/delete/(?<id>\d+)/'
-          => 'AphrontDirectoryCategoryDeleteController',
+          => 'PhabricatorDirectoryCategoryDeleteController',
+      ),
+      '/phid/' => array(
+        '$' => 'PhabricatorPHIDListController',
+        'type/$' => 'PhabricatorPHIDTypeListController',
+        'type/edit/(?:(?<id>\d+)/)?$' => 'PhabricatorPHIDTypeEditController',
+        'new/$' => 'PhabricatorPHIDAllocateController',
       ),
       '.*' => 'AphrontDefaultApplicationController',
     );
diff --git a/src/aphront/response/webpage/AphrontWebpageResponse.php b/src/aphront/response/webpage/AphrontWebpageResponse.php
index 40ceb9e2eb..94e976a64c 100644
--- a/src/aphront/response/webpage/AphrontWebpageResponse.php
+++ b/src/aphront/response/webpage/AphrontWebpageResponse.php
@@ -32,4 +32,10 @@ class AphrontWebpageResponse extends AphrontResponse {
     return $this->content;
   }
 
+  public function getHeaders() {
+    return array(
+      array('Content-Type', 'text/html; charset=UTF-8'),
+    );
+  }
+
 }
diff --git a/src/applications/base/controller/base/__init__.php b/src/applications/base/controller/base/__init__.php
new file mode 100644
index 0000000000..03cfc02dba
--- /dev/null
+++ b/src/applications/base/controller/base/__init__.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'aphront/controller');
+phutil_require_module('phabricator', 'aphront/response/webpage');
+phutil_require_module('phabricator', 'view/page/standard');
+
+
+phutil_require_source('PhabricatorController.php');
diff --git a/src/applications/base/storage/lisk/PhabricatorLiskDAO.php b/src/applications/base/storage/lisk/PhabricatorLiskDAO.php
index 069dca62a3..c27248660e 100644
--- a/src/applications/base/storage/lisk/PhabricatorLiskDAO.php
+++ b/src/applications/base/storage/lisk/PhabricatorLiskDAO.php
@@ -42,7 +42,12 @@ abstract class PhabricatorLiskDAO extends LiskDAO {
     if (!strncmp($class, $app, strlen($app))) {
       $class = substr($class, strlen($app));
     }
-    return $app.'_'.$class;
+
+    if (strlen($class)) {
+      return $app.'_'.$class;
+    } else {
+      return $app;
+    }
   }
 
   abstract public function getApplicationName();
diff --git a/src/applications/directory/storage/item/PhabricatorDirectoryItem.php b/src/applications/directory/storage/item/PhabricatorDirectoryItem.php
index 811bb59a69..6a7ea3c6f8 100644
--- a/src/applications/directory/storage/item/PhabricatorDirectoryItem.php
+++ b/src/applications/directory/storage/item/PhabricatorDirectoryItem.php
@@ -23,7 +23,7 @@ class PhabricatorDirectoryItem extends PhabricatorDirectoryDAO {
   protected $href;
   protected $categoryID;
   protected $sequence;
-  protected $imageGUID;
+  protected $imagePHID;
 
   public function getSortKey() {
     return sprintf(
diff --git a/src/applications/phid/controller/allocate/PhabricatorPHIDAllocateController.php b/src/applications/phid/controller/allocate/PhabricatorPHIDAllocateController.php
new file mode 100644
index 0000000000..53f8af3e14
--- /dev/null
+++ b/src/applications/phid/controller/allocate/PhabricatorPHIDAllocateController.php
@@ -0,0 +1,68 @@
+<?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 PhabricatorPHIDAllocateController
+  extends PhabricatorPHIDController {
+
+  public function processRequest() {
+
+    $request = $this->getRequest();
+    if ($request->isFormPost()) {
+      $type = $request->getStr('type');
+      $phid = PhabricatorPHID::generateNewPHID($type);
+
+      return id(new AphrontRedirectResponse())
+        ->setURI('/phid/?phid='.phutil_escape_uri($phid));
+    }
+
+    $types = id(new PhabricatorPHIDType())->loadAll();
+    
+    $options = array();
+    foreach ($types as $type) {
+      $options[$type->getType()] = $type->getType().': '.$type->getName();
+    }
+    asort($options);
+
+    $form = new AphrontFormView();
+    $form->setAction('/phid/new/');
+
+    $form
+      ->appendChild(
+        id(new AphrontFormSelectControl())
+          ->setLabel('PHID Type')
+          ->setName('type')
+          ->setOptions($options))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue('Allocate')
+          ->addCancelButton('/phid/'));
+
+    $panel = new AphrontPanelView();
+    $panel->setHeader('Allocate New PHID');
+
+    $panel->appendChild($form);
+    $panel->setWidth(AphrontPanelView::WIDTH_FORM);
+
+    return $this->buildStandardPageResponse(
+      array($panel),
+      array(
+        'title' => 'Allocate New PHID',
+      ));
+  }
+
+}
diff --git a/src/applications/phid/controller/allocate/__init__.php b/src/applications/phid/controller/allocate/__init__.php
new file mode 100644
index 0000000000..0605962517
--- /dev/null
+++ b/src/applications/phid/controller/allocate/__init__.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'aphront/response/redirect');
+phutil_require_module('phabricator', 'applications/phid/controller/base');
+phutil_require_module('phabricator', 'applications/phid/storage/phid');
+phutil_require_module('phabricator', 'applications/phid/storage/type');
+phutil_require_module('phabricator', 'view/form/base');
+phutil_require_module('phabricator', 'view/form/control/submit');
+phutil_require_module('phabricator', 'view/layout/panel');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorPHIDAllocateController.php');
diff --git a/src/applications/phid/controller/base/PhabricatorPHIDController.php b/src/applications/phid/controller/base/PhabricatorPHIDController.php
new file mode 100644
index 0000000000..4c190e9ab7
--- /dev/null
+++ b/src/applications/phid/controller/base/PhabricatorPHIDController.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 PhabricatorPHIDController extends PhabricatorController {
+
+  public function buildStandardPageResponse($view, array $data) {
+    $page = new PhabricatorStandardPageView();
+
+    $page->setApplicationName('PHID');
+    $page->setBaseURI('/phid/');
+    $page->setTitle(idx($data, 'title'));
+    $page->setTabs(
+      array(
+        'phids' => array(
+          'href' => '/phid/',
+          'name' => 'PHIDs',
+        ),
+        'types' => array(
+          'href' => '/phid/type/',
+          'name' => 'PHID Types',
+        ),
+      ),
+      idx($data, 'tab'));
+    $page->setGlyph('#');
+    $page->appendChild($view);
+
+    $response = new AphrontWebpageResponse();
+    return $response->setContent($page->render());
+  }
+
+}
diff --git a/src/applications/phid/controller/base/__init__.php b/src/applications/phid/controller/base/__init__.php
new file mode 100644
index 0000000000..44f0f1b94d
--- /dev/null
+++ b/src/applications/phid/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('PhabricatorPHIDController.php');
diff --git a/src/applications/phid/controller/list/PhabricatorPHIDListController.php b/src/applications/phid/controller/list/PhabricatorPHIDListController.php
new file mode 100644
index 0000000000..33803cc4d0
--- /dev/null
+++ b/src/applications/phid/controller/list/PhabricatorPHIDListController.php
@@ -0,0 +1,56 @@
+<?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 PhabricatorPHIDListController
+  extends PhabricatorPHIDController {
+
+  public function processRequest() {
+    $items = id(new PhabricatorPHID())->loadAllWhere(
+      '1 = 1 ORDER BY id DESC limit 100');
+
+    $rows = array();
+    foreach ($items as $item) {
+      $rows[] = array(
+        phutil_escape_html($item->getPHID()),
+        phutil_escape_html($item->getPHIDType()),
+        phutil_escape_html($item->getOwnerPHID()),
+        phutil_escape_html($item->getParentPHID()),
+      );
+    }
+
+    $table = new AphrontTableView($rows);
+    $table->setHeaders(
+      array(
+        'PHID',
+        'Type',
+        'Owner PHID',
+        'Parent PHID',
+      ));
+
+    $panel = new AphrontPanelView();
+    $panel->appendChild($table);
+    $panel->setHeader('PHIDs');
+    $panel->setCreateButton('Allocate New PHID', '/phid/new/');
+
+    return $this->buildStandardPageResponse($panel, array(
+      'title' => 'PHIDs',
+      'tab'   => 'phids',
+      ));
+  }
+
+}
diff --git a/src/applications/phid/controller/list/__init__.php b/src/applications/phid/controller/list/__init__.php
new file mode 100644
index 0000000000..913d4fe3f1
--- /dev/null
+++ b/src/applications/phid/controller/list/__init__.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/phid/controller/base');
+phutil_require_module('phabricator', 'applications/phid/storage/phid');
+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('PhabricatorPHIDListController.php');
diff --git a/src/applications/phid/controller/typeedit/PhabricatorPHIDTypeEditController.php b/src/applications/phid/controller/typeedit/PhabricatorPHIDTypeEditController.php
new file mode 100644
index 0000000000..a82e63c778
--- /dev/null
+++ b/src/applications/phid/controller/typeedit/PhabricatorPHIDTypeEditController.php
@@ -0,0 +1,132 @@
+<?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 PhabricatorPHIDTypeEditController
+  extends PhabricatorPHIDController {
+
+  private $id;
+
+  public function willProcessRequest(array $data) {
+    $this->id = idx($data, 'id');
+  }
+
+  public function processRequest() {
+
+    if ($this->id) {
+      $type = id(new PhabricatorPHIDType())->load($this->id);
+      if (!$type) {
+        return new Aphront404Response();
+      }
+    } else {
+      $type = new PhabricatorPHIDType();
+    }
+
+    $e_type = true;
+    $e_name = true;
+    $errors = array();
+
+    $request = $this->getRequest();
+    if ($request->isFormPost()) {
+      $type->setName($request->getStr('name'));
+      if (!$type->getID()) {
+        $type->setType($request->getStr('type'));
+      }
+      $type->setDescription($request->getStr('description'));
+
+      if (!strlen($type->getType())) {
+        $errors[] = 'Type code is required.';
+        $e_type = 'Required';
+      }
+
+      if (!strlen($type->getName())) {
+        $errors[] = 'Type name is required.';
+        $e_name = 'Required';
+      }
+
+      if (!$errors) {
+        $type->save();
+        return id(new AphrontRedirectResponse())
+          ->setURI('/phid/type/');
+      }
+    }
+
+    $error_view = null;
+    if ($errors) {
+      $error_view = id(new AphrontErrorView())
+        ->setTitle('Form Errors')
+        ->setErrors($errors);
+    }
+
+    $form = new AphrontFormView();
+    if ($type->getID()) {
+      $form->setAction('/phid/type/edit/'.$type->getID().'/');
+    } else {
+      $form->setAction('/phid/type/edit/');
+    }
+
+    if ($type->getID()) {
+      $type_immutable = true;
+    } else {
+      $type_immutable = false;
+    }
+
+    $form
+      ->appendChild(
+        id(new AphrontFormTextControl())
+          ->setLabel('Type')
+          ->setName('type')
+          ->setValue($type->getType())
+          ->setError($e_type)
+          ->setCaption(
+            'Four character type identifier. This can not be changed once '.
+            'it is created.')
+          ->setDisabled($type_immutable))
+      ->appendChild(
+        id(new AphrontFormTextControl())
+          ->setLabel('Name')
+          ->setName('name')
+          ->setValue($type->getName())
+          ->setError($e_name))
+      ->appendChild(
+        id(new AphrontFormTextAreaControl())
+          ->setLabel('Description')
+          ->setName('description')
+          ->setValue($type->getDescription()))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue('Save')
+          ->addCancelButton('/phid/type/'));
+
+    $panel = new AphrontPanelView();
+    if ($type->getID()) {
+      $panel->setHeader('Edit PHID Type');
+    } else {
+      $panel->setHeader('Create New PHID Type');
+    }
+
+    $panel->appendChild($form);
+    $panel->setWidth(AphrontPanelView::WIDTH_FORM);
+
+    return $this->buildStandardPageResponse(
+      array($error_view, $panel),
+      array(
+        'title' => 'Edit PHID Type',
+      ));
+  }
+
+}
diff --git a/src/applications/phid/controller/typeedit/__init__.php b/src/applications/phid/controller/typeedit/__init__.php
new file mode 100644
index 0000000000..0805e99ff0
--- /dev/null
+++ b/src/applications/phid/controller/typeedit/__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/404');
+phutil_require_module('phabricator', 'aphront/response/redirect');
+phutil_require_module('phabricator', 'applications/phid/controller/base');
+phutil_require_module('phabricator', 'applications/phid/storage/type');
+phutil_require_module('phabricator', 'view/form/base');
+phutil_require_module('phabricator', 'view/form/control/submit');
+phutil_require_module('phabricator', 'view/form/error');
+phutil_require_module('phabricator', 'view/layout/panel');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorPHIDTypeEditController.php');
diff --git a/src/applications/phid/controller/typelist/PhabricatorPHIDTypeListController.php b/src/applications/phid/controller/typelist/PhabricatorPHIDTypeListController.php
new file mode 100644
index 0000000000..cb961798c0
--- /dev/null
+++ b/src/applications/phid/controller/typelist/PhabricatorPHIDTypeListController.php
@@ -0,0 +1,59 @@
+<?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 PhabricatorPHIDTypeListController
+  extends PhabricatorPHIDController {
+
+  public function processRequest() {
+    $items = id(new PhabricatorPHIDType())->loadAll();
+
+    $rows = array();
+    foreach ($items as $item) {
+      $rows[] = array(
+        $item->getID(),
+        phutil_escape_html($item->getType()),
+        phutil_escape_html($item->getName()),
+      );
+    }
+
+    $table = new AphrontTableView($rows);
+    $table->setHeaders(
+      array(
+        'ID',
+        'Type Code',
+        'Name',
+      ));
+    $table->setColumnClasses(
+      array(
+        null,
+        null,
+        'wide',
+      ));
+
+    $panel = new AphrontPanelView();
+    $panel->appendChild($table);
+    $panel->setHeader('PHID Types');
+    $panel->setCreateButton('New Type', '/phid/type/edit/');
+
+    return $this->buildStandardPageResponse($panel, array(
+      'title' => 'PHID Types',
+      'tab'   => 'types',
+      ));
+  }
+
+}
diff --git a/src/applications/phid/controller/typelist/__init__.php b/src/applications/phid/controller/typelist/__init__.php
new file mode 100644
index 0000000000..81a4d0557d
--- /dev/null
+++ b/src/applications/phid/controller/typelist/__init__.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/phid/controller/base');
+phutil_require_module('phabricator', 'applications/phid/storage/type');
+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('PhabricatorPHIDTypeListController.php');
diff --git a/src/applications/phid/storage/base/PhabricatorPHIDDAO.php b/src/applications/phid/storage/base/PhabricatorPHIDDAO.php
new file mode 100644
index 0000000000..a133222722
--- /dev/null
+++ b/src/applications/phid/storage/base/PhabricatorPHIDDAO.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.
+ */
+
+class PhabricatorPHIDDAO extends PhabricatorLiskDAO {
+
+  public function getApplicationName() {
+    return 'phid';
+  }
+
+}
diff --git a/src/applications/phid/storage/base/__init__.php b/src/applications/phid/storage/base/__init__.php
new file mode 100644
index 0000000000..5c42a7b15d
--- /dev/null
+++ b/src/applications/phid/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('PhabricatorPHIDDAO.php');
diff --git a/src/applications/phid/storage/phid/PhabricatorPHID.php b/src/applications/phid/storage/phid/PhabricatorPHID.php
new file mode 100644
index 0000000000..70f018ad4f
--- /dev/null
+++ b/src/applications/phid/storage/phid/PhabricatorPHID.php
@@ -0,0 +1,56 @@
+<?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 PhabricatorPHID extends PhabricatorPHIDDAO {
+
+  protected $phid;
+  protected $phidType;
+  protected $ownerPHID;
+  protected $parentPHID;
+
+  public static function generateNewPHID($type, array $config = array()) {
+    $owner  = idx($config, 'owner');
+    $parent = idx($config, 'parent');
+
+    if (!$type) {
+      throw new Exception("Can not generate PHID with no type.");
+    }
+
+    $urandom = @fopen('/dev/urandom', 'r');
+    if (!$urandom) {
+      throw new Exception("Failed to open /dev/urandom!");
+    }
+    $entropy = fread($urandom, 16);
+    if (strlen($entropy) != 16) {
+      throw new Exception("Failed to read from /dev/urandom!");
+    }
+
+    $uniq = sha1($entropy);
+    $phid = 'PHID-'.$type.'-X-'.$uniq;
+
+    $phid_rec = new PhabricatorPHID();
+    $phid_rec->setPHIDType($type);
+    $phid_rec->setOwnerPHID($owner);
+    $phid_rec->setParentPHID($parent);
+    $phid_rec->setPHID($phid);
+    $phid_rec->save();
+
+    return $phid;
+  }
+
+}
diff --git a/src/applications/phid/storage/phid/__init__.php b/src/applications/phid/storage/phid/__init__.php
new file mode 100644
index 0000000000..5ff7852286
--- /dev/null
+++ b/src/applications/phid/storage/phid/__init__.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/phid/storage/base');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorPHID.php');
diff --git a/src/applications/phid/storage/type/PhabricatorPHIDType.php b/src/applications/phid/storage/type/PhabricatorPHIDType.php
new file mode 100644
index 0000000000..b5c50d512b
--- /dev/null
+++ b/src/applications/phid/storage/type/PhabricatorPHIDType.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.
+ */
+
+class PhabricatorPHIDType extends PhabricatorPHIDDAO {
+
+  protected $type;
+  protected $name;
+  protected $description;
+
+}
diff --git a/src/applications/phid/storage/type/__init__.php b/src/applications/phid/storage/type/__init__.php
new file mode 100644
index 0000000000..9753ee3309
--- /dev/null
+++ b/src/applications/phid/storage/type/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/phid/storage/base');
+
+
+phutil_require_source('PhabricatorPHIDType.php');
diff --git a/src/storage/lisk/dao/LiskDAO.php b/src/storage/lisk/dao/LiskDAO.php
index de90777d70..226c89d4fd 100644
--- a/src/storage/lisk/dao/LiskDAO.php
+++ b/src/storage/lisk/dao/LiskDAO.php
@@ -148,7 +148,7 @@ abstract class LiskDAO {
   const CONFIG_OPTIMISTIC_LOCKS     = 'enable-locks';
   const CONFIG_IDS                  = 'id-mechanism';
   const CONFIG_TIMESTAMPS           = 'timestamps';
-  const CONFIG_AUX_GUID             = 'auxiliary-guid';
+  const CONFIG_AUX_PHID             = 'auxiliary-phid';
   const CONFIG_SERIALIZATION        = 'col-serialization';
 
   const SERIALIZATION_NONE          = 'id';
@@ -156,7 +156,7 @@ abstract class LiskDAO {
   const SERIALIZATION_PHP           = 'php';
 
   const IDS_AUTOINCREMENT           = 'ids-auto';
-  const IDS_GUID                    = 'ids-guid';
+  const IDS_PHID                    = 'ids-phid';
   const IDS_MANUAL                  = 'ids-manual';
 
   /**
@@ -208,8 +208,8 @@ abstract class LiskDAO {
    * CONFIG_IDS
    * Lisk objects need to have a unique identifying ID. The three mechanisms
    * available for generating this ID are IDS_AUTOINCREMENT (default, assumes
-   * the ID column is an autoincrement primary key), IDS_GUID (to generate a
-   * unique GUID for each object) or IDS_MANUAL (you are taking full
+   * the ID column is an autoincrement primary key), IDS_PHID (to generate a
+   * unique PHID for each object) or IDS_MANUAL (you are taking full
    * responsibility for ID management).
    *
    * CONFIG_TIMESTAMPS
@@ -218,12 +218,12 @@ abstract class LiskDAO {
    * an object. If you don't want to do this, you may disable this option.
    * By default, this option is ON.
    *
-   * CONFIG_AUX_GUID
+   * CONFIG_AUX_PHID
    * This option can be enabled by being set to some truthy value. The meaning
-   * of this value is defined by your guid generation mechanism. If this option
-   * is enabled, a `guid' property will be populated with a unique GUID when an
+   * of this value is defined by your PHID generation mechanism. If this option
+   * is enabled, a `phid' property will be populated with a unique PHID when an
    * object is created (or if it is saved and does not currently have one). You
-   * need to override generateGUID() and hook it into your GUID generation
+   * need to override generatePHID() and hook it into your PHID generation
    * mechanism for this to work. By default, this option is OFF.
    *
    * CONFIG_SERIALIZATION
@@ -554,9 +554,9 @@ abstract class LiskDAO {
         $properties['datemodified'] = 'dateModified';
       }
 
-      if (!$this->isGUIDPrimaryID() &&
-          $this->getConfigOption(self::CONFIG_AUX_GUID)) {
-        $properties['guid'] = 'guid';
+      if (!$this->isPHIDPrimaryID() &&
+          $this->getConfigOption(self::CONFIG_AUX_PHID)) {
+        $properties['phid'] = 'phid';
       }
     }
     return $properties;
@@ -792,11 +792,11 @@ abstract class LiskDAO {
       case self::IDS_AUTOINCREMENT:
         unset($data[$this->getIDKeyForUse()]);
         break;
-      case self::IDS_GUID:
+      case self::IDS_PHID:
         if (empty($data[$this->getIDKeyForUse()])) {
-          $guid = $this->generateGUID();
-          $this->setID($guid);
-          $data[$this->getIDKeyForUse()] = $guid;
+          $phid = $this->generatePHID();
+          $this->setID($phid);
+          $data[$this->getIDKeyForUse()] = $phid;
         }
         break;
       case self::IDS_MANUAL:
@@ -888,11 +888,11 @@ abstract class LiskDAO {
 
 
   /**
-   * Helper: Whether this class is configured to use GUIDs as the primary ID.
+   * Helper: Whether this class is configured to use PHIDs as the primary ID.
    * @task internal
    */
-  private function isGUIDPrimaryID() {
-    return ($this->getConfigOption(self::CONFIG_IDS) === self::IDS_GUID);
+  private function isPHIDPrimaryID() {
+    return ($this->getConfigOption(self::CONFIG_IDS) === self::IDS_PHID);
   }
 
 
@@ -906,8 +906,8 @@ abstract class LiskDAO {
    */
   public function getIDKey() {
     return
-      $this->isGUIDPrimaryID() ?
-      'guid' :
+      $this->isPHIDPrimaryID() ?
+      'phid' :
       'id';
   }
 
@@ -924,16 +924,16 @@ abstract class LiskDAO {
 
 
   /**
-   * Generate a new GUID, used by CONFIG_AUX_GUID and IDS_GUID.
+   * Generate a new PHID, used by CONFIG_AUX_PHID and IDS_PHID.
    *
-   * @return guid    Unique, newly allocated GUID.
+   * @return phid    Unique, newly allocated PHID.
    *
    * @task   hook
    */
-  protected function generateGUID() {
+  protected function generatePHID() {
     throw new Exception(
-      "To use CONFIG_AUX_GUID or IDS_GUID, you need to overload ".
-      "generateGUID() to perform GUID generation.");
+      "To use CONFIG_AUX_PHID or IDS_PHID, you need to overload ".
+      "generatePHID() to perform PHID generation.");
   }
 
 
@@ -987,14 +987,14 @@ abstract class LiskDAO {
       $this->setDateModified(time());
     }
 
-    if (($this->isGUIDPrimaryID() && !$this->getID())) {
-      // If GUIDs are the primary ID, the subclass could have overridden the
+    if (($this->isPHIDPrimaryID() && !$this->getID())) {
+      // If PHIDs are the primary ID, the subclass could have overridden the
       // name of the ID column.
-      $this->setID($this->generateGUID());
-    } else if ($this->getConfigOption(self::CONFIG_AUX_GUID) &&
-               !$this->getGUID()) {
-      // The subclass could still want GUIDs.
-      $this->setGUID($this->generateGUID());
+      $this->setID($this->generatePHID());
+    } else if ($this->getConfigOption(self::CONFIG_AUX_PHID) &&
+               !$this->getPHID()) {
+      // The subclass could still want PHIDs.
+      $this->setPHID($this->generatePHID());
     }
   }
 
diff --git a/src/view/form/control/base/AphrontFormControl.php b/src/view/form/control/base/AphrontFormControl.php
index 9fa982b131..1f078710f8 100755
--- a/src/view/form/control/base/AphrontFormControl.php
+++ b/src/view/form/control/base/AphrontFormControl.php
@@ -23,6 +23,7 @@ abstract class AphrontFormControl extends AphrontView {
   private $error;
   private $name;
   private $value;
+  private $disabled;
 
   public function setLabel($label) {
     $this->label = $label;
@@ -69,6 +70,15 @@ abstract class AphrontFormControl extends AphrontView {
     return $this->value;
   }
 
+  public function setDisabled($disabled) {
+    $this->disabled = $disabled;
+    return $this;
+  }
+
+  public function getDisabled() {
+    return $this->disabled;
+  }
+
   abstract protected function renderInput();
   abstract protected function getCustomControlClass();
 
diff --git a/src/view/form/control/select/AphrontFormSelectControl.php b/src/view/form/control/select/AphrontFormSelectControl.php
index a15eda8f49..d2ffaad74d 100755
--- a/src/view/form/control/select/AphrontFormSelectControl.php
+++ b/src/view/form/control/select/AphrontFormSelectControl.php
@@ -48,7 +48,8 @@ class AphrontFormSelectControl extends AphrontFormControl {
     return phutil_render_tag(
       'select',
       array(
-        'name'    => $this->getName(),
+        'name'      => $this->getName(),
+        'disabled'  => $this->getDisabled() ? 'disabled' : null,
       ),
       implode("\n", $options));
   }
diff --git a/src/view/form/control/submit/AphrontFormSubmitControl.php b/src/view/form/control/submit/AphrontFormSubmitControl.php
index 16dd7b9a5e..7742a20ae0 100755
--- a/src/view/form/control/submit/AphrontFormSubmitControl.php
+++ b/src/view/form/control/submit/AphrontFormSubmitControl.php
@@ -39,7 +39,8 @@ class AphrontFormSubmitControl extends AphrontFormControl {
     return phutil_render_tag(
       'button',
       array(
-        'name' => '__submit__',
+        'name'      => '__submit__',
+        'disabled'  => $this->getDisabled() ? 'disabled' : null,
       ),
       phutil_escape_html($this->getValue())).
       $this->cancelButton;
diff --git a/src/view/form/control/text/AphrontFormTextControl.php b/src/view/form/control/text/AphrontFormTextControl.php
index f62fd6f463..f8265188af 100755
--- a/src/view/form/control/text/AphrontFormTextControl.php
+++ b/src/view/form/control/text/AphrontFormTextControl.php
@@ -26,9 +26,10 @@ class AphrontFormTextControl extends AphrontFormControl {
     return phutil_render_tag(
       'input',
       array(
-        'type'    => 'text',
-        'name'    => $this->getName(),
-        'value'   => $this->getValue(),
+        'type'      => 'text',
+        'name'      => $this->getName(),
+        'value'     => $this->getValue(),
+        'disabled'  => $this->getDisabled() ? 'disabled' : null,
       ));
   }
 
diff --git a/src/view/form/control/textarea/AphrontFormTextAreaControl.php b/src/view/form/control/textarea/AphrontFormTextAreaControl.php
index f52cbeb9d6..2668b825b1 100755
--- a/src/view/form/control/textarea/AphrontFormTextAreaControl.php
+++ b/src/view/form/control/textarea/AphrontFormTextAreaControl.php
@@ -26,7 +26,8 @@ class AphrontFormTextAreaControl extends AphrontFormControl {
     return phutil_render_tag(
       'textarea',
       array(
-        'name'    => $this->getName(),
+        'name'      => $this->getName(),
+        'disabled'  => $this->getDisabled() ? 'disabled' : null,
       ),
       phutil_escape_html($this->getValue()));
   }
diff --git a/webroot/rsrc/css/base.css b/webroot/rsrc/css/base.css
index f305a544c2..4e49a892d3 100644
--- a/webroot/rsrc/css/base.css
+++ b/webroot/rsrc/css/base.css
@@ -476,6 +476,8 @@ a.small:visited {
   clear: both;
   margin-right: 25%;
   margin-left: 15%;
+  margin-top: 3px;
+  margin-bottom: 6px;
 }
 
 .aphront-error-view {