diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 06669aa2be..d2fdf8d763 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -1,833 +1,798 @@
 <?php
 
 final class PhabricatorProjectBoardViewController
   extends PhabricatorProjectBoardController {
 
   const BATCH_EDIT_ALL = 'all';
 
   private $id;
   private $slug;
   private $handles;
   private $queryKey;
   private $filter;
   private $sortKey;
   private $showHidden;
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getUser();
 
     $response = $this->loadProject();
     if ($response) {
       return $response;
     }
 
     $project = $this->getProject();
 
     $this->readRequestState();
-    $columns = $this->loadColumns($project);
-
-    // TODO: Expand the checks here if we add the ability
-    // to hide the Backlog column
-    if (!$columns) {
-      $can_edit = PhabricatorPolicyFilter::hasCapability(
-        $viewer,
-        $project,
-        PhabricatorPolicyCapability::CAN_EDIT);
-      if (!$can_edit) {
-        $content = $this->buildNoAccessContent($project);
-      } else {
-        $content = $this->buildInitializeContent($project);
-      }
-
-      if ($content instanceof AphrontResponse) {
-        return $content;
-      }
-
-      $nav = $this->getProfileMenu();
-      $nav->selectFilter(PhabricatorProject::PANEL_WORKBOARD);
-
-      $crumbs = $this->buildApplicationCrumbs();
-      $crumbs->addTextCrumb(pht('Workboard'));
-
-      return $this->newPage()
-        ->setTitle(
-          array(
-            pht('Workboard'),
-            $project->getName(),
-          ))
-        ->setNavigation($nav)
-        ->setCrumbs($crumbs)
-        ->appendChild($content);
-    }
 
     $board_uri = $this->getApplicationURI('board/'.$project->getID().'/');
 
-    $engine = id(new ManiphestTaskSearchEngine())
+    $search_engine = id(new ManiphestTaskSearchEngine())
       ->setViewer($viewer)
       ->setBaseURI($board_uri)
       ->setIsBoardView(true);
 
-    if ($request->isFormPost()) {
-      $saved = $engine->buildSavedQueryFromRequest($request);
-      $engine->saveQuery($saved);
+    if ($request->isFormPost() && !$request->getBool('initialize')) {
+      $saved = $search_engine->buildSavedQueryFromRequest($request);
+      $search_engine->saveQuery($saved);
       $filter_form = id(new AphrontFormView())
         ->setUser($viewer);
-      $engine->buildSearchForm($filter_form, $saved);
-      if ($engine->getErrors()) {
+      $search_engine->buildSearchForm($filter_form, $saved);
+      if ($search_engine->getErrors()) {
         return $this->newDialog()
           ->setWidth(AphrontDialogView::WIDTH_FULL)
           ->setTitle(pht('Advanced Filter'))
           ->appendChild($filter_form->buildLayoutView())
-          ->setErrors($engine->getErrors())
+          ->setErrors($search_engine->getErrors())
           ->setSubmitURI($board_uri)
           ->addSubmitButton(pht('Apply Filter'))
           ->addCancelButton($board_uri);
       }
       return id(new AphrontRedirectResponse())->setURI(
         $this->getURIWithState(
-          $engine->getQueryResultsPageURI($saved->getQueryKey())));
+          $search_engine->getQueryResultsPageURI($saved->getQueryKey())));
     }
 
     $query_key = $request->getURIData('queryKey');
     if (!$query_key) {
       $query_key = 'open';
     }
     $this->queryKey = $query_key;
 
     $custom_query = null;
-    if ($engine->isBuiltinQuery($query_key)) {
-      $saved = $engine->buildSavedQueryFromBuiltin($query_key);
+    if ($search_engine->isBuiltinQuery($query_key)) {
+      $saved = $search_engine->buildSavedQueryFromBuiltin($query_key);
     } else {
       $saved = id(new PhabricatorSavedQueryQuery())
         ->setViewer($viewer)
         ->withQueryKeys(array($query_key))
         ->executeOne();
 
       if (!$saved) {
         return new Aphront404Response();
       }
 
       $custom_query = $saved;
     }
 
     if ($request->getURIData('filter')) {
       $filter_form = id(new AphrontFormView())
         ->setUser($viewer);
-      $engine->buildSearchForm($filter_form, $saved);
+      $search_engine->buildSearchForm($filter_form, $saved);
 
       return $this->newDialog()
         ->setWidth(AphrontDialogView::WIDTH_FULL)
         ->setTitle(pht('Advanced Filter'))
         ->appendChild($filter_form->buildLayoutView())
         ->setSubmitURI($board_uri)
         ->addSubmitButton(pht('Apply Filter'))
         ->addCancelButton($board_uri);
     }
 
-    $task_query = $engine->buildQueryFromSavedQuery($saved);
+    $task_query = $search_engine->buildQueryFromSavedQuery($saved);
 
     $tasks = $task_query
       ->withEdgeLogicPHIDs(
         PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
         PhabricatorQueryConstraint::OPERATOR_AND,
         array($project->getPHID()))
       ->setOrder(ManiphestTaskQuery::ORDER_PRIORITY)
       ->setViewer($viewer)
       ->execute();
     $tasks = mpull($tasks, null, 'getPHID');
 
-    if ($tasks) {
-      $positions = id(new PhabricatorProjectColumnPositionQuery())
-        ->setViewer($viewer)
-        ->withObjectPHIDs(mpull($tasks, 'getPHID'))
-        ->withColumns($columns)
-        ->execute();
-      $positions = mpull($positions, null, 'getObjectPHID');
-    } else {
-      $positions = array();
-    }
 
-    $task_map = array();
-    foreach ($tasks as $task) {
-      $task_phid = $task->getPHID();
-      if (empty($positions[$task_phid])) {
-        // This shouldn't normally be possible because we create positions on
-        // demand, but we might have raced as an object was removed from the
-        // board. Just drop the task if we don't have a position for it.
-        continue;
-      }
+    $board_phid = $project->getPHID();
 
-      $position = $positions[$task_phid];
-      $task_map[$position->getColumnPHID()][] = $task_phid;
-    }
+    $layout_engine = id(new PhabricatorBoardLayoutEngine())
+      ->setViewer($viewer)
+      ->setBoardPHIDs(array($board_phid))
+      ->setObjectPHIDs(array_keys($tasks))
+      ->executeLayout();
 
-    // If we're showing the board in "natural" order, sort columns by their
-    // column positions.
-    if ($this->sortKey == PhabricatorProjectColumn::ORDER_NATURAL) {
-      foreach ($task_map as $column_phid => $task_phids) {
-        $order = array();
-        foreach ($task_phids as $task_phid) {
-          if (isset($positions[$task_phid])) {
-            $order[$task_phid] = $positions[$task_phid]->getOrderingKey();
-          } else {
-            $order[$task_phid] = 0;
-          }
-        }
-        asort($order);
-        $task_map[$column_phid] = array_keys($order);
+    $columns = $layout_engine->getColumns($board_phid);
+    if (!$columns) {
+      $can_edit = PhabricatorPolicyFilter::hasCapability(
+        $viewer,
+        $project,
+        PhabricatorPolicyCapability::CAN_EDIT);
+      if (!$can_edit) {
+        $content = $this->buildNoAccessContent($project);
+      } else {
+        $content = $this->buildInitializeContent($project);
+      }
+
+      if ($content instanceof AphrontResponse) {
+        return $content;
       }
+
+      $nav = $this->getProfileMenu();
+      $nav->selectFilter(PhabricatorProject::PANEL_WORKBOARD);
+
+      $crumbs = $this->buildApplicationCrumbs();
+      $crumbs->addTextCrumb(pht('Workboard'));
+
+      return $this->newPage()
+        ->setTitle(
+          array(
+            pht('Workboard'),
+            $project->getName(),
+          ))
+        ->setNavigation($nav)
+        ->setCrumbs($crumbs)
+        ->appendChild($content);
     }
 
     $task_can_edit_map = id(new PhabricatorPolicyFilter())
       ->setViewer($viewer)
       ->requireCapabilities(array(PhabricatorPolicyCapability::CAN_EDIT))
       ->apply($tasks);
 
     // If this is a batch edit, select the editable tasks in the chosen column
     // and ship the user into the batch editor.
     $batch_edit = $request->getStr('batch');
     if ($batch_edit) {
       if ($batch_edit !== self::BATCH_EDIT_ALL) {
         $column_id_map = mpull($columns, null, 'getID');
         $batch_column = idx($column_id_map, $batch_edit);
         if (!$batch_column) {
           return new Aphront404Response();
         }
 
-        $batch_task_phids = idx($task_map, $batch_column->getPHID(), array());
+        $batch_task_phids = $layout_engine->getColumnObjectPHIDs(
+          $board_phid,
+          $batch_column->getPHID());
+
         foreach ($batch_task_phids as $key => $batch_task_phid) {
           if (empty($task_can_edit_map[$batch_task_phid])) {
             unset($batch_task_phids[$key]);
           }
         }
 
         $batch_tasks = array_select_keys($tasks, $batch_task_phids);
       } else {
         $batch_tasks = $task_can_edit_map;
       }
 
       if (!$batch_tasks) {
         $cancel_uri = $this->getURIWithState($board_uri);
         return $this->newDialog()
           ->setTitle(pht('No Editable Tasks'))
           ->appendParagraph(
             pht(
               'The selected column contains no visible tasks which you '.
               'have permission to edit.'))
           ->addCancelButton($board_uri);
       }
 
       $batch_ids = mpull($batch_tasks, 'getID');
       $batch_ids = implode(',', $batch_ids);
 
       $batch_uri = new PhutilURI('/maniphest/batch/');
       $batch_uri->setQueryParam('board', $this->id);
       $batch_uri->setQueryParam('batch', $batch_ids);
       return id(new AphrontRedirectResponse())
         ->setURI($batch_uri);
     }
 
     $board_id = celerity_generate_unique_node_id();
 
     $board = id(new PHUIWorkboardView())
       ->setUser($viewer)
       ->setID($board_id);
 
     $behavior_config = array(
       'boardID' => $board_id,
       'projectPHID' => $project->getPHID(),
       'moveURI' => $this->getApplicationURI('move/'.$project->getID().'/'),
       'createURI' => $this->getCreateURI(),
       'order' => $this->sortKey,
     );
     $this->initBehavior(
       'project-boards',
       $behavior_config);
 
     $this->handles = ManiphestTaskListView::loadTaskHandles($viewer, $tasks);
 
     foreach ($columns as $column) {
-      $task_phids = idx($task_map, $column->getPHID(), array());
+      if (!$this->showHidden) {
+        if ($column->isHidden()) {
+          continue;
+        }
+      }
+
+      $task_phids = $layout_engine->getColumnObjectPHIDs(
+        $board_phid,
+        $column->getPHID());
+
       $column_tasks = array_select_keys($tasks, $task_phids);
 
+      // If we aren't using "natural" order, reorder the column by the original
+      // query order.
+      if ($this->sortKey != PhabricatorProjectColumn::ORDER_NATURAL) {
+        $column_tasks = array_select_keys($column_tasks, array_keys($tasks));
+      }
+
       $panel = id(new PHUIWorkpanelView())
         ->setHeader($column->getDisplayName())
         ->setSubHeader($column->getDisplayType())
         ->addSigil('workpanel');
 
       $header_icon = $column->getHeaderIcon();
       if ($header_icon) {
         $panel->setHeaderIcon($header_icon);
       }
 
       if ($column->isHidden()) {
         $panel->addClass('project-panel-hidden');
       }
 
       $column_menu = $this->buildColumnMenu($project, $column);
       $panel->addHeaderAction($column_menu);
 
       $tag_id = celerity_generate_unique_node_id();
       $tag_content_id = celerity_generate_unique_node_id();
 
       $count_tag = id(new PHUITagView())
         ->setType(PHUITagView::TYPE_SHADE)
         ->setShade(PHUITagView::COLOR_BLUE)
         ->setID($tag_id)
         ->setName(phutil_tag('span', array('id' => $tag_content_id), '-'))
         ->setStyle('display: none');
 
       $panel->setHeaderTag($count_tag);
 
       $cards = id(new PHUIObjectItemListView())
         ->setUser($viewer)
         ->setFlush(true)
         ->setAllowEmptyList(true)
         ->addSigil('project-column')
         ->setItemClass('phui-workcard')
         ->setMetadata(
           array(
             'columnPHID' => $column->getPHID(),
             'countTagID' => $tag_id,
             'countTagContentID' => $tag_content_id,
             'pointLimit' => $column->getPointLimit(),
           ));
 
       foreach ($column_tasks as $task) {
         $owner = null;
         if ($task->getOwnerPHID()) {
           $owner = $this->handles[$task->getOwnerPHID()];
         }
         $can_edit = idx($task_can_edit_map, $task->getPHID(), false);
         $cards->addItem(id(new ProjectBoardTaskCard())
           ->setViewer($viewer)
           ->setProject($project)
           ->setTask($task)
           ->setOwner($owner)
           ->setCanEdit($can_edit)
           ->getItem());
       }
       $panel->setCards($cards);
       $board->addPanel($panel);
     }
 
     $sort_menu = $this->buildSortMenu(
       $viewer,
       $this->sortKey);
 
     $filter_menu = $this->buildFilterMenu(
       $viewer,
       $custom_query,
-      $engine,
+      $search_engine,
       $query_key);
 
     $manage_menu = $this->buildManageMenu($project, $this->showHidden);
 
     $header_link = phutil_tag(
       'a',
       array(
         'href' => $this->getApplicationURI('profile/'.$project->getID().'/'),
       ),
       $project->getName());
 
     $board_box = id(new PHUIBoxView())
       ->appendChild($board)
       ->addClass('project-board-wrapper');
 
     $nav = $this->getProfileMenu();
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Workboard'));
     $crumbs->setBorder(true);
 
     $crumbs->addAction($sort_menu);
     $crumbs->addAction($filter_menu);
     $crumbs->addAction($manage_menu);
 
     return $this->newPage()
       ->setTitle(pht('%s Board', $project->getName()))
       ->setPageObjectPHIDs(array($project->getPHID()))
       ->setShowFooter(false)
       ->setNavigation($nav)
       ->setCrumbs($crumbs)
       ->addQuicksandConfig(
         array(
           'boardConfig' => $behavior_config,
         ))
       ->appendChild(
         array(
           $board_box,
         ));
   }
 
   private function readRequestState() {
     $request = $this->getRequest();
     $project = $this->getProject();
 
     $this->showHidden = $request->getBool('hidden');
     $this->id = $project->getID();
 
     $sort_key = $request->getStr('order');
     switch ($sort_key) {
       case PhabricatorProjectColumn::ORDER_NATURAL:
       case PhabricatorProjectColumn::ORDER_PRIORITY:
         break;
       default:
         $sort_key = PhabricatorProjectColumn::DEFAULT_ORDER;
         break;
     }
     $this->sortKey = $sort_key;
   }
 
-  private function loadColumns(PhabricatorProject $project) {
-    $viewer = $this->getViewer();
-
-    $column_query = id(new PhabricatorProjectColumnQuery())
-      ->setViewer($viewer)
-      ->withProjectPHIDs(array($project->getPHID()));
-
-    if (!$this->showHidden) {
-      $column_query->withStatuses(
-        array(PhabricatorProjectColumn::STATUS_ACTIVE));
-    }
-
-    $columns = $column_query->execute();
-    $columns = mpull($columns, null, 'getSequence');
-    ksort($columns);
-
-    return $columns;
-  }
-
   private function buildSortMenu(
     PhabricatorUser $viewer,
     $sort_key) {
 
     $sort_icon = id(new PHUIIconView())
       ->setIcon('fa-sort-amount-asc bluegrey');
 
     $named = array(
       PhabricatorProjectColumn::ORDER_NATURAL => pht('Natural'),
       PhabricatorProjectColumn::ORDER_PRIORITY => pht('Sort by Priority'),
     );
 
     $base_uri = $this->getURIWithState();
 
     $items = array();
     foreach ($named as $key => $name) {
       $is_selected = ($key == $sort_key);
       if ($is_selected) {
         $active_order = $name;
       }
 
       $item = id(new PhabricatorActionView())
         ->setIcon('fa-sort-amount-asc')
         ->setSelected($is_selected)
         ->setName($name);
 
       $uri = $base_uri->alter('order', $key);
       $item->setHref($uri);
 
       $items[] = $item;
     }
 
     $sort_menu = id(new PhabricatorActionListView())
       ->setUser($viewer);
     foreach ($items as $item) {
       $sort_menu->addAction($item);
     }
 
     $sort_button = id(new PHUIListItemView())
       ->setName(pht('Sort: %s', $active_order))
       ->setIcon('fa-sort-amount-asc')
       ->setHref('#')
       ->addSigil('boards-dropdown-menu')
       ->setMetadata(
         array(
           'items' => hsprintf('%s', $sort_menu),
         ));
 
     return $sort_button;
   }
   private function buildFilterMenu(
     PhabricatorUser $viewer,
     $custom_query,
     PhabricatorApplicationSearchEngine $engine,
     $query_key) {
 
     $named = array(
       'open' => pht('Open Tasks'),
       'all' => pht('All Tasks'),
     );
 
     if ($viewer->isLoggedIn()) {
       $named['assigned'] = pht('Assigned to Me');
     }
 
     if ($custom_query) {
       $named[$custom_query->getQueryKey()] = pht('Custom Filter');
     }
 
     $items = array();
     foreach ($named as $key => $name) {
       $is_selected = ($key == $query_key);
       if ($is_selected) {
         $active_filter = $name;
       }
 
       $is_custom = false;
       if ($custom_query) {
         $is_custom = ($key == $custom_query->getQueryKey());
       }
 
       $item = id(new PhabricatorActionView())
         ->setIcon('fa-search')
         ->setSelected($is_selected)
         ->setName($name);
 
       if ($is_custom) {
         $uri = $this->getApplicationURI(
           'board/'.$this->id.'/filter/query/'.$key.'/');
         $item->setWorkflow(true);
       } else {
         $uri = $engine->getQueryResultsPageURI($key);
       }
 
       $uri = $this->getURIWithState($uri);
       $item->setHref($uri);
 
       $items[] = $item;
     }
 
     $items[] = id(new PhabricatorActionView())
       ->setIcon('fa-cog')
       ->setHref($this->getApplicationURI('board/'.$this->id.'/filter/'))
       ->setWorkflow(true)
       ->setName(pht('Advanced Filter...'));
 
     $filter_menu = id(new PhabricatorActionListView())
         ->setUser($viewer);
     foreach ($items as $item) {
       $filter_menu->addAction($item);
     }
 
     $filter_button = id(new PHUIListItemView())
       ->setName(pht('Filter: %s', $active_filter))
       ->setIcon('fa-search')
       ->setHref('#')
       ->addSigil('boards-dropdown-menu')
       ->setMetadata(
         array(
           'items' => hsprintf('%s', $filter_menu),
         ));
 
     return $filter_button;
   }
 
   private function buildManageMenu(
     PhabricatorProject $project,
     $show_hidden) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $project,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $manage_items = array();
 
     $manage_items[] = id(new PhabricatorActionView())
       ->setIcon('fa-plus')
       ->setName(pht('Add Column'))
       ->setHref($this->getApplicationURI('board/'.$this->id.'/edit/'))
       ->setDisabled(!$can_edit)
       ->setWorkflow(!$can_edit);
 
     $manage_items[] = id(new PhabricatorActionView())
       ->setIcon('fa-exchange')
       ->setName(pht('Reorder Columns'))
       ->setHref($this->getApplicationURI('board/'.$this->id.'/reorder/'))
       ->setDisabled(!$can_edit)
       ->setWorkflow(true);
 
     if ($show_hidden) {
       $hidden_uri = $this->getURIWithState()
         ->setQueryParam('hidden', null);
       $hidden_icon = 'fa-eye-slash';
       $hidden_text = pht('Hide Hidden Columns');
     } else {
       $hidden_uri = $this->getURIWithState()
         ->setQueryParam('hidden', 'true');
       $hidden_icon = 'fa-eye';
       $hidden_text = pht('Show Hidden Columns');
     }
 
     $manage_items[] = id(new PhabricatorActionView())
       ->setIcon($hidden_icon)
       ->setName($hidden_text)
       ->setHref($hidden_uri);
 
     $batch_edit_uri = $request->getRequestURI();
     $batch_edit_uri->setQueryParam('batch', self::BATCH_EDIT_ALL);
     $can_batch_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
       ManiphestBulkEditCapability::CAPABILITY);
 
     $manage_items[] = id(new PhabricatorActionView())
       ->setIcon('fa-list-ul')
       ->setName(pht('Batch Edit Visible Tasks...'))
       ->setHref($batch_edit_uri)
       ->setDisabled(!$can_batch_edit);
 
     $manage_menu = id(new PhabricatorActionListView())
         ->setUser($viewer);
     foreach ($manage_items as $item) {
       $manage_menu->addAction($item);
     }
 
     $manage_button = id(new PHUIListItemView())
       ->setName(pht('Manage Board'))
       ->setIcon('fa-cog')
       ->setHref('#')
       ->addSigil('boards-dropdown-menu')
       ->setMetadata(
         array(
           'items' => hsprintf('%s', $manage_menu),
         ));
 
     return $manage_button;
   }
 
   private function buildColumnMenu(
     PhabricatorProject $project,
     PhabricatorProjectColumn $column) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $project,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $column_items = array();
 
     $column_items[] = id(new PhabricatorActionView())
       ->setIcon('fa-plus')
       ->setName(pht('Create Task...'))
       ->setHref($this->getCreateURI())
       ->addSigil('column-add-task')
       ->setMetadata(
         array(
           'columnPHID' => $column->getPHID(),
         ));
 
     $batch_edit_uri = $request->getRequestURI();
     $batch_edit_uri->setQueryParam('batch', $column->getID());
     $can_batch_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
       ManiphestBulkEditCapability::CAPABILITY);
 
     $column_items[] = id(new PhabricatorActionView())
       ->setIcon('fa-list-ul')
       ->setName(pht('Batch Edit Tasks...'))
       ->setHref($batch_edit_uri)
       ->setDisabled(!$can_batch_edit);
 
     $detail_uri = $this->getApplicationURI(
       'board/'.$this->id.'/column/'.$column->getID().'/');
 
     $column_items[] = id(new PhabricatorActionView())
       ->setIcon('fa-columns')
       ->setName(pht('Column Details'))
       ->setHref($detail_uri);
 
     $can_hide = ($can_edit && !$column->isDefaultColumn());
     $hide_uri = 'board/'.$this->id.'/hide/'.$column->getID().'/';
     $hide_uri = $this->getApplicationURI($hide_uri);
     $hide_uri = $this->getURIWithState($hide_uri);
 
     if (!$column->isHidden()) {
       $column_items[] = id(new PhabricatorActionView())
         ->setName(pht('Hide Column'))
         ->setIcon('fa-eye-slash')
         ->setHref($hide_uri)
         ->setDisabled(!$can_hide)
         ->setWorkflow(true);
     } else {
       $column_items[] = id(new PhabricatorActionView())
         ->setName(pht('Show Column'))
         ->setIcon('fa-eye')
         ->setHref($hide_uri)
         ->setDisabled(!$can_hide)
         ->setWorkflow(true);
     }
 
     $column_menu = id(new PhabricatorActionListView())
       ->setUser($viewer);
     foreach ($column_items as $item) {
       $column_menu->addAction($item);
     }
 
     $column_button = id(new PHUIIconView())
       ->setIcon('fa-caret-down')
       ->setHref('#')
       ->addSigil('boards-dropdown-menu')
       ->setMetadata(
         array(
           'items' => hsprintf('%s', $column_menu),
         ));
 
     return $column_button;
   }
 
 
   /**
    * Add current state parameters (like order and the visibility of hidden
    * columns) to a URI.
    *
    * This allows actions which toggle or adjust one piece of state to keep
    * the rest of the board state persistent. If no URI is provided, this method
    * starts with the request URI.
    *
    * @param string|null   URI to add state parameters to.
    * @return PhutilURI    URI with state parameters.
    */
   private function getURIWithState($base = null) {
     if ($base === null) {
       $base = $this->getRequest()->getRequestURI();
     }
 
     $base = new PhutilURI($base);
 
     if ($this->sortKey != PhabricatorProjectColumn::DEFAULT_ORDER) {
       $base->setQueryParam('order', $this->sortKey);
     } else {
       $base->setQueryParam('order', null);
     }
 
     $base->setQueryParam('hidden', $this->showHidden ? 'true' : null);
 
     return $base;
   }
 
   private function getCreateURI() {
     $viewer = $this->getViewer();
 
     // TODO: This should be cleaned up, but maybe we're going to make options
     // for each column or board?
     $edit_config = id(new ManiphestEditEngine())
       ->setViewer($viewer)
       ->loadDefaultEditConfiguration();
     if ($edit_config) {
       $form_key = $edit_config->getIdentifier();
       $create_uri = "/maniphest/task/edit/form/{$form_key}/";
     } else {
       $create_uri = '/maniphest/task/edit/';
     }
 
     return $create_uri;
   }
 
 
   private function buildInitializeContent(PhabricatorProject $project) {
     $request = $this->getRequest();
     $viewer = $this->getViewer();
 
     $type = $request->getStr('initialize-type');
 
     $id = $project->getID();
 
     $profile_uri = $this->getApplicationURI("profile/{$id}/");
     $board_uri = $this->getApplicationURI("board/{$id}/");
     $import_uri = $this->getApplicationURI("board/{$id}/import/");
 
     $set_default = $request->getBool('default');
     if ($set_default) {
       $this
         ->getProfilePanelEngine()
         ->adjustDefault(PhabricatorProject::PANEL_WORKBOARD);
     }
 
     if ($request->isFormPost()) {
       if ($type == 'backlog-only') {
         $column = PhabricatorProjectColumn::initializeNewColumn($viewer)
           ->setSequence(0)
           ->setProperty('isDefault', true)
           ->setProjectPHID($project->getPHID())
           ->save();
 
         $project->setHasWorkboard(1)->save();
 
         return id(new AphrontRedirectResponse())
           ->setURI($board_uri);
       } else {
         return id(new AphrontRedirectResponse())
           ->setURI($import_uri);
       }
     }
 
     $new_selector = id(new AphrontFormRadioButtonControl())
       ->setLabel(pht('Columns'))
       ->setName('initialize-type')
       ->setValue('backlog-only')
       ->addButton(
         'backlog-only',
         pht('New Empty Board'),
         pht('Create a new board with just a backlog column.'))
       ->addButton(
         'import',
         pht('Import Columns'),
         pht('Import board columns from another project.'));
 
     $default_checkbox = id(new AphrontFormCheckboxControl())
       ->setLabel(pht('Make Default'))
       ->addCheckbox(
         'default',
         1,
         pht('Make the workboard the default view for this project.'),
         true);
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
+      ->addHiddenInput('initialize', 1)
       ->appendRemarkupInstructions(
         pht('The workboard for this project has not been created yet.'))
       ->appendControl($new_selector)
       ->appendControl($default_checkbox)
       ->appendControl(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($profile_uri)
           ->setValue(pht('Create Workboard')));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Create Workboard'))
       ->setForm($form);
 
     return $box;
   }
 
   private function buildNoAccessContent(PhabricatorProject $project) {
     $viewer = $this->getViewer();
 
     $id = $project->getID();
 
     $profile_uri = $this->getApplicationURI("profile/{$id}/");
 
     return $this->newDialog()
       ->setTitle(pht('Unable to Create Workboard'))
       ->appendParagraph(
         pht(
           'The workboard for this project has not been created yet, '.
           'but you do not have permission to create it. Only users '.
           'who can edit this project can create a workboard for it.'))
       ->addCancelButton($profile_uri);
   }
 
 }
diff --git a/src/applications/project/engine/PhabricatorBoardLayoutEngine.php b/src/applications/project/engine/PhabricatorBoardLayoutEngine.php
index 28cecd81ea..8a6143c81d 100644
--- a/src/applications/project/engine/PhabricatorBoardLayoutEngine.php
+++ b/src/applications/project/engine/PhabricatorBoardLayoutEngine.php
@@ -1,400 +1,412 @@
 <?php
 
 final class PhabricatorBoardLayoutEngine extends Phobject {
 
   private $viewer;
   private $boardPHIDs;
   private $objectPHIDs;
   private $boards;
-  private $columnMap;
+  private $columnMap = array();
   private $objectColumnMap = array();
   private $boardLayout = array();
 
   private $remQueue = array();
   private $addQueue = array();
 
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
   }
 
   public function getViewer() {
     return $this->viewer;
   }
 
   public function setBoardPHIDs(array $board_phids) {
     $this->boardPHIDs = $board_phids;
     return $this;
   }
 
   public function getBoardPHIDs() {
     return $this->boardPHIDs;
   }
 
   public function setObjectPHIDs(array $object_phids) {
     $this->objectPHIDs = $object_phids;
     return $this;
   }
 
   public function getObjectPHIDs() {
     return $this->objectPHIDs;
   }
 
   public function executeLayout() {
     $viewer = $this->getViewer();
 
     $boards = $this->loadBoards();
     if (!$boards) {
       return $this;
     }
 
     $columns = $this->loadColumns($boards);
     $positions = $this->loadPositions($boards);
 
     foreach ($boards as $board_phid => $board) {
       $board_columns = idx($columns, $board_phid);
 
       // Don't layout boards with no columns. These boards need to be formally
       // created first.
       if (!$columns) {
         continue;
       }
 
       $board_positions = idx($positions, $board_phid, array());
 
       $this->layoutBoard($board, $board_columns, $board_positions);
     }
 
     return $this;
   }
 
+  public function getColumns($board_phid) {
+    $columns = idx($this->boardLayout, $board_phid, array());
+    return array_select_keys($this->columnMap, array_keys($columns));
+  }
+
+  public function getColumnObjectPHIDs($board_phid, $column_phid) {
+    $columns = idx($this->boardLayout, $board_phid, array());
+    $positions = idx($columns, $column_phid, array());
+    return mpull($positions, 'getObjectPHID');
+  }
+
   public function getObjectColumns($board_phid, $object_phid) {
     $board_map = idx($this->objectColumnMap, $board_phid, array());
 
     $column_phids = idx($board_map, $object_phid);
     if (!$column_phids) {
       return array();
     }
 
     return array_select_keys($this->columnMap, $column_phids);
   }
 
   public function queueRemovePosition(
     $board_phid,
     $column_phid,
     $object_phid) {
 
     $board_layout = idx($this->boardLayout, $board_phid, array());
     $positions = idx($board_layout, $column_phid, array());
     $position = idx($positions, $object_phid);
 
     if ($position) {
       $this->remQueue[] = $position;
 
       // If this position hasn't been saved yet, get it out of the add queue.
       if (!$position->getID()) {
         foreach ($this->addQueue as $key => $add_position) {
           if ($add_position === $position) {
             unset($this->addQueue[$key]);
           }
         }
       }
     }
 
     unset($this->boardLayout[$board_phid][$column_phid][$object_phid]);
 
     return $this;
   }
 
   public function queueAddPositionBefore(
     $board_phid,
     $column_phid,
     $object_phid,
     $before_phid) {
 
     return $this->queueAddPositionRelative(
       $board_phid,
       $column_phid,
       $object_phid,
       $before_phid,
       true);
   }
 
   public function queueAddPositionAfter(
     $board_phid,
     $column_phid,
     $object_phid,
     $after_phid) {
 
     return $this->queueAddPositionRelative(
       $board_phid,
       $column_phid,
       $object_phid,
       $after_phid,
       false);
   }
 
   public function queueAddPosition(
     $board_phid,
     $column_phid,
     $object_phid) {
     return $this->queueAddPositionRelative(
       $board_phid,
       $column_phid,
       $object_phid,
       null,
       true);
   }
 
   private function queueAddPositionRelative(
     $board_phid,
     $column_phid,
     $object_phid,
     $relative_phid,
     $is_before) {
 
     $board_layout = idx($this->boardLayout, $board_phid, array());
     $positions = idx($board_layout, $column_phid, array());
 
     // Check if the object is already in the column, and remove it if it is.
     $object_position = idx($positions, $object_phid);
     unset($positions[$object_phid]);
 
     if (!$object_position) {
       $object_position = id(new PhabricatorProjectColumnPosition())
         ->setBoardPHID($board_phid)
         ->setColumnPHID($column_phid)
         ->setObjectPHID($object_phid);
     }
 
     $found = false;
     if (!$positions) {
       $object_position->setSequence(0);
     } else {
       foreach ($positions as $position) {
         if (!$found) {
           if ($relative_phid === null) {
             $is_match = true;
           } else {
             $position_phid = $position->getObjectPHID();
             $is_match = ($relative_phid == $position_phid);
           }
 
           if ($is_match) {
             $found = true;
 
             $sequence = $position->getSequence();
 
             if (!$is_before) {
               $sequence++;
             }
 
             $object_position->setSequence($sequence++);
 
             if (!$is_before) {
               // If we're inserting after this position, continue the loop so
               // we don't update it.
               continue;
             }
           }
         }
 
         if ($found) {
           $position->setSequence($sequence++);
           $this->addQueue[] = $position;
         }
       }
     }
 
     if ($relative_phid && !$found) {
       throw new Exception(
         pht(
           'Unable to find object "%s" in column "%s" on board "%s".',
           $relative_phid,
           $column_phid,
           $board_phid));
     }
 
     $this->addQueue[] = $object_position;
 
     $positions[$object_phid] = $object_position;
     $positions = msort($positions, 'getOrderingKey');
 
     $this->boardLayout[$board_phid][$column_phid] = $positions;
 
     return $this;
   }
 
   public function applyPositionUpdates() {
     foreach ($this->remQueue as $position) {
       if ($position->getID()) {
         $position->delete();
       }
     }
     $this->remQueue = array();
 
     $adds = array();
     $updates = array();
 
     foreach ($this->addQueue as $position) {
       $id = $position->getID();
       if ($id) {
         $updates[$id] = $position;
       } else {
         $adds[] = $position;
       }
     }
     $this->addQueue = array();
 
     $table = new PhabricatorProjectColumnPosition();
     $conn_w = $table->establishConnection('w');
 
     $pairs = array();
     foreach ($updates as $id => $position) {
       // This is ugly because MySQL gets upset with us if it is configured
       // strictly and we attempt inserts which can't work. We'll never actually
       // do these inserts since they'll always collide (triggering the ON
       // DUPLICATE KEY logic), so we just provide dummy values in order to get
       // there.
 
       $pairs[] = qsprintf(
         $conn_w,
         '(%d, %d, "", "", "")',
         $id,
         $position->getSequence());
     }
 
     if ($pairs) {
       queryfx(
         $conn_w,
         'INSERT INTO %T (id, sequence, boardPHID, columnPHID, objectPHID)
           VALUES %Q ON DUPLICATE KEY UPDATE sequence = VALUES(sequence)',
         $table->getTableName(),
         implode(', ', $pairs));
     }
 
     foreach ($adds as $position) {
       $position->save();
     }
 
     return $this;
   }
 
   private function loadBoards() {
     $viewer = $this->getViewer();
     $board_phids = $this->getBoardPHIDs();
 
     $boards = id(new PhabricatorObjectQuery())
       ->setViewer($viewer)
       ->withPHIDs($board_phids)
       ->execute();
     $boards = mpull($boards, null, 'getPHID');
 
     foreach ($boards as $key => $board) {
       if (!$board->getHasWorkboard()) {
         unset($boards[$key]);
       }
     }
 
     return $boards;
   }
 
   private function loadColumns(array $boards) {
     $viewer = $this->getViewer();
 
     $columns = id(new PhabricatorProjectColumnQuery())
       ->setViewer($viewer)
       ->withProjectPHIDs(array_keys($boards))
       ->execute();
     $columns = msort($columns, 'getSequence');
     $columns = mpull($columns, null, 'getPHID');
 
     $this->columnMap = $columns;
     $columns = mgroup($columns, 'getProjectPHID');
 
     return $columns;
   }
 
   private function loadPositions(array $boards) {
     $viewer = $this->getViewer();
 
     $object_phids = $this->getObjectPHIDs();
     if (!$object_phids) {
       return array();
     }
 
     $positions = id(new PhabricatorProjectColumnPositionQuery())
       ->setViewer($viewer)
       ->withBoardPHIDs(array_keys($boards))
       ->withObjectPHIDs($object_phids)
       ->execute();
     $positions = msort($positions, 'getOrderingKey');
     $positions = mgroup($positions, 'getBoardPHID');
 
     return $positions;
   }
 
   private function layoutBoard(
     $board,
     array $columns,
     array $positions) {
 
     $board_phid = $board->getPHID();
     $position_groups = mgroup($positions, 'getObjectPHID');
 
+    $layout = array();
     foreach ($columns as $column) {
+      $column_phid = $column->getPHID();
+      $layout[$column_phid] = array();
+
       if ($column->isDefaultColumn()) {
-        $default_phid = $column->getPHID();
-        break;
+        $default_phid = $column_phid;
       }
     }
 
-    $layout = array();
-
     $object_phids = $this->getObjectPHIDs();
     foreach ($object_phids as $object_phid) {
       $positions = idx($position_groups, $object_phid, array());
 
       // Remove any positions in columns which no longer exist.
       foreach ($positions as $key => $position) {
         $column_phid = $position->getColumnPHID();
         if (empty($columns[$column_phid])) {
           $this->remQueue[] = $position;
           unset($positions[$key]);
         }
       }
 
       // If the object has no position, put it on the default column.
       if (!$positions) {
         $new_position = id(new PhabricatorProjectColumnPosition())
           ->setBoardPHID($board_phid)
           ->setColumnPHID($default_phid)
           ->setObjectPHID($object_phid)
           ->setSequence(0);
 
         $this->addQueue[] = $new_position;
 
         $positions = array(
           $new_position,
         );
       }
 
       foreach ($positions as $position) {
         $column_phid = $position->getColumnPHID();
         $layout[$column_phid][$object_phid] = $position;
       }
     }
 
     foreach ($layout as $column_phid => $map) {
       $map = msort($map, 'getOrderingKey');
       $layout[$column_phid] = $map;
 
       foreach ($map as $object_phid => $position) {
         $this->objectColumnMap[$board_phid][$object_phid][] = $column_phid;
       }
     }
 
     $this->boardLayout[$board_phid] = $layout;
   }
 
 }