diff --git a/.divinerconfig b/.divinerconfig
index 26acb29e01..e6d9ecae96 100644
--- a/.divinerconfig
+++ b/.divinerconfig
@@ -11,13 +11,17 @@
     "differential" : "Differential (Code Review)",
     "diffusion" : "Diffusion (Repository Browser)",
     "maniphest" : "Maniphest (Task Tracking)",
+    "slowvote" : "Slowvote (Polls)",
     "herald" : "Herald (Notifications)",
     "conduit" : "Conduit (Phabricator HTTP API)",
     "celerity" : "Celerity (CSS/JS Management)",
+    "phriction" : "Phriction (Wiki)",
     "aphront" : "Aphront (Web Stack)",
     "console" : "DarkConsole (Debugging Console)",
     "storage" : "Storage",
     "filestorage" : "File Storage",
+    "search" : "Search",
+    "daemon" : "Daemons, Tasks and Workers",
     "irc" : "IRC",
     "markup" : "Remarkup Extensions"
   },
diff --git a/src/aphront/console/api/DarkConsole.php b/src/aphront/console/api/DarkConsole.php
index df64e2f50a..24dcfd2851 100644
--- a/src/aphront/console/api/DarkConsole.php
+++ b/src/aphront/console/api/DarkConsole.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 class DarkConsole {
 
 }
diff --git a/src/aphront/console/controller/DarkConsoleController.php b/src/aphront/console/controller/DarkConsoleController.php
index fb740f8374..92bc1be753 100644
--- a/src/aphront/console/controller/DarkConsoleController.php
+++ b/src/aphront/console/controller/DarkConsoleController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 class DarkConsoleController extends PhabricatorController {
 
   protected $op;
diff --git a/src/aphront/console/core/DarkConsoleCore.php b/src/aphront/console/core/DarkConsoleCore.php
index 2b9582f28c..c7f43cb058 100644
--- a/src/aphront/console/core/DarkConsoleCore.php
+++ b/src/aphront/console/core/DarkConsoleCore.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 final class DarkConsoleCore {
 
   const PLUGIN_ERRORLOG     = 'ErrorLog';
@@ -57,7 +60,6 @@ final class DarkConsoleCore {
 
   public static function newPlugin($plugin) {
     $class = 'DarkConsole'.$plugin.'Plugin';
-    PhutilSymbolLoader::loadClass($class);
     return newv($class, array());
   }
 
diff --git a/src/aphront/console/plugin/base/DarkConsolePlugin.php b/src/aphront/console/plugin/base/DarkConsolePlugin.php
index 5fe185d105..142d1aafab 100644
--- a/src/aphront/console/plugin/base/DarkConsolePlugin.php
+++ b/src/aphront/console/plugin/base/DarkConsolePlugin.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 abstract class DarkConsolePlugin {
 
   private $data;
diff --git a/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php b/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php
index 2e9a45bb3a..1ec5610ae8 100644
--- a/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php
+++ b/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 class DarkConsoleConfigPlugin extends DarkConsolePlugin {
 
   public function getName() {
diff --git a/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php b/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php
index a3352c5023..ba3f6dc87a 100644
--- a/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php
+++ b/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 class DarkConsoleErrorLogPlugin extends DarkConsolePlugin {
 
   public function getName() {
diff --git a/src/aphront/console/plugin/errorlog/api/DarkConsoleErrorLogPluginAPI.php b/src/aphront/console/plugin/errorlog/api/DarkConsoleErrorLogPluginAPI.php
index 7a30048342..d56799c24c 100644
--- a/src/aphront/console/plugin/errorlog/api/DarkConsoleErrorLogPluginAPI.php
+++ b/src/aphront/console/plugin/errorlog/api/DarkConsoleErrorLogPluginAPI.php
@@ -16,7 +16,9 @@
  * limitations under the License.
  */
 
-
+/**
+ * @group console
+ */
 class DarkConsoleErrorLogPluginAPI {
 
   private static $errors = array();
diff --git a/src/aphront/console/plugin/request/DarkConsoleRequestPlugin.php b/src/aphront/console/plugin/request/DarkConsoleRequestPlugin.php
index 77dea1566c..ef225391c8 100644
--- a/src/aphront/console/plugin/request/DarkConsoleRequestPlugin.php
+++ b/src/aphront/console/plugin/request/DarkConsoleRequestPlugin.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 class DarkConsoleRequestPlugin extends DarkConsolePlugin {
 
   public function getName() {
diff --git a/src/aphront/console/plugin/services/DarkConsoleServicesPlugin.php b/src/aphront/console/plugin/services/DarkConsoleServicesPlugin.php
index 270518eb2f..444ac22d8a 100644
--- a/src/aphront/console/plugin/services/DarkConsoleServicesPlugin.php
+++ b/src/aphront/console/plugin/services/DarkConsoleServicesPlugin.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 class DarkConsoleServicesPlugin extends DarkConsolePlugin {
 
   protected $observations;
diff --git a/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPlugin.php b/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPlugin.php
index 31550e98a2..f1ebdcf85c 100644
--- a/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPlugin.php
+++ b/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPlugin.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 class DarkConsoleXHProfPlugin extends DarkConsolePlugin {
 
   protected $xhprofID;
diff --git a/src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php b/src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php
index 67791d6f8e..9769b3a00b 100644
--- a/src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php
+++ b/src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group console
+ */
 final class DarkConsoleXHProfPluginAPI {
 
   private static $profilerStarted;
diff --git a/src/applications/phriction/constants/action/PhrictionActionConstants.php b/src/applications/phriction/constants/action/PhrictionActionConstants.php
index 2a02c2474b..90005e30c4 100644
--- a/src/applications/phriction/constants/action/PhrictionActionConstants.php
+++ b/src/applications/phriction/constants/action/PhrictionActionConstants.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionActionConstants extends PhrictionConstants {
 
   const ACTION_CREATE   = 'create';
diff --git a/src/applications/phriction/constants/base/PhrictionConstants.php b/src/applications/phriction/constants/base/PhrictionConstants.php
index d6f60d7956..76f98e4109 100644
--- a/src/applications/phriction/constants/base/PhrictionConstants.php
+++ b/src/applications/phriction/constants/base/PhrictionConstants.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 abstract class PhrictionConstants {
 
 }
diff --git a/src/applications/phriction/controller/base/PhrictionController.php b/src/applications/phriction/controller/base/PhrictionController.php
index ddb3a5421d..ed9f86f565 100644
--- a/src/applications/phriction/controller/base/PhrictionController.php
+++ b/src/applications/phriction/controller/base/PhrictionController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 abstract class PhrictionController extends PhabricatorController {
 
   public function buildStandardPageResponse($view, array $data) {
diff --git a/src/applications/phriction/controller/diff/PhrictionDiffController.php b/src/applications/phriction/controller/diff/PhrictionDiffController.php
index 7795200be7..ba1d719aab 100644
--- a/src/applications/phriction/controller/diff/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/diff/PhrictionDiffController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionDiffController
   extends PhrictionController {
 
diff --git a/src/applications/phriction/controller/document/PhrictionDocumentController.php b/src/applications/phriction/controller/document/PhrictionDocumentController.php
index 458c4f3e57..30b1150d02 100644
--- a/src/applications/phriction/controller/document/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/document/PhrictionDocumentController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionDocumentController
   extends PhrictionController {
 
diff --git a/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php b/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php
index a534eeb044..6fa3243f18 100644
--- a/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php
+++ b/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionDocumentPreviewController
   extends PhrictionController {
 
diff --git a/src/applications/phriction/controller/edit/PhrictionEditController.php b/src/applications/phriction/controller/edit/PhrictionEditController.php
index 1646db29cd..cfbbbd8dbd 100644
--- a/src/applications/phriction/controller/edit/PhrictionEditController.php
+++ b/src/applications/phriction/controller/edit/PhrictionEditController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionEditController
   extends PhrictionController {
 
diff --git a/src/applications/phriction/controller/history/PhrictionHistoryController.php b/src/applications/phriction/controller/history/PhrictionHistoryController.php
index 599d6507db..0c8d1c12c1 100644
--- a/src/applications/phriction/controller/history/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/history/PhrictionHistoryController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionHistoryController
   extends PhrictionController {
 
diff --git a/src/applications/phriction/controller/list/PhrictionListController.php b/src/applications/phriction/controller/list/PhrictionListController.php
index b1c377469b..48118ba2af 100644
--- a/src/applications/phriction/controller/list/PhrictionListController.php
+++ b/src/applications/phriction/controller/list/PhrictionListController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionListController
   extends PhrictionController {
 
diff --git a/src/applications/phriction/editor/document/PhrictionDocumentEditor.php b/src/applications/phriction/editor/document/PhrictionDocumentEditor.php
index 2db32e05b3..55945d9477 100644
--- a/src/applications/phriction/editor/document/PhrictionDocumentEditor.php
+++ b/src/applications/phriction/editor/document/PhrictionDocumentEditor.php
@@ -18,6 +18,8 @@
 
 /**
  * Create or update Phriction documents.
+ *
+ * @group phriction
  */
 final class PhrictionDocumentEditor {
 
diff --git a/src/applications/phriction/storage/base/PhrictionDAO.php b/src/applications/phriction/storage/base/PhrictionDAO.php
index 739989411f..4b257a5ba8 100644
--- a/src/applications/phriction/storage/base/PhrictionDAO.php
+++ b/src/applications/phriction/storage/base/PhrictionDAO.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 abstract class PhrictionDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
diff --git a/src/applications/phriction/storage/content/PhrictionContent.php b/src/applications/phriction/storage/content/PhrictionContent.php
index 737dbb70df..ba486a4006 100644
--- a/src/applications/phriction/storage/content/PhrictionContent.php
+++ b/src/applications/phriction/storage/content/PhrictionContent.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionContent extends PhrictionDAO {
 
   protected $id;
diff --git a/src/applications/phriction/storage/document/PhrictionDocument.php b/src/applications/phriction/storage/document/PhrictionDocument.php
index 8dc1cb164f..614f6b2dcd 100644
--- a/src/applications/phriction/storage/document/PhrictionDocument.php
+++ b/src/applications/phriction/storage/document/PhrictionDocument.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group phriction
+ */
 class PhrictionDocument extends PhrictionDAO {
 
   protected $id;
diff --git a/src/applications/phriction/storage/document/__tests__/PhrictionDocumentTestCase.php b/src/applications/phriction/storage/document/__tests__/PhrictionDocumentTestCase.php
index fb25732e02..e21a0b99d4 100644
--- a/src/applications/phriction/storage/document/__tests__/PhrictionDocumentTestCase.php
+++ b/src/applications/phriction/storage/document/__tests__/PhrictionDocumentTestCase.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * @group markup
+ * @group phriction
  */
 class PhrictionDocumentTestCase extends PhabricatorTestCase {
 
diff --git a/src/applications/search/constants/field/PhabricatorSearchField.php b/src/applications/search/constants/field/PhabricatorSearchField.php
index 28fefba104..40c7e39a11 100644
--- a/src/applications/search/constants/field/PhabricatorSearchField.php
+++ b/src/applications/search/constants/field/PhabricatorSearchField.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 final class PhabricatorSearchField {
 
   const FIELD_TITLE         = 'titl';
diff --git a/src/applications/search/constants/relationship/PhabricatorSearchRelationship.php b/src/applications/search/constants/relationship/PhabricatorSearchRelationship.php
index 6e86eaa0ba..de0e5d97f2 100644
--- a/src/applications/search/constants/relationship/PhabricatorSearchRelationship.php
+++ b/src/applications/search/constants/relationship/PhabricatorSearchRelationship.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 final class PhabricatorSearchRelationship {
 
   const RELATIONSHIP_AUTHOR     = 'auth';
diff --git a/src/applications/search/controller/attach/PhabricatorSearchAttachController.php b/src/applications/search/controller/attach/PhabricatorSearchAttachController.php
index 0e566e3f90..f5e3e6a2c3 100644
--- a/src/applications/search/controller/attach/PhabricatorSearchAttachController.php
+++ b/src/applications/search/controller/attach/PhabricatorSearchAttachController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchAttachController extends PhabricatorSearchController {
 
   private $phid;
diff --git a/src/applications/search/controller/base/PhabricatorSearchBaseController.php b/src/applications/search/controller/base/PhabricatorSearchBaseController.php
index 1917d13665..a7e289789c 100644
--- a/src/applications/search/controller/base/PhabricatorSearchBaseController.php
+++ b/src/applications/search/controller/base/PhabricatorSearchBaseController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 abstract class PhabricatorSearchBaseController extends PhabricatorController {
 
   public function buildStandardPageResponse($view, array $data) {
diff --git a/src/applications/search/controller/index/PhabricatorSearchIndexController.php b/src/applications/search/controller/index/PhabricatorSearchIndexController.php
index f6e08e7178..208a5e6430 100644
--- a/src/applications/search/controller/index/PhabricatorSearchIndexController.php
+++ b/src/applications/search/controller/index/PhabricatorSearchIndexController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchIndexController extends PhabricatorSearchBaseController {
 
   private $phid;
diff --git a/src/applications/search/controller/search/PhabricatorSearchController.php b/src/applications/search/controller/search/PhabricatorSearchController.php
index e70d7cffde..6fcd15496f 100644
--- a/src/applications/search/controller/search/PhabricatorSearchController.php
+++ b/src/applications/search/controller/search/PhabricatorSearchController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchController extends PhabricatorSearchBaseController {
 
   private $id;
diff --git a/src/applications/search/controller/select/PhabricatorSearchSelectController.php b/src/applications/search/controller/select/PhabricatorSearchSelectController.php
index 0d11a702d7..aa6ee22b93 100644
--- a/src/applications/search/controller/select/PhabricatorSearchSelectController.php
+++ b/src/applications/search/controller/select/PhabricatorSearchSelectController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchSelectController
   extends PhabricatorSearchController {
 
diff --git a/src/applications/search/engine/mysql/PhabricatorSearchEngineMySQL.php b/src/applications/search/engine/mysql/PhabricatorSearchEngineMySQL.php
index 8097d5799f..76c40345bc 100644
--- a/src/applications/search/engine/mysql/PhabricatorSearchEngineMySQL.php
+++ b/src/applications/search/engine/mysql/PhabricatorSearchEngineMySQL.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 final class PhabricatorSearchEngineMySQL extends PhabricatorSearchEngine {
 
   public function reindexAbstractDocument(
diff --git a/src/applications/search/index/abstractdocument/PhabricatorSearchAbstractDocument.php b/src/applications/search/index/abstractdocument/PhabricatorSearchAbstractDocument.php
index b66464a9de..97cad5007f 100644
--- a/src/applications/search/index/abstractdocument/PhabricatorSearchAbstractDocument.php
+++ b/src/applications/search/index/abstractdocument/PhabricatorSearchAbstractDocument.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 final class PhabricatorSearchAbstractDocument {
 
   private $phid;
diff --git a/src/applications/search/index/indexer/base/PhabricatorSearchDocumentIndexer.php b/src/applications/search/index/indexer/base/PhabricatorSearchDocumentIndexer.php
index e47130734a..d2d9c8458e 100644
--- a/src/applications/search/index/indexer/base/PhabricatorSearchDocumentIndexer.php
+++ b/src/applications/search/index/indexer/base/PhabricatorSearchDocumentIndexer.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 abstract class PhabricatorSearchDocumentIndexer {
 
   // TODO: Make this whole class tree concrete?
diff --git a/src/applications/search/index/indexer/differential/PhabricatorSearchDifferentialIndexer.php b/src/applications/search/index/indexer/differential/PhabricatorSearchDifferentialIndexer.php
index 5c974b0a92..a2bea4d003 100644
--- a/src/applications/search/index/indexer/differential/PhabricatorSearchDifferentialIndexer.php
+++ b/src/applications/search/index/indexer/differential/PhabricatorSearchDifferentialIndexer.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchDifferentialIndexer
   extends PhabricatorSearchDocumentIndexer {
 
diff --git a/src/applications/search/index/indexer/maniphest/PhabricatorSearchManiphestIndexer.php b/src/applications/search/index/indexer/maniphest/PhabricatorSearchManiphestIndexer.php
index c9925762eb..b88b5d9b94 100644
--- a/src/applications/search/index/indexer/maniphest/PhabricatorSearchManiphestIndexer.php
+++ b/src/applications/search/index/indexer/maniphest/PhabricatorSearchManiphestIndexer.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchManiphestIndexer
   extends PhabricatorSearchDocumentIndexer {
 
diff --git a/src/applications/search/index/indexer/phriction/PhabricatorSearchPhrictionIndexer.php b/src/applications/search/index/indexer/phriction/PhabricatorSearchPhrictionIndexer.php
index ae1b3575da..dcceaaae4b 100644
--- a/src/applications/search/index/indexer/phriction/PhabricatorSearchPhrictionIndexer.php
+++ b/src/applications/search/index/indexer/phriction/PhabricatorSearchPhrictionIndexer.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchPhrictionIndexer
   extends PhabricatorSearchDocumentIndexer {
 
diff --git a/src/applications/search/index/indexer/repository/PhabricatorSearchCommitIndexer.php b/src/applications/search/index/indexer/repository/PhabricatorSearchCommitIndexer.php
index e85005a69a..6a5cdb42b4 100644
--- a/src/applications/search/index/indexer/repository/PhabricatorSearchCommitIndexer.php
+++ b/src/applications/search/index/indexer/repository/PhabricatorSearchCommitIndexer.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchCommitIndexer
   extends PhabricatorSearchDocumentIndexer {
 
diff --git a/src/applications/search/index/indexer/user/PhabricatorSearchUserIndexer.php b/src/applications/search/index/indexer/user/PhabricatorSearchUserIndexer.php
index 28178536e3..031d5f4294 100644
--- a/src/applications/search/index/indexer/user/PhabricatorSearchUserIndexer.php
+++ b/src/applications/search/index/indexer/user/PhabricatorSearchUserIndexer.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchUserIndexer
   extends PhabricatorSearchDocumentIndexer {
 
diff --git a/src/applications/search/selector/base/PhabricatorSearchEngineSelector.php b/src/applications/search/selector/base/PhabricatorSearchEngineSelector.php
index 8f1a3ab875..ec5c2c0e1d 100644
--- a/src/applications/search/selector/base/PhabricatorSearchEngineSelector.php
+++ b/src/applications/search/selector/base/PhabricatorSearchEngineSelector.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 abstract class PhabricatorSearchEngineSelector {
 
   final public function __construct() {
diff --git a/src/applications/search/selector/default/PhabricatorDefaultSearchEngineSelector.php b/src/applications/search/selector/default/PhabricatorDefaultSearchEngineSelector.php
index 2ee990260c..d0b56689fc 100644
--- a/src/applications/search/selector/default/PhabricatorDefaultSearchEngineSelector.php
+++ b/src/applications/search/selector/default/PhabricatorDefaultSearchEngineSelector.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 final class PhabricatorDefaultSearchEngineSelector
   extends PhabricatorSearchEngineSelector {
 
diff --git a/src/applications/search/storage/base/PhabricatorSearchDAO.php b/src/applications/search/storage/base/PhabricatorSearchDAO.php
index 459f6a6f3b..a7f4739e23 100644
--- a/src/applications/search/storage/base/PhabricatorSearchDAO.php
+++ b/src/applications/search/storage/base/PhabricatorSearchDAO.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 abstract class PhabricatorSearchDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
diff --git a/src/applications/search/storage/document/document/PhabricatorSearchDocument.php b/src/applications/search/storage/document/document/PhabricatorSearchDocument.php
index 646a61b4ed..a0837c373f 100644
--- a/src/applications/search/storage/document/document/PhabricatorSearchDocument.php
+++ b/src/applications/search/storage/document/document/PhabricatorSearchDocument.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchDocument extends PhabricatorSearchDAO {
 
   protected $phid;
diff --git a/src/applications/search/storage/document/field/PhabricatorSearchDocumentField.php b/src/applications/search/storage/document/field/PhabricatorSearchDocumentField.php
index bc49d3ea4e..86e03b45f9 100644
--- a/src/applications/search/storage/document/field/PhabricatorSearchDocumentField.php
+++ b/src/applications/search/storage/document/field/PhabricatorSearchDocumentField.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchDocumentField extends PhabricatorSearchDAO {
 
   protected $phid;
diff --git a/src/applications/search/storage/document/relationship/PhabricatorSearchDocumentRelationship.php b/src/applications/search/storage/document/relationship/PhabricatorSearchDocumentRelationship.php
index 21c8158603..6985799512 100644
--- a/src/applications/search/storage/document/relationship/PhabricatorSearchDocumentRelationship.php
+++ b/src/applications/search/storage/document/relationship/PhabricatorSearchDocumentRelationship.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchDocumentRelationship extends PhabricatorSearchDAO {
 
   protected $phid;
diff --git a/src/applications/search/storage/query/PhabricatorSearchQuery.php b/src/applications/search/storage/query/PhabricatorSearchQuery.php
index cf41167e1a..135750822d 100644
--- a/src/applications/search/storage/query/PhabricatorSearchQuery.php
+++ b/src/applications/search/storage/query/PhabricatorSearchQuery.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 class PhabricatorSearchQuery extends PhabricatorSearchDAO {
 
   protected $authorPHID;
diff --git a/src/applications/search/view/searchresult/PhabricatorSearchResultView.php b/src/applications/search/view/searchresult/PhabricatorSearchResultView.php
index 5caa143bb8..da12267086 100644
--- a/src/applications/search/view/searchresult/PhabricatorSearchResultView.php
+++ b/src/applications/search/view/searchresult/PhabricatorSearchResultView.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group search
+ */
 final class PhabricatorSearchResultView extends AphrontView {
 
   private $handle;
diff --git a/src/applications/slowvote/controller/base/PhabricatorSlowvoteController.php b/src/applications/slowvote/controller/base/PhabricatorSlowvoteController.php
index c87558a916..59db63dd4a 100644
--- a/src/applications/slowvote/controller/base/PhabricatorSlowvoteController.php
+++ b/src/applications/slowvote/controller/base/PhabricatorSlowvoteController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 abstract class PhabricatorSlowvoteController extends PhabricatorController {
 
   public function buildStandardPageResponse($view, array $data) {
diff --git a/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php b/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php
index 3b41d840af..b4af23d6db 100644
--- a/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php
+++ b/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 class PhabricatorSlowvoteCreateController
   extends PhabricatorSlowvoteController {
 
diff --git a/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php b/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php
index 0cf78c3ed9..cd4a4c7c0c 100644
--- a/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php
+++ b/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 class PhabricatorSlowvoteListController
   extends PhabricatorSlowvoteController {
 
diff --git a/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
index cb01e01133..185add2871 100644
--- a/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
+++ b/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 class PhabricatorSlowvotePollController
   extends PhabricatorSlowvoteController {
 
diff --git a/src/applications/slowvote/storage/base/PhabricatorSlowvoteDAO.php b/src/applications/slowvote/storage/base/PhabricatorSlowvoteDAO.php
index a1fe2ceeae..3e770dea5c 100644
--- a/src/applications/slowvote/storage/base/PhabricatorSlowvoteDAO.php
+++ b/src/applications/slowvote/storage/base/PhabricatorSlowvoteDAO.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 class PhabricatorSlowvoteDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {
diff --git a/src/applications/slowvote/storage/choice/PhabricatorSlowvoteChoice.php b/src/applications/slowvote/storage/choice/PhabricatorSlowvoteChoice.php
index e409cd3edd..ebcfed524e 100644
--- a/src/applications/slowvote/storage/choice/PhabricatorSlowvoteChoice.php
+++ b/src/applications/slowvote/storage/choice/PhabricatorSlowvoteChoice.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 class PhabricatorSlowvoteChoice extends PhabricatorSlowvoteDAO {
 
   protected $pollID;
diff --git a/src/applications/slowvote/storage/comment/PhabricatorSlowvoteComment.php b/src/applications/slowvote/storage/comment/PhabricatorSlowvoteComment.php
index 1300195487..dca41d1f9d 100644
--- a/src/applications/slowvote/storage/comment/PhabricatorSlowvoteComment.php
+++ b/src/applications/slowvote/storage/comment/PhabricatorSlowvoteComment.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 class PhabricatorSlowvoteComment extends PhabricatorSlowvoteDAO {
 
   protected $pollID;
diff --git a/src/applications/slowvote/storage/option/PhabricatorSlowvoteOption.php b/src/applications/slowvote/storage/option/PhabricatorSlowvoteOption.php
index bedc35e3f5..5f123b262b 100644
--- a/src/applications/slowvote/storage/option/PhabricatorSlowvoteOption.php
+++ b/src/applications/slowvote/storage/option/PhabricatorSlowvoteOption.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 class PhabricatorSlowvoteOption extends PhabricatorSlowvoteDAO {
 
   protected $pollID;
diff --git a/src/applications/slowvote/storage/poll/PhabricatorSlowvotePoll.php b/src/applications/slowvote/storage/poll/PhabricatorSlowvotePoll.php
index ae463a861f..717b0da667 100644
--- a/src/applications/slowvote/storage/poll/PhabricatorSlowvotePoll.php
+++ b/src/applications/slowvote/storage/poll/PhabricatorSlowvotePoll.php
@@ -16,6 +16,9 @@
  * limitations under the License.
  */
 
+/**
+ * @group slowvote
+ */
 class PhabricatorSlowvotePoll extends PhabricatorSlowvoteDAO {
 
   const RESPONSES_VISIBLE = 0;
diff --git a/src/docs/roadmap.diviner b/src/docs/roadmap.diviner
index cf68828ee9..e1c5d23fb9 100644
--- a/src/docs/roadmap.diviner
+++ b/src/docs/roadmap.diviner
@@ -2,7 +2,7 @@
 @group intro
 
 Insight into the direction and progress of Phabricator. This document was last
-updated **July 22, 2011**.
+updated **September 14th, 2011**.
 
 = Status =
 
@@ -14,6 +14,7 @@ active development.
 The current focus on Phabricator is primarily feature buildout, particularly in
 these applications:
 
+  - **Mercurial**: Mercurial support is actively landing.
   - **Maniphest**: A lot of early adopters are getting into the suite because
     of this tool, and we're continuing to improve it.
   - **Phriction**: We just landed a wiki application, which basically works but