diff --git a/plugins/contexts/webform_submission.inc b/plugins/contexts/webform_submission.inc
new file mode 100644
index 0000000..498903b
--- /dev/null
+++ b/plugins/contexts/webform_submission.inc
@@ -0,0 +1,76 @@
+<?php
+
+include_once(drupal_get_path('module', 'webform') . '/includes/webform.submissions.inc');
+
+/**
+ * @file
+ * Webform sybmission ctools context type plugin.
+ *
+ */
+/**
+ * Plugins are described by creating a $plugin array which will be used
+ * by the system that includes this file.
+ */
+$plugin = array(
+  'title' => t('webform submisssion'),
+  'description' => t('Webform submission context'),
+  'context' => 'webform_context_create_webform_submission', // func to create context
+  'context name' => 'webform_submission',
+  'keyword' => 'webform',
+  'settings form' => 'webform_submission_setting_form',
+);
+
+/**
+ * Create a context, either from manual configuration or from an argument on the URL.
+ *
+ * @param $empty
+ *   If true, just return an empty context.
+ * @param $data
+ *   If from settings form, an array as from a form. If from argument, a string.
+ * @param $conf
+ *   TRUE if the $data is coming from admin configuration, FALSE if it's from a URL arg.
+ *
+ * @return
+ *   a Context object/
+ */
+function webform_context_create_webform_submission($empty, $data = NULL, $conf = FALSE) {
+  $context = new ctools_context('webform_submission');
+  $context->plugin = 'webform_submission';
+
+  if ($empty) {
+    return $context;
+  }
+  else {
+    $nid = arg(1);
+    $sid = arg(3);
+
+    $submission = webform_get_submission($nid, $sid);
+    $node = node_load($nid);
+    $components = $node->webform['components'];
+    $page_count = 1;
+    _webform_components_tree_build($components, $component_tree, 0, $page_count);
+
+    $data = new stdClass();
+
+    // Make sure at least one field is available
+    if (isset($component_tree['children'])) {
+      // Recursively add components to the form.
+      foreach ($component_tree['children'] as $cid => $component) {
+        $data->{$component['form_key']} = $submission->data[$cid]['value'][0];
+      }
+    }
+    $data->nid = $nid;
+    $data->sid = $sid;
+
+    $context->data = $data;
+
+    //dsm($data);
+  }
+  return $context;
+}
+
+function webform_submission_setting_form($conf, $external = FALSE) {
+  $form = array();
+
+  return $form;
+}
diff --git a/webform.info b/webform.info
index a47535b..428e242 100644
--- a/webform.info
+++ b/webform.info
@@ -4,6 +4,7 @@ description = Enables the creation of forms and questionnaires.
 core = 7.x
 package = Webform
 configure = admin/config/content/webform
+dependencies[] = ctools
 
 ; Files that contain classes:
 files[] = includes/webform.export.inc
diff --git a/webform.module b/webform.module
index 2559527..8424b24 100644
--- a/webform.module
+++ b/webform.module
@@ -3907,3 +3907,11 @@ function webform_mollom_form_info($form_id) {
 
   return $form_info;
 }
+
+/*
+ * Implementation of hook_ctools_plugin_dierctory() to let the system know
+ * we implement plugins.
+ */
+function webform_ctools_plugin_directory($module, $plugin) {
+  return 'plugins/' . $plugin;
+}
\ No newline at end of file