diff --git a/config/vanilla/config.php b/config/vanilla/config.php
index c6d53b9..39366be 100644
--- a/config/vanilla/config.php
+++ b/config/vanilla/config.php
@@ -57,14 +57,14 @@
 $Configuration['Garden']['Email']['SmtpPort'] = getenv('MAIL_SMTP_PORT');
 $Configuration['Garden']['Email']['SmtpSecurity'] = getenv('MAIL_SMTP_SECURITY');
 $Configuration['Garden']['UpdateToken'] = '105e786dc643fd20143d3c137b593af168560c13';
-$Configuration['Garden']['InputFormatter'] = 'Markdown';
+$Configuration['Garden']['InputFormatter'] = 'Rich';
 $Configuration['Garden']['Version'] = 'Undefined';
 $Configuration['Garden']['CanProcessImages'] = true;
 $Configuration['Garden']['Theme'] = 'topcoder-theme';
 $Configuration['Garden']['MobileTheme'] = 'topcoder-theme';
 $Configuration['Garden']['Profile']['EditPhotos'] = false;
 $Configuration['Garden']['SystemUserID'] = '1';
-$Configuration['Garden']['MobileInputFormatter'] = 'Markdown';
+$Configuration['Garden']['MobileInputFormatter'] = 'Rich';
 $Configuration['Garden']['AllowFileUploads'] = true;
 $Configuration['Garden']['EditContentTimeout'] = -1;
 $Configuration['Garden']['Profile']['EditPhotos'] = false;
diff --git a/vanilla/applications/vanilla/controllers/class.discussioncontroller.php b/vanilla/applications/vanilla/controllers/class.discussioncontroller.php
new file mode 100644
index 0000000..264fb69
--- /dev/null
+++ b/vanilla/applications/vanilla/controllers/class.discussioncontroller.php
@@ -0,0 +1,1099 @@
+<?php
+/**
+ * Discussion controller
+ *
+ * @copyright 2009-2019 Vanilla Forums Inc.
+ * @license GPL-2.0-only
+ * @package Vanilla
+ * @since 2.0
+ */
+
+ use Vanilla\Message;
+
+/**
+ * Handles accessing & displaying a single discussion via /discussion endpoint.
+ */
+class DiscussionController extends VanillaController {
+
+    /** @var array Models to include. */
+    public $Uses = ['DiscussionModel', 'CommentModel', 'Form'];
+
+    /** @var array Unique identifier. */
+    public $CategoryID;
+
+    /**  @var CommentModel */
+    public $CommentModel;
+
+    /** @var DiscussionModel */
+    public $DiscussionModel;
+
+    /** @var Message[] */
+    private $messages = [];
+
+    /**
+     *
+     *
+     * @param $name
+     * @return mixed
+     * @throws Exception
+     */
+    public function __get($name) {
+        switch ($name) {
+            case 'CommentData':
+                deprecated('DiscussionController->CommentData', "DiscussionController->data('Comments')");
+                return $this->data('Comments');
+                break;
+        }
+        return null;
+    }
+
+    /**
+     * Add a message to be displayed on the discussion.
+     *
+     * @param Message $message
+     */
+    public function addMessage(Message $message) {
+        $this->messages[] = $message;
+    }
+
+    /**
+     * Default single discussion display.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $DiscussionID Unique discussion ID
+     * @param string $DiscussionStub URL-safe title slug
+     * @param int $Page The current page of comments
+     */
+    public function index($DiscussionID = '', $DiscussionStub = '', $Page = '') {
+        // Setup head
+        $Session = Gdn::session();
+        $this->addJsFile('jquery.autosize.min.js');
+        $this->addJsFile('autosave.js');
+        $this->addJsFile('discussion.js');
+
+        Gdn_Theme::section('Discussion');
+
+        // Load the discussion record
+        $DiscussionID = (is_numeric($DiscussionID) && $DiscussionID > 0) ? $DiscussionID : 0;
+        if (!array_key_exists('Discussion', $this->Data)) {
+            $this->setData('Discussion', $this->DiscussionModel->getID($DiscussionID), true);
+        }
+
+        if (!is_object($this->Discussion)) {
+            $this->EventArguments['DiscussionID'] = $DiscussionID;
+            $this->fireEvent('DiscussionNotFound');
+            throw notFoundException('Discussion');
+        }
+
+        // Define the query offset & limit.
+        $Limit = c('Vanilla.Comments.PerPage', 30);
+        $enableAutoOffset = c('Vanilla.Comments.AutoOffset');
+        // FIX: Allow plugins (ReplyTo) to change page and limit.
+        // https://github.com/topcoder-platform/forums/issues/254
+        // https://github.com/topcoder-platform/forums/issues/256
+        $this->EventArguments['Discussion'] = $this->Discussion;
+        $this->EventArguments['Page'] = & $Page;
+        $this->EventArguments['Limit'] = & $Limit;
+        $this->EventArguments['EnableAutoOffset'] = & $enableAutoOffset;
+
+        $this->fireEvent('BeforeCalculatingOffsetLimit');
+
+        $OffsetProvided = $Page != '';
+        list($Offset, $Limit) = offsetLimit($Page, $Limit);
+
+        // Check permissions.
+        $Category = CategoryModel::categories($this->Discussion->CategoryID);
+        $this->categoryPermission($Category, 'Vanilla.Discussions.View');
+
+        if (c('Vanilla.Categories.Use', true)) {
+            $this->CategoryID = $this->Discussion->CategoryID;
+        } else {
+            $this->CategoryID = null;
+        }
+        $this->setData('CategoryID', $this->CategoryID);
+
+        if (strcasecmp(val('Type', $this->Discussion), 'redirect') === 0) {
+            $this->redirectDiscussion($this->Discussion);
+        }
+
+        $this->setData('Category', $Category);
+        $this->setData('Editor.BackLink', anchor(htmlspecialchars($Category['Name']), categoryUrl($Category)));
+
+        if ($CategoryCssClass = val('CssClass', $Category)) {
+            Gdn_Theme::section($CategoryCssClass);
+        }
+
+        $this->setData('Breadcrumbs', CategoryModel::getAncestors($this->CategoryID));
+
+        // Setup
+        $this->title($this->Discussion->Name);
+
+        // Actual number of comments, excluding the discussion itself.
+        $ActualResponses = $this->Discussion->CountComments;
+
+        $this->Offset = $Offset;
+        if ($enableAutoOffset) {
+//         if ($this->Discussion->CountCommentWatch > 1 && $OffsetProvided == '')
+//            $this->addDefinition('ScrollTo', 'a[name=Item_'.$this->Discussion->CountCommentWatch.']');
+            if (!is_numeric($this->Offset) || $this->Offset < 0 || !$OffsetProvided) {
+                // Round down to the appropriate offset based on the user's read comments & comments per page
+                $CountCommentWatch = $this->Discussion->CountCommentWatch > 0 ? $this->Discussion->CountCommentWatch : 0;
+                if ($CountCommentWatch > $ActualResponses) {
+                    $CountCommentWatch = $ActualResponses;
+                }
+
+                // (((67 comments / 10 perpage) = 6.7) rounded down = 6) * 10 perpage = offset 60;
+                $this->Offset = floor($CountCommentWatch / $Limit) * $Limit;
+
+                if ($this->Offset >= $ActualResponses) {
+                    $this->Offset = $ActualResponses - $Limit;
+                }
+                if ($ActualResponses <= $Limit) {
+                    $this->Offset = 0;
+                }
+            }
+        } else {
+            if ($this->Offset == '') {
+                $this->Offset = 0;
+            }
+        }
+
+        if ($this->Offset < 0) {
+            $this->Offset = 0;
+        }
+
+
+        $LatestItem = $this->Discussion->CountCommentWatch;
+        if ($LatestItem === null) {
+            $LatestItem = 0;
+        } elseif ($LatestItem < $this->Discussion->CountComments) {
+            $LatestItem += 1;
+        } elseif ($LatestItem > $this->Discussion->CountComments) {
+            // If ever the CountCommentWatch is greater than the actual number of comments.
+            $LatestItem = $this->Discussion->CountComments;
+        }
+
+        $this->setData('_LatestItem', $LatestItem);
+
+        // Set the canonical url to have the proper page title.
+        $canonicalUrl = ($this->Discussion->Attributes['CanonicalUrl'] ?? '');
+        if (empty($canonicalUrl)) {
+            $this->canonicalUrl(discussionUrl($this->Discussion, pageNumber($this->Offset, $Limit, 0, false)));
+        } else {
+            $canonicalMessage = new Message(
+                str_replace(
+                    ["<0>", "</0>"],
+                    ['<a href="' . htmlspecialchars(\Gdn::request()->url($canonicalUrl)) . '">', "</a>"],
+                    \Gdn::translate('This discussion has a more <0>recent version</0>.')
+                ),
+                Message::TYPE_WARNING
+            );
+            $this->addMessage($canonicalMessage);
+            $this->canonicalUrl($canonicalUrl);
+        }
+        $this->checkPageRange($this->Offset, $ActualResponses);
+
+        // Load the comments
+        $this->setData('Comments', $this->CommentModel->getByDiscussion($DiscussionID, $Limit, $this->Offset));
+
+        $PageNumber = pageNumber($this->Offset, $Limit);
+        $this->setData('Page', $PageNumber);
+        $this->_SetOpenGraph();
+        if ($PageNumber == 1) {
+            $this->description(sliceParagraph(Gdn_Format::plainText($this->Discussion->Body, $this->Discussion->Format), 160));
+            // Add images to head for open graph
+            $Dom = pQuery::parseStr(Gdn_Format::to($this->Discussion->Body, $this->Discussion->Format));
+        } else {
+            $this->Data['Title'] .= sprintf(t(' - Page %s'), pageNumber($this->Offset, $Limit));
+
+            $FirstComment = $this->data('Comments')->firstRow();
+            $FirstBody = val('Body', $FirstComment);
+            $FirstFormat = val('Format', $FirstComment);
+            $this->description(sliceParagraph(Gdn_Format::plainText($FirstBody, $FirstFormat), 160));
+            // Add images to head for open graph
+            $Dom = pQuery::parseStr(Gdn_Format::to($FirstBody, $FirstFormat));
+        }
+
+        if ($Dom) {
+            foreach ($Dom->query('img') as $img) {
+                if ($img->attr('src')) {
+                    $this->image($img->attr('src'));
+                }
+            }
+        }
+
+        // Queue notification.
+        if ($this->Request->get('new') && c('Vanilla.QueueNotifications')) {
+            $this->addDefinition('NotifyNewDiscussion', 1);
+        }
+
+        // Make sure to set the user's discussion watch records if this is not an API request.
+        if ($this->deliveryType() !== DELIVERY_TYPE_DATA) {
+            $this->CommentModel->setWatch($this->Discussion, $Limit, $this->Offset, $this->Discussion->CountComments);
+        }
+
+        // Build a pager
+        $PagerFactory = new Gdn_PagerFactory();
+        $this->EventArguments['PagerType'] = 'Pager';
+        $this->fireEvent('BeforeBuildPager');
+        $this->Pager = $PagerFactory->getPager($this->EventArguments['PagerType'], $this);
+        $this->Pager->ClientID = 'Pager';
+
+        $this->Pager->configure(
+            $this->Offset,
+            $Limit,
+            $ActualResponses,
+            ['DiscussionUrl']
+        );
+        $this->Pager->Record = $this->Discussion;
+        PagerModule::current($this->Pager);
+        $this->fireEvent('AfterBuildPager');
+
+        // Define the form for the comment input
+        $this->Form = Gdn::factory('Form', 'Comment');
+        $this->Form->Action = url('/post/comment/');
+        $this->DiscussionID = $this->Discussion->DiscussionID;
+        $this->Form->addHidden('DiscussionID', $this->DiscussionID);
+        $this->Form->addHidden('CommentID', '');
+
+        // Look in the session stash for a comment
+        $StashComment = $Session->getPublicStash('CommentForDiscussionID_'.$this->Discussion->DiscussionID);
+        if ($StashComment) {
+            $this->Form->setValue('Body', $StashComment);
+            $this->Form->setFormValue('Body', $StashComment);
+        }
+
+        // Retrieve & apply the draft if there is one:
+        if (Gdn::session()->UserID) {
+            $DraftModel = new DraftModel();
+            $Draft = $DraftModel->getByUser($Session->UserID, 0, 1, $this->Discussion->DiscussionID)->firstRow();
+            $this->Form->addHidden('DraftID', $Draft ? $Draft->DraftID : '');
+            if ($Draft && !$this->Form->isPostBack()) {
+                $this->Form->setValue('Body', $Draft->Body);
+                $this->Form->setValue('Format', $Draft->Format);
+            }
+        }
+
+        // Deliver JSON data if necessary
+        if ($this->_DeliveryType != DELIVERY_TYPE_ALL) {
+            $this->setJson('LessRow', $this->Pager->toString('less'));
+            $this->setJson('MoreRow', $this->Pager->toString('more'));
+            $this->View = 'comments';
+        }
+
+        // Inform moderator of checked comments in this discussion
+        $CheckedComments = $Session->getAttribute('CheckedComments', []);
+        if (count($CheckedComments) > 0) {
+            ModerationController::informCheckedComments($this);
+        }
+
+        // Add modules
+        $this->addModule('DiscussionFilterModule');
+        $this->addModule('NewDiscussionModule');
+        $this->addModule('CategoriesModule');
+        $this->addModule('BookmarkedModule');
+
+        $this->CanEditComments = Gdn::session()->checkPermission('Vanilla.Comments.Edit', true, 'Category', 'any') && c('Vanilla.AdminCheckboxes.Use');
+
+        // Report the discussion id so js can use it.
+        $this->addDefinition('DiscussionID', $DiscussionID);
+        $this->addDefinition('Category', $this->data('Category.Name'));
+
+        $this->fireEvent('BeforeDiscussionRender');
+
+        $AttachmentModel = AttachmentModel::instance();
+        if (AttachmentModel::enabled()) {
+            $AttachmentModel->joinAttachments($this->Data['Discussion'], $this->Data['Comments']);
+
+            $this->fireEvent('FetchAttachmentViews');
+            if ($this->deliveryMethod() === DELIVERY_METHOD_XHTML) {
+                require_once $this->fetchViewLocation('attachment', 'attachments', 'dashboard');
+            }
+        }
+
+        $this->Head->setJsonLD(
+            'DiscussionForumPosting',
+            $this->DiscussionModel->structuredData((array)$this->Discussion)
+        );
+        $this->render();
+    }
+
+    /**
+     * Get current messages.
+     *
+     * @return Messages[]
+     */
+    public function getMessages(): array {
+        return $this->messages;
+    }
+
+    /**
+     * Display comments in a discussion since a particular CommentID.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $discussionID Unique discussion ID
+     * @param int $lastCommentID Only shows comments posted after this one
+     */
+    public function getNew($discussionID, $lastCommentID = 0) {
+        $this->setData('Discussion', $this->DiscussionModel->getID($discussionID), true);
+
+        // Check permissions.
+        $this->categoryPermission($this->Discussion->CategoryID, 'Vanilla.Discussions.View');
+        $this->setData('CategoryID', $this->CategoryID = $this->Discussion->CategoryID, true);
+
+        // Get the comments.
+        $comments = $this->CommentModel->getNew($discussionID, $lastCommentID);
+        $this->setData('Comments', $comments, true);
+        $comments = $comments->result();
+
+        // Set the data.
+        if (count($comments) > 0) {
+            $lastComment = $comments[count($comments) - 1];
+            // Mark the comment read.
+            $this->setData('Offset', $this->Discussion->CountComments, true);
+            $this->CommentModel->setWatch($this->Discussion, $this->Discussion->CountComments, $this->Discussion->CountComments, $this->Discussion->CountComments);
+
+            $lastCommentID = $this->json('LastCommentID');
+            if (is_null($lastCommentID) || $lastComment->CommentID > $lastCommentID) {
+                $this->json('LastCommentID', $lastComment->CommentID);
+            }
+        } else {
+            $this->setData('Offset', $this->CommentModel->getOffset($lastCommentID), true);
+        }
+
+        $this->View = 'comments';
+        $this->render();
+    }
+
+    /**
+     * Highlight route & add common JS definitions.
+     *
+     * Always called by dispatcher before controller's requested method.
+     *
+     * @since 2.0.0
+     * @access public
+     */
+    public function initialize() {
+        parent::initialize();
+        $this->addDefinition('ConfirmDeleteCommentHeading', t('ConfirmDeleteCommentHeading', 'Delete Comment'));
+        $this->addDefinition('ConfirmDeleteCommentText', t('ConfirmDeleteCommentText', 'Are you sure you want to delete this comment?'));
+        $this->Menu->highlightRoute('/discussions');
+    }
+
+    /**
+     * Display discussion page starting with a particular comment.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $commentID Unique comment ID
+     */
+    public function comment($commentID) {
+        // Get the discussionID
+        $comment = $this->CommentModel->getID($commentID);
+        if (!$comment) {
+            throw notFoundException('Comment');
+        }
+
+        $discussionID = $comment->DiscussionID;
+
+        // Figure out how many comments are before this one
+        $offset = $this->CommentModel->getOffset($comment);
+        $limit = Gdn::config('Vanilla.Comments.PerPage', 30);
+
+        $pageNumber = pageNumber($offset, $limit, true);
+        $this->setData('Page', $pageNumber);
+
+        $this->View = 'index';
+        $this->index($discussionID, 'x', $pageNumber);
+    }
+
+    /**
+     * Allows user to remove announcement.
+     *
+     * Users may remove announcements from being displayed for themselves only.
+     * Does not affect what announcements are shown for other users.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $discussionID Unique discussion ID.
+     * @param string $TransientKey Single-use hash to prove intent.
+     */
+    public function dismissAnnouncement($discussionID = '') {
+        // Make sure we are posting back.
+        if (!Gdn::request()->isAuthenticatedPostBack(true)) {
+            throw new Exception('Requires POST', 405);
+        }
+
+        // Confirm announcements may be dismissed
+        if (!c('Vanilla.Discussions.Dismiss', 1)) {
+            throw permissionException('Vanilla.Discussions.Dismiss');
+        }
+
+        $session = Gdn::session();
+        if (is_numeric($discussionID)
+            && $discussionID > 0
+            && $session->UserID > 0
+        ) {
+            $this->DiscussionModel->dismissAnnouncement($discussionID, $session->UserID);
+        }
+
+        // Redirect back where the user came from if necessary
+        if ($this->_DeliveryType === DELIVERY_TYPE_ALL) {
+            redirectTo('discussions');
+        }
+
+        $this->jsonTarget("#Discussion_$discussionID", null, 'Highlight');
+
+        $this->render('Blank', 'Utility', 'Dashboard');
+    }
+
+    /**
+     * Allows user to bookmark or unbookmark a discussion.
+     *
+     * If the discussion isn't bookmarked by the user, this bookmarks it.
+     * If it is already bookmarked, this unbookmarks it.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $DiscussionID Unique discussion ID.
+     */
+    public function bookmark($DiscussionID = null) {
+        // Make sure we are posting back.
+        if (!$this->Request->isAuthenticatedPostBack()) {
+            throw permissionException('Javascript');
+        }
+
+        $Session = Gdn::session();
+
+        if (!$Session->UserID) {
+            throw permissionException('SignedIn');
+        }
+
+        // Check the form to see if the data was posted.
+        $Form = new Gdn_Form();
+        $DiscussionID = $Form->getFormValue('DiscussionID', $DiscussionID);
+        $Bookmark = $Form->getFormValue('Bookmark', null);
+        $UserID = $Form->getFormValue('UserID', $Session->UserID);
+
+        // Check the permission on the user.
+        if ($UserID != $Session->UserID) {
+            $this->permission('Garden.Moderation.Manage');
+        }
+
+        $Discussion = $this->DiscussionModel->getID($DiscussionID);
+        if (!$Discussion) {
+            throw notFoundException('Discussion');
+        }
+
+        // Make sure that the user has access to the discussion.
+        $categoryID = val('CategoryID', $Discussion);
+        $this->DiscussionModel->categoryPermission('Vanilla.Discussions.View', $categoryID);
+
+        $Bookmark = $this->DiscussionModel->bookmark($DiscussionID, $UserID, $Bookmark);
+
+        // Set the new value for api calls and json targets.
+        $this->setData([
+            'UserID' => $UserID,
+            'DiscussionID' => $DiscussionID,
+            'Bookmarked' => (bool)$Bookmark
+        ]);
+        setValue('Bookmarked', $Discussion, (int)$Bookmark);
+
+        // Update the user's bookmark count
+        $CountBookmarks = $this->DiscussionModel->setUserBookmarkCount($UserID);
+        $this->jsonTarget('.User-CountBookmarks', (string)$CountBookmarks);
+
+        //  Short circuit if this is an api call.
+        if ($this->deliveryType() === DELIVERY_TYPE_DATA) {
+            $this->render('Blank', 'Utility', 'Dashboard');
+            return;
+        }
+
+        // Return the appropriate bookmark.
+        require_once $this->fetchViewLocation('helper_functions', 'Discussions');
+        $Html = bookmarkButton($Discussion);
+//      $this->jsonTarget(".Section-DiscussionList #Discussion_$DiscussionID .Bookmark,.Section-Discussion .PageTitle .Bookmark", $Html, 'ReplaceWith');
+        $this->jsonTarget("!element", $Html, 'ReplaceWith');
+
+        // Add the bookmark to the bookmarks module.
+        if ($Bookmark) {
+            // Grab the individual bookmark and send it to the client.
+            $Bookmarks = new BookmarkedModule($this);
+            if ($CountBookmarks == 1) {
+                // When there is only one bookmark we have to get the whole module.
+                $Target = '#Panel';
+                $Type = 'Append';
+                $Bookmarks->getData();
+                $Data = $Bookmarks->toString();
+            } else {
+                $Target = '#Bookmark_List';
+                $Type = 'Prepend';
+                $Loc = $Bookmarks->fetchViewLocation('discussion');
+
+                ob_start();
+                include($Loc);
+                $Data = ob_get_clean();
+            }
+
+            $this->jsonTarget($Target, $Data, $Type);
+        } else {
+            // Send command to remove bookmark html.
+            if ($CountBookmarks == 0) {
+                $this->jsonTarget('#Bookmarks', null, 'Remove');
+            } else {
+                $this->jsonTarget('#Bookmark_'.$DiscussionID, null, 'Remove');
+            }
+        }
+
+        $this->render('Blank', 'Utility', 'Dashboard');
+    }
+
+    /**
+     * Allows user to announce or unannounce a discussion.
+     *
+     * If the discussion isn't announced, this announces it.
+     * If it is already announced, this unannounces it.
+     * Announced discussions stay at the top of the discussions
+     * list regardless of how long ago the last comment was.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $discussionID Unique discussion ID.
+     * @param string $TransientKey Single-use hash to prove intent.
+     */
+    public function announce($discussionID = '', $target = '') {
+        $discussion = $this->DiscussionModel->getID($discussionID);
+        if (!$discussion) {
+            throw notFoundException('Discussion');
+        }
+        $this->categoryPermission($discussion->CategoryID, 'Vanilla.Discussions.Announce');
+
+        if ($this->Form->authenticatedPostBack()) {
+            // Save the property.
+            $cacheKeys = [
+                $this->DiscussionModel->getAnnouncementCacheKey(),
+                $this->DiscussionModel->getAnnouncementCacheKey(val('CategoryID', $discussion))
+            ];
+            $this->DiscussionModel->SQL->cache($cacheKeys);
+            $this->DiscussionModel->setProperty($discussionID, 'Announce', (int)$this->Form->getFormValue('Announce', 0));
+
+            if ($target) {
+                $this->setRedirectTo($target);
+            }
+
+            $this->jsonTarget('', '', 'Refresh');
+        } else {
+            if (!$discussion->Announce) {
+                $discussion->Announce = 2;
+            }
+            $this->Form->setData($discussion);
+        }
+
+        $discussion = (array)$discussion;
+        $category = CategoryModel::categories($discussion['CategoryID']);
+
+        $this->setData('Discussion', $discussion);
+        $this->setData('Category', $category);
+
+        $this->title(t('Announce'));
+        $this->render();
+    }
+
+    /**
+     *
+     *
+     * @param $discussion
+     * @throws Exception
+     */
+    public function sendOptions($discussion) {
+        require_once $this->fetchViewLocation('helper_functions', 'Discussion');
+        $this->jsonTarget("#Discussion_{$discussion->DiscussionID} .OptionsMenu,.Section-Discussion .Discussion .OptionsMenu", getDiscussionOptionsDropdown($discussion)->toString(), 'ReplaceWith');
+    }
+
+    /**
+     * Allows user to sink or unsink a discussion.
+     *
+     * If the discussion isn't sunk, this sinks it. If it is already sunk,
+     * this unsinks it. Sunk discussions do not move to the top of the
+     * discussion list when a new comment is added.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $discussionID Unique discussion ID.
+     * @param bool $sink Whether or not to unsink the discussion.
+     */
+    public function sink($discussionID = '', $sink = true, $from = 'list') {
+        // Make sure we are posting back.
+        if (!$this->Request->isAuthenticatedPostBack()) {
+            throw permissionException('Javascript');
+        }
+
+        $discussion = $this->DiscussionModel->getID($discussionID);
+
+        if (!$discussion) {
+            throw notFoundException('Discussion');
+        }
+
+        $this->categoryPermission($discussion->CategoryID, 'Vanilla.Discussions.Sink');
+
+        // Sink the discussion.
+        $this->DiscussionModel->setField($discussionID, 'Sink', $sink);
+        $discussion->Sink = $sink;
+
+        // Redirect to the front page
+        if ($this->_DeliveryType === DELIVERY_TYPE_ALL) {
+            $target = getIncomingValue('Target', 'discussions');
+            redirectTo($target);
+        }
+
+        $this->sendOptions($discussion);
+
+        $this->jsonTarget("#Discussion_$discussionID", null, 'Highlight');
+        $this->jsonTarget(".Discussion #Item_0", null, 'Highlight');
+
+        $this->render('Blank', 'Utility', 'Dashboard');
+    }
+
+    /**
+     * Allows user to close or re-open a discussion.
+     *
+     * If the discussion isn't closed, this closes it. If it is already
+     * closed, this re-opens it. Closed discussions may not have new
+     * comments added to them.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $DiscussionID Unique discussion ID.
+     * @param bool $Close Whether or not to close the discussion.
+     */
+    public function close($DiscussionID = '', $Close = true, $From = 'list') {
+        // Make sure we are posting back.
+        if (!$this->Request->isAuthenticatedPostBack()) {
+            throw permissionException('Javascript');
+        }
+
+        $Discussion = $this->DiscussionModel->getID($DiscussionID);
+
+        if (!$Discussion) {
+            throw notFoundException('Discussion');
+        }
+
+        $this->categoryPermission($Discussion->CategoryID, 'Vanilla.Discussions.Close');
+
+        // Close the discussion.
+        $this->DiscussionModel->setField($DiscussionID, 'Closed', $Close);
+        $Discussion->Closed = $Close;
+
+        // Redirect to the front page
+        if ($this->_DeliveryType === DELIVERY_TYPE_ALL) {
+            $Target = getIncomingValue('Target', 'discussions');
+            redirectTo($Target);
+        }
+
+        $this->sendOptions($Discussion);
+
+        if ($Close) {
+            require_once $this->fetchViewLocation('helper_functions', 'Discussions');
+            $this->jsonTarget(".Section-DiscussionList #Discussion_$DiscussionID .Meta-Discussion", tag($Discussion, 'Closed', 'Closed'), 'Prepend');
+            $this->jsonTarget(".Section-DiscussionList #Discussion_$DiscussionID", 'Closed', 'AddClass');
+        } else {
+            $this->jsonTarget(".Section-DiscussionList #Discussion_$DiscussionID .Tag-Closed", null, 'Remove');
+            $this->jsonTarget(".Section-DiscussionList #Discussion_$DiscussionID", 'Closed', 'RemoveClass');
+        }
+
+        $this->jsonTarget("#Discussion_$DiscussionID", null, 'Highlight');
+        $this->jsonTarget(".Discussion #Item_0", null, 'Highlight');
+
+        $this->render('Blank', 'Utility', 'Dashboard');
+    }
+
+    /**
+     * Allows user to delete a discussion.
+     *
+     * This is a "hard" delete - it is removed from the database.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $discussionID Unique discussion ID.
+     */
+    public function delete($discussionID, $target = '') {
+        $discussion = $this->DiscussionModel->getID($discussionID);
+
+        if (!$discussion) {
+            throw notFoundException('Discussion');
+        }
+
+        $this->categoryPermission($discussion->CategoryID, 'Vanilla.Discussions.Delete');
+
+        if ($this->Form->authenticatedPostBack()) {
+            if (!$this->DiscussionModel->deleteID($discussionID)) {
+                $this->Form->addError('Failed to delete discussion');
+            }
+
+            if ($this->Form->errorCount() == 0) {
+                if ($this->_DeliveryType === DELIVERY_TYPE_ALL) {
+                    redirectTo($target);
+                }
+
+                if ($target) {
+                    $this->setRedirectTo($target);
+                }
+
+                $this->jsonTarget(".Section-DiscussionList #Discussion_$discussionID", null, 'SlideUp');
+            }
+        }
+
+        $this->setData('Title', t('Delete Discussion'));
+        $this->render();
+    }
+
+    /**
+     * Allows user to delete a comment.
+     *
+     * If the comment is the only one in the discussion, the discussion will
+     * be deleted as well. Users without administrative delete abilities
+     * should not be able to delete a comment unless it is a draft. This is
+     * a "hard" delete - it is removed from the database.
+     *
+     * @since 2.0.0
+     * @access public
+     *
+     * @param int $commentID Unique comment ID.
+     * @param string $transientKey Single-use hash to prove intent.
+     */
+    public function deleteComment($commentID = '', $transientKey = '') {
+        $session = Gdn::session();
+        $defaultTarget = '/discussions/';
+        $validCommentID = is_numeric($commentID) && $commentID > 0;
+        $validUser = $session->UserID > 0 && $session->validateTransientKey($transientKey);
+
+        if ($validCommentID && $validUser) {
+            // Get comment and discussion data
+            $comment = $this->CommentModel->getID($commentID);
+            $discussionID = val('DiscussionID', $comment);
+            $discussion = $this->DiscussionModel->getID($discussionID);
+
+            if ($comment && $discussion) {
+                $defaultTarget = discussionUrl($discussion);
+
+                // Make sure comment is this user's or they have Delete permission.
+                if ($comment->InsertUserID != $session->UserID || !c('Vanilla.Comments.AllowSelfDelete')) {
+                    $this->categoryPermission($discussion->CategoryID, 'Vanilla.Comments.Delete');
+                }
+
+                // Make sure that content can (still) be edited.
+                $editTimeout = 0;
+                if (!CommentModel::canEdit($comment, $editTimeout, $discussion)) {
+                    $this->categoryPermission($discussion->CategoryID, 'Vanilla.Comments.Delete');
+                }
+
+                // Delete the comment.
+                if (!$this->CommentModel->deleteID($commentID)) {
+                    $this->Form->addError('Failed to delete comment');
+                }
+            } else {
+                $this->Form->addError('Invalid comment');
+            }
+        } else {
+            $this->Form->addError('ErrPermission');
+        }
+
+        // Redirect
+        if ($this->_DeliveryType == DELIVERY_TYPE_ALL) {
+            $target = getIncomingValue('Target', $defaultTarget);
+            redirectTo($target);
+        }
+
+        if ($this->Form->errorCount() > 0) {
+            $this->setJson('ErrorMessage', $this->Form->errors());
+        } else {
+            $this->jsonTarget("#Comment_$commentID", '', 'SlideUp');
+        }
+
+        $this->render();
+    }
+
+    /**
+     * Alternate version of Index that uses the embed master view.
+     *
+     * @param int $discussionID Unique identifier, if discussion has been created.
+     * @param string $discussionStub Deprecated.
+     * @param int $offset
+     * @param int $limit
+     */
+    public function embed($discussionID = '', $discussionStub = '', $offset = '', $limit = '') {
+        $this->title(t('Comments'));
+
+        // Add theme data
+        $this->Theme = c('Garden.CommentsTheme', $this->Theme);
+        Gdn_Theme::section('Comments');
+
+        // Force view options
+        $this->MasterView = 'empty';
+        $this->CanEditComments = false; // Don't show the comment checkboxes on the embed comments page
+
+        // Add some css to help with the transparent bg on embedded comments
+        if ($this->Head) {
+            $this->Head->addString('<style>
+body { background: transparent !important; }
+</style>');
+        }
+
+        // Javascript files & options
+        $this->addJsFile('jquery.gardenmorepager.js');
+        $this->addJsFile('jquery.autosize.min.js');
+        $this->addJsFile('discussion.js');
+        $this->removeJsFile('autosave.js');
+        $this->addDefinition('DoInform', '0'); // Suppress inform messages on embedded page.
+        $this->addDefinition('SelfUrl', Gdn::request()->pathAndQuery());
+        $this->addDefinition('Embedded', true);
+
+        // Define incoming variables (prefer querystring parameters over method parameters)
+        $discussionID = (is_numeric($discussionID) && $discussionID > 0) ? $discussionID : 0;
+        $discussionID = getIncomingValue('vanilla_discussion_id', $discussionID);
+        $offset = getIncomingValue('Offset', $offset);
+        $limit = getIncomingValue('Limit', $limit);
+        $vanilla_identifier = getIncomingValue('vanilla_identifier', '');
+
+        // Only allow vanilla identifiers of 32 chars or less - md5 if larger
+        if (strlen($vanilla_identifier) > 32) {
+            $vanilla_identifier = md5($vanilla_identifier);
+        }
+        $vanilla_type = getIncomingValue('vanilla_type', 'page');
+        $vanilla_url = getIncomingValue('vanilla_url', '');
+        $vanilla_category_id = getIncomingValue('vanilla_category_id', '');
+        $foreignSource = [
+            'vanilla_identifier' => $vanilla_identifier,
+            'vanilla_type' => $vanilla_type,
+            'vanilla_url' => $vanilla_url,
+            'vanilla_category_id' => $vanilla_category_id
+        ];
+        $this->setData('ForeignSource', $foreignSource);
+
+        // Set comment sorting
+        $sortComments = c('Garden.Embed.SortComments') == 'desc' ? 'desc' : 'asc';
+        $this->setData('SortComments', $sortComments);
+
+        // Retrieve the discussion record
+        $discussion = false;
+        if ($discussionID > 0) {
+            $discussion = $this->DiscussionModel->getID($discussionID);
+        } elseif ($vanilla_identifier != '' && $vanilla_type != '') {
+            $discussion = $this->DiscussionModel->getForeignID($vanilla_identifier, $vanilla_type);
+        }
+
+        // Set discussion data if we have one for this page
+        if ($discussion) {
+            // Allow Vanilla.Comments.View to be defined to limit access to embedded comments only.
+            // Otherwise, go with normal discussion view permissions. Either will do.
+            $this->categoryPermission($discussion->CategoryID, ['Vanilla.Discussions.View', 'Vanilla.Comments.View'], false);
+
+            $this->setData('Discussion', $discussion, true);
+            $this->setData('DiscussionID', $discussion->DiscussionID, true);
+            $this->title($discussion->Name);
+
+            // Actual number of comments, excluding the discussion itself
+            $actualResponses = $discussion->CountComments;
+
+            // Define the query offset & limit
+            if (!is_numeric($limit) || $limit < 0) {
+                $limit = c('Garden.Embed.CommentsPerPage', 30);
+            }
+
+            $offsetProvided = $offset != '';
+            list($offset, $limit) = offsetLimit($offset, $limit);
+            $this->Offset = $offset;
+            if (c('Vanilla.Comments.AutoOffset')) {
+                if ($actualResponses <= $limit) {
+                    $this->Offset = 0;
+                }
+
+                if ($this->Offset == $actualResponses) {
+                    $this->Offset -= $limit;
+                }
+            } elseif ($this->Offset == '') {
+                $this->Offset = 0;
+            }
+
+            if ($this->Offset < 0) {
+                $this->Offset = 0;
+            }
+
+            // Set the canonical url to have the proper page title.
+            $canonicalUrl = ($discussion->Attributes['CanonicalUrl'] ?? '');
+            if (empty($canonicalUrl)) {
+                $this->canonicalUrl(discussionUrl($discussion, pageNumber($this->Offset, $limit)));
+            } else {
+                $this->canonicalUrl($canonicalUrl);
+            }
+
+            // Load the comments.
+            $currentOrderBy = $this->CommentModel->orderBy();
+            if (stringBeginsWith(getValueR('0.0', $currentOrderBy), 'c.DateInserted')) {
+                $this->CommentModel->orderBy('c.DateInserted '.$sortComments); // allow custom sort
+            }
+            $this->setData('Comments', $this->CommentModel->getByDiscussion($discussion->DiscussionID, $limit, $this->Offset), true);
+
+            if (count($this->CommentModel->where()) > 0) {
+                $actualResponses = false;
+            }
+
+            $this->setData('_Count', $actualResponses);
+
+            // Build a pager
+            $pagerFactory = new Gdn_PagerFactory();
+            $this->EventArguments['PagerType'] = 'MorePager';
+            $this->fireEvent('BeforeBuildPager');
+            $this->Pager = $pagerFactory->getPager($this->EventArguments['PagerType'], $this);
+            $this->Pager->ClientID = 'Pager';
+            $this->Pager->MoreCode = 'More Comments';
+            $this->Pager->configure(
+                $this->Offset,
+                $limit,
+                $actualResponses,
+                'discussion/embed/'.$discussion->DiscussionID.'/'.Gdn_Format::url($discussion->Name).'/%1$s'
+            );
+            $this->Pager->CurrentRecords = $this->Comments->numRows();
+            $this->fireEvent('AfterBuildPager');
+        }
+
+        // Define the form for the comment input
+        $this->Form = Gdn::factory('Form', 'Comment');
+        $this->Form->Action = url('/post/comment/');
+        $this->Form->addHidden('CommentID', '');
+        $this->Form->addHidden('Embedded', 'true'); // Tell the post controller that this is an embedded page (in case there are custom views it needs to pick up from a theme).
+        $this->Form->addHidden('DisplayNewCommentOnly', 'true'); // Only load/display the new comment after posting (don't load all new comments since the page last loaded).
+
+        // Grab the page title
+        if ($this->Request->get('title')) {
+            $this->Form->setValue('Name', $this->Request->get('title'));
+        }
+
+        // Set existing DiscussionID for comment form
+        if ($discussion) {
+            $this->Form->addHidden('DiscussionID', $discussion->DiscussionID);
+        }
+
+        foreach ($foreignSource as $key => $val) {
+            // Drop the foreign source information into the form so it can be used if creating a discussion
+            $this->Form->addHidden($key, $val);
+
+            // Also drop it into the definitions so it can be picked up for stashing comments
+            $this->addDefinition($key, $val);
+        }
+
+        // Retrieve & apply the draft if there is one:
+        $draft = false;
+        if (Gdn::session()->UserID && $discussion) {
+            $draftModel = new DraftModel();
+            $draft = $draftModel->getByUser(Gdn::session()->UserID, 0, 1, $discussion->DiscussionID)->firstRow();
+            $this->Form->addHidden('DraftID', $draft ? $draft->DraftID : '');
+        }
+
+        if ($draft) {
+            $this->Form->setFormValue('Body', $draft->Body);
+        } else {
+            // Look in the session stash for a comment
+            $stashComment = Gdn::session()->getPublicStash('CommentForForeignID_'.$foreignSource['vanilla_identifier']);
+            if ($stashComment) {
+                $this->Form->setValue('Body', $stashComment);
+                $this->Form->setFormValue('Body', $stashComment);
+            }
+        }
+
+        // Deliver JSON data if necessary
+        if ($this->_DeliveryType != DELIVERY_TYPE_ALL) {
+            if ($this->Discussion) {
+                $this->setJson('LessRow', $this->Pager->toString('less'));
+                $this->setJson('MoreRow', $this->Pager->toString('more'));
+            }
+            $this->View = 'comments';
+        }
+
+        // Ordering note for JS
+        if ($sortComments == 'desc') {
+            $this->addDefinition('PrependNewComments', '1');
+        }
+
+        // Report the discussion id so js can use it.
+        if ($discussion) {
+            $this->addDefinition('DiscussionID', $discussion->DiscussionID);
+        }
+
+        $this->fireEvent('BeforeDiscussionRender');
+        $this->render();
+    }
+
+    /**
+     * Redirect to the url specified by the discussion.
+     * @param array|object $discussion
+     */
+    protected function redirectDiscussion($discussion) {
+        $body = Gdn_Format::to(val('Body', $discussion), val('Format', $discussion));
+        if (preg_match('`href="([^"]+)"`i', $body, $matches)) {
+            $url = $matches[1];
+            redirectTo($url, 301);
+        }
+    }
+
+    /**
+     * Re-fetch a discussion's content based on its foreign url.
+     * @param type $discussionID
+     */
+    public function refetchPageInfo($discussionID) {
+        // Make sure we are posting back.
+        if (!$this->Request->isAuthenticatedPostBack(true)) {
+            throw permissionException('Javascript');
+        }
+
+        // Grab the discussion.
+        $discussion = $this->DiscussionModel->getID($discussionID);
+
+        if (!$discussion) {
+            throw notFoundException('Discussion');
+        }
+
+        // Make sure the user has permission to edit this discussion.
+        $this->categoryPermission($discussion->CategoryID, 'Vanilla.Discussions.Edit');
+
+        $foreignUrl = valr('Attributes.ForeignUrl', $discussion);
+        if (!$foreignUrl) {
+            throw new Gdn_UserException(t("This discussion isn't associated with a url."));
+        }
+
+        $stub = $this->DiscussionModel->fetchPageInfo($foreignUrl, true);
+
+        // Save the stub.
+        $this->DiscussionModel->setField($discussionID, (array)$stub);
+
+        // Send some of the stuff back.
+        if (isset($stub['Name'])) {
+            $this->jsonTarget('.PageTitle h1', Gdn_Format::text($stub['Name']));
+        }
+        if (isset($stub['Body'])) {
+            $this->jsonTarget("#Discussion_$discussionID .Message", Gdn_Format::to($stub['Body'], $stub['Format']));
+        }
+
+        $this->informMessage('The page was successfully fetched.');
+
+        $this->render('Blank', 'Utility', 'Dashboard');
+    }
+
+    protected function _setOpenGraph() {
+        if (!$this->Head) {
+            return;
+        }
+        $this->Head->addTag('meta', ['property' => 'og:type', 'content' => 'article']);
+    }
+}
diff --git a/vanilla/applications/vanilla/views/discussion/index.php b/vanilla/applications/vanilla/views/discussion/index.php
new file mode 100644
index 0000000..2aa6a3a
--- /dev/null
+++ b/vanilla/applications/vanilla/views/discussion/index.php
@@ -0,0 +1,82 @@
+<?php if (!defined('APPLICATION')) exit();
+$Session = Gdn::session();
+if (!function_exists('WriteComment'))
+    include $this->fetchViewLocation('helper_functions', 'discussion');
+
+// Wrap the discussion related content in a div.
+echo '<div class="MessageList Discussion">';
+
+// Write the page title.
+echo '<!-- Page Title -->
+<div id="Item_0" class="PageTitle">';
+
+echo '<div class="Options">';
+
+$this->fireEvent('BeforeDiscussionOptions');
+writeBookmarkLink();
+echo getDiscussionOptionsDropdown();
+writeAdminCheck();
+
+echo '</div>';
+
+echo '<h1>'.$this->data('Discussion.Name').'</h1>';
+
+echo "</div>\n\n";
+
+$this->fireEvent('AfterDiscussionTitle');
+$this->fireEvent('AfterPageTitle');
+
+// Write the initial discussion.
+if ($this->data('Page') == 1) {
+    include $this->fetchViewLocation('discussion', 'discussion');
+    echo '</div>'; // close discussion wrap
+
+    $this->fireEvent('AfterDiscussion');
+} else {
+    ?>
+    <div class="Item ItemDiscussion">
+        <div class="Item-BodyWrap">
+            <div class="Item-Body">
+                <?php
+                    Gdn::controller()->fireEvent('Replies');
+                ?>
+            </div>
+        </div>
+    </div>
+    <?php
+        echo '</div>'; // close discussion wrap
+}
+
+echo '<div class="CommentsWrap">';
+
+// Write the comments.
+$this->Pager->Wrapper = '<span %1$s>%2$s</span>';
+echo '<span class="BeforeCommentHeading">';
+$this->fireEvent('CommentHeading');
+echo $this->Pager->toString('less');
+echo '</span>';
+
+echo '<div class="DataBox DataBox-Comments">';
+if ($this->data('Comments')->numRows() > 0)
+    echo '<h2 class="CommentHeading">'.$this->data('_CommentsHeader', t('Comments')).'</h2>';
+?>
+    <ul class="MessageList DataList Comments">
+        <?php include $this->fetchViewLocation('comments'); ?>
+    </ul>
+<?php
+$this->fireEvent('AfterComments');
+if ($this->Pager->lastPage()) {
+    $LastCommentID = $this->addDefinition('LastCommentID');
+    if (!$LastCommentID || $this->Data['Discussion']->LastCommentID > $LastCommentID)
+        $this->addDefinition('LastCommentID', (int)$this->Data['Discussion']->LastCommentID);
+    $this->addDefinition('Vanilla_Comments_AutoRefresh', Gdn::config('Vanilla.Comments.AutoRefresh', 0));
+}
+echo '</div>';
+
+echo '<div class="P PagerWrap">';
+$this->Pager->Wrapper = '<div %1$s>%2$s</div>';
+echo $this->Pager->toString('more');
+echo '</div>';
+echo '</div>';
+
+writeCommentForm();