diff --git a/plugins/page_manager/tasks/nodedraft.inc b/plugins/page_manager/tasks/nodedraft.inc
new file mode 100644
index 0000000..26a5fc3
--- /dev/null
+++ b/plugins/page_manager/tasks/nodedraft.inc
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * Specialized implementation of hook_page_manager_task_tasks(). See api-task.html for
+ * more information.
+ */
+function workbench_moderation_nodedraft_page_manager_tasks() {
+
+  return array(
+    // This is a 'page' task and will fall under the page admin UI
+    'task type' => 'page',
+
+    'title' => t('Node Draft'),
+    'admin title' => t('The draft page for moderated nodes.'),
+    'admin description' => t('When enabled, this overrides the default node view at node/%node/draft'),
+    'admin path' => 'node/%node/draft',
+
+    // Menu hooks so that we can alter the node/%node menu entry to point to us.
+    'hook menu alter' => 'workbench_moderation_nodedraft_menu_alter',
+
+    // This is task uses 'context' handlers and must implement these to give the
+    // handler data it needs.
+    'handler type' => 'context',
+    'get arguments' => 'workbench_moderation_nodedraft_get_arguments',
+    'get context placeholders' => 'workbench_moderation_nodedraft_get_contexts',
+
+    // Allow this to be enabled or disabled:
+    'disabled' => variable_get('workbench_moderation_nodedraft_disabled', TRUE),
+    'enable callback' => 'workbench_moderation_nodedraft_enable',
+  );
+}
+
+/**
+ * Callback defined by workbench_moderation_nodedraft_page_manager_tasks().
+ *
+ * Alter menu item so that admin/workbench comes here.
+ */
+function workbench_moderation_nodedraft_menu_alter(&$items, $task) {
+
+  if (variable_get('workbench_moderation_nodedraft_disabled', TRUE)) {
+    return;
+  }
+
+  $callback = $items['node/%node/draft']['page callback'];
+  // Override the node edit handler for our purpose.
+  if ($callback == 'workbench_moderation_node_view_draft' || variable_get('page_manager_override_anyway', FALSE)) {
+    $items['node/%node/draft']['page callback'] = 'workbench_moderation_nodedraft';
+    $items['node/%node/draft']['file path'] = $task['path'];
+    $items['node/%node/draft']['file'] = $task['file'];
+  }
+
+  else {
+    //variable_set('workbench_moderation_nodedraft_disabled', TRUE);
+    if (!empty($GLOBALS['page_manager_enabling_workbench'])) {
+      drupal_set_message(t('Page manager module is unable to enable Workbench Moderation Draft Node because some other module already has overridden with %callback.', array('%callback' => $callback)), 'warning');
+    }
+    return;
+  }
+}
+
+/**
+ * Entry point for our overridden My Workbench.
+ *
+ * This function asks its assigned handlers who, if anyone, would like
+ * to run with it. If no one does, it passes through to the main node draft page.
+ */
+function workbench_moderation_nodedraft($node) {
+  // Load my task plugin
+  $task = page_manager_get_task('nodedraft');
+
+  // Get the most recent revision to pass to the task handler.
+  $current_node = workbench_moderation_node_current_load($node);
+
+  // Load the node into a context.
+  ctools_include('context');
+  ctools_include('context-task-handler');
+  $contexts = ctools_context_handler_get_task_contexts($task, '', array($current_node));
+
+  $output = ctools_context_handler_render($task, '', $contexts, array($current_node->nid));
+  if ($output !== FALSE) {
+    return $output;
+  }
+
+  module_load_include('inc', 'workbench_moderation', 'workbench_moderation.node');
+  $function = 'workbench_moderation_node_view_draft';
+  foreach (module_implements('page_manager_override') as $module) {
+    $call = $module . '_page_manager_override';
+    if (($rc = $call('workbench')) && function_exists($rc)) {
+      $function = $rc;
+      break;
+    }
+  }
+
+  // Otherwise, fall back.
+  return $function($node);
+}
+
+/**
+ * Callback to enable/disable the page from the UI.
+ */
+function workbench_moderation_nodedraft_enable($cache, $status) {
+  variable_set('workbench_moderation_nodedraft_disabled', $status);
+  // Set a global flag so that the menu routine knows it needs
+  // to set a message if enabling cannot be done.
+  if (!$status) {
+    $GLOBALS['page_manager_enabling_workbench'] = TRUE;
+  }
+}
+
+/**
+ * Callback to get arguments provided by this task handler.
+ *
+ * Since this is the node view and there is no UI on the arguments, we
+ * create dummy arguments that contain the needed data.
+ */
+function workbench_moderation_nodedraft_get_arguments($task, $subtask_id) {
+  return array(
+    array(
+      'keyword' => 'node',
+      'identifier' => t('Node draft being viewed'),
+      'id' => 1,
+      'name' => 'entity_id:node',
+      'settings' => array(),
+    ),
+  );
+}
+
+/**
+ * Callback to get context placeholders provided by this handler.
+ */
+function workbench_moderation_nodedraft_get_contexts($task, $subtask_id) {
+  return ctools_context_get_placeholders_from_argument(page_manager_node_view_get_arguments($task, $subtask_id));
+}
diff --git a/plugins/page_manager/tasks/noderevision.inc b/plugins/page_manager/tasks/noderevision.inc
new file mode 100644
index 0000000..ec56bde
--- /dev/null
+++ b/plugins/page_manager/tasks/noderevision.inc
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * Specialized implementation of hook_page_manager_task_tasks(). See api-task.html for
+ * more information.
+ */
+function workbench_moderation_noderevision_page_manager_tasks() {
+
+  return array(
+    // This is a 'page' task and will fall under the page admin UI
+    'task type' => 'page',
+
+    'title' => t('Node Revision'),
+    'admin title' => t('The revision page for moderated nodes.'),
+    'admin description' => t('When enabled, this overrides the default node view at node/%node/revisions/%/view'),
+    'admin path' => 'node/%node/revisions/%/view',
+
+    // Menu hooks so that we can alter the node/%node menu entry to point to us.
+    'hook menu alter' => 'workbench_moderation_noderevision_menu_alter',
+
+    // This is task uses 'context' handlers and must implement these to give the
+    // handler data it needs.
+    'handler type' => 'context',
+    'get arguments' => 'workbench_moderation_noderevision_get_arguments',
+    'get context placeholders' => 'workbench_moderation_noderevisoin_get_contexts',
+
+    // Allow this to be enabled or disabled:
+    'disabled' => variable_get('workbench_moderation_noderevision_disabled', TRUE),
+    'enable callback' => 'workbench_moderation_noderevision_enable',
+  );
+}
+
+/**
+ * Callback defined by workbench_moderation_noderevision_page_manager_tasks().
+ *
+ * Alter menu item so that admin/workbench comes here.
+ */
+function workbench_moderation_noderevision_menu_alter(&$items, $task) {
+
+  if (variable_get('workbench_moderation_noderevision_disabled', TRUE)) {
+    return;
+  }
+
+  $callback = $items['node/%node/revisions/%/view']['page callback'];
+  // Override the node edit handler for our purpose.
+  if ($callback == 'workbench_moderation_node_view_revision' || variable_get('page_manager_override_anyway', FALSE)) {
+    $items['node/%node/revisions/%/view']['page callback'] = 'workbench_moderation_noderevision';
+    $items['node/%node/revisions/%/view']['file path'] = $task['path'];
+    $items['node/%node/revisions/%/view']['file'] = $task['file'];
+  }
+
+  else {
+    variable_set('workbench_moderation_noderevision_disabled', TRUE);
+    if (!empty($GLOBALS['page_manager_enabling_workbench_noderevision'])) {
+      drupal_set_message(t('Page manager module is unable to enable Workbench Moderation Revision Node because some other module already has overridden with %callback.', array('%callback' => $callback)), 'warning');
+    }
+    return;
+  }
+}
+
+/**
+ * Entry point for our overridden My Workbench.
+ *
+ * This function asks its assigned handlers who, if anyone, would like
+ * to run with it. If no one does, it passes through to the main node draft page.
+ */
+function workbench_moderation_noderevision($node) {
+  // Load my task plugin
+  $task = page_manager_get_task('noderevision');
+
+  // Load the node into a context.
+  ctools_include('context');
+  ctools_include('context-task-handler');
+  $contexts = ctools_context_handler_get_task_contexts($task, '', array($node));
+
+  $output = ctools_context_handler_render($task, '', $contexts, array($node->nid));
+  if ($output !== FALSE) {
+    return $output;
+  }
+
+  module_load_include('inc', 'workbench_moderation', 'workbench_moderation.node');
+  $function = 'workbench_moderation_node_view_revision';
+  foreach (module_implements('page_manager_override') as $module) {
+    $call = $module . '_page_manager_override';
+    if (($rc = $call('workbench')) && function_exists($rc)) {
+      $function = $rc;
+      break;
+    }
+  }
+
+  // Otherwise, fall back.
+  return $function($node);
+}
+
+/**
+ * Callback to enable/disable the page from the UI.
+ */
+function workbench_moderation_noderevision_enable($cache, $status) {
+  variable_set('workbench_moderation_noderevision_disabled', $status);
+  // Set a global flag so that the menu routine knows it needs
+  // to set a message if enabling cannot be done.
+  if (!$status) {
+    $GLOBALS['page_manager_enabling_workbench_noderevision'] = TRUE;
+  }
+}
+
+/**
+ * Callback to get arguments provided by this task handler.
+ *
+ * Since this is the node view and there is no UI on the arguments, we
+ * create dummy arguments that contain the needed data.
+ */
+function workbench_moderation_noderevision_get_arguments($task, $subtask_id) {
+  return array(
+    array(
+      'keyword' => 'node',
+      'identifier' => t('Node revision being viewed'),
+      'id' => 1,
+      'name' => 'entity_id:node',
+      'settings' => array(),
+    ),
+  );
+}
+
+/**
+ * Callback to get context placeholders provided by this handler.
+ */
+function workbench_moderation_noderevision_get_contexts($task, $subtask_id) {
+  return ctools_context_get_placeholders_from_argument(page_manager_node_view_get_arguments($task, $subtask_id));
+}
diff --git a/workbench_moderation.module b/workbench_moderation.module
index 5ccb921..98f1acd 100644
--- a/workbench_moderation.module
+++ b/workbench_moderation.module
@@ -126,6 +126,12 @@ function workbench_moderation_menu_alter(&$items) {
   $items['node/%node/revisions']['page callback'] = 'workbench_moderation_node_revisions_redirect';
   $items['node/%node/revisions']['page arguments'] = array(1);
 
+  // Override the node revision view callback.
+ $items['node/%node/revisions/%/view']['page callback'] = 'workbench_moderation_node_view_revision';
+ $items['node/%node/revisions/%/view']['file path'] = drupal_get_path('module', 'workbench_moderation');
+ $items['node/%node/revisions/%/view']['file'] = 'workbench_moderation.node.inc';
+
+
   // For revert and delete operations, use our own access check.
   $items['node/%node/revisions/%/revert']['access callback'] = '_workbench_moderation_revision_access';
   $items['node/%node/revisions/%/delete']['access callback'] = '_workbench_moderation_revision_access';
@@ -1842,3 +1848,23 @@ function workbench_moderation_workbench_block() {
 
   return $output;
 }
+
+/**
+ * Implements hook_ctools_plugin_directory() to let the system know
+ * where our task and task_handler plugins are.
+ */
+function workbench_moderation_ctools_plugin_directory($owner, $plugin_type) {
+  if ($owner == 'page_manager') {
+    return 'plugins/page_manager/' . $plugin_type;
+  }
+}
+
+/**
+ * Implements hook_ctools_plugin_api().
+ */
+function workbench_moderation_ctools_plugin_api($module, $api) {
+
+  if ($module == 'page_manager' && $api == 'pages_default') {
+    return array('version' => 1);
+  }
+}
diff --git a/workbench_moderation.node.inc b/workbench_moderation.node.inc
index ddbce3c..3c8b4f9 100644
--- a/workbench_moderation.node.inc
+++ b/workbench_moderation.node.inc
@@ -21,6 +21,26 @@ function workbench_moderation_node_current_view($node) {
 }
 
 /**
+ * Get the menu router item for nodes.
+ *
+ * @param $node
+ *   The node being acted upon.
+ * @return
+ *   A fully themed node page.
+ */
+function workbench_moderation_router_item_page_callback($node) {
+  $router_item = menu_get_item('node/' . $node->nid);
+  if ($router_item['include_file']) {
+    require_once DRUPAL_ROOT . '/' . $router_item['include_file'];
+  }
+
+  // Call whatever function is assigned to the main node path but pass the
+  // current node as an argument. This approach allows for the reuse of of Panel
+  // definition acting on node/%node.
+  return $router_item['page_callback']($node);
+
+}
+/**
  * Displays the current draft the node, if it is not published.
  *
  * @param $node
@@ -31,7 +51,20 @@ function workbench_moderation_node_current_view($node) {
  */
 function workbench_moderation_node_view_draft($node) {
   $current_node = workbench_moderation_node_current_load($node);
-  return node_page_view($current_node);
+  return workbench_moderation_router_item_page_callback($current_node);
+}
+
+/**
+ * Displays a specific revisison of the node.
+ *
+ * @param $node
+ *   The node being acted upon.
+ *
+ * @return
+ *   A fully themed node page.
+ */
+function workbench_moderation_node_view_revision($node) {
+  return workbench_moderation_router_item_page_callback($node);
 }
 
 /**
