diff --git a/src/storage/SemiStructuredObjectInstance.php b/src/storage/SemiStructuredObjectInstance.php
index 49347b5..78e0586 100644
--- a/src/storage/SemiStructuredObjectInstance.php
+++ b/src/storage/SemiStructuredObjectInstance.php
@@ -1,179 +1,180 @@
 <?php
 
 final class SemiStructuredObjectInstance extends SemiStructuredDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorApplicationTransactionInterface,
     PhabricatorSubscribableInterface,
     PhabricatorFlaggableInterface,
+    PhabricatorProjectInterface,
     PhabricatorMentionableInterface,
     // PhabricatorConduitResultInterface,
     PhabricatorCustomFieldInterface,
     PhabricatorDestructibleInterface {
 
 
   protected $classPHID;
   protected $status;
   protected $name;
   protected $rawData;
   protected $description;
 
 
   const STATUS_ACTIVE = 'active';
   const STATUS_ARCHIVED = 'archived';
 
   private $class = self::ATTACHABLE;
   private $customFields = self::ATTACHABLE;
 
   public static function initializeNewObjectInstance(
       PhabricatorUser $actor,
       SemiStructuredObjectType $object_class = null) {
 
     $object = id(new self())
     // ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy()) // TODO take policies from class?
     // ->setEditPolicy($actor->getPHID())
     ->setStatus(self::STATUS_ACTIVE);
 
     if ($object_class !== null) {
       $object
         ->setClassPHID($object_class->getPHID())
         ->attachClass($object_class);
     }
 
     return $object;
   }
 
   public function attachClass(
       SemiStructuredObjectType $object_class = null) {
     $this->class = $object_class;
     return $this;
   }
 
   public function getClass() {
     return $this->assertAttached($this->class);
   }
 
   public function hasAttachedClass() {
     return $this->class !== self::ATTACHABLE;
   }
 
   public function getURI() {
     return urisprintf('/semistruct/instance/%d/', $this->getID());
   }
 
 
   public function getIcon() {
     // TODO customize in Type
     return 'fa-dribbble';
   }
 
   public static function getStatusNameMap() {
     return array(
       // TODO remove this
       self::STATUS_ACTIVE => pht('Active'),
       self::STATUS_ARCHIVED => pht('Archived'),
     );
   }
 
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'rawData' => self::SERIALIZATION_JSON,
       ),
       self::CONFIG_COLUMN_SCHEMA => array(
         'name' => 'sort255',
         'description' => 'text',
         'status' => 'text32',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'classPHID' => array(
           'columns' => array('classPHID'),
         ),
       ),
     ) + parent::getConfiguration();
   }
 
 
   public function getPHIDType() {
     return SemiStructuredObjectInstancePHIDType::TYPECONST;
   }
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 
   public function getApplicationTransactionEditor() {
     return new SemiStructuredObjectInstanceTransactionEditor();
   }
 
   public function getApplicationTransactionTemplate() {
     return new SemiStructuredObjectInstanceTransaction();
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
 return ''; // TODO
     switch ($capability) {
       // TODO
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return true;
   }
 
   /* -(  PhabricatorCustomFieldInterface  )------------------------------------ */
 
 
   public function getCustomFieldSpecificationForRole($role) {
     return PhabricatorEnv::getEnvConfig('user.fields');
   }
 
   public function getCustomFieldBaseClass() {
     return 'SemiStructuredInstanceCustomField';
   }
 
   public function getCustomFields() {
     return $this->assertAttached($this->customFields);
   }
 
   public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
     $this->customFields = $fields;
     return $this;
   }
 
 
 /* -(  PhabricatorDestructibleInterface  )----------------------------------- */
 
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
       $this->delete();
     $this->saveTransaction();
   }
 
 
 /* -(  PhabricatorSubscribableInterface  )----------------------------------- */
 
 
   public function isAutomaticallySubscribed($phid) {
     return false;
   }
 
 }
diff --git a/src/storage/SemiStructuredObjectType.php b/src/storage/SemiStructuredObjectType.php
index 3ce4729..d97e745 100644
--- a/src/storage/SemiStructuredObjectType.php
+++ b/src/storage/SemiStructuredObjectType.php
@@ -1,154 +1,155 @@
 <?php
 
 final class SemiStructuredObjectType extends SemiStructuredDAO
   implements
     PhabricatorPolicyInterface,
     PhabricatorApplicationTransactionInterface,
     // PhabricatorMarkupInterface, ?
     PhabricatorMentionableInterface,
     PhabricatorSubscribableInterface,
+    PhabricatorProjectInterface,
     // PhabricatorConduitResultInterface
     PhabricatorFlaggableInterface,
     PhabricatorDestructibleInterface,
     PhabricatorFerretInterface {
 
 
   protected $viewPolicy;
   protected $editPolicy;
 
   protected $name;
   protected $status;
   protected $description;
 
   protected $customFieldsConfig = array();
 // icon/logo
 
 
 
   const STATUS_ACTIVE = 'active';
   const STATUS_ARCHIVED = 'archived';
 
 
   public static function initializeNewObjectType(PhabricatorUser $actor) {
     return id(new self())
       ->setName('')
       ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
       ->setEditPolicy($actor->getPHID())
       ->setStatus(self::STATUS_ACTIVE);
   }
 
 
   public function getCustomFieldsConfig() {
     if (!$this->customFieldsConfig) {
       return array();
     }
     return $this->customFieldsConfig;
   }
 
   public static function getStatusNameMap() {
     return array(
       self::STATUS_ACTIVE => pht('Active'),
       self::STATUS_ARCHIVED => pht('Archived'),
     );
   }
 
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'customFieldsConfig' => self::SERIALIZATION_JSON,
       ),
       self::CONFIG_COLUMN_SCHEMA => array(
         'name' => 'sort255',
         'status' => 'text32',
         'description' => 'text',
       ),
     ) + parent::getConfiguration();
   }
 
   public function getPHIDType() {
     return SemiStructuredObjectTypePHIDType::TYPECONST;
   }
 
   public function isArchived() {
     return ($this->getStatus() == self::STATUS_ARCHIVED);
   }
 
   public function getURI() {
     return urisprintf('/semistruct/type/%d/', $this->getID());
   }
 
   public function getObjectName() {
     return pht('Object Type %d', $this->getID());
   }
 
   public function getIcon() {
     // TODO copy the feature from Projects, where you can put a custom image
     // or select from a list.
     return 'fa-camera';
   }
 
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 
   public function getApplicationTransactionEditor() {
     return new SemiStructuredObjectTypeTransactionEditor();
   }
 
   public function getApplicationTransactionTemplate() {
     return new SemiStructuredObjectTypeTransaction();
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
       // TODO can-create-instances
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
 
 /* -(  PhabricatorDestructibleInterface  )----------------------------------- */
 
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
       $this->delete();
     $this->saveTransaction();
   }
 
 
 /* -(  PhabricatorSubscribableInterface  )----------------------------------- */
 
   public function isAutomaticallySubscribed($phid) {
     return false;
   }
 
 
 /* -(  PhabricatorFerretInterface  )----------------------------------------- */
 
   public function newFerretEngine() {
     return new SemiStructuredObjectTypeFerretEngine();
   }
 
 }