diff --git a/gigya_comments/gigya_comments.info b/gigya_comments/gigya_comments.info
new file mode 100644
index 0000000..e7136ce
--- /dev/null
+++ b/gigya_comments/gigya_comments.info
@@ -0,0 +1,6 @@
+; $Id: $
+name = Gigya comments plugin
+description = Adds the Gigya Comments Plugin as a block, for display on any node.
+core = 6.x
+
+dependencies[] = gigya
\ No newline at end of file
diff --git a/gigya_comments/gigya_comments.install b/gigya_comments/gigya_comments.install
new file mode 100644
index 0000000..6ceac3c
--- /dev/null
+++ b/gigya_comments/gigya_comments.install
@@ -0,0 +1,19 @@
+<?php
+// $Id: $
+
+/**
+ * @file
+ * Update and uninstall functions for the Gigya comments plugin module.
+ */
+
+/**
+ * Implements hook_uninstall
+ *
+ * Removes variables when module is uninstalled
+ */
+function gigya_comments_uninstall(){
+  variable_del('gigya_comments_category_id');
+  variable_del('gigya_comments_stream_id');
+  variable_del('gigya_comments_container_id');
+  variable_del('gigya_comments_cid');
+}
\ No newline at end of file
diff --git a/gigya_comments/gigya_comments.js b/gigya_comments/gigya_comments.js
new file mode 100644
index 0000000..fe56239
--- /dev/null
+++ b/gigya_comments/gigya_comments.js
@@ -0,0 +1,18 @@
+// $Id: $
+
+if (Drupal.settings.gigya_sharebar){
+  var conf = {  
+    APIKey: Drupal.settings.gigya_comments.APIKey 
+  }     
+
+  // Step 1: Define the Comments Plugin's params object.
+  var params = {   
+    categoryID: Drupal.settings.gigya_comments.categoryID,
+    streamID: Drupal.settings.gigya_comments.streamID,
+    containerID: Drupal.settings.gigya_comments.containerID,
+    cid: Drupal.settings.gigya_comments.cid  
+  };  
+
+  // Step 2: Load the Share Bar Plugin.   
+  gigya.services.socialize.showCommentsUI(conf,params);
+}
\ No newline at end of file
diff --git a/gigya_comments/gigya_comments.module b/gigya_comments/gigya_comments.module
new file mode 100644
index 0000000..3115be3
--- /dev/null
+++ b/gigya_comments/gigya_comments.module
@@ -0,0 +1,174 @@
+<?php
+// $Id: $
+
+/**
+ * @file
+ * Adds support for the Gigya comment plugin as a Drupal block.
+ */
+
+/**
+ *
+ * Implements hook_block
+ */
+function gigya_comments_block($op = 'list', $delta = 0, $edit = array()) {
+  if ($op == 'list') {
+    $blocks[0] = array(
+      'info' => t('Gigya comments plugin'), 
+      'weight' => 0, 
+    );
+
+    return $blocks;
+  }
+  else if ($op == 'view') {
+    switch ($delta) {
+      case 0:
+        // Your module will need to define this function to render the block.
+        $block = array(
+          'subject' => '', 
+          'content' => gigya_comments_display(),
+        );
+        break;
+    }
+    return $block;
+  }
+}
+
+function gigya_comments_display(){
+  $output = theme('gigya_comments');
+  
+  // Assemble all the settings needed
+  $category_id = variable_get('gigya_comments_category_id', '');
+  $stream_id = variable_get('gigya_comments_stream_id', '');
+  $container_id = variable_get('gigya_comments_container_id', 'gigya-comments-plugin');
+  $cid = variable_get('gigya_comments_cid', '');
+  
+  // Throw a nice error if the comments plugin has nothing to render:
+  if ($category_id == '') {
+    drupal_set_message(t('The Gigya comment plugin still needs to be <a href="!path">configured</a>.', array('!path' => base_path() . 'admin/settings/gigya/comments')), 'warning');
+  }
+  
+  
+  // Set all the above as Drupal settings.
+  drupal_add_js(array('gigya_comments' => array(
+      'APIKey' => variable_get('gigya_APIKey', ''),
+      'categoryID' => $category_id,
+      'streamID' => $stream_id,
+      'containerID' => $container_id,
+      'cid' => $cid,
+      )
+    ), 'setting');
+  
+  return $output;
+}
+
+/**
+ * Implements hook_menu_alter
+ *
+ * Adds a menu local task for the gigya settings page.
+ */
+function gigya_comments_menu_alter(&$items){
+  if (isset($items['admin/settings/gigya']) && !isset($items['admin/settings/gigya/socalize']){
+    $items['admin/settings/gigya/socalize'] = array(
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+      'title' => 'Socialize',
+      'access arguments' => array('administer gigya'),
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('gigya_admin_form'),
+      'description' => 'Gigya socialize configuration.',
+      'file' => 'gigya.admin.inc',
+      'weight' => -1,
+    );
+  }
+}
+
+/**
+ * Implements hook_menu
+ *
+ * Adds a settings page for comments plugin.
+ */
+function gigya_comments_menu() {
+  $items['admin/settings/gigya/comments'] = array(
+    'title' => 'Comments', 
+    'description' => 'Gigya comment plugin settings.', 
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('gigya_comment_settings_form'), 
+    'access arguments' => array('administer gigya'), 
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 1,
+  );
+  
+  return $items;
+}
+
+function gigya_comment_settings_form(){
+  $form = array();
+  
+  $form['gigya_comments_category_id'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Category ID'),
+    '#default_value' => variable_get('gigya_comments_category_id', ''),
+    '#description' => t('The comment category must first be established in your <a href="http://www.gigya.com/site/partners/settings.aspx#&&userstate=commentssetup">Gigya account</a>. Your category ID can be retrieved from the Embed code provided.'),
+    '#required' => TRUE,
+  );
+  
+  $form['gigya_comments_stream_id'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Stream ID'),
+    '#default_value' => variable_get('gigya_comments_stream_id', ''),
+    '#description' => t('Your stream ID can be retrieved from the Embed code provided.'),
+  );
+  
+  $form['gigya_comments_cid'] = array(
+    '#type' => 'textfield',
+    '#title' => t('cid'),
+    '#default_value' => variable_get('gigya_comments_cid', ''),
+    '#description' => t('Your stream ID can be retrieved from the Embed code provided.'),
+  );
+  
+  $form['gigya_comments_container_id'] = array(
+    '#type' => 'textfield',
+    '#title' => t('CSS ID of the comments container'),
+    '#default_value' => variable_get('gigya_comments_container_id', 'gigya-comments-plugin'),
+    '#description' => t('DO NOT CHANGE THIS SETTING unless you plan to theme the Gigya comments container.'),
+  );
+  
+  return system_settings_form($form);
+}
+
+/**
+ * Implements hook_init
+ *
+ * Add all the js here, to speed page load w/ aggregation enabled.
+ */
+function gigya_comments_init(){
+  drupal_add_js(drupal_get_path('module', 'gigya_comments') . '/gigya_comments.js', 'module', 'footer');
+}
+
+/**
+ * Helper function
+ *
+ * Adds the external Gigya JS file to the $scripts var in page.
+ */
+function gigya_comments_preprocess_page(&$vars){
+  $apikey = variable_get('gigya_APIKey', '');
+  $vars['scripts'] .= '<script type="text/javascript" src="http://cdn.gigya.com/JS/socialize.js?apiKey=' . $apikey . "\"></script>\n";
+}
+
+/**
+ * Implements hook_theme
+ */
+function gigya_comments_theme(){
+  return array(
+    'gigya_comments' => array(
+          'arguments' => array(),
+        ),
+  );
+}
+
+/**
+ * Implements hook_theme
+ */
+function theme_gigya_comments(){
+  $output = '<div id="gigya-comments-plugin"></div>';
+  return $output;
+}
\ No newline at end of file