diff --git a/css/collapsible-div.css b/css/collapsible-div.css
index 0f900474a91494c9a42f9b65da82c2641431a643..e241128d191ac7f21a4ee647405959879bfbdffa 100644
--- a/css/collapsible-div.css
+++ b/css/collapsible-div.css
@@ -10,6 +10,10 @@
   background-image: url(../images/collapsible-expanded.png);
 }
 
+.ctools-collapsible-container .ctools-collapsible-handle {
+  cursor: pointer;
+}
+
 .ctools-collapsible-container .ctools-toggle-collapsed {
   background-image: url(../images/collapsible-collapsed.png);
 }
diff --git a/delegator/css/task-handlers.css b/delegator/css/task-handlers.css
index c1624c07bc8946d82327202591a429c894b2a025..b937812c5cbe2cdb483981c799a2510b17364318 100644
--- a/delegator/css/task-handlers.css
+++ b/delegator/css/task-handlers.css
@@ -46,3 +46,20 @@
   padding-right: .75em;
 }
 
+#delegator-task-list-arrange td {
+  vertical-align: top;
+}
+
+#delegator-task-list-arrange tr.delegator-collapsible td {
+  padding-left: 4em;
+}
+
+#delegator-task-list-arrange tr.draggable .ctools-collapsible-content {
+  display: none;
+}
+
+/*
+#delegator-task-list-arrange tr.delegator-collapsible div.ctools-collapsible-content {
+  display: block;
+}
+*/
diff --git a/delegator/delegator.admin.inc b/delegator/delegator.admin.inc
index 600f03bce28535430f869b52c72dc90616aed4bf..30fff233928289fa306fc51ded128b10b108d660 100644
--- a/delegator/delegator.admin.inc
+++ b/delegator/delegator.admin.inc
@@ -266,6 +266,10 @@ function delegator_admin_list_form(&$form_state) {
       '#value' => $title,
     );
 
+    $form['handlers'][$id]['summary'] = array(
+      '#value' => delegator_get_handler_summary($plugin, $handler, $task, $form_state['subtask_id']),
+    );
+
     $form['handlers'][$id]['weight'] = array(
       '#type' => 'weight',
       '#default_value' => $info['weight'],
@@ -441,7 +445,12 @@ function theme_delegator_admin_list_form($form) {
         'class' => 'delegator-changed-col',
       );
 
-      $title = theme('ctools_collapsible', drupal_render($element['title']), 'Imagine content here, please', TRUE);
+      if ($summary = drupal_render($element['summary'])) {
+        $title = theme('ctools_collapsible', drupal_render($element['title']), $summary, TRUE);
+      }
+      else {
+        $title = drupal_render($element['title']);
+      }
 
       $row[] = array(
         'data' => $title,
diff --git a/delegator/delegator.module b/delegator/delegator.module
index 6a23cc162309024be5afe1b3f0fd30acafd6d5c4..938d6d8f02eb2682a30275e71c9896879c97e291 100644
--- a/delegator/delegator.module
+++ b/delegator/delegator.module
@@ -394,6 +394,15 @@ function delegator_get_handler_title($plugin, $handler, $task, $subtask_id) {
   }
 }
 
+/**
+ * Get the admin summary (additional info) for a given handler.
+ */
+function delegator_get_handler_summary($plugin, $handler, $task, $subtask_id) {
+  if ($function = ctools_plugin_get_function($plugin, 'admin summary')) {
+    return $function($handler, $task, $subtask_id);
+  }
+}
+
 /**
  * Implementation of hook_ctools_plugin_dierctory() to let the system know
  * we implement task and task_handler plugins.
diff --git a/delegator/help/api-task-handler.html b/delegator/help/api-task-handler.html
index 72e6937bd5e028b1a8539eb00f4c2e42267bde8b..ff45d873da17f48b643d5a26adb5fd824cc381da 100644
--- a/delegator/help/api-task-handler.html
+++ b/delegator/help/api-task-handler.html
@@ -4,7 +4,9 @@ task handler definition:
   description -- description of the task handler.
   task type -- The type of the task this handler can service.
   render -- callback of the function to render the handler. The arguments to this callback are specific to the task type.
-  title callback -- callback to render the admin title as this handler is listed.
+  admin title -- callback to render the admin title as this handler is listed.
+    params: $handler, $task, $subtask_id
+  admin summary -- callback to render what's in the collapsible info as the handler is listed. Optional.
     params: $handler, $task, $subtask_id
   default conf -- either an array() of default conf data or a callback that returns an array.
     params: $handler, $task, $subtask_id
@@ -36,5 +38,7 @@ task handler definition:
    'id2' => t('tab name'),
  ),
 
+ If a form name is blank it is a 'hidden' form -- it has no tab but can still be reached.
+
 
 Notes: Because #required validation cannot be skipped when clicking cancel, please don't use it.
\ No newline at end of file
diff --git a/delegator/js/task-handlers.js b/delegator/js/task-handlers.js
index 8460c226c475f4ca9b87c54f6111b08346d18e88..4b666a3211beebc66e17e1b299a1bf3eb1f8d2c2 100644
--- a/delegator/js/task-handlers.js
+++ b/delegator/js/task-handlers.js
@@ -38,4 +38,41 @@ Drupal.behaviors.zzGoLastDelegatorTaskList = function(context) {
       $next.trigger('click');
     });
   });
-}
\ No newline at end of file
+}
+
+Drupal.Delegator = {};
+
+Drupal.Delegator.CollapsibleCallback = function($container, handle, content, toggle) {
+  var $parent = $container.parents('tr.draggable');
+  var id = $parent.attr('id') + '-collapse';
+  if (toggle.hasClass('ctools-toggle-collapsed')) {
+    // Force any other item to close, like an accordion:
+    $('#delegator-task-list-arrange .ctools-toggle:not(.ctools-toggle-collapsed)').trigger('click');
+    // Closed, about to be opened.
+    var tr = '<tr class="delegator-collapsible" id="' + id + '"><td colspan=4></td></tr>';
+    $parent.after(tr);
+    $('#' + id + ' td').append(content);
+    $('#' + id).addClass($parent.attr('class'));
+  }
+};
+
+Drupal.Delegator.CollapsibleCallbackAfterToggle = function($container, handle, content, toggle) {
+  var $parent = $container.parents('tr.draggable');
+  var id = $parent.attr('id') + '-collapse';
+  if (toggle.hasClass('ctools-toggle-collapsed')) {
+    // Was just closed.
+    content.hide();
+    handle.after(content);
+    $('#' + id).remove();
+  }
+};
+
+$(document).ready(function() {
+  Drupal.CTools.CollapsibleCallbacks.push(Drupal.Delegator.CollapsibleCallback);
+  Drupal.CTools.CollapsibleCallbacksAfterToggle.push(Drupal.Delegator.CollapsibleCallbackAfterToggle);
+
+  // Force all our accordions to close when tabledragging to prevent ugliness:
+  $('#delegator-task-list-arrange .tabledrag-handle').mousedown(function() {
+    $('#delegator-task-list-arrange .ctools-toggle:not(.ctools-toggle-collapsed)').trigger('click');
+  });
+});
\ No newline at end of file
diff --git a/help/plugins-creating.html b/help/plugins-creating.html
index b447dfdd90c98690e323fba6aebb2777f62f8ae1..ac4db84f8c5b816a746be1b31e2e85d5f701c46a 100644
--- a/help/plugins-creating.html
+++ b/help/plugins-creating.html
@@ -25,4 +25,15 @@ Automatically filled in data:
   name
   module
   path
-  file
\ No newline at end of file
+  file
+
+
+General feature for callbacks:
+  either 'function_name' or
+  array(
+    'file' => 'filename',
+    'path' => 'filepath', // optional
+    'function' => 'function_name'
+  ),
+
+  Using ctools_plugin_get_function() of ctools_plugin_load_function() will take advantage.
\ No newline at end of file
diff --git a/includes/plugins.inc b/includes/plugins.inc
index 4d9d09b68aefecc56deb7f040b1882087ac1cef5..d5b843ebb7ad2035c43cd261964abee9d69e61cf 100644
--- a/includes/plugins.inc
+++ b/includes/plugins.inc
@@ -257,11 +257,30 @@ function _ctools_get_plugins($module, $type, $id = NULL) {
 function ctools_plugin_get_function($plugin, $function_name) {
   // If cached the .inc file may not have been loaded. require_once is quite safe
   // and fast so it's okay to keep calling it.
-  if ($plugin['file']) {
+  if (isset($plugin['file'])) {
     require_once './' . $plugin['path'] . '/' . $plugin['file'];
   }
-  if (isset($plugin[$function_name]) && function_exists($plugin[$function_name])) {
-    return $plugin[$function_name];
+
+  if (!isset($plugin[$function_name])) {
+    return;
+  }
+
+  if (is_array($plugin[$function_name]) && isset($plugin[$function_name]['function'])) {
+    $function = $plugin[$function_name]['function'];
+    if (isset($plugin[$function_name]['file'])) {
+      $file = $plugin[$function_name]['file'];
+      if (isset($plugin[$function_name]['path'])) {
+        $file = $plugin[$function_name]['path'] . '/' . $file;
+      }
+      require_once './' . $file;
+    }
+  }
+  else {
+    $function = $plugin[$function_name];
+  }
+
+  if (function_exists($function)) {
+    return $function;
   }
 }
 
diff --git a/js/collapsible-div.js b/js/collapsible-div.js
index c453eb5f33c4acd3f944a2a5e7d29dd6b1380565..a51035c1992b0c7af17a221e7d2b450606920f6b 100644
--- a/js/collapsible-div.js
+++ b/js/collapsible-div.js
@@ -21,6 +21,10 @@ if (!Drupal.CTools) {
  * a class, which will cause the container to draw collapsed.
  */
 
+// Set up an array for callbacks.
+Drupal.CTools.CollapsibleCallbacks = [];
+Drupal.CTools.CollapsibleCallbacksAfterToggle = [];
+
 /**
  * Bind collapsible behavior to a given container.
  */
@@ -40,15 +44,27 @@ Drupal.CTools.bindCollapsible = function() {
       content.hide();
     }
 
-    // Let both the toggle and the handle be clickable.
-    toggle.click(function() {
-      content.slideToggle(20);
-      toggle.toggleClass('ctools-toggle-collapsed');
-    });
-    handle.click(function() {
-      content.slideToggle(20);
+    var afterToggle = function() {
+      if (Drupal.CTools.CollapsibleCallbacksAfterToggle) {
+        for (i in Drupal.CTools.CollapsibleCallbacksAfterToggle) {
+          Drupal.CTools.CollapsibleCallbacksAfterToggle[i]($container, handle, content, toggle);
+        }
+      }
+    }
+    
+    var clickMe = function() {
+      if (Drupal.CTools.CollapsibleCallbacks) {
+        for (i in Drupal.CTools.CollapsibleCallbacks) {
+          Drupal.CTools.CollapsibleCallbacks[i]($container, handle, content, toggle);
+        }
+      }
+      content.slideToggle(100, afterToggle);
       toggle.toggleClass('ctools-toggle-collapsed');
-    });
+    }
+
+    // Let both the toggle and the handle be clickable.
+    toggle.click(clickMe);
+    handle.click(clickMe);
   }
 };