diff --git a/plugins/context_admin/noderef_create_node.inc b/plugins/context_admin/noderef_create_node.inc
index 3ec51a3..30dd631 100644
--- a/plugins/context_admin/noderef_create_node.inc
+++ b/plugins/context_admin/noderef_create_node.inc
@@ -29,6 +29,11 @@ function context_admin_noderef_create_node_content_form($form, &$form_state, $ca
       isset($cache->handlers[$form_state['handler_id']]->conf['context_admin_content_types']) ? 
         $cache->handlers[$form_state['handler_id']]->conf['context_admin_content_types'] : 
         NULL;
+    $node_edit = isset($form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_use_node_edit']) ? 
+      $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_use_node_edit'] : 
+      isset($cache->handlers[$form_state['handler_id']]->conf['context_admin_use_node_edit']) ? 
+        $cache->handlers[$form_state['handler_id']]->conf['context_admin_use_node_edit'] : 
+        NULL;
     $forward = isset($form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_autoforward']) ? 
       $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_autoforward'] : 
       isset($cache->handlers[$form_state['handler_id']]->conf['context_admin_autoforward']) ? 
@@ -83,15 +88,20 @@ function context_admin_noderef_create_node_content_form($form, &$form_state, $ca
         '#dependency' => array('radio:context_admin[context_admin_options_items]' => array($key)),
         '#prefix' => '<div id="edit-context-admin-content-types-'. str_replace('_', '-', $key) .'-wrapper"><div>',
         '#suffix' => '</div></div>',
-        '#default_value' => $type_fields[$key],
+        '#default_value' => isset($type_fields[$key]),
       );
     }
+    $form['context_admin_use_node_edit'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Render the Add form using panels and page manager (enable node/%node/edit in page manager).  Unchecked renders Add form with Drupal\'s node templating system.'),
+      '#default_value' => $node_edit,
+    );
     $form['context_admin_autoforward'] = array(
       '#type' => 'checkbox',
       '#title' => t('Forward the user back to the node they were on before they created this node.'),
       '#default_value' => $forward,
     );
-
+    
     $form['context_admin_custom_redirect'] = array(
       '#type' => 'textfield',
       '#title' => t('Custom redirect path'),
@@ -130,6 +140,7 @@ function context_admin_noderef_create_node_content_form_submit($form, &$form_sta
     unset($form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_content_types']);
     $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_content_types'][$form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options_items']] = $form_state['values']['context_admin']['content_types'][$form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options_items']];
     $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_field'] = $form_state['values']['context_admin']['content_types'][$form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_options_items']];
+    $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_use_node_edit'] = $form_state['values']['context_admin_use_node_edit'];
     $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_autoforward'] = $form_state['values']['context_admin_autoforward'];
     $form_state['page']->handlers[$form_state['handler_id']]->conf['context_admin_custom_redirect'] = $form_state['values']['context_admin_custom_redirect'];
   }
@@ -138,6 +149,7 @@ function context_admin_noderef_create_node_content_form_submit($form, &$form_sta
     unset($form_state['page']->new_handler->conf['context_admin_content_types']);
     $form_state['page']->new_handler->conf['context_admin_content_types'][$form_state['page']->new_handler->conf['context_admin_options_items']] = $form_state['values']['context_admin']['content_types'][$form_state['page']->new_handler->conf['context_admin_options_items']];
     $form_state['page']->new_handler->conf['context_admin_field'] = $form_state['values']['context_admin']['content_types'][$form_state['page']->new_handler->conf['context_admin_options_items']];
+    $form_state['page']->new_handler->conf['context_admin_use_node_edit'] = $form_state['values']['context_admin_use_node_edit'];
     $form_state['page']->new_handler->conf['context_admin_autoforward'] = $form_state['values']['context_admin_autoforward'];
     $form_state['page']->new_handler->conf['context_admin_custom_redirect'] = $form_state['values']['context_admin_custom_redirect'];
   }
@@ -146,12 +158,12 @@ function context_admin_noderef_create_node_content_form_submit($form, &$form_sta
 }
 
 function context_admin_noderef_create_node_render_page($handler, $base_contexts, $args, $test = TRUE) {
-  $page = page_manager_get_current_page();
-  $type = $handler->conf['context_admin_options_items'];
-  module_load_include('inc', 'node', 'node.pages');
   global $user;
-
+  
+  $type = $handler->conf['context_admin_options_items'];
   $types = node_type_get_types();
+  
+  // Initialize settings:
   $node = (object) array(
     'uid' => $user->uid,
     'name' => (isset($user->name) ? $user->name : ''),
@@ -159,10 +171,24 @@ function context_admin_noderef_create_node_render_page($handler, $base_contexts,
     'language' => LANGUAGE_NONE,
     $handler->conf['context_admin_field'] => array('und' => array(0 => array('nid' => $base_contexts[$handler->conf['submitted_context']]->data->nid))),
   );
-  drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
-  $output = drupal_get_form($type . '_node_form', $node);
 
-  return $output;
+  // Render the form
+  if ($handler->conf['context_admin_use_node_edit']) {
+    // Render form using Page Manager's node/%node/edit page
+    // Requires node/%node/edit page to be enabled.  Check for this and disable checkbox above?  FIXME
+    ctools_include("plugins");
+    $plugin = ctools_get_plugins("page_manager", "tasks", "node_edit");
+    global $user;
+    drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)));
+    return page_manager_node_edit($node);
+  } else {
+    // Default: Render form, using drupal's node template system 
+    $page = page_manager_get_current_page();
+    module_load_include('inc', 'node', 'node.pages');
+    drupal_set_title(t('Create @name', array('@name' => $types[$type]->name)), PASS_THROUGH);
+    $output = drupal_get_form($type . '_node_form', $node);
+    return $output;
+  }  
 }
 
 function context_admin_noderef_create_node_form_alter(&$form, &$form_state, $form_id, $page) {