diff --git a/resources/sql/patches/021.xhpastview.sql b/resources/sql/patches/021.xhpastview.sql
new file mode 100644
index 0000000000..09ec1b16f0
--- /dev/null
+++ b/resources/sql/patches/021.xhpastview.sql
@@ -0,0 +1,9 @@
+CREATE DATABASE phabricator_xhpastview;
+CREATE TABLE phabricator_xhpastview.xhpastview_parsetree (
+  id int unsigned not null auto_increment primary key,
+  authorPHID varchar(64) binary,
+  input longblob not null,
+  stdout longblob not null,
+  dateCreated int unsigned not null,
+  dateModified int unsigned not null
+);
\ No newline at end of file
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 860271769b..3ad9d4c2c8 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -423,6 +423,16 @@ phutil_register_library_map(array(
     'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/task',
     'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/taskdata',
     'PhabricatorWorkerTaskDetailController' => 'applications/daemon/controller/workertaskdetail',
+    'PhabricatorXHPASTViewController' => 'applications/xhpastview/controller/base',
+    'PhabricatorXHPASTViewDAO' => 'applications/xhpastview/storage/base',
+    'PhabricatorXHPASTViewFrameController' => 'applications/xhpastview/controller/viewframe',
+    'PhabricatorXHPASTViewFramesetController' => 'applications/xhpastview/controller/viewframeset',
+    'PhabricatorXHPASTViewInputController' => 'applications/xhpastview/controller/viewinput',
+    'PhabricatorXHPASTViewPanelController' => 'applications/xhpastview/controller/viewpanel',
+    'PhabricatorXHPASTViewParseTree' => 'applications/xhpastview/storage/parsetree',
+    'PhabricatorXHPASTViewRunController' => 'applications/xhpastview/controller/run',
+    'PhabricatorXHPASTViewStreamController' => 'applications/xhpastview/controller/viewstream',
+    'PhabricatorXHPASTViewTreeController' => 'applications/xhpastview/controller/viewtree',
     'PhabricatorXHProfController' => 'applications/xhprof/controller/base',
     'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/profile',
     'PhabricatorXHProfProfileSymbolView' => 'applications/xhprof/view/symbol',
@@ -776,6 +786,16 @@ phutil_register_library_map(array(
     'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO',
     'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',
     'PhabricatorWorkerTaskDetailController' => 'PhabricatorDaemonController',
+    'PhabricatorXHPASTViewController' => 'PhabricatorController',
+    'PhabricatorXHPASTViewDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorXHPASTViewFrameController' => 'PhabricatorXHPASTViewController',
+    'PhabricatorXHPASTViewFramesetController' => 'PhabricatorXHPASTViewController',
+    'PhabricatorXHPASTViewInputController' => 'PhabricatorXHPASTViewPanelController',
+    'PhabricatorXHPASTViewPanelController' => 'PhabricatorXHPASTViewController',
+    'PhabricatorXHPASTViewParseTree' => 'PhabricatorXHPASTViewDAO',
+    'PhabricatorXHPASTViewRunController' => 'PhabricatorXHPASTViewController',
+    'PhabricatorXHPASTViewStreamController' => 'PhabricatorXHPASTViewPanelController',
+    'PhabricatorXHPASTViewTreeController' => 'PhabricatorXHPASTViewPanelController',
     'PhabricatorXHProfController' => 'PhabricatorController',
     'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController',
     'PhabricatorXHProfProfileSymbolView' => 'AphrontView',
diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
index dd75e97589..6264d31a51 100644
--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
@@ -268,6 +268,20 @@ class AphrontDefaultApplicationConfiguration
         'delete/(?P<id>\d+)/$' => 'PhabricatorOwnersDeleteController',
       ),
 
+      '/xhpast/' => array(
+        '$' => 'PhabricatorXHPASTViewRunController',
+        'view/(?P<id>\d+)/$'
+          => 'PhabricatorXHPASTViewFrameController',
+        'frameset/(?P<id>\d+)/$'
+          => 'PhabricatorXHPASTViewFramesetController',
+        'input/(?P<id>\d+)/$'
+          => 'PhabricatorXHPASTViewInputController',
+        'tree/(?P<id>\d+)/$'
+          => 'PhabricatorXHPASTViewTreeController',
+        'stream/(?P<id>\d+)/$'
+          => 'PhabricatorXHPASTViewStreamController',
+      ),
+
     );
   }
 
diff --git a/src/aphront/response/webpage/AphrontWebpageResponse.php b/src/aphront/response/webpage/AphrontWebpageResponse.php
index c30ebdcad3..9c29d90d31 100644
--- a/src/aphront/response/webpage/AphrontWebpageResponse.php
+++ b/src/aphront/response/webpage/AphrontWebpageResponse.php
@@ -22,21 +22,30 @@
 class AphrontWebpageResponse extends AphrontResponse {
 
   private $content;
+  private $frameable;
 
   public function setContent($content) {
     $this->content = $content;
     return $this;
   }
 
+  public function setFrameable($frameable) {
+    $this->frameable = $frameable;
+    return $this;
+  }
+
   public function buildResponseString() {
     return $this->content;
   }
 
   public function getHeaders() {
-    return array(
-      array('Content-Type',    'text/html; charset=UTF-8'),
-      array('X-Frame-Options', 'Deny'),
+    $headers = array(
+      array('Content-Type', 'text/html; charset=UTF-8'),
     );
+    if (!$this->frameable) {
+      $headers[] = array('X-Frame-Options', 'Deny');
+    }
+    return $headers;
   }
 
 }
diff --git a/src/applications/xhpastview/controller/base/PhabricatorXHPASTViewController.php b/src/applications/xhpastview/controller/base/PhabricatorXHPASTViewController.php
new file mode 100644
index 0000000000..12a60fa7d7
--- /dev/null
+++ b/src/applications/xhpastview/controller/base/PhabricatorXHPASTViewController.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.
+ */
+
+abstract class PhabricatorXHPASTViewController extends PhabricatorController {
+
+  public function buildStandardPageResponse($view, array $data) {
+
+    $page = $this->buildStandardPageView();
+
+    $page->setApplicationName('XHPASTView');
+    $page->setBaseURI('/xhpast/');
+    $page->setTitle(idx($data, 'title'));
+    $page->setGlyph("\xE2\x96\xA0");
+    $page->appendChild($view);
+
+    $response = new AphrontWebpageResponse();
+    return $response->setContent($page->render());
+  }
+
+}
diff --git a/src/applications/xhpastview/controller/base/__init__.php b/src/applications/xhpastview/controller/base/__init__.php
new file mode 100644
index 0000000000..24ef441d7c
--- /dev/null
+++ b/src/applications/xhpastview/controller/base/__init__.php
@@ -0,0 +1,15 @@
+<?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('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorXHPASTViewController.php');
diff --git a/src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php b/src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php
new file mode 100644
index 0000000000..1d3cd9d9ae
--- /dev/null
+++ b/src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php
@@ -0,0 +1,73 @@
+<?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 PhabricatorXHPASTViewRunController
+  extends PhabricatorXHPASTViewController {
+
+  public function processRequest() {
+
+    $request = $this->getRequest();
+    $user = $request->getUser();
+
+    if ($request->isFormPost()) {
+      $source = $request->getStr('source');
+
+      $future = xhpast_get_parser_future($source);
+      $resolved = $future->resolve();
+
+      // This is just to let it throw exceptions if stuff is broken.
+      $parse_tree = XHPASTTree::newFromDataAndResolvedExecFuture(
+        $source,
+        $resolved);
+
+      list($err, $stdout, $stderr) = $resolved;
+
+      $storage_tree = new PhabricatorXHPASTViewParseTree();
+      $storage_tree->setInput($source);
+      $storage_tree->setStdout($stdout);
+      $storage_tree->setAuthorPHID($user->getPHID());
+      $storage_tree->save();
+
+      return id(new AphrontRedirectResponse())
+        ->setURI('/xhpast/view/'.$storage_tree->getID().'/');
+    }
+
+    $form = id(new AphrontFormView())
+      ->setUser($user)
+      ->appendChild(
+        id(new AphrontFormTextAreaControl())
+          ->setLabel('Source')
+          ->setName('source')
+          ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue('Parse'));
+
+    $panel = new AphrontPanelView();
+    $panel->setHeader('Generate XHP AST');
+    $panel->setWidth(AphrontPanelView::WIDTH_WIDE);
+    $panel->appendChild($form);
+
+    return $this->buildStandardPageResponse(
+      $panel,
+      array(
+        'title' => 'XHPAST View',
+      ));
+  }
+
+}
diff --git a/src/applications/xhpastview/controller/run/__init__.php b/src/applications/xhpastview/controller/run/__init__.php
new file mode 100644
index 0000000000..b8cd348573
--- /dev/null
+++ b/src/applications/xhpastview/controller/run/__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/redirect');
+phutil_require_module('phabricator', 'applications/xhpastview/controller/base');
+phutil_require_module('phabricator', 'applications/xhpastview/storage/parsetree');
+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', 'parser/xhpast/api/tree');
+phutil_require_module('phutil', 'parser/xhpast/bin');
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorXHPASTViewRunController.php');
diff --git a/src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php b/src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php
new file mode 100644
index 0000000000..f8da52dbc5
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php
@@ -0,0 +1,43 @@
+<?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 PhabricatorXHPASTViewFrameController
+  extends PhabricatorXHPASTViewController {
+
+  private $id;
+
+  public function willProcessRequest(array $data) {
+    $this->id = $data['id'];
+  }
+
+  public function processRequest() {
+    $id = $this->id;
+
+    return $this->buildStandardPageResponse(
+      phutil_render_tag(
+        'iframe',
+        array(
+          'src'         => '/xhpast/frameset/'.$id.'/',
+          'frameborder' => '0',
+          'style'       => 'width: 100%; height: 800px;',
+        '')),
+      array(
+        'title' => 'XHPAST View',
+      ));
+  }
+}
diff --git a/src/applications/xhpastview/controller/viewframe/__init__.php b/src/applications/xhpastview/controller/viewframe/__init__.php
new file mode 100644
index 0000000000..64fc5e108f
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewframe/__init__.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/xhpastview/controller/base');
+
+phutil_require_module('phutil', 'markup');
+
+
+phutil_require_source('PhabricatorXHPASTViewFrameController.php');
diff --git a/src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php b/src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php
new file mode 100644
index 0000000000..dfbb022b64
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php
@@ -0,0 +1,42 @@
+<?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 PhabricatorXHPASTViewFramesetController
+  extends PhabricatorXHPASTViewController {
+
+  private $id;
+
+  public function willProcessRequest(array $data) {
+    $this->id = $data['id'];
+  }
+
+  public function processRequest() {
+    $id = $this->id;
+
+    $response = new AphrontWebpageResponse();
+    $response->setFrameable(true);
+    $response->setContent(
+      '<frameset cols="33%, 34%, 33%">'.
+        '<frame src="/xhpast/input/'.$id.'/" />'.
+        '<frame src="/xhpast/tree/'.$id.'/" />'.
+        '<frame src="/xhpast/stream/'.$id.'/" />'.
+      '</frameset>');
+
+    return $response;
+  }
+}
diff --git a/src/applications/xhpastview/controller/viewframeset/__init__.php b/src/applications/xhpastview/controller/viewframeset/__init__.php
new file mode 100644
index 0000000000..c9fcc90ee7
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewframeset/__init__.php
@@ -0,0 +1,13 @@
+<?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/xhpastview/controller/base');
+
+
+phutil_require_source('PhabricatorXHPASTViewFramesetController.php');
diff --git a/src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php b/src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php
new file mode 100644
index 0000000000..c16873769e
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php
@@ -0,0 +1,27 @@
+<?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 PhabricatorXHPASTViewInputController
+  extends PhabricatorXHPASTViewPanelController {
+
+  public function processRequest() {
+    $input = $this->getStorageTree()->getInput();
+    return $this->buildXHPASTViewPanelResponse(
+      phutil_escape_html($input));
+  }
+}
diff --git a/src/applications/xhpastview/controller/viewinput/__init__.php b/src/applications/xhpastview/controller/viewinput/__init__.php
new file mode 100644
index 0000000000..95153c75f8
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewinput/__init__.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/xhpastview/controller/viewpanel');
+
+phutil_require_module('phutil', 'markup');
+
+
+phutil_require_source('PhabricatorXHPASTViewInputController.php');
diff --git a/src/applications/xhpastview/controller/viewpanel/PhabricatorXHPASTViewPanelController.php b/src/applications/xhpastview/controller/viewpanel/PhabricatorXHPASTViewPanelController.php
new file mode 100644
index 0000000000..25bcd23082
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewpanel/PhabricatorXHPASTViewPanelController.php
@@ -0,0 +1,87 @@
+<?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 PhabricatorXHPASTViewPanelController
+  extends PhabricatorXHPASTViewController {
+
+  private $id;
+  private $tree;
+
+  public function willProcessRequest(array $data) {
+    $this->id = $data['id'];
+    $this->storageTree = id(new PhabricatorXHPASTViewParseTree())
+      ->load($this->id);
+    if (!$this->storageTree) {
+      throw new Exception("No such AST!");
+    }
+  }
+
+  protected function getStorageTree() {
+    return $this->storageTree;
+  }
+
+  protected function buildXHPASTViewPanelResponse($content) {
+    $content =
+      '<!DOCTYPE html>'.
+      '<html>'.
+        '<head>'.
+          '<style type="text/css">
+body {
+  white-space: pre;
+  font: 10px "Monaco";
+  cursor: pointer;
+}
+
+.token {
+  padding: 2px 4px;
+  margin: 2px 2px;
+  border: 1px solid #bbbbbb;
+  line-height: 24px;
+}
+
+ul {
+  margin: 0 0 0 1em;
+  padding: 0;
+  list-style: none;
+  line-height: 1em;
+}
+
+li {
+  margin: 0;
+  padding: 0;
+}
+
+li span {
+  background: #dddddd;
+  padding: 3px 6px;
+}
+
+          </style>'.
+        '</head>'.
+        '<body>'.
+          $content.
+        '</body>'.
+      '</html>';
+
+    $response = new AphrontWebpageResponse();
+    $response->setFrameable(true);
+    $response->setContent($content);
+    return $response;
+  }
+
+}
diff --git a/src/applications/xhpastview/controller/viewpanel/__init__.php b/src/applications/xhpastview/controller/viewpanel/__init__.php
new file mode 100644
index 0000000000..f6cf718b9d
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewpanel/__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/xhpastview/controller/base');
+phutil_require_module('phabricator', 'applications/xhpastview/storage/parsetree');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorXHPASTViewPanelController.php');
diff --git a/src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php b/src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php
new file mode 100644
index 0000000000..ca8dd96087
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php
@@ -0,0 +1,48 @@
+<?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 PhabricatorXHPASTViewStreamController
+  extends PhabricatorXHPASTViewPanelController {
+
+  public function processRequest() {
+    $storage = $this->getStorageTree();
+    $input = $storage->getInput();
+    $stdout = $storage->getStdout();
+
+    $tree = XHPASTTree::newFromDataAndResolvedExecFuture(
+      $input,
+      array(0, $stdout, ''));
+
+    $tokens = array();
+    foreach ($tree->getRawTokenStream() as $id => $token) {
+      $seq = $id;
+      $name = $token->getTypeName();
+      $title = "Token {$seq}: {$name}";
+
+      $tokens[] = phutil_render_tag(
+        'span',
+        array(
+          'title' => $title,
+          'class' => 'token',
+        ),
+        phutil_escape_html($token->getValue()));
+    }
+
+    return $this->buildXHPASTViewPanelResponse(implode('', $tokens));
+  }
+}
diff --git a/src/applications/xhpastview/controller/viewstream/__init__.php b/src/applications/xhpastview/controller/viewstream/__init__.php
new file mode 100644
index 0000000000..de768b5532
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewstream/__init__.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/xhpastview/controller/viewpanel');
+
+phutil_require_module('phutil', 'markup');
+phutil_require_module('phutil', 'parser/xhpast/api/tree');
+
+
+phutil_require_source('PhabricatorXHPASTViewStreamController.php');
diff --git a/src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php b/src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php
new file mode 100644
index 0000000000..49243f09ad
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php
@@ -0,0 +1,61 @@
+<?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 PhabricatorXHPASTViewTreeController
+  extends PhabricatorXHPASTViewPanelController {
+
+  public function processRequest() {
+    $storage = $this->getStorageTree();
+    $input = $storage->getInput();
+    $stdout = $storage->getStdout();
+
+    $tree = XHPASTTree::newFromDataAndResolvedExecFuture(
+      $input,
+      array(0, $stdout, ''));
+
+    $tree = '<ul>'.$this->buildTree($tree->getRootNode()).'</ul>';
+    return $this->buildXHPASTViewPanelResponse($tree);
+  }
+
+  protected function buildTree($root) {
+
+    try {
+      $name = $root->getTypeName();
+      $title = $root->getDescription();
+    } catch (Exception $ex) {
+      $name = '???';
+      $title = '???';
+    }
+
+    $tree = array();
+    $tree[] =
+      '<li>'.
+        phutil_render_tag(
+          'span',
+          array(
+            'title' => $title,
+          ),
+          phutil_escape_html($name)).
+      '</li>';
+    foreach ($root->getChildren() as $child) {
+      $tree[] = '<ul>'.$this->buildTree($child).'</ul>';
+    }
+    return implode("\n", $tree);
+  }
+
+}
diff --git a/src/applications/xhpastview/controller/viewtree/__init__.php b/src/applications/xhpastview/controller/viewtree/__init__.php
new file mode 100644
index 0000000000..847f53a70d
--- /dev/null
+++ b/src/applications/xhpastview/controller/viewtree/__init__.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/xhpastview/controller/viewpanel');
+
+phutil_require_module('phutil', 'markup');
+phutil_require_module('phutil', 'parser/xhpast/api/tree');
+
+
+phutil_require_source('PhabricatorXHPASTViewTreeController.php');
diff --git a/src/applications/xhpastview/storage/base/PhabricatorXHPASTViewDAO.php b/src/applications/xhpastview/storage/base/PhabricatorXHPASTViewDAO.php
new file mode 100644
index 0000000000..5dd338dba0
--- /dev/null
+++ b/src/applications/xhpastview/storage/base/PhabricatorXHPASTViewDAO.php
@@ -0,0 +1,24 @@
+<?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 PhabricatorXHPASTViewDAO extends PhabricatorLiskDAO {
+
+  public function getApplicationName() {
+    return 'xhpastview';
+  }
+}
diff --git a/src/applications/xhpastview/storage/base/__init__.php b/src/applications/xhpastview/storage/base/__init__.php
new file mode 100644
index 0000000000..818cc8df2a
--- /dev/null
+++ b/src/applications/xhpastview/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('PhabricatorXHPASTViewDAO.php');
diff --git a/src/applications/xhpastview/storage/parsetree/PhabricatorXHPASTViewParseTree.php b/src/applications/xhpastview/storage/parsetree/PhabricatorXHPASTViewParseTree.php
new file mode 100644
index 0000000000..c53ee68355
--- /dev/null
+++ b/src/applications/xhpastview/storage/parsetree/PhabricatorXHPASTViewParseTree.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 PhabricatorXHPASTViewParseTree extends PhabricatorXHPASTViewDAO {
+
+  protected $authorPHID;
+
+  protected $input;
+  protected $stdout;
+}
diff --git a/src/applications/xhpastview/storage/parsetree/__init__.php b/src/applications/xhpastview/storage/parsetree/__init__.php
new file mode 100644
index 0000000000..0e041754cc
--- /dev/null
+++ b/src/applications/xhpastview/storage/parsetree/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/xhpastview/storage/base');
+
+
+phutil_require_source('PhabricatorXHPASTViewParseTree.php');
diff --git a/webroot/index.php b/webroot/index.php
index 5b733544b1..48c03b3917 100644
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -59,9 +59,9 @@ try {
 
   phutil_require_module('phabricator', 'aphront/console/plugin/errorlog/api');
   set_error_handler(
-    array('DarkConsoleErrorLogPluginAPI', 'handleError'));
+    array('PhutilErrorHandler', 'handleError'));
   set_exception_handler(
-    array('DarkConsoleErrorLogPluginAPI', 'handleException'));
+    array('PhutilErrorHandler', 'handleException'));
 } catch (Exception $ex) {
   phabricator_fatal_config_error(
     "[Exception] ".$ex->getMessage());