diff --git a/docroot/sites/all/modules/contrib/facebook_comments_box/facebook_comments_box.module b/docroot/sites/all/modules/contrib/facebook_comments_box/facebook_comments_box.module
index 38d70e3..aa2c323 100644
--- a/docroot/sites/all/modules/contrib/facebook_comments_box/facebook_comments_box.module
+++ b/docroot/sites/all/modules/contrib/facebook_comments_box/facebook_comments_box.module
@@ -24,74 +24,21 @@ function facebook_comments_box_menu() {
 /**
  * Implements hook_block().
  */
-function facebook_comments_box_block($op = 'list', $delta = 0, $edit = array()) {
+function facebook_comments_box_block($op = 'list', $delta = 'default', $edit = array()) {
   if ($op == 'list') {
-    $blocks['facebook_comments_box'] = array(
-      'info' => t('Facebook Comments Box'),
+    $blocks = array();
+    $blocks['default'] = array(
+      'info' => t('Facebook Comments Box (Default)'),
+    );
+    $blocks['second'] = array(
+      'info' => t('Facebook Comments Box (Secondary)'),
     );
     return $blocks;
-  } else if ($op == 'view') {
+  } 
+  elseif ($op == 'view') {
     $block = array();
-    switch ($delta) {
-      case 'facebook_comments_box':
-
-      $fcb_title = '';
-      $node_type = '';
-
-      // Get which node types should have comments.
-      $fcb_node_types = variable_get('facebook_comments_box_default_node_types', array(NULL));
-
-      // Figure out which node and nodetype we're on, puts comments only on
-      // nodes (as opposed to the front page, views pages, term pages, etc.)
-      if (arg(0) == 'node' && is_numeric(arg(1))) {
-        $nid       = arg(1);
-        $node      = node_load($nid);
-        $node_type = $node->type;
-        $fcb_title = check_plain($node->title);
-      }
-
-      // If the nodetype is set and selected in config, then load the comments
-      // on the page.
-      if (isset($node_type) && in_array($node_type, $fcb_node_types) && $node->status) {
-
-        // Figure out the current absolute URL.
-        $path = isset($_GET['q']) ? $_GET['q'] : '<front>';
-        $fcb_url = url($path, array('absolute' => TRUE));
-
-        // Meta mark up for the page.
-        $markup = '<meta property="og:type" content="Article" />';
-        $markup .= '<meta property="og:title" content="' . $fcb_title . '"/>';
-        $markup .= '<meta property="og:url" content="' . $fcb_url . '"/>';
-        //$markup .= '<meta property="og:image" content="' . theme_get_setting('logo') . '"/>';
-        $app_id = variable_get('facebook_comments_box_app_id', NULL);
-        if (isset($app_id) && !empty($app_id)) {
-          $markup .= '<meta property="fb:app_id" content="' . check_plain($app_id) . '">';
-        }
-        else {
-          $markup .= '<meta property="fb:admins" content="' . check_plain(variable_get('facebook_comments_box_admin_id', NULL)) . '">';
-        }
-
-        // Add meta data to the HEAD.
-        drupal_set_html_head($markup);
-
-        // Set the title of the block.
-        $block['subject'] = t('Facebook Comments Box');
-
-        // Set the content of the block.
-        $fcb_content = '<div class="facebook-comments-box">';
-        $fcb_content .= '<div id="fb-root"></div>';
-        // Emergency fix, we already have this script included in ifaw/page.tpl.php
-        // We can't add it twice, so removing it here pending a FB comments box patch for templates.
-        //$fcb_content .= '<script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script>';
-        $fcb_content .= '<fb:comments href="' . $fcb_url . '" ';
-        $fcb_content .= ' num_posts="' . check_plain(variable_get('facebook_comments_box_default_comments', 10)) . '" ';
-        $fcb_content .= ' width="' . check_plain(variable_get('facebook_comments_box_default_width', 400)) . '" ';
-        $fcb_content .= ' colorscheme="' . variable_get('facebook_comments_box_default_theme', 'light') . '" ></fb:comments></div>';
-
-        $block['content'] = $fcb_content;
-      }
-      break;
-    }
+    $fcb_content = _facebook_comments_box_content($delta);
+    $block['content'] = $fcb_content;
   }
   return $block;
 }
@@ -107,30 +54,40 @@ function facebook_comments_box_config() {
     '#title' => t('Global Settings'),
     '#collapsible' => TRUE,
   );
-
   $form['facebook_comments_box_global']['facebook_comments_box_admin_id'] = array(
     '#type' => 'textfield',
     '#title' => t('Facebook Admin ID'),
     '#default_value' => variable_get('facebook_comments_box_admin_id', NULL),
     '#description' => t('Your Facebook Admin Username or ID. More than one admin can be separated by commas, no spaces.'),
   );
-
   $form['facebook_comments_box_global']['facebook_comments_box_app_id'] = array(
     '#type' => 'textfield',
     '#title' => t('Facebook Application ID'),
     '#default_value' => variable_get('facebook_comments_box_app_id', NULL),
     '#description' => t('Your Facebook App ID. By setting an application ID, admin IDs will be ignored.'),
    );
+  // Store the node type keys as values for easier comparison.
+  $fcb_all_node_types_keys = array_keys(node_get_types());
+  $fcb_all_node_types = array();
+  foreach ($fcb_all_node_types_keys as $node_type) {
+    $fcb_all_node_types[$node_type] = $node_type;
+  }
+  $form['facebook_comments_box_global']['facebook_comments_box_default_node_types'] = array(
+    '#type' => 'select',
+    '#title' => t('Default Node Types'),
+    '#default_value' => variable_get('facebook_comments_box_default_node_types', NULL),
+    '#options' => $fcb_all_node_types,
+    '#multiple' => TRUE,
+    '#description' => t('The node types to attach comments to. This will make comments available for each of the selected node types.'),
+    '#required' => TRUE,
+  );
 
-  // Default settings for each block gets that you can configure and change by
-  // block // (the first version of this gets one global setting for all node
-  // types).
+  // Settings for the default block
   $form['facebook_comments_box_default_block'] = array(
     '#type' => 'fieldset',
     '#title' => t('Default Block Settings'),
     '#collapsible' => TRUE,
   );
-
   $form['facebook_comments_box_default_block']['facebook_comments_box_default_comments'] = array(
     '#type' => 'select',
     '#title' => t('Default Number of Comments'),
@@ -145,7 +102,6 @@ function facebook_comments_box_config() {
     '#description' => t('The number of comments to show by default on the page displaying them.'),
     '#required' => TRUE,
   );
-
   $form['facebook_comments_box_default_block']['facebook_comments_box_default_width'] = array(
     '#type' => 'textfield',
     '#title' => t('Default Width of Comments (in pixels)'),
@@ -155,7 +111,6 @@ function facebook_comments_box_config() {
     '#description' => t('The width of the comments with a minimum of 400px.'),
     '#required' => TRUE,
   );
-
   $form['facebook_comments_box_default_block']['facebook_comments_box_default_theme'] = array(
     '#type' => 'select',
     '#title' => t('Default Theme'),
@@ -167,23 +122,106 @@ function facebook_comments_box_config() {
     '#description' => t('The default theme to use for comments.'),
     '#required' => TRUE,
   );
+  
+  // Additional settings for a secondary block
+  $form['facebook_comments_box_second_block'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Additional Block Settings'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
+  $form['facebook_comments_box_second_block']['facebook_comments_box_second_comments'] = array(
+    '#type' => 'select',
+    '#title' => t('Default Number of Comments'),
+    '#default_value' => variable_get('facebook_comments_box_second_comments', 10),
+    '#options' => array(
+      10 => 10,
+      20 => 20,
+      30 => 30,
+      50 => 50,
+      100 => 100,
+    ),
+    '#description' => t('The number of comments to show by default on the page displaying them.'),
+    '#required' => TRUE,
+  );
+  $form['facebook_comments_box_second_block']['facebook_comments_box_second_width'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Default Width of Comments (in pixels)'),
+    '#default_value' => variable_get('facebook_comments_box_second_width', 400),
+    '#size' => 4,
+    '#maxlength' => 4,
+    '#description' => t('The width of the comments with a minimum of 400px.'),
+    '#required' => TRUE,
+  );
 
-  // Store the node type keys as values for easier comparison.
-  $fcb_all_node_types_keys = array_keys(node_get_types());
-  $fcb_all_node_types = array();
-  foreach ($fcb_all_node_types_keys as $node_type) {
-    $fcb_all_node_types[$node_type] = $node_type;
-  }
-
-  $form['facebook_comments_box_default_block']['facebook_comments_box_default_node_types'] = array(
+  $form['facebook_comments_box_second_block']['facebook_comments_box_second_theme'] = array(
     '#type' => 'select',
-    '#title' => t('Default Node Types'),
-    '#default_value' => variable_get('facebook_comments_box_default_node_types', NULL),
-    '#options' => $fcb_all_node_types,
-    '#multiple' => TRUE,
-    '#description' => t('The node types to attach comments to. This will make comments available for each of the selected node types.'),
+    '#title' => t('Default Theme'),
+    '#default_value' => variable_get('facebook_comments_box_second_theme', 'light'),
+    '#options' => array(
+      'light' => t('Light'),
+      'dark' => t('Dark'),
+    ),
+    '#description' => t('The default theme to use for comments.'),
     '#required' => TRUE,
   );
 
   return system_settings_form($form);
 }
+
+/**
+ * Helper function to generate the block content
+ * @param string $delta Either 'default' or 'second'
+ */
+function _facebook_comments_box_content($delta='default') {
+  $fcb_title = '';
+  $node_type = '';
+  $fcb_content = '';
+
+  // Get which node types should have comments.
+  $fcb_node_types = variable_get('facebook_comments_box_default_node_types', array(NULL));
+  // Figure out which node and nodetype we're on, puts comments only on
+  // nodes (as opposed to the front page, views pages, term pages, etc.)
+  if (arg(0) == 'node' && is_numeric(arg(1))) {
+    $nid       = arg(1);
+    $node      = node_load($nid);
+    $node_type = $node->type;
+    $fcb_title = check_plain($node->title);
+  }
+
+  // If the nodetype is set and selected in config, then load the comments
+  // on the page.
+  if (isset($node_type) && in_array($node_type, $fcb_node_types) && $node->status) {
+     // Figure out the current absolute URL.
+    $path = isset($_GET['q']) ? $_GET['q'] : '<front>';
+    $fcb_url = url($path, array('absolute' => TRUE));
+    // Meta mark up for the page.
+    $markup = '<meta property="og:type" content="Article" />';
+    $markup .= '<meta property="og:title" content="' . $fcb_title . '"/>';
+    $markup .= '<meta property="og:url" content="' . $fcb_url . '"/>';
+    //$markup .= '<meta property="og:image" content="' . theme_get_setting('logo') . '"/>';
+    $app_id = variable_get('facebook_comments_box_app_id', NULL);
+    if (isset($app_id) && !empty($app_id)) {
+     $markup .= '<meta property="fb:app_id" content="' . check_plain($app_id) . '">';
+    }
+    else {
+      $markup .= '<meta property="fb:admins" content="' . check_plain(variable_get('facebook_comments_box_admin_id', NULL)) . '">';
+    }
+     // Add meta data to the HEAD.
+    drupal_set_html_head($markup);
+    // Set the title of the block.
+    $block['subject'] = t('Facebook Comments Box');
+    // Set the content of the block.
+    $fcb_content = '<div class="facebook-comments-box facebook-comments-box-' . $delta . '">';
+    $fcb_content .= '<div id="fb-root"></div>';
+    $fcb_content .= '<script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script>';
+    $fcb_content .= '<fb:comments href="' . $fcb_url . '" ';
+    $fcb_content .= ' num_posts="' . check_plain(variable_get('facebook_comments_box_' . $delta . '_comments', 10)) . '" ';
+    $fcb_content .= ' width="' . check_plain(variable_get('facebook_comments_box_' . $delta . '_width', 400)) . '" ';
+    $fcb_content .= ' colorscheme="' . variable_get('facebook_comments_box_' . $delta . '_theme', 'light') . '" ></fb:comments></div>';
+    }
+
+  return $fcb_content;
+}
\ No newline at end of file